From 2cdbb69378ac6af3786b8800977de437ba53241c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 10 十月 2022 15:47:41 +0800
Subject: [PATCH] Merge branch 'local_20221010' into huacheng_test
---
.gitignore | 6
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/.gitignore | 33 ++++
springcloud_k8s_panzhihuazhihuishequ/service_api/.gitignore | 33 ++++
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingWestApi.java | 9 +
springcloud_k8s_panzhihuazhihuishequ/service_property/.gitignore | 33 ++++
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java | 9
springcloud_k8s_panzhihuazhihuishequ/grid_app/.gitignore | 33 ++++
springcloud_k8s_panzhihuazhihuishequ/common/.gitignore | 33 ++++
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 5
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java | 48 ++++--
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java | 9 +
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 50 ++++--
springcloud_k8s_panzhihuazhihuishequ/service_grid/.gitignore | 33 ++++
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 9 +
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 9 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleWestServiceImpl.java | 4
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 27 ++-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java | 5
18 files changed, 325 insertions(+), 63 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e5e634c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+/springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/
+
+
+.idea
+*.iml
+*.log
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index 811b9d9..f28bf2a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -3,6 +3,7 @@
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
@@ -167,7 +168,7 @@
if (StrUtil.isNotBlank(evaluateContent)) {
String result = checkService.checkMessageBy(evaluateContent, openid, appId);
if (StrUtil.isNotBlank(result)) {
- return R.fail("填写内容存在 " + result + " 违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
}
}
@@ -175,7 +176,7 @@
String photo = comActActEvaluateVO.getPhoto();
if (StrUtil.isNotBlank(photo)) {
if (!checkService.checkImageBy(photo, appId)) {
- return R.fail("上传图片存在违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "上传图片存在违规信息");
}
}
return communityService.activityEvaluate(comActActEvaluateVO);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
index 0b5f266..45b4f45 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
@@ -2,6 +2,7 @@
import cn.hutool.core.util.StrUtil;
import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
@@ -54,7 +55,7 @@
if (StrUtil.isNotBlank(discussSubject)) {
String result = checkService.checkMessageBy(discussSubject, openid, appId);
if (StrUtil.isNotBlank(result)) {
- return R.fail("填写内容存在 " + result + " 违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
}
}
@@ -62,7 +63,7 @@
String photoPah = comActDiscussDTO.getPhotoPah();
if (StrUtil.isNotBlank(photoPah)) {
if (!checkService.checkImageBy(photoPah, appId)) {
- return R.fail("上传图片存在违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "上传图片存在违规信息");
}
}
@@ -130,7 +131,7 @@
}
String result = checkService.checkMessageBy(comment, this.getLoginUserInfo().getOpenid(), this.getAppId());
if (StrUtil.isNotBlank(result)) {
- return R.fail("填写内容存在 " + result + " 违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
}
comActDiscussCommentDTO.setUserId(this.getUserId());
// 议事投票计算积分
@@ -197,7 +198,7 @@
}
String result = checkService.checkMessageBy(comment, this.getLoginUserInfo().getOpenid(), this.getAppId());
if (StrUtil.isNotBlank(result)) {
- return R.fail("填写内容存在 " + result + " 违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
}
comActDiscussCommentDTO.setUserId(this.getUserId());
return communityService.addDiscussCommentBack(comActDiscussCommentDTO);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java
index 88a395c..aee2756 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java
@@ -2,6 +2,8 @@
import javax.annotation.Resource;
+import cn.hutool.core.util.StrUtil;
+import com.panzhihua.common.constants.Constants;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -43,8 +45,11 @@
public R addHouse(@RequestBody @Validated(AddGroup.class) ComOpsHouseDTO comOpsHouseDTO) {
// 微信内容审核
String introduction = comOpsHouseDTO.getIntroduction();
- if (!checkService.checkMessage(introduction)) {
- return R.fail("内容违规");
+ if (StrUtil.isNotBlank(introduction)) {
+ String result = checkService.checkMessageBy(introduction, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
+ }
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
index 9194887..fd102e6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -79,7 +79,7 @@
if (StrUtil.isNotBlank(detail)) {
String result = checkService.checkMessageBy(detail, openid, appId);
if (StrUtil.isNotBlank(result)) {
- return R.fail("填写内容存在 " + result + " 违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
}
}
@@ -87,7 +87,7 @@
String photoPathList = comActEasyPhotoVO.getPhotoPathList();
if (StrUtil.isNotBlank(photoPathList)) {
if (!checkService.checkImageBy(photoPathList, appId)) {
- return R.fail("上传图片存在违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "上传图片存在违规信息");
}
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
@@ -184,7 +184,7 @@
if (StrUtil.isNotBlank(comment)) {
String result = checkService.checkMessageBy(comment, openid, appId);
if (StrUtil.isNotBlank(result)) {
- return R.fail("填写内容存在 " + result + " 违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
}
}
comActEasyPhotoCommentDTO.setUserId(this.getUserId());
@@ -232,8 +232,11 @@
public R addMicroWish(@RequestBody @Validated(AddGroup.class) ComActMicroWishVO comActMicroWishVO) {
// 微信内容审核
String msg = comActMicroWishVO.getDetail();
- if (!checkService.checkMessage(msg)) {
- return R.fail("内容违规");
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
+ }
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
@@ -317,8 +320,11 @@
public R addMessage(@RequestBody @Validated(AddGroup.class) ComActMessageVO comActMessageVO) {
// 微信内容审核
String msg = comActMessageVO.getMsgContent();
- if (!checkService.checkMessage(msg)) {
- return R.fail("内容违规");
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
+ }
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
@@ -344,8 +350,11 @@
public R addMessageBack(@RequestBody @Validated(AddGroup.class) ComActMessageBackVO comActMessageBackVO) {
// 微信内容审核
String msg = comActMessageBackVO.getMsgContent();
- if (!checkService.checkMessage(msg)) {
- return R.fail("内容违规");
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
+ }
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
index 767556f..dd1d41a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
@@ -2,6 +2,7 @@
import cn.hutool.core.util.StrUtil;
import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.constants.NeighborCircleConstants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.neighbor.*;
@@ -69,13 +70,13 @@
if (StrUtil.isNotBlank(releaseContent)) {
String result = checkService.checkMessageBy(releaseContent, this.getLoginUserInfo().getOpenid(), this.getAppId());
if (StrUtil.isNotBlank(result)) {
- return R.fail("填写内容存在 " + result + " 违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
}
}
String releaseImages = addNeighborCircleAppDTO.getReleaseImages();
if (StrUtil.isNotBlank(releaseImages)) {
if (checkService.checkImageBy(releaseImages, this.getAppId())) {
- return R.fail("上传图片存在违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "上传图片存在违规信息");
}
}
addNeighborCircleAppDTO.setUserId(userId);
@@ -87,28 +88,37 @@
}
//查询社区自动审核是否开着
- String key = NeighborCircleConstants.NEIGHBOR_CIRCLE_AUTO_EXAMINE;
- R isOk = communityService.getSysConfValue(key + communityId, communityId);
- if (R.isOk(isOk)) {
- if (isOk.getData() != null) {
- String value = isOk.getData().toString();
- if (value.equals("1")) {
- addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
- String msg = addNeighborCircleAppDTO.getReleaseContent();
- if (checkService.checkMessage(msg)) {
- addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes);
+
+ if (this.getAppId().equals("wx118de8a734d269f0")) {
+ //花城直接通过
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes);
+
+ } else {
+ //西区
+ String key = NeighborCircleConstants.NEIGHBOR_CIRCLE_AUTO_EXAMINE;
+ R isOk = communityService.getSysConfValue(key + communityId, communityId);
+ if (R.isOk(isOk)) {
+ if (isOk.getData() != null) {
+ String value = isOk.getData().toString();
+ if (value.equals("1")) {
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
+ String msg = addNeighborCircleAppDTO.getReleaseContent();
+ if (StrUtil.isEmpty(checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(), this.getAppId()))) {
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes);
+ } else {
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.no);
+ }
} else {
- addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.no);
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
}
} else {
- addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
+ communityService.addSysConfValue(key + communityId, communityId, "社区邻里圈自动审核参数", "1");
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
}
} else {
- communityService.addSysConfValue(key + communityId, communityId, "社区邻里圈自动审核参数", "1");
- addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
}
- } else {
- addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
}
return communityService.addNeighborByApp(addNeighborCircleAppDTO);
@@ -177,7 +187,7 @@
if (StrUtil.isNotBlank(content)) {
String result = checkService.checkMessageBy(content, this.getLoginUserInfo().getOpenid(), this.getAppId());
if (StrUtil.isNotBlank(result)) {
- return R.fail("填写内容存在 " + result + " 违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
}
}
commentAppDTO.setUserId(userId);
@@ -195,7 +205,7 @@
if (StrUtil.isNotBlank(content)) {
String result = checkService.checkMessageBy(content, this.getLoginUserInfo().getOpenid(), this.getAppId());
if (StrUtil.isNotBlank(result)) {
- return R.fail("填写内容存在 " + result + " 违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
}
}
replyAppDTO.setUserId(userId);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java
index 2b71d6c..4ffc58c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java
@@ -2,6 +2,7 @@
import cn.hutool.core.util.StrUtil;
import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.constants.NeighborCircleConstants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.neighbor.*;
@@ -65,7 +66,7 @@
if (StrUtil.isNotBlank(releaseContent)) {
String result = checkService.checkMessageBy(releaseContent, openid, appId);
if (StrUtil.isNotBlank(result)) {
- return R.fail("填写内容存在 " + result + " 违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
}
}
@@ -73,7 +74,7 @@
String releaseImages = addNeighborCircleAppDTO.getReleaseImages();
if (StrUtil.isNotBlank(releaseImages)) {
if (!checkService.checkImageBy(releaseImages, appId)) {
- return R.fail("上传图片存在违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "上传图片存在违规信息");
}
}
@@ -84,30 +85,37 @@
addNeighborCircleAppDTO.setCommunityId(communityId);
}
- //查询社区自动审核是否开着
- String key = NeighborCircleConstants.NEIGHBOR_CIRCLE_AUTO_EXAMINE;
- R isOk = communityWestService.getSysConfValue(key + communityId, communityId);
- if (R.isOk(isOk)) {
- if (isOk.getData() != null) {
- String value = isOk.getData().toString();
- if (value.equals("1")) {
- addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
- String msg = addNeighborCircleAppDTO.getReleaseContent();
- if (checkService.checkMessage(msg)) {
- addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes);
+ if(this.getAppId().equals("wx118de8a734d269f0")){
+ //花城直接通过
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes);
+ }else {
+ //查询社区自动审核是否开着
+ String key = NeighborCircleConstants.NEIGHBOR_CIRCLE_AUTO_EXAMINE;
+ R isOk = communityWestService.getSysConfValue(key + communityId, communityId);
+ if (R.isOk(isOk)) {
+ if (isOk.getData() != null) {
+ String value = isOk.getData().toString();
+ if (value.equals("1")) {
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
+ String msg = addNeighborCircleAppDTO.getReleaseContent();
+ if (StrUtil.isEmpty(checkService.checkMessageBy(msg,this.getLoginUserInfo().getOpenid(),this.getAppId()))) {
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes);
+ } else {
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.no);
+ }
} else {
- addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.no);
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
}
} else {
- addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
+ communityWestService.addSysConfValue(key + communityId, communityId, "社区邻里圈自动审核参数", "1");
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
}
} else {
- communityWestService.addSysConfValue(key + communityId, communityId, "社区邻里圈自动审核参数", "1");
- addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
}
- } else {
- addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
}
+
return communityWestService.addNeighborByApp(addNeighborCircleAppDTO);
}
@@ -179,7 +187,7 @@
if (StrUtil.isNotBlank(content)) {
String result = checkService.checkMessageBy(content, openid, appId);
if (StrUtil.isNotBlank(result)) {
- return R.fail("填写内容存在 " + result + " 违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
}
}
return communityWestService.neighborCommentByApp(commentAppDTO);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
index d82407a..ba8087f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -4,6 +4,8 @@
import javax.annotation.Resource;
+import cn.hutool.core.util.StrUtil;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO;
@@ -207,8 +209,11 @@
public R addActivityinfo(@RequestBody @Validated(AddGroup.class) ComPbActivityDTO comPbActivityDTO) {
// 微信内容审核
String msg = comPbActivityDTO.getRichText();
- if (!checkService.checkMessage(msg)) {
- return R.fail("内容违规");
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
+ }
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingWestApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingWestApi.java
index f797e2c..2cc1516 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingWestApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingWestApi.java
@@ -4,6 +4,8 @@
import javax.annotation.Resource;
+import cn.hutool.core.util.StrUtil;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
@@ -199,8 +201,11 @@
public R addActivityinfo(@RequestBody @Validated(AddGroup.class) ComPbActivityDTO comPbActivityDTO) {
// 微信内容审核
String msg = comPbActivityDTO.getRichText();
- if (!checkService.checkMessage(msg)) {
- return R.fail("内容违规");
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
+ }
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index b48296f..7115cc6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -9,7 +9,9 @@
import javax.annotation.Resource;
import javax.validation.Valid;
+import cn.hutool.core.util.StrUtil;
import com.panzhihua.applets.umf.UmfPayUtil;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.constants.HttpStatus;
import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
@@ -397,8 +399,11 @@
public R addFeedback(@RequestBody @Validated(AddGroup.class) SysUserFeedbackDTO sysUserFeedbackDTO) {
// 微信内容审核
String msg = sysUserFeedbackDTO.getContent();
- if (!checkService.checkMessage(msg)) {
- return R.fail("内容违规");
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
+ }
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/.gitignore b/springcloud_k8s_panzhihuazhihuishequ/common/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
index bee09b7..878b710 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
@@ -37,6 +37,11 @@
public static final Integer FAIL = 500;
/**
+ * 失败标记-微信提示违规记录消息状态码
+ */
+ public static final Integer NOTICE_FAIL = 501;
+
+ /**
* 登录成功
*/
public static final String LOGIN_SUCCESS = "Success";
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/.gitignore b/springcloud_k8s_panzhihuazhihuishequ/grid_app/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/.gitignore b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/.gitignore b/springcloud_k8s_panzhihuazhihuishequ/service_api/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleWestServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleWestServiceImpl.java
index 35f9a82..9e0313d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleWestServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleWestServiceImpl.java
@@ -161,6 +161,10 @@
neighborCircleDO.setRefuseReason("内容违规");
}
}
+ if(addNeighborCircleAppDTO.getIsExamine().equals(AddComActNeighborCircleAppDTO.isExamine.no) &&
+ addNeighborCircleAppDTO.getWxExamineResult().equals(AddComActNeighborCircleAppDTO.isExamine.yes)){
+ neighborCircleDO.setStatus(ComActNeighborCircleWestDO.status.xs);
+ }
if(this.baseMapper.insert(neighborCircleDO) > 0){
return R.ok();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/.gitignore b/springcloud_k8s_panzhihuazhihuishequ/service_grid/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/.gitignore b/springcloud_k8s_panzhihuazhihuishequ/service_property/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
--
Gitblit v1.7.1