Merge branch 'dev/baseUp' into dev/icssNCD

admin-service/pom.xml

@@ -49,7 +49,7 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-server</artifactId>
-            <version>2.0.2</version>
+            <version>2.1.3</version>
         </dependency>
 
         <dependency>

admin-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

aipt-service/pom.xml

@@ -100,6 +100,17 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
         <!-- mq -->
@@ -129,6 +140,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->

aipt-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

aipt-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,7 +46,7 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("root");
         dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-log?useUnicode=true&characterEncoding=utf-8");

bi-service/pom.xml

@@ -100,6 +100,17 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
         <!-- mq -->
@@ -129,6 +140,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->

bi-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

bi-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,7 +46,7 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("root");
         dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-log?useUnicode=true&characterEncoding=utf-8");

common/pom.xml

@@ -23,21 +23,21 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.8</version>
+            <version>3.8.1</version>
             <!--<scope>provided</scope>-->
         </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.2</version>
+            <version>1.18.6</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>5.0.9.RELEASE</version>
+            <version>5.1.6.RELEASE</version>
             <scope>provided</scope>
         </dependency>
 
@@ -51,21 +51,21 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
-            <version>5.0.8.RELEASE</version>
+            <version>5.1.4.RELEASE</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.security.oauth</groupId>
             <artifactId>spring-security-oauth2</artifactId>
-            <version>2.3.3.RELEASE</version>
+            <version>2.3.5.RELEASE</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.25</version>
+            <version>1.7.26</version>
             <scope>provided</scope>
         </dependency>
 
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.54</version>
+            <version>1.2.56</version>
             <scope>compile</scope>
         </dependency>
 
@@ -87,13 +87,13 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>

config-server/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

config-server/src/main/resources/shared/aipt-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/aipt-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/aipt-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/aipt-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/bi-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/bi-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/bi-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/bi-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/diagbotman-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-diagbotman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/diagbotman-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-diagbotman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/diagbotman-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-diagbotman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/diagbotman-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-diagbotman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/feedback-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/feedback-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/feedback-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/feedback-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/gateway-service-dev.yml

@@ -33,42 +33,42 @@ spring:
         predicates:
         - Path=/api/user/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: logger-service
         uri: lb://logger-service
         predicates:
         - Path=/api/log/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: bi-service
         uri: lb://bi-service
         predicates:
         - Path=/api/bi/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: diagbotman-service
         uri: lb://diagbotman-service
         predicates:
         - Path=/api/diagbotman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: feedback-service
         uri: lb://feedback-service
         predicates:
         - Path=/api/feedback/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledge-service
         uri: lb://knowledge-service
         predicates:
         - Path=/api/knowledge/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssold
         uri: http://192.168.2.165:8080
@@ -81,42 +81,42 @@ spring:
         predicates:
         - Path=/api/triage/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icss-service
         uri: lb://icss-service
         predicates:
         - Path=/api/icss/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssman-service
         uri: lb://icssman-service
         predicates:
         - Path=/api/icssman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledgeman-service
         uri: lb://knowledgeman-service
         predicates:
         - Path=/api/knowledgeman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: tran-service
         uri: lb://tran-service
         predicates:
         - Path=/api/tran/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: aipt-service
         uri: lb://aipt-service
         predicates:
         - Path=/api/aipt/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
 
 server:

config-server/src/main/resources/shared/gateway-service-local.yml

@@ -26,6 +26,10 @@ spring:
           destination: myLog
       #          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
     gateway:
+      discovery:
+        locator:
+          enabled: false
+          lowerCaseServiceId: true
       default-filters:
       routes:
       - id: user-service
@@ -33,42 +37,42 @@ spring:
         predicates:
         - Path=/api/user/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: logger-service
         uri: lb://logger-service
         predicates:
         - Path=/api/log/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: bi-service
         uri: lb://bi-service
         predicates:
         - Path=/api/bi/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: diagbotman-service
         uri: lb://diagbotman-service
         predicates:
         - Path=/api/diagbotman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: feedback-service
         uri: lb://feedback-service
         predicates:
         - Path=/api/feedback/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledge-service
         uri: lb://knowledge-service
         predicates:
         - Path=/api/knowledge/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssold
         uri: http://192.168.2.165:8080
@@ -81,42 +85,42 @@ spring:
         predicates:
         - Path=/api/triage/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icss-service
         uri: lb://icss-service
         predicates:
         - Path=/api/icss/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssman-service
         uri: lb://icssman-service
         predicates:
         - Path=/api/icssman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledgeman-service
         uri: lb://knowledgeman-service
         predicates:
         - Path=/api/knowledgeman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: tran-service
         uri: lb://tran-service
         predicates:
         - Path=/api/tran/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: aipt-service
         uri: lb://aipt-service
         predicates:
         - Path=/api/aipt/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
 
 server:

