5.10.0

update import icon
2025
2024-12-31 21:04:15 +08:00 · 2024-12-31 21:04:15 +08:00 · 2024-12-30 14:56:56 +08:00 · 2024-12-29 16:43:20 +08:00 · 2024-12-26 11:42:58 +08:00 · 2024-12-25 16:20:46 +08:00
49 changed files with 152 additions and 86 deletions
--- a/README.md
+++ b/README.md
@@ -4,10 +4,13 @@
 </p>
 <h3 align="center" style="margin:30px 0 30px;font-weight:bold;font-size:30px;">快速开发平台 - Spring Boot</h3>
 <p align="center">
+ <a href="https://spring.io/projects/spring-boot" target="__blank"><img alt="SpringBoot-2.7/3.3" src="https://img.shields.io/badge/SpringBoot-V2.7/3.4-blue.svg"></a>
+ <a href="https://v3.cn.vuejs.org/" target="__blank"><img alt="TypeScript-Vue3" src="https://img.shields.io/badge/TypeScript-Vue3-green.svg"></a>
 <a href="https://jeesite.com/docs/upgrade/" target="__blank"><img alt="JeeSite-5.9" src="https://img.shields.io/badge/JeeSite-V5.9-success.svg"></a>
- <a href="https://spring.io/projects/spring-boot#learn" target="__blank"><img alt="SpringBoot-2.7/3.2" src="https://img.shields.io/badge/SpringBoot-2.7/3.2-blue.svg"></a>
- <a href="https://gitee.com/thinkgem/jeesite5/stargazers" target="__blank"><img alt="star" src="https://gitee.com/thinkgem/jeesite5/badge/star.svg?theme=dark"></a>
- <a href="https://gitee.com/thinkgem/jeesite-vue/stargazers" target="__blank"><img alt="star" src="https://gitee.com/thinkgem/jeesite-vue/badge/star.svg?theme=dark"></a>
+ <a href="https://gitee.com/thinkgem/jeesite5" target="__blank"><img alt="star" src="https://gitee.com/thinkgem/jeesite5/badge/star.svg?theme=dark"></a>
+ <a href="https://gitee.com/thinkgem/jeesite-vue" target="__blank"><img alt="star" src="https://gitee.com/thinkgem/jeesite-vue/badge/star.svg?theme=dark"></a>
+ <a href="https://gitee.com/thinkgem/jeesite" target="__blank"><img alt="star" src="https://gitee.com/thinkgem/jeesite/badge/star.svg?theme=gvp"></a>
+ <a href="https://gitcode.com/thinkgem/jeesite" target="__blank"><img alt="star" src="https://gitcode.com/thinkgem/jeesite/star/badge.svg"></a> 
 </p>

 ------
@@ -24,20 +27,32 @@
 * 使用文档：<https://jeesite.com/docs>
 * 问题反馈：<http://jeesite.net> [【新手必读】](https://gitee.com/thinkgem/jeesite5/issues/I18ARR)
 * 需求收集：<https://gitee.com/thinkgem/jeesite5/issues/new>
-* QQ 群：`127515876`、`209330483`、`223507718`、`709534275`、`730390092`、`1373527`、`183903863(外包)`
-* 微信群：添加客服微信 <http://s.jeesite.com> 邀请您进群
+* 联系我们：<http://s.jeesite.com>
 * 关注微信公众号，了解最新动态：

 <p style="padding-left:40px">　　
 <img alt="JeeSite微信公众号" src="https://jeesite.com/assets/images/mp.png" width="200">
 </p>

