diff --git a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java index 1b86da6d..2df3be6a 100644 --- a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java +++ b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java @@ -36,9 +36,7 @@ public class PropertiesUtils { // 默认加载的文件,可通过继承覆盖(若有相同Key,优先加载后面的) public static final String[] DEFAULT_CONFIG_FILE = new String[]{ "classpath:application.yml", "classpath:config/application.yml", - "classpath:bootstrap.yml", "classpath:config/bootstrap.yml", "file:application.yml", "file:config/application.yml", - "file:bootstrap.yml", "file:config/bootstrap.yml", }; private static final Logger logger = PropertiesUtils.initLogger(); diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap-elk.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-elk.xml similarity index 100% rename from modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap-elk.xml rename to modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-elk.xml diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap-prod.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-prod.xml similarity index 86% rename from modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap-prod.xml rename to modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-prod.xml index d60f6c67..c20b3e53 100644 --- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap-prod.xml +++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-prod.xml @@ -60,15 +60,15 @@ spring: # 服务注册和配置 nacos: + server-addr: 192.168.56.1:8848 + username: nacos + password: nacos discovery: - server-addr: 192.168.56.1:8848 + namespace: ~ + group: jeesite-cloud config: - server-addr: 192.168.56.1:8848 - file-extension: yml + namespace: ~ group: jeesite-cloud-yml - extension-configs: - - data-id: application.yml - group: jeesite-cloud-yml # 服务发现与注册优选IP前缀 #inetutils: diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application.xml similarity index 81% rename from modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml rename to modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application.xml index 1f9ff872..74ad0deb 100644 --- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml +++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application.xml @@ -47,6 +47,16 @@ spring: # 当前环境名称(注意:不可设置为 test 它是单元测试专用的名称) profiles: active: default + + # 加载的配置文件 + config: +# import: +# - 'optional:configserver:' + import: + - 'nacos:application.yml' + - 'nacos:application-${spring.profiles.active}.yml' + - 'nacos:${spring.application.name}.yml' + - 'nacos:${spring.application.name}-${spring.profiles.active}.yml' # 分布式配置中心 cloud: @@ -65,22 +75,15 @@ spring: # 服务注册和配置 nacos: + server-addr: 127.0.0.1:8848 + username: nacos + password: nacos discovery: - server-addr: 127.0.0.1:8848 - username: nacos - password: nacos namespace: ~ group: jeesite-cloud config: - server-addr: 127.0.0.1:8848 - username: nacos - password: nacos namespace: ~ - file-extension: yml group: jeesite-cloud-yml - extension-configs: - - data-id: application.yml - group: jeesite-cloud-yml # 服务发现与注册优选IP前缀 #inetutils: