update yml config

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();

modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-prod.xml

@@ -60,14 +60,14 @@ 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
+        namespace: ~
-        file-extension: yml
-        group: jeesite-cloud-yml
-        extension-configs:
-          - data-id: application.yml
         group: jeesite-cloud-yml
 
     # 服务发现与注册优选IP前缀

modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application.xml

@@ -48,6 +48,16 @@ spring:
   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:
     config:
@@ -65,21 +75,14 @@ spring:
         
     # 服务注册和配置
     nacos:
-      discovery:
       server-addr: 127.0.0.1:8848
       username: nacos
       password: nacos
+      discovery:
         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前缀