Merge remote-tracking branch 'origin/main'

xueyi-auth/src/main/resources/bootstrap.yml

@@ -26,3 +26,4 @@ spring:
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
           - application-secret-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - application-datasource-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

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

@@ -27,6 +27,7 @@ spring:
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
           - application-secret-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - application-datasource-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
     sentinel:
       # 取消控制台懒加载
       eager: true

xueyi-modules/xueyi-file/src/main/resources/bootstrap.yml

@@ -29,4 +29,5 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-          - application-secret-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - application-secret-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - application-datasource-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

xueyi-modules/xueyi-modules-auth/src/main/resources/bootstrap-prod.yml

@@ -1,33 +0,0 @@
-# Tomcat
-server:
-  port: 9700
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: xueyi-message
-  profiles:
-    # 环境配置
-    active:
-  servlet:
-    multipart:
-      max-request-size: 20MB
-      max-file-size: 100MB
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-#        server-addr: 172.17.0.1:18848
-        server-addr: 127.0.0.1:18848
-      config:
-        # 配置中心地址
-#        server-addr: 172.17.0.1:18848
-        server-addr: 127.0.0.1:18848
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-          - application-secret-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-          - application-datasource-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}