nacos配置修改

authentication/dependency-reduced-pom.xml

@@ -188,5 +188,17 @@
       <version>5.0.0</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.alibaba.cloud</groupId>
+      <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+      <version>2022.0.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.alibaba.cloud</groupId>
+      <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+      <version>2022.0.0.0</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>

authentication/src/main/resources/application-test.yml

@@ -1,23 +1,23 @@
 server:
   port: 9081
 spring:
-  redis:
-    redisson:
-      address: redis://172.24.144.218:6379
-      password: sxzgkj@2023
-
-  datasource:
-    url: jdbc:mysql://39.98.239.48:3366/platform?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
-    username: root
-    password: '@RqGHG#KZ*C9ytkQ'
-    driverClassName: com.mysql.cj.jdbc.Driver
+  cloud:
+    nacos:
+      server-addr: 172.24.144.223:8848
+      username: nacos
+      password: nacos
+      config:
+        file-extension: yaml
+        namespace: bb8f915c-82b0-4f0d-9e9e-03aa629f2d45
+        group: DEFAULT_GROUP
+      discovery:
+        namespace: bb8f915c-82b0-4f0d-9e9e-03aa629f2d45
+  config:
+    import:
+      - nacos:mysql
+      - nacos:redisson
+      - nacos:minio
 
 config:
   sso: 0
 
-
-minio:
-  url: http://test-api.baoxianzhanggui.com
-  access-key: N8hf40VDM3Uf2xJ5vnvE
-  secret-key: CDe1raroqIMo5R2KhHl6ZQbJOhdq0mrtCI78g3vq
-  bucket-name: jzg

authentication/src/main/resources/logback-spring.xml

@@ -20,13 +20,13 @@
 <!--    </appender>-->
 
     <!-- 排除启动日志 -->
-    <logger name="org.springframework.boot" level="WARN" additivity="false">
-        <appender-ref ref="STDOUT"/>
-    </logger>
+<!--    <logger name="org.springframework.boot" level="WARN" additivity="false">-->
+<!--        <appender-ref ref="STDOUT"/>-->
+<!--    </logger>-->
 
-    <logger name="org.springframework.context" level="WARN" additivity="false">
-        <appender-ref ref="STDOUT"/>
-    </logger>
+<!--    <logger name="org.springframework.context" level="WARN" additivity="false">-->
+<!--        <appender-ref ref="STDOUT"/>-->
+<!--    </logger>-->
 
     <!-- 控制台输出日志，非必须，可以根据需要选择性启用 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -37,7 +37,7 @@
 
     <!-- 输出到控制台 -->
     <root level="INFO">
-        <appender-ref ref="GELF"/>
+<!--        <appender-ref ref="GELF"/>-->
         <appender-ref ref="STDOUT"/>
     </root>
 </configuration>

gateway/src/main/java/com/jzg/GateWayApplication.java

