From 0b3b0731ff875b35a17774160bd7c0f2850ca282 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 7 Mar 2025 16:23:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=A8=A1=E6=9D=BF=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/modules/gen/config.xml    |  6 +++---
 .../web/src/main/resources/config/application-elk.xml  |  4 ++--
 .../web/src/main/resources/config/application-prod.xml |  4 ++--
 .../web/src/main/resources/config/application.xml      | 10 +++++-----
 .../src/main/resources/config/logback-spring-elk.xml   |  2 +-
 .../src/main/resources/config/logback-spring-prod.xml  |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/config.xml b/modules/core/src/main/resources/templates/modules/gen/config.xml
index 5779b539..91fd14c7 100644
--- a/modules/core/src/main/resources/templates/modules/gen/config.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/config.xml
@@ -281,9 +281,9 @@
 			<template>module_cloud/web/db/erm.xml</template>
 			<template>module_cloud/web/src/main/java/package.xml</template>
 			<template>module_cloud/web/src/main/java/startClass.xml</template>
-			<template>module_cloud/web/src/main/resources/config/bootstrap.xml</template>
-			<template>module_cloud/web/src/main/resources/config/bootstrap-elk.xml</template>
-			<template>module_cloud/web/src/main/resources/config/bootstrap-prod.xml</template>
+			<template>module_cloud/web/src/main/resources/config/application.xml</template>
+			<template>module_cloud/web/src/main/resources/config/application-elk.xml</template>
+			<template>module_cloud/web/src/main/resources/config/application-prod.xml</template>
 			<template>module_cloud/web/src/main/resources/config/logback-spring.xml</template>
 			<template>module_cloud/web/src/main/resources/config/logback-spring-elk.xml</template>
 			<template>module_cloud/web/src/main/resources/config/logback-spring-prod.xml</template>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-elk.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-elk.xml
index 9184f81d..e3d81f71 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-elk.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-elk.xml
@@ -2,9 +2,9 @@
 <!-- Copyright (c) 2013-Now http://jeesite.com All rights reserved.
      No deletion without permission, or be held responsible to law. -->
 <template>
-	<name>bootstrap</name>
+	<name>application-elk</name>
 	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
-	<fileName>bootstrap-elk.yml</fileName>
+	<fileName>application-elk.yml</fileName>
 	<content><![CDATA[
 
 # 使用环境配置，只需 JVM 参数里加：-Dspring.profiles.active=prod,elk
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-prod.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-prod.xml
index c20b3e53..d92601d8 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-prod.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-prod.xml
@@ -2,9 +2,9 @@
 <!-- Copyright (c) 2013-Now http://jeesite.com All rights reserved.
      No deletion without permission, or be held responsible to law. -->
 <template>
-	<name>bootstrap</name>
+	<name>application-prod</name>
 	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
-	<fileName>bootstrap-prod.yml</fileName>
+	<fileName>application-prod.yml</fileName>
 	<content><![CDATA[
 
 # 使用环境配置，只需 JVM 参数里加：-Dspring.profiles.active=prod
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application.xml
index 74ad0deb..25aeae08 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application.xml
@@ -2,9 +2,9 @@
 <!-- Copyright (c) 2013-Now http://jeesite.com All rights reserved.
      No deletion without permission, or be held responsible to law. -->
 <template>
-	<name>bootstrap</name>
+	<name>application</name>
 	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
-	<fileName>bootstrap.yml</fileName>
+	<fileName>application.yml</fileName>
 	<content><![CDATA[
 #======================================#
 #========== Server settings ===========#
@@ -54,9 +54,9 @@ spring:
 #      - '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'
+      - 'nacos:application-\${spring.profiles.active}.yml'
+      - 'nacos:\${spring.application.name}.yml'
+      - 'nacos:\${spring.application.name}-\${spring.profiles.active}.yml'
     
   # 分布式配置中心
   cloud:
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-elk.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-elk.xml
index 9c421931..4d5a180f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-elk.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-elk.xml
@@ -2,7 +2,7 @@
 <!-- Copyright (c) 2013-Now http://jeesite.com All rights reserved.
      No deletion without permission, or be held responsible to law. -->
 <template>
-	<name>logback-spring</name>
+	<name>logback-spring-elk</name>
 	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
 	<fileName>logback-spring-elk.xml</fileName>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-prod.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-prod.xml
index df2abe1d..5b59c9ea 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-prod.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-prod.xml
@@ -2,7 +2,7 @@
 <!-- Copyright (c) 2013-Now http://jeesite.com All rights reserved.
      No deletion without permission, or be held responsible to law. -->
 <template>
-	<name>logback-spring</name>
+	<name>logback-spring-prod</name>
 	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
 	<fileName>logback-spring-prod.xml</fileName>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>