Merge remote-tracking branch 'origin/master'

epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/enums/ErrorCode.java

@@ -18,7 +18,7 @@ public enum ErrorCode implements IErrorCode {
     ERR10004(10004, "返回的Object类型不是EsuaResponse，无法添加token!"),
     ERR10005(10005, "clentToken不能为空"),
 
-    ERR500(500, "Internal Server Error"),
+    ERR500(500, "网络开小差了，请稍后再试"),
     ERR501(501, "参数绑定异常"),
 
     ERR(ErrorCode.COMMON_ERR_CODE, "其他异常");

epdc-commons-tools/pom.xml

@@ -116,6 +116,10 @@
             <artifactId>thumbnailator</artifactId>
             <version>0.4.8</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/RocketMqConstant.java

@@ -28,7 +28,7 @@ public interface RocketMqConstant {
      * 分类信息修改-消息tag
      */
     String MQ_TAG_CATEGORY = "categoryTag";
-
+    //---------------------------------------------------------------------------
 
     /**
      * 内容安全审核-工作日志-消息topic
@@ -49,6 +49,82 @@ public interface RocketMqConstant {
      * 内容安全审核-工作日志-月报-消息tag
      */
     String MQ_TAG_WORKRECORD_MONTH_ORGANIZATION = "workRecord_month_contentSecurityTag";
+    //---------------------------------------------------------------------------
+
+    /**
+     * 内容安全审核-书记在线-消息topic
+     */
+    String MQ_TOPIC_SECRETARY_CONTENTSECURITY = "secretary_contentSecurityTopic";
+
+    /**
+     * 内容安全审核-书记在线-发布通知-消息topic
+     */
+    String MQ_TAG_SECRETARY_NOTICE_CONTENTSECURITY = "secretary_notice_contentSecurityTopic";
+
+    /**
+     * 内容安全审核-书记在线-我有话说-消息topic
+     */
+    String MQ_TAG_SECRETARY_TOPIC_CONTENTSECURITY = "secretary_topic_contentSecurityTopic";
+
+    /**
+     * 内容安全审核-书记在线-我有话说-评论-消息topic
+     */
+    String MQ_TAG_SECRETARY_TOPIC_COMMENT_CONTENTSECURITY = "secretary_topic_comment_contentSecurityTopic";
+    //---------------------------------------------------------------------------
+
+    /**
+     * 内容安全审核-初心互助-消息topic
+     */
+    String MQ_TOPIC_HEART_CONTENTSECURITY = "heart_contentSecurityTopic";
+
+    /**
+     * 内容安全审核-初心互助-发布活动-消息tag
+     */
+    String MQ_TAG_HEART_ACTIVITY_CONTENTSECURITY = "heart_activity_contentSecurityTag";
+
+    /**
+     * 内容安全审核-初心互助-已报名活动-我要打卡-消息tag
+     */
+    String MQ_TAG_HEART_SIGNIN_CONTENTSECURITY = "heart_signIn_contentSecurityTag";
+    //---------------------------------------------------------------------------
+
+    /**
+     *
+     * 内容安全审核-议题项目-消息topic
+     */
+    String MQ_TOPIC_ISSUE_ITEM_CONTENTSECURITY = "issueItem_contentSecurityTopic";
+
+    /**
+     * 内容安全审核-议题项目-我要报事-消息tag
+     */
+    String MQ_TAG_ISSUE_ITEM_SUBMIT_CONTENTSECURITY = "issueItem_submit_contentSecurityTag";
+
+    /**
+     * 内容安全审核-议题项目-评论-消息tag
+     */
+    String MQ_TAG_ISSUE_ITEM_COMMENT_CONTENTSECURITY = "issueItem_comment_contentSecurityTag";
+
+    /**
+     * 内容安全审核-项目详情-满意度评价-消息tag
+     */
+    String MQ_TAG_ISSUE_ITEM_SATISFACTION_CONTENTSECURITY = "issueItem_satisfaction_contentSecurityTag";
+    //---------------------------------------------------------------------------
+
+    /**
+     * 内容安全审核-邻里党群-消息topic
+     */
+    String MQ_TOPIC_GROUP_CONTENTSECURITY = "group_contentSecurityTopic";
+
+    /**
+     * 内容安全审核-邻里党群-我有话说-消息tag
+     */
+    String MQ_TAG_GROUP_TOPIC_CONTENTSECURITY = "group_topic_contentSecurityTag";
+
+    /**
+     * 内容安全审核-邻里党群-我有话说-评论-消息tag
+     */
+    String MQ_TAG_GROUP_TOPIC_COMMENT_CONTENTSECURITY = "group_topic_comment_contentSecurityTag";
+
 
 
 }

epdc-commons-tools/src/main/resources/i18n/messages_common.properties

@@ -1,5 +1,5 @@
 #Default
-500=\u670D\u52A1\u5668\u5185\u90E8\u5F02\u5E38
+500=\u7F51\u7EDC\u5F00\u5C0F\u5DEE\u4E86\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5
 401=\u672A\u6388\u6743
 403=\u62D2\u7EDD\u8BBF\u95EE\uFF0C\u6CA1\u6709\u6743\u9650
 10001={0}\u4E0D\u80FD\u4E3A\u7A7A

epdc-commons-tools/src/main/resources/i18n/messages_common_en_US.properties

@@ -1,5 +1,5 @@
 #English
-500=Internal Server Error
+500=Internal Server has some problems,please try again later.
 401=Unauthorized
 403=Denied access, no permission
 10001={0} can not be empty

epdc-commons-tools/src/main/resources/i18n/messages_common_zh_CN.properties

@@ -1,5 +1,5 @@
 #\u7B80\u4F53\u4E2D\u6587
-500=\u670D\u52A1\u5668\u5185\u90E8\u5F02\u5E38
+500=\u7F51\u7EDC\u5F00\u5C0F\u5DEE\u4E86\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5
 401=\u672A\u6388\u6743
 403=\u62D2\u7EDD\u8BBF\u95EE\uFF0C\u6CA1\u6709\u6743\u9650
 10001={0}\u4E0D\u80FD\u4E3A\u7A7A

epdc-commons-tools/src/main/resources/i18n/messages_common_zh_TW.properties

@@ -1,5 +1,5 @@
 #\u7E41\u4F53\u4E2D\u6587
-500=\u670D\u52D9\u5668\u5167\u90E8\u7570\u5E38
+500=\u7DB2\u7D61\u958B\u5C0F\u5DEE\u4E86\uFF0C\u8ACB\u7A0D\u5F8C\u518D\u8A66
 401=\u672A\u6388\u6B0A
 403=\u62D2\u7D55\u8A2A\u554F\uFF0C\u6C92\u6709\u6B0A\u9650
 10001={0}\u4E0D\u80FD\u70BA\u7A7A