配置文件拆分

yifu-auth/src/main/resources/application-dev.yml

+spring:
+  config:
+    #import:
+    #  - classpath: application-test.yml
+    activate:
+      on-profile: dev
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  redis:
+    host: 127.0.0.1
+    password: '@yf_2017'
+  cloud:
+    sentinel:
+      eager: true
+      transport:
+        dashboard: yifu-sentinel:5003
+  # 数据源
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: yf_zsk
+    url: jdbc:mysql://192.168.1.65:22306/yifu_upms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+  freemarker:
+    allow-request-override: false
+    allow-session-override: false
+    cache: true
+    charset: UTF-8
+    check-template-location: true
+    content-type: text/html
+    enabled: true
+    expose-request-attributes: false
+    expose-session-attributes: false
+    expose-spring-macro-helpers: true
+    prefer-file-system-access: true
+    suffix: .ftl
+    template-loader-path: classpath:/templates/

yifu-auth/src/main/resources/application-test.yml

+spring:
+  config:
+    #import:
+    #  - classpath: application-test.yml
+    activate:
+      on-profile: test
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  redis:
+    host: 192.168.1.65
+    port: 22379
+    password: '@yf_2017'
+  cloud:
+    sentinel:
+      eager: true
+      transport:
+        dashboard: yifu-sentinel:5003
+  # 数据源
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: yf_zsk
+    #url: jdbc:mysql://127.0.0.1:3306/yifu_upms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://192.168.1.65:22306/yifu_upms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+  freemarker:
+    allow-request-override: false
+    allow-session-override: false
+    cache: true
+    charset: UTF-8
+    check-template-location: true
+    content-type: text/html
+    enabled: true
+    expose-request-attributes: false
+    expose-session-attributes: false
+    expose-spring-macro-helpers: true
+    prefer-file-system-access: true
+    suffix: .ftl
+    template-loader-path: classpath:/templates/
\ No newline at end of file

yifu-auth/src/main/resources/application.yml

@@ -51,85 +51,4 @@ security:
 # Spring 相关
 spring:
   application:
-    name: @artifactId@
----
+    name: @artifactId@
\ No newline at end of file
-spring:
-  config:
-    #import:
-    #  - classpath: application-test.yml
-    activate:
-      on-profile: test
-  mvc:
-    pathmatch:
-      matching-strategy: ant_path_matcher
-  redis:
-    host: 192.168.1.65
-    port: 22379
-    password: '@yf_2017'
-  cloud:
-    sentinel:
-      eager: true
-      transport:
-        dashboard: yifu-sentinel:5003
-  # 数据源
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: yf_zsk
-    #url: jdbc:mysql://127.0.0.1:3306/yifu_upms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-    url: jdbc:mysql://192.168.1.65:22306/yifu_upms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-  freemarker:
-    allow-request-override: false
-    allow-session-override: false
-    cache: true
-    charset: UTF-8
-    check-template-location: true
-    content-type: text/html
-    enabled: true
-    expose-request-attributes: false
-    expose-session-attributes: false
-    expose-spring-macro-helpers: true
-    prefer-file-system-access: true
-    suffix: .ftl
-    template-loader-path: classpath:/templates/
-
----
-spring:
-  config:
-    #import:
-    #  - classpath: application-test.yml
-    activate:
-      on-profile: dev
-  mvc:
-    pathmatch:
-      matching-strategy: ant_path_matcher
-  redis:
-    host: 127.0.0.1
-    password: '@yf_2017'
-  cloud:
-    sentinel:
-      eager: true
-      transport:
-        dashboard: yifu-sentinel:5003
-  # 数据源
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: yf_zsk
-    url: jdbc:mysql://192.168.1.65:22306/yifu_upms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-  freemarker:
-    allow-request-override: false
-    allow-session-override: false
-    cache: true
-    charset: UTF-8
-    check-template-location: true
-    content-type: text/html
-    enabled: true
-    expose-request-attributes: false
-    expose-session-attributes: false
-    expose-spring-macro-helpers: true
-    prefer-file-system-access: true
-    suffix: .ftl
-    template-loader-path: classpath:/templates/

