From 37f08f6deffd8f9ab55c60bf7ff7d74d3a20848f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Wed, 13 Apr 2022 12:43:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=9D=A2=E5=8D=87=E7=BA=A7=E9=80=82?= =?UTF-8?q?=E9=85=8D=20SpringCloudAlibaba=202021.0.1.0=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=B9=E5=BC=8F=E5=A4=A7=E6=9B=B4=E6=94=B9=20nacos?= =?UTF-8?q?=20client=20=E9=99=8D=E7=BA=A7=202.0.2=20=E9=AB=98=E4=BA=8E?= =?UTF-8?q?=E6=AD=A4=E7=89=88=E6=9C=AC=E4=BC=9A=E6=9C=89=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E4=B8=8D=E5=BD=B1=E5=93=8Dnacos=E6=9C=8D=E5=8A=A1=E7=AB=AF?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20nacos=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=20application.yml=20=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E4=B8=BA=20application-common.yml=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...application.yml => application-common.yml} | 0 pom.xml | 6 +-- .../{bootstrap.yml => application.yml} | 13 ++----- ruoyi-common/ruoyi-common-alibaba-bom/pom.xml | 4 +- ruoyi-common/ruoyi-common-dubbo/pom.xml | 5 +++ ruoyi-common/ruoyi-common-job/pom.xml | 7 ++++ .../{bootstrap.yml => application.yml} | 13 ++----- .../src/main/resources/application.yml | 18 ++++----- .../src/main/resources/bootstrap.yml | 38 ------------------- .../src/main/resources/application.yml | 32 ++++++++++++++++ .../src/main/resources/bootstrap.yml | 38 ------------------- .../src/main/resources/application.yml | 32 ++++++++++++++++ .../src/main/resources/bootstrap.yml | 38 ------------------- .../src/main/resources/application.yml | 32 ++++++++++++++++ .../src/main/resources/bootstrap.yml | 38 ------------------- .../src/main/resources/application.yml | 34 ++++++++++++++++- .../{bootstrap.yml => application.yml} | 13 ++----- .../{bootstrap.yml => application.yml} | 16 +++----- .../{bootstrap.yml => application.yml} | 16 +++----- sql/ry-config.sql | 4 +- 20 files changed, 175 insertions(+), 222 deletions(-) rename config/dev/{application.yml => application-common.yml} (100%) rename ruoyi-auth/src/main/resources/{bootstrap.yml => application.yml} (62%) rename ruoyi-gateway/src/main/resources/{bootstrap.yml => application.yml} (64%) rename ruoyi-visual/ruoyi-doc/src/main/resources/bootstrap.yml => ruoyi-modules/ruoyi-gen/src/main/resources/application.yml (58%) delete mode 100644 ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml create mode 100644 ruoyi-modules/ruoyi-job/src/main/resources/application.yml delete mode 100644 ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml create mode 100644 ruoyi-modules/ruoyi-resource/src/main/resources/application.yml delete mode 100644 ruoyi-modules/ruoyi-resource/src/main/resources/bootstrap.yml create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/application.yml delete mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml rename ruoyi-visual/ruoyi-monitor/src/main/resources/{bootstrap.yml => application.yml} (62%) rename ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/{bootstrap.yml => application.yml} (58%) rename ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/{bootstrap.yml => application.yml} (67%) diff --git a/config/dev/application.yml b/config/dev/application-common.yml similarity index 100% rename from config/dev/application.yml rename to config/dev/application-common.yml diff --git a/pom.xml b/pom.xml index ac7fae80..9276ef9f 100644 --- a/pom.xml +++ b/pom.xml @@ -265,11 +265,7 @@ pom - - - org.springframework.cloud - spring-cloud-starter-bootstrap - + diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/application.yml similarity index 62% rename from ruoyi-auth/src/main/resources/bootstrap.yml rename to ruoyi-auth/src/main/resources/application.yml index 3263cb61..55046dfe 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/application.yml @@ -4,9 +4,6 @@ server: # Spring spring: - main: - # 此配置禁止放入 nacos 优先级不够 - allow-circular-references: true application: # 应用名称 name: ruoyi-auth @@ -28,9 +25,7 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - data-id: application.${spring.cloud.nacos.config.file-extension} - refresh: true + config: + import: + - optional:nacos:application-common.yml + - optional:nacos:${spring.application.name}.yml diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml index d1967e6c..1a6bdb36 100644 --- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml @@ -14,14 +14,14 @@ - 2021.1 + 2021.0.1.0 3.1.1 1.8.3 1.6 0.8.0 2.2.1 1.1.0 - 2.0.4 + 2.0.2 1.4.2 3.0.7 1.0.11 diff --git a/ruoyi-common/ruoyi-common-dubbo/pom.xml b/ruoyi-common/ruoyi-common-dubbo/pom.xml index 2531ef06..2fdfa71e 100644 --- a/ruoyi-common/ruoyi-common-dubbo/pom.xml +++ b/ruoyi-common/ruoyi-common-dubbo/pom.xml @@ -21,6 +21,11 @@ ruoyi-common-core + + org.springframework.cloud + spring-cloud-context + + org.apache.dubbo dubbo-spring-boot-starter diff --git a/ruoyi-common/ruoyi-common-job/pom.xml b/ruoyi-common/ruoyi-common-job/pom.xml index 1349f691..94de9979 100644 --- a/ruoyi-common/ruoyi-common-job/pom.xml +++ b/ruoyi-common/ruoyi-common-job/pom.xml @@ -16,6 +16,12 @@ + + + org.springframework.boot + spring-boot-autoconfigure + + com.xuxueli @@ -27,5 +33,6 @@ lombok + diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/application.yml similarity index 64% rename from ruoyi-gateway/src/main/resources/bootstrap.yml rename to ruoyi-gateway/src/main/resources/application.yml index 3fa1eaf1..08bd112a 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/application.yml @@ -6,9 +6,6 @@ server: # Spring spring: - main: - # 此配置禁止放入 nacos 优先级不够 - allow-circular-references: true application: # 应用名称 name: ruoyi-gateway @@ -30,9 +27,7 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - data-id: application.${spring.cloud.nacos.config.file-extension} - refresh: true + config: + import: + - optional:nacos:application-common.yml + - optional:nacos:${spring.application.name}.yml diff --git a/ruoyi-visual/ruoyi-doc/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/application.yml similarity index 58% rename from ruoyi-visual/ruoyi-doc/src/main/resources/bootstrap.yml rename to ruoyi-modules/ruoyi-gen/src/main/resources/application.yml index 3df0dd4b..a6761d83 100644 --- a/ruoyi-visual/ruoyi-doc/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/application.yml @@ -1,15 +1,12 @@ # Tomcat server: - port: 18000 + port: 9202 # Spring spring: - main: - # 此配置禁止放入 nacos 优先级不够 - allow-circular-references: true application: # 应用名称 - name: ruoyi-doc + name: ruoyi-gen profiles: # 环境配置 active: @profiles.active@ @@ -28,9 +25,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - data-id: application.${spring.cloud.nacos.config.file-extension} - refresh: true + config: + import: + - optional:nacos:application-common.yml + - optional:nacos:datasource.yml + - optional:nacos:${spring.application.name}.yml diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml deleted file mode 100644 index 8f2ef66e..00000000 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,38 +0,0 @@ -# Tomcat -server: - port: 9202 - -# Spring -spring: - main: - # 此配置禁止放入 nacos 优先级不够 - allow-circular-references: true - application: - # 应用名称 - name: ruoyi-gen - profiles: - # 环境配置 - active: @profiles.active@ - ---- # nacos 配置 -spring: - cloud: - nacos: - # nacos 服务地址 - server-addr: @nacos.server@ - discovery: - # 注册组 - group: @nacos.discovery.group@ - namespace: ${spring.profiles.active} - config: - # 配置组 - group: @nacos.config.group@ - namespace: ${spring.profiles.active} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - data-id: application.${spring.cloud.nacos.config.file-extension} - refresh: true - - data-id: datasource.${spring.cloud.nacos.config.file-extension} - refresh: true diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/application.yml b/ruoyi-modules/ruoyi-job/src/main/resources/application.yml new file mode 100644 index 00000000..5d5b2d77 --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/resources/application.yml @@ -0,0 +1,32 @@ +# Tomcat +server: + port: 9203 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-job + profiles: + # 环境配置 + active: @profiles.active@ + +--- # nacos 配置 +spring: + cloud: + nacos: + # nacos 服务地址 + server-addr: @nacos.server@ + discovery: + # 注册组 + group: @nacos.discovery.group@ + namespace: ${spring.profiles.active} + config: + # 配置组 + group: @nacos.config.group@ + namespace: ${spring.profiles.active} + config: + import: + - optional:nacos:application-common.yml + - optional:nacos:datasource.yml + - optional:nacos:${spring.application.name}.yml diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml deleted file mode 100644 index d1b24675..00000000 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,38 +0,0 @@ -# Tomcat -server: - port: 9203 - -# Spring -spring: - main: - # 此配置禁止放入 nacos 优先级不够 - allow-circular-references: true - application: - # 应用名称 - name: ruoyi-job - profiles: - # 环境配置 - active: @profiles.active@ - ---- # nacos 配置 -spring: - cloud: - nacos: - # nacos 服务地址 - server-addr: @nacos.server@ - discovery: - # 注册组 - group: @nacos.discovery.group@ - namespace: ${spring.profiles.active} - config: - # 配置组 - group: @nacos.config.group@ - namespace: ${spring.profiles.active} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - data-id: application.${spring.cloud.nacos.config.file-extension} - refresh: true - - data-id: datasource.${spring.cloud.nacos.config.file-extension} - refresh: true diff --git a/ruoyi-modules/ruoyi-resource/src/main/resources/application.yml b/ruoyi-modules/ruoyi-resource/src/main/resources/application.yml new file mode 100644 index 00000000..0a843837 --- /dev/null +++ b/ruoyi-modules/ruoyi-resource/src/main/resources/application.yml @@ -0,0 +1,32 @@ +# Tomcat +server: + port: 9300 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-resource + profiles: + # 环境配置 + active: @profiles.active@ + +--- # nacos 配置 +spring: + cloud: + nacos: + # nacos 服务地址 + server-addr: @nacos.server@ + discovery: + # 注册组 + group: @nacos.discovery.group@ + namespace: ${spring.profiles.active} + config: + # 配置组 + group: @nacos.config.group@ + namespace: ${spring.profiles.active} + config: + import: + - optional:nacos:application-common.yml + - optional:nacos:datasource.yml + - optional:nacos:${spring.application.name}.yml diff --git a/ruoyi-modules/ruoyi-resource/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-resource/src/main/resources/bootstrap.yml deleted file mode 100644 index 192c352b..00000000 --- a/ruoyi-modules/ruoyi-resource/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,38 +0,0 @@ -# Tomcat -server: - port: 9300 - -# Spring -spring: - main: - # 此配置禁止放入 nacos 优先级不够 - allow-circular-references: true - application: - # 应用名称 - name: ruoyi-resource - profiles: - # 环境配置 - active: @profiles.active@ - ---- # nacos 配置 -spring: - cloud: - nacos: - # nacos 服务地址 - server-addr: @nacos.server@ - discovery: - # 注册组 - group: @nacos.discovery.group@ - namespace: ${spring.profiles.active} - config: - # 配置组 - group: @nacos.config.group@ - namespace: ${spring.profiles.active} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - data-id: application.${spring.cloud.nacos.config.file-extension} - refresh: true - - data-id: datasource.${spring.cloud.nacos.config.file-extension} - refresh: true diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/application.yml b/ruoyi-modules/ruoyi-system/src/main/resources/application.yml new file mode 100644 index 00000000..e2ec8528 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/application.yml @@ -0,0 +1,32 @@ +# Tomcat +server: + port: 9201 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-system + profiles: + # 环境配置 + active: @profiles.active@ + +--- # nacos 配置 +spring: + cloud: + nacos: + # nacos 服务地址 + server-addr: @nacos.server@ + discovery: + # 注册组 + group: @nacos.discovery.group@ + namespace: ${spring.profiles.active} + config: + # 配置组 + group: @nacos.config.group@ + namespace: ${spring.profiles.active} + config: + import: + - optional:nacos:application-common.yml + - optional:nacos:datasource.yml + - optional:nacos:${spring.application.name}.yml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml deleted file mode 100644 index 9d85dc95..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,38 +0,0 @@ -# Tomcat -server: - port: 9201 - -# Spring -spring: - main: - # 此配置禁止放入 nacos 优先级不够 - allow-circular-references: true - application: - # 应用名称 - name: ruoyi-system - profiles: - # 环境配置 - active: @profiles.active@ - ---- # nacos 配置 -spring: - cloud: - nacos: - # nacos 服务地址 - server-addr: @nacos.server@ - discovery: - # 注册组 - group: @nacos.discovery.group@ - namespace: ${spring.profiles.active} - config: - # 配置组 - group: @nacos.config.group@ - namespace: ${spring.profiles.active} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - data-id: application.${spring.cloud.nacos.config.file-extension} - refresh: true - - data-id: datasource.${spring.cloud.nacos.config.file-extension} - refresh: true diff --git a/ruoyi-visual/ruoyi-doc/src/main/resources/application.yml b/ruoyi-visual/ruoyi-doc/src/main/resources/application.yml index a3416392..ace4de59 100644 --- a/ruoyi-visual/ruoyi-doc/src/main/resources/application.yml +++ b/ruoyi-visual/ruoyi-doc/src/main/resources/application.yml @@ -1,4 +1,36 @@ -# knife4j聚合配置 +# Tomcat +server: + port: 18000 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-doc + profiles: + # 环境配置 + active: @profiles.active@ + +--- # nacos 配置 +spring: + cloud: + nacos: + # nacos 服务地址 + server-addr: @nacos.server@ + discovery: + # 注册组 + group: @nacos.discovery.group@ + namespace: ${spring.profiles.active} + config: + # 配置组 + group: @nacos.config.group@ + namespace: ${spring.profiles.active} + config: + import: + - optional:nacos:application-common.yml + - optional:nacos:${spring.application.name}.yml + +--- # knife4j聚合配置 knife4j: enableAggregation: true # cloud模式 diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/application.yml similarity index 62% rename from ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml rename to ruoyi-visual/ruoyi-monitor/src/main/resources/application.yml index 2434814a..fe8b3573 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/application.yml @@ -4,9 +4,6 @@ server: # Spring spring: - main: - # 此配置禁止放入 nacos 优先级不够 - allow-circular-references: true application: # 应用名称 name: ruoyi-monitor @@ -28,9 +25,7 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - data-id: application.${spring.cloud.nacos.config.file-extension} - refresh: true + config: + import: + - optional:nacos:application-common.yml + - optional:nacos:${spring.application.name}.yml diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml similarity index 58% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/bootstrap.yml rename to ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml index 84cff126..88edd624 100644 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml @@ -4,9 +4,6 @@ server: # Spring spring: - main: - # 此配置禁止放入 nacos 优先级不够 - allow-circular-references: true application: # 应用名称 name: ruoyi-sentinel-dashboard @@ -32,11 +29,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - data-id: application.${spring.cloud.nacos.config.file-extension} - refresh: true - - data-id: datasource.${spring.cloud.nacos.config.file-extension} - refresh: true + config: + import: + - optional:nacos:application-common.yml + - optional:nacos:datasource.yml + - optional:nacos:${spring.application.name}.yml diff --git a/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/application.yml similarity index 67% rename from ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/bootstrap.yml rename to ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/application.yml index 8c6c97eb..b70227d9 100644 --- a/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/application.yml @@ -4,9 +4,6 @@ server: # Spring spring: - main: - # 此配置禁止放入 nacos 优先级不够 - allow-circular-references: true application: # 应用名称 name: ruoyi-xxl-job-admin @@ -42,11 +39,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - data-id: application.${spring.cloud.nacos.config.file-extension} - refresh: true - - data-id: datasource.${spring.cloud.nacos.config.file-extension} - refresh: true + config: + import: + - optional:nacos:application-common.yml + - optional:nacos:datasource.yml + - optional:nacos:${spring.application.name}.yml diff --git a/sql/ry-config.sql b/sql/ry-config.sql index 6a6263c3..feb705bc 100644 --- a/sql/ry-config.sql +++ b/sql/ry-config.sql @@ -32,7 +32,7 @@ CREATE TABLE `config_info` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_modified, src_user, src_ip, app_name, tenant_id, c_desc, c_use, effect, type, c_schema) values -(1, 'application.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:18:55', '2022-01-09 15:18:55', NULL, '0:0:0:0:0:0:0:1', '', 'dev', '通用配置基础配置', NULL, NULL, 'yaml', NULL), +(1, 'application-common.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:18:55', '2022-01-09 15:18:55', NULL, '0:0:0:0:0:0:0:1', '', 'dev', '通用配置基础配置', NULL, NULL, 'yaml', NULL), (2, 'datasource.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:19:07', '2022-01-09 15:19:07', NULL, '0:0:0:0:0:0:0:1', '', 'dev', '数据源配置', NULL, NULL, 'yaml', NULL), (3, 'ruoyi-gateway.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:19:43', '2022-01-09 15:22:42', NULL, '0:0:0:0:0:0:0:1', '', 'dev', '网关模块', NULL, NULL, 'yaml', NULL), (4, 'ruoyi-auth.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:19:43', '2022-01-09 15:22:29', NULL, '0:0:0:0:0:0:0:1', '', 'dev', '认证中心', NULL, NULL, 'yaml', NULL), @@ -46,7 +46,7 @@ insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_mod (12, 'seata-server.properties', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:21:02', '2022-01-09 15:21:02', NULL, '0:0:0:0:0:0:0:1', '', 'dev', 'seata配置文件', NULL, NULL, 'properties', NULL), (13, 'ruoyi-sentinel-dashboard.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:21:02', '2022-01-09 15:21:02', NULL, '0:0:0:0:0:0:0:1', '', 'dev', 'sentinel控制台配置文件', NULL, NULL, 'yaml', NULL), -(101, 'application.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:23:00', '2022-01-09 15:23:00', NULL, '0:0:0:0:0:0:0:1', '', 'prod', '通用配置基础配置', NULL, NULL, 'yaml', NULL), +(101, 'application-common.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:23:00', '2022-01-09 15:23:00', NULL, '0:0:0:0:0:0:0:1', '', 'prod', '通用配置基础配置', NULL, NULL, 'yaml', NULL), (102, 'datasource.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:23:00', '2022-01-09 15:23:00', NULL, '0:0:0:0:0:0:0:1', '', 'prod', '数据源配置', NULL, NULL, 'yaml', NULL), (103, 'ruoyi-gateway.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:23:00', '2022-01-09 15:23:00', NULL, '0:0:0:0:0:0:0:1', '', 'prod', '网关模块', NULL, NULL, 'yaml', NULL), (104, 'ruoyi-auth.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:23:00', '2022-01-09 15:23:00', NULL, '0:0:0:0:0:0:0:1', '', 'prod', '认证中心', NULL, NULL, 'yaml', NULL),