-* 源码仓库地址1：<https://gitee.com/thinkgem/jeesite5>
-* 源码仓库地址2：<https://github.com/thinkgem/jeesite5>
-* 源码仓库地址3：<https://gitcode.com/thinkgem/jeesite5>
-* 分离版前端源码仓库地址1：<https://gitee.com/thinkgem/jeesite-vue>
-* 分离版前端源码仓库地址2：<https://github.com/thinkgem/jeesite-vue>
-* 分离版前端源码仓库地址3：<https://gitcode.com/thinkgem/jeesite-vue>
+* QQ 群：`127515876`、`209330483`、`223507718`、`709534275`、`730390092`、`1373527`、`183903863(外包)`
+* 微信群：如果无法进入，可添加客服微信 jeesitex 邀请您进群
+
+<p style="padding-left:40px">　　
+ <img alt="JeeSite微信群" src="https://jeesite.com/assets/images/wxg_cur.png" width="200"/>
+</p>
+
+* 源码仓库地址：
+  [Gitee](https://gitee.com/thinkgem/jeesite5)、
+  [GitCode](https://gitcode.com/thinkgem/jeesite5)、
+  [GitHub](https://github.com/thinkgem/jeesite5)
+* 分离版源码仓库地址：
+  [Gitee](https://gitee.com/thinkgem/jeesite-vue)、
+  [GitCode](https://gitcode.com/thinkgem/jeesite-vue)、
+  [GitHub](https://github.com/thinkgem/jeesite-vue)
+* 源码合集仓库地址：
+  [GVP](https://gitee.com/thinkgem/jeesite/tree/v5.springboot3)、
+  [G-Star](https://gitcode.com/thinkgem/jeesite/overview?ref=v5.springboot3)、
+  [GitHub](https://github.com/thinkgem/jeesite/tree/v5.springboot3)

 ## 平台介绍

@@ -86,7 +101,7 @@
 * 前端组件：jQuery 3.7、jqGrid 4.7、layer 3.5、zTree 3.5、jQuery Validation
 * 分离前端版：Node.js、TypeScript、Vue3、Vite、Ant Design Vue、Vue Vben Admin
 * 工作流引擎：Flowable 6.6、符合 BPMN 规范、在线流程设计器、中国式流程、退回、撤回、自由流
-* Bootstrap 版 支持 IE9 及以上版本及其他所有现代浏览器，如：谷歌、火狐、国产浏览器 等
+* Bootstrap 版 支持 IE10 及以上版本及其他所有现代浏览器，如：谷歌、火狐、国产浏览器 等
 * Vue3 版 支持现代浏览器，如：谷歌 Chrome 86+、火狐、国产浏览器 等
 * 技术选型（详细）：<http://jeesite.com/docs/technology/>
 * JeeSite Vue 版本：<https://gitee.com/thinkgem/jeesite-vue>
@@ -228,10 +243,10 @@ docker run --name jeesite-web -p 8980:8980 -d --restart unless-stopped \
 7. 本项目已申请软件著作权，请尊重开源，感谢阅读。
 8. 无用户数限制，无在线人数限制，放心使用。

-## 技术服务与支持
+## 技术支持与服务

 * 没有资金的支撑就很难得到发展，特别是一个好的产品，如果 JeeSite 帮助了您，请为我们点赞。支持我们，您可以获得更多回馈，我们会把公益事业做的更好，开放更多资源，回报社区和社会。请给我们一些动力吧，在此非常感谢已支持我们的朋友！
-* **联系我们**：请访问技术支持服务页面：<https://jeesite.com/docs/support/> 
+* **联系我们**：请访问技术支持与服务页面：<http://s.jeesite.com> 

 ## 今后如何升级？

--- a/common/pom.xml
+++ b/common/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.9.2-SNAPSHOT</version>
+		<version>5.10.0-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
--- a/common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java
+++ b/common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java
@@ -77,7 +77,6 @@ public class ReflectUtils {
 							//Method method = getAccessibleMethodByName(object, methodName, 0);
 							//if (method == null) { return; }
 							//Class<?> returnType = method.getReturnType();
-							System.out.println(object.getClass());
 							MethodAccess ma = MethodAccess.get(object.getClass());
 							Class<?> returnType = ma.getReturnTypes()[ma.getIndex(methodName)];
 							childObj = returnType.getDeclaredConstructor().newInstance();
--- a/common/src/main/java/com/jeesite/common/utils/excel/fieldtype/BigDecimalType.java
+++ b/common/src/main/java/com/jeesite/common/utils/excel/fieldtype/BigDecimalType.java
@@ -0,0 +1,44 @@
+/**
+ * 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.excel.fieldtype;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+
+
+/**
+ * BigDecimal类型转换
+ * @author ThinkGem
+ * @version 2020-3-5
+ * @example fieldType = BigDecimalType.class
+ */
+public class BigDecimalType implements FieldType {
+	
+	/**
+	 * 获取对象值（导入）
+	 */
+	@Override
+	public Object getValue(String val) {
+		return new BigDecimal(val);
+	}
+
+	/**
+	 * 获取对象值（导出）
+	 */
+	@Override
+	public String setValue(Object val) {
+		return val == null ? StringUtils.EMPTY : val.toString();
+	}
+	
+	/**
+	 * 获取对象值格式（导出）
+	 */
+	@Override
+	public String getDataFormat() {
+		return "0.00";
+	}
+	
+}
--- 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.9.2-SNAPSHOT</version>
+		<version>5.10.0-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
--- a/modules/app/src/main/resources/db/upgrade/app/versions
+++ b/modules/app/src/main/resources/db/upgrade/app/versions
@@ -22,4 +22,5 @@
 5.8.1
 5.9.0
 5.9.1
-5.9.2
+5.9.2
+5.10.0
--- 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.9.2-SNAPSHOT</version>
+		<version>5.10.0-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>

--- a/modules/cms/src/main/resources/db/upgrade/cms/versions
+++ b/modules/cms/src/main/resources/db/upgrade/cms/versions
@@ -30,4 +30,5 @@
 5.8.1
 5.9.0
 5.9.1
-5.9.2
+5.9.2
+5.10.0
--- 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.9.2-SNAPSHOT</version>
+		<version>5.10.0-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
--- a/modules/core/src/main/java/com/jeesite/modules/file/web/FileUploadController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/file/web/FileUploadController.java
@@ -35,7 +35,7 @@ public class FileUploadController extends BaseController {

 	@Autowired
 	private FileUploadService fileUploadService;
-
+	
 	/**
 	 * 上传文件参数
 	 */
@@ -53,7 +53,7 @@ public class FileUploadController extends BaseController {
 		model.put("imageMaxHeight", Global.getConfigToInteger("file.imageMaxHeight", "768"));
 		return model;
 	}
-
+	
 	/**
 	 * 上传文件
 	 */
@@ -62,14 +62,14 @@ public class FileUploadController extends BaseController {
 	public Map<String, Object> uploadFile(FileUploadParams params) {
 		return fileUploadService.uploadFile(new FileUpload(), params);
 	}
-
+	
 	/**
 	 * 下载文件
 	 */
 	@RequestMapping(value = "/download/{fileUploadId}")
 	public String downloadFile(@PathVariable("fileUploadId") String fileUploadId, String preview, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 		FileUpload fileUpload = fileUploadService.getFile(new FileUpload(fileUploadId));
-		return fileUploadService.downloadFile(fileUpload, preview, request, response);
+		return fileUploadService.downloadFile(fileUpload, preview, "file", request, response);
 	}

 	/**
--- a/modules/core/src/main/java/com/jeesite/modules/file/web/UserfilesController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/file/web/UserfilesController.java
@@ -33,7 +33,7 @@ import java.io.IOException;
 public class UserfilesController extends BaseController {

 	@RequestMapping(value="/userfiles/**")
-	public String fileStreamDown(HttpServletRequest request, HttpServletResponse response)
+	public String fileStreamDown(HttpServletRequest request, HttpServletResponse response) 
 			throws ServletException, IOException {

 		// 获取相对文件地址
@@ -49,7 +49,8 @@ public class UserfilesController extends BaseController {
 			String uid = request.getParameter("uid");
 			if (StringUtils.isNotBlank(url) && StringUtils.isNotBlank(uid)){
 				fileUrl = url; //EncodeUtils.decodeUrl(url); 不用解码，否则腾讯云存储的时候预览不能显示
-				fileUri = Global.getCtxPath() + Global.getAdminPath() + "/file/download/" + uid;
+				String type = StringUtils.defaultIfBlank(request.getParameter("type"), "file");
+				fileUri = Global.getCtxPath() + Global.getAdminPath() + "/" + type + "/download/" + uid;
 				filePath = fileName;
 			} else if (StringUtils.isNotBlank(fileName)){
 				fileUri += "?fileName=" + EncodeUtils.encodeUrl(fileName);
--- a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
--- a/modules/core/src/main/resources/config/beetl-core.properties
+++ b/modules/core/src/main/resources/config/beetl-core.properties
@@ -140,7 +140,7 @@ FTC.java.util.concurrent.atomic.AtomicInteger = com.jeesite.common.beetl.ext.for
 ## 标签类
 TAG.include= org.beetl.ext.tag.IncludeTag
 TAG.includeFileTemplate= org.beetl.ext.tag.IncludeTag
-TAG.incdlueJSP= org.beetl.ext.jsp.IncludeJSPTag
+#TAG.includeJSP= org.beetl.ext.jsp.IncludeJSPTag
 TAG.layout= org.beetl.ext.tag.LayoutTag
 TAG.delete= org.beetl.ext.tag.DeleteTag
 #TAG.htmltag= org.beetl.ext.tag.HTMLTagSupportWrapper
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -179,10 +179,10 @@ user:
  dataScopes: >
    [{
      moduleCode: "core",
-      ctrlPermi: "0",
      ctrlName: "机构权限",
      ctrlName_en: "Office",
      ctrlType: "Office",
+      ctrlPermi: "0",
      ctrlDataUrl: "/sys/office/treeData",
      chkboxType: {"Y":"ps","N":"ps"},
      expandLevel: -1,
@@ -197,6 +197,16 @@ user:
      chkboxType: {"Y":"ps","N":"ps"},
      expandLevel: -1,
      remarks: ""
+    },{
+      moduleCode: "core",
+      ctrlName: "用户权限",
+      ctrlName_en: "User",
+      ctrlType: "User",
+      ctrlPermi: "3",
+      ctrlDataUrl: "/sys/office/treeData?isLoadUser=true",
+      chkboxType: {"Y":"s","N":"s"},
+      expandLevel: -1,
+      remarks: ""
    },{
      moduleCode: "core",
      ctrlName: "角色权限",
--- a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
+++ b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
@@ -388,7 +388,6 @@
 本部门数据=Current organization data
 本公司数据=Current company data
 本部门和本公司数据=Current organization and company data
-控制业务范围=Business scope

 新增角色=New role
 编辑角色=Edit role
--- 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
@@ -312,7 +312,6 @@
 本部门数据=本省庁データ
 本公司数据=当社のデータ
 本部门和本公司数据=本省庁と自社のデータ
-控制业务范围=業務の範囲を制御する

 新增角色=新規役
 编辑角色=編集役
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
@@ -33,7 +33,7 @@
          <Icon icon="i-ant-design:download-outlined" /> {{ t('导出') }}
        </a-button>
        <a-button type="default" @click="handleImport()">
-          <Icon icon="i-ant-design:upload-outlined" /> {{ t('导入') }}
+          <Icon icon="i-ant-design:import-outlined" /> {{ t('导入') }}
        </a-button>
        <% } %>
        <a-button type="primary" @click="handleForm({})" v-auth="'${permissionPrefix}:edit'">
--- a/modules/core/src/main/resources/views/htmltags/form/fileupload.html
+++ b/modules/core/src/main/resources/views/htmltags/form/fileupload.html
@@ -81,7 +81,7 @@ if (p.dataMap){
 %>
 <div id="${p.id}_wup" class="wup_container ${p.isMini?'mini':''}">
 	<% if(isNotBlank(p.bizType)){ %>
-	<input id="${p.id}" name="${p.name}" value="" class="wup_input ${p.uploadType} ${p.class}" data-msg-required="${p.dataMsgRequired}"/>
+	<input id="${p.id}" name="${p.name}" value="" autocomplete="off" class="wup_input ${p.uploadType} ${p.class}" data-msg-required="${p.dataMsgRequired}"/>
 	<input id="${p.id}__del" name="${p.nameDel}" value="" type="hidden"/>
 	<% } %>
 	<div class="area">
--- a/modules/core/src/main/resources/views/modules/sys/roleFormAuthDataScope.html
+++ b/modules/core/src/main/resources/views/modules/sys/roleFormAuthDataScope.html
@@ -17,7 +17,7 @@
 					<div class="col-xs-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
-								<span class="required ">*</span> ${text('角色名称')}：<i class="fa icon-question hide"></i></label>
+								<span class="required hide">*</span> ${text('角色名称')}：<i class="fa icon-question hide"></i></label>
 							<div class="col-sm-8">
 								<#form:hidden name="oldRoleName" value="${role.roleName}"/>
 								<#form:input path="roleName" maxlength="100" readonly="true" class="form-control required "/>
@@ -27,7 +27,7 @@
 					<div class="col-xs-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
-								<span class="required ">*</span> ${text('角色编码')}：<i class="fa icon-question hide"></i></label>
+								<span class="required hide">*</span> ${text('角色编码')}：<i class="fa icon-question hide"></i></label>
 							<div class="col-sm-8">
 								<#form:hidden path="isNewRecord"/>
 								<#form:hidden path="roleCode"/>
@@ -40,7 +40,7 @@
 					<div class="col-xs-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="${text('指定数据权限范围类型，多个角色同时指定，之间为或者关系')}">
-								<span class="required ">*</span> ${text('数据范围')}：<i class="fa icon-question "></i></label>
+								<span class="required hide">*</span> ${text('数据范围')}：<i class="fa icon-question "></i></label>
 							<div class="col-sm-10">
 								<#form:radio path="dataScope" dictType="sys_role_data_scope" class="form-control required " />
 							</div>
@@ -51,7 +51,7 @@
 					<div class="col-xs-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="${text('在 addFilter 权限过滤的时候指定适应的业务范围，不指定代表所有生效，如：有的功能看本部门，有的功能看本公司；新的业务范围从字典 sys_role_biz_scope 类型添加。')}">
-								<span class="required hide">*</span> ${text('控制业务范围')}：<i class="fa icon-question "></i></label>
+								<span class="required hide">*</span> ${text('业务范围')}：<i class="fa icon-question "></i></label>
 							<div class="col-sm-10">
 								<#form:select path="bizScope" dictType="sys_role_biz_scope" class="form-control " multiple="true"/>
 							</div>
--- a/modules/core/src/test/resources/application.yml
+++ b/modules/core/src/test/resources/application.yml
@@ -4,8 +4,8 @@ productName: JeeSite Demo
 companyName: ThinkGem

 # 产品版本、版权年份
-productVersion: V5.9
-copyrightYear: 2024
+productVersion: V5.10
+copyrightYear: 2025

 # 数据库连接
 jdbc: 
@@ -13,7 +13,7 @@ jdbc:
  # Mysql 数据库配置
  type: mysql
  driver: com.mysql.cj.jdbc.Driver
-  url: jdbc:mysql://127.0.0.1:3306/jeesite_v5?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
+  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
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -5,7 +5,7 @@
 	
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite-modules</artifactId>
-	<version>5.9.2-SNAPSHOT</version>
+	<version>5.10.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>JeeSite Modules</name>
--- 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.9.2-SNAPSHOT</version>
+		<version>5.10.0-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
--- 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.9.2-SNAPSHOT</version>
+		<version>5.10.0-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -12,7 +12,7 @@

 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite-parent</artifactId>
-	<version>5.9.2-SNAPSHOT</version>
+	<version>5.10.0-SNAPSHOT</version>
 	<packaging>pom</packaging>

 	<name>JeeSite Parent</name>
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite</artifactId>
-	<version>5.9.2-SNAPSHOT</version>
+	<version>5.10.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>JeeSite</name>
--- a/root/pom.xml
+++ b/root/pom.xml
@@ -5,7 +5,7 @@
 	
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite-root</artifactId>
-	<version>5.9.2-SNAPSHOT</version>
+	<version>5.10.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>JeeSite Root</name>
--- a/web-api/bin/docker/Dockerfile
+++ b/web-api/bin/docker/Dockerfile
@@ -18,4 +18,4 @@ ENTRYPOINT jar -xvf app.war && rm app.war && cd WEB-INF && sh startup.sh

 EXPOSE 8980

-#docker run -p 8980:8980 thinkgem/jeesite-web:5.3
+#docker run -p 8980:8980 thinkgem/jeesite-web:5.10
--- a/web-api/bin/init-data.bat
+++ b/web-api/bin/init-data.bat
@@ -10,7 +10,7 @@ echo [
 echo.
 echo [<5B><>Ϣ] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD>״ΰ<D7B4>װ JeeSite <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>װ Module <20><><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><DDB1><EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3><EFBFBD>Ѱ<EFBFBD>װ<EFBFBD><D7B0><EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD>ԡ<EFBFBD>
 echo.
-echo [<5B><>Ϣ] <20><EFBFBD> v4.2 <20>汾<EFBFBD>Ժ󣬹ٷ<F3A3ACB9><D9B7><EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><EFBFBD>ǱȽϰ<EFBFBD>ȫ<EFBFBD>ģ<EFBFBD><EFBFBD>ٷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>в<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>κ<EFBFBD>ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵĽű<EFBFBD><EFBFBD><EFBFBD>
+echo [<5B><>Ϣ] <20>ٷ<EFBFBD>Ĭ<EFBFBD><EFBFBD><EFBFBD>ṩ<EFBFBD>ĳ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ⹤<EFBFBD><EFBFBD><EFBFBD>ǱȽϰ<EFBFBD>ȫ<EFBFBD>ģ<EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>а<EFBFBD><EFBFBD><EFBFBD>ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵĽű<EFBFBD><EFBFBD><EFBFBD>
 echo.
 echo [<5B><>Ϣ] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ð汾<C3B0><E6B1BE><EFBFBD><EFBFBD><EFBFBD>ų<EFBFBD><C5B3><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>ȫ<EFBFBD><C8AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȱ<EFBFBD><C8B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD>ٲ<EFBFBD><D9B2><EFBFBD><EFBFBD><EFBFBD>
 echo.
--- a/web-api/bin/init-data.sh
+++ b/web-api/bin/init-data.sh
@@ -11,7 +11,7 @@ echo "[信息] 初始化数据库。"
 echo ""
 echo "[信息] 本操作主要用于首次安装 JeeSite 或后安装 Module 的数据表初始化，若模块已安装会自动忽略。"
 echo ""
-echo "[信息] 在 v4.2 版本以后，官方初始化数据库是比较安全的，官方代码中不会包含任何删除数据表及数据的脚本。"
+echo "[信息] 官方默认提供的初始化数据库工具是比较安全的，她没有包含删除您的业务数据表及数据的脚本。"
 echo ""
 echo "[信息] 如果你是升级到该版本，不排除你是否升级完整，为安全起见，建议先备份数据库后再操作。"
 echo ""
--- 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.9.2-SNAPSHOT</version>
+		<version>5.10.0-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
--- a/web-api/src/main/resources/config/application-prod.yml
+++ b/web-api/src/main/resources/config/application-prod.yml
@@ -13,7 +13,7 @@ jdbc:
  # Mysql 数据库配置
  type: mysql
  driver: com.mysql.cj.jdbc.Driver
-  url: jdbc:mysql://192.168.56.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
+  url: jdbc:mysql://192.168.56.1:3306/jeesite?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
  username: jeesite
  password: jeesite
  testSql: SELECT 1
--- a/web-api/src/main/resources/config/application.yml
+++ b/web-api/src/main/resources/config/application.yml
@@ -8,8 +8,8 @@ productName: JeeSite Demo
 companyName: ThinkGem

 # 产品版本、版权年份
-productVersion: V5.9
-copyrightYear: 2024
+productVersion: V5.10
+copyrightYear: 2025

 # 是否演示模式
 demoMode: false
@@ -54,7 +54,7 @@ jdbc:
  # Mysql 数据库配置
  type: mysql
  driver: com.mysql.cj.jdbc.Driver
-  url: jdbc:mysql://127.0.0.1:3306/jeesite_v5?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+  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&nullCatalogMeansCurrent=true
  username: root
  password: 123456
  testSql: SELECT 1
@@ -170,7 +170,7 @@ jdbc:
 #  ds_read_01:
 #    type: mysql
 #    driver: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://127.0.0.1:3306/jeesite_test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://127.0.0.1:3306/jeesite_test?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: 123456
 #    testSql: SELECT 1
@@ -183,7 +183,7 @@ jdbc:
 #  ds_read_02:
 #    type: mysql
 #    driver: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://127.0.0.1:3306/jeesite_test2?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://127.0.0.1:3306/jeesite_test2?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: 123456
 #    testSql: SELECT 1
@@ -199,7 +199,7 @@ jdbc:
 #  ds2:
 #    type: mysql
 #    driver: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://127.0.0.1:3306/jeesite2?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://127.0.0.1:3306/jeesite2?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: 123456
 #    testSql: SELECT 1
--- a/web-fast/bin/init-data.bat
+++ b/web-fast/bin/init-data.bat
@@ -10,7 +10,7 @@ echo [
 echo.
 echo [<5B><>Ϣ] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD>״ΰ<D7B4>װ JeeSite <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>װ Module <20><><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><DDB1><EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3><EFBFBD>Ѱ<EFBFBD>װ<EFBFBD><D7B0><EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD>ԡ<EFBFBD>
 echo.
-echo [<5B><>Ϣ] <20><EFBFBD> v4.2 <20>汾<EFBFBD>Ժ󣬹ٷ<F3A3ACB9><D9B7><EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><EFBFBD>ǱȽϰ<EFBFBD>ȫ<EFBFBD>ģ<EFBFBD><EFBFBD>ٷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>в<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>κ<EFBFBD>ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵĽű<EFBFBD><EFBFBD><EFBFBD>
+echo [<5B><>Ϣ] <20>ٷ<EFBFBD>Ĭ<EFBFBD><EFBFBD><EFBFBD>ṩ<EFBFBD>ĳ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ⹤<EFBFBD><EFBFBD><EFBFBD>ǱȽϰ<EFBFBD>ȫ<EFBFBD>ģ<EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>а<EFBFBD><EFBFBD><EFBFBD>ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵĽű<EFBFBD><EFBFBD><EFBFBD>
 echo.
 echo [<5B><>Ϣ] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ð汾<C3B0><E6B1BE><EFBFBD><EFBFBD><EFBFBD>ų<EFBFBD><C5B3><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>ȫ<EFBFBD><C8AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȱ<EFBFBD><C8B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD>ٲ<EFBFBD><D9B2><EFBFBD><EFBFBD><EFBFBD>
 echo.
--- a/web-fast/bin/init-data.sh
+++ b/web-fast/bin/init-data.sh
@@ -11,7 +11,7 @@ echo "[信息] 初始化数据库。"
 echo ""
 echo "[信息] 本操作主要用于首次安装 JeeSite 或后安装 Module 的数据表初始化，若模块已安装会自动忽略。"
 echo ""
-echo "[信息] 在 v4.2 版本以后，官方初始化数据库是比较安全的，官方代码中不会包含任何删除数据表及数据的脚本。"
+echo "[信息] 官方默认提供的初始化数据库工具是比较安全的，她没有包含删除您的业务数据表及数据的脚本。"
 echo ""
 echo "[信息] 如果你是升级到该版本，不排除你是否升级完整，为安全起见，建议先备份数据库后再操作。"
 echo ""
--- 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.9.2-SNAPSHOT</version>
+		<version>5.10.0-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
@@ -97,7 +97,7 @@
 		<dependency>
 			<groupId>com.jeesite</groupId>
 			<artifactId>jeesite-vue-dist</artifactId>
-			<version>${project.parent.version}</version>
+			<version>5.10.0-SNAPSHOT</version>
 		</dependency>

 	</dependencies>
--- a/web-fast/src/main/resources/config/application.yml
+++ b/web-fast/src/main/resources/config/application.yml
@@ -8,8 +8,8 @@ productName: JeeSite Demo
 companyName: ThinkGem

 # 产品版本、版权年份
-productVersion: V5.9
-copyrightYear: 2024
+productVersion: V5.10
+copyrightYear: 2025

 # 是否演示模式
 demoMode: false
@@ -149,9 +149,6 @@ shiro:
  #  defaultPath: ${shiro.loginUrl}
  defaultPath: ${vuePath}/login

-  # Vue 资源文件路径，与 VITE_PUBLIC_PATH 一致
-  vuePath: /vue
-
  # 登录相关设置
  loginUrl: ${adminPath}/login
  logoutUrl: ${shiro.loginUrl}
--- a/web-mini/bin/docker/Dockerfile
+++ b/web-mini/bin/docker/Dockerfile
@@ -18,4 +18,4 @@ ENTRYPOINT jar -xvf app.war && rm app.war && cd WEB-INF && sh startup.sh

 EXPOSE 8980

-#docker run -p 8980:8980 thinkgem/jeesite-web:5.3
+#docker run -p 8980:8980 thinkgem/jeesite-web:5.10
--- a/web-mini/bin/init-data.bat
+++ b/web-mini/bin/init-data.bat
@@ -10,7 +10,7 @@ echo [
 echo.
 echo [<5B><>Ϣ] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD>״ΰ<D7B4>װ JeeSite <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>װ Module <20><><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><DDB1><EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3><EFBFBD>Ѱ<EFBFBD>װ<EFBFBD><D7B0><EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD>ԡ<EFBFBD>
 echo.
-echo [<5B><>Ϣ] <20><EFBFBD> v4.2 <20>汾<EFBFBD>Ժ󣬹ٷ<F3A3ACB9><D9B7><EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><EFBFBD>ǱȽϰ<EFBFBD>ȫ<EFBFBD>ģ<EFBFBD><EFBFBD>ٷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>в<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>κ<EFBFBD>ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵĽű<EFBFBD><EFBFBD><EFBFBD>
+echo [<5B><>Ϣ] <20>ٷ<EFBFBD>Ĭ<EFBFBD><EFBFBD><EFBFBD>ṩ<EFBFBD>ĳ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ⹤<EFBFBD><EFBFBD><EFBFBD>ǱȽϰ<EFBFBD>ȫ<EFBFBD>ģ<EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>а<EFBFBD><EFBFBD><EFBFBD>ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵĽű<EFBFBD><EFBFBD><EFBFBD>
 echo.
 echo [<5B><>Ϣ] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ð汾<C3B0><E6B1BE><EFBFBD><EFBFBD><EFBFBD>ų<EFBFBD><C5B3><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>ȫ<EFBFBD><C8AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȱ<EFBFBD><C8B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD>ٲ<EFBFBD><D9B2><EFBFBD><EFBFBD><EFBFBD>
 echo.
--- a/web-mini/bin/init-data.sh
+++ b/web-mini/bin/init-data.sh
@@ -11,7 +11,7 @@ echo "[信息] 初始化数据库。"
 echo ""
 echo "[信息] 本操作主要用于首次安装 JeeSite 或后安装 Module 的数据表初始化，若模块已安装会自动忽略。"
 echo ""
-echo "[信息] 在 v4.2 版本以后，官方初始化数据库是比较安全的，官方代码中不会包含任何删除数据表及数据的脚本。"
+echo "[信息] 官方默认提供的初始化数据库工具是比较安全的，她没有包含删除您的业务数据表及数据的脚本。"
 echo ""
 echo "[信息] 如果你是升级到该版本，不排除你是否升级完整，为安全起见，建议先备份数据库后再操作。"
 echo ""
--- 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.9.2-SNAPSHOT</version>
+		<version>5.10.0-SNAPSHOT</version>
 		<relativePath>../../jeesite/parent/pom.xml</relativePath>
 	</parent>
 	
--- a/web-mini/src/main/resources/config/application-prod.yml
+++ b/web-mini/src/main/resources/config/application-prod.yml
@@ -21,7 +21,7 @@ jdbc:
  # Mysql 数据库配置
  type: mysql
  driver: com.mysql.cj.jdbc.Driver
-  url: jdbc:mysql://192.168.56.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
+  url: jdbc:mysql://192.168.56.1:3306/jeesite?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
  username: jeesite
  password: jeesite
  testSql: SELECT 1
--- a/web-mini/src/main/resources/config/application.yml
+++ b/web-mini/src/main/resources/config/application.yml
@@ -8,8 +8,8 @@ productName: JeeSite Demo
 companyName: ThinkGem

 # 产品版本、版权年份
-productVersion: V5.9
-copyrightYear: 2024
+productVersion: V5.10
+copyrightYear: 2025

 # 是否演示模式
 demoMode: false
@@ -57,7 +57,7 @@ jdbc:
 #  # Mysql 数据库配置
 #  type: mysql
 #  driver: com.mysql.cj.jdbc.Driver
-#  url: jdbc:mysql://127.0.0.1:3306/jeesite_v5?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
+#  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
--- a/web-mini/src/main/resources/config/beetl-core.properties
+++ b/web-mini/src/main/resources/config/beetl-core.properties
@@ -136,7 +136,7 @@ FTC.java.util.concurrent.atomic.AtomicInteger = com.jeesite.common.beetl.ext.for
 ## 标签类
 TAG.include= org.beetl.ext.tag.IncludeTag
 TAG.includeFileTemplate= org.beetl.ext.tag.IncludeTag
-TAG.incdlueJSP= org.beetl.ext.jsp.IncludeJSPTag
+#TAG.includeJSP= org.beetl.ext.jsp.IncludeJSPTag
 TAG.layout= org.beetl.ext.tag.LayoutTag
 TAG.delete= org.beetl.ext.tag.DeleteTag
 #TAG.htmltag= org.beetl.ext.tag.HTMLTagSupportWrapper
--- a/web/bin/docker/Dockerfile
+++ b/web/bin/docker/Dockerfile
@@ -18,4 +18,4 @@ ENTRYPOINT jar -xvf app.war && rm app.war && cd WEB-INF && sh startup.sh

 EXPOSE 8980

-#docker run -p 8980:8980 thinkgem/jeesite-web:5.3
+#docker run -p 8980:8980 thinkgem/jeesite-web:5.10
--- a/web/bin/init-data.bat
+++ b/web/bin/init-data.bat
@@ -10,7 +10,7 @@ echo [
 echo.
 echo [<5B><>Ϣ] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD>״ΰ<D7B4>װ JeeSite <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>װ Module <20><><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><DDB1><EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3><EFBFBD>Ѱ<EFBFBD>װ<EFBFBD><D7B0><EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD>ԡ<EFBFBD>
 echo.
-echo [<5B><>Ϣ] <20><EFBFBD> v4.2 <20>汾<EFBFBD>Ժ󣬹ٷ<F3A3ACB9><D9B7><EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><EFBFBD>ǱȽϰ<EFBFBD>ȫ<EFBFBD>ģ<EFBFBD><EFBFBD>ٷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>в<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>κ<EFBFBD>ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵĽű<EFBFBD><EFBFBD><EFBFBD>
+echo [<5B><>Ϣ] <20>ٷ<EFBFBD>Ĭ<EFBFBD><EFBFBD><EFBFBD>ṩ<EFBFBD>ĳ<EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ⹤<EFBFBD><EFBFBD><EFBFBD>ǱȽϰ<EFBFBD>ȫ<EFBFBD>ģ<EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>а<EFBFBD><EFBFBD><EFBFBD>ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵĽű<EFBFBD><EFBFBD><EFBFBD>
 echo.
 echo [<5B><>Ϣ] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ð汾<C3B0><E6B1BE><EFBFBD><EFBFBD><EFBFBD>ų<EFBFBD><C5B3><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>ȫ<EFBFBD><C8AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȱ<EFBFBD><C8B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD>ٲ<EFBFBD><D9B2><EFBFBD><EFBFBD><EFBFBD>
 echo.
--- a/web/bin/init-data.sh
+++ b/web/bin/init-data.sh
@@ -11,7 +11,7 @@ echo "[信息] 初始化数据库。"
 echo ""
 echo "[信息] 本操作主要用于首次安装 JeeSite 或后安装 Module 的数据表初始化，若模块已安装会自动忽略。"
 echo ""
-echo "[信息] 在 v4.2 版本以后，官方初始化数据库是比较安全的，官方代码中不会包含任何删除数据表及数据的脚本。"
+echo "[信息] 官方默认提供的初始化数据库工具是比较安全的，她没有包含删除您的业务数据表及数据的脚本。"
 echo ""
 echo "[信息] 如果你是升级到该版本，不排除你是否升级完整，为安全起见，建议先备份数据库后再操作。"
 echo ""
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.9.2-SNAPSHOT</version>
+		<version>5.10.0-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
--- a/web/src/main/resources/config/application-prod.yml
+++ b/web/src/main/resources/config/application-prod.yml
@@ -13,7 +13,7 @@ jdbc:
  # Mysql 数据库配置
  type: mysql
  driver: com.mysql.cj.jdbc.Driver
-  url: jdbc:mysql://192.168.56.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
+  url: jdbc:mysql://192.168.56.1:3306/jeesite?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
  username: jeesite
  password: jeesite
  testSql: SELECT 1
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -8,8 +8,8 @@ productName: JeeSite Demo
 companyName: ThinkGem

 # 产品版本、版权年份
-productVersion: V5.9
-copyrightYear: 2024
+productVersion: V5.10
+copyrightYear: 2025

 # 是否演示模式
 demoMode: false
@@ -54,7 +54,7 @@ jdbc:
  # Mysql 数据库配置
  type: mysql
  driver: com.mysql.cj.jdbc.Driver
-  url: jdbc:mysql://127.0.0.1:3306/jeesite_v5?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+  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&nullCatalogMeansCurrent=true
  username: root
  password: 123456
  testSql: SELECT 1
@@ -170,7 +170,7 @@ jdbc:
 #  ds_read_01:
 #    type: mysql
 #    driver: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://127.0.0.1:3306/jeesite_test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://127.0.0.1:3306/jeesite_test?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: 123456
 #    testSql: SELECT 1
@@ -183,7 +183,7 @@ jdbc:
 #  ds_read_02:
 #    type: mysql
 #    driver: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://127.0.0.1:3306/jeesite_test2?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://127.0.0.1:3306/jeesite_test2?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: 123456
 #    testSql: SELECT 1
@@ -199,7 +199,7 @@ jdbc:
 #  ds2:
 #    type: mysql
 #    driver: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://127.0.0.1:3306/jeesite2?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://127.0.0.1:3306/jeesite2?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: 123456
 #    testSql: SELECT 1
Author	SHA1	Message	Date
thinkgem	6b29c8c937	5.10.0	2024-12-31 21:04:15 +08:00
thinkgem	cf32922387	update import icon	2024-12-31 21:04:15 +08:00
thinkgem	5e87d44a3c	2025	2024-12-30 14:56:56 +08:00
thinkgem	0ef1eca662	update	2024-12-29 16:43:20 +08:00
thinkgem	203e21beed	update bin	2024-12-26 11:42:58 +08:00
thinkgem	34b1ba00fd	上传文件必填时，防止表单验证提示输入历史	2024-12-25 16:20:46 +08:00
thinkgem	8e64c2c51b	update README.md	2024-12-25 15:50:06 +08:00
thinkgem	62392702a6	update jdbc url	2024-12-25 10:30:26 +08:00
thinkgem	580f5eea55	remove beetl includeJSP	2024-12-23 17:15:54 +08:00
thinkgem	3623824a01	update README.md	2024-12-13 12:59:21 +08:00
thinkgem	b1409e88a1	update README.md	2024-12-12 18:16:41 +08:00
thinkgem	2b25eaa591	增加参考配置，可查看哪些用户的数据，ctrlPermi 更改为 0 后显示	2024-12-11 10:32:19 +08:00
thinkgem	38c8ea825a	细节优化，控制业务范围重命名为业务范围	2024-12-11 10:27:48 +08:00
thinkgem	56be7dd689	移除重复参数	2024-12-11 10:23:03 +08:00
thinkgem	8623b1a497	新增BigDecimalType	2024-12-05 11:12:14 +08:00
thinkgem	1c8a5adcd3	update	2024-12-05 11:12:07 +08:00
thinkgem	8d1bbde93b	update version	2024-12-04 14:30:02 +08:00
thinkgem	a9054c7567	使用对象存储时，文件管理的在线预览文件中的下载地址修正	2024-12-04 14:17:22 +08:00
thinkgem	bca5facc4e	update	2024-11-26 20:10:15 +08:00
thinkgem	a8d1080cfd	update README.md	2024-11-24 20:36:53 +08:00