From ad93ac861d11cbc59551a07449aa6ef8fd32be97 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 25 Apr 2025 18:45:10 +0800
Subject: [PATCH 01/84] =?UTF-8?q?=E5=BD=93=E9=80=89=E6=8B=A9=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E6=9C=AA=E8=AE=BE=E7=BD=AE=E6=9F=A5=E8=AF=A2=E5=88=97?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E6=B2=A1=E6=9C=89=E7=94=9F=E6=88=90?=
 =?UTF-8?q?office=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/modules/gen/vue/vueForm.xml    | 2 +-
 .../resources/templates/modules/gen/vue/vueFormChildList.xml    | 2 +-
 .../main/resources/templates/modules/gen/vue/vueFormRoute.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
index ef316eba..24f97a58 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
@@ -70,7 +70,7 @@
   var companyselectExists = false;
   var areaselectExists = false;
   for(c in table.columnList){
-    if(c.isQuery == "1" && !c.isTreeEntityColumn){
+    if(c.isEdit == "1" && !c.isTreeEntityColumn){
       if(c.showType == 'userselect'){
         userselectExists = true;
       }else if(c.showType == 'officeselect'){
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
index 5d927788..cb53d841 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
@@ -33,7 +33,7 @@
   var companyselectExists = false;
   var areaselectExists = false;
   for(c in table.columnList){
-    if(c.isQuery == "1" && !c.isTreeEntityColumn){
+    if(c.isEdit == "1" && !c.isTreeEntityColumn){
       if(c.showType == 'userselect'){
         userselectExists = true;
       }else if(c.showType == 'officeselect'){
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
index 7f46ad2a..41334031 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
@@ -79,7 +79,7 @@ var officeselectExists = false;
 var companyselectExists = false;
 var areaselectExists = false;
 for(c in table.columnList){
-  if(c.isQuery == "1" && !c.isTreeEntityColumn){
+  if(c.isEdit == "1" && !c.isTreeEntityColumn){
     if(c.showType == 'userselect'){
       userselectExists = true;
     }else if(c.showType == 'officeselect'){
-- 
Gitee


From 7358034209f11d10b06dff43667bd9c14ba8305c Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 25 Apr 2025 18:47:37 +0800
Subject: [PATCH 02/84] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=8C=89=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E8=A7=92=E8=89=B2=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20user.roleCodes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mappings/modules/sys/EmpUserDao.xml    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml b/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml
index bad1c37f..eedbe2e5 100644
--- a/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml
+++ b/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml
@@ -13,7 +13,7 @@
 	<select id="findList" resultType="EmpUser">
 		SELECT ${sqlMap.column.toSql()}
 		FROM ${sqlMap.table.toSql()}
-		<if test="roleCode != null and roleCode != ''">
+		<if test="(roleCode != null and roleCode != '') or (roleCodes != null and roleCodes.length gt 0)">
 			JOIN ${_prefix}sys_user_role ur2 ON ur2.user_code = a.user_code
 		</if>
 		<if test="employee.postCode != null and employee.postCode != ''">
@@ -24,6 +24,12 @@
 			<if test="roleCode != null and roleCode != ''">
 				AND ur2.role_code = #{roleCode}
 			</if>
+			<if test="roleCodes != null and roleCodes.length gt 0">
+				AND ur2.role_code IN
+				<foreach collection="roleCodes" item="roleCode" open="(" separator="," close=")">
+					#{roleCode}
+				</foreach>
+			</if>
 			<if test="employee.postCode != null and employee.postCode != ''">
 				AND (
 					ep.post_code = #{employee.postCode}
-- 
Gitee


From 864e996f648e3701ad1292b901e21216d832df79 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 27 Apr 2025 14:24:04 +0800
Subject: [PATCH 03/84] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E6=A8=A1=E6=9D=BF=E7=9A=84=E4=B8=80=E4=BA=9B=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8Ctextarea=20v-model=20=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9Bmaxlength=20=E4=B8=BA=200=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B=E5=88=97=E8=A1=A8=20query=20?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=8D=E5=AF=B9=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/app/appForm.xml  | 8 ++++----
 .../main/resources/templates/modules/gen/app/appList.xml  | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/app/appForm.xml b/modules/core/src/main/resources/templates/modules/gen/app/appForm.xml
index 09c58fc6..2cf8bc5d 100644
--- a/modules/core/src/main/resources/templates/modules/gen/app/appForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/app/appForm.xml
@@ -41,11 +41,11 @@
 		%>
 		<% if(c.showType == 'input'){ %>
 			<u-form-item label="${c.columnLabel}" prop="${c.attrName}" label-width="180">
-				<u-input placeholder="请输入${c.columnLabel}" v-model="model.${c.attrName}" type="text" maxlength="${c.dataLength}"></u-input>
+				<u-input placeholder="请输入${c.columnLabel}" v-model="model.${c.attrName}" type="text"${c.dataLength != "0" ? ' maxlength="'+c.dataLength+'"' : ''}></u-input>
 			</u-form-item>
 		<% }else if(c.showType == 'textarea'){ %>
 			<u-form-item label="${c.columnLabel}" prop="${c.attrName}" label-width="180" label-position="top">
-				<u-input type="textarea" placeholder="请输入${c.columnLabel}" v-model="model.testTextarea" height="100" maxlength="${c.dataLength}" />
+				<u-input type="textarea" placeholder="请输入${c.columnLabel}" v-model="model.${c.attrName}" height="100"${c.dataLength != "0" ? ' maxlength="'+c.dataLength+'"' : ''} />
 			</u-form-item>
 		<% }else if(c.showType == 'select' || c.showType == 'select_multiple'){
 			var isMultiple = (c.showType == 'select_multiple'); %>
@@ -63,7 +63,7 @@
 		<% }else if(c.showType == 'date' || c.showType == 'datetime'){
 		var isTime = (c.showType == 'datetime'); %>
 			<u-form-item label="${c.columnLabel}" prop="${c.attrName}" label-width="180">
-				<u-input placeholder="请输入${c.columnLabel}" v-model="model.${c.attrName}" format="yyyy-MM-dd${isTime?' HH:mm':''}" type="text" maxlength="${c.dataLength}"></u-input>
+				<u-input placeholder="请输入${c.columnLabel}" v-model="model.${c.attrName}" format="yyyy-MM-dd${isTime?' HH:mm':''}" type="text"${c.dataLength != "0" ? ' maxlength="'+c.dataLength+'"' : ''}></u-input>
 			</u-form-item>
 		<% }else if(c.showType == 'userselect'){ %>
 			<u-form-item label="${c.columnLabel}" prop="${c.attrName}" label-width="180">
@@ -87,7 +87,7 @@
 			</u-form-item>
 		<% }else{ %>
 			<u-form-item label="${c.columnLabel}" prop="${c.attrName}" label-width="180">
-				<u-input placeholder="请输入${c.columnLabel}" v-model="model.${c.attrName}" type="text" maxlength="${c.dataLength}"></u-input>
+				<u-input placeholder="请输入${c.columnLabel}" v-model="model.${c.attrName}" type="text"${c.dataLength != "0" ? ' maxlength="'+c.dataLength+'"' : ''}></u-input>
 			</u-form-item>
 		<% } %>
 		<%
diff --git a/modules/core/src/main/resources/templates/modules/gen/app/appList.xml b/modules/core/src/main/resources/templates/modules/gen/app/appList.xml
index f1f03672..29fe006b 100644
--- a/modules/core/src/main/resources/templates/modules/gen/app/appList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/app/appList.xml
@@ -15,7 +15,7 @@
 			<u-cell-group class="list" :border="false">
 				<u-swipe-action :options="options" v-for="(item, index) in list" :key="item.id" :index="index" @click="optionsClick">
 					<%
-						var idParam = '', idParam2 = '';
+						var idParam = '', idParam2 = '', queryField = '';
 						for(pk in table.pkList){
 						  idParam = idParam + (pk.attrName + '=\'+item.' + pk.attrName);
 						  idParam2 = idParam2 + ('item.' + pk.attrName);
@@ -39,6 +39,7 @@
 						<text slot="label">创建者：{{item.createBy}} &nbsp;|&nbsp; 时间：{{item.createDate}}</text>
 					</u-cell-item>
 					<%
+							  queryField = c.attrName;
 							  break;
 							}
 						}
@@ -130,7 +131,7 @@ export default {
 		search(value) {
 			this.list = [];
 			this.query.pageNo = 0;
-			this.query.testInput = value;
+			this.query.${queryField} = value;
 			this.loadList();
 		},
 		navTo(url) {
-- 
Gitee


From 91ded3eac61b8a7e859ab3915edff4e557e6f6f2 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 27 Apr 2025 15:39:04 +0800
Subject: [PATCH 04/84] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E8=A1=A5=E5=85=85=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/modules/gen/app/appForm.xml     | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/app/appForm.xml b/modules/core/src/main/resources/templates/modules/gen/app/appForm.xml
index 2cf8bc5d..83aa3b1f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/app/appForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/app/appForm.xml
@@ -40,53 +40,58 @@
 			}
 		%>
 		<% if(c.showType == 'input'){ %>
-			<u-form-item label="${c.columnLabel}" prop="${c.attrName}" label-width="180">
+			<u-form-item label="${c.columnLabel}" prop="${c.simpleAttrName}" label-width="180">
 				<u-input placeholder="请输入${c.columnLabel}" v-model="model.${c.attrName}" type="text"${c.dataLength != "0" ? ' maxlength="'+c.dataLength+'"' : ''}></u-input>
 			</u-form-item>
 		<% }else if(c.showType == 'textarea'){ %>
-			<u-form-item label="${c.columnLabel}" prop="${c.attrName}" label-width="180" label-position="top">
+			<u-form-item label="${c.columnLabel}" prop="${c.simpleAttrName}" label-width="180" label-position="top">
 				<u-input type="textarea" placeholder="请输入${c.columnLabel}" v-model="model.${c.attrName}" height="100"${c.dataLength != "0" ? ' maxlength="'+c.dataLength+'"' : ''} />
 			</u-form-item>
 		<% }else if(c.showType == 'select' || c.showType == 'select_multiple'){
 			var isMultiple = (c.showType == 'select_multiple'); %>
-			<u-form-item label="${c.columnLabel}" prop="${c.attrName}" label-width="180">
-				<js-select v-model="model.${c.attrName}" dict-type="${c.optionMap['dictType']}"<% if(isMultiple){ %> multiple="true"<% } %> placeholder="请选择${c.columnLabel}"></js-select>
+			<u-form-item label="${c.columnLabel}" prop="${c.simpleAttrName}" label-width="180">
+				<js-select v-model="model.${c.attrName}" dict-type="${c.optionMap['dictType']}"<% if(isMultiple){ %> :multiple="true"<% } %> placeholder="请选择${c.columnLabel}"></js-select>
 			</u-form-item>
 		<% }else if(c.showType == 'radio'){ %>
-			<u-form-item label="${c.columnLabel}" prop="${c.attrName}" label-width="180">
+			<u-form-item label="${c.columnLabel}" prop="${c.simpleAttrName}" label-width="180">
 				<js-radio v-model="model.${c.attrName}" dict-type="${c.optionMap['dictType']}"></js-radio>
 			</u-form-item>
 		<% }else if(c.showType == 'checkbox'){ %>
-			<u-form-item label="${c.columnLabel}" prop="${c.attrName}" label-width="180">
+			<u-form-item label="${c.columnLabel}" prop="${c.simpleAttrName}" label-width="180">
 				<js-checkbox v-model="model.${c.attrName}" dict-type="${c.optionMap['dictType']}"></js-checkbox>
 			</u-form-item>
 		<% }else if(c.showType == 'date' || c.showType == 'datetime'){
 		var isTime = (c.showType == 'datetime'); %>
-			<u-form-item label="${c.columnLabel}" prop="${c.attrName}" label-width="180">
-				<u-input placeholder="请输入${c.columnLabel}" v-model="model.${c.attrName}" format="yyyy-MM-dd${isTime?' HH:mm':''}" type="text"${c.dataLength != "0" ? ' maxlength="'+c.dataLength+'"' : ''}></u-input>
+			<u-form-item label="${c.columnLabel}" prop="${c.simpleAttrName}" label-width="180">
+				<u-input placeholder="请输入${c.columnLabel}" v-model="model.${c.attrName}" type="text"
+					@click="${c.attrName}Open = true;" :disabled="true"></u-input>
+				<u-picker v-model="${c.attrName}Open" mode="time" :default-time="model.${c.attrName}"
+					:params="{year: true, month: true, day: true<% if(isTime){ %>, hour: true, minute: true, second: false<% } %>}"
+					@confirm="model.${c.attrName} = $event.year + '-' + $event.month + '-' + $event.day<% if(isTime){ %> + ' ' + $event.hour + ':' + $event.minute<% } %>"
+				></u-picker>
 			</u-form-item>
 		<% }else if(c.showType == 'userselect'){ %>
-			<u-form-item label="${c.columnLabel}" prop="${c.attrName}" label-width="180">
-				<js-select v-model="model.${c.attrName}" :items="${c.attrName}List" placeholder="请选择${c.columnLabel}" :tree="true"<% if (isNotBlank(c.attrName2)){ %>
+			<u-form-item label="${c.columnLabel}" prop="${c.simpleAttrName}" label-width="180">
+				<js-select v-model="model.${c.attrName}" :items="${c.simpleAttrName}List" placeholder="请选择${c.columnLabel}" :tree="true"<% if (isNotBlank(c.attrName2)){ %>
 					:label-value="model.${c.attrName2}" @label-input="model.${c.attrName2} = $event"<% } %>></js-select>
 			</u-form-item>
 		<% }else if(c.showType == 'officeselect'){ %>
-			<u-form-item label="${c.columnLabel}" prop="${c.attrName}" label-width="180">
-				<js-select v-model="model.${c.attrName}" :items="${c.attrName}List" placeholder="请选择${c.columnLabel}" :tree="true"<% if (isNotBlank(c.attrName2)){ %>
+			<u-form-item label="${c.columnLabel}" prop="${c.simpleAttrName}" label-width="180">
+				<js-select v-model="model.${c.attrName}" :items="${c.simpleAttrName}List" placeholder="请选择${c.columnLabel}" :tree="true"<% if (isNotBlank(c.attrName2)){ %>
 					:label-value="model.${c.attrName2}" @label-input="model.${c.attrName2} = $event"<% } %>></js-select>
 			</u-form-item>
 		<% }else if(c.showType == 'companyselect'){ %>
-			<u-form-item label="${c.columnLabel}" prop="${c.attrName}" label-width="180">
-				<js-select v-model="model.${c.attrName}" :items="${c.attrName}List" placeholder="请选择${c.columnLabel}" :tree="true"<% if (isNotBlank(c.attrName2)){ %>
+			<u-form-item label="${c.columnLabel}" prop="${c.simpleAttrName}" label-width="180">
+				<js-select v-model="model.${c.attrName}" :items="${c.simpleAttrName}List" placeholder="请选择${c.columnLabel}" :tree="true"<% if (isNotBlank(c.attrName2)){ %>
 					:label-value="model.${c.attrName2}" @label-input="model.${c.attrName2} = $event"<% } %>></js-select>
 			</u-form-item>
 		<% }else if(c.showType == 'areaselect'){ %>
-			<u-form-item label="${c.columnLabel}" prop="${c.attrName}" label-width="180">
-				<js-select v-model="model.${c.attrName}" :items="${c.attrName}List" placeholder="请选择${c.columnLabel}" :tree="true"<% if (isNotBlank(c.attrName2)){ %>
+			<u-form-item label="${c.columnLabel}" prop="${c.simpleAttrName}" label-width="180">
+				<js-select v-model="model.${c.attrName}" :items="${c.simpleAttrName}List" placeholder="请选择${c.columnLabel}" :tree="true"<% if (isNotBlank(c.attrName2)){ %>
 					:label-value="model.${c.attrName2}" @label-input="model.${c.attrName2} = $event"<% } %>></js-select>
 			</u-form-item>
 		<% }else{ %>
-			<u-form-item label="${c.columnLabel}" prop="${c.attrName}" label-width="180">
+			<u-form-item label="${c.columnLabel}" prop="${c.simpleAttrName}" label-width="180">
 				<u-input placeholder="请输入${c.columnLabel}" v-model="model.${c.attrName}" type="text"${c.dataLength != "0" ? ' maxlength="'+c.dataLength+'"' : ''}></u-input>
 			</u-form-item>
 		<% } %>
@@ -167,7 +172,7 @@ export default {
 				}
 			%>
 				<% if(c.isRequired == '1'){ %>
-				'${c.attrName}': [
+				'${c.simpleAttrName}': [
 					{
 						required: true,
 						message: '请输入${c.columnLabel}',
@@ -199,6 +204,8 @@ export default {
 			${c.simpleAttrName}List: [],
 			<% }else if(c.showType == 'areaselect'){ %>
 			${c.simpleAttrName}List: [],
+			<% }else if(c.showType == 'date' || c.showType == 'datetime'){ %>
+			${c.attrName}Open: false,
 			<% } %>
 			<%
 			  }
-- 
Gitee


From 885a69f9c802d21c9f5fdf4237813986eecaba42 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 27 Apr 2025 22:15:49 +0800
Subject: [PATCH 05/84] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF=E5=A2=9E=E5=BC=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/modules/gen/app/appForm.xml   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/app/appForm.xml b/modules/core/src/main/resources/templates/modules/gen/app/appForm.xml
index 83aa3b1f..6042277e 100644
--- a/modules/core/src/main/resources/templates/modules/gen/app/appForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/app/appForm.xml
@@ -131,28 +131,31 @@ export default {
 				  continue;
 				}
 			%>
-			<% if(c.showType == 'userselect'){ %>
+			<% if(c.showType == 'userselect' && c.attrType != 'String'){ %>
 				${c.simpleAttrName}: {
 					userCode: '',
 					userName: ''
 				},
-			<% }else if(c.showType == 'officeselect'){ %>
+			<% }else if(c.showType == 'officeselect' && c.attrType != 'String'){ %>
 				${c.simpleAttrName}: {
 					officeCode: '',
 					officeName: ''
 				},
-			<% }else if(c.showType == 'companyselect'){ %>
+			<% }else if(c.showType == 'companyselect' && c.attrType != 'String'){ %>
 				${c.simpleAttrName}: {
 					companyCode: '',
 					companyName: ''
 				},
-			<% }else if(c.showType == 'areaselect'){ %>
+			<% }else if(c.showType == 'areaselect' && c.attrType != 'String'){ %>
 				${c.simpleAttrName}: {
 					areaCode: '',
 					areaName: ''
 				},
 			<% }else{ %>
 				${c.attrName}: '',
+				<% if (!isBlank(c.attrName2)){ %>
+				${c.attrName2}: '',
+				<% } %>
 			<% } %>
 			<%
 			  }
-- 
Gitee


From 1f9af0706d2de4f0ea7f4f4ab1ae790d66210827 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 29 Apr 2025 15:43:09 +0800
Subject: [PATCH 06/84] update DaoMapperTest.java

---
 .../java/com/jeesite/test/DaoMapperTest.java  | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java
index ea518846..f761019d 100644
--- a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java
+++ b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java
@@ -466,18 +466,26 @@ public class DaoMapperTest extends BaseSpringContextTests {
 		queryPost.setPostType("ceo");
 		queryPost.sqlMap().getColumn().setExcludeAttrNames(SetUtils.newHashSet("postType"));
 		queryPost.sqlMap().getColumn().setIncludeAttrNames(SetUtils.newHashSet("postName"));
-		queryPost.sqlMap().getColumn().addExtSql("c1", "column1 AS \"column1\"");
-		queryPost.sqlMap().getTable().addExtSql("t1", "JOIN test1 b.post_code = a.post_code");
-		queryPost.sqlMap().getWhere().addExtSql("w1", "AND a.name1 = '123'");
+		queryPost.sqlMap().getColumn().addExtSql("c1", "b.column1 AS \"column1\"");
+		queryPost.sqlMap().getColumn().addExtSql("c2", "c.column2 AS \"column2\"");
+		queryPost.sqlMap().getTable().addExtSql("t1", "JOIN test1 b ON b.post_code = a.post_code");
+		queryPost.sqlMap().getTable().addExtSql("t2", "JOIN test2 c ON b.test_code = a.test_code");
+		queryPost.sqlMap().getWhere().addExtSql("w1", "AND b.name1 = '123'");
+		queryPost.sqlMap().getWhere().addExtSql("w2", "AND c.name2 = '123'");
 		a = "SELECT " + queryPost.sqlMap().getColumn().toSql();
 		a += " FROM " + queryPost.sqlMap().getTable().toSql();
 		a += " WHERE " + queryPost.sqlMap().getWhere().toSql();
-		b = "SELECT a.`corp_code` AS \"corpCode\", a.`corp_name` AS \"corpName\", a.`status` AS \"status\", " +
-				"a.`create_by` AS \"createBy\", a.`create_date` AS \"createDate\", a.`update_by` AS \"updateBy\", " +
-				"a.`update_date` AS \"updateDate\", a.`post_name` AS \"postName\", column1 AS \"column1\" " +
-			"FROM `js_sys_post` aJOIN test1 b.post_code = a.post_code " +
-			"WHERE a.`status` != #{STATUS_DELETE} AND a.`post_code` = #{sqlMap.where#post_code#EQ1} " +
-			"AND a.`post_type` = #{sqlMap.where#post_type#EQ1} AND a.name1 = '123'";
+		b = "SELECT a.`corp_code` AS \"corpCode\", a.`corp_name` AS \"corpName\", a.`status` AS \"status\"," +
+					" a.`create_by` AS \"createBy\", a.`create_date` AS \"createDate\", a.`update_by` AS \"updateBy\"," +
+					" a.`update_date` AS \"updateDate\", a.`post_name` AS \"postName\"," +
+					" b.column1 AS \"column1\", c.column2 AS \"column2\"" +
+				" FROM `js_sys_post` a" +
+					" JOIN test1 b ON b.post_code = a.post_code" +
+					" JOIN test2 c ON b.test_code = a.test_code" +
+				" WHERE a.`status` != #{STATUS_DELETE}" +
+					" AND a.`post_code` = #{sqlMap.where#post_code#EQ1}" +
+					" AND a.`post_type` = #{sqlMap.where#post_type#EQ1}" +
+					" AND b.name1 = '123' AND c.name2 = '123'";
 		System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(b, a);
 
 		System.exit(0);
-- 
Gitee


From 9eb21e0d80c0d623988065d9d1dbf72fd716e15e Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 6 May 2025 15:06:11 +0800
Subject: [PATCH 07/84] =?UTF-8?q?=E5=88=87=E6=8D=A2=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=88=B7=E6=96=B0=E5=BD=93=E5=89=8D=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=B7=B3=E8=BD=AC=E5=88=B0=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jeesite/modules/sys/web/SwitchController.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/SwitchController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/SwitchController.java
index ada09a15..08a0f9bf 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/SwitchController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/SwitchController.java
@@ -25,6 +25,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Set;
 
@@ -136,13 +137,14 @@ public class SwitchController extends BaseController{
 	 */
 	//@RequiresPermissions("user")
 	@RequestMapping(value = "switchSkin/{skinName}")
-	public String switchSkin(@PathVariable String skinName, HttpServletRequest request, HttpServletResponse response) {
+	public String switchSkin(@PathVariable String skinName, @RequestParam(defaultValue="${adminPath}/index") String url,
+							 HttpServletRequest request, HttpServletResponse response) {
 		if (StringUtils.isNotBlank(skinName) && !"select".equals(skinName)){
 			CookieUtils.setCookie(response, "skinName", EncodeUtils.encodeUrl(EncodeUtils.xssFilter(skinName, request)));
 			if (ServletUtils.isAjaxRequest(request)) {
 				return renderResult(response, Global.TRUE, text("主题切换成功"));
 			}
-			return REDIRECT + adminPath + "/index";
+			return REDIRECT + EncodeUtils.decodeUrl2(url);
 		}
 		return "modules/sys/switchSkin";
 	}
-- 
Gitee


From 9c78772e1f76aae9104d96b8e332691ac44aede4 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 6 May 2025 15:07:49 +0800
Subject: [PATCH 08/84] =?UTF-8?q?=E4=B8=80=E7=BA=A7=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=BE=8E=E5=8C=96=EF=BC=8C=E5=9C=86=E8=A7=92=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E8=83=8C=E6=99=AF=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminlte/css/skins/skin-blue-light2.css   | 29 ++++++-----
 .../adminlte/css/skins/skin-blue-light3.css   | 51 +++++++++++++------
 .../static/adminlte/css/skins/skin-blue2.css  |  1 +
 .../static/adminlte/css/skins/skin-blue3.css  | 23 ++++++++-
 .../static/adminlte/css/skins/skin-dark.css   |  3 +-
 .../templates/modules/gen/vue/vueForm.xml     |  2 +-
 .../views/include/sysIndex/topMenu.html       |  2 +-
 .../views/include/sysIndex/topMenuCorp.html   |  2 +-
 .../views/include/sysIndex/topMenuOffice.html |  2 +-
 .../views/modules/sys/switchSkin.html         |  6 +--
 .../resources/static/modules/sys/sysIndex.css |  2 +-
 11 files changed, 84 insertions(+), 39 deletions(-)

diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css
index c2ef1859..c3933388 100644
--- a/common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css
+++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css
@@ -2,14 +2,14 @@
  * http://jeesite.com
  */
 a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {
-  color:#1890ff;
+  color:#1677ff;
 }
 .main-header .navbar {
-  background: #1890ff;
-  background: -webkit-gradient(linear, left bottom, right top, color-stop(0, #2684f5), color-stop(1, #1890ff));
-  background: -ms-linear-gradient(left, #2684f5, #1890ff);
-  background: -moz-linear-gradient(left top, #2684f5 0%, #1890ff 100%);
-  background: -o-linear-gradient(#1890ff, #2684f5);
+  background: #1677ff;
+  background: -webkit-gradient(linear, left bottom, right top, color-stop(0, #2684f5), color-stop(1, #1677ff));
+  background: -ms-linear-gradient(left, #2684f5, #1677ff);
+  background: -moz-linear-gradient(left top, #2684f5 0%, #1677ff 100%);
+  background: -o-linear-gradient(#1677ff, #2684f5);
 }
 .main-header .navbar .nav > li > a {
   color: #ffffff;
@@ -54,10 +54,10 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
   border-bottom: 0 solid transparent;
 }
 .main-header .logo:hover {
-  background-color: #1890ff;
+  background-color: #1677ff;
 }
 .main-header li.user-header {
-  background-color: #1890ff;
+  background-color: #1677ff;
 }
 .content-header {
   background: transparent;
@@ -93,7 +93,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
   background: #ffffff;
 }
 .sidebar-menu > li.active {
-  border-left-color: #1890ff;
+  border-left-color: #1677ff;
 }
 .sidebar-menu > li.active > a {
   font-weight: 600;
@@ -154,7 +154,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
   border-radius: 4px;
 }
 .skin-blue.layout-top-nav .main-header > .logo {
-  background-color: #1890ff;
+  background-color: #1677ff;
   color: #ffffff;
   border-bottom: 0 solid transparent;
 }
@@ -164,7 +164,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 
 .sidebar-menu {padding:0 8px 0 7px;}
 .sidebar-menu li>a>.pull-right-container {left:0;}
-.sidebar-menu .treeview-item.active>a {color:#1890ff;background-color:#e7f4ff;border-right:0;border-radius:6px;}
+.sidebar-menu .treeview-item.active>a {color:#1677ff;background-color:#e7f4ff;border-right:0;border-radius:6px;}
 
 .content-wrapper, .right-side, body {background-color:#f0f2f5;}
 
@@ -189,12 +189,13 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .select2-container--default .select2-results__option--highlighted[aria-selected],
 .pagination>.active>a, .pagination>.active>a:focus, .pagination>.active>a:hover,
 .pagination>.active>span, .pagination>.active>span:focus, .pagination>.active>span:hover,
-.wup_container .placeholder .webuploader-pick {background-color:#1890ff!important;border-color:#1890ff;}
-.form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1890ff;}
+.wup_container .placeholder .webuploader-pick {background-color:#1677ff!important;border-color:#1677ff;}
+.form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1677ff;}
 .form-unit {border-bottom:1px solid #eee;}
+.form-unit:before {background-color:#1677ff;}
 
 .box-main>.box-header {border-bottom-color:#eeeeee;}
-.box-main>.box-header .box-title .fa {color:#1890ff;}
+.box-main>.box-header .box-title .fa {color:#1677ff;}
 .nav-tabs-custom>.nav-tabs>li.active {border-top-color:#3aa0ff;}
 .form-control:focus,.select2-container--default.select2-container--focus .select2-selection--multiple,
 .select2-container--default .select2-search--dropdown .select2-search__field,
diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue-light3.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue-light3.css
index 4260d5a0..233993d3 100644
--- a/common/src/main/resources/static/adminlte/css/skins/skin-blue-light3.css
+++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue-light3.css
@@ -2,17 +2,37 @@
  * http://jeesite.com
  */
 a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {
-  color:#1890ff;
+  color:#1677ff;
 }
 .main-header .navbar {
-  background: #1890ff;
-  background: -webkit-gradient(linear, left bottom, right top, color-stop(0, #2684f5), color-stop(1, #1890ff));
-  background: -ms-linear-gradient(left, #2684f5, #1890ff);
-  background: -moz-linear-gradient(left top, #2684f5 0%, #1890ff 100%);
-  background: -o-linear-gradient(#1890ff, #2684f5);
+  background: #1677ff;
+  background: -webkit-gradient(linear, left bottom, right top, color-stop(0, #2684f5), color-stop(1, #1677ff));
+  background: -ms-linear-gradient(left, #2684f5, #1677ff);
+  background: -moz-linear-gradient(left top, #2684f5 0%, #1677ff 100%);
+  background: -o-linear-gradient(#1677ff, #2684f5);
 }
 .main-header .navbar .nav > li > a {
   color: #ffffff;
+  margin: 4.5px 2px 0;
+  padding: 10px 13px;
+  border-radius: 6px;
+}
+.main-header .navbar .nav > li > a > i {
+  font-size: 16px;
+  vertical-align: bottom;
+  line-height: 20px;
+}
+.navbar-nav>.user-menu>.dropdown-menu {
+  margin-top: 7px;
+  border-radius: 6px;
+}
+.navbar-nav .treeview-menu,
+.navbar-custom-menu>.navbar-nav>li>.dropdown-menu {
+  margin-top: 5px;
+  border-radius: 6px;
+}
+.navbar-nav .treeview-menu a {
+  border-radius: 6px;
 }
 .main-header .navbar .nav > li > a:hover,
 .main-header .navbar .nav > li > a:active,
@@ -54,10 +74,10 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
   border-bottom: 0 solid transparent;
 }
 .main-header .logo:hover {
-  background-color: #1890ff;
+  background-color: #1677ff;
 }
 .main-header li.user-header {
-  background-color: #1890ff;
+  background-color: #1677ff;
 }
 .content-header {
   background: transparent;
@@ -93,7 +113,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
   background: #ffffff;
 }
 .sidebar-menu > li.active {
-  border-left-color: #1890ff;
+  border-left-color: #1677ff;
 }
 .sidebar-menu > li.active > a {
   font-weight: 600;
@@ -154,7 +174,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
   border-radius: 4px;
 }
 .skin-blue.layout-top-nav .main-header > .logo {
-  background-color: #1890ff;
+  background-color: #1677ff;
   color: #ffffff;
   border-bottom: 0 solid transparent;
 }
@@ -164,12 +184,12 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 
 .sidebar-menu {padding:0 8px 0 7px;}
 .sidebar-menu li>a>.pull-right-container {left:0;}
-.sidebar-menu .treeview-item.active>a {color:#1890ff;background-color:#e7f4ff;border-right:0;border-radius:6px;}
+.sidebar-menu .treeview-item.active>a {color:#1677ff;background-color:#e7f4ff;border-right:0;border-radius:6px;}
 
 /* 页签添加内边距 */
 .content-wrapper, .tabpanel_content, .tabpanel_content .html_content, body {background-color:#f0f2f5;}
 .box-main, .nav-main, .ui-layout-pane, iframe {border-radius:5px;}
-.tabpanel_content .html_content {padding:13px 14px 13px 15px;}
+.tabpanel_content .html_content {padding:12px 14px 12px 15px;}
 .tabpanel_tab_content {border-bottom:0;}
 .ui-layout-resizer {background:none;}
 .content {padding:0!important}
@@ -211,12 +231,13 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .select2-container--default .select2-results__option--highlighted[aria-selected],
 .pagination>.active>a, .pagination>.active>a:focus, .pagination>.active>a:hover,
 .pagination>.active>span, .pagination>.active>span:focus, .pagination>.active>span:hover,
-.wup_container .placeholder .webuploader-pick {background-color:#1890ff!important;border-color:#1890ff!important;}
-.form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1890ff;}
+.wup_container .placeholder .webuploader-pick {background-color:#1677ff!important;border-color:#1677ff!important;}
+.form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1677ff;}
 .form-unit {border-bottom:1px solid #eee;}
+.form-unit:before {background-color:#1677ff;}
 
 .box-main>.box-header {border-bottom-color:#eeeeee;}
-.box-main>.box-header .box-title .fa {color:#1890ff;}
+.box-main>.box-header .box-title .fa {color:#1677ff;}
 .nav-tabs-custom>.nav-tabs>li.active {border-top-color:#3aa0ff;}
 .form-control:focus,.select2-container--default.select2-container--focus .select2-selection--multiple,
 .select2-container--default .select2-search--dropdown .select2-search__field,
diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue2.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue2.css
index 4ca3d2fe..7865b9dd 100644
--- a/common/src/main/resources/static/adminlte/css/skins/skin-blue2.css
+++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue2.css
@@ -192,6 +192,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .wup_container .placeholder .webuploader-pick {background-color:#1e5edb!important;border-color:#1e5edb!important;}
 .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1e5edb;}
 .form-unit {border-bottom:1px solid #eee;}
+.form-unit:before {background-color:#1e5edb;}
 
 .box-main>.box-header {border-bottom-color:#eeeeee;}
 .box-main>.box-header .box-title .fa {color:#1e5edb;}
diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue3.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue3.css
index d8c699e1..a6d13632 100644
--- a/common/src/main/resources/static/adminlte/css/skins/skin-blue3.css
+++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue3.css
@@ -13,6 +13,26 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 }
 .main-header .navbar .nav > li > a {
   color: #ffffff;
+  margin: 4.5px 2px 0;
+  padding: 10px 13px;
+  border-radius: 6px;
+}
+.main-header .navbar .nav > li > a > i {
+  font-size: 16px;
+  vertical-align: bottom;
+  line-height: 20px;
+}
+.navbar-nav .treeview-menu,
+.navbar-nav>.user-menu>.dropdown-menu {
+  margin-top: 7px;
+  border-radius: 6px;
+}
+.navbar-custom-menu>.navbar-nav>li>.dropdown-menu {
+  margin-top: 5px;
+  border-radius: 6px;
+}
+.navbar-nav .treeview-menu a {
+  border-radius: 6px;
 }
 .main-header .navbar .nav > li > a:hover,
 .main-header .navbar .nav > li > a:active,
@@ -169,7 +189,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 /* 页签添加内边距 */
 .content-wrapper, .tabpanel_content, .tabpanel_content .html_content, body {background-color:#f0f2f5;}
 .box-main, .nav-main, .ui-layout-pane, iframe {border-radius:5px;}
-.tabpanel_content .html_content {padding:13px 14px 13px 15px;}
+.tabpanel_content .html_content {padding:12px 14px 12px 15px;}
 .tabpanel_tab_content {border-bottom:0;}
 .ui-layout-resizer {background:none;}
 .content {padding:0!important}
@@ -214,6 +234,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .wup_container .placeholder .webuploader-pick {background-color:#1e5edb!important;border-color:#1e5edb!important;}
 .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1e5edb;}
 .form-unit {border-bottom:1px solid #eee;}
+.form-unit:before {background-color:#1e5edb;}
 
 .box-main>.box-header {border-bottom-color:#eeeeee;}
 .box-main>.box-header .box-title .fa {color:#1e5edb;}
diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-dark.css b/common/src/main/resources/static/adminlte/css/skins/skin-dark.css
index b04d8f4c..64cd8315 100644
--- a/common/src/main/resources/static/adminlte/css/skins/skin-dark.css
+++ b/common/src/main/resources/static/adminlte/css/skins/skin-dark.css
@@ -167,7 +167,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 /* 页签添加内边距 */
 .content-wrapper, .tabpanel_content, .tabpanel_content .html_content, body {background-color:#000;}
 .box-main, .nav-main, .ui-layout-pane, iframe {border-radius:5px;}
-.tabpanel_content .html_content {padding:13px 14px 13px 15px;}
+.tabpanel_content .html_content {padding:12px 14px 12px 15px;}
 .tabpanel_tab_content {border-bottom:0;}
 .ui-layout-resizer {background:none;}
 .content {padding:0!important}
@@ -227,6 +227,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .wup_container .placeholder .webuploader-pick {background-color:#3aa0ff!important;border-color:#3aa0ff!important;}
 .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#2975bc;}
 .form-unit {border-bottom:1px solid #4e4e4e;}
+.form-unit:before {background-color:#2975bc;}
 
 .form-inline .form-more {background-color:#1a1a1a;border-bottom-color:#393939;}
 .form-control, .input-group .input-group-addon, input, select, textarea, pre {background-color:#1a1a1a;border-color:#414141!important;color:#ddd}
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
index 24f97a58..831fe906 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
@@ -19,7 +19,7 @@
     :okAuth="'${permissionPrefix}:edit'"
     @register="register${modalOrDrawer}"
     @ok="handleSubmit"
-    width="60%"
+    width="70%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
diff --git a/modules/core/src/main/resources/views/include/sysIndex/topMenu.html b/modules/core/src/main/resources/views/include/sysIndex/topMenu.html
index 305c2b64..30276b87 100644
--- a/modules/core/src/main/resources/views/include/sysIndex/topMenu.html
+++ b/modules/core/src/main/resources/views/include/sysIndex/topMenu.html
@@ -12,7 +12,7 @@
 			<% include('/include/sysIndex/topMenuCorp.html'){} %>
 			<% include('/include/sysIndex/topMenuOffice.html'){} %>
 			<li><a href="javascript:" id="fullScreen" title="${text('全屏')}" data-placement="bottom" data-container="body"><i class="fa fa-arrows-alt"></i></a></li>
-			<li><a href="javascript:" id="switchSkin" title="${text('切换主题')}" style="margin-top:-1px;" data-placement="bottom" data-container="body" data-layer-width="600" data-layer-height="350"><i class="fa fa-dashboard"></i></a></li>
+			<li><a href="javascript:" id="switchSkin" title="${text('切换主题')}" data-placement="bottom" data-container="body" data-layer-width="600" data-layer-height="350"><i class="fa fa-dashboard"></i></a></li>
 			<% include('/include/sysIndex/topMenuLang.html'){} %>
 			<% include('/include/sysIndex/topMenuOnline.html'){} %>
 			<% include('/include/sysIndex/topMenuMsg.html'){} %>
diff --git a/modules/core/src/main/resources/views/include/sysIndex/topMenuCorp.html b/modules/core/src/main/resources/views/include/sysIndex/topMenuCorp.html
index c79b9315..c8097812 100644
--- a/modules/core/src/main/resources/views/include/sysIndex/topMenuCorp.html
+++ b/modules/core/src/main/resources/views/include/sysIndex/topMenuCorp.html
@@ -1,7 +1,7 @@
 <% if(@Global.getConfigToBoolean('user.useCorpModel', 'false') && hasPermi('sys:corpAdmin:edit')){ %>
 <li>
 	<a href="javascript:" id="switchCorp">
-		<i class="fa icon-home"></i> ${text('当前租户')}：${currentCorpName}
+		<i class="fa icon-home" style="font-size:14px;"></i> ${currentCorpName}
 	</a>
 	<div class="hide"><#form:treeselect id="switchCorpSelect" title="${text('租户切换')}" allowClear="false"
 		url="${ctx}/sys/corpAdmin/treeData?isShowCode=true" callbackFuncName="switchCorpSelectCallback"/>
diff --git a/modules/core/src/main/resources/views/include/sysIndex/topMenuOffice.html b/modules/core/src/main/resources/views/include/sysIndex/topMenuOffice.html
index b3dac4d6..fb218aca 100644
--- a/modules/core/src/main/resources/views/include/sysIndex/topMenuOffice.html
+++ b/modules/core/src/main/resources/views/include/sysIndex/topMenuOffice.html
@@ -1,7 +1,7 @@
 <% if(toBoolean(switchOffice!)){ %>
 <li>
 	<a href="javascript:" id="switchOffice">
-		<i class="fa icon-grid" style="font-size:12px;"></i> ${officeName!}
+		<i class="fa icon-grid" style="font-size:13px;"></i> ${officeName!}
 	</a>
 	<div class="hide"><#form:treeselect id="switchOfficeSelect" title="${text('部门切换')}" allowClear="true"
 		url="${ctx}/sys/empUser/officeListData?isShowCode=true" callbackFuncName="switchOfficeSelectCallback"
diff --git a/modules/core/src/main/resources/views/modules/sys/switchSkin.html b/modules/core/src/main/resources/views/modules/sys/switchSkin.html
index 7c08685e..cef086d9 100644
--- a/modules/core/src/main/resources/views/modules/sys/switchSkin.html
+++ b/modules/core/src/main/resources/views/modules/sys/switchSkin.html
@@ -145,7 +145,7 @@
 	<li style="float:left;width:16.66666%;padding:5px;">
 		<a href="javascript:" data-skin="skin-blue-light2" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
 			<span style="display:block;width:20%;float:left;height:13px;background:#1681e5"></span>
-			<span style="display:block;width:80%;float:left;height:13px;background:#1890ff"></span>
+			<span style="display:block;width:80%;float:left;height:13px;background:#1677ff"></span>
 			<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
 			<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
 		</a>
@@ -163,7 +163,7 @@
 	<li style="float:left;width:16.66666%;padding:5px;">
 		<a href="javascript:" data-skin="skin-blue-light3" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
 			<span style="display:block;width:20%;float:left;height:13px;background:#1681e5"></span>
-			<span style="display:block;width:80%;float:left;height:13px;background:#1890ff"></span>
+			<span style="display:block;width:80%;float:left;height:13px;background:#1677ff"></span>
 			<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
 			<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
 		</a>
@@ -186,7 +186,7 @@
 <% } %>
 <script>
 $('.full-opacity-hover').click(function(){
-	js.window.location = '${ctx}/switchSkin/' + $(this).data('skin');
+	js.window.location = '${ctx}/switchSkin/' + $(this).data('skin') + "?url=" + js.window.location;
 });
 
 $('#formLayerModel')
diff --git a/modules/static/src/main/resources/static/modules/sys/sysIndex.css b/modules/static/src/main/resources/static/modules/sys/sysIndex.css
index 5d259335..134c362f 100644
--- a/modules/static/src/main/resources/static/modules/sys/sysIndex.css
+++ b/modules/static/src/main/resources/static/modules/sys/sysIndex.css
@@ -27,7 +27,7 @@
 .navbar-nav > .treeview > a > .pull-right-container > .fa-angle-left{display:none;}
 .navbar-nav li > a > .pull-right-container > .fa-angle-left {margin-top:3px;transition:transform 0.5s ease;}
 .navbar-nav .menu-open > a > .pull-right-container > .fa-angle-left {transform: rotate(-90deg);}
-.navbar-nav .treeview.active>a {color:#1890ff;background-color:#e1e3e9;}
+.navbar-nav .treeview.active>a {color:#1677ff;background-color:#e1e3e9;}
 .navbar-nav .treeview small.label {float:right;}
 
 /* 头部消息列表 */
-- 
Gitee


From cc31d01f572d40cbf72174f461f66ec3dfeff1b0 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 7 May 2025 12:18:23 +0800
Subject: [PATCH 09/84] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0=20my?=
 =?UTF-8?q?batis.orderBySqlFilter=20=E4=BB=85=E5=AF=B9=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE=E7=94=9F=E6=95=88=EF=BC=8C?=
 =?UTF-8?q?UI=E4=BC=A0=E8=BE=93=E7=9A=84=E6=95=B0=E6=8D=AE=E4=BB=8D?=
 =?UTF-8?q?=E7=84=B6=E5=BF=85=E9=A1=BB=E7=BB=8F=E8=BF=87=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/src/main/resources/config/jeesite-core.yml |  8 +++++++-
 web-api/src/main/resources/config/application.yml   | 13 +++++++++++++
 web/src/main/resources/config/application.yml       | 13 +++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index aac7c486..a5cecd2a 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -130,13 +130,19 @@ mybatis:
   # 批量插入和更新的分批默认大小（防止库一次性接受不了太大的sql语句）
   defaultBatchSize: 500
 
-  # 执行逻辑删除的时候，同时修改主键字段值，方便再次使用这个主键值 v5.4.0+
+  # 执行逻辑删除的时候，同时修改主键字段值，方便再次使用这个主键值（调用 entity.sqlMap().markIdDelete() 时生效） v5.4.0+
   # 案例分析（角色管理场景）：
   #  1.如果是逻辑删除数据，并非物理删除，所以删除了角色 abc 再次新增时，会提示 abc 编号已存在
   #  2.使用方法为：在 super.delete(entity); 前调用：entity.sqlMap().markIdDelete();
   #  3.一般在手动填写主键业务中使用，启用后将会在删除后，修改 ID 值数据，例如：abc__del_随机串
   markIdDeleteFlag: __del_
 
+  # 允许 @Table orderBy 排序 设置为空，否则默认使用 主键 排序 v4.5.0 v5.1.0
+  allowOrderEmpty: true
+
+  # 排序字段 SQL 过滤，该参数仅对 sqlMap.getOrder().setOrderBy 内部调用方法有效 page.setOrderBy 和 entity.setOrderBy 必须经过过滤 v5.12.0
+  orderBySqlFilter: false
+
   # Mapper文件刷新线程
   mapper:
     refresh:
diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml
index 5961312d..80b9e7dd 100644
--- a/web-api/src/main/resources/config/application.yml
+++ b/web-api/src/main/resources/config/application.yml
@@ -329,6 +329,19 @@ mybatis:
 #
 #  # 批量插入和更新的分批默认大小（防止库一次性接受不了太大的sql语句）
 #  defaultBatchSize: 500
+#
+#  # 执行逻辑删除的时候，同时修改主键字段值，方便再次使用这个主键值（调用 entity.sqlMap().markIdDelete() 时生效） v5.4.0+
+#  # 案例分析（角色管理场景）：
+#  #  1.如果是逻辑删除数据，并非物理删除，所以删除了角色 abc 再次新增时，会提示 abc 编号已存在
+#  #  2.使用方法为：在 super.delete(entity); 前调用：entity.sqlMap().markIdDelete();
+#  #  3.一般在手动填写主键业务中使用，启用后将会在删除后，修改 ID 值数据，例如：abc__del_随机串
+#  markIdDeleteFlag: __del_
+#
+#  # 允许 @Table orderBy 排序 设置为空，否则默认使用 主键 排序 v4.5.0 v5.1.0
+#  allowOrderEmpty: true
+#
+#  # 排序字段 SQL 过滤，该参数仅对 sqlMap.getOrder().setOrderBy 内部调用方法有效 page.setOrderBy 和 entity.setOrderBy 必须经过过滤 v5.12.0
+#  orderBySqlFilter: false
 
   # Mapper文件刷新线程
   mapper:
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 4424ef9d..52ecbe26 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -329,6 +329,19 @@ mybatis:
 #
 #  # 批量插入和更新的分批默认大小（防止库一次性接受不了太大的sql语句）
 #  defaultBatchSize: 500
+#
+#  # 执行逻辑删除的时候，同时修改主键字段值，方便再次使用这个主键值（调用 entity.sqlMap().markIdDelete() 时生效） v5.4.0+
+#  # 案例分析（角色管理场景）：
+#  #  1.如果是逻辑删除数据，并非物理删除，所以删除了角色 abc 再次新增时，会提示 abc 编号已存在
+#  #  2.使用方法为：在 super.delete(entity); 前调用：entity.sqlMap().markIdDelete();
+#  #  3.一般在手动填写主键业务中使用，启用后将会在删除后，修改 ID 值数据，例如：abc__del_随机串
+#  markIdDeleteFlag: __del_
+#
+#  # 允许 @Table orderBy 排序 设置为空，否则默认使用 主键 排序 v4.5.0 v5.1.0
+#  allowOrderEmpty: true
+#
+#  # 排序字段 SQL 过滤，该参数仅对 sqlMap.getOrder().setOrderBy 内部调用方法有效 page.setOrderBy 和 entity.setOrderBy 必须经过过滤 v5.12.0
+#  orderBySqlFilter: false
 
   # Mapper文件刷新线程
   mapper:
-- 
Gitee


From 349757216ebd2fcd4d85db283f9dfd7de8bc6c93 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 7 May 2025 14:55:12 +0800
Subject: [PATCH 10/84] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i18n/core/sys/i18n_en.properties          |  1 +
 .../i18n/core/sys/i18n_ja_JP.properties       |  1 +
 .../views/modules/sys/configForm.html         |  1 +
 .../resources/views/modules/sys/langForm.html |  1 +
 .../resources/views/modules/sys/menuForm.html |  2 +-
 .../views/modules/sys/moduleForm.html         | 28 +++++++++++--------
 .../resources/views/modules/sys/postForm.html |  1 +
 .../resources/views/modules/sys/roleForm.html |  1 +
 8 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
index 7447d100..57f3b36c 100644
--- a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
+++ b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
@@ -547,6 +547,7 @@
 主类全名=Main class name
 模块描述=Module description
 当前版本=Current version
+升级信息=Upgrade info
 版本=version
 未知=Unknown
 未安装=Uninstalled
diff --git a/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties b/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties
index b180fb0c..5b9d18de 100644
--- a/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties
+++ b/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties
@@ -460,6 +460,7 @@
 主类全名=主類のフルネーム
 模块描述=モジュール記述
 当前版本=現行版
+升级信息=アップグレードします情報
 版本=バージョン
 未知=未知
 未安装=未実装
diff --git a/modules/core/src/main/resources/views/modules/sys/configForm.html b/modules/core/src/main/resources/views/modules/sys/configForm.html
index 95c53106..aff7c564 100644
--- a/modules/core/src/main/resources/views/modules/sys/configForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/configForm.html
@@ -63,6 +63,7 @@
 						</div>
 					</div>
 				</div>
+				<div class="form-unit">${text('其它信息')}</div>
 				<div class="row">
 					<div class="col-xs-12">
 						<div class="form-group">
diff --git a/modules/core/src/main/resources/views/modules/sys/langForm.html b/modules/core/src/main/resources/views/modules/sys/langForm.html
index d201ecf5..6e5bc25c 100644
--- a/modules/core/src/main/resources/views/modules/sys/langForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/langForm.html
@@ -61,6 +61,7 @@
 						</div>
 					</div>
 				</div>
+				<div class="form-unit">${text('其它信息')}</div>
 				<div class="row">
 					<div class="col-xs-12">
 						<div class="form-group">
diff --git a/modules/core/src/main/resources/views/modules/sys/menuForm.html b/modules/core/src/main/resources/views/modules/sys/menuForm.html
index 5a915461..2104eb30 100644
--- a/modules/core/src/main/resources/views/modules/sys/menuForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/menuForm.html
@@ -170,6 +170,7 @@ Vue：const props = defineProps({ aa: String, bb: String })">
 						</div>
 					</div>
 				</div>
+				<div class="form-unit">${text('其它信息')}</div>
 				<div class="row">
 					<div class="col-xs-6 isMenu">
 						<div class="form-group">
@@ -224,7 +225,6 @@ Vue：const props = defineProps({ aa: String, bb: String })">
 						</div>
 					</div>
 				</div>
-				<div class="form-unit">${text('其它信息')}</div>
 				<div class="row">
 					<div class="col-xs-12">
 						<div class="form-group">
diff --git a/modules/core/src/main/resources/views/modules/sys/moduleForm.html b/modules/core/src/main/resources/views/modules/sys/moduleForm.html
index e13075a7..07cbdec4 100644
--- a/modules/core/src/main/resources/views/modules/sys/moduleForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/moduleForm.html
@@ -62,22 +62,28 @@ Class.forName(“com.jeesite.modules.sys.web.LoginController”)；在微服务
 						</div>
 					</div>
 				</div>
+				<div class="form-unit">${text('版本信息')}</div>
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-xs-6">
 						<div class="form-group">
-							<label class="control-label col-sm-2" title="">
+							<label class="control-label col-sm-4" title="">
 								<span class="required hide">*</span> ${text('当前版本')}：<i class="fa icon-question hide"></i></label>
-							<% if(isNotBlank(module.upgradeInfo)){ %>
-								<div class="col-sm-6 control-text">
-									${module.currentVersion} &nbsp; ${module.upgradeInfo}
-								</div>
-							<% }else{ %>
-								<div class="col-sm-4">
-									<#form:input path="currentVersion" maxlength="50" class="form-control"/>
-								</div>
-							<% } %>
+							<div class="col-sm-8">
+								<#form:input path="currentVersion" maxlength="50" class="form-control" readonly="${!module.isNewRecord}"/>
+							</div>
+						</div>
+					</div>
+					<% if(!module.isNewRecord){ %>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('升级信息')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="upgradeInfo" maxlength="300" class="form-control" readonly="true"/>
+							</div>
 						</div>
 					</div>
+					<% } %>
 				</div>
 				<% if (hasPermi('sys:module:edit') && isCustomModule){ %>
 				<div class="form-unit">${text('生成工程代码')}</div>
diff --git a/modules/core/src/main/resources/views/modules/sys/postForm.html b/modules/core/src/main/resources/views/modules/sys/postForm.html
index 697b7ff4..6dda944b 100644
--- a/modules/core/src/main/resources/views/modules/sys/postForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/postForm.html
@@ -57,6 +57,7 @@
 						</div>
 					</div>
 				</div>
+				<div class="form-unit">${text('其它信息')}</div>
 				<div class="row">
 					<div class="col-xs-12">
 						<div class="form-group">
diff --git a/modules/core/src/main/resources/views/modules/sys/roleForm.html b/modules/core/src/main/resources/views/modules/sys/roleForm.html
index 5c9d2807..5bf105d3 100644
--- a/modules/core/src/main/resources/views/modules/sys/roleForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/roleForm.html
@@ -95,6 +95,7 @@
 						</div>
 					</div>
 				</div>
+				<div class="form-unit">${text('其它信息')}</div>
 				<div class="row">
 					<div class="col-xs-6">
 						<div class="form-group">
-- 
Gitee


From 6b4a69453da53b25746c7294573976736ff83b67 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 8 May 2025 09:46:25 +0800
Subject: [PATCH 11/84] next

---
 common/pom.xml         | 2 +-
 modules/app/pom.xml    | 2 +-
 modules/cms-ai/pom.xml | 2 +-
 modules/cms/pom.xml    | 2 +-
 modules/core/pom.xml   | 2 +-
 modules/pom.xml        | 2 +-
 modules/static/pom.xml | 2 +-
 modules/test/pom.xml   | 2 +-
 parent/pom.xml         | 2 +-
 pom.xml                | 2 +-
 root/pom.xml           | 2 +-
 web-ai/pom.xml         | 4 ++--
 web-api/pom.xml        | 2 +-
 web-fast/pom.xml       | 4 ++--
 web-mini/pom.xml       | 2 +-
 web/pom.xml            | 2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index 7c4a7a13..b4beee15 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.11.1.springboot3-SNAPSHOT</version>
+		<version>5.12.0.springboot3-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
diff --git a/modules/app/pom.xml b/modules/app/pom.xml
index 94c903f5..35409142 100644
--- a/modules/app/pom.xml
+++ b/modules/app/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.11.1.springboot3-SNAPSHOT</version>
+		<version>5.12.0.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
diff --git a/modules/cms-ai/pom.xml b/modules/cms-ai/pom.xml
index 548c0532..ca10bc0e 100644
--- a/modules/cms-ai/pom.xml
+++ b/modules/cms-ai/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.11.1.springboot3-SNAPSHOT</version>
+		<version>5.12.0.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
diff --git a/modules/cms/pom.xml b/modules/cms/pom.xml
index 92cff54e..90d935c0 100644
--- a/modules/cms/pom.xml
+++ b/modules/cms/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.11.1.springboot3-SNAPSHOT</version>
+		<version>5.12.0.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 79044bac..6b290034 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.11.1.springboot3-SNAPSHOT</version>
+		<version>5.12.0.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
diff --git a/modules/pom.xml b/modules/pom.xml
index 9464a18c..856c94a9 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -5,7 +5,7 @@
 	
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite-modules</artifactId>
-	<version>5.11.1.springboot3-SNAPSHOT</version>
+	<version>5.12.0.springboot3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>JeeSite Modules</name>
diff --git a/modules/static/pom.xml b/modules/static/pom.xml
index 3a91e94c..43068990 100644
--- a/modules/static/pom.xml
+++ b/modules/static/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.11.1.springboot3-SNAPSHOT</version>
+		<version>5.12.0.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
diff --git a/modules/test/pom.xml b/modules/test/pom.xml
index 11ff396d..440cb5c0 100644
--- a/modules/test/pom.xml
+++ b/modules/test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.11.1.springboot3-SNAPSHOT</version>
+		<version>5.12.0.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
diff --git a/parent/pom.xml b/parent/pom.xml
index 89fc7131..ce9e563f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite-parent</artifactId>
-	<version>5.11.1.springboot3-SNAPSHOT</version>
+	<version>5.12.0.springboot3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>JeeSite Parent</name>
diff --git a/pom.xml b/pom.xml
index a4330274..6dee30f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite</artifactId>
-	<version>5.11.1.springboot3-SNAPSHOT</version>
+	<version>5.12.0.springboot3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>JeeSite</name>
diff --git a/root/pom.xml b/root/pom.xml
index 10a3820d..253be7df 100644
--- a/root/pom.xml
+++ b/root/pom.xml
@@ -5,7 +5,7 @@
 	
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite-root</artifactId>
-	<version>5.11.1.springboot3-SNAPSHOT</version>
+	<version>5.12.0.springboot3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>JeeSite Root</name>
diff --git a/web-ai/pom.xml b/web-ai/pom.xml
index 4569e154..93381b88 100644
--- a/web-ai/pom.xml
+++ b/web-ai/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.11.1.springboot3-SNAPSHOT</version>
+		<version>5.12.0.springboot3-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
@@ -56,7 +56,7 @@
 		<dependency>
 			<groupId>com.jeesite</groupId>
 			<artifactId>jeesite-vue-dist</artifactId>
-			<version>5.11.1-SNAPSHOT</version>
+			<version>5.12.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>
diff --git a/web-api/pom.xml b/web-api/pom.xml
index b17d0263..7110b328 100644
--- a/web-api/pom.xml
+++ b/web-api/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.11.1.springboot3-SNAPSHOT</version>
+		<version>5.12.0.springboot3-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
diff --git a/web-fast/pom.xml b/web-fast/pom.xml
index 782348b7..111194e5 100644
--- a/web-fast/pom.xml
+++ b/web-fast/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.11.1.springboot3-SNAPSHOT</version>
+		<version>5.12.0.springboot3-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
@@ -97,7 +97,7 @@
 		<dependency>
 			<groupId>com.jeesite</groupId>
 			<artifactId>jeesite-vue-dist</artifactId>
-			<version>5.11.1-SNAPSHOT</version>
+			<version>5.12.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>
diff --git a/web-mini/pom.xml b/web-mini/pom.xml
index fc40f3e8..2168256b 100644
--- a/web-mini/pom.xml
+++ b/web-mini/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.11.1.springboot3-SNAPSHOT</version>
+		<version>5.12.0.springboot3-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
diff --git a/web/pom.xml b/web/pom.xml
index 75c7d77c..2408a016 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.11.1.springboot3-SNAPSHOT</version>
+		<version>5.12.0.springboot3-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
-- 
Gitee


From 31eab113a2770ea919983eb62284df557363a22a Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 8 May 2025 09:52:04 +0800
Subject: [PATCH 12/84] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=A1=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/src/main/resources/static/modules/sys/sysIndex.css   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/static/src/main/resources/static/modules/sys/sysIndex.css b/modules/static/src/main/resources/static/modules/sys/sysIndex.css
index 134c362f..31aede58 100644
--- a/modules/static/src/main/resources/static/modules/sys/sysIndex.css
+++ b/modules/static/src/main/resources/static/modules/sys/sysIndex.css
@@ -33,6 +33,8 @@
 /* 头部消息列表 */
 .navbar-nav>.messages-menu i.img-circle{margin:auto 10px auto auto;display:block;width:33px;height:33px;padding:9px;font-weight: bold;}
 .navbar-nav>.messages-menu>.dropdown-menu>li.header{border-radius:0;background-color:#f9f9f9;}
+.navbar-nav>.messages-menu>.dropdown-menu>li .menu {max-height:300px}
+.navbar-nav>.messages-menu>.dropdown-menu>li .menu>li>a>h4 {font-size:14px;font-weight:normal;margin-bottom:3px;}
 .navbar-nav>.messages-menu>.dropdown-menu>li a {white-space:normal!important;}
 
 /* 侧边栏用户头像 */
-- 
Gitee


From 95ab40a14ffa7ccf7abbfe6bacc2c6a72ab18c25 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 8 May 2025 11:51:52 +0800
Subject: [PATCH 13/84] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20ai=20=E5=BC=82?=
 =?UTF-8?q?=E6=AD=A5=E4=BB=BB=E5=8A=A1=E6=B1=A0=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/ai/config/CmsAiWebMvcConfig.java      | 36 +++++++++++++++++++
 .../main/resources/config/jeesite-cms-ai.yml  |  1 -
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiWebMvcConfig.java

diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiWebMvcConfig.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiWebMvcConfig.java
new file mode 100644
index 00000000..943f50b9
--- /dev/null
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiWebMvcConfig.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ */
+package com.jeesite.modules.cms.ai.config;
+
+import com.jeesite.common.config.Global;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * MVC 异步任务池定义
+ * @author ThinkGem
+ */
+@Configuration
+public class CmsAiWebMvcConfig implements WebMvcConfigurer {
+
+    @Override
+    public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
+        configurer.setTaskExecutor(webMvcAsyncTaskExecutor());
+    }
+
+    @Bean
+    public ThreadPoolTaskExecutor webMvcAsyncTaskExecutor() {
+        ThreadPoolTaskExecutor bean = new ThreadPoolTaskExecutor();
+		bean.setCorePoolSize(Global.getPropertyToInteger("web.taskPool.corePoolSize", "8"));
+		bean.setMaxPoolSize(Global.getPropertyToInteger("web.taskPool.maxPoolSize", "20"));
+		bean.setKeepAliveSeconds(Global.getPropertyToInteger("web.taskPool.keepAliveSeconds", "60"));
+		bean.setQueueCapacity(Global.getPropertyToInteger("web.taskPool.queueCapacity", String.valueOf(Integer.MAX_VALUE)));
+        bean.setThreadNamePrefix("web-async-");
+        return bean;
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
index ffc6bf43..698dfe0b 100644
--- a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
+++ b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
@@ -113,7 +113,6 @@ spring:
         3. 可以用少量表情，避免过多表情。
         4. 增加互动，如 “您的看法如何？”
       
-    
 
 # ========= Postgresql 向量数据库数据源 =========
 
-- 
Gitee


From 179ec878ea932db2ce8bfbf2289036c8a42aa90a Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 8 May 2025 11:52:18 +0800
Subject: [PATCH 14/84] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20spring=20ai=201.0.0-?=
 =?UTF-8?q?M8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/cms-ai/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cms-ai/pom.xml b/modules/cms-ai/pom.xml
index ca10bc0e..6b0d3dbe 100644
--- a/modules/cms-ai/pom.xml
+++ b/modules/cms-ai/pom.xml
@@ -19,7 +19,7 @@
 
 	<properties>
 
-		<spring-ai.version>1.0.0-M7</spring-ai.version>
+		<spring-ai.version>1.0.0-M8</spring-ai.version>
 
 	</properties>
 	
-- 
Gitee


From d30b5f60d789329b41832217ba770a35b17c9a57 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 9 May 2025 14:29:33 +0800
Subject: [PATCH 15/84] fileAllowSuffixes add .ofd

---
 modules/core/src/main/resources/config/jeesite-core.yml         | 2 +-
 .../core/src/main/resources/views/htmltags/form/fileupload.html | 2 +-
 web-api/src/main/resources/config/application.yml               | 2 +-
 web/src/main/resources/config/application.yml                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index a5cecd2a..c6d627bb 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -761,7 +761,7 @@ file:
   # 设置允许上传的文件后缀（全局设置）
   imageAllowSuffixes: .gif,.bmp,.jpeg,.jpg,.ico,.png,.tif,.tiff,.webp,
   mediaAllowSuffixes: .flv,.swf,.mkv,webm,.mid,.mov,.mp3,.mp4,.m4v,.mpc,.mpeg,.mpg,.swf,.wav,.wma,.wmv,.avi,.rm,.rmi,.rmvb,.aiff,.asf,.ogg,.ogv,
-  fileAllowSuffixes: .doc,.docx,.rtf,.xls,.xlsx,.csv,.ppt,.pptx,.pdf,.vsd,.txt,.md,.xml,.rar,.zip,.7z,.tar,.tgz,.jar,.gz,.gzip,.bz2,.cab,.iso,.ipa,.apk,
+  fileAllowSuffixes: .doc,.docx,.rtf,.xls,.xlsx,.csv,.ppt,.pptx,.pdf,.ofd,.vsd,.txt,.md,.xml,.rar,.zip,.7z,.tar,.tgz,.jar,.gz,.gzip,.bz2,.cab,.iso,.ipa,.apk,
   
   # 允许上传的文件内容类型（图片、word、excel、ppt）防止修改后缀恶意上传文件（默认不启用验证）
 #  allowContentTypes: image/jpeg,image/gif,image/bmp,image/png,image/x-png,
diff --git a/modules/core/src/main/resources/views/htmltags/form/fileupload.html b/modules/core/src/main/resources/views/htmltags/form/fileupload.html
index 50d61366..017d693c 100644
--- a/modules/core/src/main/resources/views/htmltags/form/fileupload.html
+++ b/modules/core/src/main/resources/views/htmltags/form/fileupload.html
@@ -163,7 +163,7 @@ $(function() {
 		maxFileSize: "#{isNotBlank(p.maxFileSize)?p.maxFileSize:@Global.getConfig('file.maxFileSize', '500*1024*1024')}",
 		imageAllowSuffixes: '${isNotBlank(p.allowSuffixes)?p.allowSuffixes:@Global.getConfig("file.imageAllowSuffixes", ".gif,.bmp,.jpeg,.jpg,.ico,.png,.tif,.tiff,.webp,")}',
 		mediaAllowSuffixes: '${isNotBlank(p.allowSuffixes)?p.allowSuffixes:@Global.getConfig("file.mediaAllowSuffixes", ".flv,.swf,.mkv,webm,.mid,.mov,.mp3,.mp4,.m4v,.mpc,.mpeg,.mpg,.swf,.wav,.wma,.wmv,.avi,.rm,.rmi,.rmvb,.aiff,.asf,.ogg,.ogv,")}',
-		fileAllowSuffixes: '${isNotBlank(p.allowSuffixes)?p.allowSuffixes:@Global.getConfig("file.fileAllowSuffixes", ".doc,.docx,.rtf,.xls,.xlsx,.csv,.ppt,.pptx,.pdf,.vsd,.txt,.md,.xml,.rar,.zip,.7z,.tar,.tgz,.jar,.gz,.gzip,.bz2,.cab,.iso,")}',
+		fileAllowSuffixes: '${isNotBlank(p.allowSuffixes)?p.allowSuffixes:@Global.getConfig("file.fileAllowSuffixes", ".doc,.docx,.rtf,.xls,.xlsx,.csv,.ppt,.pptx,.pdf,.ofd,.vsd,.txt,.md,.xml,.rar,.zip,.7z,.tar,.tgz,.jar,.gz,.gzip,.bz2,.cab,.iso,")}',
 		chunked: "#{__info_type=='0'?false:@Global.getConfig('file.chunked', 'true')}",
 		chunkSize: "#{@Global.getConfigToInteger('file.chunkSize', '10*1024*1024')}",
 		threads: "#{@Global.getConfigToInteger('file.threads', '3')}",
diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml
index 80b9e7dd..8202ce9d 100644
--- a/web-api/src/main/resources/config/application.yml
+++ b/web-api/src/main/resources/config/application.yml
@@ -902,7 +902,7 @@ file:
 #  # 设置允许上传的文件后缀（全局设置）
 #  imageAllowSuffixes: .gif,.bmp,.jpeg,.jpg,.ico,.png,.tif,.tiff,.webp,
 #  mediaAllowSuffixes: .flv,.swf,.mkv,webm,.mid,.mov,.mp3,.mp4,.m4v,.mpc,.mpeg,.mpg,.swf,.wav,.wma,.wmv,.avi,.rm,.rmi,.rmvb,.aiff,.asf,.ogg,.ogv,
-#  fileAllowSuffixes: .doc,.docx,.rtf,.xls,.xlsx,.csv,.ppt,.pptx,.pdf,.vsd,.txt,.md,.xml,.rar,.zip,.7z,.tar,.tgz,.jar,.gz,.gzip,.bz2,.cab,.iso,.ipa,.apk,
+#  fileAllowSuffixes: .doc,.docx,.rtf,.xls,.xlsx,.csv,.ppt,.pptx,.pdf,.ofd,.vsd,.txt,.md,.xml,.rar,.zip,.7z,.tar,.tgz,.jar,.gz,.gzip,.bz2,.cab,.iso,.ipa,.apk,
 #  
 #  # 允许上传的文件内容类型（图片、word、excel、ppt）防止修改后缀恶意上传文件（默认不启用验证）
 #  #allowContentTypes: image/jpeg,image/gif,image/bmp,image/png,image/x-png,
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 52ecbe26..51a63d32 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -902,7 +902,7 @@ file:
 #  # 设置允许上传的文件后缀（全局设置）
 #  imageAllowSuffixes: .gif,.bmp,.jpeg,.jpg,.ico,.png,.tif,.tiff,.webp,
 #  mediaAllowSuffixes: .flv,.swf,.mkv,webm,.mid,.mov,.mp3,.mp4,.m4v,.mpc,.mpeg,.mpg,.swf,.wav,.wma,.wmv,.avi,.rm,.rmi,.rmvb,.aiff,.asf,.ogg,.ogv,
-#  fileAllowSuffixes: .doc,.docx,.rtf,.xls,.xlsx,.csv,.ppt,.pptx,.pdf,.vsd,.txt,.md,.xml,.rar,.zip,.7z,.tar,.tgz,.jar,.gz,.gzip,.bz2,.cab,.iso,.ipa,.apk,
+#  fileAllowSuffixes: .doc,.docx,.rtf,.xls,.xlsx,.csv,.ppt,.pptx,.pdf,.ofd,.vsd,.txt,.md,.xml,.rar,.zip,.7z,.tar,.tgz,.jar,.gz,.gzip,.bz2,.cab,.iso,.ipa,.apk,
 #
 #  # 允许上传的文件内容类型（图片、word、excel、ppt）防止修改后缀恶意上传文件（默认不启用验证）
 #  #allowContentTypes: image/jpeg,image/gif,image/bmp,image/png,image/x-png,
-- 
Gitee


From 681f4e751068f6f9842481491bd512ddee3dbec2 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 9 May 2025 17:49:14 +0800
Subject: [PATCH 16/84] =?UTF-8?q?=E5=BD=93=E5=B7=B2=E7=9F=A5=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=BF=A1=E6=81=AF=E5=8C=85=E5=90=AB=E6=9B=B4=E5=A4=9A?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF=E6=89=93=E5=8D=B0=E5=88=B0?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/lang/ExceptionUtils.java   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/lang/ExceptionUtils.java b/common/src/main/java/com/jeesite/common/lang/ExceptionUtils.java
index 23b1f7de..49242c50 100644
--- a/common/src/main/java/com/jeesite/common/lang/ExceptionUtils.java
+++ b/common/src/main/java/com/jeesite/common/lang/ExceptionUtils.java
@@ -37,16 +37,19 @@ public class ExceptionUtils {
 	public static String getExceptionMessage(Throwable ex){
 		String message = null;
 		Throwable e = ex;
-		while (true){
-			if (e == null){
+		while (true) {
+			if (e == null) {
 				break;
 			}
-			if (StringUtils.startsWith(e.getMessage(), "msg:")){
+			if (StringUtils.startsWith(e.getMessage(), "msg:")) {
 				message = StringUtils.replace(e.getMessage(), "msg:", "");
-				break;
-			}else if ("com.jeesite.common.service.ServiceException"
-					.equals(e.getClass().getName())){
+			} else if ("com.jeesite.common.service.ServiceException".equals(e.getClass().getName())){
 				message = e.getMessage();
+			}
+			if (StringUtils.isNotBlank(message)){
+				if (e.getSuppressed() != null && e.getCause() != null){
+					ex.addSuppressed(e.getCause());
+				}
 				break;
 			}
 			e = e.getCause();
-- 
Gitee


From 8789c83942e2145f11a09d642d60970bc3d54c63 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 12 May 2025 11:02:30 +0800
Subject: [PATCH 17/84] =?UTF-8?q?FastJSON=202.x=20=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E4=B8=AA=E5=88=AB=E7=AC=AC=E4=B8=89=E6=96=B9=E5=9C=A8=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=EF=BC=8C1.x=20=E5=B7=B2=E7=BB=8F=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=86=8D=E7=94=A8=E4=BA=86=EF=BC=8C=E4=BB=A3=E7=A0=81=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jeesite/common/io/PropertyLoader.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/io/PropertyLoader.java b/common/src/main/java/com/jeesite/common/io/PropertyLoader.java
index 3863f52a..5c70fa84 100644
--- a/common/src/main/java/com/jeesite/common/io/PropertyLoader.java
+++ b/common/src/main/java/com/jeesite/common/io/PropertyLoader.java
@@ -4,7 +4,6 @@
  */
 package com.jeesite.common.io;
 
-import com.alibaba.fastjson.parser.ParserConfig;
 import com.jeesite.common.lang.StringUtils;
 import org.springframework.boot.env.OriginTrackedMapPropertySource;
 import org.springframework.boot.env.PropertiesPropertySourceLoader;
@@ -39,12 +38,12 @@ public class PropertyLoader implements org.springframework.boot.env.PropertySour
 		List<PropertySource<?>> propertySources = new ArrayList<>();
 		if (!isLoadJeeSitePropertySource) {
 			isLoadJeeSitePropertySource = true;
-			try {
-				// 默认开启 FastJSON 1.x 的，安全模式
-				ParserConfig.getGlobalInstance().setSafeMode(true);
-			} catch (Throwable ignored) {
-				// 兼容 FastJSON 2.x 的调用，忽略异常
-			}
+//			try {
+//				// 默认开启 FastJSON 1.x 的，安全模式
+//				ParserConfig.getGlobalInstance().setSafeMode(true);
+//			} catch (Throwable ignored) {
+//				// 兼容 FastJSON 2.x 的调用，忽略异常
+//			}
 			Properties properties = PropertiesUtils.getInstance().getProperties();
 			propertySources.add(new OriginTrackedMapPropertySource("jeesite", properties));
 		} else {
-- 
Gitee


From 1794d086b44fd74336da72829b838f88a9dd71f4 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 12 May 2025 11:04:50 +0800
Subject: [PATCH 18/84] upgrade seata 2.3.0

---
 .../resources/templates/modules/gen/crud_cloud/controller.xml   | 2 +-
 .../main/resources/templates/modules/gen/crud_cloud/service.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
index ba0d6e0b..82cd6d07 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
@@ -57,7 +57,7 @@ import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subMod
 <% } %>
 import ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Service;
 
-import io.seata.spring.annotation.GlobalTransactional;
+import org.apache.seata.spring.annotation.GlobalTransactional;
 
 /**
  * ${functionName}Controller
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
index c9caeb29..fdfa4da3 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
@@ -46,7 +46,7 @@ import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
 <% } %>
 
-import io.seata.spring.annotation.GlobalTransactional;
+import org.apache.seata.spring.annotation.GlobalTransactional;
 
 /**
  * ${functionName}Service
-- 
Gitee


From a1b5a868ec62b6298943baa82cf2f437c9cbe788 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 12 May 2025 11:09:56 +0800
Subject: [PATCH 19/84] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?=E8=BE=BE=E6=A2=A6=E5=92=8C=E4=BA=BA=E5=A4=A7=E9=87=91=E4=BB=93?=
 =?UTF-8?q?=E9=A9=B1=E5=8A=A8=EF=BC=8C=E5=87=8F=E5=B0=91=E5=92=A8=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E7=94=B1=E4=BA=8E=E4=B8=AA=E5=88=ABjdbc=E9=A9=B1?=
 =?UTF-8?q?=E5=8A=A8=E4=BD=93=E7=A7=AF=E6=AF=94=E8=BE=83=E5=A4=A7=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AF=E6=8C=89=E9=9C=80=E7=A7=BB=E9=99=A4=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/pom.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 6b290034..cc80191d 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -71,19 +71,21 @@
 			<scope>runtime</scope>
 		</dependency> -->
 
-		<!-- 达梦数据库
+		<!-- 达梦数据库 -->
 		<dependency>
 			<groupId>com.dameng</groupId>
 			<artifactId>Dm8JdbcDriver18</artifactId>
 			<version>8.1.1.49</version>
-		</dependency> -->
+			<scope>runtime</scope>
+		</dependency>
 
-		<!-- 人大金仓数据库
+		<!-- 人大金仓数据库 -->
 		<dependency>
 			<groupId>com.kingbase</groupId>
 			<artifactId>kingbasejdbc8</artifactId>
 			<version>8.6.0</version>
-		</dependency> -->
+			<scope>runtime</scope>
+		</dependency>
 
 		<!-- Web Server -->
 		<dependency>
-- 
Gitee


From c3e2f6fabbf1409194c041359c0807adbb07ac69 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 12 May 2025 11:22:19 +0800
Subject: [PATCH 20/84] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81reasoning=5Fcontent=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E6=88=96=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E7=BB=93=E6=9D=9F=E6=80=9D=E8=80=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java
index 70885aa0..1111817c 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java
@@ -92,7 +92,7 @@ public class WebClientThinkConfig {
 								}
 								String reasoningContent = (String) delta.get("reasoning_content");
 								String content = (String) delta.get("content");
-								if (reasoningContent != null) {
+								if (StringUtils.isNotBlank(reasoningContent)) {
 									if (!thinkingFlag.get()) {
 										thinkingFlag.set(true);
 										delta.put("content", "<think>\n" + reasoningContent);
-- 
Gitee


From bc15521b3aabf7d65cf442260f8776e200366f40 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 12 May 2025 11:24:04 +0800
Subject: [PATCH 21/84] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20defaultPromptTemplat?=
 =?UTF-8?q?e=20=E9=BB=98=E8=AE=A4=E9=97=AE=E9=A2=98=E5=9B=9E=E7=AD=94?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/ai/properties/CmsAiProperties.java    | 10 +++++
 .../cms/ai/service/CmsAiChatService.java      |  9 ++++-
 .../main/resources/config/jeesite-cms-ai.yml  | 38 +++++++++++--------
 3 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java
index d9c26847..07646b90 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java
@@ -9,6 +9,8 @@ public class CmsAiProperties {
 
 	private String defaultSystem = "";
 
+	private String defaultPromptTemplate = "";
+
 	public Boolean getToolCalls() {
 		return toolCalls;
 	}
@@ -24,4 +26,12 @@ public class CmsAiProperties {
 	public void setDefaultSystem(String defaultSystem) {
 		this.defaultSystem = defaultSystem;
 	}
+
+	public String getDefaultPromptTemplate() {
+		return defaultPromptTemplate;
+	}
+
+	public void setDefaultPromptTemplate(String defaultPromptTemplate) {
+		this.defaultPromptTemplate = defaultPromptTemplate;
+	}
 }
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
index 3bc3cdc2..33419055 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
@@ -10,6 +10,7 @@ import com.jeesite.common.idgen.IdGen;
 import com.jeesite.common.lang.DateUtils;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.service.BaseService;
+import com.jeesite.modules.cms.ai.properties.CmsAiProperties;
 import com.jeesite.modules.sys.utils.UserUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.ai.chat.client.ChatClient;
@@ -21,6 +22,7 @@ import org.springframework.ai.chat.messages.Message;
 import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.model.Generation;
+import org.springframework.ai.chat.prompt.PromptTemplate;
 import org.springframework.ai.vectorstore.SearchRequest;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +51,8 @@ public class CmsAiChatService extends BaseService {
     private ChatMemory chatMemory;
 	@Autowired
 	private VectorStore vectorStore;
+	@Autowired
+	private CmsAiProperties properties;
 
 	/**
 	 * 获取聊天对话消息
@@ -116,7 +120,10 @@ public class CmsAiChatService extends BaseService {
 			)
             .advisors(
 				new MessageChatMemoryAdvisor(chatMemory, conversationId, 1024),
-				new QuestionAnswerAdvisor(vectorStore, SearchRequest.builder().similarityThreshold(0.6F).topK(6).build())
+				QuestionAnswerAdvisor.builder(vectorStore)
+						.searchRequest(SearchRequest.builder().similarityThreshold(0.6F).topK(6).build())
+						.promptTemplate(new PromptTemplate(properties.getDefaultPromptTemplate()))
+						.build()
 			)
             .stream()
 			.chatResponse()
diff --git a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
index 698dfe0b..f4faceda 100644
--- a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
+++ b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
@@ -5,18 +5,18 @@ spring:
 
     # 在线大模型【请在 pom.xml 中打开 openai 的注释，并注释上其它模型】
     openai:
-      base-url: https://api.siliconflow.cn
-      api-key: ${SFLOW_APP_KEY}
-      #base-url: https://ai.gitee.com
-      #api-key: ${GITEE_APP_KEY}
-      #base-url: https://dashscope.aliyuncs.com/compatible-mode
-      #api-key: ${BAILIAN_APP_KEY}
+#      base-url: https://api.siliconflow.cn
+#      api-key: ${SFLOW_APP_KEY}
+#      base-url: https://ai.gitee.com
+#      api-key: ${GITEE_APP_KEY}
+      base-url: https://dashscope.aliyuncs.com/compatible-mode
+      api-key: ${BAILIAN_APP_KEY}
       # 聊天对话模型
       chat:
         options:
-          model: deepseek-ai/DeepSeek-R1-Distill-Qwen-7B
-          #model: DeepSeek-R1-Distill-Qwen-14B
-          #model: deepseek-r1-distill-llama-8b
+#          model: deepseek-ai/DeepSeek-R1-Distill-Qwen-7B
+#          model: DeepSeek-R1-Distill-Qwen-14B
+          model: deepseek-r1-distill-llama-8b
           max-tokens: 1024
           temperature: 0.6
           top-p: 0.9
@@ -25,11 +25,11 @@ spring:
       # 向量库知识库模型（注意：不同的模型维度不同）
       embedding:
         options:
-          model: BAAI/bge-m3
-          #model: bge-large-zh-v1.5
-          dimensions: 512
-          #model: text-embedding-v3
-          #dimensions: 1024
+#          model: BAAI/bge-m3
+#          model: bge-large-zh-v1.5
+#          dimensions: 512
+          model: text-embedding-v3
+          dimensions: 1024
 
     # 本地大模型配置【请在 pom.xml 中打开 ollama 的注释，并注释上其它模型】
     ollama:
@@ -112,7 +112,15 @@ spring:
         2. 使用幽默有趣的方式与我沟通。
         3. 可以用少量表情，避免过多表情。
         4. 增加互动，如 “您的看法如何？”
-      
+
+    # 默认问题回答模板
+    default-prompt-template: |
+      上下文信息如下，用---------------------符号标出：
+      ---------------------
+      {question_answer_context}
+      ---------------------
+      在提供上下文和历史信息的基础上，并且不使用先前知识的前提下回答用户的问题。
+      如果问题的答案不在上下文中，请告知用户你无法回答该问题。
 
 # ========= Postgresql 向量数据库数据源 =========
 
-- 
Gitee


From 7bd5c9eed0bf9ddc74b9f72260e3b6e03c81cf7d Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 12 May 2025 11:25:40 +0800
Subject: [PATCH 22/84] =?UTF-8?q?spring=20boot=203.4.5=E3=80=81mybatis=203?=
 =?UTF-8?q?.5.19=E3=80=81jsqlparser=204.9=E3=80=81quartz=202.5.0=E3=80=81l?=
 =?UTF-8?q?iquibase=204.31.1=E3=80=81=E7=AD=89=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parent/pom.xml | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index ce9e563f..7ae00b8a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.4.0</version>
+		<version>3.4.5</version>
 		<relativePath />
 	</parent>
 
@@ -21,18 +21,11 @@
 
 	<properties>
 
-		<!-- common version setting -->
-		<commons-io.version>2.16.1</commons-io.version>
-		<commons-text.version>1.12.0</commons-text.version>
+		<!-- commons version -->
+		<commons-io.version>2.19.0</commons-io.version>
+		<commons-text.version>1.13.1</commons-text.version>
 		<commons-email.version>1.6.0</commons-email.version>
 
-		<fury.version>0.9.0</fury.version>
-		<jackson-bom2.version>2.18.1</jackson-bom2.version>
-		<fastjson.version>2.0.51</fastjson.version>
-		<snakeyaml.version>2.2</snakeyaml.version>
-		<glassfish-jaxb.version>2.3.9</glassfish-jaxb.version>
-		<UserAgentUtils.version>1.21</UserAgentUtils.version>
-
 		<metadata-extractor.version>2.19.0</metadata-extractor.version>
 		<thumbnailator.version>0.4.20</thumbnailator.version>
 		<twelvemonkeys.version>3.11.0</twelvemonkeys.version>
@@ -41,31 +34,32 @@
 		<zxing.version>3.5.3</zxing.version>
 
 		<poi.version>5.2.3</poi.version>
-		<pinyin4j.version>2.5.1</pinyin4j.version>
+		<fury.version>0.10.2</fury.version>
 		<bcprov.version>1.78.1</bcprov.version>
-
+		<pinyin4j.version>2.5.1</pinyin4j.version>
+		<snakeyaml.version>2.2</snakeyaml.version>
+		<fastjson.version>2.0.57</fastjson.version>
 		<joda-time.version>2.12.7</joda-time.version>
+		<UserAgentUtils.version>1.21</UserAgentUtils.version>
 		<logstash-logback.version>7.4</logstash-logback.version>
-		<!--<elasticsearch.version>8.11.1</elasticsearch.version>-->
 
-		<!-- framework version setting -->
-		<mybatis.version>3.5.16</mybatis.version>
+		<!-- framework version -->
+		<mybatis.version>3.5.19</mybatis.version>
 		<mybatis-spring.version>3.0.4</mybatis-spring.version>
-		<jsqlparser.version>4.7</jsqlparser.version>
+		<jsqlparser.version>4.9</jsqlparser.version>
 		<atomikos.version>6.0.0</atomikos.version>
-		<druid.version>1.2.23</druid.version>
-		<shiro.version>2.0.2</shiro.version>
-		<quartz.version>2.4.0-rc3</quartz.version>
+		<druid.version>1.2.24</druid.version>
+		<shiro.version>2.0.4</shiro.version>
+		<quartz.version>2.5.0</quartz.version>
 		<swagger3.version>2.2.27</swagger3.version>
-		<liquibase.version>4.20.0</liquibase.version>
+		<liquibase.version>4.31.1</liquibase.version>
 
-		<!-- jdbc setting -->
+		<!-- jdbc driver version -->
 		<mysql.version>8.0.33</mysql.version>
 		<h2.version>2.3.232</h2.version>
 
 		<!-- environment setting -->
 		<java.version>17</java.version>
-		<!--<tomcat.version>10.1.16</tomcat.version>-->
 		<maven.test.skip>true</maven.test.skip>
 		<resource.delimiter>@</resource.delimiter>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
-- 
Gitee


From 723a088eede03c8597521878f4ba5f100bf128fb Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 14 May 2025 21:47:45 +0800
Subject: [PATCH 23/84] =?UTF-8?q?=E9=81=BF=E5=85=8DURL=E5=B8=A6#=E5=8F=B7?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jeesite/common/web/http/HttpClientUtils.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/src/main/java/com/jeesite/common/web/http/HttpClientUtils.java b/common/src/main/java/com/jeesite/common/web/http/HttpClientUtils.java
index e5c81143..b09c9da8 100644
--- a/common/src/main/java/com/jeesite/common/web/http/HttpClientUtils.java
+++ b/common/src/main/java/com/jeesite/common/web/http/HttpClientUtils.java
@@ -89,6 +89,7 @@ public class HttpClientUtils {
 	 * 构建表单数据，Map 转换 params，支持指定编码
 	 */
 	private static String buildUrl(String url, Map<String, String> dataMap, String charset) {
+		url = StringUtils.substringBefore(url, "#");
 		if (dataMap == null) {
 			return url;
 		}
-- 
Gitee


From 1b21375e1c6891bfefd7a19bfcd8137c947765ec Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 14 May 2025 21:48:29 +0800
Subject: [PATCH 24/84] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20Spring=20AI=201.0.0-?=
 =?UTF-8?q?RC1=E3=80=81Chroma=201.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/cms-ai/README.md                      |  2 +-
 modules/cms-ai/pom.xml                        |  2 +-
 .../cms/ai/config/CmsAiChatConfig.java        | 15 +++++
 .../ai/service/ArticleVectorStoreImpl.java    | 62 ++++++++++++-------
 ...ry.java => CacheChatMemoryRepository.java} | 27 ++++----
 .../cms/ai/service/CmsAiChatService.java      |  6 +-
 .../main/resources/config/jeesite-cms-ai.yml  |  4 +-
 7 files changed, 75 insertions(+), 43 deletions(-)
 rename modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/{CacheChatMemory.java => CacheChatMemoryRepository.java} (48%)

diff --git a/modules/cms-ai/README.md b/modules/cms-ai/README.md
index af19fbd0..94c82409 100644
--- a/modules/cms-ai/README.md
+++ b/modules/cms-ai/README.md
@@ -52,7 +52,7 @@
 ### 安装 Chroma
 
 ```sh
-docker run --name chroma -p 8000:8000 ghcr.io/chroma-core/chroma:0.5.20
+docker run -it --rm --name chroma -p 8000:8000 ghcr.io/chroma-core/chroma:1.0.0
 ```
 
 ### 安装 PGVector
diff --git a/modules/cms-ai/pom.xml b/modules/cms-ai/pom.xml
index 6b0d3dbe..c3a375f5 100644
--- a/modules/cms-ai/pom.xml
+++ b/modules/cms-ai/pom.xml
@@ -19,7 +19,7 @@
 
 	<properties>
 
-		<spring-ai.version>1.0.0-M8</spring-ai.version>
+		<spring-ai.version>1.0.0-RC1</spring-ai.version>
 
 	</properties>
 	
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiChatConfig.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiChatConfig.java
index ceeff286..006b9883 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiChatConfig.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiChatConfig.java
@@ -7,8 +7,11 @@ package com.jeesite.modules.cms.ai.config;
 import com.jeesite.common.datasource.DataSourceHolder;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.modules.cms.ai.properties.CmsAiProperties;
+import com.jeesite.modules.cms.ai.service.CacheChatMemoryRepository;
 import com.jeesite.modules.cms.ai.tools.CmsAiTools;
 import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.ai.chat.memory.ChatMemory;
+import org.springframework.ai.chat.memory.MessageWindowChatMemory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -39,6 +42,18 @@ public class CmsAiChatConfig {
         return builder.build();
     }
 
+	/**
+	 * 聊天对话数据存储
+	 * @author ThinkGem
+	 */
+	@Bean
+	public ChatMemory chatMemory(CacheChatMemoryRepository cacheChatMemoryRepository) {
+		return MessageWindowChatMemory.builder()
+				.chatMemoryRepository(cacheChatMemoryRepository)
+				.maxMessages(1024)
+				.build();
+	}
+
 //	@Bean
 //	public BatchingStrategy batchingStrategy() {
 //		return new TokenCountBatchingStrategy(EncodingType.CL100K_BASE, Integer.MAX_VALUE, 0.1);
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java
index 07d24ee2..247eaeeb 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java
@@ -12,6 +12,7 @@ import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.lang.TimeUtils;
 import com.jeesite.common.utils.PageUtils;
 import com.jeesite.common.web.http.HttpClientUtils;
+import com.jeesite.common.web.http.ServletUtils;
 import com.jeesite.modules.cms.entity.Article;
 import com.jeesite.modules.cms.service.ArticleVectorStore;
 import com.jeesite.modules.cms.utils.CmsUtils;
@@ -21,11 +22,11 @@ import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter;
 import com.vladsch.flexmark.html2md.converter.HtmlLinkResolver;
 import com.vladsch.flexmark.html2md.converter.HtmlLinkResolverFactory;
 import com.vladsch.flexmark.html2md.converter.HtmlNodeConverterContext;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.tika.Tika;
 import org.apache.tika.config.TikaConfig;
 import org.apache.tika.exception.TikaException;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.ai.document.Document;
@@ -75,13 +76,33 @@ public class ArticleVectorStoreImpl implements ArticleVectorStore {
 		metadata.put("updateBy", article.getUpdateBy());
 		metadata.put("updateDate", article.getUpdateDate());
 		List<String> attachmentList = ListUtils.newArrayList();
-		HtmlLinkResolverFactory linkResolverFactory = new HtmlLinkResolverFactory() {
+		String content = article.getTitle() + ", " + article.getKeywords() + ", "
+				+ article.getDescription() + ", " + FlexmarkHtmlConverter.builder()
+					.linkResolverFactory(getHtmlLinkResolverFactory(attachmentList)).build()
+					.convert(article.getArticleData().getContent())
+				+ ", attachment: " + attachmentList;
+		List<Document> documents = List.of(new Document(article.getId(), content, metadata));
+		List<Document> splitDocuments = new TokenTextSplitter().apply(documents);
+		this.delete(article); // 删除原数据
+		ListUtils.pageList(splitDocuments, 10, params -> {
+			vectorStore.add((List<Document>)params[0]); // 增加新数据
+			return null;
+		});
+	}
+
+	/**
+	 * 解析文章中的连接并提取内容
+	 * @author ThinkGem
+	 */
+	private @NotNull HtmlLinkResolverFactory getHtmlLinkResolverFactory(List<String> attachmentList) {
+		HttpServletRequest request = ServletUtils.getRequest();
+		return new HtmlLinkResolverFactory() {
 			@Override
-			public @Nullable Set<Class<?>> getAfterDependents() {
+			public @NotNull Set<Class<?>> getAfterDependents() {
 				return Set.of();
 			}
 			@Override
-			public @Nullable Set<Class<?>> getBeforeDependents() {
+			public @NotNull Set<Class<?>> getBeforeDependents() {
 				return Set.of();
 			}
 			@Override
@@ -94,11 +115,16 @@ public class ArticleVectorStoreImpl implements ArticleVectorStore {
 					if ("a".equalsIgnoreCase(node.nodeName())) {
 						String href = node.attributes().get("href"); String url = href;
 						if (StringUtils.contains(url, "://")) {
-							try (InputStream is = HttpClientUtils.getInputStream(url, null)) {
-								String text = getDocumentText(is);
-								attachmentList.add(url + text);
-							} catch (IOException | TikaException e) {
-								logger.error(e.getMessage(), e);
+							// 只提取系统允许跳转的附件内容，外部网站内容不进行提取，shiro.allowRedirects 参数设置范围
+							if (ServletUtils.isAllowRedirects(request, url)) {
+								try (InputStream is = HttpClientUtils.getInputStream(url, null)) {
+									if (is != null) {
+										String text = getDocumentText(is);
+										attachmentList.add(url + text);
+									}
+								} catch (IOException | TikaException e) {
+									logger.error(e.getMessage(), e);
+								}
 							}
 						} else {
 							String ctxPath = Global.getCtxPath();
@@ -106,8 +132,10 @@ public class ArticleVectorStoreImpl implements ArticleVectorStore {
 								url = url.substring(ctxPath.length());
 							}
 							try (InputStream is = IOUtils.getFileInputStream(Global.getUserfilesBaseDir(url))){
-								String text = getDocumentText(is);
-								attachmentList.add(url + text);
+								if (is != null) {
+									String text = getDocumentText(is);
+									attachmentList.add(url + text);
+								}
 							} catch (IOException | TikaException e) {
 								logger.error(e.getMessage(), e);
 							}
@@ -130,18 +158,6 @@ public class ArticleVectorStoreImpl implements ArticleVectorStore {
 					.orElse(StringUtils.EMPTY);
 			}
 		};
-		String content = article.getTitle() + ", " + article.getKeywords() + ", "
-				+ article.getDescription() + ", " + FlexmarkHtmlConverter.builder()
-					.linkResolverFactory(linkResolverFactory).build()
-					.convert(article.getArticleData().getContent())
-				+ ", attachment: " + attachmentList;
-		List<Document> documents = List.of(new Document(article.getId(), content, metadata));
-		List<Document> splitDocuments = new TokenTextSplitter().apply(documents);
-		this.delete(article); // 删除原数据
-		ListUtils.pageList(splitDocuments, 64, params -> {
-			vectorStore.add((List<Document>)params[0]); // 增加新数据
-			return null;
-		});
 	}
 
 	/**
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CacheChatMemory.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CacheChatMemoryRepository.java
similarity index 48%
rename from modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CacheChatMemory.java
rename to modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CacheChatMemoryRepository.java
index 3255204c..d8d51d31 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CacheChatMemory.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CacheChatMemoryRepository.java
@@ -5,8 +5,8 @@
 package com.jeesite.modules.cms.ai.service;
 
 import com.jeesite.common.cache.CacheUtils;
-import com.jeesite.common.collect.ListUtils;
-import org.springframework.ai.chat.memory.ChatMemory;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.ai.chat.memory.ChatMemoryRepository;
 import org.springframework.ai.chat.messages.Message;
 import org.springframework.stereotype.Service;
 
@@ -17,29 +17,28 @@ import java.util.List;
  * @author ThinkGem
  */
 @Service
-public class CacheChatMemory implements ChatMemory {
+public class CacheChatMemoryRepository implements ChatMemoryRepository {
 
 	private static final String CMS_CHAT_MSG_CACHE = "cmsChatMsgCache";
 
 	@Override
-	public void add(String conversationId, List<Message> messages) {
-		List<Message> conversationHistory = CacheUtils.get(CMS_CHAT_MSG_CACHE, conversationId);
-		if (conversationHistory == null) {
-			conversationHistory = ListUtils.newArrayList();
-		}
-		conversationHistory.addAll(messages);
-		CacheUtils.put(CMS_CHAT_MSG_CACHE, conversationId, conversationHistory);
+	public @NotNull List<String> findConversationIds() {
+		return CacheUtils.getCache(CMS_CHAT_MSG_CACHE).keys().stream().map(Object::toString).toList();
 	}
 
 	@Override
-	public List<Message> get(String conversationId, int lastN) {
+	public @NotNull List<Message> findByConversationId(@NotNull String conversationId) {
 		List<Message> all = CacheUtils.get(CMS_CHAT_MSG_CACHE, conversationId);
-		return all != null ? all.stream().skip(Math.max(0, all.size() - lastN)).toList() : List.of();
+		return all != null ? all : List.of();
 	}
 
 	@Override
-	public void clear(String conversationId) {
-		CacheUtils.remove(CMS_CHAT_MSG_CACHE, conversationId);
+	public void saveAll(@NotNull String conversationId, @NotNull List<Message> messages) {
+		CacheUtils.put(CMS_CHAT_MSG_CACHE, conversationId, messages);
 	}
 
+	@Override
+	public void deleteByConversationId(@NotNull String conversationId) {
+		CacheUtils.remove(CMS_CHAT_MSG_CACHE, conversationId);
+	}
 }
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
index 33419055..fb2da442 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
@@ -59,7 +59,7 @@ public class CmsAiChatService extends BaseService {
 	 * @author ThinkGem
 	 */
 	public List<Message> getChatMessage(String conversationId) {
-        return chatMemory.get(conversationId, 100);
+        return chatMemory.get(conversationId);
 	}
 
 	private static String getChatCacheKey() {
@@ -119,7 +119,9 @@ public class CmsAiChatService extends BaseService {
 				new UserMessage(StringUtils.replaceEach(message, USER_MESSAGE_SEARCH, USER_MESSAGE_REPLACE))
 			)
             .advisors(
-				new MessageChatMemoryAdvisor(chatMemory, conversationId, 1024),
+				MessageChatMemoryAdvisor.builder(chatMemory)
+						.conversationId(conversationId)
+						.build(),
 				QuestionAnswerAdvisor.builder(vectorStore)
 						.searchRequest(SearchRequest.builder().similarityThreshold(0.6F).topK(6).build())
 						.promptTemplate(new PromptTemplate(properties.getDefaultPromptTemplate()))
diff --git a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
index f4faceda..552e8c69 100644
--- a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
+++ b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
@@ -61,8 +61,8 @@ spring:
           host: http://testserver
           port: 8000
         initialize-schema: true
-        collection-name: vector_store
-        #collection-name: vector_store_1024
+#        collection-name: vector_store
+        collection-name: vector_store_1024
 
       # Postgresql 向量数据库（PG 连接配置，见下文，需要手动建表）【请在 pom.xml 中打开 pgvector 的注释，并注释上其它向量库】
       pgvector:
-- 
Gitee


From 375fbbe3754e985ad7ff0f806bc87b45d6f485af Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 15 May 2025 11:06:50 +0800
Subject: [PATCH 25/84] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/cms/ai/config/WebClientThinkConfig.java      | 4 ++--
 .../modules/cms/ai/properties/CmsAiProperties.java       | 9 +++++++++
 .../jeesite/modules/cms/ai/service/CmsAiChatService.java | 3 +++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java
index 1111817c..c2b6a48a 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java
@@ -92,7 +92,7 @@ public class WebClientThinkConfig {
 								}
 								String reasoningContent = (String) delta.get("reasoning_content");
 								String content = (String) delta.get("content");
-								if (StringUtils.isNotBlank(reasoningContent)) {
+								if (StringUtils.isNotBlank(reasoningContent) && StringUtils.isBlank(content)) {
 									if (!thinkingFlag.get()) {
 										thinkingFlag.set(true);
 										delta.put("content", "<think>\n" + reasoningContent);
@@ -102,7 +102,7 @@ public class WebClientThinkConfig {
 								} else {
 									if (thinkingFlag.get()) {
 										thinkingFlag.set(false);
-										delta.put("content", "</think>" + (content == null ? "" : content));
+										delta.put("content", "</think>\n" + (content == null ? "" : content));
 									}
 								}
 							}
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java
index 07646b90..8adaf470 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java
@@ -5,10 +5,19 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties("spring.ai")
 public class CmsAiProperties {
 
+	/**
+	 * 是否启用 Tool calling 工具调用
+	 */
 	private Boolean toolCalls = false;
 
+	/**
+	 * 默认系统提示词
+	 */
 	private String defaultSystem = "";
 
+	/**
+	 * 默认问题模板格式
+	 */
 	private String defaultPromptTemplate = "";
 
 	public Boolean getToolCalls() {
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
index fb2da442..00da4636 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
@@ -59,6 +59,9 @@ public class CmsAiChatService extends BaseService {
 	 * @author ThinkGem
 	 */
 	public List<Message> getChatMessage(String conversationId) {
+		if (StringUtils.isBlank(conversationId)) {
+			return List.of();
+		}
         return chatMemory.get(conversationId);
 	}
 
-- 
Gitee


From d4f2c1ddb729dc6bd1e3a5863d5fb0ecdf1a7c4d Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 15 May 2025 14:31:01 +0800
Subject: [PATCH 26/84] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=AF=BB=E5=8F=96=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?html=E9=99=84=E4=BB=B6=EF=BC=8C=E5=88=99=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/ai/config/WebClientThinkConfig.java    |  2 +-
 .../cms/ai/service/ArticleVectorStoreImpl.java | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java
index c2b6a48a..6c1e1045 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java
@@ -92,7 +92,7 @@ public class WebClientThinkConfig {
 								}
 								String reasoningContent = (String) delta.get("reasoning_content");
 								String content = (String) delta.get("content");
-								if (StringUtils.isNotBlank(reasoningContent) && StringUtils.isBlank(content)) {
+								if (StringUtils.isNotEmpty(reasoningContent) && StringUtils.isEmpty(content)) {
 									if (!thinkingFlag.get()) {
 										thinkingFlag.set(true);
 										delta.put("content", "<think>\n" + reasoningContent);
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java
index 247eaeeb..7b9ad5cd 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java
@@ -26,6 +26,9 @@ import jakarta.servlet.http.HttpServletRequest;
 import org.apache.tika.Tika;
 import org.apache.tika.config.TikaConfig;
 import org.apache.tika.exception.TikaException;
+import org.apache.tika.io.TikaInputStream;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.mime.MediaType;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,6 +41,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -151,7 +155,19 @@ public class ArticleVectorStoreImpl implements ArticleVectorStore {
 			 */
 			private static @NotNull String getDocumentText(InputStream is) throws IOException, TikaException {
 				TikaConfig config = TikaConfig.getDefaultConfig();
-				String content = new Tika(config).parseToString(is);
+				Tika tika = new Tika(config);
+				Metadata metadata = new Metadata();
+				TikaInputStream stream = TikaInputStream.get(is);
+				MediaType mimetype = tika.getDetector().detect(stream, metadata);
+				if (mimetype != null && StringUtils.equals(mimetype.getType(), "text")) {
+					String text = IOUtils.toString(stream, StandardCharsets.UTF_8);
+					if (StringUtils.isNotBlank(text)) {
+						return FlexmarkHtmlConverter.builder().build().convert(text);
+					} else {
+						return text;
+					}
+				}
+				String content = tika.parseToString(stream, metadata);
 				return content.lines()
 					.map(String::strip).filter(line -> !line.isEmpty())
 					.reduce((a, b) -> a + System.lineSeparator() + b)
-- 
Gitee


From 687a02b19912090de48e9ea646263c05df837fd9 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 15 May 2025 16:03:02 +0800
Subject: [PATCH 27/84] update jeesite-cms-ai.yml

---
 .../main/resources/config/jeesite-cms-ai.yml  | 74 ++++++++++++-------
 1 file changed, 48 insertions(+), 26 deletions(-)

diff --git a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
index 552e8c69..94ceb69f 100644
--- a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
+++ b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
@@ -5,31 +5,59 @@ spring:
 
     # 在线大模型【请在 pom.xml 中打开 openai 的注释，并注释上其它模型】
     openai:
-#      base-url: https://api.siliconflow.cn
-#      api-key: ${SFLOW_APP_KEY}
-#      base-url: https://ai.gitee.com
-#      api-key: ${GITEE_APP_KEY}
-      base-url: https://dashscope.aliyuncs.com/compatible-mode
-      api-key: ${BAILIAN_APP_KEY}
+
+      # 硅基流动
+      base-url: https://api.siliconflow.cn
+      api-key: ${SFLOW_APP_KEY}
       # 聊天对话模型
       chat:
         options:
-#          model: deepseek-ai/DeepSeek-R1-Distill-Qwen-7B
-#          model: DeepSeek-R1-Distill-Qwen-14B
-          model: deepseek-r1-distill-llama-8b
+          model: deepseek-ai/DeepSeek-R1-Distill-Qwen-7B
           max-tokens: 1024
           temperature: 0.6
           top-p: 0.9
           frequency-penalty: 0
-          #logprobs: true
       # 向量库知识库模型（注意：不同的模型维度不同）
       embedding:
         options:
-#          model: BAAI/bge-m3
+          model: BAAI/bge-m3
+          dimensions: 512
+
+#      # 模力方舟
+#      base-url: https://ai.gitee.com
+#      api-key: ${GITEE_APP_KEY}
+#      # 聊天对话模型
+#      chat:
+#        options:
+#          model: DeepSeek-R1-Distill-Qwen-14B
+#          max-tokens: 1024
+#          temperature: 0.6
+#          top-p: 0.9
+#          frequency-penalty: 0
+#          #logprobs: true
+#      # 向量库知识库模型（注意：不同的模型维度不同）
+#      embedding:
+#        options:
 #          model: bge-large-zh-v1.5
 #          dimensions: 512
-          model: text-embedding-v3
-          dimensions: 1024
+
+#      # 阿里百炼
+#      base-url: https://dashscope.aliyuncs.com/compatible-mode
+#      api-key: ${BAILIAN_APP_KEY}
+#      # 聊天对话模型
+#      chat:
+#        options:
+#          model: deepseek-r1-distill-llama-8b
+#          max-tokens: 1024
+#          temperature: 0.6
+#          top-p: 0.9
+#          frequency-penalty: 0
+#          #logprobs: true
+#      # 向量库知识库模型（注意：不同的模型维度不同）
+#      embedding:
+#        options:
+#          model: text-embedding-v3
+#          dimensions: 1024
 
     # 本地大模型配置【请在 pom.xml 中打开 ollama 的注释，并注释上其它模型】
     ollama:
@@ -61,8 +89,8 @@ spring:
           host: http://testserver
           port: 8000
         initialize-schema: true
-#        collection-name: vector_store
-        collection-name: vector_store_1024
+        collection-name: vector_store
+#        collection-name: vector_store_1024
 
       # Postgresql 向量数据库（PG 连接配置，见下文，需要手动建表）【请在 pom.xml 中打开 pgvector 的注释，并注释上其它向量库】
       pgvector:
@@ -105,22 +133,16 @@ spring:
     # 默认系统提示词
     default-system: |
         ## 人物设定
-        你是我的知识库AI助手，你把我当作朋友，耐心真诚地回复我提出的相关问题。
-        你需要遵循以下原则，与关注者进行友善而有价值的沟通。
+        你是我的知识库AI助手，请耐心真诚地回复我提出的相关问题。
+        你需要遵循以下原则，与我进行友善而有价值的沟通。
         ## 表达方式：
         1. 使用简体中文回答我的问题。
-        2. 使用幽默有趣的方式与我沟通。
-        3. 可以用少量表情，避免过多表情。
-        4. 增加互动，如 “您的看法如何？”
+        2. 可以用少量表情，避免过多表情。
 
     # 默认问题回答模板
     default-prompt-template: |
-      上下文信息如下，用---------------------符号标出：
-      ---------------------
-      {question_answer_context}
-      ---------------------
-      在提供上下文和历史信息的基础上，并且不使用先前知识的前提下回答用户的问题。
-      如果问题的答案不在上下文中，请告知用户你无法回答该问题。
+      {question_answer_context} 
+      在提供上下文和历史信息的基础上，优先回答最后一条用户的问题。
 
 # ========= Postgresql 向量数据库数据源 =========
 
-- 
Gitee


From ca54e4cd3b871e0fb761d7c93746d4612ae8d8ae Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 17 May 2025 22:13:30 +0800
Subject: [PATCH 28/84] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20@Serial=20=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=8C=96=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/java/com/jeesite/common/mapper/XmlMapper.java  | 2 ++
 .../java/com/jeesite/common/utils/excel/ExcelException.java    | 3 +++
 .../main/java/com/jeesite/modules/app/entity/AppComment.java   | 2 ++
 .../main/java/com/jeesite/modules/app/entity/AppUpgrade.java   | 2 ++
 .../src/main/java/com/jeesite/modules/cms/entity/Article.java  | 3 +++
 .../main/java/com/jeesite/modules/cms/entity/ArticleData.java  | 3 +++
 .../main/java/com/jeesite/modules/cms/entity/ArticlePosid.java | 3 +++
 .../main/java/com/jeesite/modules/cms/entity/ArticleTag.java   | 3 +++
 .../src/main/java/com/jeesite/modules/cms/entity/Category.java | 3 +++
 .../src/main/java/com/jeesite/modules/cms/entity/Comment.java  | 2 ++
 .../main/java/com/jeesite/modules/cms/entity/FileTemplete.java | 2 ++
 .../src/main/java/com/jeesite/modules/cms/entity/Report.java   | 3 +++
 .../cms/src/main/java/com/jeesite/modules/cms/entity/Site.java | 3 +++
 .../cms/src/main/java/com/jeesite/modules/cms/entity/Tag.java  | 3 +++
 .../src/main/java/com/jeesite/modules/cms/entity/VisitLog.java | 2 ++
 .../main/java/com/jeesite/common/shiro/authc/LdapToken.java    | 2 ++
 .../main/java/com/jeesite/modules/biz/entity/BizCategory.java  | 3 +++
 .../src/main/java/com/jeesite/modules/msg/entity/MsgInner.java | 2 ++
 .../java/com/jeesite/modules/msg/entity/MsgInnerRecord.java    | 2 ++
 .../src/main/java/com/jeesite/modules/sys/entity/Area.java     | 3 +++
 .../src/main/java/com/jeesite/modules/sys/entity/Company.java  | 3 +++
 .../java/com/jeesite/modules/sys/entity/CompanyOffice.java     | 3 +++
 .../src/main/java/com/jeesite/modules/sys/entity/EmpUser.java  | 3 +++
 .../src/main/java/com/jeesite/modules/sys/entity/Employee.java | 3 +++
 .../java/com/jeesite/modules/sys/entity/EmployeeOffice.java    | 3 +++
 .../main/java/com/jeesite/modules/sys/entity/EmployeePost.java | 3 +++
 .../core/src/main/java/com/jeesite/modules/sys/entity/Log.java | 3 +++
 .../src/main/java/com/jeesite/modules/sys/entity/Office.java   | 3 +++
 .../src/main/java/com/jeesite/modules/sys/entity/Post.java     | 3 +++
 .../src/main/java/com/jeesite/modules/sys/entity/PostRole.java | 3 +++
 30 files changed, 81 insertions(+)

diff --git a/common/src/main/java/com/jeesite/common/mapper/XmlMapper.java b/common/src/main/java/com/jeesite/common/mapper/XmlMapper.java
index c6ab69b2..dcfdadbe 100644
--- a/common/src/main/java/com/jeesite/common/mapper/XmlMapper.java
+++ b/common/src/main/java/com/jeesite/common/mapper/XmlMapper.java
@@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 
 import java.io.IOException;
+import java.io.Serial;
 import java.util.TimeZone;
 
 /**
@@ -21,6 +22,7 @@ import java.util.TimeZone;
  */
 public class XmlMapper extends com.fasterxml.jackson.dataformat.xml.XmlMapper{
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 
 	private static final Logger logger = LoggerFactory.getLogger(XmlMapper.class);
diff --git a/common/src/main/java/com/jeesite/common/utils/excel/ExcelException.java b/common/src/main/java/com/jeesite/common/utils/excel/ExcelException.java
index 1e6fff82..08dc1b50 100644
--- a/common/src/main/java/com/jeesite/common/utils/excel/ExcelException.java
+++ b/common/src/main/java/com/jeesite/common/utils/excel/ExcelException.java
@@ -4,12 +4,15 @@
  */
 package com.jeesite.common.utils.excel;
 
+import java.io.Serial;
+
 /**
  * Excel Exception
  * @author ThinkGem
  */
 public class ExcelException extends RuntimeException {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 
 	public ExcelException() {
diff --git a/modules/app/src/main/java/com/jeesite/modules/app/entity/AppComment.java b/modules/app/src/main/java/com/jeesite/modules/app/entity/AppComment.java
index 9fe3e793..5f5cd227 100644
--- a/modules/app/src/main/java/com/jeesite/modules/app/entity/AppComment.java
+++ b/modules/app/src/main/java/com/jeesite/modules/app/entity/AppComment.java
@@ -12,6 +12,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
 
+import java.io.Serial;
 import java.util.Date;
 
 /**
@@ -36,6 +37,7 @@ import java.util.Date;
 )
 public class AppComment extends DataEntity<AppComment> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String category;		// 问题分类
 	private String content;		// 问题和意见
diff --git a/modules/app/src/main/java/com/jeesite/modules/app/entity/AppUpgrade.java b/modules/app/src/main/java/com/jeesite/modules/app/entity/AppUpgrade.java
index 1016af12..01c26e5e 100644
--- a/modules/app/src/main/java/com/jeesite/modules/app/entity/AppUpgrade.java
+++ b/modules/app/src/main/java/com/jeesite/modules/app/entity/AppUpgrade.java
@@ -4,6 +4,7 @@
  */
 package com.jeesite.modules.app.entity;
 
+import java.io.Serial;
 import java.util.Date;
 
 import jakarta.validation.constraints.Size;
@@ -34,6 +35,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 )
 public class AppUpgrade extends DataEntity<AppUpgrade> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String appCode;		// 应用编号
 	private String upTitle;		// 升级标题
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java
index 8e279935..0c243de2 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java
@@ -16,6 +16,8 @@ import com.jeesite.modules.cms.utils.CmsUtils;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
+
+import java.io.Serial;
 import java.util.Date;
 
 /**
@@ -66,6 +68,7 @@ import java.util.Date;
 public class Article extends DataEntity<Article> {
 	
 	public static final String DEFAULT_TEMPLATE = "viewArticle"; // 默认文章内容模板
+	@Serial
 	private static final long serialVersionUID = 1L;
 	
 	private Category category; 	// 栏目编码
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticleData.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticleData.java
index d4440bbd..a297d710 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticleData.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticleData.java
@@ -11,6 +11,8 @@ import com.jeesite.common.entity.Extend;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
 
+import java.io.Serial;
+
 /**
  * 文章详情表Entity
  * @author 长春叭哥、ThinkGem
@@ -26,6 +28,7 @@ import com.jeesite.common.mybatis.annotation.Table;
 )
 public class ArticleData extends DataEntity<ArticleData> {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String content; 		// 文章内容
 	private String relation; 		// 相关文章
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticlePosid.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticlePosid.java
index 76b14336..5973af7b 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticlePosid.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticlePosid.java
@@ -8,6 +8,8 @@ import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
 
+import java.io.Serial;
+
 /**
  * 文章推荐位Entity
  * @author 长春叭哥、ThinkGem
@@ -20,6 +22,7 @@ import com.jeesite.common.mybatis.annotation.Table;
 )
 public class ArticlePosid extends DataEntity<ArticlePosid> {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String articleId; 	// 内容编号
 	private String postid; 		// 推荐位置（1轮播图 2首页推荐 3栏目页面）
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticleTag.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticleTag.java
index 6f307240..0e6435e5 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticleTag.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticleTag.java
@@ -8,6 +8,8 @@ import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
 
+import java.io.Serial;
+
 /**
  * 文章与标签关系Entity
  * @author 长春叭哥、ThinkGem
@@ -20,6 +22,7 @@ import com.jeesite.common.mybatis.annotation.Table;
 )
 public class ArticleTag extends DataEntity<ArticleTag> {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String articleId; 	// 内容编号
 	private String tagName; 	// 标签名称
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Category.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Category.java
index 55fa7b20..4d952f6d 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Category.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Category.java
@@ -16,6 +16,8 @@ import com.jeesite.modules.cms.utils.CmsUtils;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
+
+import java.io.Serial;
 import java.util.List;
 
 /**
@@ -59,6 +61,7 @@ public class Category extends TreeEntity<Category> {
 	public static final String SHOW_MODES_CENTENT_LIST = "2"; 	// 首栏目内容列表
 	public static final String SHOW_MODES_FIRST_CONTENT = "3"; 	// 简介类栏目，栏目第一条内容
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String categoryCode; 	// 栏目编码
 	private String categoryName; 	// 栏目名称
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Comment.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Comment.java
index a5ad74a9..06a61c32 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Comment.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Comment.java
@@ -4,6 +4,7 @@
  */
 package com.jeesite.modules.cms.entity;
 
+import java.io.Serial;
 import java.util.Date;
 
 import jakarta.validation.constraints.NotBlank;
@@ -43,6 +44,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 )
 public class Comment extends DataEntity<Comment> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	
 	private Category category;// 分类编号
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/FileTemplete.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/FileTemplete.java
index c18d6665..6e995798 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/FileTemplete.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/FileTemplete.java
@@ -6,6 +6,7 @@ package com.jeesite.modules.cms.entity;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Objects;
 
@@ -23,6 +24,7 @@ import com.jeesite.common.lang.ExceptionUtils;
  */
 public class FileTemplete implements Comparable<FileTemplete>, Serializable {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private Resource resource;
 	private String fileName;
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Report.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Report.java
index 4e3efc38..4fda06fb 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Report.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Report.java
@@ -10,6 +10,8 @@ import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
 
+import java.io.Serial;
+
 /**
  * 内容举报表Entity
  * @author 长春叭哥、ThinkGem
@@ -26,6 +28,7 @@ import com.jeesite.common.mybatis.annotation.Table;
 )
 public class Report extends DataEntity<Report> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String reportSource;	// 举报来源（1文章、2评论）
 	private String reportContent;	// 举报内容（文章标题 评论内容）
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Site.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Site.java
index 8933c02a..44b24bcb 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Site.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Site.java
@@ -16,6 +16,8 @@ import com.jeesite.modules.sys.utils.UserUtils;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
+
+import java.io.Serial;
 import java.util.List;
 
 /**
@@ -53,6 +55,7 @@ public class Site extends DataEntity<Site> {
 	 */
 	public static final String DEFAULT_TEMPLATE = "index";
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String siteCode; 	// 站点编码
 	private String siteName; 	// 站点名称
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Tag.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Tag.java
index 524011d3..493dde2f 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Tag.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Tag.java
@@ -10,6 +10,8 @@ import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
 
+import java.io.Serial;
+
 /**
  * 内容标签Entity
  * @author 长春叭哥、ThinkGem
@@ -22,6 +24,7 @@ import com.jeesite.common.mybatis.annotation.Table;
 )
 public class Tag extends DataEntity<Tag> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String tagName;		// 标签名称
 	private Integer clicknum;	// 点击次数
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/VisitLog.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/VisitLog.java
index 81bb916d..7f8c719d 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/VisitLog.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/VisitLog.java
@@ -4,6 +4,7 @@
  */
 package com.jeesite.modules.cms.entity;
 
+import java.io.Serial;
 import java.util.Date;
 
 import jakarta.validation.constraints.Size;
@@ -57,6 +58,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 )
 public class VisitLog extends DataEntity<VisitLog> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String requestUrl;			// 请求的URL地址
 	private String requestUrlHost;		// 受访域名
diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/authc/LdapToken.java b/modules/core/src/main/java/com/jeesite/common/shiro/authc/LdapToken.java
index 1dd4a97c..db3b6c99 100644
--- a/modules/core/src/main/java/com/jeesite/common/shiro/authc/LdapToken.java
+++ b/modules/core/src/main/java/com/jeesite/common/shiro/authc/LdapToken.java
@@ -4,6 +4,7 @@
  */
 package com.jeesite.common.shiro.authc;
 
+import java.io.Serial;
 import java.util.Map;
 
 /**
@@ -13,6 +14,7 @@ import java.util.Map;
  */
 public class LdapToken extends FormToken {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 
 	public LdapToken() {
diff --git a/modules/core/src/main/java/com/jeesite/modules/biz/entity/BizCategory.java b/modules/core/src/main/java/com/jeesite/modules/biz/entity/BizCategory.java
index 6e09564f..0442065d 100644
--- a/modules/core/src/main/java/com/jeesite/modules/biz/entity/BizCategory.java
+++ b/modules/core/src/main/java/com/jeesite/modules/biz/entity/BizCategory.java
@@ -14,6 +14,8 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
 
+import java.io.Serial;
+
 /**
  * 业务分类Entity
  * @author ThinkGem
@@ -30,6 +32,7 @@ import jakarta.validation.constraints.Size;
 )
 public class BizCategory extends TreeEntity<BizCategory> {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String categoryCode;		// 分类编码
 	private String viewCode;			// 分类代码（作为显示用，多租户内唯一）
diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInner.java b/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInner.java
index da94a430..ef365d0e 100644
--- a/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInner.java
+++ b/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInner.java
@@ -4,6 +4,7 @@
  */
 package com.jeesite.modules.msg.entity;
 
+import java.io.Serial;
 import java.util.Date;
 
 import jakarta.validation.constraints.NotBlank;
@@ -53,6 +54,7 @@ public class MsgInner extends DataEntity<MsgInner> {
 	public static final String CONTENT_LEVEL_2 = "2";
 	public static final String CONTENT_LEVEL_3 = "3";
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String msgTitle;		// 消息标题
 	private String contentLevel;	// 内容等级（1普通 2一般 3紧急）
diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInnerRecord.java b/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInnerRecord.java
index b90d5bf6..3e441036 100644
--- a/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInnerRecord.java
+++ b/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInnerRecord.java
@@ -4,6 +4,7 @@
  */
 package com.jeesite.modules.msg.entity;
 
+import java.io.Serial;
 import java.util.Date;
 
 import jakarta.validation.constraints.NotBlank;
@@ -37,6 +38,7 @@ public class MsgInnerRecord extends DataEntity<MsgInnerRecord> {
 	public static final String READ_STATUS_READ = "1";
 	public static final String READ_STATUS_UNREAD = "2";
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String msgInnerId;			// 所属消息
 	private String receiveUserCode;		// 接受者用户编码
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Area.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Area.java
index 45e06e61..0edb30a1 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Area.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Area.java
@@ -13,6 +13,8 @@ import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
 
+import java.io.Serial;
+
 /**
  * 行政区划Entity
  * @author ThinkGem
@@ -28,6 +30,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 )
 public class Area extends TreeEntity<Area> {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String areaCode;		// 区域代码
 	private String areaName;		// 区域名称
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java
index c1d230ef..08d172f9 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java
@@ -19,6 +19,8 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
+
+import java.io.Serial;
 import java.util.List;
 
 /**
@@ -49,6 +51,7 @@ import java.util.List;
 )
 public class Company extends TreeEntity<Company> {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String companyCode;     // 公司编码
 	private String viewCode;        // 公司代码
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/CompanyOffice.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/CompanyOffice.java
index 0c6b3865..1b9b9f87 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/CompanyOffice.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/CompanyOffice.java
@@ -9,6 +9,8 @@ import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
 
+import java.io.Serial;
+
 /**
  * 公司机构Entity
  * @author ThinkGem
@@ -21,6 +23,7 @@ import com.jeesite.common.mybatis.annotation.Table;
 )
 public class CompanyOffice extends DataEntity<CompanyOffice> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String companyCode;		// 公司编码
 	private String officeCode;		// 机构编码
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java
index c9a5c561..c7cdeac4 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java
@@ -20,6 +20,8 @@ import com.jeesite.common.utils.excel.fieldtype.OfficeType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 
+import java.io.Serial;
+
 /**
  * 员工用户管理Entity
  * @author ThinkGem
@@ -84,6 +86,7 @@ import jakarta.validation.Valid;
 )
 public class EmpUser extends User {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	
 	private String[] codes; // 查询用
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java
index ab8b950b..9df9aa99 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java
@@ -17,6 +17,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
+
+import java.io.Serial;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -50,6 +52,7 @@ import java.util.stream.Collectors;
 )
 public class Employee extends DataEntity<Employee> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String empCode;		// 员工编码
 	private String empNo;		// 员工工号
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeeOffice.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeeOffice.java
index 6e3e4d6a..8018ed3c 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeeOffice.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeeOffice.java
@@ -12,6 +12,8 @@ import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
 import jakarta.validation.constraints.Size;
 
+import java.io.Serial;
+
 /**
  * 附属机构Entity
  * @author ThinkGem
@@ -43,6 +45,7 @@ import jakarta.validation.constraints.Size;
 )
 public class EmployeeOffice extends DataEntity<EmployeeOffice> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String empCode;		// 员工编码
 	private String officeCode;	// 机构编码
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeePost.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeePost.java
index 8b413c36..1d899af6 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeePost.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeePost.java
@@ -9,6 +9,8 @@ import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.JoinTable;
 import com.jeesite.common.mybatis.annotation.Table;
 
+import java.io.Serial;
+
 /**
  * 员工岗位Entity
  * @author ThinkGem
@@ -34,6 +36,7 @@ import com.jeesite.common.mybatis.annotation.Table;
 )
 public class EmployeePost extends DataEntity<EmployeePost> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String empCode;		// 员工编码
 	private String postCode;	// 岗位编码
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java
index 8911a80a..d16b736c 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java
@@ -18,6 +18,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
+
+import java.io.Serial;
 import java.util.Date;
 import java.util.Map;
 
@@ -58,6 +60,7 @@ public class Log extends DataEntity<Log> {
 	public static final String TYPE_SELECT = "select";
 	public static final String TYPE_LOGIN_LOGOUT = "loginLogout";
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	
 	private String logType;			// 日志类型
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java
index f5bfd3e4..d7811b3d 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java
@@ -22,6 +22,8 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
 
+import java.io.Serial;
+
 /**
  * 组织机构Entity
  * @author ThinkGem
@@ -47,6 +49,7 @@ import jakarta.validation.constraints.Size;
 @Schema
 public class Office extends TreeEntity<Office> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String officeCode;		// 机构编码
 	private String viewCode;		// 机构代码（作为显示用，多租户内唯一）
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java
index f8315308..40b4403e 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java
@@ -15,6 +15,8 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
 
+import java.io.Serial;
+
 @Table(name="${_prefix}sys_post", alias="a", label="岗位信息", columns={
 		@Column(includeEntity=BaseEntity.class),
 		@Column(includeEntity=DataEntity.class),
@@ -27,6 +29,7 @@ import jakarta.validation.constraints.Size;
 )
 public class Post extends DataEntity<Post> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String postCode;		// 岗位编码
 	private String viewCode;		// 岗位代码（作为显示用，多租户内唯一）
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/PostRole.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/PostRole.java
index caf32298..c01bc27d 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/PostRole.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/PostRole.java
@@ -10,6 +10,8 @@ import com.jeesite.common.mybatis.annotation.JoinTable;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
 
+import java.io.Serial;
+
 /**
  * 岗位角色Entity
  * @author ThinkGem
@@ -31,6 +33,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 )
 public class PostRole extends DataEntity<PostRole> {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String postCode;	// 岗位编码
 	private String roleCode;	// 角色编码
-- 
Gitee


From 8c5cefb6260df980f4b66076ec7e0c9650381950 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 18 May 2025 23:10:59 +0800
Subject: [PATCH 29/84] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=88=86=E7=A6=BB?=
 =?UTF-8?q?=E7=89=88=E4=B8=8B=E6=96=B0=E5=A2=9E=E7=A9=BA=E7=99=BD=E9=A1=B5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/src/main/resources/views/modules/cms/articleList.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cms/src/main/resources/views/modules/cms/articleList.html b/modules/cms/src/main/resources/views/modules/cms/articleList.html
index 464822aa..f471ade2 100644
--- a/modules/cms/src/main/resources/views/modules/cms/articleList.html
+++ b/modules/cms/src/main/resources/views/modules/cms/articleList.html
@@ -9,7 +9,7 @@
 				<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
 				<a href="${ctxFront}/index" target="_blank" class="btn btn-default" title="${text('访问站点')}"><i class="fa fa-globe"></i> ${text('访问网站')}</a>
 				<% if(hasPermi('cms:article:edit')){ %>
-					<a href="${ctx}/cms/article/form" onclick="$(this).data('href', this.href+'?category.categoryCode='+$('#categoryCode').val())" class="btn btn-primary btnTool" title="${text('新增文章')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
+					<a href="javascript:" onclick="$(this).data('href', '${ctx}/cms/article/form?category.categoryCode='+$('#categoryCode').val())" class="btn btn-primary btnTool" title="${text('新增文章')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
 				<% } %>
 			</div>
 		</div>
-- 
Gitee


From f0633474923067fa6d1ad214a9289444d2a846c7 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 18 May 2025 23:20:00 +0800
Subject: [PATCH 30/84] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20@Serial=20=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=8C=96=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/modules/gen/crud/entity.xml   | 3 +++
 .../main/resources/templates/modules/gen/crud_cloud/entity.xml | 3 +++
 .../main/java/com/jeesite/modules/test/entity/TestData.java    | 2 ++
 .../java/com/jeesite/modules/test/entity/TestDataChild.java    | 2 ++
 .../main/java/com/jeesite/modules/test/entity/TestTree.java    | 3 +++
 5 files changed, 13 insertions(+)

diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
index 0d38519a..2b7348bd 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
@@ -35,6 +35,8 @@ import com.jeesite.common.utils.excel.annotation.ExcelField.Align;
 import com.jeesite.common.utils.excel.annotation.ExcelFields;
 <% } %>
 
+import java.io.Serial;
+
 /**
  * ${functionName}Entity
  * @author ${functionAuthor}
@@ -180,6 +182,7 @@ import com.jeesite.common.utils.excel.annotation.ExcelFields;
 )
 public class ${ClassName} extends ${toBoolean(table.optionMap['isBpmForm'])?(table.isTreeEntity?'BpmTree':'Bpm'):table.isTreeEntity?'Tree':'Data'}Entity<${ClassName}> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	<%
 	isExtend = false;
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
index 3ade33db..e809aff1 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
@@ -35,6 +35,8 @@ import com.jeesite.common.utils.excel.annotation.ExcelField.Align;
 import com.jeesite.common.utils.excel.annotation.ExcelFields;
 <% } %>
 
+import java.io.Serial;
+
 /**
  * ${functionName}Entity
  * @author ${functionAuthor}
@@ -180,6 +182,7 @@ import com.jeesite.common.utils.excel.annotation.ExcelFields;
 )
 public class ${ClassName} extends ${toBoolean(table.optionMap['isBpmForm'])?(table.isTreeEntity?'BpmTree':'Bpm'):table.isTreeEntity?'Tree':'Data'}Entity<${ClassName}> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	<%
 	isExtend = false;
diff --git a/modules/test/src/main/java/com/jeesite/modules/test/entity/TestData.java b/modules/test/src/main/java/com/jeesite/modules/test/entity/TestData.java
index e08f3e29..5c47caa8 100644
--- a/modules/test/src/main/java/com/jeesite/modules/test/entity/TestData.java
+++ b/modules/test/src/main/java/com/jeesite/modules/test/entity/TestData.java
@@ -4,6 +4,7 @@
  */
 package com.jeesite.modules.test.entity;
 
+import java.io.Serial;
 import java.util.Date;
 import java.util.List;
 
@@ -55,6 +56,7 @@ import com.jeesite.modules.sys.entity.User;
 )
 public class TestData extends DataEntity<TestData> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String testInput;		// 单行文本
 	private String testTextarea;		// 多行文本
diff --git a/modules/test/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java b/modules/test/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java
index f20e1974..bb5a3d03 100644
--- a/modules/test/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java
+++ b/modules/test/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java
@@ -4,6 +4,7 @@
  */
 package com.jeesite.modules.test.entity;
 
+import java.io.Serial;
 import java.util.Date;
 
 import jakarta.validation.constraints.Size;
@@ -54,6 +55,7 @@ import com.jeesite.modules.sys.entity.User;
 )
 public class TestDataChild extends DataEntity<TestDataChild> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private Long testSort;		// 排序号
 	private TestData testData;		// 父表主键 父类
diff --git a/modules/test/src/main/java/com/jeesite/modules/test/entity/TestTree.java b/modules/test/src/main/java/com/jeesite/modules/test/entity/TestTree.java
index 1db55873..c8f5ed58 100644
--- a/modules/test/src/main/java/com/jeesite/modules/test/entity/TestTree.java
+++ b/modules/test/src/main/java/com/jeesite/modules/test/entity/TestTree.java
@@ -13,6 +13,8 @@ import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
 
+import java.io.Serial;
+
 /**
  * 测试树表Entity
  * @author ThinkGem
@@ -27,6 +29,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 )
 public class TestTree extends TreeEntity<TestTree> {
 	
+	@Serial
 	private static final long serialVersionUID = 1L;
 	private String treeCode;		// 节点编码
 	private String treeName;		// 节点名称
-- 
Gitee


From a867020070981b86ef728013682957746f5c33f6 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 19 May 2025 10:38:33 +0800
Subject: [PATCH 31/84] =?UTF-8?q?DateUtils=20=E5=A2=9E=E5=8A=A0=20yyyy-MM-?=
 =?UTF-8?q?dd'T'HH:mm:ss'Z'=20=E6=A0=BC=E5=BC=8F=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/lang/DateUtils.java    | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/lang/DateUtils.java b/common/src/main/java/com/jeesite/common/lang/DateUtils.java
index 3051036e..55daff2d 100644
--- a/common/src/main/java/com/jeesite/common/lang/DateUtils.java
+++ b/common/src/main/java/com/jeesite/common/lang/DateUtils.java
@@ -17,14 +17,14 @@ import java.util.Date;
  * @version 2017-1-4
  */
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
-	
+
 	private static final String[] parsePatterns = {
 		"yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd HH", "yyyy-MM",
 		"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM/dd HH", "yyyy/MM",
 		"yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM.dd HH", "yyyy.MM", 
 		"yyyy年MM月dd日", "yyyy年MM月dd日 HH时mm分ss秒", "yyyy年MM月dd日 HH时mm分", "yyyy年MM月dd日 HH时", "yyyy年MM月",
-		"yyyyMMdd", "yyyyMM", "yyyy"};
-	
+		"yyyyMMdd", "yyyyMM", "yyyy", "yyyy-MM-dd'T'HH:mm:ss'Z'"};
+
 	/**
 	 * 得到日期字符串 ，转换格式（yyyy-MM-dd）
 	 */
@@ -138,14 +138,25 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	}
 	
 	/**
-	 * 日期型字符串转化为日期 格式   see to DateUtils#parsePatterns
+	 * 日期型字符串转化为日期对象，使用默认格式集
 	 */
 	public static Date parseDate(Object str) {
 		if (str == null){
 			return null;
 		}
+		String dateStr = str.toString();
+		if (StringUtils.isBlank(dateStr)){
+			return null;
+		}
+		return parseDate(dateStr, parsePatterns);
+	}
+
+	/**
+	 * 日期型字符串转化为日期对象，指定日期解析格式
+	 */
+	public static Date parseDate(final String str, final String... parsePatterns) {
 		try {
-			return parseDate(str.toString(), parsePatterns);
+			return parseDate(str, null, parsePatterns);
 		} catch (ParseException e) {
 			return null;
 		}
-- 
Gitee


From cfca3406a1bc6571d2e410b0d88f484390c619bf Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 19 May 2025 10:41:47 +0800
Subject: [PATCH 32/84] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20web.json.defaultDate?=
 =?UTF-8?q?Format=20=E5=8F=82=E6=95=B0=EF=BC=8C=E4=BD=BF=E7=94=A8=20DateUt?=
 =?UTF-8?q?ils=20=E8=A7=A3=E6=9E=90=EF=BC=8C=E4=BB=A5=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E7=9A=84=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/src/main/resources/config/jeesite-core.yml | 4 ----
 web-api/src/main/resources/config/application.yml       | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index c6d627bb..dbb885f0 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -719,10 +719,6 @@ web:
     id: '[a-zA-Z0-9_\-/#\u4e00-\u9fa5]{0,64}'
     user.loginCode: '[a-zA-Z0-9_\u4e00-\u9fa5]{4,20}'
   
-  # 默认的日期格式（JsonMapper）
-  json:
-    defaultDateFormat: yyyy-MM-dd HH:mm:ss
-  
   # 默认不启用（为兼用旧版保留，建议使用 CORS）
   jsonp:
     enabled: false
diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml
index 8202ce9d..6f9adcc9 100644
--- a/web-api/src/main/resources/config/application.yml
+++ b/web-api/src/main/resources/config/application.yml
@@ -860,10 +860,6 @@ web:
 #    id: '[a-zA-Z0-9_\-/#\u4e00-\u9fa5]{0,64}'
 #    user.loginCode: '[a-zA-Z0-9_\u4e00-\u9fa5]{4,20}'
 #  
-#  # 默认的日期格式（JsonMapper）
-#  json:
-#    defaultDateFormat: yyyy-MM-dd HH:mm:ss
-#  
 #  # 默认不启用（为兼用旧版保留，建议使用 CORS）
 #  jsonp:
 #    enabled: false
-- 
Gitee


From fc3efc6819e2c314bf1bec7763ca3ab8b45372ca Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 19 May 2025 10:44:07 +0800
Subject: [PATCH 33/84] =?UTF-8?q?JsonMapper=20=E4=BD=BF=E7=94=A8=20DateUti?=
 =?UTF-8?q?ls=20=E8=A7=A3=E6=9E=90=E6=97=A5=E6=9C=9F=EF=BC=8C=E4=BB=A5?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9B=B4=E5=A4=9A=E7=9A=84=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=9B=E4=BC=98=E5=8C=96=20JsonFormat=20=E6=B3=A8=E8=A7=A3?=
 =?UTF-8?q?=E9=9D=9E=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B=E7=9A=84=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/mapper/JsonMapper.java | 77 +++++++++++++------
 1 file changed, 54 insertions(+), 23 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
index 567c47c2..096d8058 100644
--- a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
+++ b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
@@ -19,14 +19,15 @@ import com.jeesite.common.codec.EncodeUtils;
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.io.PropertiesUtils;
 import com.jeesite.common.lang.DateUtils;
+import org.apache.commons.lang3.LocaleUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 
 import java.io.IOException;
+import java.io.Serial;
 import java.lang.reflect.AnnotatedElement;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -39,6 +40,7 @@ import java.util.TimeZone;
  */
 public class JsonMapper extends ObjectMapper {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 
 	private static final Logger logger = LoggerFactory.getLogger(JsonMapper.class);
@@ -51,49 +53,41 @@ public class JsonMapper extends ObjectMapper {
 	}
 	
 	public JsonMapper() {
-		// Spring ObjectMapper 初始化配置，支持 @JsonView
-		new Jackson2ObjectMapperBuilder().configure(this);
+		// 设置默认时区、默认日期格式
+		this.setLocaleTimeZoneDateFormat();
 		// 为Null时不序列化
 		this.setSerializationInclusion(Include.NON_NULL);
 		// 允许单引号
 		this.configure(Feature.ALLOW_SINGLE_QUOTES, true);
 		// 允许不带引号的字段名称
 		this.configure(Feature.ALLOW_UNQUOTED_FIELD_NAMES, true);
-		// 设置默认时区
-		this.setDefaultTimeZone();
-		// 设置默认日期格式
-		this.setDefaultDateFormat();
-        // 遇到空值处理为空串
+		// 遇到空值处理为空串
 		this.enabledNullValueToEmpty();
 		// 设置输入时忽略在JSON字符串中存在但Java对象实际没有的属性
 		this.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+		// Spring ObjectMapper 初始化配置，支持 @JsonView
+		new Jackson2ObjectMapperBuilder().configure(this);
 	}
 
 	/**
-	 * 开启日期类型默认格式化
+	 * 设置默认时区、默认日期格式
 	 * @author ThinkGem
 	 */
-	public JsonMapper setDefaultTimeZone(){
+	public JsonMapper setLocaleTimeZoneDateFormat(){
+		this.setLocale(LocaleUtils.toLocale(PropertiesUtils.getInstance()
+					.getProperty("lang.defaultLocale", "zh_CN")));
 		this.setTimeZone(TimeZone.getTimeZone(PropertiesUtils.getInstance()
 					.getProperty("lang.defaultTimeZone", "GMT+08:00")));
-		return this;
-	}
-
-	/**
-	 * 开启日期类型默认格式化
-	 * @author ThinkGem
-	 */
-	public JsonMapper setDefaultDateFormat(){
-		this.setDateFormat(new SimpleDateFormat(PropertiesUtils.getInstance()
-				.getProperty("web.json.defaultDateFormat", "yyyy-MM-dd HH:mm:ss")));
 		this.setAnnotationIntrospector(new JacksonAnnotationIntrospector() {
+			@Serial
 			private static final long serialVersionUID = 1L;
 			@Override
 			public Object findSerializer(Annotated a) {
 				if (a instanceof AnnotatedMethod) {
 					AnnotatedElement m = a.getAnnotated();
 					JsonFormat jf = m.getAnnotation(JsonFormat.class);
-					if (jf != null) {
+					if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(),
+							"yyyy", "MM", "dd", "HH", "mm", "ss", "SSS")) {
 						return new JsonSerializer<Date>(){
 							@Override
 							public void serialize(Date value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
@@ -101,11 +95,48 @@ public class JsonMapper extends ObjectMapper {
 									jgen.writeString(DateUtils.formatDate(value, jf.pattern()));
 								}
 							}
-				        };
+						};
+					}
+					AnnotatedMethod am = (AnnotatedMethod) a;
+					if (am.getRawReturnType() == Date.class) {
+						return new JsonSerializer<Date>(){
+							@Override
+							public void serialize(Date value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
+								if (value != null){
+									jgen.writeString(DateUtils.formatDateTime(value));
+								}
+							}
+						};
 					}
 				}
 				return super.findSerializer(a);
 			}
+			@Override
+			public Object findDeserializer(Annotated a) {
+				if (a instanceof AnnotatedMethod) {
+					AnnotatedElement m = a.getAnnotated();
+					JsonFormat jf = m.getAnnotation(JsonFormat.class);
+					if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(),
+							"yyyy", "MM", "dd", "HH", "mm", "ss", "SSS")) {
+						return new JsonDeserializer<Date>(){
+							@Override
+							public Date deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+								return DateUtils.parseDate(p.getText(), jf.pattern());
+							}
+						};
+					}
+					AnnotatedMethod am = (AnnotatedMethod) a;
+					if (am.getParameterCount() > 0 && am.getParameterType(0).getRawClass() == Date.class) {
+						return new JsonDeserializer<Date>(){
+							@Override
+							public Date deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+								return DateUtils.parseDate(p.getText());
+							}
+						};
+					}
+				}
+				return super.findDeserializer(a);
+			}
 		});
 		return this;
 	}
@@ -120,7 +151,7 @@ public class JsonMapper extends ObjectMapper {
 			public void serialize(Object value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
 				jgen.writeString(StringUtils.EMPTY);
 			}
-        });
+		});
 		return this;
 	}
 
-- 
Gitee


From 228334faf249e0bc9eba16111052f0bca0cc2ce0 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 19 May 2025 10:46:49 +0800
Subject: [PATCH 34/84] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/ai/config/CmsAiChatConfig.java        |  8 ++---
 .../cms/ai/config/CmsAiWebMvcConfig.java      | 20 +++++------
 .../cms/ai/config/WebClientThinkConfig.java   | 36 +++++++++----------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiChatConfig.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiChatConfig.java
index 006b9883..250ac5a4 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiChatConfig.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiChatConfig.java
@@ -31,16 +31,16 @@ public class CmsAiChatConfig {
 	 * 聊天对话客户端
 	 * @author ThinkGem
 	 */
-    @Bean
-    public ChatClient chatClient(ChatClient.Builder builder, CmsAiProperties properties) {
+	@Bean
+	public ChatClient chatClient(ChatClient.Builder builder, CmsAiProperties properties) {
 		if (StringUtils.isNotBlank(properties.getDefaultSystem())) {
 			builder.defaultSystem(properties.getDefaultSystem());
 		}
 		if (properties.getToolCalls()) {
 			builder.defaultTools(new CmsAiTools());
 		}
-        return builder.build();
-    }
+		return builder.build();
+	}
 
 	/**
 	 * 聊天对话数据存储
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiWebMvcConfig.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiWebMvcConfig.java
index 943f50b9..44e5ef1b 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiWebMvcConfig.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiWebMvcConfig.java
@@ -18,19 +18,19 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Configuration
 public class CmsAiWebMvcConfig implements WebMvcConfigurer {
 
-    @Override
-    public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
-        configurer.setTaskExecutor(webMvcAsyncTaskExecutor());
-    }
+	@Override
+	public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
+		configurer.setTaskExecutor(webMvcAsyncTaskExecutor());
+	}
 
-    @Bean
-    public ThreadPoolTaskExecutor webMvcAsyncTaskExecutor() {
-        ThreadPoolTaskExecutor bean = new ThreadPoolTaskExecutor();
+	@Bean
+	public ThreadPoolTaskExecutor webMvcAsyncTaskExecutor() {
+		ThreadPoolTaskExecutor bean = new ThreadPoolTaskExecutor();
 		bean.setCorePoolSize(Global.getPropertyToInteger("web.taskPool.corePoolSize", "8"));
 		bean.setMaxPoolSize(Global.getPropertyToInteger("web.taskPool.maxPoolSize", "20"));
 		bean.setKeepAliveSeconds(Global.getPropertyToInteger("web.taskPool.keepAliveSeconds", "60"));
 		bean.setQueueCapacity(Global.getPropertyToInteger("web.taskPool.queueCapacity", String.valueOf(Integer.MAX_VALUE)));
-        bean.setThreadNamePrefix("web-async-");
-        return bean;
-    }
+		bean.setThreadNamePrefix("web-async-");
+		return bean;
+	}
 }
\ No newline at end of file
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java
index 6c1e1045..7fe193a8 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/WebClientThinkConfig.java
@@ -36,18 +36,18 @@ public class WebClientThinkConfig {
 
 	private final Logger logger = LoggerFactory.getLogger(WebClientThinkConfig.class);
 
-    @Bean
-    @ConditionalOnMissingBean
-    public WebClientCustomizer webClientCustomizerThink() {
-        return webClientBuilder -> {
-            ExchangeFilterFunction requestFilter = ExchangeFilterFunction.ofRequestProcessor(clientRequest -> {
-                logger.trace("Request url: {}: {}", clientRequest.method(), clientRequest.url());
-                return Mono.just(clientRequest);
-            });
-            ExchangeFilterFunction responseFilter = ExchangeFilterFunction.ofResponseProcessor(clientResponse -> {
-                logger.trace("Response status: {}", clientResponse.statusCode());
-                AtomicBoolean thinkingFlag = new AtomicBoolean(false);
-                Flux<DataBuffer> modifiedBody = clientResponse.bodyToFlux(DataBuffer.class)
+	@Bean
+	@ConditionalOnMissingBean
+	public WebClientCustomizer webClientCustomizerThink() {
+		return webClientBuilder -> {
+			ExchangeFilterFunction requestFilter = ExchangeFilterFunction.ofRequestProcessor(clientRequest -> {
+				logger.trace("Request url: {}: {}", clientRequest.method(), clientRequest.url());
+				return Mono.just(clientRequest);
+			});
+			ExchangeFilterFunction responseFilter = ExchangeFilterFunction.ofResponseProcessor(clientResponse -> {
+				logger.trace("Response status: {}", clientResponse.statusCode());
+				AtomicBoolean thinkingFlag = new AtomicBoolean(false);
+				Flux<DataBuffer> modifiedBody = clientResponse.bodyToFlux(DataBuffer.class)
 					.map(buf -> {
 						byte[] bytes = new byte[buf.readableByteCount()];
 						buf.read(bytes);
@@ -117,13 +117,13 @@ public class WebClientThinkConfig {
 						byte[] bytes = str.getBytes(StandardCharsets.UTF_8);
 						return new DefaultDataBufferFactory().wrap(bytes);
 					});
-                ClientResponse modifiedResponse = ClientResponse.from(clientResponse)
+				ClientResponse modifiedResponse = ClientResponse.from(clientResponse)
 					.headers(headers -> headers.remove(HttpHeaders.CONTENT_LENGTH))
 					.body(modifiedBody)
 					.build();
-                return Mono.just(modifiedResponse);
-            });
-            webClientBuilder.filter(requestFilter).filter(responseFilter);
-        };
-    }
+				return Mono.just(modifiedResponse);
+			});
+			webClientBuilder.filter(requestFilter).filter(responseFilter);
+		};
+	}
 }
-- 
Gitee


From b18dcb3001b66d7e02aa8279adac088bbe34b205 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 19 May 2025 17:15:33 +0800
Subject: [PATCH 35/84] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20AI=20=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E5=8C=96=E8=BE=93=E5=87=BA=E4=BE=8B=E5=AD=90=E3=80=81?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A0=BC=E5=BC=8F=E3=80=81JSON=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E3=80=81Java=E5=AF=B9=E8=B1=A1=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E3=80=81=E7=BB=93=E5=90=88Tool=20Calling=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/ai/service/CmsAiChatService.java      | 99 +++++++++++++++++--
 .../modules/cms/ai/tools/CmsAiTools.java      |  8 +-
 .../cms/ai/web/CmsAiChatController.java       | 71 +++++++++----
 3 files changed, 152 insertions(+), 26 deletions(-)

diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
index 00da4636..e3acbe3d 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
@@ -9,8 +9,11 @@ import com.jeesite.common.collect.MapUtils;
 import com.jeesite.common.idgen.IdGen;
 import com.jeesite.common.lang.DateUtils;
 import com.jeesite.common.lang.StringUtils;
+import com.jeesite.common.mapper.JsonMapper;
 import com.jeesite.common.service.BaseService;
 import com.jeesite.modules.cms.ai.properties.CmsAiProperties;
+import com.jeesite.modules.sys.entity.Area;
+import com.jeesite.modules.sys.utils.AreaUtils;
 import com.jeesite.modules.sys.utils.UserUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.ai.chat.client.ChatClient;
@@ -19,13 +22,19 @@ import org.springframework.ai.chat.client.advisor.vectorstore.QuestionAnswerAdvi
 import org.springframework.ai.chat.memory.ChatMemory;
 import org.springframework.ai.chat.messages.AssistantMessage;
 import org.springframework.ai.chat.messages.Message;
+import org.springframework.ai.chat.messages.SystemMessage;
 import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.model.Generation;
 import org.springframework.ai.chat.prompt.PromptTemplate;
+import org.springframework.ai.converter.AbstractMessageOutputConverter;
+import org.springframework.ai.converter.BeanOutputConverter;
+import org.springframework.ai.converter.MapOutputConverter;
 import org.springframework.ai.vectorstore.SearchRequest;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.messaging.converter.MappingJackson2MessageConverter;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Flux;
@@ -46,9 +55,9 @@ public class CmsAiChatService extends BaseService {
 	private static final String[] USER_MESSAGE_REPLACE = new String[]{"\\{", "\\}"};
 
 	@Autowired
-    private ChatClient chatClient;
+	private ChatClient chatClient;
 	@Autowired
-    private ChatMemory chatMemory;
+	private ChatMemory chatMemory;
 	@Autowired
 	private VectorStore vectorStore;
 	@Autowired
@@ -118,10 +127,10 @@ public class CmsAiChatService extends BaseService {
 	 */
 	public Flux<ChatResponse> chatStream(String conversationId, String message, HttpServletRequest request) {
 		return chatClient.prompt()
-            .messages(
+			.messages(
 				new UserMessage(StringUtils.replaceEach(message, USER_MESSAGE_SEARCH, USER_MESSAGE_REPLACE))
 			)
-            .advisors(
+			.advisors(
 				MessageChatMemoryAdvisor.builder(chatMemory)
 						.conversationId(conversationId)
 						.build(),
@@ -130,9 +139,9 @@ public class CmsAiChatService extends BaseService {
 						.promptTemplate(new PromptTemplate(properties.getDefaultPromptTemplate()))
 						.build()
 			)
-            .stream()
+			.stream()
 			.chatResponse()
-        	.doOnNext(response -> {
+			.doOnNext(response -> {
 				if (response.getResult() != null && StringUtils.isNotBlank(response.getResult().getOutput().getText())) {
 					AssistantMessage assistantMessage = (AssistantMessage)request.getAttribute("assistantMessage");
 					AssistantMessage currAssistantMessage = response.getResult().getOutput();
@@ -167,6 +176,84 @@ public class CmsAiChatService extends BaseService {
 						.generations(List.of(new Generation(assistantMessage)))
 						.build());
 			});
+	}
+
+	/**
+	 * 聊天对话，文本输出
+	 * @author ThinkGem
+	 */
+	public String chatText(String message) {
+		return chatClient.prompt()
+			.messages(
+				new UserMessage(StringUtils.replaceEach(message, USER_MESSAGE_SEARCH, USER_MESSAGE_REPLACE))
+			)
+			.call()
+			.content();
     }
 
+	/**
+	 * 聊天对话，结构化输出（Map）
+	 * @author ThinkGem
+	 */
+	public Map<String, Object> chatJson(String message) {
+		return chatClient.prompt()
+			.messages(
+				new SystemMessage("""
+						[ {name:'张三', sex:'男', age:'17'}, {name:'李四', sex:'女', age:'18'} ]，返回 json。
+						"""),
+				new UserMessage(StringUtils.replaceEach(message, USER_MESSAGE_SEARCH, USER_MESSAGE_REPLACE))
+			)
+			.call()
+			.responseEntity(new AbstractMessageOutputConverter<Map<String, Object>>(
+					new MappingJackson2MessageConverter(JsonMapper.getInstance())
+				) {
+					final MapOutputConverter mapOutputConverter = new MapOutputConverter();
+					@Override
+					public Map<String, Object> convert(String source) {
+						return mapOutputConverter.convert(source);
+					}
+					@Override
+					public String getFormat() {
+						return mapOutputConverter.getFormat();
+					}
+				}
+			)
+			.getEntity();
+	}
+
+	/**
+	 * 聊天对话，结构化输出（Area）
+	 * @author ThinkGem
+	 */
+	public List<Area> chatArea(String message) {
+		List<Area> list = AreaUtils.getAreaAllList();
+		if (list.size() > 10) list = list.subList(0, 10);
+		return chatClient.prompt()
+            .messages(
+				new SystemMessage(JsonMapper.toJson(list)),
+				new UserMessage(StringUtils.replaceEach(message, USER_MESSAGE_SEARCH, USER_MESSAGE_REPLACE))
+			)
+            .advisors(
+				QuestionAnswerAdvisor.builder(vectorStore)
+						.searchRequest(SearchRequest.builder().similarityThreshold(0.6F).topK(6).build())
+						.promptTemplate(new PromptTemplate(properties.getDefaultPromptTemplate()))
+						.build()
+			)
+			.call()
+			.responseEntity(new BeanOutputConverter<>(new ParameterizedTypeReference<List<Area>>() {},
+					JsonMapper.getInstance()))
+			.getEntity();
+	}
+
+//	public static void main(String[] args) {
+//		String s = """
+//				[{"id":"110000","isNewRecord":false,"createBy":"system","createDate":"2025-01-01T19:25:11Z","updateBy":"system","updateDate":"2025-01-01 19:25","childList":[{"id":"110100","isNewRecord":false,"createBy":"system","createDate":"2025-01-01 19:25","updateBy":"system","updateDate":"2025-01-01 19:25","childList":[{"id":"110101","isNewRecord":false,"areaCode":"110101","areaName":"东城区","areaType":"3","isRoot":true,"isTreeLeaf":false},{"id":"110102","isNewRecord":false,"areaCode":"110102","areaName":"西城区","areaType":"3","isRoot":true,"isTreeLeaf":false},{"id":"110105","isNewRecord":false,"areaCode":"110105","areaName":"朝阳区","areaType":"3","isRoot":true,"isTreeLeaf":false},{"id":"110106","isNewRecord":false,"areaCode":"110106","areaName":"丰台区","areaType":"3","isRoot":true,"isTreeLeaf":false},{"id":"110107","isNewRecord":false,"areaCode":"110107","areaName":"石景山区","areaType":"3","isRoot":true,"isTreeLeaf":false},{"id":"110108","isNewRecord":false,"areaCode":"110108","areaName":"海淀区","areaType":"3","isRoot":true,"isTreeLeaf":false},{"id":"110109","isNewRecord":false,"areaCode":"110109","areaName":"门头沟区","areaType":"3","isRoot":true,"isTreeLeaf":false},{"id":"110111","isNewRecord":false,"areaCode":"110111","areaName":"房山区","areaType":"3","isRoot":true,"isTreeLeaf":false}],"areaCode":"110100","areaName":"北京城区","areaType":"2","isRoot":true,"isTreeLeaf":false}],"areaCode":"110000","areaName":"北京市","areaType":"1","isRoot":true,"isTreeLeaf":false}]
+//				""";
+//		JsonMapper jsonMapper = JsonMapper.getInstance();
+//		ParameterizedTypeReference<List<Area>> p = new ParameterizedTypeReference<List<Area>>() {};
+//		List<Area> entity = jsonMapper.fromJsonString(s, jsonMapper.constructType(p.getType()));
+//		System.out.println(entity);
+//		String json = jsonMapper.toJsonString(entity);
+//		System.out.println(json);
+//	}
 }
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/tools/CmsAiTools.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/tools/CmsAiTools.java
index b323eb6a..8f53fcfd 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/tools/CmsAiTools.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/tools/CmsAiTools.java
@@ -33,8 +33,14 @@ public class CmsAiTools {
 	 * 你可以询问：打开客厅的灯，关闭卧室的灯（需创建新对话）
 	 */
 	@Tool(description = "房间里的灯打开或关闭")
-	public void turnLight(@ToolParam(description = "房间") String roomName, @ToolParam(description = "开关") boolean on) {
+	public String turnLight(@ToolParam(description = "房间") String roomName, @ToolParam(description = "开关") boolean on) {
 		String message = roomName + " 房间里的灯被 " + (on ? "打开" : "关闭");
 		logger.info(message + " ============== ");
+		return String.format("""
+					message: %s
+					roomName: %s
+					on: %s
+					""",
+				roomName, on, message);
 	}
 }
\ No newline at end of file
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/web/CmsAiChatController.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/web/CmsAiChatController.java
index 14314611..9ddac068 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/web/CmsAiChatController.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/web/CmsAiChatController.java
@@ -7,12 +7,14 @@ package com.jeesite.modules.cms.ai.web;
 import com.jeesite.common.config.Global;
 import com.jeesite.common.web.BaseController;
 import com.jeesite.modules.cms.ai.service.CmsAiChatService;
+import com.jeesite.modules.sys.entity.Area;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.ai.chat.messages.Message;
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Flux;
 
@@ -37,49 +39,80 @@ public class CmsAiChatController extends BaseController {
 	 * 获取聊天对话消息
 	 * @author ThinkGem
 	 */
-    @RequestMapping("/message")
-    public List<Message> message(String id) {
-        return cmsAiChatService.getChatMessage(id);
-    }
+	@RequestMapping("/message")
+	public List<Message> message(String id) {
+		return cmsAiChatService.getChatMessage(id);
+	}
 
 	/**
 	 * 聊天对话列表
 	 * @author ThinkGem
 	 */
-    @RequestMapping("/list")
-    public Collection<Map<String, Object>> list() {
+	@RequestMapping("/list")
+	public Collection<Map<String, Object>> list() {
 		return cmsAiChatService.getChatCacheMap().values().stream()
-            .sorted(Comparator.comparing(map -> (String) map.get("id"),
-                    Comparator.reverseOrder())).collect(Collectors.toList());
-    }
+			.sorted(Comparator.comparing(map -> (String) map.get("id"),
+					Comparator.reverseOrder())).collect(Collectors.toList());
+	}
 
 	/**
 	 * 新建或更新聊天对话
 	 * @author ThinkGem
 	 */
 	@RequestMapping("/save")
-    public String save(String id, String title) {
+	public String save(String id, String title) {
 		Map<String, Object> map = cmsAiChatService.saveChatConversation(id, title);
-        return renderResult(Global.TRUE, "保存成功", map);
-    }
+		return renderResult(Global.TRUE, "保存成功", map);
+	}
 
 	/**
 	 * 删除聊天对话
 	 * @author ThinkGem
 	 */
-    @RequestMapping("/delete")
-    public String delete(String id) {
+	@RequestMapping("/delete")
+	public String delete(@RequestParam String id) {
 		cmsAiChatService.deleteChatConversation(id);
-        return renderResult(Global.TRUE, "删除成功", id);
-    }
+		return renderResult(Global.TRUE, "删除成功", id);
+	}
 
 	/**
 	 * 聊天对话，流输出
 	 * @author ThinkGem
+	 * http://127.0.0.1:8980/js/a/cms/chat/stream?id=1&message=你好
 	 */
-    @RequestMapping(value = "/stream", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
-    public Flux<ChatResponse> stream(String id, String message, HttpServletRequest request) {
+	@RequestMapping(value = "/stream", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+	public Flux<ChatResponse> stream(@RequestParam String id, @RequestParam String message, HttpServletRequest request) {
 		return cmsAiChatService.chatStream(id, message, request);
-    }
+	}
+
+	/**
+	 * 聊天对话，文本输出
+	 * @author ThinkGem
+	 * http://127.0.0.1:8980/js/a/cms/chat/text?message=你好
+	 */
+	@RequestMapping(value = "/text")
+	public String text(@RequestParam String message) {
+		return cmsAiChatService.chatText(message);
+	}
+
+	/**
+	 * 聊天对话，结构化输出
+	 * @author ThinkGem
+	 * http://127.0.0.1:8980/js/a/cms/chat/json?message=张三
+	 */
+	@RequestMapping(value = "/json")
+	public Map<String, Object> json(@RequestParam String message) {
+		return cmsAiChatService.chatJson(message);
+	}
+
+	/**
+	 * 聊天对话，结构化输出
+	 * @author ThinkGem
+	 * http://127.0.0.1:8980/js/a/cms/chat/entity?message=北京
+	 */
+	@RequestMapping(value = "/entity")
+	public List<Area> entity(@RequestParam String message) {
+		return cmsAiChatService.chatArea(message);
+	}
 
 }
-- 
Gitee


From 25574c1a54ea34b0f9b84f93cbe1b3bfaad4b715 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 19 May 2025 17:15:51 +0800
Subject: [PATCH 36/84] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20AI=20=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E5=8C=96=E8=BE=93=E5=87=BA=E4=BE=8B=E5=AD=90=E3=80=81?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A0=BC=E5=BC=8F=E3=80=81JSON=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E3=80=81Java=E5=AF=B9=E8=B1=A1=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E3=80=81=E7=BB=93=E5=90=88Tool=20Calling=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/cms-ai/README.md | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/modules/cms-ai/README.md b/modules/cms-ai/README.md
index 94c82409..aaa83974 100644
--- a/modules/cms-ai/README.md
+++ b/modules/cms-ai/README.md
@@ -119,12 +119,38 @@ CREATE INDEX ON vector_store_1024 USING HNSW (embedding vector_cosine_ops);
 * 菜单名称：AI 助手
 * 菜单地址：/cms/chat/index
 
-## 工具调用 Tool Calling
+## 支持工具调用 Tool Calling
 
 工具调用 Tool Calling（也称 Function Calling）是人工智能应用程序中的常见模式，允许模型与一组 API 或工具交互，从而增强其功能。
 
 实例代码，详见 [CmsAiTools.java](https://gitee.com/thinkgem/jeesite5/blob/v5.springboot3/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/tools/CmsAiTools.java) 让 AI 调用你的 java 实现你的业务联动。
 
+## 支持结构化输出
+
+对于依赖可靠解析输出值的下游应用程序来说，LLM 产生结构化输出的能力很重要。开发人员希望将 AI 模型的结果快速转换为数据类型，如 JSON、XML 或 Java 类，这些类可以传递给其他应用程序函数和方法。
+
+pom.xml 中注释掉 `<artifactId>spring-ai-starter-model-openai</artifactId>`
+打开注释 `<artifactId>spring-ai-starter-model-ollama</artifactId>`
+启用 `Ollama` 本地模型进行测试，地址如下：
+
+* 文本格式输出
+  - 源码位置：CmsAiChatService.chatText(message)
+  - 访问地址：<http://127.0.0.1:8980/js/a/cms/chat/text?message=你好>
+  - 输出结果：`你好！有什么问题或需要帮助的吗？`
+* JSON 类型输出
+  - 源码位置：CmsAiChatService.chatJson(message)
+  - 访问地址：<http://127.0.0.1:8980/js/a/cms/chat/json?message=张三>
+  - 输出结果：`{"sex":"男","name":"张三","age":"17"}`
+* 结合 Tool Calling 结构化输出
+  - 开启参数：`spring.ai.tool-calls: true`
+  - 源码位置：CmsAiChatService.chatJson(message)
+  - 访问地址：<http://127.0.0.1:8980/js/a/cms/chat/json?message=打开客厅的灯>
+  - 输出结果：`{"message":"客厅房间里的灯被打开","roomName":"客厅","on":true}`
+* Java 对象类型输出:
+  - 源码位置：CmsAiChatService.chatArea(message)
+  - 访问地址：<http://127.0.0.1:8980/js/a/cms/chat/entity?message=北京>
+  - 输出结果：`[{"id":"110000","pageNo":1,"pageSize":10,"orderBy":"","isNewRecord":false,"dataMap":{},"status":"0","createBy":"system","createDate":"2025-01-01 19:25","updateBy":"system","updateDate":"2025-01-01 19:25","remarks":"","lastUpdateDateTime":1677843300000,"parentCodes":"0,","treeSort":110000,"treeSorts":"0000110000,","treeLeaf":"0","treeLevel":0,"treeNames":"北京市","childList":[{"id":"110100","pageNo":1,"pageSize":10,"orderBy":"","isNewRecord":false,"dataMap":{},"status":"0","createBy":"system","createDate":"2025-01-01 19:25","updateBy":"system","updateDate":"2025-01-01 19:25","remarks":"","lastUpdateDateTime":1677843300000,"parentCodes":"0,110000,","treeSort":110100,"treeSorts":"0000110000,0000110100,","treeLeaf":"0","treeLevel":1,"treeNames":"北京城区","childList":[{"id":"110101","isNewRecord":false,"areaCode":"110101","areaName":"东城区","areaType":"3","isRoot":true,"isTreeLeaf":false},{"id":"110102","isNewRecord":false,"areaCode":"110102","areaName":"西城区","areaType":"3","isRoot":true,"isTreeLeaf":false},{"id":"110105","isNewRecord":false,"areaCode":"110105","areaName":"朝阳区","areaType":"3","isRoot":true,"isTreeLeaf":false},{"id":"110106","isNewRecord":false,"areaCode":"110106","areaName":"丰台区","areaType":"3","isRoot":true,"isTreeLeaf":false},{"id":"110107","isNewRecord":false,"areaCode":"110107","areaName":"石景山区","areaType":"3","isRoot":true,"isTreeLeaf":false},{"id":"110108","isNewRecord":false,"areaCode":"110108","areaName":"海淀区","areaType":"3","isRoot":true,"isTreeLeaf":false},{"id":"110109","isNewRecord":false,"areaCode":"110109","areaName":"门头沟区","areaType":"3","isRoot":true,"isTreeLeaf":false},{"id":"110111","isNewRecord":false,"areaCode":"110111","areaName":"房山区","areaType":"3","isRoot":true,"isTreeLeaf":false}],"isQueryChildren":true,"areaCode":"110100","areaName":"北京城区","areaType":"2","isRoot":false,"parentCode":"110000","isTreeLeaf":false,"parentName":"北京市"}],"isQueryChildren":true,"areaCode":"110000","areaName":"北京市","areaType":"1","isRoot":true,"isTreeLeaf":false}]`
+
 ## 授权协议声明
 
 1. 基于 Apache License Version 2.0 协议发布，可用于商业项目，但必须遵守以下补充条款。
-- 
Gitee


From b0e6664909aacd0bb48bd0c0491a2cf8d0b996b0 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 21 May 2025 10:59:03 +0800
Subject: [PATCH 37/84] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BE=BE=E6=A2=A6?=
 =?UTF-8?q?=E5=92=8C=E9=87=91=E4=BB=93=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/config/application.yml | 19 +++++++++++++++++++
 web/src/main/resources/config/application.yml | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml
index 6f9adcc9..dc4ad4b4 100644
--- a/web-api/src/main/resources/config/application.yml
+++ b/web-api/src/main/resources/config/application.yml
@@ -91,6 +91,22 @@ jdbc:
 #  password: jeesite
 #  testSql: SELECT 1
 
+#  # 达梦数据库配置，请勿使用 sysdba 用户
+#  type: dameng
+#  driver: dm.jdbc.driver.DmDriver
+#  url: jdbc:dm://127.0.0.1:5236/jeesite5?schema=jeesite5
+#  username: jeesite
+#  password: jeesite123
+#  testSql: SELECT 1 FROM DUAL
+
+#  # 人大金仓数据库配置
+#  type: kingbase
+#  driver: com.kingbase8.Driver
+#  url: jdbc:kingbase8://127.0.0.1:54321/jeesite?currentSchema=jeesite&UseServerPrepare=false
+#  username: jeesite
+#  password: jeesite
+#  testSql: SELECT 1 FROM DUAL
+
 #  # H2 数据库配置（请打开 /modules/core/pom.xml 文件，打开 H2 DB 驱动并编译打包 core 模块）
 #  type: h2
 #  driver: org.h2.Driver
@@ -98,6 +114,9 @@ jdbc:
 #  username: jeesite
 #  password: jeesite
 #  testSql: SELECT 1
+  
+  # 更多数据库的支持列表：
+  # https://jeesite.com/docs/technology/#%E4%B8%83%E3%80%81%E5%B7%B2%E6%94%AF%E6%8C%81%E6%95%B0%E6%8D%AE%E5%BA%93
 
   # 连接信息加密
   encrypt:
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 51a63d32..2630436a 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -91,6 +91,22 @@ jdbc:
 #  password: jeesite
 #  testSql: SELECT 1
 
+#  # 达梦数据库配置，请勿使用 sysdba 用户
+#  type: dameng
+#  driver: dm.jdbc.driver.DmDriver
+#  url: jdbc:dm://127.0.0.1:5236/jeesite5?schema=jeesite5
+#  username: jeesite
+#  password: jeesite123
+#  testSql: SELECT 1 FROM DUAL
+
+#  # 人大金仓数据库配置
+#  type: kingbase
+#  driver: com.kingbase8.Driver
+#  url: jdbc:kingbase8://127.0.0.1:54321/jeesite?currentSchema=jeesite&UseServerPrepare=false
+#  username: jeesite
+#  password: jeesite
+#  testSql: SELECT 1 FROM DUAL
+
 #  # H2 数据库配置（请打开 /modules/core/pom.xml 文件，打开 H2 DB 驱动并编译打包 core 模块）
 #  type: h2
 #  driver: org.h2.Driver
@@ -98,6 +114,9 @@ jdbc:
 #  username: jeesite
 #  password: jeesite
 #  testSql: SELECT 1
+  
+  # 更多数据库的支持列表：
+  # https://jeesite.com/docs/technology/#%E4%B8%83%E3%80%81%E5%B7%B2%E6%94%AF%E6%8C%81%E6%95%B0%E6%8D%AE%E5%BA%93
 
   # 连接信息加密
   encrypt:
-- 
Gitee


From 4e5d776104e07e18b27ebb3602e5d3e142b7f008 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 21 May 2025 11:00:11 +0800
Subject: [PATCH 38/84] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20spring-boot-devtools?=
 =?UTF-8?q?=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/pom.xml                                    | 7 +++++++
 modules/core/src/main/resources/config/jeesite-core.yml | 5 +++++
 modules/core/src/main/resources/config/logger-core.xml  | 1 +
 web-ai/pom.xml                                          | 7 +++++++
 web-api/pom.xml                                         | 7 +++++++
 web-mini/pom.xml                                        | 7 +++++++
 web-mini/src/main/resources/config/logger-core.xml      | 1 +
 web/pom.xml                                             | 7 +++++++
 8 files changed, 42 insertions(+)

diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index cc80191d..48e23df8 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -142,6 +142,13 @@
 			<artifactId>logstash-logback-encoder</artifactId>
 			<version>${logstash-logback.version}</version>
 		</dependency>
+
+		<!-- 热部署工具 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
+		</dependency>
 		
 	</dependencies>
 	
diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index dbb885f0..db306479 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -102,6 +102,11 @@ spring:
   main:
     bannerMode: "off"
 
+  # 热部署工具
+  devtools:
+    restart:
+      additional-exclude: "**/*.log"
+
 # 日志配置（fatal、error、warn、info、debug）
 logging:
   config: classpath:config/logback-spring.xml
diff --git a/modules/core/src/main/resources/config/logger-core.xml b/modules/core/src/main/resources/config/logger-core.xml
index 457b1c44..1ccb043e 100644
--- a/modules/core/src/main/resources/config/logger-core.xml
+++ b/modules/core/src/main/resources/config/logger-core.xml
@@ -21,6 +21,7 @@
 <!-- 	<logger name="org.springframework.transaction.support.TransactionSynchronizationManager" level="TRACE" /> -->
 	<logger name="org.springframework.web.servlet.PageNotFound" level="ERROR" />
 	<logger name="org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker" level="ERROR" />
+	<logger name="org.springframework.boot.devtools" level="DEBUG" />
 
 	<logger name="springfox.documentation.spring.web.readers.parameter.ParameterDataTypeReader" level="ERROR" />
 	<logger name="springfox.documentation.schema.property.CachingModelPropertiesProvider" level="ERROR" />
diff --git a/web-ai/pom.xml b/web-ai/pom.xml
index 93381b88..05462ade 100644
--- a/web-ai/pom.xml
+++ b/web-ai/pom.xml
@@ -59,6 +59,13 @@
 			<version>5.12.0-SNAPSHOT</version>
 		</dependency>
 
+		<!-- 热部署工具
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
+		</dependency> -->
+
 	</dependencies>
 	
 	<build>
diff --git a/web-api/pom.xml b/web-api/pom.xml
index 7110b328..cd9c9b1d 100644
--- a/web-api/pom.xml
+++ b/web-api/pom.xml
@@ -80,6 +80,13 @@
 			<version>${project.parent.version}</version>
 		</dependency> -->
 
+		<!-- 热部署工具
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
+		</dependency> -->
+
 	</dependencies>
 	
 	<build>
diff --git a/web-mini/pom.xml b/web-mini/pom.xml
index 2168256b..3e1b4530 100644
--- a/web-mini/pom.xml
+++ b/web-mini/pom.xml
@@ -51,6 +51,13 @@
 			<!--<artifactId>spring-boot-starter-undertow</artifactId>-->
 		</dependency>
 
+		<!-- 热部署工具
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
+		</dependency> -->
+
 	</dependencies>
 	
 	<build>
diff --git a/web-mini/src/main/resources/config/logger-core.xml b/web-mini/src/main/resources/config/logger-core.xml
index 6fd35a23..f3a5dba9 100644
--- a/web-mini/src/main/resources/config/logger-core.xml
+++ b/web-mini/src/main/resources/config/logger-core.xml
@@ -21,6 +21,7 @@
 <!-- 	<logger name="org.springframework.transaction.support.TransactionSynchronizationManager" level="TRACE" /> -->
 	<logger name="org.springframework.web.servlet.PageNotFound" level="ERROR" />
 	<logger name="org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker" level="ERROR" />
+	<logger name="org.springframework.boot.devtools" level="DEBUG" />
 
 	<logger name="springfox.documentation.spring.web.readers.parameter.ParameterDataTypeReader" level="ERROR" />
 	<logger name="springfox.documentation.schema.property.CachingModelPropertiesProvider" level="ERROR" />
diff --git a/web/pom.xml b/web/pom.xml
index 2408a016..d88278a6 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -101,6 +101,13 @@
 			<version>${project.parent.version}</version>
 		</dependency> -->
 
+		<!-- 热部署工具
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
+		</dependency> -->
+
 	</dependencies>
 	
 	<build>
-- 
Gitee


From 6f05485e8f8164ab54e138fda21ca78f16004573 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 23 May 2025 19:01:15 +0800
Subject: [PATCH 39/84] =?UTF-8?q?=E5=90=91=E9=87=8F=E5=BA=93=E5=8F=AF?=
 =?UTF-8?q?=E9=80=89=EF=BC=8C=E5=9C=A8pom=E9=87=8C=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=90=91=E9=87=8F=E5=BA=93=E5=AE=9E=E7=8E=B0=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/service/ArticleVectorStoreImpl.java    |  2 +
 .../cms/ai/service/CmsAiChatService.java      | 49 +++++++++----------
 .../modules/cms/service/CategoryService.java  |  2 +-
 .../modules/cms/service/SiteService.java      |  2 +-
 4 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java
index 7b9ad5cd..a1a64d41 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java
@@ -37,6 +37,7 @@ import org.springframework.ai.transformer.splitter.TokenTextSplitter;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.ai.vectorstore.filter.FilterExpressionBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
@@ -51,6 +52,7 @@ import java.util.Set;
  * @author ThinkGem
  */
 @Service
+@ConditionalOnBean(VectorStore.class)
 public class ArticleVectorStoreImpl implements ArticleVectorStore {
 
 	protected Logger logger = LoggerFactory.getLogger(getClass());
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
index e3acbe3d..5ef37653 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
@@ -58,7 +58,7 @@ public class CmsAiChatService extends BaseService {
 	private ChatClient chatClient;
 	@Autowired
 	private ChatMemory chatMemory;
-	@Autowired
+	@Autowired(required = false)
 	private VectorStore vectorStore;
 	@Autowired
 	private CmsAiProperties properties;
@@ -126,20 +126,18 @@ public class CmsAiChatService extends BaseService {
 	 * @author ThinkGem
 	 */
 	public Flux<ChatResponse> chatStream(String conversationId, String message, HttpServletRequest request) {
-		return chatClient.prompt()
-			.messages(
-				new UserMessage(StringUtils.replaceEach(message, USER_MESSAGE_SEARCH, USER_MESSAGE_REPLACE))
-			)
-			.advisors(
-				MessageChatMemoryAdvisor.builder(chatMemory)
+		ChatClient.ChatClientRequestSpec spec = chatClient.prompt()
+				.messages(new UserMessage(StringUtils.replaceEach(message, USER_MESSAGE_SEARCH, USER_MESSAGE_REPLACE)))
+				.advisors(MessageChatMemoryAdvisor.builder(chatMemory)
 						.conversationId(conversationId)
-						.build(),
-				QuestionAnswerAdvisor.builder(vectorStore)
-						.searchRequest(SearchRequest.builder().similarityThreshold(0.6F).topK(6).build())
-						.promptTemplate(new PromptTemplate(properties.getDefaultPromptTemplate()))
-						.build()
-			)
-			.stream()
+						.build());
+		if (vectorStore != null) {
+			spec.advisors(QuestionAnswerAdvisor.builder(vectorStore)
+					.searchRequest(SearchRequest.builder().similarityThreshold(0.6F).topK(6).build())
+					.promptTemplate(new PromptTemplate(properties.getDefaultPromptTemplate()))
+					.build());
+		}
+		return spec.stream()
 			.chatResponse()
 			.doOnNext(response -> {
 				if (response.getResult() != null && StringUtils.isNotBlank(response.getResult().getOutput().getText())) {
@@ -204,7 +202,8 @@ public class CmsAiChatService extends BaseService {
 				new UserMessage(StringUtils.replaceEach(message, USER_MESSAGE_SEARCH, USER_MESSAGE_REPLACE))
 			)
 			.call()
-			.responseEntity(new AbstractMessageOutputConverter<Map<String, Object>>(
+			.responseEntity(
+				new AbstractMessageOutputConverter<Map<String, Object>>(
 					new MappingJackson2MessageConverter(JsonMapper.getInstance())
 				) {
 					final MapOutputConverter mapOutputConverter = new MapOutputConverter();
@@ -228,18 +227,18 @@ public class CmsAiChatService extends BaseService {
 	public List<Area> chatArea(String message) {
 		List<Area> list = AreaUtils.getAreaAllList();
 		if (list.size() > 10) list = list.subList(0, 10);
-		return chatClient.prompt()
-            .messages(
+		ChatClient.ChatClientRequestSpec spec = chatClient.prompt()
+			.messages(
 				new SystemMessage(JsonMapper.toJson(list)),
 				new UserMessage(StringUtils.replaceEach(message, USER_MESSAGE_SEARCH, USER_MESSAGE_REPLACE))
-			)
-            .advisors(
-				QuestionAnswerAdvisor.builder(vectorStore)
-						.searchRequest(SearchRequest.builder().similarityThreshold(0.6F).topK(6).build())
-						.promptTemplate(new PromptTemplate(properties.getDefaultPromptTemplate()))
-						.build()
-			)
-			.call()
+			);
+		if (vectorStore != null) {
+			spec.advisors(QuestionAnswerAdvisor.builder(vectorStore)
+					.searchRequest(SearchRequest.builder().similarityThreshold(0.6F).topK(6).build())
+					.promptTemplate(new PromptTemplate(properties.getDefaultPromptTemplate()))
+					.build());
+		}
+		return spec.call()
 			.responseEntity(new BeanOutputConverter<>(new ParameterizedTypeReference<List<Area>>() {},
 					JsonMapper.getInstance()))
 			.getEntity();
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/CategoryService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/CategoryService.java
index 3dc22770..94b8ce5a 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/CategoryService.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/CategoryService.java
@@ -133,7 +133,7 @@ public class CategoryService extends TreeService<CategoryDao, Category> {
 	 */
 	public String rebuildVectorStore(Category category) {
 		if (articleVectorStore == null) {
-			return text("您好，系统未安装全文检索模块");
+			return text("您好，系统未配置向量数据库");
 		}
 		return articleVectorStore.rebuild(new Article(category));
 	}
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/SiteService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/SiteService.java
index 8ff3b909..b638078a 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/SiteService.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/SiteService.java
@@ -129,7 +129,7 @@ public class SiteService extends CrudService<SiteDao, Site> {
 	 */
 	public String rebuildVectorStore(Site site) {
 		if (articleVectorStore == null) {
-			return text("您好，系统未安装内容管理AI模块");
+			return text("您好，系统未配置向量数据库");
 		}
 		return articleVectorStore.rebuild(new Article(new Category(site)));
 	}
-- 
Gitee


From 01690c76cd9c0a6e9b246a4c57e58d61e971efd0 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 24 May 2025 16:58:28 +0800
Subject: [PATCH 40/84] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/java/com/jeesite/common/io/IOUtils.java    | 6 +++++-
 .../src/main/java/com/jeesite/common/lang/NumberUtils.java | 6 +++++-
 .../src/main/java/com/jeesite/common/lang/ObjectUtils.java | 6 +++++-
 .../src/main/java/com/jeesite/common/lang/StringUtils.java | 6 +++++-
 .../main/java/com/jeesite/common/utils/IdcardUtils.java    | 7 ++-----
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/io/IOUtils.java b/common/src/main/java/com/jeesite/common/io/IOUtils.java
index 5c865e1e..95596ce3 100644
--- a/common/src/main/java/com/jeesite/common/io/IOUtils.java
+++ b/common/src/main/java/com/jeesite/common/io/IOUtils.java
@@ -103,5 +103,9 @@ public class IOUtils extends org.apache.commons.io.IOUtils {
             // ignore
         }
     }
-	
+
+	@Deprecated
+	public IOUtils() {
+		// empty
+	}
 }
\ No newline at end of file
diff --git a/common/src/main/java/com/jeesite/common/lang/NumberUtils.java b/common/src/main/java/com/jeesite/common/lang/NumberUtils.java
index 0940ff34..e47caf19 100644
--- a/common/src/main/java/com/jeesite/common/lang/NumberUtils.java
+++ b/common/src/main/java/com/jeesite/common/lang/NumberUtils.java
@@ -119,5 +119,9 @@ public class NumberUtils extends org.apache.commons.lang3.math.NumberUtils {
 		}
 		return df.format(data);
 	}
-	
+
+	@Deprecated
+	public NumberUtils() {
+		// empty
+	}
 }
diff --git a/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java b/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java
index b76895f6..bd5617ad 100644
--- a/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java
+++ b/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java
@@ -413,5 +413,9 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 //			inputPool.free(input);
 //		}
 //	}
-	
+
+	@Deprecated
+	public ObjectUtils() {
+		// empty
+	}
 }
diff --git a/common/src/main/java/com/jeesite/common/lang/StringUtils.java b/common/src/main/java/com/jeesite/common/lang/StringUtils.java
index 6fec8b50..2140ede7 100644
--- a/common/src/main/java/com/jeesite/common/lang/StringUtils.java
+++ b/common/src/main/java/com/jeesite/common/lang/StringUtils.java
@@ -415,5 +415,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 			return name;
 		}
 	}
-	
+
+	@Deprecated
+	public StringUtils() {
+		// empty
+	}
 }
diff --git a/common/src/main/java/com/jeesite/common/utils/IdcardUtils.java b/common/src/main/java/com/jeesite/common/utils/IdcardUtils.java
index a44b0ab1..4a723a01 100644
--- a/common/src/main/java/com/jeesite/common/utils/IdcardUtils.java
+++ b/common/src/main/java/com/jeesite/common/utils/IdcardUtils.java
@@ -1,7 +1,5 @@
 package com.jeesite.common.utils;
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -11,11 +9,10 @@ import java.util.Map;
 
 /**
  * 身份证工具类
- * 
  * @author June
- * @version 1.0, 2010-06-17
+ * @version 2010-06-17
  */
-public class IdcardUtils extends StringUtils {
+public class IdcardUtils {
 
 	/** 中国公民身份证号码最小长度。 */
 	public static final int CHINA_ID_MIN_LENGTH = 15;
-- 
Gitee


From eaa25b7975a67ffcd3a640dcc5409bf51614d2b4 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 24 May 2025 18:34:21 +0800
Subject: [PATCH 41/84] =?UTF-8?q?beetl=20=E6=97=A5=E6=9C=9F=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E6=9B=B4=E5=A5=BD=E7=9A=84=20DataUtils=20=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/src/main/resources/config/beetl-cms.properties |  4 ++--
 .../src/main/resources/config/beetl-core.properties    | 10 +++++-----
 web-ai/src/main/resources/config/beetl.properties      |  4 ++--
 web-api/src/main/resources/config/beetl.properties     |  4 ++--
 web-fast/src/main/resources/config/beetl.properties    |  4 ++--
 .../src/main/resources/config/beetl-core.properties    | 10 +++++-----
 web/src/main/resources/config/beetl.properties         |  4 ++--
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/cms/src/main/resources/config/beetl-cms.properties b/modules/cms/src/main/resources/config/beetl-cms.properties
index e27fdd33..da983c62 100644
--- a/modules/cms/src/main/resources/config/beetl-cms.properties
+++ b/modules/cms/src/main/resources/config/beetl-cms.properties
@@ -12,10 +12,10 @@ IMPORT_PACKAGE_cms=\
 #FNP.strutil = org.beetl.ext.fn.StringUtil
 
 ##内置的格式化函数
-#FT.dateFormat =  org.beetl.ext.format.DateFormat
+#FT.dateFormat = com.jeesite.common.beetl.ext.format.DateFormat
 
 ##内置的默认格式化函数
-#FTC.java.util.Date = org.beetl.ext.format.DateFormat
+#FTC.java.util.Date = com.jeesite.common.beetl.ext.format.DateFormat
 
 ## 标签类
 #TAG.include= org.beetl.ext.tag.IncludeTag
diff --git a/modules/core/src/main/resources/config/beetl-core.properties b/modules/core/src/main/resources/config/beetl-core.properties
index f54015ad..7731b75a 100644
--- a/modules/core/src/main/resources/config/beetl-core.properties
+++ b/modules/core/src/main/resources/config/beetl-core.properties
@@ -117,15 +117,15 @@ FNP.array = org.beetl.ext.fn.ArrayUtil
 FNP.dict = com.jeesite.common.beetl.ext.fn.DictUtil
 
 ##内置的格式化函数
-FT.dateFormat = org.beetl.ext.format.DateFormat
+FT.dateFormat = com.jeesite.common.beetl.ext.format.DateFormat
 FT.numberFormat = com.jeesite.common.beetl.ext.format.NumberFormat
 FT.xss = com.jeesite.common.beetl.ext.format.XssFormat
 
 ##内置的默认格式化函数
-FTC.java.util.Date = org.beetl.ext.format.DateFormat
-FTC.java.sql.Date = org.beetl.ext.format.DateFormat
-FTC.java.sql.Time = org.beetl.ext.format.DateFormat
-FTC.java.sql.Timestamp = org.beetl.ext.format.DateFormat
+FTC.java.util.Date = com.jeesite.common.beetl.ext.format.DateFormat
+FTC.java.sql.Date = com.jeesite.common.beetl.ext.format.DateFormat
+FTC.java.sql.Time = com.jeesite.common.beetl.ext.format.DateFormat
+FTC.java.sql.Timestamp = com.jeesite.common.beetl.ext.format.DateFormat
 FTC.java.lang.Short = com.jeesite.common.beetl.ext.format.NumberFormat
 FTC.java.lang.Long = com.jeesite.common.beetl.ext.format.NumberFormat
 FTC.java.lang.Integer = com.jeesite.common.beetl.ext.format.NumberFormat
diff --git a/web-ai/src/main/resources/config/beetl.properties b/web-ai/src/main/resources/config/beetl.properties
index 5a9fef83..701ad98f 100644
--- a/web-ai/src/main/resources/config/beetl.properties
+++ b/web-ai/src/main/resources/config/beetl.properties
@@ -12,10 +12,10 @@
 #FNP.strutil = org.beetl.ext.fn.StringUtil
 
 ##内置的格式化函数
-#FT.dateFormat =  org.beetl.ext.format.DateFormat
+#FT.dateFormat = com.jeesite.common.beetl.ext.format.DateFormat
 
 ##内置的默认格式化函数
-#FTC.java.util.Date = org.beetl.ext.format.DateFormat
+#FTC.java.util.Date = com.jeesite.common.beetl.ext.format.DateFormat
 
 ## 标签类
 #TAG.include= org.beetl.ext.tag.IncludeTag
diff --git a/web-api/src/main/resources/config/beetl.properties b/web-api/src/main/resources/config/beetl.properties
index 5a9fef83..701ad98f 100644
--- a/web-api/src/main/resources/config/beetl.properties
+++ b/web-api/src/main/resources/config/beetl.properties
@@ -12,10 +12,10 @@
 #FNP.strutil = org.beetl.ext.fn.StringUtil
 
 ##内置的格式化函数
-#FT.dateFormat =  org.beetl.ext.format.DateFormat
+#FT.dateFormat = com.jeesite.common.beetl.ext.format.DateFormat
 
 ##内置的默认格式化函数
-#FTC.java.util.Date = org.beetl.ext.format.DateFormat
+#FTC.java.util.Date = com.jeesite.common.beetl.ext.format.DateFormat
 
 ## 标签类
 #TAG.include= org.beetl.ext.tag.IncludeTag
diff --git a/web-fast/src/main/resources/config/beetl.properties b/web-fast/src/main/resources/config/beetl.properties
index 5a9fef83..701ad98f 100644
--- a/web-fast/src/main/resources/config/beetl.properties
+++ b/web-fast/src/main/resources/config/beetl.properties
@@ -12,10 +12,10 @@
 #FNP.strutil = org.beetl.ext.fn.StringUtil
 
 ##内置的格式化函数
-#FT.dateFormat =  org.beetl.ext.format.DateFormat
+#FT.dateFormat = com.jeesite.common.beetl.ext.format.DateFormat
 
 ##内置的默认格式化函数
-#FTC.java.util.Date = org.beetl.ext.format.DateFormat
+#FTC.java.util.Date = com.jeesite.common.beetl.ext.format.DateFormat
 
 ## 标签类
 #TAG.include= org.beetl.ext.tag.IncludeTag
diff --git a/web-mini/src/main/resources/config/beetl-core.properties b/web-mini/src/main/resources/config/beetl-core.properties
index 9ac4bd37..d2b2e21e 100644
--- a/web-mini/src/main/resources/config/beetl-core.properties
+++ b/web-mini/src/main/resources/config/beetl-core.properties
@@ -117,15 +117,15 @@ FNP.array = org.beetl.ext.fn.ArrayUtil
 FNP.dict = com.jeesite.common.beetl.ext.fn.DictUtil
 
 ##内置的格式化函数
-FT.dateFormat = org.beetl.ext.format.DateFormat
+FT.dateFormat = com.jeesite.common.beetl.ext.format.DateFormat
 FT.numberFormat = com.jeesite.common.beetl.ext.format.NumberFormat
 FT.xss = com.jeesite.common.beetl.ext.format.XssFormat
 
 ##内置的默认格式化函数
-FTC.java.util.Date = org.beetl.ext.format.DateFormat
-FTC.java.sql.Date = org.beetl.ext.format.DateFormat
-FTC.java.sql.Time = org.beetl.ext.format.DateFormat
-FTC.java.sql.Timestamp = org.beetl.ext.format.DateFormat
+FTC.java.util.Date = com.jeesite.common.beetl.ext.format.DateFormat
+FTC.java.sql.Date = com.jeesite.common.beetl.ext.format.DateFormat
+FTC.java.sql.Time = com.jeesite.common.beetl.ext.format.DateFormat
+FTC.java.sql.Timestamp = com.jeesite.common.beetl.ext.format.DateFormat
 FTC.java.lang.Short = com.jeesite.common.beetl.ext.format.NumberFormat
 FTC.java.lang.Long = com.jeesite.common.beetl.ext.format.NumberFormat
 FTC.java.lang.Integer = com.jeesite.common.beetl.ext.format.NumberFormat
diff --git a/web/src/main/resources/config/beetl.properties b/web/src/main/resources/config/beetl.properties
index 5a9fef83..701ad98f 100644
--- a/web/src/main/resources/config/beetl.properties
+++ b/web/src/main/resources/config/beetl.properties
@@ -12,10 +12,10 @@
 #FNP.strutil = org.beetl.ext.fn.StringUtil
 
 ##内置的格式化函数
-#FT.dateFormat =  org.beetl.ext.format.DateFormat
+#FT.dateFormat = com.jeesite.common.beetl.ext.format.DateFormat
 
 ##内置的默认格式化函数
-#FTC.java.util.Date = org.beetl.ext.format.DateFormat
+#FTC.java.util.Date = com.jeesite.common.beetl.ext.format.DateFormat
 
 ## 标签类
 #TAG.include= org.beetl.ext.tag.IncludeTag
-- 
Gitee


From 4726020b54715779bac69ddf9bb835d1b2cd4ade Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 24 May 2025 18:36:33 +0800
Subject: [PATCH 42/84] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/src/main/resources/i18n/core/sys/i18n_en.properties   | 3 ++-
 .../src/main/resources/i18n/core/sys/i18n_ja_JP.properties     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
index 57f3b36c..b0d74d37 100644
--- a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
+++ b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
@@ -33,7 +33,7 @@
 公司管理=Company manage
 岗位管理=Position manage
 
-权限管理=Rights Manage
+权限管理=Rights manage
 角色管理=Role manage
 二级管理员=Secondary admin
 系统管理员=System admin
@@ -56,6 +56,7 @@
 在线用户=Online user
 在线文档=Online doc
 
+数据管理=Data manage
 研发工具=Develop Tools
 
 用户选择=User select
diff --git a/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties b/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties
index 5b9d18de..f35ad3b5 100644
--- a/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties
+++ b/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties
@@ -56,6 +56,7 @@
 在线用户=オンラインユーザー
 在线文档=オンラインドキュメント
 
+数据管理=データかんり
 研发工具=開発ツール
 
 用户选择=ユーザー選択
-- 
Gitee


From d78b7f3c17df69f279997ee2caf85700905c5f1e Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 24 May 2025 18:39:58 +0800
Subject: [PATCH 43/84] =?UTF-8?q?DateUtils.parseDate=20=E5=A4=9A=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=AD=97=E7=AC=A6=E4=B8=B2=E8=A7=A3=E6=9E=90=E6=80=A7?=
 =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=8C=E5=B9=B6=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=97=B6=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/pom.xml                                |  5 ++
 .../com/jeesite/common/lang/DateUtils.java    | 57 ++++++++++++-------
 .../com/jeesite/test/lang/DateUtilsTest.java  |  1 +
 3 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index b4beee15..f25a73c4 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -242,6 +242,11 @@
 			<artifactId>spring-web</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot</artifactId>
diff --git a/common/src/main/java/com/jeesite/common/lang/DateUtils.java b/common/src/main/java/com/jeesite/common/lang/DateUtils.java
index 55daff2d..6a1f5e83 100644
--- a/common/src/main/java/com/jeesite/common/lang/DateUtils.java
+++ b/common/src/main/java/com/jeesite/common/lang/DateUtils.java
@@ -4,10 +4,11 @@
  */
 package com.jeesite.common.lang;
 
+import com.jeesite.common.utils.LocaleUtils;
 import org.apache.commons.lang3.time.FastDateFormat;
 
 import java.lang.management.ManagementFactory;
-import java.text.ParseException;
+import java.text.ParsePosition;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -21,7 +22,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	private static final String[] parsePatterns = {
 		"yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd HH", "yyyy-MM",
 		"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM/dd HH", "yyyy/MM",
-		"yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM.dd HH", "yyyy.MM", 
+		"yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM.dd HH", "yyyy.MM",
 		"yyyy年MM月dd日", "yyyy年MM月dd日 HH时mm分ss秒", "yyyy年MM月dd日 HH时mm分", "yyyy年MM月dd日 HH时", "yyyy年MM月",
 		"yyyyMMdd", "yyyyMM", "yyyy", "yyyy-MM-dd'T'HH:mm:ss'Z'"};
 
@@ -45,15 +46,12 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	public static String formatDate(Date date, String pattern) {
 		String formatDate = null;
 		if (date != null){
-//			if (StringUtils.isNotBlank(pattern)) {
-//				formatDate = DateFormatUtils.format(date, pattern);
-//			} else {
-//				formatDate = DateFormatUtils.format(date, "yyyy-MM-dd");
-//			}
 			if (StringUtils.isBlank(pattern)) {
 				pattern = "yyyy-MM-dd";
 			}
-			formatDate = FastDateFormat.getInstance(pattern).format(date);
+//			formatDate = DateFormatUtils.format(date, "yyyy-MM-dd");
+			formatDate = FastDateFormat.getInstance(pattern,
+					LocaleUtils.getTimeZone(), LocaleUtils.getLocale()).format(date);
 		}
 		return formatDate;
 	}
@@ -77,7 +75,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	 */
 	public static String getDate(String pattern) {
 //		return DateFormatUtils.format(new Date(), pattern);
-		return FastDateFormat.getInstance(pattern).format(new Date());
+		return FastDateFormat.getInstance(pattern,
+				LocaleUtils.getTimeZone(), LocaleUtils.getLocale()).format(new Date());
 	}
 	
 	/**
@@ -88,11 +87,12 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	 * @return
 	 */
 	public static String getDate(String pattern, int amont, int type) {
-		Calendar calendar = Calendar.getInstance();
+		Calendar calendar = Calendar.getInstance(LocaleUtils.getTimeZone(), LocaleUtils.getLocale());
 		calendar.setTime(new Date());
 		calendar.add(type, amont);
 //		return DateFormatUtils.format(calendar.getTime(), pattern);
-		return FastDateFormat.getInstance(pattern).format(calendar.getTime());
+		return FastDateFormat.getInstance(pattern,
+						LocaleUtils.getTimeZone(), LocaleUtils.getLocale()).format(calendar.getTime());
 	}
 	
 	/**
@@ -155,11 +155,26 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	 * 日期型字符串转化为日期对象，指定日期解析格式
 	 */
 	public static Date parseDate(final String str, final String... parsePatterns) {
-		try {
-			return parseDate(str, null, parsePatterns);
-		} catch (ParseException e) {
-			return null;
+//		try {
+//			return DateUtils.parseDate(str, Locale.getDefault(), parsePatterns);
+//		} catch (ParseException e) {
+//			return null;
+//		}
+		ParsePosition pos = new ParsePosition(0);
+		Calendar calendar = Calendar.getInstance(LocaleUtils.getTimeZone(), LocaleUtils.getLocale());
+		for (final String parsePattern : parsePatterns) {
+			FastDateFormat format = FastDateFormat.getInstance(parsePattern);
+			calendar.clear();
+			try {
+				if (format.parse(str, pos, calendar) && pos.getIndex() == str.length()) {
+					return calendar.getTime();
+				}
+			} catch (final IllegalArgumentException ignored) {
+				// leniency is preventing calendar from being set
+			}
+			pos.setIndex(0);
 		}
+		return null;
 	}
 
 	/**
@@ -239,7 +254,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	 * @return
 	 */
 	public static int getWeekOfYear(Date date){
-		Calendar cal = Calendar.getInstance(); 
+		Calendar cal = Calendar.getInstance(LocaleUtils.getTimeZone(), LocaleUtils.getLocale());
 		cal.setTime(date);
 		return cal.get(Calendar.WEEK_OF_YEAR);
 	}
@@ -253,7 +268,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 		if (date == null){
 			return null;
 		}
-		Calendar calendar = Calendar.getInstance();
+		Calendar calendar = Calendar.getInstance(LocaleUtils.getTimeZone(), LocaleUtils.getLocale());
 		calendar.setTime(date);
 		calendar.set(Calendar.HOUR_OF_DAY, 0);
 		calendar.set(Calendar.MINUTE, 0);
@@ -271,7 +286,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 		if (date == null){
 			return null;
 		}
-		Calendar calendar = Calendar.getInstance();
+		Calendar calendar = Calendar.getInstance(LocaleUtils.getTimeZone(), LocaleUtils.getLocale());
 		calendar.setTime(date);
 		calendar.set(Calendar.HOUR_OF_DAY, 23);
 		calendar.set(Calendar.MINUTE, 59);
@@ -326,5 +341,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 		}
 		return new Date[]{beginDate, endDate};
 	}
-	
+
+	@Deprecated
+	public DateUtils() {
+		// empty
+	}
 }
diff --git a/common/src/test/java/com/jeesite/test/lang/DateUtilsTest.java b/common/src/test/java/com/jeesite/test/lang/DateUtilsTest.java
index b1dffc01..37c9f301 100644
--- a/common/src/test/java/com/jeesite/test/lang/DateUtilsTest.java
+++ b/common/src/test/java/com/jeesite/test/lang/DateUtilsTest.java
@@ -18,6 +18,7 @@ public class DateUtilsTest {
 
 	public static void main(String[] args) throws ParseException {
 		System.out.println(DateUtils.formatDate(DateUtils.parseDate("2023/3/6")));
+		System.out.println(DateUtils.formatDateTime(DateUtils.parseDate("2023-3-6 12:30:15")));
 		System.out.println(DateUtils.getDate("yyyy年MM月dd日 E"));
 		long time = new Date().getTime()-DateUtils.parseDate("2023-11-19").getTime();
 		System.out.println(time/(24*60*60*1000));
-- 
Gitee


From 1b465578b6476f0fb230675f9252f10da26946a8 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 24 May 2025 18:41:20 +0800
Subject: [PATCH 44/84] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20LocaleUtils=20?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=8C=96=E8=AF=AD=E8=A8=80=E5=92=8C=E6=97=B6?=
 =?UTF-8?q?=E5=8C=BA=E5=AF=B9=E8=B1=A1=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/utils/LocaleUtils.java | 93 +++++++++++++++++++
 .../config/web/IpAddrFilterConfig.java        |  6 +-
 2 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 common/src/main/java/com/jeesite/common/utils/LocaleUtils.java

diff --git a/common/src/main/java/com/jeesite/common/utils/LocaleUtils.java b/common/src/main/java/com/jeesite/common/utils/LocaleUtils.java
new file mode 100644
index 00000000..397330fa
--- /dev/null
+++ b/common/src/main/java/com/jeesite/common/utils/LocaleUtils.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ */
+package com.jeesite.common.utils;
+
+import com.jeesite.common.io.PropertiesUtils;
+import com.jeesite.common.web.http.ServletUtils;
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.context.i18n.TimeZoneAwareLocaleContext;
+import org.springframework.core.NamedThreadLocal;
+import org.springframework.web.servlet.LocaleContextResolver;
+
+import java.util.Locale;
+import java.util.TimeZone;
+
+/**
+ * 本地化工具
+ * @author ThinkGem
+ * @version 2025-05-21
+ */
+public class LocaleUtils {
+
+	private static final Boolean LANG_ENABLED = PropertiesUtils.getInstance().getPropertyToBoolean("lang.enabled", "false");
+	private static final ThreadLocal<TimeZoneAwareLocaleContext> timeZoneAwareLocaleContext = new NamedThreadLocal<>("TimeZoneAwareLocaleContext");
+	private static LocaleContextResolver localeResolver;
+
+	/**
+	 * 获取当前 Locale 对象，获取顺序：请求 -> 会话 -> Cookie -> lang.defaultLocale
+	 */
+	public static Locale getLocale() {
+		return getTimeZoneAwareLocaleContext().getLocale();
+	}
+
+	/**
+	 * 获取当前 TimeZone 对象，获取顺序：请求 -> 会话 -> Cookie -> lang.defaultTimeZone
+	 */
+	public static TimeZone getTimeZone() {
+		return getTimeZoneAwareLocaleContext().getTimeZone();
+	}
+
+	/**
+	 * 获取 TimeZoneAwareLocaleContext
+	 */
+	public static TimeZoneAwareLocaleContext getTimeZoneAwareLocaleContext() {
+		TimeZoneAwareLocaleContext context = timeZoneAwareLocaleContext.get();
+		if (context != null){
+			return context;
+		}
+		if (LANG_ENABLED && localeResolver != null){
+			HttpServletRequest request = ServletUtils.getRequest();
+			if (request != null){
+				context = (TimeZoneAwareLocaleContext)localeResolver.resolveLocaleContext(request);
+			}
+		}
+		if (context == null){
+			context = new TimeZoneAwareLocaleContext() {
+				@Override
+				public Locale getLocale() {
+					return Locale.getDefault();
+				}
+				@Override
+				public TimeZone getTimeZone() {
+					return TimeZone.getDefault();
+				}
+			};
+		}
+		setTimeZoneAwareLocaleContext(context);
+		return context;
+	}
+
+	/**
+	 * 设置 TimeZoneAwareLocaleContext
+	 */
+	public static void setTimeZoneAwareLocaleContext(TimeZoneAwareLocaleContext context) {
+		timeZoneAwareLocaleContext.set(context);
+	}
+
+	/**
+	 * 清理本地线程对象（请求结束时调用）
+	 */
+	public static void removeTimeZoneAwareLocaleContext() {
+		timeZoneAwareLocaleContext.remove();
+	}
+
+	/**
+	 * 设置 LocaleContextResolver
+	 */
+	public static void setLocaleResolver(LocaleContextResolver localeResolver) {
+		LocaleUtils.localeResolver = localeResolver;
+	}
+
+}
diff --git a/modules/core/src/main/java/com/jeesite/modules/config/web/IpAddrFilterConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/web/IpAddrFilterConfig.java
index 3f10aa3e..e3fe80a7 100644
--- a/modules/core/src/main/java/com/jeesite/modules/config/web/IpAddrFilterConfig.java
+++ b/modules/core/src/main/java/com/jeesite/modules/config/web/IpAddrFilterConfig.java
@@ -6,6 +6,7 @@ package com.jeesite.modules.config.web;
 
 import com.jeesite.common.config.Global;
 import com.jeesite.common.lang.StringUtils;
+import com.jeesite.common.utils.LocaleUtils;
 import com.jeesite.common.web.http.ServletUtils;
 import jakarta.servlet.Filter;
 import jakarta.servlet.ServletRequest;
@@ -15,6 +16,7 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
+import org.springframework.web.servlet.LocaleContextResolver;
 
 /**
  * IP地址黑白名单过滤器配置
@@ -27,7 +29,7 @@ public class IpAddrFilterConfig {
 	private static String[] denyPrefixes;
 
 	@Bean
-	public FilterRegistrationBean<Filter> ipAddrFilter() {
+	public FilterRegistrationBean<Filter> ipAddrFilter(LocaleContextResolver localeResolver) {
 		FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<>();
 		bean.setName("ipAddrFilter");
 		bean.setOrder(Ordered.HIGHEST_PRECEDENCE + 10);
@@ -39,7 +41,9 @@ public class IpAddrFilterConfig {
 				response.setStatus(403);
 				ServletUtils.renderString(response, Global.getText("访问拒绝"));
 			}
+			LocaleUtils.removeTimeZoneAwareLocaleContext();
 		});
+		LocaleUtils.setLocaleResolver(localeResolver);
 		bean.addUrlPatterns("/*");
 		return bean;
 	}
-- 
Gitee


From 9118907838e21f956886c0279a651d85ff6a2af2 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 24 May 2025 18:42:12 +0800
Subject: [PATCH 45/84] =?UTF-8?q?JsonMapper=E6=97=A5=E6=9C=9F=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=BD=AC=E6=8D=A2=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/mapper/JsonMapper.java | 82 +++++++++++--------
 .../jeesite/test/mapper/JsonMapperTest.java   |  2 +
 2 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
index 096d8058..d439d0a5 100644
--- a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
+++ b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
@@ -11,6 +11,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonParser.Feature;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.Annotated;
+import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
 import com.fasterxml.jackson.databind.module.SimpleModule;
@@ -53,7 +54,7 @@ public class JsonMapper extends ObjectMapper {
 	}
 	
 	public JsonMapper() {
-		// 设置默认时区、默认日期格式
+		// 日志类型格式化处理
 		this.setLocaleTimeZoneDateFormat();
 		// 为Null时不序列化
 		this.setSerializationInclusion(Include.NON_NULL);
@@ -70,7 +71,7 @@ public class JsonMapper extends ObjectMapper {
 	}
 
 	/**
-	 * 设置默认时区、默认日期格式
+	 * 日志类型格式化处理
 	 * @author ThinkGem
 	 */
 	public JsonMapper setLocaleTimeZoneDateFormat(){
@@ -81,32 +82,52 @@ public class JsonMapper extends ObjectMapper {
 		this.setAnnotationIntrospector(new JacksonAnnotationIntrospector() {
 			@Serial
 			private static final long serialVersionUID = 1L;
+			private static final String[] pattern = new String[] {"yyyy", "MM", "dd", "HH", "mm", "ss", "SSS"};
+			private static class JeeSiteJsonSerializer extends JsonSerializer<Date> {
+				private final String pattern;
+				private JeeSiteJsonSerializer(String pattern) {
+					this.pattern = pattern;
+				}
+				@Override
+				public void serialize(Date value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+					if (value != null){
+						if (StringUtils.isNotBlank(pattern)) {
+							gen.writeString(DateUtils.formatDate(value, pattern));
+						} else {
+							gen.writeString(DateUtils.formatDateTime(value));
+						}
+					}
+				}
+			}
+			private static class JeeSiteJsonDeserializer extends JsonDeserializer<Date> {
+				private final String pattern;
+				private JeeSiteJsonDeserializer(String pattern) {
+					this.pattern = pattern;
+				}
+				@Override
+				public Date deserialize(JsonParser parser, DeserializationContext context) throws IOException {
+					if (StringUtils.isNotBlank(pattern)) {
+						return DateUtils.parseDate(parser.getText(), pattern);
+					} else {
+						return DateUtils.parseDate(parser.getText());
+					}
+				}
+			}
 			@Override
 			public Object findSerializer(Annotated a) {
 				if (a instanceof AnnotatedMethod) {
 					AnnotatedElement m = a.getAnnotated();
 					JsonFormat jf = m.getAnnotation(JsonFormat.class);
-					if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(),
-							"yyyy", "MM", "dd", "HH", "mm", "ss", "SSS")) {
-						return new JsonSerializer<Date>(){
-							@Override
-							public void serialize(Date value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
-								if (value != null){
-									jgen.writeString(DateUtils.formatDate(value, jf.pattern()));
-								}
-							}
-						};
+					if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
+						return new JeeSiteJsonSerializer(jf.pattern());
 					}
 					AnnotatedMethod am = (AnnotatedMethod) a;
 					if (am.getRawReturnType() == Date.class) {
-						return new JsonSerializer<Date>(){
-							@Override
-							public void serialize(Date value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
-								if (value != null){
-									jgen.writeString(DateUtils.formatDateTime(value));
-								}
-							}
-						};
+						return new JeeSiteJsonSerializer(null);
+					}
+				} else if (a instanceof AnnotatedClass) {
+					if (a.getRawType() == Date.class) {
+						return new JeeSiteJsonSerializer(null);
 					}
 				}
 				return super.findSerializer(a);
@@ -116,23 +137,16 @@ public class JsonMapper extends ObjectMapper {
 				if (a instanceof AnnotatedMethod) {
 					AnnotatedElement m = a.getAnnotated();
 					JsonFormat jf = m.getAnnotation(JsonFormat.class);
-					if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(),
-							"yyyy", "MM", "dd", "HH", "mm", "ss", "SSS")) {
-						return new JsonDeserializer<Date>(){
-							@Override
-							public Date deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
-								return DateUtils.parseDate(p.getText(), jf.pattern());
-							}
-						};
+					if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
+						return new JeeSiteJsonDeserializer(jf.pattern());
 					}
 					AnnotatedMethod am = (AnnotatedMethod) a;
 					if (am.getParameterCount() > 0 && am.getParameterType(0).getRawClass() == Date.class) {
-						return new JsonDeserializer<Date>(){
-							@Override
-							public Date deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
-								return DateUtils.parseDate(p.getText());
-							}
-						};
+						return new JeeSiteJsonDeserializer(null);
+					}
+				} else if (a instanceof AnnotatedClass) {
+					if (a.getRawType() == Date.class) {
+						return new JeeSiteJsonDeserializer(null);
 					}
 				}
 				return super.findDeserializer(a);
diff --git a/common/src/test/java/com/jeesite/test/mapper/JsonMapperTest.java b/common/src/test/java/com/jeesite/test/mapper/JsonMapperTest.java
index 5d2dec70..4efbb872 100644
--- a/common/src/test/java/com/jeesite/test/mapper/JsonMapperTest.java
+++ b/common/src/test/java/com/jeesite/test/mapper/JsonMapperTest.java
@@ -8,6 +8,7 @@ import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.collect.MapUtils;
 import com.jeesite.common.mapper.JsonMapper;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -30,6 +31,7 @@ public class JsonMapperTest {
 		map.put("pId", 1);
 		map.put("name", "你好");
 		map.put("open", true);
+		map.put("date", new Date());
 		list.add(map);
 		String json = JsonMapper.toJson(list);
 		System.out.println(json);
-- 
Gitee


From 3c295c86b8d6ebc69f00f6f7b9b5576db5cb2862 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 26 May 2025 09:42:59 +0800
Subject: [PATCH 46/84] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E6=97=B6=E5=8C=BA=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/shiro/filter/FormFilter.java |  5 ++++-
 .../views/include/sysIndex/topMenuLang.html         | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java
index 1726a7c4..3aa51046 100644
--- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java
+++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java
@@ -431,6 +431,8 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica
 		data.put("company", Global.getProperty("companyName"));
 		data.put("version", Global.getProperty("productVersion"));
 		data.put("year", Global.getProperty("copyrightYear"));
+		data.put("lang", Global.getLang(request));
+		data.put("timeZone", Global.getTimeZone(request));
 	}
 
 	/**
@@ -458,7 +460,8 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica
 		data.put("company", Global.getProperty("companyName"));
 		data.put("version", Global.getProperty("productVersion"));
 		data.put("year", Global.getProperty("copyrightYear"));
-		data.put("lang", Global.getLang());
+		data.put("lang", Global.getLang(request));
+		data.put("timeZone", Global.getTimeZone(request));
 		List<Map<String, Object>> roleList = ListUtils.newArrayList();
 		String desktopUrl = null; String roleCode = (String)session.getAttribute("roleCode");
 		Set<String> roleCodes = roleCode != null ? SetUtils.newHashSet(StringUtils.splitComma(roleCode)) : null;
diff --git a/modules/core/src/main/resources/views/include/sysIndex/topMenuLang.html b/modules/core/src/main/resources/views/include/sysIndex/topMenuLang.html
index 922b7994..75bac351 100644
--- a/modules/core/src/main/resources/views/include/sysIndex/topMenuLang.html
+++ b/modules/core/src/main/resources/views/include/sysIndex/topMenuLang.html
@@ -8,6 +8,19 @@
 		<% for(var dict in @DictUtils.getDictList('sys_lang_type')){ %>
 			<li><a href="${ctxPath}/lang/${dict.dictValue}" onclick="location=this.href+'?url='+location.href;return false;">${dict.dictLabel}</a></li>
 		<% } %>
+		<li><a href="javascript:$('#timeZoneSelectName').click()">${@Global.getTimeZone()}</a></li>
+		<div class="hide">
+			<#form:treeselect id="timeZoneSelect" title="${text('时区选择')}" allowClear="false"
+				url="${ctxPath}/timeZone/treeData" callbackFuncName="timeZoneSelectCallback" boxWidth="350"/>
+			<script>
+				function timeZoneSelectCallback(id, act){
+					if (id == 'timeZoneSelect' && (act == 'ok')){
+						var timeZoneId = $('#timeZoneSelectCode').val();
+						location = '${ctxPath}/timeZone?id=' + js.encodeUrl(timeZoneId) + '&url=' + location.href;
+					}
+				}
+			</script>
+		</div>
 		<li class="mt10"></li>
 	</ul>
 </li>
-- 
Gitee


From e1d8548e82dd2c4c9c8a6233772c4a02d69b3e47 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 26 May 2025 10:18:57 +0800
Subject: [PATCH 47/84] 5.12.0

---
 modules/app/src/main/resources/db/upgrade/app/versions | 3 ++-
 modules/cms/src/main/resources/db/upgrade/cms/versions | 3 ++-
 modules/core/src/test/resources/application.yml        | 2 +-
 web-ai/src/main/resources/config/application.yml       | 2 +-
 web-api/src/main/resources/config/application.yml      | 2 +-
 web-fast/src/main/resources/config/application.yml     | 2 +-
 web-mini/src/main/resources/config/application.yml     | 2 +-
 web/src/main/resources/config/application.yml          | 2 +-
 8 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/app/src/main/resources/db/upgrade/app/versions b/modules/app/src/main/resources/db/upgrade/app/versions
index 30a971d4..e2318df5 100644
--- a/modules/app/src/main/resources/db/upgrade/app/versions
+++ b/modules/app/src/main/resources/db/upgrade/app/versions
@@ -26,4 +26,5 @@
 5.10.0
 5.10.1
 5.11.0
-5.11.1
\ No newline at end of file
+5.11.1
+5.12.0
\ No newline at end of file
diff --git a/modules/cms/src/main/resources/db/upgrade/cms/versions b/modules/cms/src/main/resources/db/upgrade/cms/versions
index dfba06d3..10339fe6 100644
--- a/modules/cms/src/main/resources/db/upgrade/cms/versions
+++ b/modules/cms/src/main/resources/db/upgrade/cms/versions
@@ -34,4 +34,5 @@
 5.10.0
 5.10.1
 5.11.0
-5.11.1
\ No newline at end of file
+5.11.1
+5.12.0
\ No newline at end of file
diff --git a/modules/core/src/test/resources/application.yml b/modules/core/src/test/resources/application.yml
index 7268562c..f9d4e6e1 100644
--- a/modules/core/src/test/resources/application.yml
+++ b/modules/core/src/test/resources/application.yml
@@ -4,7 +4,7 @@ productName: JeeSite Demo
 companyName: ThinkGem
 
 # 产品版本、版权年份
-productVersion: V5.11
+productVersion: V5.12
 copyrightYear: 2025
 
 # 数据库连接
diff --git a/web-ai/src/main/resources/config/application.yml b/web-ai/src/main/resources/config/application.yml
index 8b7f5176..8a8b388f 100644
--- a/web-ai/src/main/resources/config/application.yml
+++ b/web-ai/src/main/resources/config/application.yml
@@ -8,7 +8,7 @@ productName: JeeSite Demo
 companyName: ThinkGem
 
 # 产品版本、版权年份
-productVersion: V5.11
+productVersion: V5.12
 copyrightYear: 2025
 
 # 是否演示模式
diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml
index dc4ad4b4..1d33632d 100644
--- a/web-api/src/main/resources/config/application.yml
+++ b/web-api/src/main/resources/config/application.yml
@@ -8,7 +8,7 @@ productName: JeeSite Demo
 companyName: ThinkGem
 
 # 产品版本、版权年份
-productVersion: V5.11
+productVersion: V5.12
 copyrightYear: 2025
 
 # 是否演示模式
diff --git a/web-fast/src/main/resources/config/application.yml b/web-fast/src/main/resources/config/application.yml
index a1ac05c4..7f766e65 100644
--- a/web-fast/src/main/resources/config/application.yml
+++ b/web-fast/src/main/resources/config/application.yml
@@ -8,7 +8,7 @@ productName: JeeSite Demo
 companyName: ThinkGem
 
 # 产品版本、版权年份
-productVersion: V5.11
+productVersion: V5.12
 copyrightYear: 2025
 
 # 是否演示模式
diff --git a/web-mini/src/main/resources/config/application.yml b/web-mini/src/main/resources/config/application.yml
index 2ed472cd..084f44df 100644
--- a/web-mini/src/main/resources/config/application.yml
+++ b/web-mini/src/main/resources/config/application.yml
@@ -8,7 +8,7 @@ productName: JeeSite Demo
 companyName: ThinkGem
 
 # 产品版本、版权年份
-productVersion: V5.11
+productVersion: V5.12
 copyrightYear: 2025
 
 # 是否演示模式
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 2630436a..5b20d130 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -8,7 +8,7 @@ productName: JeeSite Demo
 companyName: ThinkGem
 
 # 产品版本、版权年份
-productVersion: V5.11
+productVersion: V5.12
 copyrightYear: 2025
 
 # 是否演示模式
-- 
Gitee


From 2f6530e725f6144760983a54cd2a88afb4c37397 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 27 May 2025 23:36:54 +0800
Subject: [PATCH 48/84] update jdbc driver

---
 modules/core/pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 48e23df8..8499b259 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -74,16 +74,16 @@
 		<!-- 达梦数据库 -->
 		<dependency>
 			<groupId>com.dameng</groupId>
-			<artifactId>Dm8JdbcDriver18</artifactId>
-			<version>8.1.1.49</version>
+			<artifactId>DmJdbcDriver18</artifactId>
+			<version>8.1.3.62</version>
 			<scope>runtime</scope>
 		</dependency>
 
 		<!-- 人大金仓数据库 -->
 		<dependency>
-			<groupId>com.kingbase</groupId>
-			<artifactId>kingbasejdbc8</artifactId>
-			<version>8.6.0</version>
+			<groupId>cn.com.kingbase</groupId>
+			<artifactId>kingbase8</artifactId>
+			<version>8.6.1</version>
 			<scope>runtime</scope>
 		</dependency>
 
-- 
Gitee


From a567c82ef2f963234021ed2713f37ac917d16dcc Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 5 Jun 2025 13:04:51 +0800
Subject: [PATCH 49/84] =?UTF-8?q?=E5=A2=9E=E5=8A=A0JsonFormat=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/mapper/JsonMapper.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
index d439d0a5..c3ad30ef 100644
--- a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
+++ b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
@@ -116,13 +116,12 @@ public class JsonMapper extends ObjectMapper {
 			@Override
 			public Object findSerializer(Annotated a) {
 				if (a instanceof AnnotatedMethod) {
-					AnnotatedElement m = a.getAnnotated();
-					JsonFormat jf = m.getAnnotation(JsonFormat.class);
-					if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
-						return new JeeSiteJsonSerializer(jf.pattern());
-					}
 					AnnotatedMethod am = (AnnotatedMethod) a;
 					if (am.getRawReturnType() == Date.class) {
+						JsonFormat jf = am.getAnnotation(JsonFormat.class);
+						if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
+							return new JeeSiteJsonSerializer(jf.pattern());
+						}
 						return new JeeSiteJsonSerializer(null);
 					}
 				} else if (a instanceof AnnotatedClass) {
@@ -135,13 +134,13 @@ public class JsonMapper extends ObjectMapper {
 			@Override
 			public Object findDeserializer(Annotated a) {
 				if (a instanceof AnnotatedMethod) {
-					AnnotatedElement m = a.getAnnotated();
-					JsonFormat jf = m.getAnnotation(JsonFormat.class);
-					if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
-						return new JeeSiteJsonDeserializer(jf.pattern());
-					}
 					AnnotatedMethod am = (AnnotatedMethod) a;
 					if (am.getParameterCount() > 0 && am.getParameterType(0).getRawClass() == Date.class) {
+						AnnotatedElement m = am.getAnnotated();
+						JsonFormat jf = m.getAnnotation(JsonFormat.class);
+						if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
+							return new JeeSiteJsonDeserializer(jf.pattern());
+						}
 						return new JeeSiteJsonDeserializer(null);
 					}
 				} else if (a instanceof AnnotatedClass) {
-- 
Gitee


From b55467312f344f87019fb1d497d075a3cab620b8 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 6 Jun 2025 15:03:21 +0800
Subject: [PATCH 50/84] =?UTF-8?q?=E5=A2=9E=E5=8A=A0ureport=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/src/main/resources/config/jeesite-core.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index db306479..52578d65 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -548,6 +548,8 @@ shiro:
     /oauth2/authorize = user
     /druid/** = perms[sys:state:druid]
     /bpm/modeler/** = perms[bpm:modeler]
+    /ureport/designer/** = perms[ureport]
+    /ureport/datasource/** = perms[ureport]
     ${adminPath}/login-cas = cas
     ${adminPath}/login-ldap = ldap
     ${adminPath}/login = authc
-- 
Gitee


From cb5957ee61d0e5b813144e51dc834515947a0f7c Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 7 Jun 2025 16:11:53 +0800
Subject: [PATCH 51/84] add AiChatServiceTest

---
 modules/cms-ai/README.md                      |  2 +-
 .../cms/ai/service/CmsAiChatService.java      | 16 ++++-
 .../cms/ai/web/CmsAiChatController.java       |  5 +-
 .../com/jeesite/test/AiChatServiceTest.java   | 72 +++++++++++++++++++
 .../cms-ai/src/test/resources/application.yml | 28 ++++++++
 .../src/test/resources/logback-test.xml       | 20 ++++++
 6 files changed, 137 insertions(+), 6 deletions(-)
 create mode 100644 modules/cms-ai/src/test/java/com/jeesite/test/AiChatServiceTest.java
 create mode 100644 modules/cms-ai/src/test/resources/application.yml
 create mode 100644 modules/cms-ai/src/test/resources/logback-test.xml

diff --git a/modules/cms-ai/README.md b/modules/cms-ai/README.md
index aaa83974..0497bed8 100644
--- a/modules/cms-ai/README.md
+++ b/modules/cms-ai/README.md
@@ -131,7 +131,7 @@ CREATE INDEX ON vector_store_1024 USING HNSW (embedding vector_cosine_ops);
 
 pom.xml 中注释掉 `<artifactId>spring-ai-starter-model-openai</artifactId>`
 打开注释 `<artifactId>spring-ai-starter-model-ollama</artifactId>`
-启用 `Ollama` 本地模型进行测试，地址如下：
+启用 `Ollama` 本地模型，测试类：`AiChatServiceTest.java`，或测试地址：
 
 * 文本格式输出
   - 源码位置：CmsAiChatService.chatText(message)
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
index 5ef37653..a60b63ea 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java
@@ -5,6 +5,7 @@
 package com.jeesite.modules.cms.ai.service;
 
 import com.jeesite.common.cache.CacheUtils;
+import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.collect.MapUtils;
 import com.jeesite.common.idgen.IdGen;
 import com.jeesite.common.lang.DateUtils;
@@ -27,6 +28,7 @@ import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.model.Generation;
 import org.springframework.ai.chat.prompt.PromptTemplate;
+import org.springframework.ai.content.Media;
 import org.springframework.ai.converter.AbstractMessageOutputConverter;
 import org.springframework.ai.converter.BeanOutputConverter;
 import org.springframework.ai.converter.MapOutputConverter;
@@ -126,8 +128,16 @@ public class CmsAiChatService extends BaseService {
 	 * @author ThinkGem
 	 */
 	public Flux<ChatResponse> chatStream(String conversationId, String message, HttpServletRequest request) {
-		ChatClient.ChatClientRequestSpec spec = chatClient.prompt()
-				.messages(new UserMessage(StringUtils.replaceEach(message, USER_MESSAGE_SEARCH, USER_MESSAGE_REPLACE)))
+		String text = StringUtils.replaceEach(message, USER_MESSAGE_SEARCH, USER_MESSAGE_REPLACE);
+		List<Media> media = ListUtils.newArrayList();
+//		List<FileUpload> fileUploadList = FileUploadUtils.findFileUpload(conversationId, "cms-chat");
+//		for (FileUpload fileUpload : fileUploadList) {
+//			File file = new File(fileUpload.getFileEntity().getFileRealPath());
+//			MediaType mediaType = MediaType.parseMediaType(FileUtils.getContentType(file.getName()));
+//			media.add(Media.builder().mimeType(mediaType).data(file).build());
+//		}
+		UserMessage userMessage = UserMessage.builder().text(text).media(media).build();
+		ChatClient.ChatClientRequestSpec spec = chatClient.prompt().messages(userMessage)
 				.advisors(MessageChatMemoryAdvisor.builder(chatMemory)
 						.conversationId(conversationId)
 						.build());
@@ -197,7 +207,7 @@ public class CmsAiChatService extends BaseService {
 		return chatClient.prompt()
 			.messages(
 				new SystemMessage("""
-						[ {name:'张三', sex:'男', age:'17'}, {name:'李四', sex:'女', age:'18'} ]，返回 json。
+						[{name:'张三', sex:'男', age:'17'}, {name:'李四', sex:'女', age:'18'}]，返回 json。
 						"""),
 				new UserMessage(StringUtils.replaceEach(message, USER_MESSAGE_SEARCH, USER_MESSAGE_REPLACE))
 			)
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/web/CmsAiChatController.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/web/CmsAiChatController.java
index 9ddac068..0cdd1f5b 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/web/CmsAiChatController.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/web/CmsAiChatController.java
@@ -96,9 +96,10 @@ public class CmsAiChatController extends BaseController {
 	}
 
 	/**
-	 * 聊天对话，结构化输出
+	 * 聊天对话，结构化输出 JSON
 	 * @author ThinkGem
 	 * http://127.0.0.1:8980/js/a/cms/chat/json?message=张三
+	 * http://127.0.0.1:8980/js/a/cms/chat/json?message=打开客厅的灯
 	 */
 	@RequestMapping(value = "/json")
 	public Map<String, Object> json(@RequestParam String message) {
@@ -106,7 +107,7 @@ public class CmsAiChatController extends BaseController {
 	}
 
 	/**
-	 * 聊天对话，结构化输出
+	 * 聊天对话，结构化输出 Entity
 	 * @author ThinkGem
 	 * http://127.0.0.1:8980/js/a/cms/chat/entity?message=北京
 	 */
diff --git a/modules/cms-ai/src/test/java/com/jeesite/test/AiChatServiceTest.java b/modules/cms-ai/src/test/java/com/jeesite/test/AiChatServiceTest.java
new file mode 100644
index 00000000..b088eced
--- /dev/null
+++ b/modules/cms-ai/src/test/java/com/jeesite/test/AiChatServiceTest.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ */
+package com.jeesite.test;
+
+import com.jeesite.common.mapper.JsonMapper;
+import com.jeesite.common.tests.BaseSpringContextTests;
+import com.jeesite.modules.cms.ai.service.CmsAiChatService;
+import com.jeesite.modules.sys.entity.Area;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AI 对话单元测试
+ * @author ThinkGem
+ * @version 2025-06-06
+ */
+@ActiveProfiles("test")
+@SpringBootApplication
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@SpringBootTest(properties = {"spring.ai.tool-calls=true"})
+public class AiChatServiceTest extends BaseSpringContextTests {
+
+	@Autowired
+	private CmsAiChatService cmsAiChatService;
+
+	@Test
+	public void test01Text() {
+		logger.info("===== 聊天对话，文本输出");
+		String message = "你好";
+		String text = cmsAiChatService.chatText(message);
+		System.out.println(text);
+	}
+
+	@Test
+	public void test02Json() {
+		logger.info("===== 聊天对话，结构化输出 JSON");
+		String message = "张三";
+		Map<String, Object> map = cmsAiChatService.chatJson(message);
+		System.out.println(JsonMapper.toJson(map));
+	}
+
+	@Test
+	public void test03Tool() {
+		logger.info("===== 聊天对话，结构化输出 Tool Calling");
+		String message = "打开客厅的灯";
+		Map<String, Object> map = cmsAiChatService.chatJson(message);
+		System.out.println(JsonMapper.toJson(map));
+		message = "关闭客厅的灯";
+		map = cmsAiChatService.chatJson(message);
+		System.out.println(JsonMapper.toJson(map));
+	}
+
+	@Test
+	public void test04Entity() {
+		logger.info("===== 聊天对话，结构化输出 Entity");
+		String message = "北京";
+		List<Area> list = cmsAiChatService.chatArea(message);
+		System.out.println(JsonMapper.toJson(list));
+	}
+
+
+}
diff --git a/modules/cms-ai/src/test/resources/application.yml b/modules/cms-ai/src/test/resources/application.yml
new file mode 100644
index 00000000..f03254a3
--- /dev/null
+++ b/modules/cms-ai/src/test/resources/application.yml
@@ -0,0 +1,28 @@
+
+# 产品或项目名称、软件开发公司名称
+productName: JeeSite Demo
+companyName: ThinkGem
+
+# 产品版本、版权年份
+productVersion: V5.12
+copyrightYear: 2025
+
+
+# 数据库连接
+jdbc: 
+  
+  # Mysql 数据库配置
+  type: mysql
+  driver: com.mysql.cj.jdbc.Driver
+  url: jdbc:mysql://127.0.0.1:3306/jeesite_v5?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
+  username: root
+  password: 123456
+  testSql: SELECT 1
+  
+# 日志配置
+logging:
+  config: classpath:logback-test.xml
+
+# 消息推送
+msg:
+  enabled: true
diff --git a/modules/cms-ai/src/test/resources/logback-test.xml b/modules/cms-ai/src/test/resources/logback-test.xml
new file mode 100644
index 00000000..a9a15b7f
--- /dev/null
+++ b/modules/cms-ai/src/test/resources/logback-test.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="false">
+	
+	<!-- Logger level setting -->
+	<include resource="org/springframework/boot/logging/logback/defaults.xml" />
+	<include resource="config/logger-core.xml"/>
+
+	<!-- Console log output -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} %clr(%-5p) %clr([%-39logger{39}]){cyan} - %m%n%wEx</pattern>
+		</encoder>
+	</appender>
+	
+	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+	<root level="WARN">
+		<appender-ref ref="console" />
+	</root>
+	
+</configuration>
\ No newline at end of file
-- 
Gitee


From a81297c2bea83f7c2d7f64a518c39171daae6fa5 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 8 Jun 2025 10:38:42 +0800
Subject: [PATCH 52/84] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=BB=98=E8=AE=A4=E6=9B=BF=E6=8D=A2=E4=B8=BA?=
 =?UTF-8?q?=20Monorepo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/modules/gen/vue/vueApi.xml      | 16 ++++----
 .../templates/modules/gen/vue/vueForm.xml     | 24 +++++------
 .../modules/gen/vue/vueFormChildList.xml      | 16 ++++----
 .../modules/gen/vue/vueFormRoute.xml          | 32 +++++++--------
 .../templates/modules/gen/vue/vueImport.xml   | 16 ++++----
 .../templates/modules/gen/vue/vueIndex.xml    | 10 ++---
 .../templates/modules/gen/vue/vueList.xml     | 40 +++++++++----------
 .../templates/modules/gen/vue/vueSelect.xml   | 14 +++----
 8 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
index a5293e74..b2bccd0e 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueApi</name>
-	<filePath>${frontDir}/src/api/${moduleName}/${subModuleName}</filePath>
+	<filePath>${frontDir}/packages/${moduleName}/api/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}.ts</fileName>
 	<content><![CDATA[
 /**
@@ -11,18 +11,18 @@
  * No deletion without permission, or be held responsible to law.
  * @author ${functionAuthor}
  */
-import { defHttp } from '/@/utils/http/axios';
-import { useGlobSetting } from '/@/hooks/setting';
+import { defHttp } from '@jeesite/core/utils/http/axios';
+import { useGlobSetting } from '@jeesite/core/hooks/setting';
 <% if(table.isTreeEntity){ %>
-import { TreeDataModel, TreeModel } from '/@/api/model/baseModel';
+import { TreeDataModel, TreeModel } from '@jeesite/core/api/model/baseModel';
 <% }else if(isNotBlank(table.optionMap['leftTreeRightTableUrl'])){ %>
-import { BasicModel, Page, TreeDataModel } from '/@/api/model/baseModel';
+import { BasicModel, Page, TreeDataModel } from '@jeesite/core/api/model/baseModel';
 <% }else{ %>
-import { BasicModel, Page } from '/@/api/model/baseModel';
+import { BasicModel, Page } from '@jeesite/core/api/model/baseModel';
 <% } %>
 <% if(toBoolean(table.optionMap['isImportExport'])){ %>
-import { UploadApiResult } from '/@/api/sys/upload';
-import { UploadFileParams } from '/#/axios';
+import { UploadApiResult } from '@jeesite/core/api/sys/upload';
+import { UploadFileParams } from '@jeesite/types/axios';
 
 const { ctxPath, adminPath } = useGlobSetting();
 <% }else{ %>
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
index 831fe906..0c6a9feb 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueForm</name>
-	<filePath>${frontDir}/src/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
 	<fileName>form.vue</fileName>
 	<content><![CDATA[
 <% var modalOrDrawer = @StringUtils.contains(table.tplCategory, '_modal') ? 'Modal' : 'Drawer'; %>
@@ -57,13 +57,13 @@
 </template>
 <script lang="ts" setup name="${compNamePrefix}Form">
   import { ref, unref, computed } from 'vue';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { router } from '/@/router';
-  import { Icon } from '/@/components/Icon';
-  import { BasicForm, FormSchema, useForm } from '/@/components/Form';
-  import { Basic${modalOrDrawer}, use${modalOrDrawer}Inner } from '/@/components/${modalOrDrawer}';
-  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '/@/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { useI18n } from '@jeesite/core/hooks/web/useI18n';
+  import { useMessage } from '@jeesite/core/hooks/web/useMessage';
+  import { router } from '@jeesite/core/router';
+  import { Icon } from '@jeesite/core/components/Icon';
+  import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
+  import { Basic${modalOrDrawer}, use${modalOrDrawer}Inner } from '@jeesite/core/components/${modalOrDrawer}';
+  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
   <%
   var userselectExists = false;
   var officeselectExists = false;
@@ -84,16 +84,16 @@
   }
   %>
   <% if(userselectExists || officeselectExists) { %>
-  import { officeTreeData } from '/@/api/sys/office';
+  import { officeTreeData } from '@jeesite/core/api/sys/office';
   <% } %>
   <% if(companyselectExists) { %>
-  import { companyTreeData } from '/@/api/sys/company';
+  import { companyTreeData } from '@jeesite/core/api/sys/company';
   <% } %>
   <% if(areaselectExists) { %>
-  import { areaTreeData } from '/@/api/sys/area';
+  import { areaTreeData } from '@jeesite/core/api/sys/area';
   <% } %>
   <% if(toBoolean(table.optionMap['isBpmForm'])){ %>
-  import { BpmButton } from '/@/components/Bpm';
+  import { BpmButton } from '@jeesite/bpm/components/Bpm';
   <% } %>
   <% for (child in table.childList){ %>
   import Form${@StringUtils.cap(child.classNameSimple)}List from './form${@StringUtils.cap(child.classNameSimple)}List.vue';
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
index cb53d841..bc789025 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueFormChildList</name>
-	<filePath>${frontDir}/src/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
 	<fileName>form${@StringUtils.cap(table.classNameSimple)}List.vue</fileName>
 	<content><![CDATA[
 <!--
@@ -23,10 +23,10 @@
 </template>
 <script lang="ts" setup>
   import { ref } from 'vue';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { Icon } from '/@/components/Icon';
-  import { BasicTable, BasicColumn, useTable } from '/@/components/Table';
-  import { ${ParentClassName} } from '/@/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${parentClassName}';
+  import { useI18n } from '@jeesite/core/hooks/web/useI18n';
+  import { Icon } from '@jeesite/core/components/Icon';
+  import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
+  import { ${ParentClassName} } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${parentClassName}';
   <%
   var userselectExists = false;
   var officeselectExists = false;
@@ -47,13 +47,13 @@
   }
   %>
   <% if(userselectExists || officeselectExists) { %>
-  import { officeTreeData } from '/@/api/sys/office';
+  import { officeTreeData } from '@jeesite/core/api/sys/office';
   <% } %>
   <% if(companyselectExists) { %>
-  import { companyTreeData } from '/@/api/sys/company';
+  import { companyTreeData } from '@jeesite/core/api/sys/company';
   <% } %>
   <% if(areaselectExists) { %>
-  import { areaTreeData } from '/@/api/sys/area';
+  import { areaTreeData } from '@jeesite/core/api/sys/area';
   <% } %>
 
   const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
index 41334031..0ff887a2 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueFormRoute</name>
-	<filePath>${frontDir}/src/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
 	<fileName>formRoute.vue</fileName>
 	<content><![CDATA[
 <!--
@@ -62,17 +62,17 @@
 </template>
 <script lang="ts" setup name="${compNamePrefix}Form">
   import { ref, unref, computed, onMounted } from 'vue';
-  import { useEmitter } from '/@/store/modules/user';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { router } from '/@/router';
-  import { Icon } from '/@/components/Icon';
-  import { CollapseForm } from '/@/components/CollapseForm';
-  import { BasicForm, FormSchema, useForm } from '/@/components/Form';
+  import { useEmitter } from '@jeesite/core/store/modules/user';
+  import { useI18n } from '@jeesite/core/hooks/web/useI18n';
+  import { useMessage } from '@jeesite/core/hooks/web/useMessage';
+  import { router } from '@jeesite/core/router';
+  import { Icon } from '@jeesite/core/components/Icon';
+  import { CollapseForm } from '@jeesite/core/components/CollapseForm';
+  import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
 <% if (table.childList.~size > 0){ %>
-  import { BasicTable, useTable } from '/@/components/Table';
+  import { BasicTable, useTable } from '@jeesite/core/components/Table';
 <% } %>
-  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '/@/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
 <%
 var userselectExists = false;
 var officeselectExists = false;
@@ -93,19 +93,19 @@ for(c in table.columnList){
 }
 %>
 <% if(userselectExists || officeselectExists) { %>
-  import { officeTreeData } from '/@/api/sys/office';
+  import { officeTreeData } from '@jeesite/core/api/sys/office';
 <% } %>
 <% if(companyselectExists) { %>
-  import { companyTreeData } from '/@/api/sys/company';
+  import { companyTreeData } from '@jeesite/core/api/sys/company';
 <% } %>
 <% if(areaselectExists) { %>
-  import { areaTreeData } from '/@/api/sys/area';
+  import { areaTreeData } from '@jeesite/core/api/sys/area';
 <% } %>
 <% if(toBoolean(table.optionMap['isBpmForm'])){ %>
-  import { BpmButton } from '/@/components/Bpm';
+  import { BpmButton } from '@jeesite/bpm/components/Bpm';
 <% } %>
-  import { useQuery } from '/@/hooks/web/usePage';
-  import { useTabs } from '/@/hooks/web/useTabs';
+  import { useQuery } from '@jeesite/core/hooks/web/usePage';
+  import { useTabs } from '@jeesite/core/hooks/web/useTabs';
 
   const formConfig = ref<any[]>([
     {
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
index 9e4962cd..31aedad0 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueFormImport</name>
-	<filePath>${frontDir}/src/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
 	<fileName>formImport.vue</fileName>
 	<content><![CDATA[
 <% if(toBoolean(table.optionMap['isImportExport'])){ %>
@@ -45,13 +45,13 @@
 <script lang="ts" setup>
   import { ref } from 'vue';
   import { Upload } from 'ant-design-vue';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { useGlobSetting } from '/@/hooks/setting';
-  import { downloadByUrl } from '/@/utils/file/download';
-  import { Icon } from '/@/components/Icon';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { ${className}ImportData } from '/@/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { useI18n } from '@jeesite/core/hooks/web/useI18n';
+  import { useMessage } from '@jeesite/core/hooks/web/useMessage';
+  import { useGlobSetting } from '@jeesite/core/hooks/setting';
+  import { downloadByUrl } from '@jeesite/core/utils/file/download';
+  import { Icon } from '@jeesite/core/components/Icon';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
+  import { ${className}ImportData } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
   import { FileType } from 'ant-design-vue/es/upload/interface';
   import { AxiosProgressEvent } from 'axios';
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
index 313b87de..ebbbb6c6 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueIndex</name>
-	<filePath>${frontDir}/src/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
 	<fileName>index.vue</fileName>
 	<content><![CDATA[
 <% if(table.isTreeEntity || isNotBlank(table.optionMap['leftTreeRightTableUrl'])){ %>
@@ -30,10 +30,10 @@
 </template>
 <script lang="ts" setup name="${compNamePrefix}Index">
   import { ref } from 'vue';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { PageWrapper } from '/@/components/Page';
-  import { BasicTree } from '/@/components/Tree';
-  import { ${className}TreeData } from '/@/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { useI18n } from '@jeesite/core/hooks/web/useI18n';
+  import { PageWrapper } from '@jeesite/core/components/Page';
+  import { BasicTree } from '@jeesite/core/components/Tree';
+  import { ${className}TreeData } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
   import ListView from './list.vue';
 
   const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
index 6c76bcd2..8fb90deb 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueList</name>
-	<filePath>${frontDir}/src/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
 	<fileName>list.vue</fileName>
 	<content><![CDATA[
 <% var modalOrDrawer = @StringUtils.contains(table.tplCategory, '_modal') ? 'Modal' : 'Drawer'; %>
@@ -97,23 +97,23 @@ if(table.isTreeEntity){
   import { unref<% if(toBoolean(table.optionMap['isImportExport'])){ %>, ref<% } %><% if(table.isTreeEntity || isNotBlank(table.optionMap['leftTreeRightTableFk'])){ %>, watch<% }
   	%><% if(table.isTreeEntity){ %>, nextTick<% } %> } from 'vue';
   <% if(@StringUtils.contains(table.tplCategory, '_route')) { %>
-  import { useEmitter } from '/@/store/modules/user';
+  import { useEmitter } from '@jeesite/core/store/modules/user';
   <% } %>
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useI18n } from '@jeesite/core/hooks/web/useI18n';
+  import { useMessage } from '@jeesite/core/hooks/web/useMessage';
   <% if(toBoolean(table.optionMap['isImportExport'])){ %>
-  import { useGlobSetting } from '/@/hooks/setting';
-  import { downloadByUrl } from '/@/utils/file/download';
+  import { useGlobSetting } from '@jeesite/core/hooks/setting';
+  import { downloadByUrl } from '@jeesite/core/utils/file/download';
   <% } %>
   <% if(@StringUtils.contains(table.tplCategory, '_route')) { %>
-  import { useGo } from '/@/hooks/web/usePage';
+  import { useGo } from '@jeesite/core/hooks/web/usePage';
   <% } %>
-  import { router } from '/@/router';
-  import { Icon } from '/@/components/Icon';
-  import { BasicTable, BasicColumn, useTable } from '/@/components/Table';
-  import { ${className}Delete, ${className}ListData } from '/@/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { router } from '@jeesite/core/router';
+  import { Icon } from '@jeesite/core/components/Icon';
+  import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
+  import { ${className}Delete, ${className}ListData } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
   <% if(toBoolean(table.optionMap['isHaveDisableEnable'])){ %>
-  import { ${className}Disable, ${className}Enable } from '/@/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { ${className}Disable, ${className}Enable } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
   <% } %>
   <%
   var userselectExists = false;
@@ -135,27 +135,27 @@ if(table.isTreeEntity){
   }
   %>
   <% if(userselectExists || officeselectExists) { %>
-  import { officeTreeData } from '/@/api/sys/office';
+  import { officeTreeData } from '@jeesite/core/api/sys/office';
   <% } %>
   <% if(companyselectExists) { %>
-  import { companyTreeData } from '/@/api/sys/company';
+  import { companyTreeData } from '@jeesite/core/api/sys/company';
   <% } %>
   <% if(areaselectExists) { %>
-  import { areaTreeData } from '/@/api/sys/area';
+  import { areaTreeData } from '@jeesite/core/api/sys/area';
   <% } %>
   <% if(modalOrDrawer == 'Drawer' && !@StringUtils.contains(table.tplCategory, '_route')){ %>
-  import { useDrawer } from '/@/components/Drawer';
+  import { useDrawer } from '@jeesite/core/components/Drawer';
   <% } %>
   <% if(modalOrDrawer == 'Modal' || (toBoolean(table.optionMap['isBpmForm'])
        || toBoolean(table.optionMap['isImportExport']))){ %>
-  import { useModal } from '/@/components/Modal';
+  import { useModal } from '@jeesite/core/components/Modal';
   <% } %>
   <% if(toBoolean(table.optionMap['isBpmForm'])){ %>
-  import { BpmRuntimeTrace } from '/@/components/Bpm';
+  import { BpmRuntimeTrace } from '@jeesite/bpm/components/Bpm';
   <% } %>
-  import { FormProps } from '/@/components/Form';
+  import { FormProps } from '@jeesite/core/components/Form';
   <% if(table.isTreeEntity || isNotBlank(table.optionMap['leftTreeRightTableFk'])) { %>
-  import { isEmpty } from '/@/utils/is';
+  import { isEmpty } from '@jeesite/core/utils/is';
   <% } %>
   <% if(!@StringUtils.contains(table.tplCategory, '_route')) { %>
   import InputForm from './form.vue';
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml
index f3d796b9..b72aeaac 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml
@@ -3,12 +3,12 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueSelect</name>
-	<filePath>${frontDir}/src/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
 	<fileName>select.ts</fileName>
 	<content><![CDATA[
-import { useI18n } from '/@/hooks/web/useI18n';
-import { BasicColumn, BasicTableProps, FormProps } from '/@/components/Table';
-import { ${className}ListData } from '/@/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+import { useI18n } from '@jeesite/core/hooks/web/useI18n';
+import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
+import { ${className}ListData } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
 <%
 var userselectExists = false;
 var officeselectExists = false;
@@ -29,13 +29,13 @@ for(c in table.columnList){
 }
 %>
 <% if(userselectExists || officeselectExists) { %>
-import { officeTreeData } from '/@/api/sys/office';
+import { officeTreeData } from '@jeesite/core/api/sys/office';
 <% } %>
 <% if(companyselectExists) { %>
-import { companyTreeData } from '/@/api/sys/company';
+import { companyTreeData } from '@jeesite/core/api/sys/company';
 <% } %>
 <% if(areaselectExists) { %>
-import { areaTreeData } from '/@/api/sys/area';
+import { areaTreeData } from '@jeesite/core/api/sys/area';
 <% } %>
 
 const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
-- 
Gitee


From 7459bc220c78c02522d86f54c74f3a94e729fa6b Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 8 Jun 2025 10:42:18 +0800
Subject: [PATCH 53/84] lint type

---
 .../src/main/resources/templates/modules/gen/vue/vueApi.xml    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
index b2bccd0e..b867ffdf 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
@@ -23,6 +23,7 @@ import { BasicModel, Page } from '@jeesite/core/api/model/baseModel';
 <% if(toBoolean(table.optionMap['isImportExport'])){ %>
 import { UploadApiResult } from '@jeesite/core/api/sys/upload';
 import { UploadFileParams } from '@jeesite/types/axios';
+import { AxiosProgressEvent } from 'axios';
 
 const { ctxPath, adminPath } = useGlobSetting();
 <% }else{ %>
@@ -100,7 +101,7 @@ export const ${className}Save = (params?: any, data?: ${ClassName} | any) =>
 
 export const ${className}ImportData = (
   params: UploadFileParams,
-  onUploadProgress: (progressEvent: ProgressEvent) => void,
+  onUploadProgress: (progressEvent: AxiosProgressEvent) => void,
 ) =>
   defHttp.uploadFile<UploadApiResult>(
     {
-- 
Gitee


From 28293383dd88404985cb0bb2cd7d4877eac4ea88 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 10 Jun 2025 11:47:00 +0800
Subject: [PATCH 54/84] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/mapper/JsonMapper.java | 62 ++++++++++---------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
index c3ad30ef..6e3ee3b0 100644
--- a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
+++ b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
@@ -83,36 +83,6 @@ public class JsonMapper extends ObjectMapper {
 			@Serial
 			private static final long serialVersionUID = 1L;
 			private static final String[] pattern = new String[] {"yyyy", "MM", "dd", "HH", "mm", "ss", "SSS"};
-			private static class JeeSiteJsonSerializer extends JsonSerializer<Date> {
-				private final String pattern;
-				private JeeSiteJsonSerializer(String pattern) {
-					this.pattern = pattern;
-				}
-				@Override
-				public void serialize(Date value, JsonGenerator gen, SerializerProvider provider) throws IOException {
-					if (value != null){
-						if (StringUtils.isNotBlank(pattern)) {
-							gen.writeString(DateUtils.formatDate(value, pattern));
-						} else {
-							gen.writeString(DateUtils.formatDateTime(value));
-						}
-					}
-				}
-			}
-			private static class JeeSiteJsonDeserializer extends JsonDeserializer<Date> {
-				private final String pattern;
-				private JeeSiteJsonDeserializer(String pattern) {
-					this.pattern = pattern;
-				}
-				@Override
-				public Date deserialize(JsonParser parser, DeserializationContext context) throws IOException {
-					if (StringUtils.isNotBlank(pattern)) {
-						return DateUtils.parseDate(parser.getText(), pattern);
-					} else {
-						return DateUtils.parseDate(parser.getText());
-					}
-				}
-			}
 			@Override
 			public Object findSerializer(Annotated a) {
 				if (a instanceof AnnotatedMethod) {
@@ -154,6 +124,38 @@ public class JsonMapper extends ObjectMapper {
 		return this;
 	}
 
+	public static final class JeeSiteJsonSerializer extends JsonSerializer<Date> {
+		private final String pattern;
+		public JeeSiteJsonSerializer(String pattern) {
+			this.pattern = pattern;
+		}
+		@Override
+		public void serialize(Date value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+			if (value != null){
+				if (StringUtils.isNotBlank(pattern)) {
+					gen.writeString(DateUtils.formatDate(value, pattern));
+				} else {
+					gen.writeString(DateUtils.formatDateTime(value));
+				}
+			}
+		}
+	}
+
+	public static final class JeeSiteJsonDeserializer extends JsonDeserializer<Date> {
+		private final String pattern;
+		public JeeSiteJsonDeserializer(String pattern) {
+			this.pattern = pattern;
+		}
+		@Override
+		public Date deserialize(JsonParser parser, DeserializationContext context) throws IOException {
+			if (StringUtils.isNotBlank(pattern)) {
+				return DateUtils.parseDate(parser.getText(), pattern);
+			} else {
+				return DateUtils.parseDate(parser.getText());
+			}
+		}
+	}
+
 	/**
 	 * 开启将空值转换为空字符串
 	 * @author ThinkGem
-- 
Gitee


From 5fc096ab0a946c900efbc7181aea38e9ed2c230f Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 18 Jun 2025 10:59:44 +0800
Subject: [PATCH 55/84] =?UTF-8?q?=E9=80=9A=E8=BF=87yml=E5=BC=80=E5=85=B3?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E4=BD=BF=E7=94=A8=E5=93=AA=E4=BA=9B=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=92=8C=E5=90=91=E9=87=8F=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/cms-ai/pom.xml                        | 16 +++++------
 .../cms/ai/properties/CmsAiProperties.java    | 27 +++++++++++++++++++
 .../main/resources/config/jeesite-cms-ai.yml  | 10 +++++++
 web-ai/pom.xml                                |  2 +-
 4 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/modules/cms-ai/pom.xml b/modules/cms-ai/pom.xml
index c3a375f5..5e32ac78 100644
--- a/modules/cms-ai/pom.xml
+++ b/modules/cms-ai/pom.xml
@@ -43,11 +43,11 @@
 			<artifactId>spring-ai-starter-model-openai</artifactId>
 		</dependency>
 
-		<!-- 本地大模型
+		<!-- 本地大模型 -->
 		<dependency>
 		   <groupId>org.springframework.ai</groupId>
 		   <artifactId>spring-ai-starter-model-ollama</artifactId>
-		</dependency> -->
+		</dependency>
 
 		<!-- 向量数据库 -->
 		<dependency>
@@ -65,19 +65,19 @@
 			<artifactId>httpclient5</artifactId>
 		</dependency>
 
-		<!-- PG 向量数据库
+		<!-- PG 向量数据库 -->
         <dependency>
             <groupId>org.springframework.ai</groupId>
             <artifactId>spring-ai-starter-vector-store-pgvector</artifactId>
-        </dependency> -->
+        </dependency>
 
-		<!-- ES 向量数据库
+		<!-- ES 向量数据库 -->
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
 			<artifactId>spring-ai-starter-vector-store-elasticsearch</artifactId>
-		</dependency> -->
+		</dependency>
 
-		<!-- Milvus 向量数据库
+		<!-- Milvus 向量数据库 -->
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
 			<artifactId>spring-ai-starter-vector-store-milvus</artifactId>
@@ -92,7 +92,7 @@
 			<groupId>io.netty</groupId>
 			<artifactId>netty-resolver-dns-native-macos</artifactId>
 			<classifier>osx-aarch_64</classifier>
-		</dependency> -->
+		</dependency>
 
 		<!-- HTML 转 Markdown -->
 		<dependency>
diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java
index 8adaf470..fd924f25 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java
@@ -1,6 +1,7 @@
 package com.jeesite.modules.cms.ai.properties;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 @ConfigurationProperties("spring.ai")
 public class CmsAiProperties {
@@ -20,6 +21,12 @@ public class CmsAiProperties {
 	 */
 	private String defaultPromptTemplate = "";
 
+	/**
+	 * 向量数据库设置
+	 */
+	@NestedConfigurationProperty
+	private final Vectorstore vectorstore = new Vectorstore();
+
 	public Boolean getToolCalls() {
 		return toolCalls;
 	}
@@ -43,4 +50,24 @@ public class CmsAiProperties {
 	public void setDefaultPromptTemplate(String defaultPromptTemplate) {
 		this.defaultPromptTemplate = defaultPromptTemplate;
 	}
+
+	public Vectorstore getVectorstore() {
+		return vectorstore;
+	}
+
+	public static class Vectorstore {
+
+		/**
+		 * 向量库类型选择：chroma、pgvector、elasticsearch、milvus
+		 */
+		private String type;
+
+		public String getType() {
+			return type;
+		}
+
+		public void setType(String type) {
+			this.type = type;
+		}
+	}
 }
diff --git a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
index 94ceb69f..39413a39 100644
--- a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
+++ b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
@@ -3,6 +3,13 @@
 spring:
   ai:
 
+    # 模型选择：openai、ollama
+    model:
+      chat: ollama
+      embedding: ${spring.ai.model.chat}
+      image: ${spring.ai.model.chat}
+      audio: ${spring.ai.model.chat}
+
     # 在线大模型【请在 pom.xml 中打开 openai 的注释，并注释上其它模型】
     openai:
 
@@ -83,6 +90,9 @@ spring:
     # 向量数据库配置
     vectorstore:
 
+      # 向量库类型：chroma、pgvector、elasticsearch、milvus
+      type: chroma
+
       # Chroma 向量数据库【请在 pom.xml 中打开 chroma 的注释，并注释上其它向量库】
       chroma:
         client:
diff --git a/web-ai/pom.xml b/web-ai/pom.xml
index 05462ade..8c9e951a 100644
--- a/web-ai/pom.xml
+++ b/web-ai/pom.xml
@@ -13,7 +13,7 @@
 	<artifactId>jeesite-web-ai</artifactId>
 	<packaging>war</packaging>
 	
-	<description>Web AI 服务，也可为分离端提供接口服务</description>
+	<description>Web AI 服务</description>
 	
 	<name>JeeSite Web AI</name>
 	<url>http://jeesite.com</url>
-- 
Gitee


From f1281b73cc203eeb37a806bc5c451be6041d12f5 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 18 Jun 2025 11:03:01 +0800
Subject: [PATCH 56/84] =?UTF-8?q?=E6=96=B0=E5=A2=9Evue=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/web/ModuleController.java     |  1 -
 .../templates/modules/gen/config.xml          |  8 ++++
 .../modules/gen/module_vue/README.md.xml      | 35 ++++++++++++++++
 .../modules/gen/module_vue/api/api.xml        | 12 ++++++
 .../modules/gen/module_vue/index.ts.xml       | 12 ++++++
 .../modules/gen/module_vue/package.json.xml   | 42 +++++++++++++++++++
 .../modules/gen/module_vue/tsconfig.json.xml  | 32 ++++++++++++++
 .../modules/gen/module_vue/views/views.xml    | 12 ++++++
 8 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml
 create mode 100644 modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml
 create mode 100644 modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml
 create mode 100644 modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml
 create mode 100644 modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml
 create mode 100644 modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java
index 9e909ba4..49503c2f 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java
@@ -33,7 +33,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-
 /**
  * 模块管理Controller
  * @author ThinkGem
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 91fd14c7..86b34c35 100644
--- a/modules/core/src/main/resources/templates/modules/gen/config.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/config.xml
@@ -293,5 +293,13 @@
 			<template>module_cloud/web/pom.xml</template>
 			<template>module_cloud/pom.xml</template>
 		</category>
+		<category value="module_vue" label="生成前端模块代码（Vue）">
+			<template>module_vue/api/api.xml</template>
+			<template>module_vue/views/views.xml</template>
+			<template>module_vue/index.ts.xml</template>
+			<template>module_vue/package.json.xml</template>
+			<template>module_vue/README.md.xml</template>
+			<template>module_vue/tsconfig.json.xml</template>
+		</category>
 	</moduleTplCategory>
 </config>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml
new file mode 100644
index 00000000..e81ff207
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+     No deletion without permission, or be held responsible to law. -->
+<template>
+	<name>README</name>
+	<filePath>${baseDir}/packages/${moduleCode}</filePath>
+	<fileName>README.md</fileName>
+	<content><![CDATA[
+
+- 官方网站：<https://jeesite.com>
+- 使用文档：<https://jeesite.com/docs>
+- 后端代码：<https://gitee.com/thinkgem/jeesite5>
+- 前端代码：<https://gitee.com/thinkgem/jeesite-vue>
+
+------
+
+<div align="center">
+ 如果你喜欢 JeeSite，请给她一个 ⭐️ Star，您的支持将是我们前行的动力。
+</div>
+
+------
+
+- 问题反馈：<https://gitee.com/thinkgem/jeesite-vue/issues> [【新手必读】](https://gitee.com/thinkgem/jeesite5/issues/I18ARR)
+- 需求收集：<https://gitee.com/thinkgem/jeesite-vue/issues/new>
+- QQ 群：`127515876`、`209330483`、`223507718`、`709534275`、`730390092`、`1373527`、`183903863(外包)`
+- 微信群：添加客服微信 <http://s.jeesite.com> 邀请您进群
+- 关注微信公众号，了解最新动态：
+
+<p style="padding-left:40px">
+ <img alt="JeeSite微信公众号" src="https://jeesite.com/assets/images/mp.png" width="220" height="220">
+</p>
+
+]]>
+	</content>
+</template>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml
new file mode 100644
index 00000000..4831145d
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+     No deletion without permission, or be held responsible to law. -->
+<template>
+	<name>api</name>
+	<filePath>${baseDir}/packages/${moduleCode}/api</filePath>
+	<fileName></fileName>
+	<content><![CDATA[
+
+]]>
+	</content>
+</template>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml
new file mode 100644
index 00000000..167ebd0e
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+     No deletion without permission, or be held responsible to law. -->
+<template>
+	<name>index</name>
+	<filePath>${baseDir}/packages/${moduleCode}</filePath>
+	<fileName>index.ts</fileName>
+	<content><![CDATA[
+
+]]>
+	</content>
+</template>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml
new file mode 100644
index 00000000..7a020d29
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+     No deletion without permission, or be held responsible to law. -->
+<template>
+	<name>package</name>
+	<filePath>${baseDir}/packages/${moduleCode}</filePath>
+	<fileName>package.json</fileName>
+	<content><![CDATA[
+{
+  "name": "@jeesite/${moduleCode}",
+  "version": "${module.currentVersion}",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "type:check": "vue-tsc --noEmit --skipLibCheck",
+    "uninstall": "rimraf node_modules",
+    "update": "ncu -u"
+  },
+  "dependencies": {
+    "qs": "6.14.0"
+  },
+  "devDependencies": {
+    "@types/qs": "6.9.18"
+  },
+  "homepage": "https://jeesite.com",
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/thinkgem/jeesite-vue.git"
+  },
+  "bugs": {
+    "url": "https://gitee.com/thinkgem/jeesite-vue/issues"
+  },
+  "author": {
+    "name": "ThinkGem",
+    "email": "thinkgem@163.com",
+    "url": "https://gitee.com/thinkgem"
+  }
+}
+
+]]>
+	</content>
+</template>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml
new file mode 100644
index 00000000..1de6b97d
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+     No deletion without permission, or be held responsible to law. -->
+<template>
+	<name>tsconfig</name>
+	<filePath>${baseDir}/packages/${moduleCode}</filePath>
+	<fileName>tsconfig.json</fileName>
+	<content><![CDATA[
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@jeesite/${moduleCode}/*": ["./*"]
+    }
+  },
+  "include": [
+    "./**/*.ts",
+    "./**/*.tsx",
+    "./**/*.vue"
+  ],
+  "exclude": [
+    "node_modules",
+    "vite.config.ts",
+    "_lib",
+    "dist"
+  ]
+}
+
+]]>
+	</content>
+</template>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml
new file mode 100644
index 00000000..78eb76bb
--- /dev/null
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+     No deletion without permission, or be held responsible to law. -->
+<template>
+	<name>views</name>
+	<filePath>${baseDir}/packages/${moduleCode}/views</filePath>
+	<fileName></fileName>
+	<content><![CDATA[
+
+]]>
+	</content>
+</template>
\ No newline at end of file
-- 
Gitee


From 02adbd3af3cf69136ca6171844cf9b0b85691973 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 19 Jun 2025 15:04:00 +0800
Subject: [PATCH 57/84] update

---
 .../com/jeesite/common/mapper/JsonMapper.java | 81 ++++++++++---------
 1 file changed, 41 insertions(+), 40 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
index d439d0a5..6e3ee3b0 100644
--- a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
+++ b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
@@ -83,46 +83,15 @@ public class JsonMapper extends ObjectMapper {
 			@Serial
 			private static final long serialVersionUID = 1L;
 			private static final String[] pattern = new String[] {"yyyy", "MM", "dd", "HH", "mm", "ss", "SSS"};
-			private static class JeeSiteJsonSerializer extends JsonSerializer<Date> {
-				private final String pattern;
-				private JeeSiteJsonSerializer(String pattern) {
-					this.pattern = pattern;
-				}
-				@Override
-				public void serialize(Date value, JsonGenerator gen, SerializerProvider provider) throws IOException {
-					if (value != null){
-						if (StringUtils.isNotBlank(pattern)) {
-							gen.writeString(DateUtils.formatDate(value, pattern));
-						} else {
-							gen.writeString(DateUtils.formatDateTime(value));
-						}
-					}
-				}
-			}
-			private static class JeeSiteJsonDeserializer extends JsonDeserializer<Date> {
-				private final String pattern;
-				private JeeSiteJsonDeserializer(String pattern) {
-					this.pattern = pattern;
-				}
-				@Override
-				public Date deserialize(JsonParser parser, DeserializationContext context) throws IOException {
-					if (StringUtils.isNotBlank(pattern)) {
-						return DateUtils.parseDate(parser.getText(), pattern);
-					} else {
-						return DateUtils.parseDate(parser.getText());
-					}
-				}
-			}
 			@Override
 			public Object findSerializer(Annotated a) {
 				if (a instanceof AnnotatedMethod) {
-					AnnotatedElement m = a.getAnnotated();
-					JsonFormat jf = m.getAnnotation(JsonFormat.class);
-					if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
-						return new JeeSiteJsonSerializer(jf.pattern());
-					}
 					AnnotatedMethod am = (AnnotatedMethod) a;
 					if (am.getRawReturnType() == Date.class) {
+						JsonFormat jf = am.getAnnotation(JsonFormat.class);
+						if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
+							return new JeeSiteJsonSerializer(jf.pattern());
+						}
 						return new JeeSiteJsonSerializer(null);
 					}
 				} else if (a instanceof AnnotatedClass) {
@@ -135,13 +104,13 @@ public class JsonMapper extends ObjectMapper {
 			@Override
 			public Object findDeserializer(Annotated a) {
 				if (a instanceof AnnotatedMethod) {
-					AnnotatedElement m = a.getAnnotated();
-					JsonFormat jf = m.getAnnotation(JsonFormat.class);
-					if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
-						return new JeeSiteJsonDeserializer(jf.pattern());
-					}
 					AnnotatedMethod am = (AnnotatedMethod) a;
 					if (am.getParameterCount() > 0 && am.getParameterType(0).getRawClass() == Date.class) {
+						AnnotatedElement m = am.getAnnotated();
+						JsonFormat jf = m.getAnnotation(JsonFormat.class);
+						if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
+							return new JeeSiteJsonDeserializer(jf.pattern());
+						}
 						return new JeeSiteJsonDeserializer(null);
 					}
 				} else if (a instanceof AnnotatedClass) {
@@ -155,6 +124,38 @@ public class JsonMapper extends ObjectMapper {
 		return this;
 	}
 
+	public static final class JeeSiteJsonSerializer extends JsonSerializer<Date> {
+		private final String pattern;
+		public JeeSiteJsonSerializer(String pattern) {
+			this.pattern = pattern;
+		}
+		@Override
+		public void serialize(Date value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+			if (value != null){
+				if (StringUtils.isNotBlank(pattern)) {
+					gen.writeString(DateUtils.formatDate(value, pattern));
+				} else {
+					gen.writeString(DateUtils.formatDateTime(value));
+				}
+			}
+		}
+	}
+
+	public static final class JeeSiteJsonDeserializer extends JsonDeserializer<Date> {
+		private final String pattern;
+		public JeeSiteJsonDeserializer(String pattern) {
+			this.pattern = pattern;
+		}
+		@Override
+		public Date deserialize(JsonParser parser, DeserializationContext context) throws IOException {
+			if (StringUtils.isNotBlank(pattern)) {
+				return DateUtils.parseDate(parser.getText(), pattern);
+			} else {
+				return DateUtils.parseDate(parser.getText());
+			}
+		}
+	}
+
 	/**
 	 * 开启将空值转换为空字符串
 	 * @author ThinkGem
-- 
Gitee


From 3e16c2744228b4100b3d3fecc483d5ef7deb28ac Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 20 Jun 2025 19:16:21 +0800
Subject: [PATCH 58/84] update ai README.md

---
 modules/cms-ai/README.md                             | 12 +++++++++++-
 .../src/main/resources/config/jeesite-cms-ai.yml     | 10 +++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/modules/cms-ai/README.md b/modules/cms-ai/README.md
index 0497bed8..60029def 100644
--- a/modules/cms-ai/README.md
+++ b/modules/cms-ai/README.md
@@ -35,6 +35,11 @@
 
 * 模型类型包括：聊天对话模型和嵌入式向量库模型，需注意 dimensions 维度参数，要和模型要求的匹配。
 
+```yml
+# 向量库类型：openai、ollama
+spring.ai.model.chat: openai
+```
+
 具体配置项详见 [jeesite-cms-ai.yml](https://gitee.com/thinkgem/jeesite5/blob/v5.springboot3/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml) 文件，有注释。
 
 ## 向量数据库配置
@@ -47,6 +52,11 @@
 * Milvus
 * ...
 
+```yml
+# 向量库类型：chroma、pgvector、elasticsearch、milvus、指定 none 表示不使用向量库
+spring.ai.vectorstore.type: none
+```
+
 具体配置项详见 [jeesite-cms-ai.yml](https://gitee.com/thinkgem/jeesite5/blob/v5.springboot3/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml) 文件，有注释。
 
 ### 安装 Chroma
@@ -119,7 +129,7 @@ CREATE INDEX ON vector_store_1024 USING HNSW (embedding vector_cosine_ops);
 * 菜单名称：AI 助手
 * 菜单地址：/cms/chat/index
 
-## 支持工具调用 Tool Calling
+## 工具调用 Tool Calling
 
 工具调用 Tool Calling（也称 Function Calling）是人工智能应用程序中的常见模式，允许模型与一组 API 或工具交互，从而增强其功能。
 
diff --git a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
index 39413a39..51904756 100644
--- a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
+++ b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
@@ -90,17 +90,17 @@ spring:
     # 向量数据库配置
     vectorstore:
 
-      # 向量库类型：chroma、pgvector、elasticsearch、milvus
-      type: chroma
+      # 向量库类型：chroma、pgvector、elasticsearch、milvus、指定 none 表示不使用向量库
+      type: none
 
       # Chroma 向量数据库【请在 pom.xml 中打开 chroma 的注释，并注释上其它向量库】
       chroma:
         client:
-          host: http://testserver
+          host: http://127.0.0.1
           port: 8000
         initialize-schema: true
-        collection-name: vector_store
-#        collection-name: vector_store_1024
+#        collection-name: vector_store
+        collection-name: vector_store_1024
 
       # Postgresql 向量数据库（PG 连接配置，见下文，需要手动建表）【请在 pom.xml 中打开 pgvector 的注释，并注释上其它向量库】
       pgvector:
-- 
Gitee


From 0732be618effdf8b19bc8b0806d013942e60bbd9 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 20 Jun 2025 19:37:04 +0800
Subject: [PATCH 59/84] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E8=A2=AB=E5=9B=9E=E6=94=B6=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/utils/LocaleUtils.java | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/utils/LocaleUtils.java b/common/src/main/java/com/jeesite/common/utils/LocaleUtils.java
index 397330fa..45836f6c 100644
--- a/common/src/main/java/com/jeesite/common/utils/LocaleUtils.java
+++ b/common/src/main/java/com/jeesite/common/utils/LocaleUtils.java
@@ -47,24 +47,31 @@ public class LocaleUtils {
 		if (context != null){
 			return context;
 		}
+		Locale locale;
+		TimeZone timeZone;
 		if (LANG_ENABLED && localeResolver != null){
 			HttpServletRequest request = ServletUtils.getRequest();
 			if (request != null){
 				context = (TimeZoneAwareLocaleContext)localeResolver.resolveLocaleContext(request);
 			}
 		}
-		if (context == null){
-			context = new TimeZoneAwareLocaleContext() {
-				@Override
-				public Locale getLocale() {
-					return Locale.getDefault();
-				}
-				@Override
-				public TimeZone getTimeZone() {
-					return TimeZone.getDefault();
-				}
-			};
+		if (context != null){
+			locale = context.getLocale();
+			timeZone = context.getTimeZone();
+		} else {
+			locale = Locale.getDefault();
+			timeZone = TimeZone.getDefault();
 		}
+		context = new TimeZoneAwareLocaleContext() {
+			@Override
+			public Locale getLocale() {
+				return locale;
+			}
+			@Override
+			public TimeZone getTimeZone() {
+				return timeZone;
+			}
+		};
 		setTimeZoneAwareLocaleContext(context);
 		return context;
 	}
-- 
Gitee


From fbf25775b31b1d62e32033415e80975b8838c39a Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 23 Jun 2025 08:28:13 +0800
Subject: [PATCH 60/84] update README.md

---
 modules/cms-ai/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cms-ai/README.md b/modules/cms-ai/README.md
index 60029def..fd6ea2cc 100644
--- a/modules/cms-ai/README.md
+++ b/modules/cms-ai/README.md
@@ -62,7 +62,7 @@ spring.ai.vectorstore.type: none
 ### 安装 Chroma
 
 ```sh
-docker run -it --rm --name chroma -p 8000:8000 ghcr.io/chroma-core/chroma:1.0.0
+docker run -d --name chroma -p 8000:8000 ghcr.io/chroma-core/chroma:1.0.0
 ```
 
 ### 安装 PGVector
-- 
Gitee


From 32f4d7e0ae0cf8679a1b37539fc08647f86ac780 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 23 Jun 2025 09:37:24 +0800
Subject: [PATCH 61/84] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20spring.cache.globalK?=
 =?UTF-8?q?eyNames=20=E5=8F=82=E6=95=B0=EF=BC=8C=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E5=93=AA=E4=BA=9B=E4=B8=BA=E5=85=A8=E5=B1=80=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=EF=BC=8C=E8=8A=82=E7=9C=81=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/src/main/resources/config/jeesite-core.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 52578d65..4cf27824 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -85,6 +85,10 @@ spring:
   cache:
     # 缓存及会话共享（专业版）
     isClusterMode: false
+    # 给缓存Key增加数据源名称前缀 v5.6.1
+    keyPrefixWithDsName: false
+    # 指定全局Key，不加DsName前缀，当keyPrefixWithDsName设置为true的时有效（cacheName:key|*）v5.12.1
+    globalKeyNames: sysCache:configMap,sysCache:moduleMap,sysCache:areaAllList
     # 清理全部缓存按钮所清理的缓存列表
     clearNames: sysCache,corpCache,userCache,roleCache,fileUploadCache,msgPcPoolCache,cmsCache,bpmFormCache
     # 用户缓存
-- 
Gitee


From 6faa39ebea5668fea6d35b6026d50c2bc1dda0eb Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 23 Jun 2025 13:59:02 +0800
Subject: [PATCH 62/84] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/cms/ai/service/ArticleVectorStoreImpl.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java
index a1a64d41..97f0e332 100644
--- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java
+++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java
@@ -37,7 +37,6 @@ import org.springframework.ai.transformer.splitter.TokenTextSplitter;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.ai.vectorstore.filter.FilterExpressionBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
@@ -52,12 +51,11 @@ import java.util.Set;
  * @author ThinkGem
  */
 @Service
-@ConditionalOnBean(VectorStore.class)
 public class ArticleVectorStoreImpl implements ArticleVectorStore {
 
 	protected Logger logger = LoggerFactory.getLogger(getClass());
 
-	@Autowired
+	@Autowired(required = false)
 	private VectorStore vectorStore;
 
 	/**
@@ -66,6 +64,7 @@ public class ArticleVectorStoreImpl implements ArticleVectorStore {
 	 */
 	@Override
 	public void save(Article article) {
+		if (vectorStore == null) return;
 		Map<String, Object> metadata = MapUtils.newHashMap();
 		metadata.put("id", article.getId());
 		metadata.put("siteCode", article.getCategory().getSite().getSiteCode());
@@ -184,6 +183,7 @@ public class ArticleVectorStoreImpl implements ArticleVectorStore {
 	 */
 	@Override
 	public void delete(Article article) {
+		if (vectorStore == null) return;
 		if (StringUtils.isNotBlank(article.getId())) {
 			vectorStore.delete(new FilterExpressionBuilder().eq("id", article.getId()).build());
 		}
@@ -194,6 +194,7 @@ public class ArticleVectorStoreImpl implements ArticleVectorStore {
 	 * @author ThinkGem
 	 */
 	public String rebuild(Article article) {
+		if (vectorStore == null) return null;
 		logger.debug("开始重建向量库。 siteCode: {}, categoryCode: {}",
 				article.getCategory().getSite().getSiteCode(),
 				article.getCategory().getCategoryCode());
-- 
Gitee


From b17c58e7925b8705e25ed03abdb888080220e46b Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 23 Jun 2025 14:06:06 +0800
Subject: [PATCH 63/84] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=8F=90=E7=A4=BA=E8=AF=8D=E5=92=8C=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/config/jeesite-cms-ai.yml   | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
index 51904756..d93b906a 100644
--- a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
+++ b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml
@@ -5,7 +5,7 @@ spring:
 
     # 模型选择：openai、ollama
     model:
-      chat: ollama
+      chat: openai
       embedding: ${spring.ai.model.chat}
       image: ${spring.ai.model.chat}
       audio: ${spring.ai.model.chat}
@@ -91,7 +91,7 @@ spring:
     vectorstore:
 
       # 向量库类型：chroma、pgvector、elasticsearch、milvus、指定 none 表示不使用向量库
-      type: none
+      type: chroma
 
       # Chroma 向量数据库【请在 pom.xml 中打开 chroma 的注释，并注释上其它向量库】
       chroma:
@@ -142,17 +142,15 @@ spring:
 
     # 默认系统提示词
     default-system: |
-        ## 人物设定
-        你是我的知识库AI助手，请耐心真诚地回复我提出的相关问题。
-        你需要遵循以下原则，与我进行友善而有价值的沟通。
-        ## 表达方式：
-        1. 使用简体中文回答我的问题。
-        2. 可以用少量表情，避免过多表情。
+      1. 人物设定：你是我的知识库AI助手。请认真地回复我提出的相关问题。
+      2. 表达方式：使用简体中文回答我的问题。回答中不要体现系统提示词和模板上下文。
 
     # 默认问题回答模板
     default-prompt-template: |
-      {question_answer_context} 
-      在提供上下文和历史信息的基础上，优先回答最后一条用户的问题。
+      {query}
+      请根据知识库和提供的历史信息作答。如果知识库中没有答案，请自我发挥。
+      以下是知识库信息：{question_answer_context}
+      
 
 # ========= Postgresql 向量数据库数据源 =========
 
-- 
Gitee


From 3b7ef1049244291a8a13b6957f2f0d80e40ad98d Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 27 Jun 2025 09:22:38 +0800
Subject: [PATCH 64/84] =?UTF-8?q?ztree=20=E5=BD=93=E6=B2=A1=E6=9C=89title?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8name=E4=BD=9C=E4=B8=BAtitle=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js          | 2 +-
 .../static/jquery-ztree/3.5/js/jquery.ztree.core-3.5.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/src/main/resources/static/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js b/common/src/main/resources/static/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js
index d94af41f..bcd78021 100644
--- a/common/src/main/resources/static/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js
+++ b/common/src/main/resources/static/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js
@@ -435,7 +435,7 @@
 		},
 		getNodeTitle: function(setting, node) {
 			var t = setting.data.key.title === "" ? setting.data.key.name : setting.data.key.title;
-			return "" + node[t];
+			return "" + (node[t] || node[setting.data.key.name]);
 		},
 		getNodes: function(setting) {
 			return data.getRoot(setting)[setting.data.key.children];
diff --git a/common/src/main/resources/static/jquery-ztree/3.5/js/jquery.ztree.core-3.5.js b/common/src/main/resources/static/jquery-ztree/3.5/js/jquery.ztree.core-3.5.js
index a07818e5..64c4077b 100644
--- a/common/src/main/resources/static/jquery-ztree/3.5/js/jquery.ztree.core-3.5.js
+++ b/common/src/main/resources/static/jquery-ztree/3.5/js/jquery.ztree.core-3.5.js
@@ -434,7 +434,7 @@
 		},
 		getNodeTitle: function(setting, node) {
 			var t = setting.data.key.title === "" ? setting.data.key.name : setting.data.key.title;
-			return "" + node[t];
+			return "" + (node[t] || node[setting.data.key.name]);
 		},
 		getNodes: function(setting) {
 			return data.getRoot(setting)[setting.data.key.children];
-- 
Gitee


From e64b1d3b490604a820a53eedf1631990c01c7d9a Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 27 Jun 2025 14:53:51 +0800
Subject: [PATCH 65/84] update

---
 web-ai/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/web-ai/pom.xml b/web-ai/pom.xml
index 8c9e951a..32f18bb1 100644
--- a/web-ai/pom.xml
+++ b/web-ai/pom.xml
@@ -38,6 +38,13 @@
 			<version>${project.parent.version}</version>
 		</dependency>
 
+		<!-- 测试模块 -->
+		<dependency>
+			<groupId>com.jeesite</groupId>
+			<artifactId>jeesite-module-test</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+
 		<!-- 内容管理模块 -->
 		<dependency>
 			<groupId>com.jeesite</groupId>
-- 
Gitee


From a683a9ed5c200dda80226222f9a8aa29207f4212 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 27 Jun 2025 17:13:56 +0800
Subject: [PATCH 66/84] =?UTF-8?q?vue=E4=B8=BB=E9=94=AE=E4=B8=BA=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E4=B8=BB=E9=94=AE=E9=87=8D=E5=A4=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/modules/gen/vue/vueForm.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
index 0c6a9feb..a19137e5 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
@@ -491,7 +491,7 @@ for (c in table.columnList){
   <%
   for (c in table.columnList){
     if (c.isPk == '1' || c.showType == 'hidden'){ %>
-        ${c.attrName}: record.value.${c.attrName},
+        ${c.attrName}: record.value.${c.attrName} || data.${c.attrName},
       <% 
     }
   }
-- 
Gitee


From 511d76e03fa7f85f707ee9306ac0bba0177656d8 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 27 Jun 2025 17:18:04 +0800
Subject: [PATCH 67/84] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/modules/gen/crud/controller.xml    | 2 +-
 .../core/src/main/resources/templates/modules/gen/crud/dao.xml  | 2 +-
 .../src/main/resources/templates/modules/gen/crud/entity.xml    | 2 +-
 .../src/main/resources/templates/modules/gen/crud/mapper.xml    | 2 +-
 .../src/main/resources/templates/modules/gen/crud/service.xml   | 2 +-
 .../src/main/resources/templates/modules/gen/crud/viewForm.xml  | 2 +-
 .../src/main/resources/templates/modules/gen/crud/viewIndex.xml | 2 +-
 .../src/main/resources/templates/modules/gen/crud/viewList.xml  | 2 +-
 .../main/resources/templates/modules/gen/crud/viewSelect.xml    | 2 +-
 .../src/main/resources/templates/modules/gen/crud_cloud/api.xml | 2 +-
 .../main/resources/templates/modules/gen/crud_cloud/client.xml  | 2 +-
 .../resources/templates/modules/gen/crud_cloud/controller.xml   | 2 +-
 .../src/main/resources/templates/modules/gen/crud_cloud/dao.xml | 2 +-
 .../main/resources/templates/modules/gen/crud_cloud/entity.xml  | 2 +-
 .../main/resources/templates/modules/gen/crud_cloud/mapper.xml  | 2 +-
 .../main/resources/templates/modules/gen/crud_cloud/service.xml | 2 +-
 .../resources/templates/modules/gen/crud_cloud/viewForm.xml     | 2 +-
 .../resources/templates/modules/gen/crud_cloud/viewIndex.xml    | 2 +-
 .../resources/templates/modules/gen/crud_cloud/viewList.xml     | 2 +-
 .../resources/templates/modules/gen/crud_cloud/viewSelect.xml   | 2 +-
 .../main/resources/templates/modules/gen/query/controller.xml   | 2 +-
 .../core/src/main/resources/templates/modules/gen/query/dao.xml | 2 +-
 .../src/main/resources/templates/modules/gen/query/service.xml  | 2 +-
 .../src/main/resources/templates/modules/gen/query/viewForm.xml | 2 +-
 .../src/main/resources/templates/modules/gen/query/viewList.xml | 2 +-
 .../src/main/resources/templates/modules/gen/vue/vueApi.xml     | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
index f6bd1303..ffa6cafc 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>controller</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/web/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/web${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Controller.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml b/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml
index b318b954..563092fe 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>dao</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/dao/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/dao${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Dao.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
index 2b7348bd..f2929e07 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>entity</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/entity/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/entity${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.entity${isNotBlank(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/mapper.xml b/modules/core/src/main/resources/templates/modules/gen/crud/mapper.xml
index 2961fdac..09008874 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/mapper.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/mapper.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>mapper</name>
-	<filePath>${baseDir}/src/main/resources/mappings/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/resources/mappings/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Dao.xml</fileName>
 	<content><![CDATA[
 <?xml version="1.0" encoding="UTF-8" ?>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml
index b1e87204..9b0f12c0 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>service</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/service/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/service${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Service.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml
index 0d1ea75d..a39ad2bd 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewForm</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}Form.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewForm.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml
index 9aacd215..66961473 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewIndex</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}Index.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewIndex.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml
index 34bcc2b2..105db071 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewList</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}List.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewList.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml
index a22bcc85..4e3b28bd 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewSelect</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}Select.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewSelect.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/api.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/api.xml
index 954b2f2b..a758b3d3 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/api.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/api.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>api</name>
-	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/api/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/api${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}ServiceApi.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.api${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/client.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/client.xml
index a4d28030..132b6ebf 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/client.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/client.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>client</name>
-	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/client/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/client${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}ServiceClient.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.client${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
index 82cd6d07..21470f2a 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>controller</name>
-	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/web/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/web${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Controller.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/dao.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/dao.xml
index 7d26c202..ecc5bbb9 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/dao.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/dao.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>dao</name>
-	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/dao/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/dao${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Dao.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
index e809aff1..286011a4 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>entity</name>
-	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/entity/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/entity${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.entity${isNotBlank(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/mapper.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/mapper.xml
index 6f99968a..6273fb35 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/mapper.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/mapper.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>mapper</name>
-	<filePath>${baseDir}/${moduleName}/src/main/resources/mappings/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}/src/main/resources/mappings/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Dao.xml</fileName>
 	<content><![CDATA[
 <?xml version="1.0" encoding="UTF-8" ?>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
index fdfa4da3..49d4d577 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>service</name>
-	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/service/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/service${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Service.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml
index 9712c399..3bf72277 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewForm</name>
-	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}Form.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewForm.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml
index a0481252..4a9ce7e1 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewIndex</name>
-	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}Index.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewIndex.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml
index dd7f9b47..8f58c066 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewList</name>
-	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}List.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewList.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewSelect.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewSelect.xml
index 0de4bfae..6cc84514 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewSelect.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewSelect.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewSelect</name>
-	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}Select.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewSelect.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml
index 83069499..0e73d874 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>controller</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/web/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/web${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Controller.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/dao.xml b/modules/core/src/main/resources/templates/modules/gen/query/dao.xml
index 5b9f1b04..3037f18a 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/dao.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/dao.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>dao</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/dao/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/dao${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Dao.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/service.xml b/modules/core/src/main/resources/templates/modules/gen/query/service.xml
index 3d4c804f..d0c527a2 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/service.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/service.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>service</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/service/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/service${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Service.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml b/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml
index 5e256af6..188d44e6 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewForm</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}Form.html</fileName>
 	<content><![CDATA[
 <%
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml
index ff1abef6..4ee8b449 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewList</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}List.html</fileName>
 	<content><![CDATA[
 \<% layout('/layouts/default.html', {title: '${functionNameSimple}查询', libs: ['dataGrid']}){ %>
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
index b867ffdf..c0d8e40d 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueApi</name>
-	<filePath>${frontDir}/packages/${moduleName}/api/${moduleName}/${subModuleName}</filePath>
+	<filePath>${frontDir}/packages/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}.ts</fileName>
 	<content><![CDATA[
 /**
-- 
Gitee


From 63dd5c161d1582ab26242dbd79d5e10e031fbc6c Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 30 Jun 2025 11:19:38 +0800
Subject: [PATCH 68/84] =?UTF-8?q?=E4=BF=AE=E6=AD=A3beetl=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=90=8E=E5=86=8D=E7=99=BB=E5=BD=95=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=EF=BC=8C=E6=B2=A1=E6=9C=89=E8=B7=B3=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/views/modules/sys/user/userInfo.html    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/resources/views/modules/sys/user/userInfo.html b/modules/core/src/main/resources/views/modules/sys/user/userInfo.html
index 406fcfed..fd92d363 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/userInfo.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/userInfo.html
@@ -313,7 +313,7 @@ $("#inputFormBase").validate({
 		js.ajaxSubmitForm($(form), function(data){
 			js.showMessage(data.message);
 			if(data.result == Global.TRUE){
-				location = '${ctx}/sys/user/info?op=base';
+				js.window.location = '${ctx}/sys/user/info?op=base';
 			}
 		}, "json");
     }
@@ -353,7 +353,8 @@ $("#inputFormPwd").validate({
 					if ('${parameter.url}'!=''){
 						js.window.location = '${ctxPath}${parameter.url}';
 					}else{
-						js.window.location = '${ctx}/sys/user/info?op=mpd';
+						//js.window.location = '${ctx}/sys/user/info?op=mpd';
+						js.window.location = '${ctxPath}';
 					}
 				});
 			}else{
@@ -385,7 +386,7 @@ $("#inputFormPqa").validate({
 		js.ajaxSubmitForm($(form), function(data){
 			js.showMessage(data.message);
 			if(data.result == Global.TRUE){
-				location = '${ctx}/sys/user/info?op=pqa';
+				js.window.location = '${ctx}/sys/user/info?op=pqa';
 			}
 		}, "json");
 		$('#validPassword').val(validPassword);
-- 
Gitee


From 3107ab8f3af69895b4f5fd2c9e850aaf0168c705 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 30 Jun 2025 11:19:48 +0800
Subject: [PATCH 69/84] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E6=94=AF=E6=8C=81=E5=A4=9A=E7=BA=A7=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E8=AE=BE=E7=BD=AE=EF=BC=8C=E5=A6=82=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=9Aai-core=EF=BC=9B=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E5=9D=97=E5=90=8D=EF=BC=9Aai.core?=
 =?UTF-8?q?=EF=BC=9B=E6=96=B0=E5=A2=9E=E5=87=A0=E4=B8=AA=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=9AmoduleMinus=E3=80=81modulePath?=
 =?UTF-8?q?=E3=80=81subModuleNameDot=E3=80=81subModulePath?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/modules/gen/crud/controller.xml      | 10 +++++-----
 .../resources/templates/modules/gen/crud/dao.xml   |  6 +++---
 .../templates/modules/gen/crud/entity.xml          |  2 +-
 .../templates/modules/gen/crud/mapper.xml          |  2 +-
 .../templates/modules/gen/crud/service.xml         | 12 ++++++------
 .../templates/modules/gen/crud/viewForm.xml        |  2 +-
 .../templates/modules/gen/crud/viewIndex.xml       |  2 +-
 .../templates/modules/gen/crud/viewList.xml        |  2 +-
 .../templates/modules/gen/crud/viewSelect.xml      |  2 +-
 .../templates/modules/gen/crud_cloud/api.xml       |  6 +++---
 .../templates/modules/gen/crud_cloud/client.xml    |  6 +++---
 .../modules/gen/crud_cloud/controller.xml          | 10 +++++-----
 .../templates/modules/gen/crud_cloud/dao.xml       |  6 +++---
 .../templates/modules/gen/crud_cloud/entity.xml    |  2 +-
 .../templates/modules/gen/crud_cloud/mapper.xml    |  2 +-
 .../templates/modules/gen/crud_cloud/service.xml   | 14 +++++++-------
 .../templates/modules/gen/crud_cloud/viewForm.xml  |  2 +-
 .../templates/modules/gen/crud_cloud/viewIndex.xml |  2 +-
 .../templates/modules/gen/crud_cloud/viewList.xml  |  2 +-
 .../modules/gen/crud_cloud/viewSelect.xml          |  2 +-
 .../modules/gen/module/bin/deploy.bat.xml          |  2 +-
 .../templates/modules/gen/module/bin/deploy.sh.xml |  2 +-
 .../modules/gen/module/bin/package.bat.xml         |  2 +-
 .../modules/gen/module/bin/package.sh.xml          |  2 +-
 .../templates/modules/gen/module/db/erm.xml        |  2 +-
 .../resources/templates/modules/gen/module/pom.xml |  2 +-
 .../modules/gen/module/src/main/java/package.xml   |  2 +-
 .../module/src/main/resources/config/jeesite.xml   |  2 +-
 .../gen/module/src/main/resources/db/versions.xml  |  2 +-
 .../module/src/main/resources/static/static.xml    |  2 +-
 .../gen/module_cloud/client/bin/deploy.bat.xml     |  2 +-
 .../gen/module_cloud/client/bin/deploy.sh.xml      |  2 +-
 .../gen/module_cloud/client/bin/package.bat.xml    |  2 +-
 .../gen/module_cloud/client/bin/package.sh.xml     |  2 +-
 .../modules/gen/module_cloud/client/pom.xml        |  2 +-
 .../module_cloud/client/src/main/java/package.xml  |  2 +-
 .../templates/modules/gen/module_cloud/pom.xml     |  2 +-
 .../gen/module_cloud/web/bin/docker-build.bat.xml  |  2 +-
 .../gen/module_cloud/web/bin/docker-build.sh.xml   |  2 +-
 .../gen/module_cloud/web/bin/docker/Dockerfile.xml |  2 +-
 .../gen/module_cloud/web/bin/package.bat.xml       |  2 +-
 .../gen/module_cloud/web/bin/package.sh.xml        |  2 +-
 .../gen/module_cloud/web/bin/run-tomcat.bat.xml    |  2 +-
 .../gen/module_cloud/web/bin/run-tomcat.sh.xml     |  2 +-
 .../gen/module_cloud/web/bin/run-web.bat.xml       |  2 +-
 .../gen/module_cloud/web/bin/run-web.sh.xml        |  2 +-
 .../modules/gen/module_cloud/web/db/erm.xml        |  2 +-
 .../templates/modules/gen/module_cloud/web/pom.xml |  2 +-
 .../gen/module_cloud/web/src/main/java/package.xml |  2 +-
 .../module_cloud/web/src/main/java/startClass.xml  |  2 +-
 .../src/main/resources/config/application-elk.xml  |  2 +-
 .../src/main/resources/config/application-prod.xml |  2 +-
 .../web/src/main/resources/config/application.xml  |  2 +-
 .../main/resources/config/logback-spring-elk.xml   |  2 +-
 .../main/resources/config/logback-spring-prod.xml  |  2 +-
 .../src/main/resources/config/logback-spring.xml   |  2 +-
 .../web/src/main/resources/static/static.xml       |  2 +-
 .../web/src/main/webapp/WEB-INF/startup.bat.xml    |  2 +-
 .../web/src/main/webapp/WEB-INF/startup.sh.xml     |  2 +-
 .../templates/modules/gen/module_vue/README.md.xml |  2 +-
 .../templates/modules/gen/module_vue/api/api.xml   |  2 +-
 .../templates/modules/gen/module_vue/index.ts.xml  |  2 +-
 .../modules/gen/module_vue/package.json.xml        |  2 +-
 .../modules/gen/module_vue/tsconfig.json.xml       |  2 +-
 .../modules/gen/module_vue/views/views.xml         |  2 +-
 .../templates/modules/gen/query/controller.xml     | 10 +++++-----
 .../resources/templates/modules/gen/query/dao.xml  |  6 +++---
 .../templates/modules/gen/query/service.xml        | 12 ++++++------
 .../templates/modules/gen/query/viewForm.xml       |  2 +-
 .../templates/modules/gen/query/viewList.xml       |  2 +-
 .../resources/templates/modules/gen/vue/vueApi.xml |  2 +-
 .../templates/modules/gen/vue/vueForm.xml          |  6 +++---
 .../templates/modules/gen/vue/vueFormChildList.xml |  6 +++---
 .../templates/modules/gen/vue/vueFormRoute.xml     |  6 +++---
 .../templates/modules/gen/vue/vueImport.xml        |  6 +++---
 .../templates/modules/gen/vue/vueIndex.xml         |  6 +++---
 .../templates/modules/gen/vue/vueList.xml          |  8 ++++----
 .../templates/modules/gen/vue/vueSelect.xml        |  6 +++---
 78 files changed, 131 insertions(+), 131 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
index ffa6cafc..795f7683 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
@@ -3,10 +3,10 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>controller</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/web${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/java${packagePath}${modulePath}/web${subModulePath}</filePath>
 	<fileName>${ClassName}Controller.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.web${subModuleNameDot};
 
 <% if (table.isTreeEntity){ %>
 import java.util.Map;
@@ -51,11 +51,11 @@ import com.alibaba.fastjson.JSONValidator;
 import com.jeesite.common.codec.EncodeUtils;
 <% } %>
 import com.jeesite.common.web.BaseController;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
 <% for (child in table.childList){ %>
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${@StringUtils.cap(child.className)};
 <% } %>
-import ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Service;
+import ${packageName}.${moduleName}.service${subModuleNameDot}.${ClassName}Service;
 
 /**
  * ${functionName}Controller
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml b/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml
index 563092fe..96ba8dad 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml
@@ -3,14 +3,14 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>dao</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/dao${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/java${packagePath}${modulePath}/dao${subModulePath}</filePath>
 	<fileName>${ClassName}Dao.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.dao${subModuleNameDot};
 
 import com.jeesite.common.dao.${table.isTreeEntity?'Tree':'Crud'}Dao;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
 
 /**
  * ${functionName}DAO接口
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
index f2929e07..458552f2 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>entity</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/entity${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/java${packagePath}${modulePath}/entity${subModulePath}</filePath>
 	<fileName>${ClassName}.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.entity${isNotBlank(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/mapper.xml b/modules/core/src/main/resources/templates/modules/gen/crud/mapper.xml
index 09008874..9262fb79 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/mapper.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/mapper.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>mapper</name>
-	<filePath>${baseDir}/src/main/resources/mappings/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/resources/mappings/${lastPackageName}${modulePath}${subModulePath}</filePath>
 	<fileName>${ClassName}Dao.xml</fileName>
 	<content><![CDATA[
 <?xml version="1.0" encoding="UTF-8" ?>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml
index 9b0f12c0..0602896f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml
@@ -3,10 +3,10 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>service</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/service${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/java${packagePath}${modulePath}/service${subModulePath}</filePath>
 	<fileName>${ClassName}Service.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.service${subModuleNameDot};
 
 import java.util.List;
 <% if (table.childList.~size > 0){ %>
@@ -17,8 +17,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.service.${table.isTreeEntity?'Tree':'Crud'}Service;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
-import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Dao;
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
+import ${packageName}.${moduleName}.dao${subModuleNameDot}.${ClassName}Dao;
 <% if(toBoolean(table.optionMap['isBpmForm'])){ %>
 import java.util.Map;
 import com.jeesite.common.lang.StringUtils;
@@ -32,8 +32,8 @@ import com.jeesite.common.service.ServiceException;
 import com.jeesite.modules.file.utils.FileUploadUtils;
 <% } %>
 <% for (child in table.childList){ %>
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)};
-import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)}Dao;
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${@StringUtils.cap(child.className)};
+import ${packageName}.${moduleName}.dao${subModuleNameDot}.${@StringUtils.cap(child.className)}Dao;
 <% } %>
 <% if(toBoolean(table.optionMap['isImportExport'])){ %>
 import com.jeesite.common.config.Global;
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml
index a39ad2bd..5ef41c42 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewForm</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</filePath>
 	<fileName>${className}Form.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewForm.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml
index 66961473..fcd1b09d 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewIndex</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</filePath>
 	<fileName>${className}Index.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewIndex.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml
index 105db071..3ac55dae 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewList</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</filePath>
 	<fileName>${className}List.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewList.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml
index 4e3b28bd..5550acde 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewSelect</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</filePath>
 	<fileName>${className}Select.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewSelect.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/api.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/api.xml
index a758b3d3..d5ebd153 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/api.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/api.xml
@@ -3,15 +3,15 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>api</name>
-	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/api${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}-client/src/main/java${packagePath}${modulePath}/api${subModulePath}</filePath>
 	<fileName>${ClassName}ServiceApi.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.api${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.api${subModuleNameDot};
 
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.jeesite.common.service.rest.${table.isTreeEntity?'Tree':'Crud'}ServiceRest;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
 
 /**
  * ${functionName}API
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/client.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/client.xml
index 132b6ebf..d07d9749 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/client.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/client.xml
@@ -3,15 +3,15 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>client</name>
-	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/client${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}-client/src/main/java${packagePath}${modulePath}/client${subModulePath}</filePath>
 	<fileName>${ClassName}ServiceClient.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.client${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.client${subModuleNameDot};
 
 import org.springframework.cloud.openfeign.FeignClient;
 
 import com.jeesite.modules.cloud.feign.condition.ConditionalOnNotCurrentApplication;
-import ${packageName}.${moduleName}.api${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}ServiceApi;
+import ${packageName}.${moduleName}.api${subModuleNameDot}.${ClassName}ServiceApi;
 
 /**
  * ${functionName}API
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
index 21470f2a..8e059ecb 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
@@ -3,10 +3,10 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>controller</name>
-	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/web${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}/src/main/java${packagePath}${modulePath}/web${subModulePath}</filePath>
 	<fileName>${ClassName}Controller.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.web${subModuleNameDot};
 
 <% if (table.isTreeEntity){ %>
 import java.util.Map;
@@ -51,11 +51,11 @@ import com.alibaba.fastjson.JSONValidator;
 import com.jeesite.common.codec.EncodeUtils;
 <% } %>
 import com.jeesite.common.web.BaseController;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
 <% for (child in table.childList){ %>
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${@StringUtils.cap(child.className)};
 <% } %>
-import ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Service;
+import ${packageName}.${moduleName}.service${subModuleNameDot}.${ClassName}Service;
 
 import org.apache.seata.spring.annotation.GlobalTransactional;
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/dao.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/dao.xml
index ecc5bbb9..1d1dfb3a 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/dao.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/dao.xml
@@ -3,14 +3,14 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>dao</name>
-	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/dao${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}/src/main/java${packagePath}${modulePath}/dao${subModulePath}</filePath>
 	<fileName>${ClassName}Dao.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.dao${subModuleNameDot};
 
 import com.jeesite.common.dao.${table.isTreeEntity?'Tree':'Crud'}Dao;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
 
 /**
  * ${functionName}DAO接口
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
index 286011a4..b179a027 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>entity</name>
-	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/entity${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}-client/src/main/java${packagePath}${modulePath}/entity${subModulePath}</filePath>
 	<fileName>${ClassName}.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.entity${isNotBlank(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/mapper.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/mapper.xml
index 6273fb35..8a11e107 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/mapper.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/mapper.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>mapper</name>
-	<filePath>${baseDir}/${moduleName}/src/main/resources/mappings/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}/src/main/resources/mappings/${lastPackageName}${modulePath}${subModulePath}</filePath>
 	<fileName>${ClassName}Dao.xml</fileName>
 	<content><![CDATA[
 <?xml version="1.0" encoding="UTF-8" ?>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
index 49d4d577..fa8fa3b1 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
@@ -3,10 +3,10 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>service</name>
-	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/service${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}/src/main/java${packagePath}${modulePath}/service${subModulePath}</filePath>
 	<fileName>${ClassName}Service.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.service${subModuleNameDot};
 
 import java.util.List;
 <% if (table.childList.~size > 0){ %>
@@ -18,9 +18,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.service.${table.isTreeEntity?'Tree':'Crud'}Service;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
-import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Dao;
-import ${packageName}.${moduleName}.api${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}ServiceApi;
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
+import ${packageName}.${moduleName}.dao${subModuleNameDot}.${ClassName}Dao;
+import ${packageName}.${moduleName}.api${subModuleNameDot}.${ClassName}ServiceApi;
 <% if(toBoolean(table.optionMap['isBpmForm'])){ %>
 import java.util.Map;
 import com.jeesite.common.lang.StringUtils;
@@ -34,8 +34,8 @@ import com.jeesite.common.service.ServiceException;
 import com.jeesite.modules.file.utils.FileUploadUtils;
 <% } %>
 <% for (child in table.childList){ %>
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)};
-import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)}Dao;
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${@StringUtils.cap(child.className)};
+import ${packageName}.${moduleName}.dao${subModuleNameDot}.${@StringUtils.cap(child.className)}Dao;
 <% } %>
 <% if(toBoolean(table.optionMap['isImportExport'])){ %>
 import com.jeesite.common.config.Global;
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml
index 3bf72277..11db3de1 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewForm</name>
-	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</filePath>
 	<fileName>${className}Form.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewForm.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml
index 4a9ce7e1..5bd12355 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewIndex</name>
-	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</filePath>
 	<fileName>${className}Index.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewIndex.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml
index 8f58c066..63a3ac9b 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewList</name>
-	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</filePath>
 	<fileName>${className}List.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewList.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewSelect.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewSelect.xml
index 6cc84514..845b1b73 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewSelect.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewSelect.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewSelect</name>
-	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</filePath>
 	<fileName>${className}Select.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewSelect.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.bat.xml
index 53830229..2eca39e9 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>deploy</name>
-	<filePath>${baseDir}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/bin</filePath>
 	<fileName>deploy.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.sh.xml
index e2ed3d66..480d3504 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>deploy</name>
-	<filePath>${baseDir}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/bin</filePath>
 	<fileName>deploy.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/bin/package.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module/bin/package.bat.xml
index d86f4727..54edef96 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/bin/package.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/bin/package.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/bin</filePath>
 	<fileName>package.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/bin/package.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module/bin/package.sh.xml
index 8f33e9f1..998f092c 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/bin/package.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/bin/package.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/bin</filePath>
 	<fileName>package.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml b/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml
index 2d5900b8..41d8d5cb 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>erm</name>
-	<filePath>${baseDir}/${moduleCode}/db</filePath>
+	<filePath>${baseDir}/${modulePath}/db</filePath>
 	<fileName>${moduleCode}.erm</fileName>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <diagram>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/pom.xml b/modules/core/src/main/resources/templates/modules/gen/module/pom.xml
index e03805a9..56aac210 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/pom.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/pom.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>pom</name>
-	<filePath>${baseDir}/${moduleCode}</filePath>
+	<filePath>${baseDir}/${modulePath}</filePath>
 	<fileName>pom.xml</fileName>
 	<charset></charset>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/src/main/java/package.xml b/modules/core/src/main/resources/templates/modules/gen/module/src/main/java/package.xml
index fce4f31d..365b7bbd 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/src/main/java/package.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/src/main/java/package.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/src/main/java/com/jeesite/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
+	<filePath>${baseDir}/${modulePath}/src/main/java/com/jeesite/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/config/jeesite.xml b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/config/jeesite.xml
index 2476a20e..97675bbd 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/config/jeesite.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/config/jeesite.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>jeesite</name>
-	<filePath>${baseDir}/${moduleCode}/src/main/resources/config</filePath>
+	<filePath>${baseDir}/${modulePath}/src/main/resources/config</filePath>
 	<fileName>jeesite-${moduleCode}.yml</fileName>
 	<content><![CDATA[
 # 温馨提示：不建议直接修改此文件，为了平台升级方便，建议将需要修改的参数值，复制到application.yml里进行覆盖该参数值。
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/db/versions.xml b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/db/versions.xml
index bd704c6f..a6376c89 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/db/versions.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/db/versions.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>versions</name>
-	<filePath>${baseDir}/${moduleCode}/src/main/resources/db/upgrade/${moduleCode}</filePath>
+	<filePath>${baseDir}/${modulePath}/src/main/resources/db/upgrade/${moduleCode}</filePath>
 	<fileName>versions</fileName>
 	<content><![CDATA[${module.currentVersion}]]>
 	</content>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/static/static.xml b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/static/static.xml
index 94362aea..cf16a48e 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/static/static.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/static/static.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>static</name>
-	<filePath>${baseDir}/${moduleCode}/src/main/resources/static/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
+	<filePath>${baseDir}/${modulePath}/src/main/resources/static/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.bat.xml
index 7326cafb..2a907cbf 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>deploy</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}-client/bin</filePath>
 	<fileName>deploy.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.sh.xml
index 59db3580..abc16e80 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>deploy</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}-client/bin</filePath>
 	<fileName>deploy.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.bat.xml
index 18017679..0625811d 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}-client/bin</filePath>
 	<fileName>package.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.sh.xml
index 387026d1..b1b21a53 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}-client/bin</filePath>
 	<fileName>package.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/pom.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/pom.xml
index 09168989..83e3a460 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/pom.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/pom.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>pom</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}-client</filePath>
 	<fileName>pom.xml</fileName>
 	<charset></charset>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/src/main/java/package.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/src/main/java/package.xml
index 3311713a..18860987 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/src/main/java/package.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/src/main/java/package.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/src/main/java/com/jeesite/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}-client/src/main/java/com/jeesite/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/pom.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/pom.xml
index eb9f190b..73bc1725 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/pom.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/pom.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>pom</name>
-	<filePath>${baseDir}/${moduleCode}</filePath>
+	<filePath>${baseDir}/${modulePath}</filePath>
 	<fileName>pom.xml</fileName>
 	<charset></charset>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.bat.xml
index 4aa20dbc..094d0c0b 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>docker-build</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin</filePath>
 	<fileName>docker-build.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.sh.xml
index 8ac2ba5c..af6dfd55 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>docker-build</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin</filePath>
 	<fileName>docker-build.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml
index 4b2340e2..db3417ce 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>Dockerfile</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin/docker</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin/docker</filePath>
 	<fileName>Dockerfile</fileName>
 	<content><![CDATA[FROM docker.m.daocloud.io/openjdk:17
 LABEL maintainer="ThinkGem@163.com"
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.bat.xml
index 5633279f..ecf7f63a 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin</filePath>
 	<fileName>package.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.sh.xml
index cc64f7ae..5bbad64e 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin</filePath>
 	<fileName>package.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.bat.xml
index 6aaa4c60..66526e30 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>run-tomcat</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin</filePath>
 	<fileName>run-tomcat.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.sh.xml
index 4ea38171..5928b26c 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>run-tomcat</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin</filePath>
 	<fileName>run-tomcat.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml
index 267b23b2..bb49c950 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>run-web</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin</filePath>
 	<fileName>run-web.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml
index 1d888e21..65285a28 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>run-web</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin</filePath>
 	<fileName>run-web.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml
index beafa58b..a6c9175f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>erm</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/db</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/db</filePath>
 	<fileName>${moduleCode}.erm</fileName>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <diagram>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml
index d25681a0..7e8f5c3a 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>pom</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}</filePath>
 	<fileName>pom.xml</fileName>
 	<charset></charset>
 	<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/java/package.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/package.xml
index be5207c6..e39a3c2f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/package.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/package.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/java/com/jeesite/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/java/com/jeesite/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml
index 77e5d5b8..9285dd9f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>start-class</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/java/com/jeesite/modules</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/java/com/jeesite/modules</filePath>
 	<fileName>${@StringUtils.capCamelCase(moduleCode)}Application.java</fileName>
 	<content><![CDATA[
 /**
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 e3d81f71..e88aa505 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
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>application-elk</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/resources/config</filePath>
 	<fileName>application-elk.yml</fileName>
 	<content><![CDATA[
 
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 d92601d8..e2833fda 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
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>application-prod</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/resources/config</filePath>
 	<fileName>application-prod.yml</fileName>
 	<content><![CDATA[
 
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 25aeae08..c7ecb67b 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
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>application</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/resources/config</filePath>
 	<fileName>application.yml</fileName>
 	<content><![CDATA[
 #======================================#
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 4d5a180f..7c7bc7bc 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
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>logback-spring-elk</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/resources/config</filePath>
 	<fileName>logback-spring-elk.xml</fileName>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
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 5b59c9ea..acdacded 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
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>logback-spring-prod</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/resources/config</filePath>
 	<fileName>logback-spring-prod.xml</fileName>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml
index 41daf3bc..edf73f83 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>logback-spring</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/resources/config</filePath>
 	<fileName>logback-spring.xml</fileName>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/static/static.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/static/static.xml
index d46ba518..4f3080ed 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/static/static.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/static/static.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>static</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/static/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/resources/static/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml
index de67a742..d1acceeb 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>run-web</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/webapp/WEB-INF</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/webapp/WEB-INF</filePath>
 	<fileName>startup.bat</fileName>
 	<content><![CDATA[chcp 65001
 @echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml
index 6c8d6e79..789bf7b1 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>run-web</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/webapp/WEB-INF</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/webapp/WEB-INF</filePath>
 	<fileName>startup.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml
index e81ff207..9907801f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>README</name>
-	<filePath>${baseDir}/packages/${moduleCode}</filePath>
+	<filePath>${baseDir}/packages/${modulePath}</filePath>
 	<fileName>README.md</fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml
index 4831145d..0c0fbb3f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>api</name>
-	<filePath>${baseDir}/packages/${moduleCode}/api</filePath>
+	<filePath>${baseDir}/packages/${modulePath}/api</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml
index 167ebd0e..b34fe154 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>index</name>
-	<filePath>${baseDir}/packages/${moduleCode}</filePath>
+	<filePath>${baseDir}/packages/${modulePath}</filePath>
 	<fileName>index.ts</fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml
index 7a020d29..1346afe4 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/packages/${moduleCode}</filePath>
+	<filePath>${baseDir}/packages/${modulePath}</filePath>
 	<fileName>package.json</fileName>
 	<content><![CDATA[
 {
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml
index 1de6b97d..e1bc1434 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>tsconfig</name>
-	<filePath>${baseDir}/packages/${moduleCode}</filePath>
+	<filePath>${baseDir}/packages/${modulePath}</filePath>
 	<fileName>tsconfig.json</fileName>
 	<content><![CDATA[
 {
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml
index 78eb76bb..b249219b 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>views</name>
-	<filePath>${baseDir}/packages/${moduleCode}/views</filePath>
+	<filePath>${baseDir}/packages/${modulePath}/views</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml
index 0e73d874..e080f5b3 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml
@@ -3,10 +3,10 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>controller</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/web${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/java${packagePath}${modulePath}/web${subModulePath}</filePath>
 	<fileName>${ClassName}Controller.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.web${subModuleNameDot};
 
 <% if (table.isTreeEntity){ %>
 import java.util.List;
@@ -36,11 +36,11 @@ import com.jeesite.modules.sys.utils.UserUtils;
 import com.jeesite.common.entity.Page;
 <% } %>
 import com.jeesite.common.web.BaseController;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
 <% for (child in table.childList){ %>
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${@StringUtils.cap(child.className)};
 <% } %>
-import ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Service;
+import ${packageName}.${moduleName}.service${subModuleNameDot}.${ClassName}Service;
 
 /**
  * ${functionName}Controller
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/dao.xml b/modules/core/src/main/resources/templates/modules/gen/query/dao.xml
index 3037f18a..073062f6 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/dao.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/dao.xml
@@ -3,14 +3,14 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>dao</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/dao${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/java${packagePath}${modulePath}/dao${subModulePath}</filePath>
 	<fileName>${ClassName}Dao.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.dao${subModuleNameDot};
 
 import com.jeesite.common.dao.${table.isTreeEntity?'Tree':'Query'}Dao;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
 
 /**
  * ${functionName}DAO接口
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/service.xml b/modules/core/src/main/resources/templates/modules/gen/query/service.xml
index d0c527a2..fdea692c 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/service.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/service.xml
@@ -3,10 +3,10 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>service</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/service${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/java${packagePath}${modulePath}/service${subModulePath}</filePath>
 	<fileName>${ClassName}Service.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.service${subModuleNameDot};
 
 import java.util.List;
 <% if (table.childList.~size > 0){ %>
@@ -16,11 +16,11 @@ import org.springframework.stereotype.Service;
 
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.service.${table.isTreeEntity?'Tree':'Query'}Service;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
-import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Dao;
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
+import ${packageName}.${moduleName}.dao${subModuleNameDot}.${ClassName}Dao;
 <% for (child in table.childList){ %>
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)};
-import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)}Dao;
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${@StringUtils.cap(child.className)};
+import ${packageName}.${moduleName}.dao${subModuleNameDot}.${@StringUtils.cap(child.className)}Dao;
 <% } %>
 
 /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml b/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml
index 188d44e6..a2c0bfa3 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewForm</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</filePath>
 	<fileName>${className}Form.html</fileName>
 	<content><![CDATA[
 <%
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml
index 4ee8b449..d7328812 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewList</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</filePath>
 	<fileName>${className}List.html</fileName>
 	<content><![CDATA[
 \<% layout('/layouts/default.html', {title: '${functionNameSimple}查询', libs: ['dataGrid']}){ %>
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
index c0d8e40d..b5d80fda 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueApi</name>
-	<filePath>${frontDir}/packages/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${frontDir}/packages${modulePath}/api${modulePath}${subModulePath}</filePath>
 	<fileName>${className}.ts</fileName>
 	<content><![CDATA[
 /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
index a19137e5..83677378 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueForm</name>
-	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages${modulePath}/views/${urlPrefix}</filePath>
 	<fileName>form.vue</fileName>
 	<content><![CDATA[
 <% var modalOrDrawer = @StringUtils.contains(table.tplCategory, '_modal') ? 'Modal' : 'Drawer'; %>
@@ -63,7 +63,7 @@
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
   import { Basic${modalOrDrawer}, use${modalOrDrawer}Inner } from '@jeesite/core/components/${modalOrDrawer}';
-  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
   <%
   var userselectExists = false;
   var officeselectExists = false;
@@ -101,7 +101,7 @@
 
   const emit = defineEmits(['success', 'register']);
 
-  const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
   const { showMessage } = useMessage();
   const { meta } = unref(router.currentRoute);
   const record = ref<${ClassName}>({} as ${ClassName});
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
index bc789025..131eb208 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueFormChildList</name>
-	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages${modulePath}/views/${urlPrefix}</filePath>
 	<fileName>form${@StringUtils.cap(table.classNameSimple)}List.vue</fileName>
 	<content><![CDATA[
 <!--
@@ -26,7 +26,7 @@
   import { useI18n } from '@jeesite/core/hooks/web/useI18n';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
-  import { ${ParentClassName} } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${parentClassName}';
+  import { ${ParentClassName} } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${parentClassName}';
   <%
   var userselectExists = false;
   var officeselectExists = false;
@@ -56,7 +56,7 @@
   import { areaTreeData } from '@jeesite/core/api/sys/area';
   <% } %>
 
-  const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
   const record = ref<${ParentClassName}>({} as ${ParentClassName});
 
   const tableColumns: BasicColumn[] = [
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
index 0ff887a2..e9019c59 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueFormRoute</name>
-	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages${modulePath}/views/${urlPrefix}</filePath>
 	<fileName>formRoute.vue</fileName>
 	<content><![CDATA[
 <!--
@@ -72,7 +72,7 @@
 <% if (table.childList.~size > 0){ %>
   import { BasicTable, useTable } from '@jeesite/core/components/Table';
 <% } %>
-  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
 <%
 var userselectExists = false;
 var officeselectExists = false;
@@ -124,7 +124,7 @@ for(c in table.columnList){
 
   const emitter = useEmitter();
 
-  const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
   const { showMessage } = useMessage();
   const { setTitle, close } = useTabs(router);
   const record = ref<${ClassName}>({} as ${ClassName});
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
index 31aedad0..09640ac9 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueFormImport</name>
-	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages${modulePath}/views/${urlPrefix}</filePath>
 	<fileName>formImport.vue</fileName>
 	<content><![CDATA[
 <% if(toBoolean(table.optionMap['isImportExport'])){ %>
@@ -51,13 +51,13 @@
   import { downloadByUrl } from '@jeesite/core/utils/file/download';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
-  import { ${className}ImportData } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { ${className}ImportData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
   import { FileType } from 'ant-design-vue/es/upload/interface';
   import { AxiosProgressEvent } from 'axios';
 
   const emit = defineEmits(['success', 'register']);
 
-  const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
   const { showMessage, showMessageModal } = useMessage();
 
   const fileList = ref<FileType[]>([]);
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
index ebbbb6c6..dd6e57d2 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueIndex</name>
-	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages${modulePath}/views/${urlPrefix}</filePath>
 	<fileName>index.vue</fileName>
 	<content><![CDATA[
 <% if(table.isTreeEntity || isNotBlank(table.optionMap['leftTreeRightTableUrl'])){ %>
@@ -33,10 +33,10 @@
   import { useI18n } from '@jeesite/core/hooks/web/useI18n';
   import { PageWrapper } from '@jeesite/core/components/Page';
   import { BasicTree } from '@jeesite/core/components/Tree';
-  import { ${className}TreeData } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { ${className}TreeData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
   import ListView from './list.vue';
 
-  const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
   const treeCodes = ref<string[]>([]);
 </script>
 <% } %>
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
index 8fb90deb..114a673c 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueList</name>
-	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages/${modulePath}/views/${urlPrefix}</filePath>
 	<fileName>list.vue</fileName>
 	<content><![CDATA[
 <% var modalOrDrawer = @StringUtils.contains(table.tplCategory, '_modal') ? 'Modal' : 'Drawer'; %>
@@ -111,9 +111,9 @@ if(table.isTreeEntity){
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
-  import { ${className}Delete, ${className}ListData } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { ${className}Delete, ${className}ListData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
   <% if(toBoolean(table.optionMap['isHaveDisableEnable'])){ %>
-  import { ${className}Disable, ${className}Enable } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { ${className}Disable, ${className}Enable } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
   <% } %>
   <%
   var userselectExists = false;
@@ -176,7 +176,7 @@ if(table.isTreeEntity){
   const emitter = useEmitter();
   <% } %>
 
-  const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
   const { showMessage } = useMessage();
   const { meta } = unref(router.currentRoute);
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml
index b72aeaac..4fc5df73 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml
@@ -3,12 +3,12 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueSelect</name>
-	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages${modulePath}/views/${urlPrefix}</filePath>
 	<fileName>select.ts</fileName>
 	<content><![CDATA[
 import { useI18n } from '@jeesite/core/hooks/web/useI18n';
 import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
-import { ${className}ListData } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+import { ${className}ListData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
 <%
 var userselectExists = false;
 var officeselectExists = false;
@@ -38,7 +38,7 @@ import { companyTreeData } from '@jeesite/core/api/sys/company';
 import { areaTreeData } from '@jeesite/core/api/sys/area';
 <% } %>
 
-const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
+const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
 
 const modalProps = {
   title: t('${functionNameSimple}选择'),
-- 
Gitee


From 27447c2479c9aa740e9840465ccdbd7fc2e7039e Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 1 Jul 2025 12:34:13 +0800
Subject: [PATCH 70/84] update

---
 web-ai/src/main/resources/config/application.yml   | 2 +-
 web-fast/src/main/resources/config/application.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web-ai/src/main/resources/config/application.yml b/web-ai/src/main/resources/config/application.yml
index 8a8b388f..e78f4403 100644
--- a/web-ai/src/main/resources/config/application.yml
+++ b/web-ai/src/main/resources/config/application.yml
@@ -158,7 +158,7 @@ state:
 # Shiro 相关
 shiro:
 
-  #  defaultPath: ${shiro.loginUrl}
+#  defaultPath: ${shiro.loginUrl}
   defaultPath: ${vuePath}/login
 
   # 登录相关设置
diff --git a/web-fast/src/main/resources/config/application.yml b/web-fast/src/main/resources/config/application.yml
index 7f766e65..d7fa76c1 100644
--- a/web-fast/src/main/resources/config/application.yml
+++ b/web-fast/src/main/resources/config/application.yml
@@ -158,7 +158,7 @@ state:
 # Shiro 相关
 shiro:
 
-  #  defaultPath: ${shiro.loginUrl}
+#  defaultPath: ${shiro.loginUrl}
   defaultPath: ${vuePath}/login
 
   # 登录相关设置
-- 
Gitee


From bbbace28eabd19f59af50dce12a3e7f427277051 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 3 Jul 2025 13:47:34 +0800
Subject: [PATCH 71/84] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8oracl?=
 =?UTF-8?q?e=20ojdbc8=E9=A9=B1=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 8499b259..51195aee 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -30,19 +30,19 @@
 			<scope>runtime</scope>
 		</dependency>
 
-		<!-- Oracle 11g -->
+		<!-- Oracle 11g
 		<dependency>
 			<groupId>com.oracle</groupId>
 			<artifactId>ojdbc6</artifactId>
 			<version>11.2.0.3</version>
 			<scope>runtime</scope>
-		</dependency>
-		<!-- Oracle 12c 及以上版本
+		</dependency> -->
+		<!-- Oracle 12c 及以上版本 -->
 		<dependency>
 			<groupId>com.oracle.database.jdbc</groupId>
 			<artifactId>ojdbc8</artifactId>
 			<scope>runtime</scope>
-		</dependency> -->
+		</dependency>
 
 		<!-- SqlServer 2008
 		<dependency>
-- 
Gitee


From d41545f2b09868a145361d666a307879596bd48d Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 3 Jul 2025 14:01:17 +0800
Subject: [PATCH 72/84] update yml

---
 web-api/src/main/resources/config/application.yml | 2 +-
 web/src/main/resources/config/application.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml
index 1d33632d..390f0540 100644
--- a/web-api/src/main/resources/config/application.yml
+++ b/web-api/src/main/resources/config/application.yml
@@ -59,7 +59,7 @@ jdbc:
   password: 123456
   testSql: SELECT 1
 
-#  # Oracle 数据库配置（11g，若使用 12c 以上版本，请打开 /modules/core/pom.xml 文件，替换为 Oracle 12c 驱动并编译打包 core 模块）
+#  # Oracle 数据库配置
 #  type: oracle
 #  driver: oracle.jdbc.OracleDriver
 #  url: jdbc:oracle:thin:@127.0.0.1:1521/orcl
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 5b20d130..597c86a0 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -59,7 +59,7 @@ jdbc:
   password: 123456
   testSql: SELECT 1
 
-#  # Oracle 数据库配置（11g，若使用 12c 以上版本，请打开 /modules/core/pom.xml 文件，替换为 Oracle 12c 驱动并编译打包 core 模块）
+#  # Oracle 数据库配置
 #  type: oracle
 #  driver: oracle.jdbc.OracleDriver
 #  url: jdbc:oracle:thin:@127.0.0.1:1521/orcl
-- 
Gitee


From 278f67fe720f8346a54f27cb2956ec7343f638aa Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 3 Jul 2025 14:04:13 +0800
Subject: [PATCH 73/84] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=AE=80=E5=8C=96=E8=AF=B7=E6=B1=82=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E6=97=B6=EF=BC=8Capi=E6=96=87=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E5=90=AB=E6=A8=A1=E5=9D=97=E5=90=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/modules/gen/vue/vueApi.xml | 2 +-
 .../main/resources/templates/modules/gen/vue/vueForm.xml    | 2 +-
 .../resources/templates/modules/gen/vue/vueFormRoute.xml    | 2 +-
 .../main/resources/templates/modules/gen/vue/vueImport.xml  | 2 +-
 .../main/resources/templates/modules/gen/vue/vueIndex.xml   | 2 +-
 .../main/resources/templates/modules/gen/vue/vueList.xml    | 6 +++---
 .../main/resources/templates/modules/gen/vue/vueSelect.xml  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
index b5d80fda..155d4dad 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
@@ -4,7 +4,7 @@
 <template>
 	<name>vueApi</name>
 	<filePath>${frontDir}/packages${modulePath}/api${modulePath}${subModulePath}</filePath>
-	<fileName>${className}.ts</fileName>
+	<fileName>${funName}.ts</fileName>
 	<content><![CDATA[
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
index 83677378..e977a65a 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
@@ -63,7 +63,7 @@
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
   import { Basic${modalOrDrawer}, use${modalOrDrawer}Inner } from '@jeesite/core/components/${modalOrDrawer}';
-  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
+  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${funName}';
   <%
   var userselectExists = false;
   var officeselectExists = false;
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
index e9019c59..1f103cf1 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
@@ -72,7 +72,7 @@
 <% if (table.childList.~size > 0){ %>
   import { BasicTable, useTable } from '@jeesite/core/components/Table';
 <% } %>
-  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
+  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${funName}';
 <%
 var userselectExists = false;
 var officeselectExists = false;
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
index 09640ac9..d5854056 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
@@ -51,7 +51,7 @@
   import { downloadByUrl } from '@jeesite/core/utils/file/download';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
-  import { ${className}ImportData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
+  import { ${className}ImportData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${funName}';
   import { FileType } from 'ant-design-vue/es/upload/interface';
   import { AxiosProgressEvent } from 'axios';
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
index dd6e57d2..ab1acea4 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
@@ -33,7 +33,7 @@
   import { useI18n } from '@jeesite/core/hooks/web/useI18n';
   import { PageWrapper } from '@jeesite/core/components/Page';
   import { BasicTree } from '@jeesite/core/components/Tree';
-  import { ${className}TreeData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
+  import { ${className}TreeData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${funName}';
   import ListView from './list.vue';
 
   const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
index 114a673c..22b745c8 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueList</name>
-	<filePath>${frontDir}/packages/${modulePath}/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages${modulePath}/views/${urlPrefix}</filePath>
 	<fileName>list.vue</fileName>
 	<content><![CDATA[
 <% var modalOrDrawer = @StringUtils.contains(table.tplCategory, '_modal') ? 'Modal' : 'Drawer'; %>
@@ -111,9 +111,9 @@ if(table.isTreeEntity){
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
-  import { ${className}Delete, ${className}ListData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
+  import { ${className}Delete, ${className}ListData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${funName}';
   <% if(toBoolean(table.optionMap['isHaveDisableEnable'])){ %>
-  import { ${className}Disable, ${className}Enable } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
+  import { ${className}Disable, ${className}Enable } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${funName}';
   <% } %>
   <%
   var userselectExists = false;
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml
index 4fc5df73..c56ce638 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml
@@ -8,7 +8,7 @@
 	<content><![CDATA[
 import { useI18n } from '@jeesite/core/hooks/web/useI18n';
 import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
-import { ${className}ListData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
+import { ${className}ListData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${funName}';
 <%
 var userselectExists = false;
 var officeselectExists = false;
-- 
Gitee


From c0f02b4599bbf153ef1c0fafdf56eab12dbd8d56 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 4 Jul 2025 15:01:33 +0800
Subject: [PATCH 74/84] =?UTF-8?q?=E5=B7=A6=E6=A0=91=E5=8F=B3=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=88=87=E6=8D=A2=E6=A0=91=E8=8A=82=E7=82=B9=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E5=AE=9A=E5=90=91=E5=88=B0=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/views/modules/cms/categoryIndex.html   | 2 +-
 .../cms/src/main/resources/views/modules/cms/cmsIndex.html    | 4 ++--
 .../main/resources/templates/modules/gen/view/viewIndex.html  | 2 +-
 .../main/resources/views/modules/biz/bizCategoryIndex.html    | 2 +-
 .../src/main/resources/views/modules/sys/companyIndex.html    | 2 +-
 .../core/src/main/resources/views/modules/sys/menuIndex.html  | 2 +-
 .../src/main/resources/views/modules/sys/officeIndex.html     | 2 +-
 .../src/main/resources/views/modules/test/testTreeIndex.html  | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/cms/src/main/resources/views/modules/cms/categoryIndex.html b/modules/cms/src/main/resources/views/modules/cms/categoryIndex.html
index 8257e93d..215d1a43 100644
--- a/modules/cms/src/main/resources/views/modules/cms/categoryIndex.html
+++ b/modules/cms/src/main/resources/views/modules/cms/categoryIndex.html
@@ -41,7 +41,7 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{
 		tree.expandNode(treeNode);
 		//win.$('button[type=reset]').click();
 		win.$('#categoryCode').val(treeNode.id);
-		win.page();
+		win.page(1);
 	}}
 }, tree, loadTree = function(){
 	js.ajaxSubmit(setting.async.url+"?___t="+new Date().getTime(), {
diff --git a/modules/cms/src/main/resources/views/modules/cms/cmsIndex.html b/modules/cms/src/main/resources/views/modules/cms/cmsIndex.html
index dfa374a7..c439c885 100644
--- a/modules/cms/src/main/resources/views/modules/cms/cmsIndex.html
+++ b/modules/cms/src/main/resources/views/modules/cms/cmsIndex.html
@@ -58,13 +58,13 @@ var setting = {
 				&& ((src.indexOf("article") > 0 && adminUrl.indexOf("article") > 0)
 					|| (src.indexOf("link") > 0 && adminUrl.indexOf("link") > 0))){
 				var win = ifr[0].contentWindow, conts = ifr.contents();
-				conts.find('input[type=reset]').click();
+				//conts.find('input[type=reset]').click();
 				conts.find('#categoryCode').val(treeNode.id);
 				conts.find('#outline').val(adminUrl.indexOf("outline=true") != -1); // 文章模型是否显示大纲视图
 				conts.find('#fileDown').val(adminUrl.indexOf("fileDown=true") != -1); // 链接模型是否是下载栏目
 				var caption = conts.find('.portlet-title .caption');
 				caption.html(caption.find('i').prop("outerHTML") + " " + treeNode.name);
-				win.page();
+				win.page(1);
 			}else{
 				$('#mainFrame').attr("src", adminUrl);
 			}
diff --git a/modules/core/src/main/resources/templates/modules/gen/view/viewIndex.html b/modules/core/src/main/resources/templates/modules/gen/view/viewIndex.html
index 782ed023..3fda05cc 100644
--- a/modules/core/src/main/resources/templates/modules/gen/view/viewIndex.html
+++ b/modules/core/src/main/resources/templates/modules/gen/view/viewIndex.html
@@ -50,7 +50,7 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{
 		win.$('#${pk.attrName}').val(treeNode.id);
 			<% } %>
 		<% } %>
-		win.page();
+		win.page(1);
 	}}
 }, tree, loadTree = function(){
 	js.ajaxSubmit(setting.async.url+"?___t="+new Date().getTime(), {
diff --git a/modules/core/src/main/resources/views/modules/biz/bizCategoryIndex.html b/modules/core/src/main/resources/views/modules/biz/bizCategoryIndex.html
index 76fd3619..5738cf0b 100644
--- a/modules/core/src/main/resources/views/modules/biz/bizCategoryIndex.html
+++ b/modules/core/src/main/resources/views/modules/biz/bizCategoryIndex.html
@@ -38,7 +38,7 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{
 		tree.expandNode(treeNode);
 		//win.$('button[type=reset]').click();
 		win.$('#categoryCode').val(treeNode.id);
-		win.page();
+		win.page(1);
 	}}
 }, tree, loadTree = function(){
 	js.ajaxSubmit(setting.async.url+"?___t="+new Date().getTime(), {
diff --git a/modules/core/src/main/resources/views/modules/sys/companyIndex.html b/modules/core/src/main/resources/views/modules/sys/companyIndex.html
index 302c6157..e1b4eb57 100644
--- a/modules/core/src/main/resources/views/modules/sys/companyIndex.html
+++ b/modules/core/src/main/resources/views/modules/sys/companyIndex.html
@@ -38,7 +38,7 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{
 		tree.expandNode(treeNode);
 		//win.$('button[type=reset]').click();
 		win.$('#companyCode').val(treeNode.id);
-		win.page();
+		win.page(1);
 	}}
 }, tree, loadTree = function(){
 	js.ajaxSubmit(setting.async.url+"?___t="+new Date().getTime(), {
diff --git a/modules/core/src/main/resources/views/modules/sys/menuIndex.html b/modules/core/src/main/resources/views/modules/sys/menuIndex.html
index ef7bbea9..86a62a8b 100644
--- a/modules/core/src/main/resources/views/modules/sys/menuIndex.html
+++ b/modules/core/src/main/resources/views/modules/sys/menuIndex.html
@@ -50,7 +50,7 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{
 		win.$('#menuCode').val(treeNode.id);
 		win.$('#sysCode').val($('#sysCode').data('code'));
 		win.$('#sysCodeLabel').text($('#sysCode').text());
-		win.page();
+		win.page(1);
 	}}
 }, tree, loadTree = function(){
 	js.ajaxSubmit(setting.async.url+"?___t="+new Date().getTime(), {
diff --git a/modules/core/src/main/resources/views/modules/sys/officeIndex.html b/modules/core/src/main/resources/views/modules/sys/officeIndex.html
index 04b33301..78c1b553 100644
--- a/modules/core/src/main/resources/views/modules/sys/officeIndex.html
+++ b/modules/core/src/main/resources/views/modules/sys/officeIndex.html
@@ -38,7 +38,7 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{
 		tree.expandNode(treeNode);
 		//win.$('button[type=reset]').click();
 		win.$('#officeCode').val(treeNode.id);
-		win.page();
+		win.page(1);
 	}}
 }, tree, loadTree = function(){
 	js.ajaxSubmit(setting.async.url+"?___t="+new Date().getTime(), {
diff --git a/modules/test/src/main/resources/views/modules/test/testTreeIndex.html b/modules/test/src/main/resources/views/modules/test/testTreeIndex.html
index 516d7d0d..992aace0 100644
--- a/modules/test/src/main/resources/views/modules/test/testTreeIndex.html
+++ b/modules/test/src/main/resources/views/modules/test/testTreeIndex.html
@@ -35,7 +35,7 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{
 		tree.expandNode(treeNode);
 		//win.$('button[type=reset]').click();
 		win.$('#treeCode').val(treeNode.id);
-		win.page();
+		win.page(1);
 	}}
 }, tree, loadTree = function(){
 	js.ajaxSubmit(setting.async.url+"?___t="+new Date().getTime(), {
-- 
Gitee


From 7de53c00efc9bf754cf787115c2ce6ae7448d43d Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 5 Jul 2025 16:31:07 +0800
Subject: [PATCH 75/84] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=EF=BC=8C=E4=BC=98=E5=8C=96=20useI18n=20?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/modules/gen/vue/vueForm.xml    | 2 +-
 .../resources/templates/modules/gen/vue/vueFormChildList.xml    | 2 +-
 .../main/resources/templates/modules/gen/vue/vueFormRoute.xml   | 2 +-
 .../src/main/resources/templates/modules/gen/vue/vueImport.xml  | 2 +-
 .../src/main/resources/templates/modules/gen/vue/vueIndex.xml   | 2 +-
 .../src/main/resources/templates/modules/gen/vue/vueList.xml    | 2 +-
 .../src/main/resources/templates/modules/gen/vue/vueSelect.xml  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
index e977a65a..8aeaa61a 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
@@ -101,7 +101,7 @@
 
   const emit = defineEmits(['success', 'register']);
 
-  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${funName}');
   const { showMessage } = useMessage();
   const { meta } = unref(router.currentRoute);
   const record = ref<${ClassName}>({} as ${ClassName});
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
index 131eb208..1206b66b 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
@@ -56,7 +56,7 @@
   import { areaTreeData } from '@jeesite/core/api/sys/area';
   <% } %>
 
-  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${funName}');
   const record = ref<${ParentClassName}>({} as ${ParentClassName});
 
   const tableColumns: BasicColumn[] = [
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
index 1f103cf1..5d122f73 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
@@ -124,7 +124,7 @@ for(c in table.columnList){
 
   const emitter = useEmitter();
 
-  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${funName}');
   const { showMessage } = useMessage();
   const { setTitle, close } = useTabs(router);
   const record = ref<${ClassName}>({} as ${ClassName});
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
index d5854056..bac6af12 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
@@ -57,7 +57,7 @@
 
   const emit = defineEmits(['success', 'register']);
 
-  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${funName}');
   const { showMessage, showMessageModal } = useMessage();
 
   const fileList = ref<FileType[]>([]);
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
index ab1acea4..05eaae90 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
@@ -36,7 +36,7 @@
   import { ${className}TreeData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${funName}';
   import ListView from './list.vue';
 
-  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${funName}');
   const treeCodes = ref<string[]>([]);
 </script>
 <% } %>
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
index 22b745c8..003d8127 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
@@ -176,7 +176,7 @@ if(table.isTreeEntity){
   const emitter = useEmitter();
   <% } %>
 
-  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${funName}');
   const { showMessage } = useMessage();
   const { meta } = unref(router.currentRoute);
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml
index c56ce638..cfb0b894 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml
@@ -38,7 +38,7 @@ import { companyTreeData } from '@jeesite/core/api/sys/company';
 import { areaTreeData } from '@jeesite/core/api/sys/area';
 <% } %>
 
-const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
+const { t } = useI18n('${moduleName}${subModuleNameDot}.${funName}');
 
 const modalProps = {
   title: t('${functionNameSimple}选择'),
-- 
Gitee


From 743dcc6f4ce6bdaa507f521e7f9b8df94d5f7b55 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 7 Jul 2025 08:55:36 +0800
Subject: [PATCH 76/84] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20SHA-256=20=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=EF=BC=8C=E4=BD=BF=E7=94=A8=20ShaUtils=20=E6=9B=BF?=
 =?UTF-8?q?=E4=BB=A3=20Sha1Utils?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/codec/DigestUtils.java |   1 +
 .../com/jeesite/common/codec/Sha1Utils.java   |  72 +---------
 .../com/jeesite/common/codec/ShaUtils.java    | 131 ++++++++++++++++++
 .../{Sha1UtilsTest.java => ShaUtilsTest.java} |  16 ++-
 .../common/shiro/realm/AuthorizingRealm.java  |   7 +-
 5 files changed, 149 insertions(+), 78 deletions(-)
 create mode 100644 common/src/main/java/com/jeesite/common/codec/ShaUtils.java
 rename common/src/test/java/com/jeesite/test/codec/{Sha1UtilsTest.java => ShaUtilsTest.java} (49%)

diff --git a/common/src/main/java/com/jeesite/common/codec/DigestUtils.java b/common/src/main/java/com/jeesite/common/codec/DigestUtils.java
index 56c1b806..a73a12a2 100644
--- a/common/src/main/java/com/jeesite/common/codec/DigestUtils.java
+++ b/common/src/main/java/com/jeesite/common/codec/DigestUtils.java
@@ -19,6 +19,7 @@ import java.security.*;
 public class DigestUtils {
 
 	public static final String SHA1 = "SHA-1";
+	public static final String SHA256 = "SHA-256";
 	public static final String MD5 = "MD5";
 	public static final String SM3 = "SM3";
 
diff --git a/common/src/main/java/com/jeesite/common/codec/Sha1Utils.java b/common/src/main/java/com/jeesite/common/codec/Sha1Utils.java
index dd7718df..323c48c2 100644
--- a/common/src/main/java/com/jeesite/common/codec/Sha1Utils.java
+++ b/common/src/main/java/com/jeesite/common/codec/Sha1Utils.java
@@ -4,79 +4,11 @@
  */
 package com.jeesite.common.codec;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
 /**
  * SHA-1 加密工具类，散列加密，不可逆加密
  * @author ThinkGem
  */
-public class Sha1Utils {
-
-	/**
-	 * 生成随机的 Byte[] 作为 salt 密钥.
-	 * @param numBytes byte数组的大小
-	 */
-	public static byte[] genSalt(int numBytes) {
-		return DigestUtils.genSalt(numBytes);
-	}
-
-	/**
-	 * 生成随机的 Byte[] 作为 salt 密钥，返回 HEX 值
-	 * @param numBytes byte 数组的大小
-	 */
-	public static String genSaltString(int numBytes) {
-		return DigestUtils.genSaltString(numBytes);
-	}
-
-	/**
-	 * 对输入字符串进行 SHA-1 散列.
-	 */
-	public static byte[] sha1(byte[] input) {
-		return DigestUtils.digest(input, DigestUtils.SHA1, null, 1);
-	}
-
-	/**
-	 * 对输入字符串进行 SHA-1 散列.
-	 */
-	public static String sha1(String input) {
-		return EncodeUtils.encodeHex(sha1(input.getBytes(StandardCharsets.UTF_8)));
-	}
-
-	/**
-	 * 对输入字符串进行 SHA-1 散列.
-	 */
-	public static byte[] sha1(byte[] input, byte[] salt) {
-		return DigestUtils.digest(input, DigestUtils.SHA1, salt, 1);
-	}
-
-	/**
-	 * 对输入字符串进行 SHA-1 散列.
-	 */
-	public static String sha1(String data, String salt) {
-		return EncodeUtils.encodeHex(sha1(data.getBytes(StandardCharsets.UTF_8), EncodeUtils.decodeHex(salt)));
-	}
-
-	/**
-	 * 对输入字符串进行 SHA-1 散列.
-	 */
-	public static byte[] sha1(byte[] input, byte[] salt, int iterations) {
-		return DigestUtils.digest(input, DigestUtils.SHA1, salt, iterations);
-	}
-
-	/**
-	 * 对输入字符串进行 SHA-1 散列.
-	 */
-	public static String sha1(String input, String salt, int iterations) {
-		return EncodeUtils.encodeHex(sha1(input.getBytes(StandardCharsets.UTF_8), EncodeUtils.decodeHex(salt), iterations));
-	}
-
-	/**
-	 * 对文件进行 SHA-1 散列.
-	 */
-	public static byte[] sha1(InputStream input) throws IOException {
-		return DigestUtils.digest(input, DigestUtils.SHA1);
-	}
+@Deprecated
+public class Sha1Utils extends ShaUtils {
 
 }
diff --git a/common/src/main/java/com/jeesite/common/codec/ShaUtils.java b/common/src/main/java/com/jeesite/common/codec/ShaUtils.java
new file mode 100644
index 00000000..b93c8a49
--- /dev/null
+++ b/common/src/main/java/com/jeesite/common/codec/ShaUtils.java
@@ -0,0 +1,131 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ */
+package com.jeesite.common.codec;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * SHA-1 和 SHA-256 加密工具类，散列加密，不可逆加密
+ * @author ThinkGem
+ */
+public class ShaUtils {
+
+	/**
+	 * 生成随机的 Byte[] 作为 salt 密钥.
+	 * @param numBytes byte数组的大小
+	 */
+	public static byte[] genSalt(int numBytes) {
+		return DigestUtils.genSalt(numBytes);
+	}
+
+	/**
+	 * 生成随机的 Byte[] 作为 salt 密钥，返回 HEX 值
+	 * @param numBytes byte 数组的大小
+	 */
+	public static String genSaltString(int numBytes) {
+		return DigestUtils.genSaltString(numBytes);
+	}
+
+	/**
+	 * 对输入字符串进行 SHA-1 散列.
+	 */
+	public static byte[] sha1(byte[] input) {
+		return DigestUtils.digest(input, DigestUtils.SHA1, null, 1);
+	}
+
+	/**
+	 * 对输入字符串进行 SHA-1 散列.
+	 */
+	public static String sha1(String input) {
+		return EncodeUtils.encodeHex(sha1(input.getBytes(StandardCharsets.UTF_8)));
+	}
+
+	/**
+	 * 对输入字符串进行 SHA-1 散列.
+	 */
+	public static byte[] sha1(byte[] input, byte[] salt) {
+		return DigestUtils.digest(input, DigestUtils.SHA1, salt, 1);
+	}
+
+	/**
+	 * 对输入字符串进行 SHA-1 散列.
+	 */
+	public static String sha1(String data, String salt) {
+		return EncodeUtils.encodeHex(sha1(data.getBytes(StandardCharsets.UTF_8), EncodeUtils.decodeHex(salt)));
+	}
+
+	/**
+	 * 对输入字符串进行 SHA-1 散列.
+	 */
+	public static byte[] sha1(byte[] input, byte[] salt, int iterations) {
+		return DigestUtils.digest(input, DigestUtils.SHA1, salt, iterations);
+	}
+
+	/**
+	 * 对输入字符串进行 SHA-1 散列.
+	 */
+	public static String sha1(String input, String salt, int iterations) {
+		return EncodeUtils.encodeHex(sha1(input.getBytes(StandardCharsets.UTF_8), EncodeUtils.decodeHex(salt), iterations));
+	}
+
+	/**
+	 * 对文件进行 SHA-1 散列.
+	 */
+	public static byte[] sha1(InputStream input) throws IOException {
+		return DigestUtils.digest(input, DigestUtils.SHA1);
+	}
+
+	/**
+	 * 对输入字符串进行 SHA-256 散列.
+	 */
+	public static byte[] sha256(byte[] input) {
+		return DigestUtils.digest(input, DigestUtils.SHA256, null, 1);
+	}
+
+	/**
+	 * 对输入字符串进行 SHA-256 散列.
+	 */
+	public static String sha256(String input) {
+		return EncodeUtils.encodeHex(sha256(input.getBytes(StandardCharsets.UTF_8)));
+	}
+
+	/**
+	 * 对输入字符串进行 SHA-256 散列.
+	 */
+	public static byte[] sha256(byte[] input, byte[] salt) {
+		return DigestUtils.digest(input, DigestUtils.SHA256, salt, 1);
+	}
+
+	/**
+	 * 对输入字符串进行 SHA-256 散列.
+	 */
+	public static String sha256(String data, String salt) {
+		return EncodeUtils.encodeHex(sha256(data.getBytes(StandardCharsets.UTF_8), EncodeUtils.decodeHex(salt)));
+	}
+
+	/**
+	 * 对输入字符串进行 SHA-256 散列.
+	 */
+	public static byte[] sha256(byte[] input, byte[] salt, int iterations) {
+		return DigestUtils.digest(input, DigestUtils.SHA256, salt, iterations);
+	}
+
+	/**
+	 * 对输入字符串进行 SHA-256 散列.
+	 */
+	public static String sha256(String input, String salt, int iterations) {
+		return EncodeUtils.encodeHex(sha256(input.getBytes(StandardCharsets.UTF_8), EncodeUtils.decodeHex(salt), iterations));
+	}
+
+	/**
+	 * 对文件进行 SHA-256 散列.
+	 */
+	public static byte[] sha256(InputStream input) throws IOException {
+		return DigestUtils.digest(input, DigestUtils.SHA256);
+	}
+
+}
diff --git a/common/src/test/java/com/jeesite/test/codec/Sha1UtilsTest.java b/common/src/test/java/com/jeesite/test/codec/ShaUtilsTest.java
similarity index 49%
rename from common/src/test/java/com/jeesite/test/codec/Sha1UtilsTest.java
rename to common/src/test/java/com/jeesite/test/codec/ShaUtilsTest.java
index 02656dc0..6e5cbb99 100644
--- a/common/src/test/java/com/jeesite/test/codec/Sha1UtilsTest.java
+++ b/common/src/test/java/com/jeesite/test/codec/ShaUtilsTest.java
@@ -4,25 +4,33 @@
  */
 package com.jeesite.test.codec;
 
-import com.jeesite.common.codec.Sha1Utils;
+import com.jeesite.common.codec.ShaUtils;
 
 /**
  * SHA-1 加密工具类，散列加密，不可逆加密
  * @author ThinkGem
  * @version 2024-07-22
  */
-public class Sha1UtilsTest {
+public class ShaUtilsTest {
+
+	public static final int HASH_ITERATIONS = 1024;
+	public static final int SALT_SIZE = 8;
 
 	public static void main(String[] args) {
 
 		String s = "Hello word! 你好，中文！";
 		System.out.println(s);
 
-		String salt = Sha1Utils.genSaltString(8);
+		String salt = ShaUtils.genSaltString(SALT_SIZE);
 		System.out.println(salt);
-		String data = Sha1Utils.sha1(s, salt);
+		String data = ShaUtils.sha1(s, salt, HASH_ITERATIONS);
 		System.out.println(data);
 
+		String salt2 = ShaUtils.genSaltString(SALT_SIZE);
+		System.out.println(salt2);
+		String data2 = ShaUtils.sha256(s, salt2, HASH_ITERATIONS);
+		System.out.println(data2);
+
 	}
 	
 }
\ No newline at end of file
diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java b/modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java
index 03beb444..ceadbc00 100644
--- a/modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java
+++ b/modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java
@@ -6,7 +6,7 @@ package com.jeesite.common.shiro.realm;
 
 import com.jeesite.common.codec.EncodeUtils;
 import com.jeesite.common.codec.SM3Utils;
-import com.jeesite.common.codec.Sha1Utils;
+import com.jeesite.common.codec.ShaUtils;
 import com.jeesite.common.config.Global;
 import com.jeesite.common.shiro.authc.FormToken;
 import com.jeesite.common.utils.SpringUtils;
@@ -30,7 +30,6 @@ import org.apache.shiro.subject.Subject;
  */
 public class AuthorizingRealm extends BaseAuthorizingRealm  {
 
-	public static final String HASH_ALGORITHM = "SHA-1";
 	public static final int HASH_ITERATIONS = 1024;
 	public static final int SALT_SIZE = 8;
 
@@ -88,7 +87,7 @@ public class AuthorizingRealm extends BaseAuthorizingRealm  {
 			String data = SM3Utils.sm3(plain, salt, HASH_ITERATIONS);
 			return salt + data;
 		}
-		String data = Sha1Utils.sha1(plain, salt, HASH_ITERATIONS);
+		String data = ShaUtils.sha1(plain, salt, HASH_ITERATIONS);
 		return salt + data;
 	}
 
@@ -107,7 +106,7 @@ public class AuthorizingRealm extends BaseAuthorizingRealm  {
 				String data = SM3Utils.sm3(plain, salt, HASH_ITERATIONS);
 				return password.equals(salt + data);
 			}
-			String data = Sha1Utils.sha1(plain, salt, HASH_ITERATIONS);
+			String data = ShaUtils.sha1(plain, salt, HASH_ITERATIONS);
 			return password.equals(salt + data);
 		}catch(Exception e){
 			return false;
-- 
Gitee


From b522b3ff1e1b6b65631282f47fabbbbc2c86b8a3 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 7 Jul 2025 18:29:36 +0800
Subject: [PATCH 77/84] 5.12.1

---
 common/pom.xml                                         | 2 +-
 modules/app/pom.xml                                    | 2 +-
 modules/app/src/main/resources/db/upgrade/app/versions | 3 ++-
 modules/cms-ai/pom.xml                                 | 2 +-
 modules/cms/pom.xml                                    | 2 +-
 modules/cms/src/main/resources/db/upgrade/cms/versions | 3 ++-
 modules/core/pom.xml                                   | 2 +-
 modules/pom.xml                                        | 2 +-
 modules/static/pom.xml                                 | 2 +-
 modules/test/pom.xml                                   | 2 +-
 parent/pom.xml                                         | 2 +-
 pom.xml                                                | 2 +-
 root/pom.xml                                           | 2 +-
 web-ai/pom.xml                                         | 4 ++--
 web-api/pom.xml                                        | 2 +-
 web-fast/pom.xml                                       | 4 ++--
 web-mini/pom.xml                                       | 2 +-
 web/pom.xml                                            | 2 +-
 18 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index f25a73c4..76e53784 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.12.0.springboot3-SNAPSHOT</version>
+		<version>5.12.1.springboot3-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
diff --git a/modules/app/pom.xml b/modules/app/pom.xml
index 35409142..8eb892ca 100644
--- a/modules/app/pom.xml
+++ b/modules/app/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.12.0.springboot3-SNAPSHOT</version>
+		<version>5.12.1.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
diff --git a/modules/app/src/main/resources/db/upgrade/app/versions b/modules/app/src/main/resources/db/upgrade/app/versions
index e2318df5..00e5430b 100644
--- a/modules/app/src/main/resources/db/upgrade/app/versions
+++ b/modules/app/src/main/resources/db/upgrade/app/versions
@@ -27,4 +27,5 @@
 5.10.1
 5.11.0
 5.11.1
-5.12.0
\ No newline at end of file
+5.12.0
+5.12.1
\ No newline at end of file
diff --git a/modules/cms-ai/pom.xml b/modules/cms-ai/pom.xml
index 5e32ac78..d89cc68d 100644
--- a/modules/cms-ai/pom.xml
+++ b/modules/cms-ai/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.12.0.springboot3-SNAPSHOT</version>
+		<version>5.12.1.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
diff --git a/modules/cms/pom.xml b/modules/cms/pom.xml
index 90d935c0..52baafd7 100644
--- a/modules/cms/pom.xml
+++ b/modules/cms/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.12.0.springboot3-SNAPSHOT</version>
+		<version>5.12.1.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/cms/src/main/resources/db/upgrade/cms/versions b/modules/cms/src/main/resources/db/upgrade/cms/versions
index 10339fe6..e24a7341 100644
--- a/modules/cms/src/main/resources/db/upgrade/cms/versions
+++ b/modules/cms/src/main/resources/db/upgrade/cms/versions
@@ -35,4 +35,5 @@
 5.10.1
 5.11.0
 5.11.1
-5.12.0
\ No newline at end of file
+5.12.0
+5.12.1
\ No newline at end of file
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 51195aee..2899bd22 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.12.0.springboot3-SNAPSHOT</version>
+		<version>5.12.1.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
diff --git a/modules/pom.xml b/modules/pom.xml
index 856c94a9..1c47082e 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -5,7 +5,7 @@
 	
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite-modules</artifactId>
-	<version>5.12.0.springboot3-SNAPSHOT</version>
+	<version>5.12.1.springboot3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>JeeSite Modules</name>
diff --git a/modules/static/pom.xml b/modules/static/pom.xml
index 43068990..c9c0708f 100644
--- a/modules/static/pom.xml
+++ b/modules/static/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.12.0.springboot3-SNAPSHOT</version>
+		<version>5.12.1.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
diff --git a/modules/test/pom.xml b/modules/test/pom.xml
index 440cb5c0..52c0c163 100644
--- a/modules/test/pom.xml
+++ b/modules/test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.12.0.springboot3-SNAPSHOT</version>
+		<version>5.12.1.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
diff --git a/parent/pom.xml b/parent/pom.xml
index 7ae00b8a..6a1ce8cb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite-parent</artifactId>
-	<version>5.12.0.springboot3-SNAPSHOT</version>
+	<version>5.12.1.springboot3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>JeeSite Parent</name>
diff --git a/pom.xml b/pom.xml
index 6dee30f8..e46fe2b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite</artifactId>
-	<version>5.12.0.springboot3-SNAPSHOT</version>
+	<version>5.12.1.springboot3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>JeeSite</name>
diff --git a/root/pom.xml b/root/pom.xml
index 253be7df..24f3fca6 100644
--- a/root/pom.xml
+++ b/root/pom.xml
@@ -5,7 +5,7 @@
 	
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite-root</artifactId>
-	<version>5.12.0.springboot3-SNAPSHOT</version>
+	<version>5.12.1.springboot3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>JeeSite Root</name>
diff --git a/web-ai/pom.xml b/web-ai/pom.xml
index 32f18bb1..d155a637 100644
--- a/web-ai/pom.xml
+++ b/web-ai/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.12.0.springboot3-SNAPSHOT</version>
+		<version>5.12.1.springboot3-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>com.jeesite</groupId>
 			<artifactId>jeesite-vue-dist</artifactId>
-			<version>5.12.0-SNAPSHOT</version>
+			<version>5.12.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- 热部署工具
diff --git a/web-api/pom.xml b/web-api/pom.xml
index cd9c9b1d..075d3e21 100644
--- a/web-api/pom.xml
+++ b/web-api/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.12.0.springboot3-SNAPSHOT</version>
+		<version>5.12.1.springboot3-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
diff --git a/web-fast/pom.xml b/web-fast/pom.xml
index 111194e5..1586a798 100644
--- a/web-fast/pom.xml
+++ b/web-fast/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.12.0.springboot3-SNAPSHOT</version>
+		<version>5.12.1.springboot3-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
@@ -97,7 +97,7 @@
 		<dependency>
 			<groupId>com.jeesite</groupId>
 			<artifactId>jeesite-vue-dist</artifactId>
-			<version>5.12.0-SNAPSHOT</version>
+			<version>5.12.1-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>
diff --git a/web-mini/pom.xml b/web-mini/pom.xml
index 3e1b4530..8de6a91f 100644
--- a/web-mini/pom.xml
+++ b/web-mini/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.12.0.springboot3-SNAPSHOT</version>
+		<version>5.12.1.springboot3-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
diff --git a/web/pom.xml b/web/pom.xml
index d88278a6..ad45495f 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.12.0.springboot3-SNAPSHOT</version>
+		<version>5.12.1.springboot3-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
-- 
Gitee


From 1c5e49b0818037452148e0f8ff69ed04cb8fefdc Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 8 Jul 2025 00:18:52 +0800
Subject: [PATCH 78/84] =?UTF-8?q?=E7=A6=81=E7=94=A8UEditor=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=8A=93=E5=8F=96=E5=99=A8=EF=BC=8C=E5=AF=B9CMS?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E6=9F=A5=E7=9C=8B=E7=9A=84=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E9=99=90=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/cms/utils/FileTempleteUtils.java    | 17 ++++++++++-------
 .../com/jeesite/common/ueditor/ActionEnter.java | 16 ++++++++--------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/utils/FileTempleteUtils.java b/modules/cms/src/main/java/com/jeesite/modules/cms/utils/FileTempleteUtils.java
index 899574b5..31d7114c 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/utils/FileTempleteUtils.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/utils/FileTempleteUtils.java
@@ -4,16 +4,16 @@
  */
 package com.jeesite.modules.cms.utils;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.core.io.Resource;
-
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.collect.SetUtils;
 import com.jeesite.common.io.ResourceUtils;
+import com.jeesite.common.lang.StringUtils;
 import com.jeesite.modules.cms.entity.FileTemplete;
+import org.springframework.core.io.Resource;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 模板文件公共类库
@@ -26,7 +26,10 @@ public class FileTempleteUtils {
 	 * 获取模版文件
 	 * @param fileName
 	 */
-	public static FileTemplete getFileTempleteByResource(String fileName) throws IOException {
+	public static FileTemplete getFileTempleteByResource(String fileName) {
+		if (!StringUtils.startsWith(fileName, "views/modules/cmsfront")) {
+			fileName = "views/modules/cmsfront/themes/default/index.html";
+		}
 		Resource resource = ResourceUtils.getResource(fileName);
 		return new FileTemplete(resource, fileName);
 	}
diff --git a/modules/core/src/main/java/com/jeesite/common/ueditor/ActionEnter.java b/modules/core/src/main/java/com/jeesite/common/ueditor/ActionEnter.java
index d9bee6e4..77fe3843 100644
--- a/modules/core/src/main/java/com/jeesite/common/ueditor/ActionEnter.java
+++ b/modules/core/src/main/java/com/jeesite/common/ueditor/ActionEnter.java
@@ -6,7 +6,6 @@ import com.jeesite.common.ueditor.define.AppInfo;
 import com.jeesite.common.ueditor.define.BaseState;
 import com.jeesite.common.ueditor.define.State;
 import com.jeesite.common.ueditor.hunter.FileManager;
-import com.jeesite.common.ueditor.hunter.ImageHunter;
 import com.jeesite.common.ueditor.upload.Uploader;
 import jakarta.servlet.http.HttpServletRequest;
 
@@ -72,13 +71,14 @@ public class ActionEnter {
                 state = new Uploader(request, conf).doExec();
                 break;
             case ActionMap.CATCH_IMAGE:
-                if (Global.isDemoMode()) {
-                    state = new BaseState(false, "演示模式，不允许操作！");
-                    break;
-                }
-                conf = configManager.getConfig(actionCode);
-                String[] list = this.request.getParameterValues((String) conf.get("fieldName"));
-                state = new ImageHunter(request, conf).capture(list);
+//                if (Global.isDemoMode()) {
+//                    state = new BaseState(false, "演示模式，不允许操作！");
+//                    break;
+//                }
+//                conf = configManager.getConfig(actionCode);
+//                String[] list = this.request.getParameterValues((String) conf.get("fieldName"));
+//                state = new ImageHunter(request, conf).capture(list);
+				state = new BaseState(false, "该功能暂不提供支持");
                 break;
             case ActionMap.LIST_IMAGE:
             case ActionMap.LIST_FILE:
-- 
Gitee


From 3d06b8d009d0267f0255acc87ea19d29d07cedc3 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 8 Jul 2025 00:21:21 +0800
Subject: [PATCH 79/84] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=9A=84=E5=85=81=E8=AE=B8=E9=87=8D=E5=AE=9A=E5=90=91=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=EF=BC=8C=E5=8F=AA=E5=85=81=E8=AE=B8=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/src/main/resources/config/jeesite-core.yml | 2 +-
 web-api/src/main/resources/config/application.yml       | 2 +-
 web/src/main/resources/config/application.yml           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 4cf27824..c752f420 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -510,7 +510,7 @@ shiro:
   #allowReferers: http://127.0.0.1,http://localhost
 
   # 允许重定向的地址，不设置为全部允许，设置this只允许本项目内部跳转，多个用逗号隔开，例如：this,http://*.jeesite.com
-  #allowRedirects: ~
+  allowRedirects: this
   
   # 是否在登录后生成新的Session（默认false）
   isGenerateNewSessionAfterLogin: false
diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml
index 390f0540..1397681f 100644
--- a/web-api/src/main/resources/config/application.yml
+++ b/web-api/src/main/resources/config/application.yml
@@ -693,7 +693,7 @@ shiro:
 #  allowReferers: http://127.0.0.1,http://localhost
 #
 #  # 允许重定向的地址，不设置为全部允许，设置this只允许本项目内部跳转，多个用逗号隔开，例如：this,http://*.jeesite.com
-#  allowRedirects: ~
+#  allowRedirects: this
 #
 #  # 是否在登录后生成新的Session（默认false）
 #  isGenerateNewSessionAfterLogin: false
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 597c86a0..1060eeed 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -693,7 +693,7 @@ shiro:
 #  allowReferers: http://127.0.0.1,http://localhost
 #
 #  # 允许重定向的地址，不设置为全部允许，设置this只允许本项目内部跳转，多个用逗号隔开，例如：this,http://*.jeesite.com
-#  allowRedirects: ~
+#  allowRedirects: this
 #
 #  # 是否在登录后生成新的Session（默认false）
 #  isGenerateNewSessionAfterLogin: false
-- 
Gitee


From 8d62eb25b21d33b65f12d14fe56902d947d78505 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 8 Jul 2025 00:30:49 +0800
Subject: [PATCH 80/84] 5.12.1

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 1779bdd5..2c087c14 100644
--- a/README.md
+++ b/README.md
@@ -114,6 +114,7 @@
 * 内置功能：<https://jeesite.com/docs/function/>
 * 目录结构：<https://jeesite.com/docs/catalog/>
 * 架构特点：<https://jeesite.com/docs/feature/>
+* 参数配置：<https://jeesite.com/docs/config/>
 * 开发规范：<https://jeesite.com/docs/standard/>
 * 代码生成：<https://jeesite.com/docs/code-gen/>
 
-- 
Gitee


From da999aa4e6ff999041132b328efa98ad72365f07 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 9 Jul 2025 11:03:26 +0800
Subject: [PATCH 81/84] =?UTF-8?q?Recover=20=E4=BF=AE=E6=94=B9=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=90=8E=E8=B7=B3=E8=BD=AC=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/views/modules/sys/user/userInfo.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/main/resources/views/modules/sys/user/userInfo.html b/modules/core/src/main/resources/views/modules/sys/user/userInfo.html
index fd92d363..28382e6c 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/userInfo.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/userInfo.html
@@ -313,7 +313,7 @@ $("#inputFormBase").validate({
 		js.ajaxSubmitForm($(form), function(data){
 			js.showMessage(data.message);
 			if(data.result == Global.TRUE){
-				js.window.location = '${ctx}/sys/user/info?op=base';
+				location = '${ctx}/sys/user/info?op=base';
 			}
 		}, "json");
     }
@@ -386,7 +386,7 @@ $("#inputFormPqa").validate({
 		js.ajaxSubmitForm($(form), function(data){
 			js.showMessage(data.message);
 			if(data.result == Global.TRUE){
-				js.window.location = '${ctx}/sys/user/info?op=pqa';
+				location = '${ctx}/sys/user/info?op=pqa';
 			}
 		}, "json");
 		$('#validPassword').val(validPassword);
-- 
Gitee


From 3585737d21fe490ff6948d913fcbd8d99c41fc08 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 9 Jul 2025 13:03:17 +0800
Subject: [PATCH 82/84] =?UTF-8?q?=E5=AE=8C=E5=96=84xss=E6=AD=A3=E5=88=99?=
 =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=EF=BC=8C=E5=A4=84=E7=90=86on?=
 =?UTF-8?q?=E5=89=8D=E9=9D=A2=E6=98=AF/=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9B=E5=AE=8C=E5=96=84beetl=E7=9A=84xss=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8=E9=9D=9E?=
 =?UTF-8?q?html=E6=96=87=E6=9C=AC=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/codec/EncodeUtils.java |  2 +-
 .../jeesite/test/codec/EncodeUtilsTest.java   | 74 +++++++++++--------
 .../views/include/sysIndex/leftMenu.html      |  2 +-
 .../views/include/sysIndex/topMenuUser.html   |  2 +-
 .../views/modules/sys/user/userInfo.html      |  2 +-
 5 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/codec/EncodeUtils.java b/common/src/main/java/com/jeesite/common/codec/EncodeUtils.java
index fb13350b..8f69f0f1 100644
--- a/common/src/main/java/com/jeesite/common/codec/EncodeUtils.java
+++ b/common/src/main/java/com/jeesite/common/codec/EncodeUtils.java
@@ -192,7 +192,7 @@ public class EncodeUtils {
 	private static final List<Pattern> xssPatterns = ListUtils.newArrayList(
 			Pattern.compile("(<\\s*(script|link|style|iframe)([\\s\\S]*?)(>|<\\/\\s*\\1\\s*>))|(</\\s*(script|link|style|iframe)\\s*>)", Pattern.CASE_INSENSITIVE),
 			Pattern.compile("\\s*(href|src)\\s*=\\s*(\"\\s*(javascript|vbscript):[^\"]+\"|'\\s*(javascript|vbscript):[^']+'|(javascript|vbscript):[^\\s]+)\\s*(?=>)", Pattern.CASE_INSENSITIVE),
-			Pattern.compile("\\s*on[a-z]+\\s*=\\s*(\"[^\"]+\"|'[^']+'|[^\\s]+)\\s*(?=>)", Pattern.CASE_INSENSITIVE),
+			Pattern.compile("\\s*/?\\s*on[a-zA-Z]+\\s*=\\s*(['\"]?)(.*?)\\1(?=\\s|>|/>)", Pattern.CASE_INSENSITIVE),
 			Pattern.compile("(eval\\((.*?)\\)|expression\\((.*?)\\))", Pattern.CASE_INSENSITIVE),
 			Pattern.compile("^(javascript:|vbscript:)", Pattern.CASE_INSENSITIVE)
 	);
diff --git a/common/src/test/java/com/jeesite/test/codec/EncodeUtilsTest.java b/common/src/test/java/com/jeesite/test/codec/EncodeUtilsTest.java
index de24d4f0..73039d3f 100644
--- a/common/src/test/java/com/jeesite/test/codec/EncodeUtilsTest.java
+++ b/common/src/test/java/com/jeesite/test/codec/EncodeUtilsTest.java
@@ -14,37 +14,49 @@ import com.jeesite.common.codec.EncodeUtils;
 public class EncodeUtilsTest {
 
 	public static void main(String[] args) {
-		EncodeUtils.xssFilter("1 你好 <script>alert(document.cookie)</script>我还在。");
-		EncodeUtils.xssFilter("2 你好 <strong>加粗文字</strong>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->3 你好 \"><strong>加粗文字</strong>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->4 你好 <iframe src=\"abcdef\"></iframe><strong>加粗文字</strong>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->5 你好 <iframe src=\"abcdef\"/><strong>加粗文字</strong>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->6 你好 <iframe src=\"abcdef\"><strong>加粗文字</strong>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->7 你好 <script type=\"text/javascript\">alert(document.cookie)</script>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->8 你好 <script\n type=\"text/javascript\">\nalert(document.cookie)\n</script>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->9 你好 <script src='' onerror='alert(document.cookie)'></script>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->10 你好 <script type=text/javascript>alert()我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->11 你好 <script>alert(document.cookie)</script>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->12 你好 <script>window.location='url'我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->13 你好 </script></iframe>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->14 你好 eval(abc)我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->15 你好 expression(abc)我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->16 你好 <img src='abc.jpg' onerror='location='';alert(document.cookie);'></img>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->17 你好 <img src='abc.jpg' onerror='alert(document.cookie);'/>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->18 你好 <img src='abc.jpg' onerror='alert(document.cookie);'>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->19 你好 <a onload='alert(\"abc\")'>hello</a>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->20 你好 <a href=\"/abc\">hello</a>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->21 你好 <a href='/abc'>hello</a>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->22 你好 <a href='vbscript:alert(\"abc\");'>hello</a>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->23 你好 <a href='javascript:alert(\"abc\");'>hello</a>我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->24 你好 ?abc=def&hello=123&world={\"a\":1}我还在。");
-		EncodeUtils.xssFilter("<!--HTML-->25 你好 ?abc=def&hello=123&world={'a':1}我还在。");
-		EncodeUtils.sqlFilter("1 你好 select * from xxx where abc=def and 1=1我还在。");
-		EncodeUtils.sqlFilter("2 你好 insert into xxx values(1,2,3,4,5)我还在。");
-		EncodeUtils.sqlFilter("3 你好 delete from xxx我还在。");
-		EncodeUtils.sqlFilter("4 a.audit_result asc,case when 1 like case when length(database())=6 then 1 else exp(111) end then 1 else 1/0 end", "orderBy");
-		EncodeUtils.sqlFilter("5 if(1=2,1,SLEEP(10)), if(mid(database(),{},1)=\\\"{}\\\",a.id,a.login_name)", "orderBy");
-		EncodeUtils.sqlFilter("6 a.audit_result asc, b.audit_result2 desc, b.AuditResult3 desc", "orderBy");
+		int i = 0;
+		xssFilter(i++, "你好 <script>alert(document.cookie)</script>我还在。");
+		xssFilter(i++, "你好 <strong>加粗文字</strong>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 \"><strong>加粗文字</strong>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <iframe src=\"abcdef\"></iframe><strong>加粗文字</strong>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <iframe src=\"abcdef\"/><strong>加粗文字</strong>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <iframe src=\"abcdef\"><strong>加粗文字</strong>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <script type=\"text/javascript\">alert(document.cookie)</script>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <script\n type=\"text/javascript\">\nalert(document.cookie)\n</script>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <script src='' onerror='alert(document.cookie)'></script>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <script type=text/javascript>alert()我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <script>alert(document.cookie)</script>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <script>window.location='url'我还在。");
+		xssFilter(i++, "<!--HTML-->你好 </script></iframe>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 eval(abc)我还在。");
+		xssFilter(i++, "<!--HTML-->你好 expression(abc)我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <img src='abc.jpg' onerror='location='';alert(document.cookie);'></img>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <img src='abc.jpg' onerror='alert(document.cookie);'/>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <img src='abc.jpg' onerror='alert(document.cookie);'>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <a onload='alert(\"abc\")'>hello</a>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <a href=\"/abc\">hello</a>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <a href='/abc'>hello</a>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <a href='vbscript:alert(\"abc\");'>hello</a>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 <a href='javascript:alert(\"abc\");'>hello</a>我还在。");
+		xssFilter(i++, "<!--HTML-->你好 ?abc=def&hello=123&world={\"a\":1}我还在。");
+		xssFilter(i++, "<!--HTML-->你好 ?abc=def&hello=123&world={'a':1}我还在。");
+		xssFilter(i++, "<!--HTML-->\"><svg/ONLOAD=confirm(3) />");
+		sqlFilter(i++, "你好 select * from xxx where abc=def and 1=1我还在。", "common");
+		sqlFilter(i++, "你好 insert into xxx values(1,2,3,4,5)我还在。", "common");
+		sqlFilter(i++, "你好 delete from xxx我还在。", "common");
+		sqlFilter(i++, "a.audit_result asc,case when 1 like case when length(database())=6 then 1 else exp(111) end then 1 else 1/0 end", "orderBy");
+		sqlFilter(i++, "if(1=2,1,SLEEP(10)), if(mid(database(),{},1)=\\\"{}\\\",a.id,a.login_name)", "orderBy");
+		sqlFilter(i++, "a.audit_result asc, b.audit_result2 desc, b.AuditResult3 desc", "orderBy");
+	}
+
+	private static void xssFilter(int num, String text) {
+		String text2 = EncodeUtils.xssFilter(text);
+		System.out.println(num + ". " + text + "\t ==> \t" + text2 + "\t ==> \t" + text.equals(text2));
+	}
+
+	private static void sqlFilter(int num, String text, String source) {
+		String text2 = EncodeUtils.sqlFilter(text, source);
+		System.out.println(num + ". " + text + "\t ==> \t" + text2 + "\t ==> \t" + text.equals(text2));
 	}
 
 }
diff --git a/modules/core/src/main/resources/views/include/sysIndex/leftMenu.html b/modules/core/src/main/resources/views/include/sysIndex/leftMenu.html
index 2935e61a..a56291f2 100644
--- a/modules/core/src/main/resources/views/include/sysIndex/leftMenu.html
+++ b/modules/core/src/main/resources/views/include/sysIndex/leftMenu.html
@@ -6,7 +6,7 @@
 			<script src="${ctxStatic}/modules/sys/leftMenu.js"></script>
 		</div>
 		<div class="pull-left info">
-			<p>${user.userName}</p>
+			<p>${user.userName,xss}</p>
 			<a href="javascript:"><i class="fa fa-circle text-success"></i> ${text('在线')}</a>
 			<a href="${ctx}/logout"><i class="fa fa-sign-out text-danger"></i> ${text('注销')}</a>
 		</div>
diff --git a/modules/core/src/main/resources/views/include/sysIndex/topMenuUser.html b/modules/core/src/main/resources/views/include/sysIndex/topMenuUser.html
index 6971c507..f55ecfd4 100644
--- a/modules/core/src/main/resources/views/include/sysIndex/topMenuUser.html
+++ b/modules/core/src/main/resources/views/include/sysIndex/topMenuUser.html
@@ -1,7 +1,7 @@
 <li class="dropdown user-menu mr5">
 	<a href="javascript:" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
 		<img src="${@user.getAvatarUrl().replaceFirst('/ctxPath', ctxPath)}" class="user-image">
-		<span class="hidden-xs">${user.userName}</span>
+		<span class="hidden-xs">${user.userName,xss}</span>
 	</a>
 	<ul class="dropdown-menu">
 		<li class="mt5">
diff --git a/modules/core/src/main/resources/views/modules/sys/user/userInfo.html b/modules/core/src/main/resources/views/modules/sys/user/userInfo.html
index 28382e6c..2f1069ce 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/userInfo.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/userInfo.html
@@ -23,7 +23,7 @@
 							<div class="box-body box-profile">
 								<img id="avatarImg" class="profile-user-img img-responsive img-circle"
 									src="${@user.getAvatarUrl().replaceFirst('/ctxPath', ctxPath)}?__t=${date().time}">
-								<h3 class="profile-username text-center">${user.userName}</h3>
+								<h3 class="profile-username text-center">${user.userName,xss}</h3>
 								<p class="text-muted text-center">
 									<#form:radio path="sex" dictType="sys_user_sex" class="form-control required"/>
 								</p>
-- 
Gitee


From bc05da3bd2cdc894ea035020329b45a649e7e75c Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 9 Jul 2025 13:37:33 +0800
Subject: [PATCH 83/84] =?UTF-8?q?=E5=AE=8C=E5=96=84beetl=E7=9A=84xss?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E9=9D=9Ehtml=E6=96=87=E6=9C=AC=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/views/include/sysIndex/topMenuOffice.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/core/src/main/resources/views/include/sysIndex/topMenuOffice.html b/modules/core/src/main/resources/views/include/sysIndex/topMenuOffice.html
index fb218aca..62cc2db5 100644
--- a/modules/core/src/main/resources/views/include/sysIndex/topMenuOffice.html
+++ b/modules/core/src/main/resources/views/include/sysIndex/topMenuOffice.html
@@ -1,7 +1,7 @@
 <% if(toBoolean(switchOffice!)){ %>
 <li>
 	<a href="javascript:" id="switchOffice">
-		<i class="fa icon-grid" style="font-size:13px;"></i> ${officeName!}
+		<i class="fa icon-grid" style="font-size:13px;"></i> ${officeName!,xss}
 	</a>
 	<div class="hide"><#form:treeselect id="switchOfficeSelect" title="${text('部门切换')}" allowClear="true"
 		url="${ctx}/sys/empUser/officeListData?isShowCode=true" callbackFuncName="switchOfficeSelectCallback"
-- 
Gitee


From c887260f40b81c62339a9e9f645a79a7d9585ca0 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 10 Jul 2025 10:05:33 +0800
Subject: [PATCH 84/84] update README.md

---
 README.md | 50 ++++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 2c087c14..1f9610de 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,7 @@
 
 ### 本地运行
 
-1. 环境准备：`JDK 17+`、`Maven 3.8+`、使用 `MySQL 5.7 or 8.x` 数据库、[其它数据库](https://jeesite.com/docs/technology/#_8、已支持数据库)
+1. 环境准备：`JDK 17+`、`Maven 3.8+`、使用 `MySQL 8.0+` 数据库、[其它数据库](https://jeesite.com/docs/technology/#_8、已支持数据库)
 2. 下载源码：<https://gitee.com/thinkgem/jeesite5/repository/archive/v5.springboot3.zip> 并解压
 3. 打开文件：`/web/src/main/resources/config/application.yml` 配置JDBC连接（建立一个新库）
 4. 执行脚本：`/web/bin/init-data.bat(sh)` 初始化数据库（自动往新库里创建表和初始数据）
@@ -150,10 +150,11 @@
 6. 浏览器访问：<http://127.0.0.1:8980/js>  账号 system 密码 admin
 7. 部署常见问题：<https://jeesite.com/docs/faq/>
 8. 分离端安装：<https://jeesite.com/docs/vue-install-deploy/>
+9. 分离端常见问题：<https://jeesite.com/docs/vue-faq/>
 
 ### 快速运行
 
-1. 环境准备：`JDK 17+`、`Maven 3.8+`、无需准备数据库（使用内嵌 H2 DB、Vue资源包）
+1. 环境准备：`JDK 17+`、`Maven 3.8+`、无需准备数据库（使用内嵌 H2 DB、包含 Vue 和 全栈双版本）
 2. 下载源码：<https://gitee.com/thinkgem/jeesite5/repository/archive/v5.springboot3.zip> 并解压
 3. 执行脚本：`/web-fast/bin/run-tomcat.bat(sh)` 启动服务即可（无需手动建库，自动初始化数据库）
 4. Vue分离版本地址：<http://127.0.0.1:8980/vue/login>
@@ -173,42 +174,50 @@ docker run --name jeesite-web -p 8980:8980 -d --restart unless-stopped \
     -v ~/:/data thinkgem/jeesite-web && docker logs -f jeesite-web
 ```
 - 浏览器访问：<http://127.0.0.1:8980/js/>  账号 system 密码 admin
-- 分离端安装：<https://jeesite.com/docs/vue-install-deploy/>
 
 ### 开发环境
 
 1. 部署运行文档：<https://jeesite.com/docs/install-deploy/>
 2. 部署常见问题：<https://jeesite.com/docs/faq/>
 3. 分离端运行文档：<https://jeesite.com/docs/vue-install-deploy/>
-4. 分离端常见问题：<https://jeesite.com/docs/vue-jeesite-vue/>
+4. 分离端常见问题：<https://jeesite.com/docs/vue-faq/>
 
 ## 技术文章
 
-* 菜单和按钮权限：<https://jeesite.com/docs/permi-shiro/>
-* 强大的数据权限：<https://jeesite.com/docs/service-datascope/#数据权限>
-* 表结构数据字典：<https://jeesite.com/docs/code-gen/#表结构数据字典>
-* 持久层设计：<https://jeesite.com/docs/dao-mybatis/>
-* 后端工具：<https://jeesite.com/docs/sys-utils/>
+* 库表生成、代码生成：https://jeesite.com/docs/code-gen/>
+* 菜单权限、按钮权限：<https://jeesite.com/docs/permi-shiro/>
+* 数据权限、库事务：<https://jeesite.com/docs/service-datascope/#数据权限>
+* 表结构、数据字典：<https://jeesite.com/docs/code-gen/#表结构数据字典>
+* 持久层框架、SQL：<https://jeesite.com/docs/dao-mybatis/>
+* 后端常用工具：<https://jeesite.com/docs/sys-utils/>
 
 **分离版**
 
+* 版本介绍：<https://jeesite.com/docs/jeesite-vue/>
 * 源码解析：<https://jeesite.com/docs/vue-crud-view/>
 * 表单组件：<https://jeesite.com/docs/vue-basic-form/>
 * 表格组件：<https://jeesite.com/docs/vue-basic-table/>
+* 参数配置：<https://jeesite.com/docs/vue-settings/>
 * 常用组件：<https://jeesite.com/docs/vue-comp/>
+* 前端权限：<https://jeesite.com/docs/vue-auth/>
+* 图标组件：<https://jeesite.com/docs/vue-icon/>
+* 前端样式库：<https://jeesite.com/docs/vue-style/>
+* 多语言国际化：<https://jeesite.com/docs/vue-i18n/>
 
 **经典版**
 
 * 表单组件：<https://jeesite.com/docs/views-beetl/>
 * 表格组件：<https://jeesite.com/docs/datagrid/>
 * 常用工具：<https://jeesite.com/docs/jeesite-js/>
+* 自定义主题：<https://jeesite.com/docs/custom-views/>
 
 ## 专题文章
 
-* 自定义主题：<https://jeesite.com/docs/custom-views/>
-* 国际化多语言：<https://jeesite.com/docs/i18n-locale/>
-* 接口文档：<https://jeesite.com/docs/mobile-rest-api/>
+* 系统接口文档：<https://jeesite.com/docs/mobile-rest-api/>
+* 多语言国际化：<https://jeesite.com/docs/i18n-locale/>
 * BPM工作流引擎：<https://jeesite.com/docs/bpm/>
+* CMS内容管理：<https://jeesite.com/docs/cms/>
+* AI知识库助手：<https://jeesite.com/docs/cms-ai/>
 * 用户类型：<https://jeesite.com/docs/user-type/>
 * 消息推送：<https://jeesite.com/docs/msg-push-use/>
 * 单点登录：<https://jeesite.com/docs/sso-cas/>
@@ -229,20 +238,9 @@ docker run --name jeesite-web -p 8980:8980 -d --restart unless-stopped \
 * Spring Cloud 微服务：<https://jeesite.com/docs/springcloud/>
 * 分布式事务 Seata：<https://jeesite.com/docs/springcloud-seata/>
 * 读写分离、分库分表：<https://jeesite.com/docs/sharding/>
-
-## 前后分离版
-
-* Vue 版介绍：<https://jeesite.com/docs/jeesite-vue/>
-* Vue 安装部署：<https://jeesite.com/docs/vue-install-deploy/>
-* Vue 参数配置：<https://jeesite.com/docs/vue-settings/>
-* Vue 前端权限：<https://jeesite.com/docs/vue-auth/>
-* Vue 源码解析：<https://jeesite.com/docs/vue-crud-view/>
-* Vue 表单组件：<https://jeesite.com/docs/vue-basic-form/>
-* Vue 表格组件：<https://jeesite.com/docs/vue-basic-table/>
-* Vue 常用组件：<https://jeesite.com/docs/vue-comp/>
-* Vue 图标组件：<https://jeesite.com/docs/vue-icon/>
-* Vue 国际化多语言：<https://jeesite.com/docs/vue-i18n/>
-* Vue 样式库：<https://jeesite.com/docs/vue-style/>
+* 监控系统集成：<https://jeesite.com/docs/webadmin/>
+* 追踪系统集成：<https://jeesite.com/docs/skywalking/>
+* ELK日志收集：<https://jeesite.com/docs/elk-log/>
 
 ## 授权协议声明
 
-- 
Gitee