yifu-job/yifu-job-biz/src/main/resources/application-dev.yml

+# 数据源配置
+spring:
+  redis:
+    host: 127.0.0.1
+    password: '@yf_2017'
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: yf_zsk
+    url: jdbc:mysql://192.168.1.65:22306/yifu_job?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+  config:
+    activate:
+      on-profile: dev
+
+

yifu-job/yifu-job-biz/src/main/resources/application-test.yml

+# 数据源配置
+spring:
+  redis:
+    host: 127.0.0.1
+    password: '@yf_2017'
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: yf_zsk
+    url: jdbc:mysql://192.168.1.65:22306/yifu_job?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+  config:
+    activate:
+      on-profile: test
\ No newline at end of file

yifu-job/yifu-job-biz/src/main/resources/application.yml

@@ -79,37 +79,4 @@ springdoc:
     #分组名
     - group: job
       #按包路径匹配
-      packagesToScan: com.yifu.cloud.plus.v1.job.controller
----
+      packagesToScan: com.yifu.cloud.plus.v1.job.controller
\ No newline at end of file
-# 数据源配置
-spring:
-  redis:
-    host: 127.0.0.1
-    password: '@yf_2017'
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: yf_zsk
-    url: jdbc:mysql://192.168.1.65:22306/yifu_job?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-  config:
-    activate:
-      on-profile: test
-
----
-# 数据源配置
-spring:
-  redis:
-    host: 127.0.0.1
-    password: '@yf_2017'
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: yf_zsk
-    url: jdbc:mysql://192.168.1.65:22306/yifu_job?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-  config:
-    activate:
-      on-profile: dev
-
-

yifu-visual/yifu-codegen/src/main/resources/application-dev.yml

+# 数据源配置
+spring:
+  config:
+    activate:
+      on-profile: dev
+  redis:
+    host: 127.0.0.1
+    port: 6379
+    password: '@yf_2017'
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: yf_zsk
+    url: jdbc:mysql://192.168.1.65:22306/yifu_codegen?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+  web:
+    resources:
+      static-locations: classpath:/static/,classpath:/views/
+

yifu-visual/yifu-codegen/src/main/resources/application-test.yml

+# 数据源配置
+spring:
+  config:
+    activate:
+      on-profile: test
+  redis:
+    host: 192.168.1.65
+    port: 22379
+    password: '@yf_2017'
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: yf_zsk
+    url: jdbc:mysql://192.168.1.65:22306/yifu_codegen?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+  web:
+    resources:
+      static-locations: classpath:/static/,classpath:/views/
\ No newline at end of file

yifu-visual/yifu-codegen/src/main/resources/application.yml

@@ -40,44 +40,4 @@ springdoc:
     #分组名
     - group: codegen
       #按包路径匹配
-      packagesToScan: com.yifu.cloud.plus.v1.yifu.codegen.controller
----
+      packagesToScan: com.yifu.cloud.plus.v1.yifu.codegen.controller
\ No newline at end of file
-# 数据源配置
-spring:
-  config:
-    activate:
-      on-profile: test
-  redis:
-    host: 192.168.1.65
-    port: 22379
-    password: '@yf_2017'
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: yf_zsk
-    url: jdbc:mysql://192.168.1.65:22306/yifu_codegen?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-  web:
-    resources:
-      static-locations: classpath:/static/,classpath:/views/
-
----
-# 数据源配置
-spring:
-  config:
-    activate:
-      on-profile: dev
-  redis:
-    host: 127.0.0.1
-    port: 6379
-    password: '@yf_2017'
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: yf_zsk
-    url: jdbc:mysql://192.168.1.65:22306/yifu_codegen?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-  web:
-    resources:
-      static-locations: classpath:/static/,classpath:/views/
-