admin 使用 nacos 配置

admin/pom.xml

@@ -144,6 +144,10 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.alibaba.nacos</groupId>

admin/src/main/resources/application-dev-full.yml

@@ -0,0 +1,56 @@
+app:
+  gatewayAdminUrl: http://192.168.0.181:16000
+dubbo:
+  application:
+    register-consumer: false
+  registry:
+    address: N/A
+server:
+  port: 6010
+spring:
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  cloud:
+    discovery:
+      enabled: true
+    nacos:
+      discovery:
+        server-addr: 192.168.0.209
+        username: nacos
+        password: Test_123456
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.zaxxer.hikari.HikariDataSource
+    hikari:
+      minimum-idle: 5
+      maximum-pool-size: 10
+      auto-commit: true
+      idle-timeout: 30000
+      pool-name: EvaluationHikariCP
+      max-lifetime: 1800000
+      connection-timeout: 30000
+      connection-test-query: SELECT 1
+    url: jdbc:mysql://192.168.0.209:3306/tnb_account_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
+    username: test
+    password: Test_123456
+  data:
+    mongodb:
+      uri: mongodb://test:Test_123456@192.168.0.209:27017/tnb_content_rdb?replicaSet=mymongo&authSource=admin&readPreference=secondaryPreferred&connectTimeoutMS=300000
+    redis:
+      database: 0
+      host: 192.168.0.209
+      port: 6379
+      password: Test_123456
+  rabbitmq:
+    host: 192.168.0.209
+    port: 5672
+    virtual-host: /
+    username: test
+    password: Test_123456
+mybatis:
+  configuration:
+    map-underscore-to-camel-case: true
+  #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath*:mapper/**/**.xml
+  type-aliases-package: cn.reghao.tnb.admin.model.po

admin/src/main/resources/application-dev.yml

@@ -1,32 +1,12 @@
-app:
-  gatewayAdminUrl: http://192.168.0.181:16000
-dubbo:
-  registry:
-    address: N/A
 spring:
+  config:
+    import:
+      - nacos:${spring.application.name}-${spring.profiles.active}
   cloud:
-    discovery:
-      enabled: true
     nacos:
-      discovery:
+      config:
         server-addr: 192.168.0.209
+        group: DEFAULT_GROUP
+        file-extension: yaml
         username: nacos
-        password: Test_123456
-  datasource:
-    url: jdbc:mysql://192.168.0.209:3306/tnb_account_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
-    username: test
-    password: Test_123456
-  data:
-    mongodb:
-      uri: mongodb://test:Test_123456@192.168.0.209:27017/tnb_content_rdb?replicaSet=mymongo&authSource=admin&readPreference=secondaryPreferred&connectTimeoutMS=300000
-    redis:
-      database: 0
-      host: 192.168.0.209
-      port: 6379
-      password: Test_123456
-  rabbitmq:
-    host: 192.168.0.209
-    port: 5672
-    virtual-host: /
-    username: test
-    password: Test_123456
+        password: Test_123456

admin/src/main/resources/application-test-full.yml

@@ -0,0 +1,32 @@
+app:
+  gatewayAdminUrl: http://192.168.0.181:16000
+dubbo:
+  registry:
+    address: N/A
+spring:
+  cloud:
+    discovery:
+      enabled: true
+    nacos:
+      discovery:
+        server-addr: 192.168.0.209
+        username: nacos
+        password: Test_123456
+  datasource:
+    url: jdbc:mysql://192.168.0.209:3306/tnb_account_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
+    username: test
+    password: Test_123456
+  data:
+    mongodb:
+      uri: mongodb://test:Test_123456@192.168.0.209:27017/tnb_content_rdb?replicaSet=mymongo&authSource=admin&readPreference=secondaryPreferred&connectTimeoutMS=300000
+    redis:
+      database: 0
+      host: 192.168.0.209
+      port: 6379
+      password: Test_123456
+  rabbitmq:
+    host: 192.168.0.209
+    port: 5672
+    virtual-host: /
+    username: test
+    password: Test_123456

admin/src/main/resources/application.yml

@@ -1,52 +1,8 @@
-dubbo:
-  application:
-    register-consumer: false
-server:
-  port: 6010
-  tomcat:
-    max-http-form-post-size: 4MB
-  servlet:
-    session:
-      cookie:
-        secure: true
-        http-only: true
-        # org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getSessionTimeoutInMinutes 获取超时时间
-        # 两个请求间隔的最大时间, 超过此时间则会话过期
-      timeout: 10m
 spring:
-  threads:
-    virtual:
-      enabled: true
   application:
     name: admin-service
   profiles:
     active: @profile.active@
-  mvc:
-    pathmatch:
-      matching-strategy: ant_path_matcher
-  servlet:
-    multipart:
-      max-request-size: 5MB
-      max-file-size: 5MB
-  session:
-    store-type: redis
-    redis:
-      namespace: tnb:auth:session
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    type: com.zaxxer.hikari.HikariDataSource
-    hikari:
-      minimum-idle: 5
-      maximum-pool-size: 10
-      auto-commit: true
-      idle-timeout: 30000
-      pool-name: EvaluationHikariCP
-      max-lifetime: 1800000
-      connection-timeout: 30000
-      connection-test-query: SELECT 1
-mybatis:
-  configuration:
-    map-underscore-to-camel-case: true
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  mapper-locations: classpath*:mapper/**/**.xml
-  type-aliases-package: cn.reghao.tnb.admin.model.po
+  threads:
+    virtual:
+      enabled: true