Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/common/utils/SyncTreeSiteThread.java

@@ -43,6 +43,11 @@ public class SyncTreeSiteThread implements Runnable {
                 Context contextTemp = new Context();
                 contextTemp.setUser(userEntity);
                 siteService.setSiteTree(siteTreeSelects, contextTemp);
+                if(userEntity.getId()==2065L){
+
+                    log.info("2065===>{}",JSON.toJSONString(userEntity));
+                }
+
             }
         }
        // log.info("刷新用户站点树=》userID:{} siteIds:{} siteTree:{}",context.getUser().getId(),context.getUser().getSiteIds(), JSON.toJSONString(siteService.getSiteTree(context)));

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java

@@ -97,15 +97,17 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
         JSONObject jsonObject = new JSONObject();
         Map<String, Object> model = new HashMap<>();
         String busiDesc = this.getModuleDesc() + "构建站点树";
+        Context context = getContext();
         try {
-            List<SiteTreeSelect> siteTree = this.service.getSiteTree(getContext());
+            List<SiteTreeSelect> siteTree = this.service.getSiteTree(context);
             if (ObjectUtils.isEmpty(siteTree)) {
                 log.info("为初始化站点树，重新构建！");
-                siteTree = this.service.siteTree(getContext());
+                siteTree = this.service.siteTree(context);
+                siteService.setSiteTree(siteTree, context);
             }
             model.put("siteTree", siteTree);
-            this.init(model, getContext());
-            if (!ObjectUtils.isEmpty(getContext()) && !ObjectUtils.isEmpty(getContext().getUser())) {
+            this.init(model, context);
+            if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
                 recordSysLog(request, busiDesc + " 【成功】");
             }
             jsonObject.put(KEY_RESULT_DATA, model);

base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http

@@ -65,7 +65,7 @@ Accept: application/json
 ###构建站点树
 GET {{baseUrl}}/site/siteTree
 #Authorization: {{authToken}}
-Authorization: eyJhbGciOiJIUzI1NiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE6NTgyNzRlMWM1MDlhNDQ2YzhmYjVlMDRkNjNlM2JmOTAifQ.dLq6-GLVOPvxq66pbqpj0K5qx1y3FzbKzbKq-wCxOr4
+Authorization: eyJhbGciOiJIUzI1NiJ9.eyJsb2dpbl91c2VyX2tleSI6IjIwNjY6MTM1OWYxYTQzZDNkNDljMmJkMDI5YzE5NThiNmFiZDAifQ.OQtNgxm9AH_TOuvAbbabJV0iMIbP3tj9pm6wofFqSis
 Accept: application/json
 
 

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -4,8 +4,8 @@ POST {{baseUrl}}/login/login
 Content-Type: application/json
 
 {
-  "loginName":"admin",
-  "password":"admin",
+  "loginName":"banana",
+  "password":"gxjG123!@#",
   "securityCode":"8888"
 }
 

deploy.sh

@@ -49,8 +49,8 @@ MYSQL_SERVICE="${SERVICE_PATH}/mysql.service"
 RABBITMQ="rabbitmq"
 RABBIT_CENTOS_FILENAME="rabbitmq-server-3.9.16-1.el7.noarch.rpm"
 ELANG_CENTOS_FILENAME="erlang-23.3.4.11-1.el7.x86_64.rpm"
-RABBITMQ_USER="root"
-RABBITMQ_PASSWORD="xhx@2022"
+RABBITMQ_USER="taxi_mq"
+RABBITMQ_PASSWORD="admin@2020"
 RABBITMQ_CONF_PATH="/etc/rabbitmq/"
 
 #redis
@@ -341,6 +341,10 @@ setup_rabbitmq() {
 
   else
     writelog "ubuntu erlang and rabbitmq clear"
+    apt-get remove rabbitmq-server -y
+    rm -rf /var/lib/rabbitmq
+    rm -rf /usr/lib64/erlang
+    apt-get remove erlang -y
   fi
 
 }