@@ -3,7 +3,9 @@ package com.jzg;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
+@EnableDiscoveryClient
 @SpringBootApplication(exclude ={DataSourceAutoConfiguration.class},scanBasePackages = "com.jzg")
 public class GateWayApplication {
 

gateway/src/main/resources/application-test.yml

@@ -1,20 +1,32 @@
-
 spring:
   cloud:
+    nacos:
+      server-addr: 172.24.144.223:8848
+      username: nacos
+      password: nacos
+      config:
+        import-check:
+          enabled: false
+        file-extension: yaml
+        namespace: bb8f915c-82b0-4f0d-9e9e-03aa629f2d45
+        group: DEFAULT_GROUP
+      discovery:
+        namespace: bb8f915c-82b0-4f0d-9e9e-03aa629f2d45
+
     gateway:
       routes:
         - id: auth_route
-          uri: http://172.24.144.223:9081/
+          uri: lb://jzg-auth
           predicates:
             - Path=/auth/**
 
         - id: platform_route
-          uri: http://172.24.144.223:9083/
+          uri: lb://jzg-platform
           predicates:
             - Path=/userRole/**,/system/**,/file/**,/user/**,/esmInsCompany/**,/jyxConfig/**,/qrBarcode/**,/sysDept/**
 
         - id: tenant_route
-          uri: http://172.24.144.223:9084/
+          uri: lb://jzg-organization
           predicates:
             - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**,/sysOrganization/**,/activity/**,/message/**,/messageNotice/**,/poster/**
 

platform/src/main/resources/application-test.yml

@@ -1,30 +1,25 @@
 server:
   port: 9083
 spring:
-
-#  zipkin:
-#    base-url: http://192.168.0.250:9411
-#  sleuth:
-#    sampler:
-#      probability: 1.0
-  redis:
-    redisson:
-      address: redis://172.24.144.218:6379
-      password: sxzgkj@2023
-
-  datasource:
-      url: jdbc:mysql://39.98.239.48:3366/platform?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
-      username: root
-      password: '@RqGHG#KZ*C9ytkQ'
-      driverClassName: com.mysql.cj.jdbc.Driver
+  cloud:
+    nacos:
+      server-addr: 172.24.144.223:8848
+      username: nacos
+      password: nacos
+      config:
+        file-extension: yaml
+        namespace: bfe09cf4-508a-4443-acfa-b354be6f4bac
+        group: DEFAULT_GROUP
+      discovery:
+        namespace: ba488f58-c785-49b4-9c02-b5d9b8a965a5
+  config:
+    import:
+      - nacos:mysql
+      - nacos:redisson
+      - nacos:minio
 
 config:
   sso: 1
 
 
-minio:
-  url: http://test-api.baoxianzhanggui.com
-  access-key: N8hf40VDM3Uf2xJ5vnvE
-  secret-key: CDe1raroqIMo5R2KhHl6ZQbJOhdq0mrtCI78g3vq
-  bucket-name: jzg
 

tenant/organization/src/main/java/com/jzg/organization/OrganizationApplication.java

@@ -1,9 +1,7 @@
 package com.jzg.organization;
 
 import org.mybatis.spring.annotation.MapperScan;
-import org.redisson.spring.starter.RedissonAutoConfiguration;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.ComponentScan;

tenant/organization/src/main/resources/application-test.yml

@@ -1,62 +1,23 @@
 server:
   port: 9084
 spring:
-  redis:
-    redisson:
-      address: redis://172.24.144.218:6379
-      password: sxzgkj@2023
-  main:
-    allow-circular-references: true
-  datasource:
-      url: jdbc:mysql://39.98.239.48:3366/platform?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
-      username: root
-      password: '@RqGHG#KZ*C9ytkQ'
-      driverClassName: com.mysql.cj.jdbc.Driver
-
-mybatis-plus:
-  mapper-locations: classpath*:/mapper/*Mapper.xml
-  global-config:
-    db-config:
-      logic-delete-field: is_delete
-      logic-delete-value: 1
-      logic-not-delete-value: 0
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  cloud:
+    nacos:
+      server-addr: 172.24.144.223:8848
+      username: nacos
+      password: nacos
+      config:
+        file-extension: yaml
+        namespace: bb8f915c-82b0-4f0d-9e9e-03aa629f2d45
+        group: DEFAULT_GROUP
+      discovery:
+        namespace: bb8f915c-82b0-4f0d-9e9e-03aa629f2d45
+  config:
+    import:
+      - nacos:mysql
+      - nacos:redisson
+      - nacos:minio
+      - nacos:rocketmq
 
 config:
   sso: 1
-
-minio:
-  url: http://test-api.baoxianzhanggui.com
-  access-key: N8hf40VDM3Uf2xJ5vnvE
-  secret-key: CDe1raroqIMo5R2KhHl6ZQbJOhdq0mrtCI78g3vq
-  bucket-name: jzg
-
-
-rocketmq:
-  consumer:
-    group: springboot_consumer_group
-    # 一次拉取消息最大值，注意是拉取消息的最大值而非消费最大值
-    pull-batch-size: 10
-  name-server: 39.98.199.213:9876
-  producer:
-    # 发送同一类消息的设置为同一个group，保证唯一
-    group: springboot_producer_group
-    # 发送消息超时时间，默认3000
-    sendMessageTimeout: 10000
-    # 发送消息失败重试次数，默认2
-    retryTimesWhenSendFailed: 2
-    # 异步消息重试此处，默认2
-    retryTimesWhenSendAsyncFailed: 2
-    # 消息最大长度，默认1024 * 1024 * 4(默认4M)
-    maxMessageSize: 4096
-    # 压缩消息阈值，默认4k(1024 * 4)
-    compressMessageBodyThreshold: 4096
-    # 是否在内部发送失败时重试另一个broker，默认false
-    retryNextServer: false
-  enhance:
-    # 启动隔离，用于激活配置类EnvironmentIsolationConfig
-    # 启动后会自动在topic上拼接激活的配置文件，达到自动隔离的效果
-    enabledIsolation: true
-    # 隔离环境名称，拼接到topic后，topic_dev，默认空字符串
-    environment: dev