Merge branch 'master' into reg

# Conflicts:
#	smart-gateway/src/main/resources/bootstrap.yml

base-manager-ui/admin/src/pages/basicset/addmatter/components/AddSynopsis.vue

@@ -474,11 +474,14 @@ export default {
         icon: "exclamation-circle",
         maskClosable: true,
         onOk() {
+          _this.$refs.form.resetFields();
           _this.isTimely = undefined; // 是否及时办理
           _this.isPromise = undefined; // 承诺是否及时办理
           _this.isLinked = undefined; // 是否有联办机构
-          _this.form.deptName = "";
-          _this.$refs.form.resetFields();
+          _this.baseform.deptName = "";
+          _this.baseform.deptCode = "";
+          _this.baseform.matterNo = "";
+          _this.curDpt = undefined;
         },
         onCancel() {
           console.log("Cancel");

base-manager-ui/admin/src/pages/basicset/appmarket/components/AppTheme.vue

@@ -234,7 +234,7 @@ export default {
           let { code, msg } = res.data;
           if (code === 1) {
             _this.$message.success(msg);
-            this.selectedRowKeys = [];
+            _this.selectedRowKeys = [];
             _this.getCategoryList();
           }
         },

base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue

@@ -9,7 +9,6 @@
       <div class="search-box">
         <a-input-group compact>
           <a-select style="min-width: 100px" v-model="fieldCode">
-            <a-select-option value=""> 全部 </a-select-option>
             <a-select-option
               v-for="v in appTemplate"
               :key="v.id"
@@ -214,6 +213,9 @@ export default {
         this.appTemplate = data.sort((a, b) => {
           return a.fieldOrderNo - b.fieldOrderNo;
         });
+        if (this.appTemplate.length) {
+          this.fieldCode = this.appTemplate[0].fieldCode;
+        }
       }
     },
     // 获取数据列表
@@ -224,7 +226,7 @@ export default {
         size: this.size,
         appId: this.appId,
         fieldCode: this.fieldCode,
-        fieldValue: this.searchVal,
+        fieldValue: `%${this.searchVal}%`,
       });
       this.loading = false;
       if (res.data.code === 1) {
@@ -354,4 +356,4 @@ video {
   width: 50px;
   cursor: pointer;
 }
-</style>
+</style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/workman/personnel.vue

@@ -181,15 +181,23 @@
               </a-button>
             </a-dropdown>
           </div>
-          <div class="in">
+          <a-space>
+            <a-select v-model="searchType" style="width: 120px">
+              <a-select-option :value="1">
+                按姓名
+              </a-select-option>
+              <a-select-option :value="2">
+                按工号
+              </a-select-option>
+            </a-select>
             <a-input-search
-              placeholder="请输入姓名或者工号搜索"
+              placeholder="请输入关键字搜索"
               v-model="searchVal"
               enter-button="搜索"
               allowClear
               @search="onSearch"
             />
-          </div>
+          </a-space>
         </div>
         <div class="table-content">
           <!-- 表格 -->
@@ -408,6 +416,7 @@ export default {
       WorkmanData: [], // 工作人员列表
       deptSearch: "", //部门搜索
       windowSearch: "", // 窗口搜索
+      searchType: 1, // 搜索类型
       searchVal: "",
       visibleAll: false,
       page: 1,
@@ -458,9 +467,9 @@ export default {
     async getWorkmanData(search = {}) {
       this.loading = true;
       let obj = {};
-      if (/^[\u4e00-\u9fa5]+$/.test(this.searchVal)) {
+      if (this.searchType == 1) {
         obj.name = `%${this.searchVal}%`;
-      } else if (/^[a-zA-z0-9]+$/.test(this.searchVal)) {
+      } else if (this.searchType == 2) {
         obj.number = `%${this.searchVal}%`;
       }
       let res = await getWorkmanList({

base-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.annotation.Order;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -106,19 +107,19 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
                 Claims claims = parseToken(token);
                 String uuid = (String) claims.get(SysConstains.LOGIN_USER_KEY);
                 String userKey = getTokenKey(uuid);
-                cacheService.select(portalDb);
-                String userStr = cacheService.get(userKey);
+               // cacheService.select(portalDb);
+
+                RedisTemplate<String, String> redisTemplate = cacheService.selectDbRedisTemplate(portalDb);
+                String userStr =redisTemplate.opsForValue().get(userKey);
+               // String userStr = cacheService.get(userKey);
                 //刷新token时间
                 UserEntity userEntity = JSONObject.parseObject(userStr, UserEntity.class);
                 if (!ObjectUtils.isEmpty(userEntity)) {
                     verifyToken(userEntity);
                 }
-                cacheService.select(db);
+               // cacheService.select(db);
                 if (!ObjectUtils.isEmpty(userEntity)) {
-//                    UserEntity temp = userService.selectOne(new UserQuery().loginName(userEntity.getLoginName()));
-//                    if(!ObjectUtils.isEmpty(temp)){
-//                        userEntity.setId(temp.getId());
-//                    }
+
                     UserEntity temp = userService.getExtCache(userEntity.getLoginName());
                     if (!ObjectUtils.isEmpty(temp)) {
                         userEntity.setId(temp.getId());

base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -9,6 +9,7 @@
 package com.mortals.xhx.base.system.user.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.ap.SysConstains;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.common.code.UserType;
@@ -467,15 +468,17 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
     public static void main(String[] args) throws Exception {
         //eba467f81fb265befdf1f6ab041d39ab   原始admin密码
 
-        System.out.println(SecurityUtil.md5DoubleEncoding("adminADMIN@123!@#"));
 
+        System.out.println(SecurityUtil.md5DoubleEncoding("123456"));
+        System.out.println(SecurityUtil.md5DoubleEncoding("Qt123456@"));
 
+/*
         //宜宾一体化账号密码
         System.out.println(SecurityUtil.md5DoubleEncoding("yibinYTH@123!@#"));
 
 
         //P@ssw0rd123
-        System.out.println(SecurityUtil.md5DoubleEncoding("P@ssw0rd123"));
+        System.out.println(SecurityUtil.md5DoubleEncoding("P@ssw0rd123"));*/
     }
 
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartedService.java

 package com.mortals.xhx.daemon.applicationservice;
 
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.IUser;
@@ -12,6 +13,7 @@ import com.mortals.xhx.common.pdu.user.UserPdu;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.common.utils.SyncTreeSiteThread;
 import com.mortals.xhx.feign.user.IUserFeign;
+import com.mortals.xhx.module.site.model.SiteEntity;
 import com.mortals.xhx.module.site.model.SiteTreeSelect;
 import com.mortals.xhx.module.site.service.SiteService;
 import lombok.extern.slf4j.Slf4j;
@@ -52,6 +54,26 @@ public class DemoStartedService implements IApplicationStartedService {
 
         siteService.updateAllSiteTree(null);
 
+
+        //测试获取站点
+/*
+        int i=0;
+        while (true) {
+            SiteEntity siteCache = siteService.getCache("1");
+            if (ObjectUtils.isEmpty(siteCache)) {
+                log.error("siteCache is null");
+            }else {
+                log.info("count==>"+i);
+            }
+            try {
+                Thread.sleep(50);
+                i++;
+            } catch (InterruptedException e) {
+
+            }
+
+        }*/
+
      /*   UserEntity userEntity = new UserEntity();
         userEntity.initAttrValue();
         userEntity.setId(0L);

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -284,8 +284,9 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
 
     @Override
     public Result<MatterEntity> findSubList(MatterEntity matterQuery, PageInfo pageInfo, Context context) throws AppException {
-        SiteEntity siteCache = siteService.getCache(matterQuery.getSiteId().toString());
-        if(ObjectUtils.isEmpty(siteCache)) throw new AppException("查询站点id不能为空！");
+      //  SiteEntity siteCache = siteService.getCache(matterQuery.getSiteId().toString());
+        SiteEntity siteCache = siteService.get(matterQuery.getSiteId());
+        if(ObjectUtils.isEmpty(siteCache)) throw new AppException("查询站点id不能为空！siteId:"+matterQuery.getSiteId());
         if (ObjectUtils.isEmpty(matterQuery.getAreaCode())) {
             matterQuery.setAreaCode(siteCache == null ? null : siteCache.getAreaCode());
         }

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -450,14 +450,17 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         if (ObjectUtils.isEmpty(siteId)) {
             throw new AppException("站点Id不能为空！");
         }
-        SiteEntity siteCache = this.getCache(siteId.toString());
+        SiteEntity siteCache = this.get(siteId);
         if (ObjectUtils.isEmpty(siteCache)) {
             throw new AppException("站点不存在，siteId:" + siteId);
         }
         //siteList.add(siteCache);
         AreaEntity areaEntity = areaService.getExtCache(siteCache.getAreaCode());
         if (ObjectUtils.isEmpty(areaEntity)) {
-            throw new AppException(String.format("区域不存在！区域编码：%s", siteCache.getAreaCode()));
+            areaEntity = areaService.selectOne(new AreaQuery().areaCode(siteCache.getAreaCode()));
+            if (ObjectUtils.isEmpty(areaEntity)) {
+                throw new AppException(String.format("区域不存在！区域编码：%s", siteCache.getAreaCode()));
+            }
         }
 
         String matchCode = siteCache.getAreaCode().replaceAll("(0)+$", "");

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

@@ -54,7 +54,7 @@ POST {{baseUrl}}/base/area/genSubAreaByAreaName
 Content-Type: application/json
 
 {
-  "areaCode": "510900000000"
+  "areaCode": "511722000000"
 }
 
 

base-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -18,14 +18,7 @@
   },
 
   "base-test1": {
-    "baseUrl": "http://8.136.255.30:11078/base"
-  },
-  "base-yibintest": {
-    "baseUrl": "http://192.168.2.169:11078/base"
-  },
-
-  "base-yibin": {
-    "baseUrl": "http://10.12.185.213:11078/base"
+    "baseUrl": "http://8.136.255.30:21026/base"
   },
 
   "base-yibin-web": {

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

@@ -115,7 +115,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId
 Content-Type: application/json
 
 {
-  "id":22
+  "id":1
 }
 
 

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

 
 ###窗口业务列表
-POST {{baseUrl}}/window/business/list
+POST {{baseUrl}}/window/business/interlist
 Content-Type: application/json
 
 {"windowIdList":["77","78","79","80","81","82","83","84","85","86","87","88","89","90","91","92","93","94","95","96","97","98","99"],"size":-1}

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

@@ -9,7 +9,7 @@ Content-Type: application/json
 
 
 ###工作人员列表
-POST {{baseUrl}}/workman/list
+POST {{baseUrl}}/workman/interlist
 Content-Type: application/json
 
 {

portal-manager-ui/admin/package-lock.json

@@ -19,6 +19,7 @@
         "echarts": "^5.3.3",
         "element-ui": "^2.15.8",
         "font-awesome": "^4.7.0",
+        "gsap": "^3.12.2",
         "heatmap.js": "^2.0.5",
         "highlight.js": "^11.5.1",
         "js-export-excel": "^1.1.4",
@@ -28,11 +29,13 @@
         "secure-ls": "^1.2.6",
         "swiper": "5",
         "three": "^0.155.0",
+        "v-scale-screen": "1.0.2",
         "v-viewer": "^1.6.4",
         "vue": "^2.6.14",
         "vue-highlightjs": "^1.3.3",
         "vue-lazyload": "1.3.3",
         "vue-router": "^3.5.1",
+        "vuedraggable": "^2.24.3",
         "vuex": "^3.6.2",
         "vuex-persistedstate": "^4.1.0"
       },
@@ -6434,6 +6437,11 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
+    "node_modules/gsap": {
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.12.2.tgz",
+      "integrity": "sha512-EkYnpG8qHgYBFAwsgsGEqvT1WUidX0tt/ijepx7z8EUJHElykg91RvW1XbkT59T0gZzzszOpjQv7SE41XuIXyQ=="
+    },
     "node_modules/gzip-size": {
       "version": "6.0.0",
       "resolved": "https://registry.npmmirror.com/gzip-size/-/gzip-size-6.0.0.tgz",
@@ -10419,6 +10427,11 @@
         "websocket-driver": "^0.7.4"
       }
     },
+    "node_modules/sortablejs": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
+      "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
@@ -11269,6 +11282,17 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/v-scale-screen": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/v-scale-screen/-/v-scale-screen-1.0.2.tgz",
+      "integrity": "sha512-qMXPglHIs8KnhzDBdEBLcIoF3q7jgFCTWNIVPD5M0FGBkD+amYjbFUoLdKol/Xylm+pli4AHOZOqwyL6xX62SA==",
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "vue": "^2.6.14"
+      }
+    },
     "node_modules/v-viewer": {
       "version": "1.6.4",
       "resolved": "https://registry.npmmirror.com/v-viewer/-/v-viewer-1.6.4.tgz",
@@ -11501,6 +11525,14 @@
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
+    "node_modules/vuedraggable": {
+      "version": "2.24.3",
+      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
+      "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
+      "dependencies": {
+        "sortablejs": "1.10.2"
+      }
+    },
     "node_modules/vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz",
@@ -17075,6 +17107,11 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
+    "gsap": {
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.12.2.tgz",
+      "integrity": "sha512-EkYnpG8qHgYBFAwsgsGEqvT1WUidX0tt/ijepx7z8EUJHElykg91RvW1XbkT59T0gZzzszOpjQv7SE41XuIXyQ=="
+    },
     "gzip-size": {
       "version": "6.0.0",
       "resolved": "https://registry.npmmirror.com/gzip-size/-/gzip-size-6.0.0.tgz",
@@ -20039,6 +20076,11 @@
         "websocket-driver": "^0.7.4"
       }
     },
+    "sortablejs": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
+      "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
@@ -20645,6 +20687,12 @@
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "dev": true
     },
+    "v-scale-screen": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/v-scale-screen/-/v-scale-screen-1.0.2.tgz",
+      "integrity": "sha512-qMXPglHIs8KnhzDBdEBLcIoF3q7jgFCTWNIVPD5M0FGBkD+amYjbFUoLdKol/Xylm+pli4AHOZOqwyL6xX62SA==",
+      "requires": {}
+    },
     "v-viewer": {
       "version": "1.6.4",
       "resolved": "https://registry.npmmirror.com/v-viewer/-/v-viewer-1.6.4.tgz",
@@ -20835,6 +20883,14 @@
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
+    "vuedraggable": {
+      "version": "2.24.3",
+      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
+      "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
+      "requires": {
+        "sortablejs": "1.10.2"
+      }
+    },
     "vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz",

portal-manager-ui/admin/package.json

@@ -31,6 +31,7 @@
     "secure-ls": "^1.2.6",
     "swiper": "5",
     "three": "^0.155.0",
+    "v-scale-screen": "1.0.2",
     "v-viewer": "^1.6.4",
     "vue": "^2.6.14",
     "vue-highlightjs": "^1.3.3",

portal-manager-ui/admin/src/main.js

@@ -18,6 +18,9 @@ Vue.use(GlobalComponents);
 
 import common from "./utils/commin";
 Vue.use(common);
+
+import VScaleScreen from "v-scale-screen";
+Vue.use(VScaleScreen);
 // 公共样式
 import "@/assets/css/normalize.css";
 import "@/assets/css/reset.css";

portal-manager-ui/admin/src/views/dataAdmin/components/makeRecordReport/makeRecordReport.vue

@@ -232,8 +232,9 @@ export default {
       size: 10,
       total: 0,
       searchForm: {
-        search: "",
-        check_real: "-1",
+        status: "", // 状态
+        title: "",
+        sectionid: "", // 部门
         time: [
           this.$moment().format("YYYY-MM-DD"),
           this.$moment().format("YYYY-MM-DD"),

portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/networkForm.vue

@@ -256,6 +256,9 @@ export default {
     async getDataList(searchForm) {
       let list = [];
       let listTotal = 0;
+      this.searchForm.keyword
+        ? ""
+        : (this.searchForm.keyword = this.searchForm.info);
       let res = await getWLLZList({
         page: this.current,
         size: this.size,

portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/components/pie2.vue

@@ -19,6 +19,19 @@ export default {
       type: Object,
       default: () => {},
     },
+    data() {
+      return {
+        info: this.info || {},
+      };
+    },
+  },
+  watch: {
+    info: {
+      deep: true,
+      handler(val) {
+        this._initEcharts();
+      },
+    },
   },
   mounted() {
     this._initEcharts();
@@ -29,7 +42,11 @@ export default {
       const echarts = this.$echarts;
       let option = {
         title: {
-          text: `{c|${this.info.starttime}~${this.info.endtime}} \n{a|` + (this.info.success_rate * 100).toFixed(2) + "%" + "}",
+          text:
+            `{c|${this.info.starttime}~${this.info.endtime}} \n{a|` +
+            (this.info.success_rate * 100).toFixed(2) +
+            "%" +
+            "}",
           x: "center",
           y: "center",
           textStyle: {
@@ -107,4 +124,4 @@ export default {
     },
   },
 };
-</script>
+</script>
\ No newline at end of file

portal-manager-ui/admin/src/views/signIn/signIn.vue

@@ -333,6 +333,7 @@ export default {
         speed: 1000, // 时长
         // simulateTouch: false, //是否允许鼠标滑动切换
         grabCursor: false, // 手形鼠标
+        shortSwipes: false,
         cubeEffect: {
           shadow: false, // 取消盒子阴影
           slideShadows: false, // 取消子项拖动时候的阴影

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/userManagement.vue

@@ -8,10 +8,19 @@
       </div>
       <div class="search_btn">
         <a-space>
+          <a-select
+            v-model="userform.type"
+            placeholder="请选择类型"
+            style="width: 150px"
+          >
+            <a-select-option :value="1">按用户名</a-select-option>
+            <a-select-option :value="2">按用户姓名</a-select-option>
+            <a-select-option :value="3">按电话</a-select-option>
+          </a-select>
           <a-input
             v-model="userform.searchVal"
             style="width: 250px"
-            placeholder="请输入用户姓名/手机号搜索"
+            placeholder="请输入关键字搜索"
           >
             <a-icon slot="prefix" type="search" />
           </a-input>
@@ -172,6 +181,7 @@ export default {
       sourceInfoForm: {},
       userDict: {}, // 角色数据
       userform: {
+        type: 1,
         roleId: undefined,
         searchVal: undefined,
       },
@@ -197,11 +207,14 @@ export default {
       this.tableLoading = true;
       let realName = "";
       let mobile = "";
+      let loginName = "";
       if (this.userform.searchVal) {
-        if (/^[\d]+$/.test(this.userform.searchVal)) {
-          mobile = "%" + this.userform.searchVal + "%";
-        } else {
+        if (this.userform.type == 1) {
+          loginName = "%" + this.userform.searchVal + "%";
+        } else if (this.userform.type == 2) {
           realName = "%" + this.userform.searchVal + "%";
+        } else if (this.userform.type == 3) {
+          mobile = "%" + this.userform.searchVal + "%";
         }
       }
       let res = await userList({
@@ -210,24 +223,27 @@ export default {
         roleId: this.userform.roleId,
         realName,
         mobile,
+        loginName,
       });
-      let { dict, data, total } = res.data;
-      let { roleId } = dict;
-      if (!data.length && this.tablePagination.current > 1) {
-        this.tablePagination.current -= 1;
-        this.getUserList();
-      }
-      this.userDict = roleId;
-      let { loginName } = this.userData;
-      if (this.loginNames.includes(loginName)) {
-        this.tableSourceData = data;
-        this.tablePagination.total = total;
-      } else {
-        this.tableSourceData = data.filter((v) => {
-          return !this.loginNames.includes(v.loginName);
-        });
+      if (res.code == 1) {
+        let { dict, data, total } = res.data;
+        let { roleId } = dict;
+        if (!data.length && this.tablePagination.current > 1) {
+          this.tablePagination.current -= 1;
+          this.getUserList();
+        }
+        this.userDict = roleId;
+        let { loginName } = this.userData;
+        if (this.loginNames.includes(loginName)) {
+          this.tableSourceData = data;
+          this.tablePagination.total = total;
+        } else {
+          this.tableSourceData = data.filter((v) => {
+            return !this.loginNames.includes(v.loginName);
+          });
 
-        this.tablePagination.total = total - 3;
+          this.tablePagination.total = total - this.loginNames.length;
+        }
       }
       this.tableLoading = false;
     },

portal-manager-ui/admin/yarn.lock

@@ -3488,7 +3488,7 @@ fresh@0.5.2:
 
 fs-extra@^10.0.0:
   version "10.1.0"
-  resolved "https://registry.npmmirror.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz"
   integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
   dependencies:
     graceful-fs "^4.2.0"
@@ -3516,9 +3516,9 @@ fs.realpath@^1.0.0:
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+  version "2.3.3"
+  resolved "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
 function-bind@^1.1.1:
   version "1.1.1"
@@ -3578,7 +3578,7 @@ glob-to-regexp@^0.4.1:
 
 glob@7.1.6:
   version "7.1.6"
-  resolved "https://registry.npmmirror.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
     fs.realpath "^1.0.0"
@@ -3624,7 +3624,7 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4,
 
 gsap@^3.12.2:
   version "3.12.2"
-  resolved "https://registry.npmmirror.com/gsap/-/gsap-3.12.2.tgz#6e88203eed360761cbf2a2cb3a8d702aa87f3f6d"
+  resolved "https://registry.npmjs.org/gsap/-/gsap-3.12.2.tgz"
   integrity sha512-EkYnpG8qHgYBFAwsgsGEqvT1WUidX0tt/ijepx7z8EUJHElykg91RvW1XbkT59T0gZzzszOpjQv7SE41XuIXyQ==
 
 gzip-size@^6.0.0:
@@ -3695,7 +3695,7 @@ heatmap.js@^2.0.5:
 
 hex-color-regex@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmmirror.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
+  resolved "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
 highlight.js@*, highlight.js@^11.5.1:
@@ -3725,12 +3725,12 @@ hpack.js@^2.1.6:
 
 hsl-regex@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmmirror.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e"
+  resolved "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz"
   integrity sha512-M5ezZw4LzXbBKMruP+BNANf0k+19hDQMgpzBIYnya//Al+fjNct9Wf3b1WedLqdEs2hKBvxq/jh+DsHJLj0F9A==
 
 hsla-regex@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmmirror.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
+  resolved "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz"
   integrity sha512-7Wn5GMLuHBjZCb2bTmnDOycho0p/7UVaAeqXZGbHrBCl6Yd/xDhQJAXe6Ga9AXJH2I5zY1dEdYw2u1UptnSBJA==
 
 html-entities@^2.3.2:
@@ -5898,7 +5898,7 @@ sockjs@^0.3.24:
 
 sortablejs@1.10.2:
   version "1.10.2"
-  resolved "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.10.2.tgz#6e40364d913f98b85a14f6678f92b5c1221f5290"
+  resolved "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz"
   integrity sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A==
 
 source-map-js@^1.0.2:
@@ -5977,7 +5977,7 @@ ssf@~0.11.2:
 
 ssr-window@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmmirror.com/ssr-window/-/ssr-window-2.0.0.tgz#98c301aef99523317f8d69618f0010791096efc4"
+  resolved "https://registry.npmjs.org/ssr-window/-/ssr-window-2.0.0.tgz"
   integrity sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==
 
 ssri@^8.0.1:
@@ -6374,6 +6374,11 @@ uuid@^8.3.2:
   resolved "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+v-scale-screen@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/v-scale-screen/-/v-scale-screen-1.0.2.tgz"
+  integrity sha512-qMXPglHIs8KnhzDBdEBLcIoF3q7jgFCTWNIVPD5M0FGBkD+amYjbFUoLdKol/Xylm+pli4AHOZOqwyL6xX62SA==
+
 v-viewer@^1.6.4:
   version "1.6.4"
   resolved "https://registry.npmmirror.com/v-viewer/-/v-viewer-1.6.4.tgz"
@@ -6467,14 +6472,14 @@ vue@^2.6.14:
 
 vuedraggable@^2.24.3:
   version "2.24.3"
-  resolved "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-2.24.3.tgz#43c93849b746a24ce503e123d5b259c701ba0d19"
+  resolved "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz"
   integrity sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==
   dependencies:
     sortablejs "1.10.2"
 
 vuex-persistedstate@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmmirror.com/vuex-persistedstate/-/vuex-persistedstate-4.1.0.tgz#127165f85f5b4534fb3170a5d3a8be9811bd2a53"
+  resolved "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-4.1.0.tgz"
   integrity sha512-3SkEj4NqwM69ikJdFVw6gObeB0NHyspRYMYkR/EbhR0hbvAKyR5gksVhtAfY1UYuWUOCCA0QNGwv9pOwdj+XUQ==
   dependencies:
     deepmerge "^4.2.2"

portal-manager/src/main/java/com/mortals/xhx/module/user/service/impl/UserServiceImpl.java

@@ -26,6 +26,8 @@ import com.mortals.xhx.feign.skin.ISkinSampleFeign;
 import com.mortals.xhx.module.area.model.AreaQuery;
 import com.mortals.xhx.module.area.service.AreaService;
 import com.mortals.xhx.module.menu.service.MenuService;
+import com.mortals.xhx.module.role.model.RoleQuery;
+import com.mortals.xhx.module.role.model.RoleUserEntity;
 import com.mortals.xhx.module.role.model.RoleUserQuery;
 import com.mortals.xhx.module.role.service.RoleService;
 import com.mortals.xhx.module.role.service.RoleUserService;
@@ -87,7 +89,7 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
     }
 
 
-    /*    @Override
+      @Override
     protected void findAfter(UserEntity entity, PageInfo pageInfo, Context context, List<UserEntity> list) throws AppException {
         Map<Long, String> roleMap = roleService.find(new RoleQuery()).stream().collect(Collectors.toMap(x -> x.getId(), y -> y.getName()));
         List<Long> userIdList = list.stream().map(item -> item.getId()).collect(Collectors.toList());
@@ -101,7 +103,7 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
             }
         });
         super.findAfter(entity, pageInfo, context, list);
-    }*/
+    }
 
     private void doHandlerUser(UserEntity entity) throws AppException {
         if (StringUtils.isNotEmpty(entity.getLoginPwd())) {

portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserController.java

@@ -92,7 +92,7 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
         }
     }
 
-    @Override
+   /* @Override
     @UnAuth
     public Rest<Object> list(@RequestBody UserEntity query) {
         Map<String, Object> model = new HashMap();
@@ -121,7 +121,7 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
         ret.setDict(model.get(KEY_RESULT_DICT));
         ret.setMsg(model.get(MESSAGE_INFO) == null ? "" : model.remove(MESSAGE_INFO).toString());
         return ret;
-    }
+    }*/
 
     /* @Override
     public String list(@RequestBody(required = false) UserEntity query) {

smart-gateway/src/main/resources/bootstrap.yml

@@ -142,6 +142,22 @@ spring:
           metadata:
             response-timeout: 200000
             connect-timeout: 200000
+        # 综合窗口中台
+        - id: complex-window-manager
+          uri: lb://complex-window-manager
+          predicates:
+            - Path=/complex/**
+          metadata:
+            response-timeout: 200000
+            connect-timeout: 200000
+        # 信息公开平台
+        - id: info-publish-manager
+          uri: lb://info-publish-manager
+          predicates:
+            - Path=/infopublish/**
+          metadata:
+            response-timeout: 200000
+            connect-timeout: 200000
     nacos:
       # Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类
       discovery: