测试问题修改

knowledge-base/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthUserInterceptor.java

@@ -74,7 +74,7 @@ public class AuthUserInterceptor extends BaseInterceptor {
                     if (ObjectUtils.isEmpty(loginUser)) {
                         ServletUtils.renderString(response, JSONObject.toJSONString(Rest.fail(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT)));
                         return false;
-                    } else if (loginUser.isAdmin() || loginUser.getUserType() == 1) {
+                    } else if (loginUser.isAdmin() || loginUser.getUserType() == 1 || loginUser.getUserType() == 2) {
                         return super.preHandle(request, response, handler);
                     } else {
                         ServletUtils.renderString(response, JSONObject.toJSONString(Rest.fail(ERROR_USER_OPERATION, ERROR_USER_OPERATION_CONTENT)));

knowledge-base/src/main/java/com/mortals/xhx/base/system/user/model/UserQuery.java

@@ -881,7 +881,7 @@ public class UserQuery extends UserEntity {
      * @param areaCodes
      */
     public UserQuery areaCodes(String areaCodes){
-        setAreaCodes(areaCodes);
+        //setAreaCodes(areaCodes);
         return this;
     }
 

single-matter/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthUserInterceptor.java

@@ -74,7 +74,7 @@ public class AuthUserInterceptor extends BaseInterceptor {
                     if (ObjectUtils.isEmpty(loginUser)) {
                         ServletUtils.renderString(response, JSONObject.toJSONString(Rest.fail(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT)));
                         return false;
-                    } else if (loginUser.isAdmin() || loginUser.getUserType() == 1) {
+                    } else if (loginUser.isAdmin() || loginUser.getUserType() == 1 || loginUser.getUserType() == 2) {
                         return super.preHandle(request, response, handler);
                     } else {
                         ServletUtils.renderString(response, JSONObject.toJSONString(Rest.fail(ERROR_USER_OPERATION, ERROR_USER_OPERATION_CONTENT)));

single-matter/src/main/java/com/mortals/xhx/base/system/user/model/UserQuery.java

@@ -881,7 +881,7 @@ public class UserQuery extends UserEntity {
      * @param areaCodes
      */
     public UserQuery areaCodes(String areaCodes){
-        setAreaCodes(areaCodes);
+        //setAreaCodes(areaCodes);
         return this;
     }
 

single-matter/src/main/java/com/mortals/xhx/common/utils/SyncGovMatterDetailThread.java

@@ -106,8 +106,8 @@ public class SyncGovMatterDetailThread implements Runnable {
                 matterService.update(matterEntity, context);
             });
         }
-        log.info("同步站点主题事项开始.....");
-
+//        log.info("同步站点主题事项开始.....");
+//
         //判断站点区域乡镇情况
 //        if (areaEntity.getAreaLevel() <= 3) {
 //            //省，市，区

single-matter/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartService.java

 package com.mortals.xhx.daemon.applicationservice;
 
+import com.mortals.framework.util.ThreadPool;
+import com.mortals.xhx.common.utils.SendTaskThreadPool;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.mortals.framework.springcloud.service.IApplicationService;
@@ -23,9 +26,14 @@ import com.mortals.framework.springcloud.service.IApplicationService;
 public class DemoStartService implements IApplicationService {
 
     private static Log logger = LogFactory.getLog(DemoStartService.class);
+    @Autowired
+    private SendTaskThreadPool sendTaskThreadPool;
+
 
     @Override
     public void start() {
+        ThreadPool.getInstance().init(10);
+        sendTaskThreadPool.init(10);
         logger.info("开始服务..[配置已加载完成，但部分框架还未初始化，比如：Kafka]");
     }