config-server/src/main/resources/shared/gateway-service-pro.yml

@@ -33,42 +33,42 @@ spring:
         predicates:
         - Path=/api/user/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: logger-service
         uri: lb://logger-service
         predicates:
         - Path=/api/log/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: bi-service
         uri: lb://bi-service
         predicates:
         - Path=/api/bi/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: diagbotman-service
         uri: lb://diagbotman-service
         predicates:
         - Path=/api/diagbotman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: feedback-service
         uri: lb://feedback-service
         predicates:
         - Path=/api/feedback/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledge-service
         uri: lb://knowledge-service
         predicates:
         - Path=/api/knowledge/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssold
         uri: http://192.168.2.165:8080
@@ -81,42 +81,42 @@ spring:
         predicates:
         - Path=/api/triage/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icss-service
         uri: lb://icss-service
         predicates:
         - Path=/api/icss/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssman-service
         uri: lb://icssman-service
         predicates:
         - Path=/api/icssman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledgeman-service
         uri: lb://knowledgeman-service
         predicates:
         - Path=/api/knowledgeman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: tran-service
         uri: lb://tran-service
         predicates:
         - Path=/api/tran/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: aipt-service
         uri: lb://aipt-service
         predicates:
         - Path=/api/aipt/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
 
 server:

config-server/src/main/resources/shared/gateway-service-test.yml

@@ -33,42 +33,42 @@ spring:
         predicates:
         - Path=/api/user/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: logger-service
         uri: lb://logger-service
         predicates:
         - Path=/api/log/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: bi-service
         uri: lb://bi-service
         predicates:
         - Path=/api/bi/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: diagbotman-service
         uri: lb://diagbotman-service
         predicates:
         - Path=/api/diagbotman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: feedback-service
         uri: lb://feedback-service
         predicates:
         - Path=/api/feedback/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledge-service
         uri: lb://knowledge-service
         predicates:
         - Path=/api/knowledge/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssold
         uri: http://192.168.2.164:8080
@@ -81,49 +81,49 @@ spring:
         predicates:
         - Path=/api/triage/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icss-service
         uri: lb://icss-service
         predicates:
         - Path=/api/icss/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssman-service
         uri: lb://icssman-service
         predicates:
         - Path=/api/icssman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledgeman-service
         uri: lb://knowledgeman-service
         predicates:
         - Path=/api/knowledgeman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: tran-service
         uri: lb://tran-service
         predicates:
         - Path=/api/tran/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: aipt-service
         uri: lb://aipt-service
         predicates:
         - Path=/api/aipt/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssyz-service
         uri: lb://icss-service
         predicates:
         - Path=/api/icssyz/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
 
 server:

config-server/src/main/resources/shared/icss-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/icss-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/icss-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/icss-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/icssman-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-icssman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/icssman-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-icssman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/icssman-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-icssman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/icssman-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-icssman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/knowledge-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.235:3306/diagbot-med?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/knowledge-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.235:3306/diagbot-med?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/knowledge-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/knowledge-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/knowledgeman-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.235:3306/diagbot-med?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/knowledgeman-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.235:3306/diagbot-med?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/knowledgeman-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/knowledgeman-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.235:3306/diagbot-med-test?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/logger-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/logger-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/logger-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/logger-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/tran-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-tran?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/tran-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-tran?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/tran-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-tran?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/tran-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-tran?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/triage-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-triage?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/triage-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-triage?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/triage-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-triage?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/triage-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-triage?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/uaa-service-dev.yml

@@ -2,8 +2,8 @@
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/uaa-service-local.yml

@@ -2,8 +2,8 @@
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/uaa-service-pro.yml

@@ -2,8 +2,8 @@
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/uaa-service-test.yml

@@ -2,8 +2,8 @@
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/user-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/user-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/user-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/user-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

diagbotman-service/pom.xml

@@ -100,6 +100,17 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
         <!-- mq -->
@@ -129,6 +140,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->

diagbotman-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

diagbotman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,7 +46,7 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
         dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-diagbotman?useUnicode=true&characterEncoding=utf-8&useSSL=false");

eureka-server/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

feedback-service/pom.xml

@@ -99,8 +99,18 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+        </dependency>
         <!-- mq -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -127,7 +137,11 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-plus-boot-starter.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
         </dependency>
         <!-- mybatis-plus end -->
 

