diff --git a/README.md b/README.md
index 996bce5e..f8ceb5d2 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,26 @@
-# Cloud-Platform
+### Cloud-Platform
+
 Cloud-Platform是国内首个基于`Spring 
 Cloud`微`服务`化`开发平台`，具有统一授权、认证后台管理系统，其中包含具备用户管理、资源权限管理、网关API
 管理等多个模块，支持多业务系统并行开发，可以作为后端服务的开发脚手架。代码简洁，架构清晰，适合学习和直接项目中使用。
 核心技术采用`Spring Boot 
-2.1.2`以及`Spring Cloud (Greenwich.RELEASE)
-`相关核心组件，采用`Nacos`注册和配置中心，集成流量卫兵`Sentinel`，前端采用`vue-element-admin`组件，`Elastic Search`自行集成。
+2.4.1`、`Spring Cloud (2020.0.0)`以及`Spring Cloud Alibaba 2.2.4`
+相关核心组件，采用`Nacos`注册和配置中心，集成流量卫兵`Sentinel`，前端采用`vue-element-admin`组件，`Elastic Search`自行集成。
+
+### QQ群号：169824183(1)、592462556(2)、661605461(3)
 
-### QQ群号：169824183(1)、661605461(2)、592462556(3)
+### 公众号
+![输入图片说明](https://images.gitee.com/uploads/images/2020/1020/173334_53541846_547642.png "WX20201020-173326@2x.png")
 
-### 开源用户登记，宣传用：[点击打开](https://gitee.com/geek_qi/cloud-platform/issues/II9SP)
+#### 开源用户登记，宣传用：[点击打开](https://gitee.com/geek_qi/cloud-platform/issues/II9SP)
 
-### 最新更新日志，[点击查看](https://gitee.com/geek_qi/cloud-platform/wikis/Cloud-Platform更新日志?sort_id=320050)
+#### 最新更新日志，[点击查看](https://gitee.com/geek_qi/cloud-platform/wikis/Cloud-Platform更新日志?sort_id=320050)
 
-### 基础文档，[点击查看](https://gitee.com/geek_qi/cloud-platform/wikis/Home)
+#### 基础文档，[点击查看](https://gitee.com/geek_qi/cloud-platform/blob/master/dev-doc.md)
 
 # 模块说明
 ![架构图](https://images.gitee.com/uploads/images/2019/0528/205306_9a8b8d83_1899222.png "1.png")
 
-## 公众号
-![输入图片说明](https://images.gitee.com/uploads/images/2019/0712/091503_c2618a08_547642.jpeg "qrcode_for_gh_e5a084d37c0d_258 (2).jpg")
 
 ### 架构摘要
 #### 中台化前端
diff --git a/ace-dev-base/ace-auth-sdk/pom.xml b/ace-dev-base/ace-auth-sdk/pom.xml
index 3940fe78..76dc813d 100644
--- a/ace-dev-base/ace-auth-sdk/pom.xml
+++ b/ace-dev-base/ace-auth-sdk/pom.xml
@@ -24,13 +24,13 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-openfeign-core</artifactId>
-            <version>2.0.0.M1</version>
+            <version>3.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>5.0.4.RELEASE</version>
+            <version>5.3.2</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/ace-dev-base/ace-common/pom.xml b/ace-dev-base/ace-common/pom.xml
index 2880821a..eb07cde8 100644
--- a/ace-dev-base/ace-common/pom.xml
+++ b/ace-dev-base/ace-common/pom.xml
@@ -47,6 +47,7 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
             <version>5.0.4.RELEASE</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>
@@ -57,7 +58,8 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>5.2.6.RELEASE</version>
+            <version>5.3.2</version>
+            <scope>compile</scope>
         </dependency>
 
 
@@ -85,6 +87,11 @@
             <artifactId>fastjson</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
 
 
     </dependencies>
diff --git a/ace-dev-base/ace-common/src/main/java/com/github/wxiaoqi/security/common/context/BaseContextHandler.java b/ace-dev-base/ace-common/src/main/java/com/github/wxiaoqi/security/common/context/BaseContextHandler.java
index 59efa476..6d3b6561 100644
--- a/ace-dev-base/ace-common/src/main/java/com/github/wxiaoqi/security/common/context/BaseContextHandler.java
+++ b/ace-dev-base/ace-common/src/main/java/com/github/wxiaoqi/security/common/context/BaseContextHandler.java
@@ -2,17 +2,10 @@
 
 import com.github.wxiaoqi.security.common.constant.CommonConstants;
 import com.github.wxiaoqi.security.common.util.StringHelper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-
 /**
  * Created by ace on 2017/9/8.
  */
@@ -77,41 +70,41 @@ public static void remove(){
         threadLocal.remove();
     }
 
-    @RunWith(MockitoJUnitRunner.class)
-    public static class UnitTest {
-        private Logger logger = LoggerFactory.getLogger(UnitTest.class);
-
-        @Test
-        public void testSetContextVariable() throws InterruptedException {
-            BaseContextHandler.set("test", "main");
-            new Thread(()->{
-                BaseContextHandler.set("test", "moo");
-
-                try {
-                    Thread.sleep(3000);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                assertEquals(BaseContextHandler.get("test"), "moo");
-                logger.info("thread one done!");
-            }).start();
-            new Thread(()->{
-                BaseContextHandler.set("test", "moo2");
-                assertEquals(BaseContextHandler.get("test"), "moo2");
-                logger.info("thread two done!");
-            }).start();
-
-            Thread.sleep(5000);
-            assertEquals(BaseContextHandler.get("test"), "main");
-            logger.info("main one done!");
-        }
-
-        @Test
-        public void testSetUserInfo(){
-            BaseContextHandler.setUserID("test");
-            assertEquals(BaseContextHandler.getUserID(), "test");
-            BaseContextHandler.setUsername("test2");
-            assertEquals(BaseContextHandler.getUsername(), "test2");
-        }
-    }
+//    @RunWith(MockitoJUnitRunner.class)
+//    public static class UnitTest {
+//        private Logger logger = LoggerFactory.getLogger(UnitTest.class);
+//
+//        @Test
+//        public void testSetContextVariable() throws InterruptedException {
+//            BaseContextHandler.set("test", "main");
+//            new Thread(()->{
+//                BaseContextHandler.set("test", "moo");
+//
+//                try {
+//                    Thread.sleep(3000);
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+//                assertEquals(BaseContextHandler.get("test"), "moo");
+//                logger.info("thread one done!");
+//            }).start();
+//            new Thread(()->{
+//                BaseContextHandler.set("test", "moo2");
+//                assertEquals(BaseContextHandler.get("test"), "moo2");
+//                logger.info("thread two done!");
+//            }).start();
+//
+//            Thread.sleep(5000);
+//            assertEquals(BaseContextHandler.get("test"), "main");
+//            logger.info("main one done!");
+//        }
+//
+//        @Test
+//        public void testSetUserInfo(){
+//            BaseContextHandler.setUserID("test");
+//            assertEquals(BaseContextHandler.getUserID(), "test");
+//            BaseContextHandler.setUsername("test2");
+//            assertEquals(BaseContextHandler.getUsername(), "test2");
+//        }
+//    }
 }
diff --git a/ace-gate/pom.xml b/ace-gate/pom.xml
index cad6c6ba..5b9900d5 100644
--- a/ace-gate/pom.xml
+++ b/ace-gate/pom.xml
@@ -16,7 +16,7 @@
         <project.reporting.outputEncoding>UTF-8
         </project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <kotlin.version>1.1.51</kotlin.version>
+        <kotlin.version>1.4.20</kotlin.version>
     </properties>
 
     <dependencies>
@@ -69,14 +69,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
+        <!-- LB 扩展 -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
         </dependency>
         <!--<dependency>-->
             <!--<groupId>org.springframework.amqp</groupId>-->
@@ -118,6 +114,12 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.cloud</groupId>
+                    <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>de.codecentric</groupId>
@@ -163,6 +165,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ace-gate/src/main/java/com/github/wxiaoqi/security/gate/GatewayServerBootstrap.java b/ace-gate/src/main/java/com/github/wxiaoqi/security/gate/GatewayServerBootstrap.java
index 19d96b2f..4173b3af 100644
--- a/ace-gate/src/main/java/com/github/wxiaoqi/security/gate/GatewayServerBootstrap.java
+++ b/ace-gate/src/main/java/com/github/wxiaoqi/security/gate/GatewayServerBootstrap.java
@@ -3,16 +3,14 @@
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
 import com.github.wxiaoqi.security.gate.utils.DBLog;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.client.SpringCloudApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * @author ace
  * @create 2018/3/12.
  */
-@SpringBootApplication
-@EnableDiscoveryClient
+@SpringCloudApplication
 @EnableAceAuthClient
 //TODO 切换为webclient
 @EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign"})
diff --git a/ace-gate/src/main/java/com/github/wxiaoqi/security/gate/config/GatewayConfig.java b/ace-gate/src/main/java/com/github/wxiaoqi/security/gate/config/GatewayConfig.java
index 98743f4b..74fe0732 100644
--- a/ace-gate/src/main/java/com/github/wxiaoqi/security/gate/config/GatewayConfig.java
+++ b/ace-gate/src/main/java/com/github/wxiaoqi/security/gate/config/GatewayConfig.java
@@ -11,6 +11,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.reactive.function.client.WebClient;
 
 import java.util.ArrayList;
@@ -23,6 +24,12 @@
 @Configuration
 public class GatewayConfig {
 
+    @LoadBalanced
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+
     @Bean
     public Decoder feignDecoder() {
         return new ResponseEntityDecoder(new SpringDecoder(feignHttpMessageConverter()));
diff --git a/ace-gate/src/main/java/com/github/wxiaoqi/security/gate/handler/RequestBodyRoutePredicateFactory.java b/ace-gate/src/main/java/com/github/wxiaoqi/security/gate/handler/RequestBodyRoutePredicateFactory.java
index 911f3398..86c3f6ee 100644
--- a/ace-gate/src/main/java/com/github/wxiaoqi/security/gate/handler/RequestBodyRoutePredicateFactory.java
+++ b/ace-gate/src/main/java/com/github/wxiaoqi/security/gate/handler/RequestBodyRoutePredicateFactory.java
@@ -24,7 +24,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.springframework.cloud.gateway.handler.AsyncPredicate;
 import org.springframework.cloud.gateway.handler.predicate.AbstractRoutePredicateFactory;
-import org.springframework.cloud.gateway.handler.predicate.ReadBodyPredicateFactory;
 import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.codec.HttpMessageReader;
@@ -47,7 +46,7 @@
 @Order(1)
 public class RequestBodyRoutePredicateFactory
         extends AbstractRoutePredicateFactory<RequestBodyRoutePredicateFactory.Config> {
-    protected static final Log LOGGER = LogFactory.getLog(ReadBodyPredicateFactory.class);
+    protected static final Log LOGGER = LogFactory.getLog(RequestBodyRoutePredicateFactory.class);
     private final List<HttpMessageReader<?>> messageReaders;
 
     public RequestBodyRoutePredicateFactory() {
diff --git a/ace-gate/src/main/resources/application.yml b/ace-gate/src/main/resources/application.yml
index 994fa116..3a0a7820 100644
--- a/ace-gate/src/main/resources/application.yml
+++ b/ace-gate/src/main/resources/application.yml
@@ -35,22 +35,22 @@ spring:
       legacy:
         enabled: true
   cloud:
-     gateway:
-       default-filters:
+    gateway:
+      default-filters:
          - DedupeResponseHeader=Access-Control-Allow-Origin
-       globalcors:
+      globalcors:
          add-to-simple-url-handler-mapping: true
          corsConfigurations:
            '[/**]':
-             allowed-origins: "*"
+             allowed-origins: "http://localhost:9572"
              allowed-methods: "*"
              allowed-headers: "*"
              allow-credentials: true
-       discovery:
-         locator:
-           lowerCaseServiceId: true
-           enabled: true
-       routes:
+      discovery:
+        locator:
+          lowerCaseServiceId: true
+          enabled: true
+      routes:
         # =====================================
         - id: ace-auth
           uri: lb://ace-admin
@@ -83,12 +83,10 @@ spring:
             - Path=/api/sample/**
           filters:
             - StripPrefix=2
-     nacos:
-        discovery:
-          server-addr: 127.0.0.1:8848
-  sentinel:
-    transport:
-      dashboard: localhost:8080
+    sentinel:
+      transport:
+        dashboard: localhost:8080
+
 logging:
   level:
     com.github.wxiaoqi.security.gate.v2: info
diff --git a/ace-gate/src/main/resources/bootstrap.yml b/ace-gate/src/main/resources/bootstrap.yml
index d16e8d97..3ef7bc4d 100644
--- a/ace-gate/src/main/resources/bootstrap.yml
+++ b/ace-gate/src/main/resources/bootstrap.yml
@@ -6,6 +6,12 @@ spring:
       config:
         server-addr: 127.0.0.1:8848
         file-extension: yaml
+      discovery:
+        server-addr: 127.0.0.1:8848
+    loadbalancer:
+      ribbon:
+        enabled: false
+
   profiles:
     active: dev
   main:
diff --git a/ace-infrastructure/ace-monitor/pom.xml b/ace-infrastructure/ace-monitor/pom.xml
index 8e6e8d61..5393abb5 100644
--- a/ace-infrastructure/ace-monitor/pom.xml
+++ b/ace-infrastructure/ace-monitor/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>ace-monitor</artifactId>
 
     <properties>
-        <boot.admin.version>2.1.2</boot.admin.version>
+        <boot.admin.version>2.4.0</boot.admin.version>
     </properties>
 
     <dependencies>
@@ -26,19 +26,34 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.cloud</groupId>-->
-            <!--<artifactId>spring-cloud-starter-consul-all</artifactId>-->
-        <!--</dependency>-->
+        <!-- LB 扩展 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
+
+
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.cloud</groupId>
+                    <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-server</artifactId>
             <version>${boot.admin.version}</version>
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.springframework.boot</groupId>-->
+<!--                    <artifactId>spring-boot-starter-webflux</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
         </dependency>
 
         <dependency>
diff --git a/ace-modules/ace-admin/db/init.sql b/ace-modules/ace-admin/db/init.sql
index a4c68b4f..60066851 100644
--- a/ace-modules/ace-admin/db/init.sql
+++ b/ace-modules/ace-admin/db/init.sql
@@ -361,279 +361,6 @@ INSERT INTO auth_client (id,code,secret,name,locked,description,crt_time,crt_use
 ,(14,'ace-trace','wKTl6GGE','ace-trace','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
 ,(15,'ace-monitor','eEQBUcnW','ace-monitor','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
 ,(16,'ace-gateway','PHK3CLfo','ace-gateway','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;INSERT INTO auth_client_service (id,service_id,client_id,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(21,'4','5',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(23,'3','6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(41,'3','1',NULL,'2017-12-31 08:58:03','null','null','null',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(42,'6','1',NULL,'2017-12-31 08:58:03','null','null','null',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;INSERT INTO base_element (id,code,`type`,name,uri,menu_id,parent_id,`path`,`method`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(3,'userManager:btn_add','button','新增','/admin/user','1',NULL,NULL,'POST','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(4,'userManager:btn_edit','button','编辑','/admin/user/{*}','1',NULL,NULL,'PUT','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(5,'userManager:btn_del','button','删除','/admin/user/{*}','1',NULL,NULL,'DELETE','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(9,'menuManager:element','uri','按钮页面','/admin/element','6',NULL,NULL,'GET','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(10,'menuManager:btn_add','button','新增','/admin/menu/{*}','6',NULL,NULL,'POST','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(11,'menuManager:btn_edit','button','编辑','/admin/menu/{*}','6','','','PUT','','2017-06-24 00:00:00','','','','','','','','','','','')
-,(12,'menuManager:btn_del','button','删除','/admin/menu/{*}','6','','','DELETE','','2017-06-24 00:00:00','','','','','','','','','','','')
-,(13,'menuManager:btn_element_add','button','新增元素','/admin/element','6',NULL,NULL,'POST','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(14,'menuManager:btn_element_edit','button','编辑元素','/admin/element/{*}','6',NULL,NULL,'PUT','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(15,'menuManager:btn_element_del','button','删除元素','/admin/element/{*}','6',NULL,NULL,'DELETE','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_element (id,code,`type`,name,uri,menu_id,parent_id,`path`,`method`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(16,'groupManager:btn_add','button','新增','/admin/group','7',NULL,NULL,'POST','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(17,'groupManager:btn_edit','button','编辑','/admin/group/{*}','7',NULL,NULL,'PUT','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(18,'groupManager:btn_del','button','删除','/admin/group/{*}','7',NULL,NULL,'DELETE','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(19,'groupManager:btn_userManager','button','分配用户','/admin/group/{*}/user','7',NULL,NULL,'PUT','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(20,'groupManager:btn_resourceManager','button','分配权限','/admin/group/{*}/authority','7',NULL,NULL,'GET','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(21,'groupManager:menu','uri','分配菜单','/admin/group/{*}/authority/menu','7',NULL,NULL,'POST','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(22,'groupManager:element','uri','分配资源','/admin/group/{*}/authority/element','7',NULL,NULL,'POST','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(23,'userManager:view','uri','查看','/admin/user/{*}','1','','','GET','','2017-06-26 00:00:00','','','','','','','','','','','')
-,(24,'menuManager:view','uri','查看','/admin/menu/{*}','6','','','GET','','2017-06-26 00:00:00','','','','','','','','','','','')
-,(27,'menuManager:element_view','uri','查看','/admin/element/{*}','6',NULL,NULL,'GET',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_element (id,code,`type`,name,uri,menu_id,parent_id,`path`,`method`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(28,'groupManager:view','uri','查看','/admin/group/{*}','7',NULL,NULL,'GET',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(32,'groupTypeManager:view','uri','查看','/admin/groupType/{*}','8',NULL,NULL,'GET','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(33,'groupTypeManager:btn_add','button','新增','/admin/groupType','8',NULL,NULL,'POST',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(34,'groupTypeManager:btn_edit','button','编辑','/admin/groupType/{*}','8',NULL,NULL,'PUT',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(35,'groupTypeManager:btn_del','button','删除','/admin/groupType/{*}','8',NULL,NULL,'DELETE',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(41,'gateLogManager:view','button','查看','/admin/gateLog','27',NULL,NULL,'GET','','2017-07-01 00:00:00','1','admin','0:0:0:0:0:0:0:1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(42,'serviceManager:view','URI','查看','/auth/service/{*}','30',NULL,NULL,'GET',NULL,'2017-12-26 20:17:42','1','Mr.AG','127.0.0.1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(43,'serviceManager:btn_add','button','新增','/auth/service','30',NULL,NULL,'POST',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(44,'serviceManager:btn_edit','button','编辑','/auth/service/{*}','30',NULL,NULL,'PUT',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(45,'serviceManager:btn_del','button','删除','/auth/service/{*}','30',NULL,NULL,'DELETE',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_element (id,code,`type`,name,uri,menu_id,parent_id,`path`,`method`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(46,'serviceManager:btn_clientManager','button','服务授权','/auth/service/{*}/client','30',NULL,NULL,'POST',NULL,'2017-12-30 16:32:48','1','Mr.AG','127.0.0.1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(47,'onlineManager:btn_forceLogout','button','强退','/auth/online/{*}','39',NULL,NULL,'DELETE',NULL,'2020-08-16 03:37:02','1','admin','0:0:0:0:0:0:0:1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;INSERT INTO base_group (id,code,name,parent_id,`path`,`type`,group_type,description,crt_time,crt_user,crt_name,crt_host,upd_time,upd_user,upd_name,upd_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(1,'adminRole','管理员',-1,'/adminRole',NULL,1,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(3,'testGroup','体验组',-1,'/testGroup',NULL,1,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(4,'visitorRole','游客',3,'/testGroup/visitorRole',NULL,1,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(6,'company','中华大集团',-1,'/company',NULL,2,'',NULL,NULL,NULL,NULL,'2020-07-26 07:58:58','1','admin','0:0:0:0:0:0:0:1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(7,'financeDepart','财务部',6,'/company/financeDepart',NULL,2,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(8,'hrDepart','人力资源部',6,'/company/hrDepart',NULL,2,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(9,'blogAdmin','博客管理员',-1,'/blogAdmin',NULL,1,'','2017-07-16 16:59:30','1','Mr.AG','0:0:0:0:0:0:0:1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;INSERT INTO base_group_leader (id,group_id,user_id,description,crt_time,crt_user,crt_name,crt_host,upd_time,upd_user,upd_name,upd_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(6,'9','4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(13,'1','1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;INSERT INTO base_group_member (id,group_id,user_id,description,crt_time,crt_user,crt_name,crt_host,upd_time,upd_user,upd_name,upd_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(9,'9','4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(10,'1','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(12,'4','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;INSERT INTO base_group_type (id,code,name,description,crt_time,crt_user,crt_name,crt_host,upd_time,upd_user,upd_name,upd_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(1,'role','角色类型','role',NULL,NULL,NULL,NULL,'2017-08-25 17:52:37','1','Mr.AG','127.0.0.1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(2,'depart','部门类型',NULL,NULL,NULL,NULL,NULL,'2017-08-25 17:52:43','1','Mr.AG','127.0.0.1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(3,'free','自定义类型','sadf',NULL,NULL,NULL,NULL,'2017-08-26 08:22:25','1','Mr.AG','127.0.0.1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;INSERT INTO base_menu (id,code,title,parent_id,href,icon,`type`,order_num,description,`path`,enabled,crt_time,crt_user,crt_name,crt_host,upd_time,upd_user,upd_name,upd_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(1,'userManager','用户管理',5,'/admin/user','user','menu',0,'','/adminSys/baseManager/userManager',NULL,NULL,NULL,NULL,NULL,'2020-07-18 10:40:37','1','admin','0:0:0:0:0:0:0:1','pages/admin/user/index','{"title": "角色管理","cache": true}','userManager',NULL,NULL,NULL,NULL,NULL)
-,(5,'baseManager','基础配置管理',13,'/admin','list','dirt',0,'','/adminSys/baseManager',NULL,NULL,NULL,NULL,NULL,'2020-07-18 14:18:35','1','admin','0:0:0:0:0:0:0:1','layout/header-aside/layout','{"title": "角色管理","cache": true}','layoutHeaderAside',NULL,NULL,NULL,NULL,NULL)
-,(6,'menuManager','菜单管理',5,'/admin/menu','list-ul','menu',0,'','/adminSys/baseManager/menuManager',NULL,NULL,NULL,NULL,NULL,'2020-07-18 14:21:57','1','admin','0:0:0:0:0:0:0:1','pages/admin/menu/index','{"title": "角色管理","cache": true}','menuManager',NULL,NULL,NULL,NULL,NULL)
-,(7,'groupManager','角色权限管理',5,'/admin/group','address-card','menu',0,'','/adminSys/baseManager/groupManager',NULL,NULL,NULL,NULL,NULL,'2020-07-18 14:50:32','1','admin','0:0:0:0:0:0:0:1','pages/admin/group/index','{"title": "角色管理","cache": true}','groupManager',NULL,NULL,NULL,NULL,NULL)
-,(8,'groupTypeManager','角色类型管理',5,'/admin/groupType','user-secret','menu',0,'','/adminSys/baseManager/groupTypeManager',NULL,NULL,NULL,NULL,NULL,'2020-07-18 14:51:00','1','admin','0:0:0:0:0:0:0:1','pages/admin/groupType/index','{"title": "角色管理","cache": true}','groupTypeManager',NULL,NULL,NULL,NULL,NULL)
-,(13,'adminSys','权限管理系统',-1,'/admin','chrome','sys',0,'','/adminSys',NULL,NULL,NULL,NULL,NULL,'2020-07-18 10:42:08','1','admin','0:0:0:0:0:0:0:1','','{"title": "角色管理","cache": true}','',NULL,NULL,NULL,NULL,NULL)
-,(27,'gateLogManager','操作日志',5,'/admin/gateLog','file-archive-o','menu',0,'','/adminSys/baseManager/gateLogManager',NULL,'2017-07-01 00:00:00','1','admin','0:0:0:0:0:0:0:1','2020-07-18 14:51:30','1','admin','0:0:0:0:0:0:0:1','pages/admin/gateLog/index','{"title": "角色管理","cache": true}','gateLogManager',NULL,NULL,NULL,NULL,NULL)
-,(29,'authManager','服务权限管理',13,'/admin','server','dirt',0,'服务权限管理','/adminSys/authManager',NULL,'2017-12-26 19:54:45','1','Mr.AG','127.0.0.1','2020-07-18 14:51:52','1','admin','0:0:0:0:0:0:0:1','layout/header-aside/layout','{"title": "角色管理","cache": true}','layoutHeaderAside',NULL,NULL,NULL,NULL,NULL)
-,(30,'serviceManager','服务管理',29,'/admin/service','cubes','menu',0,'服务管理','/adminSys/authManager/serviceManager',NULL,'2017-12-26 19:56:06','1','Mr.AG','127.0.0.1','2020-07-18 14:52:31','1','admin','0:0:0:0:0:0:0:1','pages/auth/gateLog/index','{"title": "角色管理","cache": true}','serviceManager',NULL,NULL,NULL,NULL,NULL)
-,(31,'monitorManager','监控模块管理',13,'/admin','shield','dirt',0,NULL,'/adminSys/monitorManager',NULL,'2018-02-25 09:36:35','1','Mr.AG','127.0.0.1','2020-07-18 14:54:19','1','admin','0:0:0:0:0:0:0:1','layout/header-aside/layout','{"title": "角色管理","cache": true}','layoutHeaderAside',NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_menu (id,code,title,parent_id,href,icon,`type`,order_num,description,`path`,enabled,crt_time,crt_user,crt_name,crt_host,upd_time,upd_user,upd_name,upd_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(32,'serviceEurekaManager','服务注册中心',31,'http://localhost:8848/nacos','paw','menu',0,NULL,'/adminSys/monitorManager/serviceEurekaManager',NULL,'2018-02-25 09:37:04','1','Mr.AG','127.0.0.1','2020-07-18 14:54:50','1','admin','0:0:0:0:0:0:0:1','layout/header-aside/layout','{"title": "角色管理","cache": true}','layoutHeaderAside',NULL,NULL,NULL,NULL,NULL)
-,(33,'serviceMonitorManager','服务状态监控',31,'http://localhost:8764','heartbeat','menu',0,NULL,'/adminSys/monitorManager/serviceEurekaManager',NULL,'2018-02-25 09:37:05','1','Mr.AG','127.0.0.1','2020-07-18 14:55:07','1','admin','0:0:0:0:0:0:0:1','layout/header-aside/layout','{"title": "角色管理","cache": true}','layoutHeaderAside',NULL,NULL,NULL,NULL,NULL)
-,(34,'serviceZipkinManager','服务链路监控',31,'','line-chart','menu',0,NULL,'/adminSys/monitorManager/serviceZipkinManager',NULL,'2018-02-25 09:38:05','1','Mr.AG','127.0.0.1','2020-07-18 14:55:37','1','admin','0:0:0:0:0:0:0:1','layout/header-aside/layout','{"title": "角色管理","cache": true}','layoutHeaderAside',NULL,NULL,NULL,NULL,NULL)
-,(35,'codeManager','开发管理系统',-1,'/dev','connectdevelop','sys',0,NULL,'/codeManager',NULL,'2020-07-21 14:35:29','1','admin','0:0:0:0:0:0:0:1','2020-07-21 15:00:23','1','admin','0:0:0:0:0:0:0:1',NULL,'{"title": "角色管理","cache": true}',NULL,NULL,NULL,NULL,NULL,NULL)
-,(36,'devFormManager','表单设计器',37,'/dev/form','wpforms','menu',0,NULL,'/codeManager/devFormManager',NULL,'2020-07-21 14:59:25','1','admin','0:0:0:0:0:0:0:1','2020-07-21 15:00:49','1','admin','0:0:0:0:0:0:0:1','pages/dev/build/index','{"title": "角色管理","cache": true}','devFormManager',NULL,NULL,NULL,NULL,NULL)
-,(37,'devBaseManager','开发基础配置',35,'/dev','code','dirt',0,NULL,'/codeManager/devBaseManager',NULL,'2020-07-21 15:07:15','1','admin','0:0:0:0:0:0:0:1','2020-07-21 15:07:15','1','admin','0:0:0:0:0:0:0:1','layout/header-aside/layout','{"title": "角色管理","cache": true}','layoutHeaderAside',NULL,NULL,NULL,NULL,NULL)
-,(38,'codeManager','代码生成器',37,'/dev/code','code-fork','menu',0,NULL,'/codeManager/devBaseManager/codeManager',NULL,'2020-07-25 06:56:19','1','admin','0:0:0:0:0:0:0:1','2020-07-25 06:56:19','1','admin','0:0:0:0:0:0:0:1','pages/dev/code/index','{"cache":"true"}','codeManager',NULL,NULL,NULL,NULL,NULL)
-,(39,'onlineManager','在线用户',5,'/admin/online','user-secret','menu',0,NULL,'/adminSys/baseManager/onlineManager',NULL,'2020-08-01 10:10:21','1','admin','0:0:0:0:0:0:0:1','2020-08-01 10:10:35','1','admin','0:0:0:0:0:0:0:1','pages/admin/online/index','{"cache":true}','onlineManager',NULL,NULL,NULL,NULL,NULL)
-;INSERT INTO base_resource_authority (id,authority_id,authority_type,resource_id,resource_type,parent_id,`path`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(287,'1','group','5','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(288,'1','group','9','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(289,'1','group','10','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(290,'1','group','11','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(291,'1','group','12','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(294,'1','group','5','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(295,'1','group','9','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(296,'1','group','10','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(297,'1','group','11','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(298,'1','group','12','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_resource_authority (id,authority_id,authority_type,resource_id,resource_type,parent_id,`path`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(299,'1','group','9','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(300,'1','group','12','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(301,'1','group','10','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(302,'1','group','11','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(303,'1','group','13','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(304,'1','group','14','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(305,'1','group','15','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(306,'1','group','10','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(307,'1','group','11','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(308,'1','group','12','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_resource_authority (id,authority_id,authority_type,resource_id,resource_type,parent_id,`path`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(309,'1','group','13','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(310,'1','group','14','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(311,'1','group','9','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(312,'1','group','15','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(313,'1','group','16','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(314,'1','group','17','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(315,'1','group','18','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(317,'1','group','20','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(318,'1','group','21','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(319,'1','group','22','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_resource_authority (id,authority_id,authority_type,resource_id,resource_type,parent_id,`path`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(349,'4','group','9','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(371,'1','group','23','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(372,'1','group','24','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(373,'1','group','27','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(374,'1','group','28','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(375,'1','group','23','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(378,'1','group','5','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(379,'1','group','9','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(380,'1','group','11','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(381,'1','group','14','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_resource_authority (id,authority_id,authority_type,resource_id,resource_type,parent_id,`path`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(382,'1','group','13','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(383,'1','group','15','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(384,'1','group','12','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(385,'1','group','24','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(386,'1','group','10','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(387,'1','group','27','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(388,'1','group','16','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(389,'1','group','18','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(390,'1','group','17','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(392,'1','group','20','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_resource_authority (id,authority_id,authority_type,resource_id,resource_type,parent_id,`path`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(393,'1','group','28','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(394,'1','group','22','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(395,'1','group','21','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(396,'4','group','23','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(397,'4','group','9','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(398,'4','group','27','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(399,'4','group','24','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(400,'4','group','28','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(401,'1','group','30','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(402,'1','group','30','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_resource_authority (id,authority_id,authority_type,resource_id,resource_type,parent_id,`path`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(403,'1','group','31','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(421,'1','group','31','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(422,'1','group','30','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(423,'4','group','31','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(424,'4','group','30','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(436,'1','group','32','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(437,'1','group','33','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(438,'1','group','34','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(439,'1','group','35','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(440,'4','group','32','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_resource_authority (id,authority_id,authority_type,resource_id,resource_type,parent_id,`path`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(464,'1','group','30','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(465,'1','group','31','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(466,'1','group','30','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(467,'1','group','31','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(468,'1','group','30','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(469,'1','group','31','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(470,'1','group','30','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(471,'1','group','31','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(472,'1','group','40','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(492,'1','group','30','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_resource_authority (id,authority_id,authority_type,resource_id,resource_type,parent_id,`path`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(493,'1','group','31','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(494,'1','group','40','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(517,'4','group','30','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(518,'4','group','31','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(519,'4','group','40','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(611,'4','group','42','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(612,'4','group','36','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(666,'1','group','41','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(689,'1','group','43','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(691,'1','group','44','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_resource_authority (id,authority_id,authority_type,resource_id,resource_type,parent_id,`path`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(710,'9','group','42','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(711,'9','group','43','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(712,'9','group','44','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(713,'9','group','45','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(718,'9','group','42','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(719,'9','group','44','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(720,'9','group','45','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(721,'9','group','43','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(722,'1','group','41','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(749,'10','group','13','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_resource_authority (id,authority_id,authority_type,resource_id,resource_type,parent_id,`path`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(750,'10','group','14','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(751,'10','group','-1','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(752,'10','group','5','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(753,'10','group','6','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(754,'10','group','17','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(755,'10','group','20','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(774,'1','group','3','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(775,'1','group','4','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(812,'1','group','19','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(924,'1','group','42','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_resource_authority (id,authority_id,authority_type,resource_id,resource_type,parent_id,`path`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(945,'1','group','45','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(956,'1','group','46','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(981,'9','group','23','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(982,'9','group','1','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(983,'9','group','13','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(984,'9','group','-1','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(985,'9','group','5','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(994,'4','group','41','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(995,'4','group','1','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(996,'4','group','13','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_resource_authority (id,authority_id,authority_type,resource_id,resource_type,parent_id,`path`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(997,'4','group','-1','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(998,'4','group','5','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(999,'4','group','27','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1000,'4','group','6','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1001,'4','group','7','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1002,'4','group','8','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1106,'1','group','47','button','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1107,'1','group','33','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1108,'1','group','34','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1109,'1','group','13','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_resource_authority (id,authority_id,authority_type,resource_id,resource_type,parent_id,`path`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(1110,'1','group','35','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1111,'1','group','36','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1112,'1','group','37','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1113,'1','group','-1','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1114,'1','group','27','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1115,'1','group','38','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1116,'1','group','39','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1117,'1','group','29','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1118,'1','group','1','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1119,'1','group','5','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;
-INSERT INTO base_resource_authority (id,authority_id,authority_type,resource_id,resource_type,parent_id,`path`,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(1120,'1','group','6','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1121,'1','group','7','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1122,'1','group','8','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1123,'1','group','30','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1124,'1','group','31','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(1125,'1','group','32','menu','-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;INSERT INTO base_user (id,username,password,name,birthday,address,mobile_phone,tel_phone,email,sex,`type`,status,description,crt_time,crt_user,crt_name,crt_host,upd_time,upd_user,upd_name,upd_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(1,'admin','jGl25bVBBBW96Qi9Te4V37Fnqchz/Eu4qB9vKrRIqRg=','Mr.AG','',NULL,'',NULL,'','男',NULL,NULL,'',NULL,NULL,NULL,NULL,'2017-11-16 23:23:49','1','Mr.AG','127.0.0.1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(2,'test','jGl25bVBBBW96Qi9Te4V37Fnqchz/Eu4qB9vKrRIqRg=','测试账户','',NULL,'',NULL,'','男',NULL,NULL,'',NULL,NULL,NULL,NULL,'2017-07-15 19:18:07','1','管理员','0:0:0:0:0:0:0:1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(4,'blog','jGl25bVBBBW96Qi9Te4V37Fnqchz/Eu4qB9vKrRIqRg=','Mr.AG(博主)','',NULL,'',NULL,'','男',NULL,NULL,'123
-556',NULL,NULL,NULL,NULL,'2020-07-25 05:28:51','1','admin','0:0:0:0:0:0:0:1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-;INSERT INTO auth_client (id,code,secret,name,locked,description,crt_time,crt_user,crt_name,crt_host,upd_time,upd_user,upd_name,upd_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
-(1,'ace-gate','123456','ace-gate','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(3,'ace-admin','123456','ace-admin','0','',NULL,NULL,NULL,NULL,'2017-07-06 21:42:17','1','管理员','0:0:0:0:0:0:0:1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(6,'ace-auth','123456','ace-auth','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(11,'ace-config','fXHsssa2','ace-config','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(13,'ace-template','bZf8yvj8','ace-template','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(14,'ace-trace','wKTl6GGE','ace-trace','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(15,'ace-monitor','eEQBUcnW','ace-monitor','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-,(16,'ace-gateway','PHK3CLfo','ace-gateway','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
 ,(17,'ace-sample','123456','ace-sample','0','ace-sample','2020-09-05 03:33:35','1','admin','0:0:0:0:0:0:0:1','2020-09-05 03:33:35','1','admin','0:0:0:0:0:0:0:1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
 ;INSERT INTO auth_client_service (id,service_id,client_id,description,crt_time,crt_user,crt_name,crt_host,attr1,attr2,attr3,attr4,attr5,attr6,attr7,attr8) VALUES
 (21,'4','5',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
diff --git a/ace-modules/ace-admin/pom.xml b/ace-modules/ace-admin/pom.xml
index c8d19f3b..f4a0e901 100644
--- a/ace-modules/ace-admin/pom.xml
+++ b/ace-modules/ace-admin/pom.xml
@@ -11,7 +11,7 @@
 
     <artifactId>ace-admin</artifactId>
     <properties>
-        <hystrix.version>1.5.12</hystrix.version>
+<!--        <hystrix.version>1.5.12</hystrix.version>-->
         <!-- MyBatis Generator -->
         <!-- Java接口和实体类 -->
         <targetJavaProject>${basedir}/src/main/java</targetJavaProject>
@@ -43,10 +43,6 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
-        </dependency>
 
         <!--增加eureka-server的依赖-->
         <!--<dependency>-->
@@ -153,9 +149,22 @@
             <!--<groupId>org.springframework.cloud</groupId>-->
             <!--<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
         <!--</dependency>-->
+
+        <!-- LB 扩展 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.cloud</groupId>
+                    <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -172,7 +181,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>5.2.6.RELEASE</version>
+            <version>5.3.2</version>
         </dependency>
 
         <dependency>
diff --git a/ace-modules/ace-admin/src/main/resources/application.yml b/ace-modules/ace-admin/src/main/resources/application.yml
index 9079ec3a..c5a4cdf1 100644
--- a/ace-modules/ace-admin/src/main/resources/application.yml
+++ b/ace-modules/ace-admin/src/main/resources/application.yml
@@ -36,30 +36,10 @@ spring:
         testOnReturn: false
         poolPreparedStatements: true
         maxOpenPreparedStatements: 20
-#    rabbitmq:
-#        host: ${RABBIT_MQ_HOST:localhost}
-#        port:  ${RABBIT_MQ_PORT:5672}
-#        username: guest
-#        password: guest
-#    sleuth:
-#        enabled: true
-#          http:
-#            legacy:
-#              enabled: true
     cloud:
-      nacos:
-        discovery:
-          server-addr: 127.0.0.1:8848
       sentinel:
         transport:
           dashboard: localhost:8080
-    sleuth:
-      enabled: false
-sample:
-  zipkin:
-    # When enabled=false, traces log to the console. Comment to send to zipkin
-    enabled: false
-
 mybatis:
     basepackage: com.github.wxiaoqi.security.admin.modules.mapper
     xmlLocation: classpath:mapper/**/*.xml
diff --git a/ace-modules/ace-admin/src/main/resources/bootstrap.yml b/ace-modules/ace-admin/src/main/resources/bootstrap.yml
index 56ec3529..9d78f963 100644
--- a/ace-modules/ace-admin/src/main/resources/bootstrap.yml
+++ b/ace-modules/ace-admin/src/main/resources/bootstrap.yml
@@ -6,5 +6,13 @@ spring:
       config:
         server-addr: 127.0.0.1:8848
         file-extension: yaml
+      discovery:
+        server-addr: 127.0.0.1:8848
+    sleuth:
+      enabled: false
+      sample:
+        zipkin:
+          # When enabled=false, traces log to the console. Comment to send to zipkin
+          enabled: false
   profiles:
     active: dev
\ No newline at end of file
diff --git a/ace-modules/ace-generator/pom.xml b/ace-modules/ace-generator/pom.xml
index 05e46426..4f331d8b 100644
--- a/ace-modules/ace-generator/pom.xml
+++ b/ace-modules/ace-generator/pom.xml
@@ -77,9 +77,21 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
+
+        <!-- LB 扩展 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.cloud</groupId>
+                    <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>de.codecentric</groupId>
@@ -95,6 +107,11 @@
             <groupId>org.apache.velocity</groupId>
             <version>1.7</version>
         </dependency>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>1.10</version>
+        </dependency>
     </dependencies>
     <build>
         <finalName>ace-generator</finalName>
diff --git a/ace-modules/ace-generator/src/main/java/com/github/wxiaoqi/security/generator/GeneratorServerBootstrap.java b/ace-modules/ace-generator/src/main/java/com/github/wxiaoqi/security/generator/GeneratorServerBootstrap.java
index 220b52fc..f6ea4b2c 100644
--- a/ace-modules/ace-generator/src/main/java/com/github/wxiaoqi/security/generator/GeneratorServerBootstrap.java
+++ b/ace-modules/ace-generator/src/main/java/com/github/wxiaoqi/security/generator/GeneratorServerBootstrap.java
@@ -2,16 +2,14 @@
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.client.SpringCloudApplication;
 import org.springframework.context.annotation.ComponentScan;
 
 /**
  * @author ace
  * @create 2018/3/12.
  */
-@SpringBootApplication
-@EnableDiscoveryClient
+@SpringCloudApplication
 @ComponentScan({"com.github.wxiaoqi.security.common","com.github.wxiaoqi.security.generator"})
 @MapperScan("com.github.wxiaoqi.security.generator.mapper")
 public class GeneratorServerBootstrap {
diff --git a/ace-modules/ace-generator/src/main/resources/application.yml b/ace-modules/ace-generator/src/main/resources/application.yml
index b2338955..6bad5d59 100644
--- a/ace-modules/ace-generator/src/main/resources/application.yml
+++ b/ace-modules/ace-generator/src/main/resources/application.yml
@@ -50,10 +50,7 @@ spring:
     http:
       legacy:
         enabled: true
-  cloud:
-     nacos:
-        discovery:
-          server-addr: 127.0.0.1:8848
+
 #  sentinel:
 #    transport:
 #      dashboard: localhost:8080
diff --git a/ace-modules/ace-generator/src/main/resources/bootstrap.yml b/ace-modules/ace-generator/src/main/resources/bootstrap.yml
index f7d584d8..b04ed1d8 100644
--- a/ace-modules/ace-generator/src/main/resources/bootstrap.yml
+++ b/ace-modules/ace-generator/src/main/resources/bootstrap.yml
@@ -6,6 +6,8 @@ spring:
       config:
         server-addr: 127.0.0.1:8848
         file-extension: yaml
+      discovery:
+        server-addr: 127.0.0.1:8848
   profiles:
     active: dev
   main:
diff --git a/ace-modules/ace-sample/pom.xml b/ace-modules/ace-sample/pom.xml
index 260f8108..a0d3b9a6 100644
--- a/ace-modules/ace-sample/pom.xml
+++ b/ace-modules/ace-sample/pom.xml
@@ -38,9 +38,11 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
+
+        <!-- LB 扩展 -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
         </dependency>
 
         <!-- 链路追踪 -->
@@ -139,6 +141,12 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery
             </artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.cloud</groupId>
+                    <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
 
@@ -158,7 +166,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>5.2.6.RELEASE</version>
+            <version>5.3.2</version>
         </dependency>
 
     </dependencies>
diff --git a/ace-modules/ace-sample/src/main/resources/application.yml b/ace-modules/ace-sample/src/main/resources/application.yml
index 6040542d..1c17300c 100644
--- a/ace-modules/ace-sample/src/main/resources/application.yml
+++ b/ace-modules/ace-sample/src/main/resources/application.yml
@@ -35,16 +35,17 @@ spring:
       pool:
           max-active: 20
   sleuth:
-    enabled: false
+    enabled: true
+    http:
+      legacy:
+        enabled: true
   cloud:
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
     sentinel:
       transport:
         dashboard: localhost:8080
 
 
+
 auth:
   serviceId: ace-admin
   user:
@@ -57,7 +58,7 @@ logging:
   level:
     com.github.wxiaoqi.security.sample: info
 #    com
-    org.springframework: DEBUG
+    org.springframework: info
 
 
 management:
diff --git a/ace-modules/ace-sample/src/main/resources/bootstrap.yml b/ace-modules/ace-sample/src/main/resources/bootstrap.yml
index 6b634cb1..57d0f782 100644
--- a/ace-modules/ace-sample/src/main/resources/bootstrap.yml
+++ b/ace-modules/ace-sample/src/main/resources/bootstrap.yml
@@ -6,6 +6,8 @@ spring:
       config:
         server-addr: 127.0.0.1:8848
         file-extension: yaml
+      discovery:
+        server-addr: 127.0.0.1:8848
   profiles:
     active: dev
   main:
diff --git a/dev-doc.md b/dev-doc.md
index 6ea0e9eb..93af9a9b 100644
--- a/dev-doc.md
+++ b/dev-doc.md
@@ -60,9 +60,10 @@ ace-security
 
 - 按`顺序`运行main类：AdminBootstrap（ace-admin）、GatewayServerBootstrap（ace-gate）
 
+- 第一次启动跨域问题：ace-gate/src/main/resources/application.yml 路径下 corsConfigurations.allowed-origins: "http://localhost:8081"对应前端ip和端口
 ----
 
-## UI工程启动[Cloud-Admin-UI-V2][点击打开](https://github.com/wxiaoqi/Spring-Cloud-PlatformUI)
+## UI工程启动[Cloud-Admin-UI-V2][点击打开](https://github.com/wxiaoqi/Spring-Cloud-Platform-UI)
 
 ### 环境搭建(node 版本 > 8)
 ```
@@ -107,7 +108,7 @@ npm run build:prod
 
 ## 更多文档
 ```
-https://item.taobao.com/item.htm?id=587275617620
+https://item.taobao.com/item.htm?id=632347815039
 （2020年最新文档，淘宝购买，留言邮箱）
 ```
 
diff --git a/pom.xml b/pom.xml
index 54aee7f3..92446367 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.0.RELEASE</version>
+        <version>2.4.1</version>
     </parent>
     <properties>
         <docker.image.prefix>ace</docker.image.prefix>
@@ -27,7 +27,7 @@
         <mapper.version>3.4.0</mapper.version>
         <maven.compile.source>1.8</maven.compile.source>
         <maven.compile.target>1.8</maven.compile.target>
-        <boot.admin.client>2.1.2</boot.admin.client>
+        <boot.admin.client>2.4.0</boot.admin.client>
     </properties>
     <modules>
         <module>ace-gate</module>
@@ -78,7 +78,7 @@
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
-                <version>Hoxton.SR6</version>
+                <version>2020.0.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -90,7 +90,7 @@
             <dependency>
                 <groupId>com.alibaba.cloud</groupId>
                 <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>2.1.1.RELEASE</version>
+                <version>2.2.4.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>