From 1b6ec86cbd1dba77f665426dbcd4851ee4ea8ed8 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 14:30:38 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
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 dd1d41a..e2a5240 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
@@ -66,18 +66,20 @@
if (userId == null) {
return R.fail("请重新登录");
}
- String releaseContent = addNeighborCircleAppDTO.getReleaseContent();
- if (StrUtil.isNotBlank(releaseContent)) {
- String result = checkService.checkMessageBy(releaseContent, this.getLoginUserInfo().getOpenid(), this.getAppId());
- if (StrUtil.isNotBlank(result)) {
- return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
+ if (!this.getAppId().equals("wx118de8a734d269f0")){
+ String releaseContent = addNeighborCircleAppDTO.getReleaseContent();
+ if (StrUtil.isNotBlank(releaseContent)) {
+ String result = checkService.checkMessageBy(releaseContent, this.getLoginUserInfo().getOpenid(), this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
}
- }
- String releaseImages = addNeighborCircleAppDTO.getReleaseImages();
- if (StrUtil.isNotBlank(releaseImages)) {
- if (checkService.checkImageBy(releaseImages, this.getAppId())) {
- return R.fail(Constants.NOTICE_FAIL, "上传图片存在违规信息");
- }
+ /* String releaseImages = addNeighborCircleAppDTO.getReleaseImages();
+ if (StrUtil.isNotBlank(releaseImages)) {
+ if (checkService.checkImageBy(releaseImages, this.getAppId())) {
+ return R.fail(501, "上传图片存在违规信息");
+ }
+ }*/
}
addNeighborCircleAppDTO.setUserId(userId);
if (StringUtils.isNotEmpty(loginUser.getPhone())) {
@@ -187,7 +189,7 @@
if (StrUtil.isNotBlank(content)) {
String result = checkService.checkMessageBy(content, this.getLoginUserInfo().getOpenid(), this.getAppId());
if (StrUtil.isNotBlank(result)) {
- return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
}
}
commentAppDTO.setUserId(userId);
@@ -205,7 +207,7 @@
if (StrUtil.isNotBlank(content)) {
String result = checkService.checkMessageBy(content, this.getLoginUserInfo().getOpenid(), this.getAppId());
if (StrUtil.isNotBlank(result)) {
- return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
}
}
replyAppDTO.setUserId(userId);
--
Gitblit v1.7.1