feedback-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

feedback-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,7 +46,7 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("root");
         dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-log?useUnicode=true&characterEncoding=utf-8");

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

@@ -10,6 +10,8 @@ spring:
         serviceId: config-server
   profiles:
       active: local
+  main:
+    allow-bean-definition-overriding: true
 
 eureka:
   client:

gateway-service/src/main/resources/logback-spring.xml

@@ -177,7 +177,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
         <!--<connectionSource-->
                 <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-            <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+            <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
             <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
             <!--<user>root</user>-->
             <!--<password>a123456789</password>-->

icss-service/pom.xml

@@ -100,6 +100,17 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
         <!-- mq -->
@@ -129,6 +140,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->
@@ -159,19 +175,6 @@
 			<artifactId>commons-io</artifactId>
 			<version>2.4</version>
 		</dependency>
-		<dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-thymeleaf</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-devtools</artifactId>
-        <optional>true</optional>
-    </dependency>
     </dependencies>
 
     <build>

icss-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

icss-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,7 +46,7 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
         dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-icssncd?useUnicode=true&characterEncoding=utf-8");

icssman-service/pom.xml

@@ -100,6 +100,17 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
         <!-- mq -->
@@ -129,6 +140,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->

icssman-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

icssman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,7 +46,7 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
         dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-icssman?useUnicode=true&characterEncoding=utf-8");

knowledge-service/pom.xml

@@ -99,6 +99,17 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
         <!-- mq -->
@@ -127,6 +138,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->

knowledge-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

knowledge-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,7 +46,7 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("diagbot@20180822");
         dsc.setUrl("jdbc:mysql://192.168.2.235:3306/diagbot-med?useUnicode=true&characterEncoding=utf-8");

knowledgeman-service/pom.xml

@@ -99,6 +99,17 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
         <!-- mq -->
@@ -127,6 +138,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->

knowledgeman-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

knowledgeman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,7 +46,7 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("root");
         dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-log?useUnicode=true&characterEncoding=utf-8");

log-service/pom.xml

@@ -104,6 +104,17 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
         <!-- mq -->
@@ -140,6 +151,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->

log-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

log-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,7 +46,7 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
         dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf-8&useSSL=false");

monitor-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

pom.xml

@@ -34,7 +34,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.5.RELEASE</version>
+        <version>2.1.3.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -42,13 +42,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Finchley.SR1</spring-cloud.version>
-        <mybatis-plus-boot-starter.version>3.0.6</mybatis-plus-boot-starter.version>
-        <mybatis-spring-boot.version>1.3.2</mybatis-spring-boot.version>
-        <druid.version>1.1.9</druid.version>
+        <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
+        <mybatis-plus-boot-starter.version>3.0.7.1</mybatis-plus-boot-starter.version>
+        <mybatis-spring-boot.version>2.0.0</mybatis-spring-boot.version>
+        <druid.version>1.1.14</druid.version>
         <swagger.version>2.9.2</swagger.version>
         <!--<swagger-bootstrap.version>1.9.1</swagger-bootstrap.version>-->
         <logstash.version>5.2</logstash.version>
+        <spring-security-oauth2.version>2.1.3.RELEASE</spring-security-oauth2.version>
         <docker-maven-plugin.version>1.1.1</docker-maven-plugin.version>
         <docker.image.prefix>192.168.2.236:5000/diagbotcloud</docker.image.prefix>
     </properties>
@@ -81,6 +82,12 @@
                 <artifactId>mybatis-plus-boot-starter</artifactId>
                 <version>${mybatis-plus-boot-starter.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-generator</artifactId>
+                <version>${mybatis-plus-boot-starter.version}</version>
+            </dependency>
             <!-- mybatis-plus end -->
 
             <!-- 阿里巴巴druid数据库连接池 -->
@@ -134,6 +141,11 @@
                 <version>${logstash.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.springframework.security.oauth.boot</groupId>
+                <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                <version>${spring-security-oauth2.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

tran-service/pom.xml

@@ -100,6 +100,17 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
         <!-- mq -->
@@ -129,6 +140,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->

tran-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

tran-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,7 +46,7 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
         dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-tran?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false");

triage-service/pom.xml

@@ -100,6 +100,17 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
         <!-- mq -->
@@ -129,6 +140,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->

triage-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

triage-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,7 +46,7 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
         dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-triage?useUnicode=true&characterEncoding=utf-8&useSSL=false");

uaa-service/pom.xml

@@ -44,9 +44,21 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
+        <!--security-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
         <dependency>
@@ -81,6 +93,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->