修改升级政务服务版本

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

@@ -89,12 +89,12 @@ 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(db);
+                cacheService.select(portalDb);
+                String userStr = cacheService.get(userKey);
+                cacheService.select(db);
 
-                Rest<String> rest = userFeign.getToken(userKey);
-                String userStr = rest.getData();
+//                Rest<String> rest = userFeign.getToken(userKey);
+//                String userStr = rest.getData();
                 if (StringUtils.isNotEmpty(userStr)) {
                     UserEntity userEntity = JSONObject.parseObject(userStr, UserEntity.class);
                     userEntity.setToken(token);

base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteTreeSelect.java

@@ -92,14 +92,14 @@ public class SiteTreeSelect implements Serializable {
             this.label = collect.stream().map(item -> item.getSiteName()).collect(Collectors.joining(","));
             this.siteCode = collect.stream().map(item -> item.getSiteCode()).collect(Collectors.joining(","));
             this.type = "site";
-            this.icon = "el-icon-document";
+            this.icon = "el-icon-wind-power";
             this.longitude = collect.stream().findFirst().map(item -> item.getLongitude()).orElseGet(() -> "");
             this.latitude = collect.stream().findFirst().map(item -> item.getLatitude()).orElseGet(() -> "");
         } else {
             this.id = entity.getIid();
             this.label = entity.getName();
             this.type = "area";
-            this.icon = "el-icon-folder";
+            this.icon = "el-icon-place";
         }
         if ("False".equalsIgnoreCase(entity.getHaveSonArea())) {
             this.isLeaf = true;

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.mortals</groupId>
         <artifactId>mortals-common</artifactId>
-        <version>1.1.5-SNAPSHOT</version>
+        <version>1.1.7-SNAPSHOT</version>
     </parent>
     <groupId>com.mortals.xhx</groupId>
     <artifactId>smart-gov-platform</artifactId>
@@ -60,6 +60,11 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-loadbalancer</artifactId>
+        </dependency>
+
 
     </dependencies>