5.13.1

README.md

@@ -4,7 +4,7 @@
 </p>
 <h3 align="center" style="margin:30px 0 30px;font-weight:bold;font-size:30px;">快速开发平台 - Spring Boot 3</h3>
 <p align="center">
- <a href="https://spring.io/projects/spring-boot" target="__blank"><img alt="SpringBoot-V2.7/3.4" src="https://img.shields.io/badge/SpringBoot-V2.7/3.4-blue.svg"></a>
+ <a href="https://spring.io/projects/spring-boot" target="__blank"><img alt="SpringBoot-V3.5 or 2.7" src="https://img.shields.io/badge/SpringBoot-V3.5 or 2.7-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-V5.x" src="https://img.shields.io/badge/JeeSite-V5.x-success.svg"></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>
@@ -97,11 +97,11 @@
 
 ## 技术选型
 
-* 主框架：Spring Boot 3.4、Spring Framework 6、Apache Shiro 2、J2Cache
+* 主框架：Spring Boot 3.5、Spring Framework 6、Apache Shiro 2、J2Cache
 * 持久层：Apache MyBatis 3.5、Hibernate Validator 8、Alibaba Druid 1.2
 * 分离版：Node.js、TypeScript、Vue3、Vite、Ant Design Vue、Vue Vben Admin
 * 经典版：Beetl 3.10（HTML）、jQuery 3.7、Bootstrap 3.3、AdminLTE 2.4
-* 分离版：支持所有现代浏览器，如：谷歌 Chrome 86+、微软 Edge、火狐、国产浏览器 等
+* 分离版：支持所有现代浏览器，如：谷歌 Chrome 87+、微软 Edge、火狐、国产浏览器 等
 * 经典版：支持 IE10 和以上版本，以及其他所有现代浏览器，如：谷歌、火狐、国产浏览器 等
 * 工作流引擎：Flowable 7.1、符合 BPMN 规范、在线流程设计器、中国式流程、退回、撤回、自由流
 * 技术选型（详细）已支持数据库：<http://jeesite.com/docs/technology/>
@@ -111,9 +111,10 @@
 
 ## 更多介绍
 
+* 架构特点：<https://jeesite.com/docs/feature/>
 * 内置功能：<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/>
 
@@ -139,9 +140,20 @@
 1. 分离版地址：<https://vue.jeesite.com>
 2. 经典版地址：<https://demo.jeesite.com>
 
+### 快速运行
+
+1. 免安装数据库，使用内嵌 H2 DB、包含 Vue 和 全栈双版本
+2. 环境准备：`JDK 17 或更高版本`、`Maven 3.8+`、无需准备数据库
+3. 下载源码：<https://gitee.com/thinkgem/jeesite5/repository/archive/v5.springboot3.zip> 并解压
+4. 执行脚本：`/web-fast/bin/run-tomcat.bat(sh)` 启动服务即可（无需手动建库，自动初始化数据库）
+5. Vue分离版本地址：<http://127.0.0.1:8980/vue/login>
+6. 全栈版本地址：<http://127.0.0.1:8980/a/login>
+7. 初始登录账号：超级管理员：system  密码：admin
+8. 部署常见问题：<https://jeesite.com/docs/faq/>
+
 ### 本地运行
 
-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)` 初始化数据库（自动往新库里创建表和初始数据）
@@ -149,65 +161,68 @@
 6. 浏览器访问：<http://127.0.0.1:8980/js>  账号 system 密码 admin
 7. 部署常见问题：<https://jeesite.com/docs/faq/>
 8. 分离端安装：<https://jeesite.com/docs/vue-install-deploy/>
-
-### 快速运行
-
-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>
-5. 全栈版本地址：<http://127.0.0.1:8980/a/login>
-6. 初始登录账号：超级管理员：system  密码：admin
-7. 部署常见问题：<https://jeesite.com/docs/faq/>
+9. 分离端常见问题：<https://jeesite.com/docs/vue-faq/>
 
 ### 容器运行
 
 - 拉取 Docker 镜像（JeeSite版本不是最新）：
 ```sh
-docker pull thinkgem/jeesite-web
+docker pull crpi-u3zm0t8trv68xpyx.cn-qingdao.personal.cr.aliyuncs.com/thinkgem/jeesite:latest
 ```
-- 启动脚本：
+- 启动镜像：
 ```sh
-docker run --name jeesite-web -p 8980:8980 -d --restart unless-stopped \
-    -v ~/:/data thinkgem/jeesite-web && docker logs -f jeesite-web
+docker run --name js5 -p 8980:8980 -d crpi-u3zm0t8trv68xpyx.cn-qingdao.personal.cr.aliyuncs.com/thinkgem/jeesite:latest
 ```
+- 查看日志：
+```sh
+docker logs -f js5
+```
+
 - 浏览器访问：<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/>
@@ -228,20 +243,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/>
 
 ## 授权协议声明
 

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.13.1.springboot3-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	

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";
 

common/src/main/java/com/jeesite/common/codec/EncodeUtils.java

@@ -32,7 +32,7 @@ import java.util.regex.Pattern;
  * 4. JDK 提供的 URLEncoder
  * 5. XSS、SQL、orderBy 过滤器
  * @author calvin、ThinkGem
- * @version 2022-2-17
+ * @version 2025-7-9
  */
 public class EncodeUtils {
 
@@ -191,8 +191,8 @@ public class EncodeUtils {
 	// 预编译XSS过滤正则表达式
 	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*(href|src)\\s*=\\s*(\"\\s*(javascript|vbscript|data):[^\"]+\"|'\\s*(javascript|vbscript|data):[^']+'|(javascript|vbscript|data):[^\\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)
 	);

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 {
 
 }

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);
+	}
+
+}

common/src/main/java/com/jeesite/common/exec/CommandUtils.java

@@ -24,20 +24,20 @@ public class CommandUtils {
 	public static String execute(String command, String charsetName) throws IOException {
 		Process process = Runtime.getRuntime().exec(command);
 		// 记录dos命令的返回信息
-		StringBuffer stringBuffer = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		// 获取返回信息的流
 		InputStream in = process.getInputStream();
 		Reader reader = new InputStreamReader(in, charsetName);
 		BufferedReader bReader = new BufferedReader(reader);
 		String res = bReader.readLine();
 		while (res != null) {
-			stringBuffer.append(res);
-			stringBuffer.append("\n");
+			sb.append(res);
+			sb.append("\n");
 			res = bReader.readLine();
 		}
 		bReader.close();
 		reader.close();
-		return stringBuffer.toString();
+		return sb.toString();
 	}
 	
 }

common/src/main/java/com/jeesite/common/image/CaptchaUtils.java

@@ -4,26 +4,21 @@
  */
 package com.jeesite.common.image;
 
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Random;
-
 import org.patchca.background.BackgroundFactory;
 import org.patchca.color.ColorFactory;
-import org.patchca.filter.predefined.CurvesRippleFilterFactory;
-import org.patchca.filter.predefined.DiffuseRippleFilterFactory;
-import org.patchca.filter.predefined.DoubleRippleFilterFactory;
-import org.patchca.filter.predefined.MarbleRippleFilterFactory;
-import org.patchca.filter.predefined.WobbleRippleFilterFactory;
+import org.patchca.filter.predefined.*;
 import org.patchca.font.RandomFontFactory;
 import org.patchca.service.ConfigurableCaptchaService;
 import org.patchca.text.renderer.BestFitTextRenderer;
 import org.patchca.utils.encoder.EncoderHelper;
 import org.patchca.word.RandomWordFactory;
 
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Random;
+
 /**
  * 验证码工具
  * @author ThinkGem
@@ -31,7 +26,7 @@ import org.patchca.word.RandomWordFactory;
  */
 public class CaptchaUtils {
 
-	private static Random random = new Random();
+	private static final Random random = new Random();
 	private volatile static ConfigurableCaptchaService ccs;
 	private static WobbleRippleFilterFactory wrff; 	// 摆波纹
 	private static DoubleRippleFilterFactory doff; 	// 双波纹
@@ -135,9 +130,6 @@ public class CaptchaUtils {
 
 	/**
 	 * 生成验证码
-	 * @param request
-	 * @param response
-	 * @throws IOException
 	 * @return 验证码字符
 	 */
 	public static String generateCaptcha(OutputStream outputStream) throws IOException{

common/src/main/java/com/jeesite/common/image/ImageGeo.java

@@ -11,7 +11,7 @@
 //import com.drew.metadata.exif.GpsDirectory;
 //
 ///**
-// * 图片地理信息获取
+// * 图片地理信息获取（pom.xml 中打开 com.drewnoakes 依赖）
 // * @author ThinkGem
 // */
 //public class ImageGeo {
@@ -45,7 +45,7 @@
 //			if (easting.equalsIgnoreCase("W")) {
 //				lonsign = -1.0d;
 //			}
-//			
+//
 //			lat = (Math.abs(latpart[0].doubleValue()) + latpart[1].doubleValue() / 60.0d + latpart[2].doubleValue() / 3600.0d) * latsign;
 //			lon = (Math.abs(lonpart[0].doubleValue()) + lonpart[1].doubleValue() / 60.0d + lonpart[2].doubleValue() / 3600.0d) * lonsign;
 //

common/src/main/java/com/jeesite/common/image/ImageUtils.java

@@ -68,7 +68,7 @@ public class ImageUtils {
 				bilder.toFile(targetFile);
 			}
 		}catch(IOException e){
-			logger.error("图片压缩失败：" + imageFile.getAbsoluteFile(), e);
+			logger.error("图片压缩失败：{}", imageFile.getAbsoluteFile(), e);
 		}
 	}
 	

common/src/main/java/com/jeesite/common/image/ZxingUtils.java

@@ -10,6 +10,8 @@ import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.common.HybridBinarizer;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
@@ -23,13 +25,14 @@ import java.util.Hashtable;
  */
 public class ZxingUtils {
 
+	private static final Logger logger = LoggerFactory.getLogger(ZxingUtils.class);
+
 	/**
 	 * 条形码编码
-	 *
-	 * @param contents
-	 * @param width
-	 * @param height
-	 * @param imgPath
+	 * @param contents 内容
+	 * @param width 宽度
+	 * @param height 高度
+	 * @param imgPath 图片路径
 	 */
 	public static void encode(String contents, int width, int height, String imgPath) {
 		int codeWidth = 3 + // start guard
@@ -42,14 +45,13 @@ public class ZxingUtils {
 			BitMatrix bitMatrix = new MultiFormatWriter().encode(contents, BarcodeFormat.EAN_13, codeWidth, height, null);
 			MatrixToImageWriter.writeToPath(bitMatrix, "png", new File(imgPath).toPath());
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error(e.getMessage(), e);
 		}
 	}
 
 	/**
 	 * 条形码解码
-	 *
-	 * @param imgPath
+	 * @param imgPath 图片路径
 	 * @return String
 	 */
 	public static String decode(String imgPath) {
@@ -58,25 +60,24 @@ public class ZxingUtils {
 		try {
 			image = ImageIO.read(new File(imgPath));
 			if (image == null) {
-				System.out.println("the decode image may be not exit.");
+				logger.debug("the decode image may be not exit.");
 			}
 			LuminanceSource source = new BufferedImageLuminanceSource(image);
 			BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
 			result = new MultiFormatReader().decode(bitmap, null);
 			return result.getText();
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error(e.getMessage(), e);
 		}
 		return null;
 	}
 
 	/**
 	 * 二维码编码
-	 *
-	 * @param contents
-	 * @param width
-	 * @param height
-	 * @param imgPath
+	 * @param contents 内容
+	 * @param width 宽度
+	 * @param height 高度
+	 * @param imgPath 图片路径
 	 */
 	public static void encode2(String contents, int width, int height, String imgPath) {
 		Hashtable<EncodeHintType, Object> hints = new Hashtable<EncodeHintType, Object>();
@@ -88,14 +89,13 @@ public class ZxingUtils {
 			BitMatrix bitMatrix = new MultiFormatWriter().encode(contents, BarcodeFormat.QR_CODE, width, height, hints);
 			MatrixToImageWriter.writeToPath(bitMatrix, "png", new File(imgPath).toPath());
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error(e.getMessage(), e);
 		}
 	}
 
 	/**
 	 * 二维码解码
-	 *
-	 * @param imgPath
+	 * @param imgPath 图片路径
 	 * @return String
 	 */
 	public static String decode2(String imgPath) {
@@ -104,7 +104,7 @@ public class ZxingUtils {
 		try {
 			image = ImageIO.read(new File(imgPath));
 			if (image == null) {
-				System.out.println("the decode image may be not exit.");
+				logger.debug("the decode image may be not exit.");
 			}
 			LuminanceSource source = new BufferedImageLuminanceSource(image);
 			BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
@@ -113,7 +113,7 @@ public class ZxingUtils {
 			result = new MultiFormatReader().decode(bitmap, hints);
 			return result.getText();
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error(e.getMessage(), e);
 		}
 		return null;
 	}

common/src/main/java/com/jeesite/common/io/FileUtils.java

@@ -19,6 +19,8 @@ import org.springframework.core.io.ClassPathResource;
 
 import javax.activation.MimetypesFileTypeMap;
 import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Objects;
@@ -30,7 +32,7 @@ import java.util.zip.ZipOutputStream;
  * 文件操作工具类
  * 实现文件的创建、删除、复制、压缩、解压以及目录的创建、删除、复制、压缩解压等功能
  * @author ThinkGem
- * @version 2015-3-16
+ * @version 2025-08-08
  */
 @SuppressWarnings("deprecation")
 public class FileUtils extends org.apache.commons.io.FileUtils {
@@ -57,17 +59,16 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 	 * @param coverlay 如果目标文件已存在，是否覆盖
 	 * @return 如果复制成功，则返回true，否则返回false
 	 */
-	public static boolean copyFileCover(String srcFileName,
-			String descFileName, boolean coverlay) {
+	public static boolean copyFileCover(String srcFileName, String descFileName, boolean coverlay) {
 		File srcFile = new File(srcFileName);
 		// 判断源文件是否存在
 		if (!srcFile.exists()) {
-			logger.debug("复制文件失败，源文件 " + srcFileName + " 不存在!");
+			logger.debug("复制文件失败，源文件 {} 不存在!", srcFileName);
 			return false;
 		}
 		// 判断源文件是否是合法的文件
 		else if (!srcFile.isFile()) {
-			logger.debug("复制文件失败，" + srcFileName + " 不是一个文件!");
+			logger.debug("复制文件失败，{} 不是一个文件!", srcFileName);
 			return false;
 		}
 		File descFile = new File(descFileName);
@@ -77,11 +78,11 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 			if (coverlay) {
 				logger.debug("目标文件已存在，准备删除!");
 				if (!FileUtils.delFile(descFileName)) {
-					logger.debug("删除目标文件 " + descFileName + " 失败!");
+					logger.debug("删除目标文件 {} 失败!", descFileName);
 					return false;
 				}
 			} else {
-				logger.debug("复制文件失败，目标文件 " + descFileName + " 已存在!");
+				logger.debug("复制文件失败，目标文件 {} 已存在!", descFileName);
 				return false;
 			}
 		} else {
@@ -95,45 +96,26 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 				}
 			}
 		}
-
 		// 准备复制文件
-		// 读取的位数
-		int readByte = 0;
-		InputStream ins = null;
-		OutputStream outs = null;
-		try {
+		try (
 			// 打开源文件
-			ins = new FileInputStream(srcFile);
+			InputStream ins = Files.newInputStream(srcFile.toPath());
 			// 打开目标文件的输出流
-			outs = new FileOutputStream(descFile);
-			byte[] buf = new byte[1024];
+			OutputStream outs = Files.newOutputStream(descFile.toPath());
+		) {
+			// 读取的位数
+			int readByte = 0;
 			// 一次读取1024个字节，当readByte为-1时表示文件已经读取完毕
+			byte[] buf = new byte[1024];
 			while ((readByte = ins.read(buf)) != -1) {
 				// 将读取的字节流写入到输出流
 				outs.write(buf, 0, readByte);
 			}
-			logger.debug("复制单个文件 " + srcFileName + " 到" + descFileName
-					+ "成功!");
+			logger.debug("复制单个文件 {} 到{}成功!", srcFileName, descFileName);
 			return true;
 		} catch (Exception e) {
-			logger.debug("复制文件失败：" + e.getMessage());
+			logger.debug("复制文件失败：{}", e.getMessage());
 			return false;
-		} finally {
-			// 关闭输入输出流，首先关闭输出流，然后再关闭输入流
-			if (outs != null) {
-				try {
-					outs.close();
-				} catch (IOException oute) {
-					oute.printStackTrace();
-				}
-			}
-			if (ins != null) {
-				try {
-					ins.close();
-				} catch (IOException ine) {
-					ine.printStackTrace();
-				}
-			}
 		}
 	}
 
@@ -144,8 +126,7 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 	 * @return 如果复制成功返回true，否则返回false
 	 */
 	public static boolean copyDirectory(String srcDirName, String descDirName) {
-		return FileUtils.copyDirectoryCover(srcDirName, descDirName,
-				false);
+		return FileUtils.copyDirectoryCover(srcDirName, descDirName, false);
 	}
 
 	/**
@@ -155,17 +136,16 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 	 * @param coverlay 如果目标目录存在，是否覆盖
 	 * @return 如果复制成功返回true，否则返回false
 	 */
-	public static boolean copyDirectoryCover(String srcDirName,
-			String descDirName, boolean coverlay) {
+	public static boolean copyDirectoryCover(String srcDirName, String descDirName, boolean coverlay) {
 		File srcDir = new File(srcDirName);
 		// 判断源目录是否存在
 		if (!srcDir.exists()) {
-			logger.debug("复制目录失败，源目录 " + srcDirName + " 不存在!");
+			logger.debug("复制目录失败，源目录 {} 不存在!", srcDirName);
 			return false;
 		}
 		// 判断源目录是否是目录
 		else if (!srcDir.isDirectory()) {
-			logger.debug("复制目录失败，" + srcDirName + " 不是一个目录!");
+			logger.debug("复制目录失败，{} 不是一个目录!", srcDirName);
 			return false;
 		}
 		// 如果目标文件夹名不以文件分隔符结尾，自动添加文件分隔符
@@ -180,11 +160,11 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 				// 允许覆盖目标目录
 				logger.debug("目标目录已存在，准备删除!");
 				if (!FileUtils.delFile(descDirNames)) {
-					logger.debug("删除目录 " + descDirNames + " 失败!");
+					logger.debug("删除目录 {} 失败!", descDirNames);
 					return false;
 				}
 			} else {
-				logger.debug("目标目录复制失败，目标目录 " + descDirNames + " 已存在!");
+				logger.debug("目标目录复制失败，目标目录 {} 已存在!", descDirNames);
 				return false;
 			}
 		} else {
@@ -200,32 +180,31 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 		boolean flag = true;
 		// 列出源目录下的所有文件名和子目录名
 		File[] files = srcDir.listFiles();
-		for (int i = 0; i < files.length; i++) {
-			// 如果是一个单个文件，则直接复制
-			if (files[i].isFile()) {
-				flag = FileUtils.copyFile(files[i].getAbsolutePath(),
-						descDirName + files[i].getName());
-				// 如果拷贝文件失败，则退出循环
-				if (!flag) {
-					break;
+		if (files != null) {
+			for (File file : files) {
+				// 如果是一个单个文件，则直接复制
+				if (file.isFile()) {
+					flag = FileUtils.copyFile(file.getAbsolutePath(), descDirName + file.getName());
+					// 如果拷贝文件失败，则退出循环
+					if (!flag) {
+						break;
+					}
 				}
-			}
-			// 如果是子目录，则继续复制目录
-			if (files[i].isDirectory()) {
-				flag = FileUtils.copyDirectory(files[i]
-						.getAbsolutePath(), descDirName + files[i].getName());
-				// 如果拷贝目录失败，则退出循环
-				if (!flag) {
-					break;
+				// 如果是子目录，则继续复制目录
+				if (file.isDirectory()) {
+					flag = FileUtils.copyDirectory(file.getAbsolutePath(), descDirName + file.getName());
+					// 如果拷贝目录失败，则退出循环
+					if (!flag) {
+						break;
+					}
 				}
 			}
 		}
-
 		if (!flag) {
-			logger.debug("复制目录 " + srcDirName + " 到 " + descDirName + " 失败!");
+			logger.debug("复制目录 {} 到 {} 失败!", srcDirName, descDirName);
 			return false;
 		}
-		logger.debug("复制目录 " + srcDirName + " 到 " + descDirName + " 成功!");
+		logger.debug("复制目录 {} 到 {} 成功!", srcDirName, descDirName);
 		return true;
 
 	}
@@ -238,7 +217,7 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 	 */
 	public static String readFileToString(String classResourcePath){
 		try (InputStream in = new ClassPathResource(classResourcePath).getInputStream()){
-            return IOUtils.toString(in, EncodeUtils.UTF_8);
+            return IOUtils.toString(in, StandardCharsets.UTF_8);
 		} catch (IOException e) {
 			logger.warn("Error file convert: {}", e.getMessage());
 		}
@@ -246,16 +225,14 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 	}
 	
 	/**
-	 * 
 	 * 删除文件，可以删除单个文件或文件夹
-	 * 
 	 * @param fileName 被删除的文件名
 	 * @return 如果删除成功，则返回true，否是返回false
 	 */
 	public static boolean delFile(String fileName) {
  		File file = new File(fileName);
 		if (!file.exists()) {
-			logger.debug(fileName + " 文件不存在!");
+			logger.debug("{} 文件不存在!", fileName);
 			return true;
 		} else {
 			if (file.isFile()) {
@@ -267,9 +244,7 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 	}
 
 	/**
-	 * 
 	 * 删除单个文件
-	 * 
 	 * @param fileName 被删除的文件名
 	 * @return 如果删除成功，则返回true，否则返回false
 	 */
@@ -277,22 +252,20 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 		File file = new File(fileName);
 		if (file.exists() && file.isFile()) {
 			if (file.delete()) {
-				logger.debug("删除文件 " + fileName + " 成功!");
+				logger.debug("删除文件 {} 成功!", fileName);
 				return true;
 			} else {
-				logger.debug("删除文件 " + fileName + " 失败!");
+				logger.debug("删除文件 {} 失败!", fileName);
 				return false;
 			}
 		} else {
-			logger.debug(fileName + " 文件不存在!");
+			logger.debug("{} 文件不存在!", fileName);
 			return true;
 		}
 	}
 
 	/**
-	 * 
 	 * 删除目录及目录下的文件
-	 * 
 	 * @param dirName 被删除的目录所在的文件路径
 	 * @return 如果目录删除成功，则返回true，否则返回false
 	 */
@@ -309,36 +282,36 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 		boolean flag = true;
 		// 列出全部文件及子目录
 		File[] files = dirFile.listFiles();
-		for (int i = 0; i < files.length; i++) {
-			// 删除子文件
-			if (files[i].isFile()) {
-				flag = FileUtils.deleteFile(files[i].getAbsolutePath());
-				// 如果删除文件失败，则退出循环
-				if (!flag) {
-					break;
+		if (files != null) {
+			for (File file : files) {
+				// 删除子文件
+				if (file.isFile()) {
+					flag = FileUtils.deleteFile(file.getAbsolutePath());
+					// 如果删除文件失败，则退出循环
+					if (!flag) {
+						break;
+					}
 				}
-			}
-			// 删除子目录
-			else if (files[i].isDirectory()) {
-				flag = FileUtils.deleteDirectory(files[i]
-						.getAbsolutePath());
-				// 如果删除子目录失败，则退出循环
-				if (!flag) {
-					break;
+				// 删除子目录
+				else if (file.isDirectory()) {
+					flag = FileUtils.deleteDirectory(file.getAbsolutePath());
+					// 如果删除子目录失败，则退出循环
+					if (!flag) {
+						break;
+					}
 				}
 			}
 		}
-
 		if (!flag) {
 			logger.debug("删除目录失败!");
 			return false;
 		}
 		// 删除当前目录
 		if (dirFile.delete()) {
-			logger.debug("删除目录 " + dirName + " 成功!");
+			logger.debug("删除目录 {} 成功!", dirName);
 			return true;
 		} else {
-			logger.debug("删除目录 " + dirName + " 失败!");
+			logger.debug("删除目录 {} 失败!", dirName);
 			return false;
 		}
 
@@ -352,11 +325,11 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 	public static boolean createFile(String descFileName) {
 		File file = new File(descFileName);
 		if (file.exists()) {
-			logger.debug("文件 " + descFileName + " 已存在!");
+			logger.debug("文件 {} 已存在!", descFileName);
 			return false;
 		}
 		if (descFileName.endsWith(File.separator)) {
-			logger.debug(descFileName + " 为目录，不能创建目录!");
+			logger.debug("{} 为目录，不能创建目录!", descFileName);
 			return false;
 		}
 		if (!file.getParentFile().exists()) {
@@ -366,22 +339,19 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 				return false;
 			}
 		}
-
 		// 创建文件
 		try {
 			if (file.createNewFile()) {
-				logger.debug(descFileName + " 文件创建成功!");
+				logger.debug("{} 文件创建成功!", descFileName);
 				return true;
 			} else {
-				logger.debug(descFileName + " 文件创建失败!");
+				logger.debug("{} 文件创建失败!", descFileName);
 				return false;
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
-			logger.debug(descFileName + " 文件创建失败!");
+			logger.debug("{} 文件创建失败!", descFileName, e);
 			return false;
 		}
-
 	}
 
 	/**
@@ -396,15 +366,15 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 		}
 		File descDir = new File(descDirNames);
 		if (descDir.exists()) {
-			logger.debug("目录 " + descDirNames + " 已存在!");
+			logger.debug("目录 {} 已存在!", descDirNames);
 			return false;
 		}
 		// 创建目录
 		if (descDir.mkdirs()) {
-			logger.debug("目录 " + descDirNames + " 创建成功!");
+			logger.debug("目录 {} 创建成功!", descDirNames);
 			return true;
 		} else {
-			logger.debug("目录 " + descDirNames + " 创建失败!");
+			logger.debug("目录 {} 创建失败!", descDirNames);
 			return false;
 		}
 
@@ -417,9 +387,9 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 	public static void writeToFile(String fileName, String content, boolean append) {
 		try {
 			FileUtils.write(new File(fileName), content, EncodeUtils.UTF_8, append);
-			logger.debug("文件 " + fileName + " 写入成功!");
+			logger.debug("文件 {} 写入成功!", fileName);
 		} catch (IOException e) {
-			logger.debug("文件 " + fileName + " 写入失败! " + e.getMessage());
+			logger.debug("文件 {} 写入失败!", fileName, e);
 		}
 	}
 
@@ -430,9 +400,9 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 	public static void writeToFile(String fileName, String content, String encoding, boolean append) {
 		try {
 			FileUtils.write(new File(fileName), content, encoding, append);
-			logger.debug("文件 " + fileName + " 写入成功!");
+			logger.debug("文件 {} 写入成功!", fileName);
 		} catch (IOException e) {
-			logger.debug("文件 " + fileName + " 写入失败! " + e.getMessage());
+			logger.debug("文件 {} 写入失败!", fileName, e);
 		}
 	}
 	
@@ -447,12 +417,11 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 			return;
 		}
 		byte[] data = EncodeUtils.decodeBase64(base64);
-		
 		File file = new File(fileName);
 		try {
 			FileUtils.writeByteArrayToFile(file, data);
 		} catch (IOException e) {
-			e.printStackTrace();
+			logger.error("文件 {} 写入失败!", fileName, e);
 		}
 	}
 	
@@ -470,33 +439,30 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 	public static void zipFiles(String srcDirName, String fileName, String descFileName) {
 		// 判断目录是否存在
 		if (srcDirName == null) {
-			logger.debug("文件压缩失败，目录 " + srcDirName + " 不存在!");
+			logger.debug("文件压缩失败，目录 {} 不存在!", srcDirName);
 			return;
 		}
 		File fileDir = new File(srcDirName);
 		if (!fileDir.exists() || !fileDir.isDirectory()) {
-			logger.debug("文件压缩失败，目录 " + srcDirName + " 不存在!");
+			logger.debug("文件压缩失败，目录 {} 不存在!", srcDirName);
 			return;
 		}
 		String dirPath = fileDir.getAbsolutePath();
 		File descFile = new File(descFileName);
-		try {
-			ZipOutputStream zouts = new ZipOutputStream(new FileOutputStream(descFile));
+		try (ZipOutputStream outs = new ZipOutputStream(new FileOutputStream(descFile));) {
 			if ("*".equals(fileName) || StringUtils.EMPTY.equals(fileName)) {
-				FileUtils.zipDirectoryToZipFile(dirPath, fileDir, zouts);
+				FileUtils.zipDirectoryToZipFile(dirPath, fileDir, outs);
 			} else {
 				File file = new File(fileDir, fileName);
 				if (file.isFile()) {
-					FileUtils.zipFilesToZipFile(dirPath, file, zouts);
+					FileUtils.zipFilesToZipFile(dirPath, file, outs);
 				} else {
-					FileUtils.zipDirectoryToZipFile(dirPath, file, zouts);
+					FileUtils.zipDirectoryToZipFile(dirPath, file, outs);
 				}
 			}
-			zouts.close();
-			logger.debug(descFileName + " 文件压缩成功!");
+			logger.debug("{} 文件压缩成功!", descFileName);
 		} catch (Exception e) {
-			logger.debug("文件压缩失败：" + e.getMessage());
-			e.printStackTrace();
+			logger.error("文件压缩失败!", e);
 		}
 
 	}
@@ -510,10 +476,11 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 		String descFileNames = descFileName;
 		if (!descFileNames.endsWith(File.separator)) {
 			descFileNames = descFileNames + File.separator;
-		}		
-        try {
+		}
+        try (
 			// 根据ZIP文件创建ZipFile对象
 			ZipFile zipFile = new ZipFile(zipFileName);
+		) {
 			ZipEntry entry = null;
 			String entryName = null;
 			String descFileDir = null;
@@ -537,21 +504,21 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 					new File(descFileDir).getParentFile().mkdirs();
 				}
 				File file = new File(descFileDir);
-				// 打开文件输出流
-				OutputStream os = new FileOutputStream(file);
-				// 从ZipFile对象中打开entry的输入流
-		        InputStream is = zipFile.getInputStream(entry);
-				while ((readByte = is.read(buf)) != -1) {
-					os.write(buf, 0, readByte);
+				try (
+					// 打开文件输出流
+					OutputStream os = new FileOutputStream(file);
+					// 从ZipFile对象中打开entry的输入流
+					InputStream is = zipFile.getInputStream(entry);
+				) {
+					while ((readByte = is.read(buf)) != -1) {
+						os.write(buf, 0, readByte);
+					}
 				}
-				os.close();
-				is.close();
 			}
-			zipFile.close();
 			logger.debug("文件解压成功!");
 			return true;
 		} catch (Exception e) {
-			logger.debug("文件解压失败：" + e.getMessage());
+			logger.error("文件解压失败!", e);
 			return false;
 		}
 	}
@@ -566,25 +533,26 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 		if (fileDir.isDirectory()) {
 			File[] files = fileDir.listFiles();
 			// 空的文件夹
-			if (files.length == 0) {
+			if (files != null && files.length == 0) {
 				// 目录信息
 				ZipEntry entry = new ZipEntry(getEntryName(dirPath, fileDir));
 				try {
 					zouts.putNextEntry(entry);
 					zouts.closeEntry();
 				} catch (Exception e) {
-					e.printStackTrace();
+					logger.error("压缩失败!", e);
 				}
 				return;
 			}
-
-			for (int i = 0; i < files.length; i++) {
-				if (files[i].isFile()) {
-					// 如果是文件，则调用文件压缩方法
-					FileUtils.zipFilesToZipFile(dirPath, files[i], zouts);
-				} else {
-					// 如果是目录，则递归调用
-					FileUtils.zipDirectoryToZipFile(dirPath, files[i], zouts);
+			if (files != null) {
+				for (File file : files) {
+					if (file.isFile()) {
+						// 如果是文件，则调用文件压缩方法
+						FileUtils.zipFilesToZipFile(dirPath, file, zouts);
+					} else {
+						// 如果是目录，则递归调用
+						FileUtils.zipDirectoryToZipFile(dirPath, file, zouts);
+					}
 				}
 			}
 		}
@@ -597,17 +565,16 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 	 * @param zouts 输出流
 	 */
 	public static void zipFilesToZipFile(String dirPath, File file, ZipOutputStream zouts) {
-		FileInputStream fin = null;
-		ZipEntry entry = null;
 		// 创建复制缓冲区
 		byte[] buf = new byte[4096];
 		int readByte = 0;
 		if (file.isFile()) {
-			try {
+			try (
 				// 创建一个文件输入流
-				fin = new FileInputStream(file);
+				FileInputStream fin = new FileInputStream(file);
+			) {
 				// 创建一个ZipEntry
-				entry = new ZipEntry(getEntryName(dirPath, file));
+				ZipEntry entry = new ZipEntry(getEntryName(dirPath, file));
 				// 存储信息到压缩文件
 				zouts.putNextEntry(entry);
 				// 复制字节到压缩文件
@@ -615,10 +582,9 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 					zouts.write(buf, 0, readByte);
 				}
 				zouts.closeEntry();
-				fin.close();
-				logger.debug("添加文件 " + file.getAbsolutePath() + " 到zip文件中!");
+				logger.debug("添加文件 {} 到zip文件中!", file.getAbsolutePath());
 			} catch (Exception e) {
-				e.printStackTrace();
+				logger.error("添加文件失败!", e);
 			}
 		}
 	}
@@ -627,7 +593,7 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 	 * 获取待压缩文件在ZIP文件中entry的名字，即相对于跟目录的相对路径名
 	 * @param dirPath 目录名
 	 * @param file entry文件名
-	 * @return
+	 * @return entry名字
 	 */
 	private static String getEntryName(String dirPath, File file) {
 		String dirPaths = dirPath;
@@ -842,8 +808,8 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 	
 	/**
 	 * 根据图片Base64获取文件扩展名
-	 * @param imageBase64
-	 * @return
+	 * @param imageBase64 图片编码内容
+	 * @return 图片文件的扩展名
 	 * @author ThinkGem
 	 */
 	public static String getFileExtensionByImageBase64(String imageBase64){
@@ -861,33 +827,28 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 	
     /**
      * 获取工程源文件所在路径
-     * @return
      */
     public static String getProjectPath(){
 		String projectPath = "";
 		try {
 			File file = ResourceUtils.getResource("").getFile();
-			if (file != null){
-				while(true){
-					File f = new File(path(file.getPath() + "/src/main"));
-					if (f.exists()){
-						break;
-					}
-					f = new File(path(file.getPath() + "/target/classes"));
-					if (f.exists()){
-						break;
-					}
-					File p = file.getParentFile();
-					if (p != null){
-						file = p;
-					}else{
-						break;
-					}
+			while (true) {
+				File f = new File(path(file.getPath() + "/src/main"));
+				if (f.exists()) {
+					break;
+				}
+				f = new File(path(file.getPath() + "/target/classes"));
+				if (f.exists()) {
+					break;
+				}
+				File p = file.getParentFile();
+				if (p != null) {
+					file = p;
+				} else {
+					break;
 				}
-				projectPath = file.toString();
 			}
-		} catch (FileNotFoundException e) {
-			// 忽略异常
+			projectPath = file.toString();
 		} catch (IOException e) {
 			// 忽略异常
 		}
@@ -900,33 +861,28 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
     
     /**
      * 获取工程源文件所在路径
-     * @return
      */
     public static String getWebappPath(){
     	String webappPath = "";
 		try {
 			File file = ResourceUtils.getResource("").getFile();
-			if (file != null){
-				while(true){
-					File f = new File(path(file.getPath() + "/WEB-INF/classes"));
-					if (f.exists()){
-						break;
-					}
-					f = new File(path(file.getPath() + "/src/main/webapp"));
-					if (f.exists()){
-						return f.getPath();
-					}
-					File p = file.getParentFile();
-					if (p != null){
-						file = p;
-					}else{
-						break;
-					}
+			while (true) {
+				File f = new File(path(file.getPath() + "/WEB-INF/classes"));
+				if (f.exists()) {
+					break;
+				}
+				f = new File(path(file.getPath() + "/src/main/webapp"));
+				if (f.exists()) {
+					return f.getPath();
+				}
+				File p = file.getParentFile();
+				if (p != null) {
+					file = p;
+				} else {
+					break;
 				}
-				webappPath = file.toString();
 			}
-		} catch (FileNotFoundException e) {
-			// 忽略异常
+			webappPath = file.toString();
 		} catch (IOException e) {
 			// 忽略异常
 		}

common/src/main/java/com/jeesite/common/io/IOUtils.java

@@ -4,6 +4,9 @@
  */
 package com.jeesite.common.io;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
@@ -15,71 +18,70 @@ import java.io.InputStream;
 /**
  * 数据流工具类
  * @author ThinkGem
+ * @version 2025-08-08
  */
 public class IOUtils extends org.apache.commons.io.IOUtils {
 
+	private static final Logger logger = LoggerFactory.getLogger(IOUtils.class);
+
 	/**
 	 * 根据文件路径创建文件输入流处理 以字节为单位（非 unicode ）
-	 * @param filePath
-	 * @return
+	 * @param filePath 文件路径
+	 * @return 文件流
 	 */
 	public static FileInputStream getFileInputStream(String filePath) {
 		FileInputStream fileInputStream = null;
 		try {
 			fileInputStream = new FileInputStream(filePath);
 		} catch (FileNotFoundException e) {
-			System.out.println("错误信息:文件不存在");
-			e.printStackTrace();
+			logger.error("文件不存在!", e);
 		}
 		return fileInputStream;
 	}
 
 	/**
 	 * 根据文件对象创建文件输入流处理 以字节为单位（非 unicode ）
-	 * @param file
-	 * @return
+	 * @param file 文件对象
+	 * @return 文件流
 	 */
 	public static FileInputStream getFileInputStream(File file) {
 		FileInputStream fileInputStream = null;
 		try {
 			fileInputStream = new FileInputStream(file);
 		} catch (FileNotFoundException e) {
-			System.out.println("错误信息:文件不存在");
-			e.printStackTrace();
+			logger.error("文件不存在!", e);
 		}
 		return fileInputStream;
 	}
 
 	/**
 	 * 根据文件对象创建文件输出流处理 以字节为单位（非 unicode ）
-	 * @param file
+	 * @param file 文件对象
 	 * @param append true:文件以追加方式打开,false:则覆盖原文件的内容
-	 * @return
+	 * @return 文件流
 	 */
 	public static FileOutputStream getFileOutputStream(File file, boolean append) {
 		FileOutputStream fileOutputStream = null;
 		try {
 			fileOutputStream = new FileOutputStream(file, append);
 		} catch (FileNotFoundException e) {
-			System.out.println("错误信息:文件不存在");
-			e.printStackTrace();
+			logger.error("文件不存在!", e);
 		}
 		return fileOutputStream;
 	}
 
 	/**
 	 * 根据文件路径创建文件输出流处理 以字节为单位（非 unicode ）
-	 * @param filePath
+	 * @param filePath 文件路径
 	 * @param append true:文件以追加方式打开,false:则覆盖原文件的内容
-	 * @return
+	 * @return 文件流
 	 */
 	public static FileOutputStream getFileOutputStream(String filePath, boolean append) {
 		FileOutputStream fileOutputStream = null;
 		try {
 			fileOutputStream = new FileOutputStream(filePath, append);
 		} catch (FileNotFoundException e) {
-			System.out.println("错误信息:文件不存在");
-			e.printStackTrace();
+			logger.error("文件不存在!", e);
 		}
 		return fileOutputStream;
 	}

common/src/main/java/com/jeesite/common/io/PropertiesUtils.java

@@ -30,7 +30,7 @@ import java.util.regex.Pattern;
  * 相同的属性在最后载入的文件中的值将会覆盖之前的值， 
  * 取不到从System.getProperty()获取。
  * @author ThinkGem
- * @version 2017-12-30
+ * @version 2025-4-17
  */
 public class PropertiesUtils {
 	
@@ -64,8 +64,11 @@ public class PropertiesUtils {
 			// 获取全局设置默认的配置文件（以下是支持环境配置的属性文件）
 			Set<String> set = SetUtils.newLinkedHashSet();
 			set.addAll(Arrays.asList(DEFAULT_CONFIG_FILE));
-			// 获取 spring.config.location 外部自定义的配置文件
+			// 获取 spring.config.location、spring.config.additional-location 外部自定义的配置文件
 			String customConfigs = System.getProperty("spring.config.location");
+			if (StringUtils.isBlank(customConfigs)){
+				customConfigs = System.getProperty("spring.config.additional-location");
+			}
 			if (StringUtils.isNotBlank(customConfigs)){
 				for (String customConfig : StringUtils.splitComma(customConfigs)){
 					if (!customConfig.contains("$")){

common/src/main/java/com/jeesite/common/lang/DateUtils.java

@@ -15,7 +15,7 @@ import java.util.Date;
 /**
  * 日期工具类, 继承org.apache.commons.lang.time.DateUtils类
  * @author ThinkGem
- * @version 2017-1-4
+ * @version 2025-08-08
  */
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 
@@ -179,8 +179,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 
 	/**
 	 * 获取过去的天数
-	 * @param date
-	 * @return
+	 * @param date 日期
 	 */
 	public static long pastDays(Date date) {
 		long t = System.currentTimeMillis()-date.getTime();
@@ -189,8 +188,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 
 	/**
 	 * 获取过去的小时
-	 * @param date
-	 * @return
+	 * @param date 日期
 	 */
 	public static long pastHour(Date date) {
 		long t = System.currentTimeMillis()-date.getTime();
@@ -199,8 +197,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	
 	/**
 	 * 获取过去的分钟
-	 * @param date
-	 * @return
+	 * @param date 日期
 	 */
 	public static long pastMinutes(Date date) {
 		long t = System.currentTimeMillis()-date.getTime();
@@ -209,15 +206,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
     
 	/**
 	 * 获取两个日期之间的天数
-	 * 
-	 * @param before
-	 * @param after
-	 * @return
+	 * @param before 开始日期
+	 * @param after 结束日期
 	 */
 	public static double getDistanceOfTwoDate(Date before, Date after) {
 		long beforeTime = before.getTime();
 		long afterTime = after.getTime();
-		return (afterTime - beforeTime) / (1000 * 60 * 60 * 24);
+		return (double) (afterTime - beforeTime) / (1000 * 60 * 60 * 24);
 	}
 	
 	/**
@@ -250,8 +245,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	
 	/**
 	 * 获取日期是当年的第几周
-	 * @param date
-	 * @return
+	 * @param date 日期
 	 */
 	public static int getWeekOfYear(Date date){
 		Calendar cal = Calendar.getInstance(LocaleUtils.getTimeZone(), LocaleUtils.getLocale());
@@ -262,7 +256,6 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	/**
 	 * 获取一天的开始时间（如：2015-11-3 00:00:00.000）
 	 * @param date 日期
-	 * @return
 	 */
 	public static Date getOfDayFirst(Date date) {
 		if (date == null){
@@ -280,7 +273,6 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	/**
 	 * 获取一天的最后时间（如：2015-11-3 23:59:59.999）
 	 * @param date 日期
-	 * @return
 	 */
 	public static Date getOfDayLast(Date date) {
 		if (date == null){
@@ -297,7 +289,6 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	
 	/**
 	 * 获取服务器启动时间
-	 * @return
 	 */
 	public static Date getServerStartDate(){
 		long time = ManagementFactory.getRuntimeMXBean().getStartTime();

common/src/main/java/com/jeesite/common/lang/ExceptionUtils.java

@@ -19,8 +19,7 @@ public class ExceptionUtils {
 
 	/**
 	 * 在request中获取异常类
-	 * @param request
-	 * @return 
+	 * @param request 请求对象
 	 */
 	public static Throwable getThrowable(HttpServletRequest request){
 		Throwable ex = null;

common/src/main/java/com/jeesite/common/lang/NumberUtils.java

@@ -79,7 +79,6 @@ public class NumberUtils extends org.apache.commons.lang3.math.NumberUtils {
 
 	/**
 	 * 格式化双精度，保留两个小数
-	 * @return
 	 */
 	public static String formatDouble(Double b) {
 		BigDecimal bg = new BigDecimal(b);
@@ -88,7 +87,6 @@ public class NumberUtils extends org.apache.commons.lang3.math.NumberUtils {
 
 	/**
 	 * 百分比计算
-	 * @return
 	 */
 	public static String formatScale(double one, long total) {
 		BigDecimal bg = new BigDecimal(one * 100 / total);
@@ -97,8 +95,6 @@ public class NumberUtils extends org.apache.commons.lang3.math.NumberUtils {
 	
 	/**
 	 * 格式化数值类型
-	 * @param data
-	 * @param pattern
 	 */
 	public static String formatNumber(Object data, String pattern) {
 		if (data == null){

common/src/main/java/com/jeesite/common/lang/StringUtils.java

@@ -270,7 +270,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 	}
 	
 	/**
-	 * 驼峰命名法工具
+	 * 转换为驼峰命名法
 	 * @return
 	 * 		camelCase("hello_world") == "helloWorld" 
 	 * 		capCamelCase("hello_world") == "HelloWorld"
@@ -283,37 +283,35 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         s = s.toLowerCase();
         StringBuilder sb = new StringBuilder(s.length());
         boolean upperCase = false;
-        for (int i = 0; i < s.length(); i++) {
+        for (int i = 0, j = 0; i < s.length(); i++) {
             char c = s.charAt(i);
             if (c == UNDERLINE.charAt(0) || c == MINUS.charAt(0)) {
-                upperCase = i != 1; // 不允许第二个字符是大写
+                upperCase = j > 1; // 不允许第二个字符是大写
             } else if (upperCase) {
                 sb.append(Character.toUpperCase(c));
                 upperCase = false;
+				j++;
             } else {
                 sb.append(c);
+				j++;
             }
         }
         return sb.toString();
     }
 
     /**
-	 * 驼峰命名法工具
+	 * 转换为驼峰命名法（首字母大写）
 	 * @return
 	 * 		camelCase("hello_world") == "helloWorld" 
 	 * 		capCamelCase("hello_world") == "HelloWorld"
 	 * 		uncamelCase("helloWorld") = "hello_world"
 	 */
     public static String capCamelCase(String s) {
-        if (s == null) {
-            return null;
-        }
-        s = camelCase(s);
-        return s.substring(0, 1).toUpperCase() + s.substring(1);
+        return cap(camelCase(s));
     }
     
     /**
-	 * 驼峰命名法工具
+	 * 取消驼峰命名发
 	 * @return
 	 * 		camelCase("hello_world") == "helloWorld" 
 	 * 		capCamelCase("hello_world") == "HelloWorld"

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

common/src/main/java/com/jeesite/common/media/VideoUtils.java

@@ -21,7 +21,7 @@ import java.util.List;
  */
 public class VideoUtils {
 
-	private static final Logger log = LoggerFactory.getLogger(VideoUtils.class);
+	private static final Logger logger = LoggerFactory.getLogger(VideoUtils.class);
 	private static String ffmpegFile; 		// ffmpeg.exe所放的路径
 	private static String mencoderFile;		//  mencoder.exe所放的路径
 	private static String qtFaststartFile;	//  qt-faststart.exe所放的路径
@@ -111,10 +111,10 @@ public class VideoUtils {
 				}
 			} catch (Exception e) {
 				statusTemp = false;
-				log.error("视频剪切图片失败", e);
+				logger.error("视频剪切图片失败", e);
 			}
 		}
-		log.debug("视频剪切图片" + (statusTemp ? "成功" : "失败") + "，用时：" + TimeUtils.formatTime(System.currentTimeMillis() - startTime));
+		logger.debug("视频剪切图片" + (statusTemp ? "成功" : "失败") + "，用时：" + TimeUtils.formatTime(System.currentTimeMillis() - startTime));
 		return statusTemp;
 	}
 
@@ -128,19 +128,19 @@ public class VideoUtils {
 		int type = checkContentType();
 		String tempFile = outputFile + ".tmp";
 		if (statusTemp && type == 0) {
-			log.debug("使用ffmpage进行视频转换");
+			logger.debug("使用ffmpage进行视频转换");
 			statusTemp = processFfmpeg(inputFile, tempFile);
 		} else if (statusTemp && type == 1) {
-			log.debug("使用mencoder进行视频转换");
+			logger.debug("使用mencoder进行视频转换");
 			statusTemp = processMencoder(inputFile, tempFile);
 		}
 		if (statusTemp){
-			log.debug("将mp4视频的元数据信息转到视频第一帧");
+			logger.debug("将mp4视频的元数据信息转到视频第一帧");
 			statusTemp = processQtFaststart(tempFile, outputFile);
 		}
-		log.debug("删除临时文件");
+		logger.debug("删除临时文件");
 		FileUtils.deleteFile(tempFile);
-		log.debug("视频转换" + (statusTemp ? "成功" : "失败") + "，用时：" + TimeUtils.formatTime(System.currentTimeMillis() - startTime));
+		logger.debug("视频转换{}，用时：{}", statusTemp ? "成功" : "失败", TimeUtils.formatTime(System.currentTimeMillis() - startTime));
 		return statusTemp;
 	}
 
@@ -152,7 +152,7 @@ public class VideoUtils {
 	public boolean checkfile(String inputFile) {
 		File file = new File(inputFile);
 		if (!file.isFile() || !file.exists()) {
-			log.warn("文件不存在！");
+			logger.warn("文件不存在！");
 			return false;
 		}
 		return true;
@@ -279,18 +279,18 @@ public class VideoUtils {
 	 */
 	private boolean process(List<String> command) {
 		try {
-			log.debug(StringUtils.join(command, StringUtils.SPACE));
+			logger.debug(StringUtils.join(command, StringUtils.SPACE));
 //			Process process = new ProcessBuilder(command).redirectErrorStream(true).start();
-			Process process = Runtime.getRuntime().exec(command.toArray(new String[command.size()]));
+			Process process = Runtime.getRuntime().exec(command.toArray(new String[0]));
 			new PrintErrorReader(process.getErrorStream()).start();
 			new PrintInputStream(process.getInputStream()).start();
 			process.waitFor();
 			return true;
 		} catch (Exception e) {
 			if (StringUtils.contains(e.getMessage(), "CreateProcess error=2")){
-				log.error("缺少视频转换工具，请配置video.ffmpegFile相关参数。" + e.getMessage());
+				logger.error("缺少视频转换工具，请配置video.ffmpegFile相关参数。{}", e.getMessage());
 			}else{
-				log.error(e.getMessage(), e);
+				logger.error(e.getMessage(), e);
 			}
 			return false;
 		}
@@ -406,10 +406,10 @@ public class VideoUtils {
 				BufferedReader br = new BufferedReader(new InputStreamReader(__is));
 				String line = null;
 				while ((line = br.readLine()) != null) {
-					log.debug(line);
+					logger.debug(line);
 				}
 			} catch (Exception e) {
-				e.printStackTrace();
+				logger.error(e.getMessage(), e);
 			}
 		}
 	}
@@ -427,10 +427,10 @@ public class VideoUtils {
 				BufferedReader br = new BufferedReader(new InputStreamReader(__is));
 				String line = null;
 				while ((line = br.readLine()) != null) {
-					log.error(line);
+					logger.error(line);
 				}
 			} catch (Exception e) {
-				e.printStackTrace();
+				logger.error(e.getMessage(), e);
 			}
 		}
 	}

common/src/main/java/com/jeesite/common/msg/EmailUtils.java

@@ -13,6 +13,7 @@ import com.jeesite.common.io.PropertiesUtils;
 
 /**
  * 发送电子邮件
+ * @author ThinkGem
  */
 public class EmailUtils {
 

common/src/main/java/com/jeesite/common/msg/SmsUtils.java

@@ -1,3 +1,7 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ */
 package com.jeesite.common.msg;
 
 import org.slf4j.Logger;
@@ -5,6 +9,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * 发送短信（请实现send方法）
+ * @author ThinkGem
  */
 public class SmsUtils {
 

common/src/main/java/com/jeesite/common/network/IpUtils.java

@@ -1,3 +1,7 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ */
 package com.jeesite.common.network;
 
 import com.jeesite.common.codec.EncodeUtils;
@@ -6,12 +10,15 @@ import com.jeesite.common.lang.StringUtils;
 
 import jakarta.servlet.http.HttpServletRequest;
 
+/**
+ * IP 地址工具
+ * @author ThinkGem
+ */
 public class IpUtils {
 
 	/**
 	 * 获取客户端IP地址
-	 * @param request
-	 * @return
+	 * @param request 请求对象
 	 */
 	public static String getRemoteAddr(HttpServletRequest request) {
 		if (request == null) {
@@ -38,8 +45,7 @@ public class IpUtils {
 	
 	/**
 	 * 是否是本地地址
-	 * @param ip
-	 * @return
+	 * @param ip 地址
 	 */
 	public static boolean isLocalAddr(String ip){
 		return StringUtils.inString(ip, "127.0.0.1", "0:0:0:0:0:0:0:1");
@@ -47,13 +53,12 @@ public class IpUtils {
 
 	/**
 	 * 判断IP地址为内网IP还是公网IP
-	 * 
+	 * <br>
 	 * tcp/ip协议中，专门保留了三个IP地址区域作为私有地址，其地址范围如下：
 	 * 10.0.0.0/8：10.0.0.0～10.255.255.255
 	 * 172.16.0.0/12：172.16.0.0～172.31.255.255
 	 * 192.168.0.0/16：192.168.0.0～192.168.255.255
-	 * 
-	 * @param ip
+	 * @param ip 地址
 	 * @return
 	 */
 	public static boolean isInternalAddr(String ip) {

common/src/main/java/com/jeesite/common/network/MacUtils.java

@@ -4,18 +4,22 @@
  */
 package com.jeesite.common.network;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
 /**
  * MAC地址工具
- * 
  * @author ThinkGem
  * @version 2014-6-18
  */
 public class MacUtils {
 
+	private static final Logger logger = LoggerFactory.getLogger(MacUtils.class);
+
 	/**
 	 * 获取当前操作系统名称. return 操作系统名称 例如:windows,Linux,Unix等.
 	 */
@@ -25,7 +29,6 @@ public class MacUtils {
 
 	/**
 	 * 获取Unix网卡的mac地址.
-	 * 
 	 * @return mac地址
 	 */
 	public static String getUnixMACAddress() {
@@ -33,39 +36,31 @@ public class MacUtils {
 		BufferedReader bufferedReader = null;
 		Process process = null;
 		try {
-			/**
-			 * Unix下的命令，一般取eth0作为本地主网卡 显示信息中包含有mac地址信息
-			 */
+			// Unix下的命令，一般取eth0作为本地主网卡 显示信息中包含有mac地址信息
 			process = Runtime.getRuntime().exec("ifconfig eth0");
 			bufferedReader = new BufferedReader(new InputStreamReader(
 					process.getInputStream()));
 			String line = null;
 			int index = -1;
 			while ((line = bufferedReader.readLine()) != null) {
-				/**
-				 * 寻找标示字符串[hwaddr]
-				 */
+				// 寻找标示字符串[hwaddr]
 				index = line.toLowerCase().indexOf("hwaddr");
-				/**
-				 * 找到了
-				 */
+				// 找到了
 				if (index != -1) {
-					/**
-					 * 取出mac地址并去除2边空格
-					 */
+					// 取出mac地址并去除2边空格
 					mac = line.substring(index + "hwaddr".length() + 1).trim();
 					break;
 				}
 			}
 		} catch (IOException e) {
-			e.printStackTrace();
+			logger.error(e.getMessage());
 		} finally {
 			try {
 				if (bufferedReader != null) {
 					bufferedReader.close();
 				}
 			} catch (IOException e1) {
-				e1.printStackTrace();
+				// ignore
 			}
 			bufferedReader = null;
 			process = null;
@@ -84,9 +79,7 @@ public class MacUtils {
 		BufferedReader bufferedReader = null;
 		Process process = null;
 		try {
-			/**
-			 * linux下的命令，一般取eth0作为本地主网卡 显示信息中包含有mac地址信息
-			 */
+			// linux下的命令，一般取eth0作为本地主网卡 显示信息中包含有mac地址信息
 			process = Runtime.getRuntime().exec("ifconfig eth0");
 			bufferedReader = new BufferedReader(new InputStreamReader(
 					process.getInputStream()));
@@ -94,26 +87,22 @@ public class MacUtils {
 			int index = -1;
 			while ((line = bufferedReader.readLine()) != null) {
 				index = line.toLowerCase().indexOf("硬件地址");
-				/**
-				 * 找到了
-				 */
+				// 找到了
 				if (index != -1) {
-					/**
-					 * 取出mac地址并去除2边空格
-					 */
+					// 取出mac地址并去除2边空格
 					mac = line.substring(index + 4).trim();
 					break;
 				}
 			}
 		} catch (IOException e) {
-			e.printStackTrace();
+			logger.error(e.getMessage());
 		} finally {
 			try {
 				if (bufferedReader != null) {
 					bufferedReader.close();
 				}
 			} catch (IOException e1) {
-				e1.printStackTrace();
+				// ignore
 			}
 			bufferedReader = null;
 			process = null;
@@ -129,7 +118,6 @@ public class MacUtils {
 
 	/**
 	 * 获取widnows网卡的mac地址.
-	 * 
 	 * @return mac地址
 	 */
 	public static String getWindowsMACAddress() {
@@ -137,37 +125,31 @@ public class MacUtils {
 		BufferedReader bufferedReader = null;
 		Process process = null;
 		try {
-			/**
-			 * windows下的命令，显示信息中包含有mac地址信息
-			 */
+			// windows下的命令，显示信息中包含有mac地址信息
 			process = Runtime.getRuntime().exec("ipconfig /all");
 			bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream()));
 			String line = null;
 			int index = -1;
 			while ((line = bufferedReader.readLine()) != null) {
-				/**
-				 * 寻找标示字符串[physical address 或  物理地址]
-				 */
+				// 寻找标示字符串[physical address 或  物理地址]
 				if (line.split("-").length == 6){
 					index = line.indexOf(":");
 					if (index != -1) {
-						/**
-						 * 取出mac地址并去除2边空格
-						 */
+						// 取出mac地址并去除2边空格
 						mac = line.substring(index + 1).trim();
 					}
 					break;
 				}
 			}
 		} catch (IOException e) {
-			e.printStackTrace();
+			logger.error(e.getMessage());
 		} finally {
 			try {
 				if (bufferedReader != null) {
 					bufferedReader.close();
 				}
 			} catch (IOException e1) {
-				e1.printStackTrace();
+				// ignore
 			}
 			bufferedReader = null;
 			process = null;

common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java

@@ -21,7 +21,7 @@ import java.util.Map;
 /**
  * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
  * @author calvin、ThinkGem
- * @version 2023-2-6
+ * @version 2025-08-08
  */
 @SuppressWarnings("rawtypes")
 public class ReflectUtils {
@@ -112,7 +112,7 @@ public class ReflectUtils {
 		if (field == null) {
 			//throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
 			if (obj != null) {
-				logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
+				logger.debug("在 [{}] 中，没有找到 [{}] 字段 ", obj.getClass(), fieldName);
 			}
 			return null;
 		}
@@ -132,7 +132,7 @@ public class ReflectUtils {
 		Field field = getAccessibleField(obj, fieldName);
 		if (field == null) {
 			//throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
-			logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
+			logger.debug("在 [{}] 中，没有找到 [{}] 字段 ", obj.getClass(), fieldName);
 			return;
 		}
 		try {
@@ -157,9 +157,7 @@ public class ReflectUtils {
 		Method method = getAccessibleMethod(obj, methodName, parameterTypes);
 		if (method == null) {
 			//throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 ");
-			if (obj != null) {
-				logger.debug("在 [" + (obj.getClass() == Class.class ? obj : obj.getClass()) + "] 中，没有找到 [" + methodName + "] 方法 ");
-			}
+			logger.debug("在 [{}] 中，没有找到 [{}] 方法 ", obj.getClass() == Class.class ? obj : obj.getClass(), methodName);
 			return null;
 		}
 		try {
@@ -182,7 +180,7 @@ public class ReflectUtils {
 		if (method == null) {
 			// 如果为空不报错，直接返回空。 throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 ");
 			if (obj != null) {
-				logger.debug("在 [" + (obj.getClass() == Class.class ? obj : obj.getClass()) + "] 中，没有找到 [" + methodName + "] 方法 ");
+				logger.debug("在 [{}] 中，没有找到 [{}] 方法 ", obj.getClass() == Class.class ? obj : obj.getClass(), methodName);
 			}
 			return null;
 		}
@@ -252,7 +250,7 @@ public class ReflectUtils {
 						args[i] = DateUtil.getJavaDate((Double) args[i]);
 					}
 				}else{
-					System.out.println(cs[i] + "    " + args[i]);
+					logger.debug("class: {}, args: {}", cs[i], args[i]);
 				}
 			}
 		}
@@ -405,17 +403,16 @@ public class ReflectUtils {
 	public static Class getClassGenricType(final Class clazz, final int index) {
 		Type genType = clazz.getGenericSuperclass();
 		if (!(genType instanceof ParameterizedType)) {
-			logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType");
+			logger.debug("{}'s superclass not ParameterizedType", clazz.getSimpleName());
 			return Object.class;
 		}
 		Type[] params = ((ParameterizedType) genType).getActualTypeArguments();
 		if (index >= params.length || index < 0) {
-			logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: "
-					+ params.length);
+			logger.debug("Index: {}, Size of {}'s Parameterized Type: {}", index, clazz.getSimpleName(), params.length);
 			return Object.class;
 		}
 		if (!(params[index] instanceof Class)) {
-			logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter");
+			logger.debug("{} not set the actual class on superclass generic parameter", clazz.getSimpleName());
 			return Object.class;
 		}
 		return (Class) params[index];
@@ -429,7 +426,7 @@ public class ReflectUtils {
 			throw new RuntimeException("Instance must not be null");
 		}
 		Class clazz = instance.getClass();
-		if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) {
+		if (clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) {
 			Class<?> superClass = clazz.getSuperclass();
 			if (superClass != null && !Object.class.equals(superClass)) {
 				return superClass;

common/src/main/java/com/jeesite/common/text/PinyinUtils.java

@@ -1,3 +1,7 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ */
 package com.jeesite.common.text;
 
 import net.sourceforge.pinyin4j.PinyinHelper;
@@ -6,6 +10,8 @@ import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
 import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
 import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType;
 import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.regex.Pattern;
 
@@ -14,10 +20,12 @@ import java.util.regex.Pattern;
  * @author ThinkGem
  */
 public class PinyinUtils {
-	
+
+	private static final Logger logger = LoggerFactory.getLogger(PinyinUtils.class);
+
 	private static class Static{
-		private static Pattern idPatt = Pattern.compile("\\W");
-		private static HanyuPinyinOutputFormat defaultFormat;
+		private static final Pattern idPat = Pattern.compile("\\W");
+		private static final HanyuPinyinOutputFormat defaultFormat;
 		static{
 			defaultFormat = new HanyuPinyinOutputFormat();
 			defaultFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE);
@@ -46,28 +54,28 @@ public class PinyinUtils {
 		if (chinese == null){
 			return null;
 		}
-		StringBuffer pybf = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		char[] arr = chinese.toCharArray();
-		for (int i = 0; i < arr.length; i++) {
-			if (arr[i] > 128) {
+		for (char c : arr) {
+			if (c > 128) {
 				try {
-					String[] temp = PinyinHelper.toHanyuPinyinStringArray(arr[i], Static.defaultFormat);
+					String[] temp = PinyinHelper.toHanyuPinyinStringArray(c, Static.defaultFormat);
 					if (temp != null && temp.length > 0) {
-						pybf.append(temp[0].charAt(0));
-					}else{
-						pybf.append(String.valueOf(arr[i]));
+						sb.append(temp[0].charAt(0));
+					} else {
+						sb.append(String.valueOf(c));
 					}
 				} catch (BadHanyuPinyinOutputFormatCombination e) {
-					e.printStackTrace();
+					logger.error(e.getMessage(), e);
 				}
 			} else {
-				pybf.append(arr[i]);
+				sb.append(c);
 			}
 		}
 		if (isId){
-			return Static.idPatt.matcher(pybf.toString()).replaceAll("").trim();
+			return Static.idPat.matcher(sb.toString()).replaceAll("").trim();
 		}
-		return pybf.toString();
+		return sb.toString();
 	}
 
 	/**
@@ -90,28 +98,28 @@ public class PinyinUtils {
 		if (chinese == null){
 			return null;
 		}
-		StringBuffer pybf = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		char[] arr = chinese.toCharArray();
-		for (int i = 0; i < arr.length; i++) {
-			if (arr[i] > 128) {
+		for (char c : arr) {
+			if (c > 128) {
 				try {
-					String[] ss = PinyinHelper.toHanyuPinyinStringArray(arr[i], Static.defaultFormat);
-					if (ss != null && ss.length > 0){
-						pybf.append(ss[0]);
-					}else{
-						pybf.append(String.valueOf(arr[i]));
+					String[] ss = PinyinHelper.toHanyuPinyinStringArray(c, Static.defaultFormat);
+					if (ss != null && ss.length > 0) {
+						sb.append(ss[0]);
+					} else {
+						sb.append(String.valueOf(c));
 					}
 				} catch (BadHanyuPinyinOutputFormatCombination e) {
-					e.printStackTrace();
+					logger.error(e.getMessage(), e);
 				}
 			} else {
-				pybf.append(arr[i]);
+				sb.append(c);
 			}
 		}
 		if (isId){
-			return Static.idPatt.matcher(pybf.toString()).replaceAll("").trim();
+			return Static.idPat.matcher(sb.toString()).replaceAll("").trim();
 		}
-		return pybf.toString();
+		return sb.toString();
 	}
 	
 	/**
@@ -143,7 +151,7 @@ public class PinyinUtils {
 		if (input == null){
 			return null;
 		}
-		char c[] = input.toCharArray();
+		char[] c = input.toCharArray();
 		for (int i = 0; i < c.length; i++) {
 			if (c[i] == '\u3000') {
 				c[i] = ' ';

common/src/main/java/com/jeesite/common/utils/IdcardUtils.java

@@ -27,11 +27,11 @@ public class IdcardUtils {
 			"62", "63", "64", "65", "71", "81", "82", "91" };
 
 	/** 每位加权因子 */
-	public static final int power[] = { 7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9,
+	public static final int[] power = { 7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9,
 			10, 5, 8, 4, 2 };
 
 	/** 第18位校检码 */
-	public static final String verifyCode[] = { "1", "0", "X", "9", "8", "7",
+	public static final String[] verifyCode = { "1", "0", "X", "9", "8", "7",
 			"6", "5", "4", "3", "2" };
 	/** 最低年限 */
 	public static final int MIN = 1930;
@@ -116,9 +116,7 @@ public class IdcardUtils {
 
 	/**
 	 * 将15位身份证号码转换为18位
-	 * 
-	 * @param idCard
-	 *            15位身份编码
+	 * @param idCard 15位身份编码
 	 * @return 18位身份编码
 	 */
 	public static String conver15CardTo18(String idCard) {

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;
 	}

common/src/main/java/com/jeesite/common/utils/ThreadUtils.java

@@ -22,7 +22,6 @@ public class ThreadUtils {
 			Thread.sleep(millis);
 		} catch (InterruptedException e) {
 			// Ignore.
-			return;
 		}
 	}
 
@@ -34,7 +33,6 @@ public class ThreadUtils {
 			Thread.sleep(unit.toMillis(duration));
 		} catch (InterruptedException e) {
 			// Ignore.
-			return;
 		}
 	}
 

common/src/main/java/com/jeesite/common/utils/excel/ExcelExport.java

@@ -509,7 +509,7 @@ public class ExcelExport implements Closeable{
 				cell.setCellStyle(style);
 //			}
 		} catch (Exception ex) {
-			log.info("Set cell value ["+row.getRowNum()+","+column+"] error: " + ex.toString());
+			log.info("Set cell value [{},{}] error: {}", row.getRowNum(), column, ex.toString());
 			cell.setCellValue(ObjectUtils.toString(val));
 		}
 		return cell;
@@ -581,7 +581,7 @@ public class ExcelExport implements Closeable{
 				this.addCell(row, colunm++, val, ef.align(), ef.fieldType(), ef.dataFormat());
 				sb.append(val + ", ");
 			}
-			log.debug("Write success: ["+row.getRowNum()+"] "+sb.toString());
+			log.debug("Write success: [{}] {}", row.getRowNum(), sb.toString());
 		}
 		return this;
 	}
@@ -633,7 +633,7 @@ public class ExcelExport implements Closeable{
 //		try {
 //			this.close();
 //		} catch (Exception e) {
-//			e.printStackTrace();
+//			log.error(e.getMessage(), e);
 //		}
 //		return this;
 //	}
@@ -647,7 +647,7 @@ public class ExcelExport implements Closeable{
 		try {
 			wb.close();
 		} catch (IOException e) {
-			e.printStackTrace();
+			log.error(e.getMessage(), e);
 		}
 	}
 

common/src/main/java/com/jeesite/common/utils/excel/ExcelImport.java

@@ -305,7 +305,7 @@ public class ExcelImport implements Closeable {
 					if (DateUtil.isCellDateFormatted(cell)) {
 						val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换
 					}else{
-						if ((Double) val % 1 > 0){
+						if (Math.abs((double)val % 1) > 1E-10){
 							val = new DecimalFormat("0.00").format(val);
 						}else{
 							val = new DecimalFormat("0").format(val);
@@ -465,7 +465,7 @@ public class ExcelImport implements Closeable {
 							//val = DictUtils.getDictValue(val.toString(), ef.dictType(), "");
 							//log.debug("Dictionary type value: ["+i+","+colunm+"] " + val);
 						} catch (Exception ex) {
-							log.info("Get cell value ["+i+","+column+"] error: " + ex.toString());
+							log.info("Get cell value [{},{}] error: {}", i, column, ex.toString());
 							val = null;
 						}
 					}
@@ -557,7 +557,7 @@ public class ExcelImport implements Closeable {
 				sb.append(val+", ");
 			}
 			dataList.add(e);
-			log.debug("Read success: ["+i+"] "+sb.toString());
+			log.debug("Read success: [{}] {}", i, sb.toString());
 		}
 		return dataList;
 	}
@@ -577,7 +577,7 @@ public class ExcelImport implements Closeable {
 		try {
 			wb.close();
 		} catch (IOException e) {
-			e.printStackTrace();
+			log.error(e.getMessage(), e);
 		}
 	}
 

common/src/main/java/com/jeesite/common/utils/excel/fieldtype/BigDecimalType.java

@@ -8,7 +8,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 
-
 /**
  * BigDecimal类型转换
  * @author ThinkGem

common/src/main/java/com/jeesite/common/utils/excel/fieldtype/MoneyType.java

@@ -9,7 +9,6 @@ import java.text.NumberFormat;
 
 import org.apache.commons.lang3.StringUtils;
 
-
 /**
  * 金额类型转换（保留两位）
  * @author ThinkGem

common/src/main/java/com/jeesite/common/utils/word/WordExport.java

@@ -1,10 +1,17 @@
 package com.jeesite.common.utils.word;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import com.jeesite.common.io.ResourceUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.openxml4j.opc.OPCPackage;
+import org.apache.poi.xwpf.usermodel.*;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHeight;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTrPr;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Node;
+
+import java.io.*;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -12,22 +19,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.apache.poi.xwpf.usermodel.XWPFRun;
-import org.apache.poi.xwpf.usermodel.XWPFTable;
-import org.apache.poi.xwpf.usermodel.XWPFTableCell;
-import org.apache.poi.xwpf.usermodel.XWPFTableRow;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHeight;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTrPr;
-import org.w3c.dom.Node;
-
-import com.jeesite.common.io.ResourceUtils;
-
 /**
  * 使用POI,进行Word相关的操作
  * @author  xuyu
@@ -38,6 +29,8 @@ import com.jeesite.common.io.ResourceUtils;
  */
 public class WordExport {
 
+	private static final Logger log = LoggerFactory.getLogger(WordExport.class);
+
 	/** 内部使用的文档对象 **/
 	private XWPFDocument document;
 
@@ -57,7 +50,7 @@ public class WordExport {
 			}
 			bookMarks = new BookMarks(document);
 		} catch (IOException | InvalidFormatException e) {
-			e.printStackTrace();
+			log.error(e.getMessage(), e);
 		}
 	}
 
@@ -224,10 +217,8 @@ public class WordExport {
 		try {
 			fos = new FileOutputStream(newFile);
 			this.document.write(fos);
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
 		} catch (IOException e) {
-			e.printStackTrace();
+			log.error(e.getMessage(), e);
 		} finally {
 			try {
 				if (fos != null){
@@ -237,7 +228,7 @@ public class WordExport {
 					fos.close();
 				}
 			} catch (IOException e) {
-				e.printStackTrace();
+				log.error(e.getMessage(), e);
 			}
 		}
 	}

common/src/main/resources/static/common/h5fix.min.js

@@ -1,7 +0,0 @@
-/*! Respond.js v1.4.2: min/max-width media query polyfill Copyright 2014 Scott Jehl  Licensed under MIT  http://j.mp/respondjs */
-//https://oss.maxcdn.com/respond/1.4.2/respond.min.js
-!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){v(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))},g=function(a){return a.replace(c.regex.minmaxwh,"").match(c.regex.other)};if(c.ajax=f,c.queue=d,c.unsupportedmq=g,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,comments:/\/\*[^*]*\*+([^/][^*]*\*+)*\//gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\(\s*min\-width\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/,maxw:/\(\s*max\-width\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/,minmaxwh:/\(\s*m(in|ax)\-(height|width)\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/gi,other:/\([^\)]*\)/g},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var h,i,j,k=a.document,l=k.documentElement,m=[],n=[],o=[],p={},q=30,r=k.getElementsByTagName("head")[0]||l,s=k.getElementsByTagName("base")[0],t=r.getElementsByTagName("link"),u=function(){var a,b=k.createElement("div"),c=k.body,d=l.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=k.createElement("body"),c.style.background="none"),l.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&l.insertBefore(c,l.firstChild),a=b.offsetWidth,f?l.removeChild(c):c.removeChild(b),l.style.fontSize=d,e&&(c.style.fontSize=e),a=j=parseFloat(a)},v=function(b){var c="clientWidth",d=l[c],e="CSS1Compat"===k.compatMode&&d||k.body[c]||d,f={},g=t[t.length-1],p=(new Date).getTime();if(b&&h&&q>p-h)return a.clearTimeout(i),i=a.setTimeout(v,q),void 0;h=p;for(var s in m)if(m.hasOwnProperty(s)){var w=m[s],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?j||u():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?j||u():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(n[w.rules]))}for(var C in o)o.hasOwnProperty(C)&&o[C]&&o[C].parentNode===r&&r.removeChild(o[C]);o.length=0;for(var D in f)if(f.hasOwnProperty(D)){var E=k.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,r.insertBefore(E,g.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(k.createTextNode(F)),o.push(E)}},w=function(a,b,d){var e=a.replace(c.regex.comments,"").replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var h=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},i=!f&&d;b.length&&(b+="/"),i&&(f=1);for(var j=0;f>j;j++){var k,l,o,p;i?(k=d,n.push(h(a))):(k=e[j].match(c.regex.findStyles)&&RegExp.$1,n.push(RegExp.$2&&h(RegExp.$2))),o=k.split(","),p=o.length;for(var q=0;p>q;q++)l=o[q],g(l)||m.push({media:l.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:n.length-1,hasquery:l.indexOf("(")>-1,minw:l.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:l.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}v()},x=function(){if(d.length){var b=d.shift();f(b.href,function(c){w(c,b.href,b.media),p[b.href]=!0,a.setTimeout(function(){x()},0)})}},y=function(){for(var b=0;b<t.length;b++){var c=t[b],e=c.href,f=c.media,g=c.rel&&"stylesheet"===c.rel.toLowerCase();e&&g&&!p[e]&&(c.styleSheet&&c.styleSheet.rawCssText?(w(c.styleSheet.rawCssText,e,f),p[e]=!0):(!/^([a-zA-Z:]*\/\/)/.test(e)&&!s||e.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&("//"===e.substring(0,2)&&(e=a.location.protocol+e),d.push({href:e,media:f})))}x()};y(),c.update=y,c.getEmValue=u,a.addEventListener?a.addEventListener("resize",b,!1):a.attachEvent&&a.attachEvent("onresize",b)}}(this);
-
-/*! @preserve HTML5 Shiv 3.7.3 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed */
-//https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js
-!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l)return c.createElement(a);d||(d=f(c));var e;return e=d.cache[a]?d.cache[a].cloneNode():p.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||o.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function h(a,c){if(a||(a=b),l)return a.createDocumentFragment();c=c||f(a);for(var e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return e}function i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return t.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(t,b.frag)}function j(a){a||(a=b);var d=f(a);return!t.shivCSS||k||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),l||i(a,d),a}var k,l,m="3.7.3",n=a.html5||{},o=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,p=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,q="_html5shiv",r=0,s={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",k="hidden"in a,l=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){k=!0,l=!0}}();var t={elements:n.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:m,shivCSS:n.shivCSS!==!1,supportsUnknownElements:l,shivMethods:n.shivMethods!==!1,type:"default",shivDocument:j,createElement:g,createDocumentFragment:h,addElements:e};a.html5=t,j(b),"object"==typeof module&&module.exports&&(module.exports=t)}("undefined"!=typeof window?window:this,document);

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];

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];

common/src/main/resources/static/upbw/index.html

@@ -16,8 +16,8 @@ span{display:block;font-size:12px;line-height:12px;}
 .clean{clear:both;}
 </style></head><body>
 <h1>浏览器版本过低，是时候升级您的浏览器了</h1>
-<p>本系统 <a href="http://jeesite.com">JeeSite</a> 支持 IE9 及以上版本及其他所有现代浏览器，如：谷歌浏览器、火狐浏览器、国产浏览器 等。</p>
-<p>您正在使用 Internet Explorer 的过期版本（IE6、IE7、IE8 内核的浏览器）。这意味着在升级浏览器前，您将无法继续访问。</p>
+<p>本系统 <a href="http://jeesite.com">JeeSite</a> 支持 IE10 及以上版本及其他所有现代浏览器，如：谷歌浏览器、火狐浏览器、国产浏览器 等。</p>
+<p>您正在使用 Internet Explorer 的过期版本（IE6、IE7、IE8、IE9 内核的浏览器）。这意味着在升级浏览器前，您将无法继续访问。</p>
 <hr>
 <h2>为什么会出现这个页面？</h2>
 <p>如果您不知道升级浏览器是什么意思，请请教一些熟练电脑操作的朋友。如果您使用的不是Internet Explorer，而是360、QQ、搜狗等，双核浏览器，出现这个页面可能是您切换到了兼容模式，请<strong style="color:#f00;">切换到极速模式</strong>下，如果还不行请升级至最新版浏览器。</p>
@@ -29,10 +29,10 @@ span{display:block;font-size:12px;line-height:12px;}
 <h2>您可以选择更先进的浏览器</h2>
 <p>推荐使用以下浏览器的最新版本。如果您的电脑已有以下浏览器的最新版本则直接使用该浏览器访问 <b id="url"></b>即可。</p>
 <div class="browser"><ul>
-<li><img src="img/chrome360.jpg"><a href="http://chrome.360.cn/"> 360极速浏览器<span>360 Chrome</span></a></li>
-<li><img src="img/chrome.jpg"><a href="http://www.google.cn/intl/zh-CN/chrome/browser/desktop/index.html"> 谷歌浏览器<span>Google Chrome</span></a></li>
-<li><img src="img/firefox.jpg"><a href="http://www.firefox.com.cn/download/"> 火狐浏览器<span>Mozilla Firefox</span></a></li>
 <li><img src="img/edge.png"><a href="https://www.microsoft.com/zh-cn/edge"> Edge 浏览器<span>Microsoft Edge</span></a></li>
+<li><img src="img/chrome.jpg"><a href="http://www.google.cn/intl/zh-CN/chrome/browser/desktop/index.html"> 谷歌浏览器<span>Google Chrome</span></a></li>
+<li><img src="img/chrome360.jpg"><a href="http://chrome.360.cn/"> 360极速浏览器<span>360 Chrome</span></a></li>
+<li><img src="img/firefox.jpg"><a href="https://www.firefox.com/zh-CN/"> 火狐浏览器<span>Mozilla Firefox</span></a></li>
 </ul><div class="clean"></div></div>
 <hr><br/>
 <script>

common/src/test/java/com/jeesite/test/codec/EncodeUtilsTest.java

@@ -14,37 +14,50 @@ 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) />");
+		xssFilter(i++, "<!--HTML-->XSS<embed src=\"data:text/html;base64,PHNjcmlwdD5hbGVydCg5KTwvc2NyaXB0Pgo=\">");
+		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));
 	}
 
 }

common/src/test/java/com/jeesite/test/codec/Sha1UtilsTest.java

@@ -1,28 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- */
-package com.jeesite.test.codec;
-
-import com.jeesite.common.codec.Sha1Utils;
-
-/**
- * SHA-1 加密工具类，散列加密，不可逆加密
- * @author ThinkGem
- * @version 2024-07-22
- */
-public class Sha1UtilsTest {
-
-	public static void main(String[] args) {
-
-		String s = "Hello word! 你好，中文！";
-		System.out.println(s);
-
-		String salt = Sha1Utils.genSaltString(8);
-		System.out.println(salt);
-		String data = Sha1Utils.sha1(s, salt);
-		System.out.println(data);
-
-	}
-	
-}

common/src/test/java/com/jeesite/test/codec/ShaUtilsTest.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.test.codec;
+
+import com.jeesite.common.codec.ShaUtils;
+
+/**
+ * SHA-1 加密工具类，散列加密，不可逆加密
+ * @author ThinkGem
+ * @version 2024-07-22
+ */
+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 = ShaUtils.genSaltString(SALT_SIZE);
+		System.out.println(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);
+
+	}
+	
+}

common/src/test/java/com/jeesite/test/image/ZxingUtilsTest.java

@@ -18,7 +18,7 @@ public class ZxingUtilsTest {
 		String baseDir = FileUtils.getProjectPath();
 
 		// 条形码
-		String imgPath = baseDir + "\\target\\zxing_EAN13.png";
+		String imgPath = baseDir + "/target/zxing_EAN13.png";
 		String contents = "6923450657713";
 		int width = 105, height = 50;
 
@@ -30,7 +30,7 @@ public class ZxingUtilsTest {
 		System.out.println("finished zxing EAN-13 decode.");
 
 		// 二维码
-		String imgPath2 = baseDir + "\\target\\zxing.png";
+		String imgPath2 = baseDir + "/target/zxing.png";
 		String contents2 = "Hello Gem, welcome to Zxing!\nEMail [ thinkgem@163.com ]";
 		int width2 = 300, height2 = 300;
 

common/src/test/java/com/jeesite/test/lang/StringUtilsTest.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ */
+package com.jeesite.test.lang;
+
+import com.jeesite.common.lang.StringUtils;
+
+import java.text.ParseException;
+
+/**
+ * 字符串工具测试类
+ * @author ThinkGem
+ * @version 2025-09-18
+ */
+public class StringUtilsTest {
+
+	public static void main(String[] args) throws ParseException {
+		System.out.println(StringUtils.camelCase("id_name") + " = idName");
+		System.out.println(StringUtils.camelCase("_id_name") + " = idName");
+		System.out.println(StringUtils.camelCase("__id_name") + " = idName");
+		System.out.println(StringUtils.camelCase("a_id") + " = aid");
+		System.out.println(StringUtils.camelCase("a_b_id") + " = abId");
+		System.out.println(StringUtils.camelCase("__a_id") + " = aid");
+		System.out.println(StringUtils.camelCase("__a_b_id") + " = abId");
+		System.out.println(StringUtils.capCamelCase("id_name") + " = IdName");
+		System.out.println(StringUtils.capCamelCase("a_b_id_name") + " = AbIdName");
+		System.out.println(StringUtils.uncamelCase("abIdName") + " = ab_id_name");
+		System.out.println(StringUtils.uncamelCase("AbIdName") + " = ab_id_name");
+	}
+	
+}

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.13.1.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	

modules/app/src/main/resources/db/upgrade/app/versions

@@ -27,4 +27,7 @@
 5.10.1
 5.11.0
 5.11.1
-5.12.0
+5.12.0
+5.12.1
+5.13.0
+5.13.1

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,12 +52,17 @@
 * 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
 
 ```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
@@ -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 或工具交互，从而增强其功能。
 
@@ -131,7 +141,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)

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.13.1.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
@@ -19,7 +19,7 @@
 
 	<properties>
 
-		<spring-ai.version>1.0.0-RC1</spring-ai.version>
+		<spring-ai.version>1.0.0</spring-ai.version>
 
 	</properties>
 	
@@ -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>

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;
+		}
+	}
 }

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

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

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=北京
 	 */

modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml

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

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));
+	}
+
+
+}

modules/cms-ai/src/test/resources/application.yml

@@ -0,0 +1,15 @@
+
+# 数据库连接
+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

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.13.1.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 

modules/cms/src/main/java/com/jeesite/modules/cms/entity/FileTemplate.java

@@ -8,6 +8,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serial;
 import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 
 import org.springframework.core.io.Resource;
@@ -22,17 +23,17 @@ import com.jeesite.common.lang.ExceptionUtils;
  * @author 长春叭哥、ThinkGem
  * @version 2020-7-7
  */
-public class FileTemplete implements Comparable<FileTemplete>, Serializable {
+public class FileTemplate implements Comparable<FileTemplate>, Serializable {
 
 	@Serial
 	private static final long serialVersionUID = 1L;
-	private Resource resource;
+	private final Resource resource;
 	private String fileName;
 	private String fileExtension;
 	private String filePath;
 	private boolean isDirectory;
 	
-	public FileTemplete(Resource resource, String path) {
+	public FileTemplate(Resource resource, String path) {
 		this.resource = resource;
 		this.fileName = resource.getFilename();
 		this.fileExtension = FileUtils.getFileExtension(this.fileName);
@@ -43,22 +44,22 @@ public class FileTemplete implements Comparable<FileTemplete>, Serializable {
 				beginIndex = filePath.indexOf(path);
 			}
 			int endIndex = filePath.length();
-			if (this.fileName.contains(".")){
+			if (this.fileName != null && this.fileName.contains(".")) {
 				endIndex = filePath.lastIndexOf('/');
-			}else if (filePath.endsWith("/")) {
-				endIndex -= 1;
-			} 
+			}
 			this.filePath = filePath.substring(beginIndex, endIndex);
 //			System.out.println(this.filePath);
 		} catch (IOException e) {
 			throw ExceptionUtils.unchecked(e);
 		}
-		this.isDirectory = !this.fileName.contains(".");
+		if (this.fileName != null) {
+			this.isDirectory = !this.fileName.contains(".");
+		}
 //		System.out.println(filePath);
 //		System.out.println(fileName);
 	}
 	
-	public FileTemplete(FileTemplete source) {
+	public FileTemplate(FileTemplate source) {
 		int index = source.filePath.lastIndexOf('/');
 		this.fileName = source.filePath.substring(index+1);
 		this.filePath = source.filePath.substring(0, index);
@@ -111,14 +112,14 @@ public class FileTemplete implements Comparable<FileTemplete>, Serializable {
 			return null;
 		}
 		try(InputStream is = resource.getInputStream()){
-			return IOUtils.toString(is, EncodeUtils.UTF_8);
+			return IOUtils.toString(is, StandardCharsets.UTF_8);
 		}catch (IOException e) {
 			throw ExceptionUtils.unchecked(e);
 		}
 	}
 
 	@Override
-	public int compareTo(FileTemplete o) {
+	public int compareTo(FileTemplate o) {
 		return this.getFileName().compareTo(o.getFileName());
 	}
 	
@@ -130,7 +131,7 @@ public class FileTemplete implements Comparable<FileTemplete>, Serializable {
 		if (o == null || getClass() != o.getClass()) {
 			return false;
 		}
-		FileTemplete e = (FileTemplete) o;
+		FileTemplate e = (FileTemplate) o;
 		return Objects.equals(this.fileName, e.fileName)
 				&& Objects.equals(this.fileExtension, e.fileExtension)
 				&& Objects.equals(this.filePath, e.filePath)

modules/cms/src/main/java/com/jeesite/modules/cms/entity/Site.java

@@ -49,7 +49,7 @@ public class Site extends DataEntity<Site> {
 	/**
 	 * 模板路径
 	 */
-	public static final String TEMPLETE_BASE_DIRECTION = "views/modules/cmsfront/themes";
+	public static final String TEMPLATE_BASE_DIRECTION = "views/modules/cmsfront/themes";
 	/**
 	 * 默认模版
 	 */
@@ -192,7 +192,7 @@ public class Site extends DataEntity<Site> {
 	 * @return
 	 */
 	public String getSolutionPath() {
-		return TEMPLETE_BASE_DIRECTION + "/" + getTheme();
+		return TEMPLATE_BASE_DIRECTION + "/" + getTheme();
 	}
 	
 	public List<String> getCategoryCodes() {

modules/cms/src/main/java/com/jeesite/modules/cms/service/FileTemplateService.java

@@ -0,0 +1,59 @@
+/**
+ * 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.service;
+
+import com.jeesite.common.collect.ListUtils;
+import com.jeesite.modules.cms.entity.FileTemplate;
+import com.jeesite.modules.cms.entity.Site;
+import com.jeesite.modules.cms.utils.CmsUtils;
+import com.jeesite.modules.cms.utils.FileTemplateUtils;
+import com.jeesite.modules.sys.entity.DictData;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 模版文件Service
+ * @author 长春叭哥、ThinkGem
+ * @version 2020-7-7
+ */
+@Service
+public class FileTemplateService {
+
+	/**
+	 * 获取对应视图模板列表，兼容 Select 字典
+	 * @param prefix
+	 */
+	public List<DictData> getTemplateContentDict(String prefix) throws IOException {
+		List<DictData> listSite = ListUtils.newArrayList();
+		String solutionPath = CmsUtils.getSite(Site.getCurrentSiteCode()).getSolutionPath();
+		List<FileTemplate> tplList = FileTemplateUtils.getFileTemplateListByPath(solutionPath);
+		for (FileTemplate tpl : tplList) {
+			if (tpl.getFileName().startsWith(prefix)) {
+				listSite.add(new DictData(tpl.getFileName()
+						.substring(0, tpl.getFileName().indexOf("."))));
+			}
+		}
+		return listSite;
+	}
+
+	/**
+	 * 获取编辑文件列表
+	 * @param path 模板路径
+	 */
+	public List<FileTemplate> getFileTemplateListForEdit(String path) throws IOException {
+		return FileTemplateUtils.getFileTemplateListForEdit(path);
+	}
+
+	/**
+	 * 获取模版文件内容
+	 * @param fileName 模板文件
+	 */
+	public FileTemplate getFileTemplate(String fileName) throws IOException {
+		return FileTemplateUtils.getFileTemplateByResource(fileName);
+	}
+	
+}

modules/cms/src/main/java/com/jeesite/modules/cms/service/FileTempleteService.java

@@ -1,88 +0,0 @@
-/**
- * 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.service;
-
-import com.jeesite.common.collect.ListUtils;
-import com.jeesite.modules.cms.entity.FileTemplete;
-import com.jeesite.modules.cms.entity.Site;
-import com.jeesite.modules.cms.utils.CmsUtils;
-import com.jeesite.modules.cms.utils.FileTempleteUtils;
-import com.jeesite.modules.sys.entity.DictData;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * 模版文件Service
- * @author 长春叭哥、ThinkGem
- * @version 2020-7-7
- */
-@Service
-public class FileTempleteService {
-
-//	public List<String> getTempleteContent(String prefix) throws IOException {
-//		List<String> tplList = getFileTempleteNameListByPrefix(CmsUtils.getSite(Site.getCurrentSiteCode()).getSolutionPath());
-//		tplList = FilesTempleteUtils.templeteTrim(tplList, prefix, "");
-//		return tplList;
-//	}
-
-	/**
-	 * 获取对应视图模板列表，兼容 Select 字典
-	 * @param prefix
-	 */
-	public List<DictData> getTempleteContentDict(String prefix) throws IOException {
-		List<DictData> listSite = ListUtils.newArrayList();
-		String solutionPath = CmsUtils.getSite(Site.getCurrentSiteCode()).getSolutionPath();
-		List<FileTemplete> tplList = FileTempleteUtils.getFileTempleteListByPath(solutionPath);
-		for (FileTemplete tpl : tplList) {
-			if (tpl.getFileName().startsWith(prefix)) {
-				listSite.add(new DictData(tpl.getFileName()
-						.substring(0, tpl.getFileName().indexOf("."))));
-			}
-		}
-		return listSite;
-	}
-
-//	/**
-//	 * 通过前缀获取文件名集合
-//	 * @param filePath
-//	 * @return List<String> 文件名集合
-//	 * @author 长春叭哥
-//	 * @throws IOException
-//	 */
-//	public List<String> getFileTempleteNameListByPrefix(String filePath) throws IOException {
-//		return FilesTempleteUtils.getFileTempleteNameListByPrefix(filePath);
-//	}
-
-//	/**
-//	 * 获取模版文件列表
-//	 * @param path 路径
-//	 * @param directory
-//	 * @return List<FileTemplete> 模版文件集合
-//	 * @author 长春叭哥
-//	 * @throws IOException
-//	 */
-//	public List<FileTemplete> getFileTempleteListByPath(String path, boolean directory) throws IOException {
-//		return FilesTempleteUtils.getFileTempleteListByPath(path, directory);
-//	}
-
-	/**
-	 * 获取编辑文件列表
-	 * @param path 模板路径
-	 */
-	public List<FileTemplete> getFileTempleteListForEdit(String path) throws IOException {
-		return FileTempleteUtils.getFileTempleteListForEdit(path);
-	}
-
-	/**
-	 * 获取模版文件内容
-	 * @param fileName 模板文件
-	 */
-	public FileTemplete getFileTemplete(String fileName) throws IOException {
-		return FileTempleteUtils.getFileTempleteByResource(fileName);
-	}
-	
-}

modules/cms/src/main/java/com/jeesite/modules/cms/utils/FileTemplateUtils.java

@@ -4,43 +4,46 @@
  */
 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.modules.cms.entity.FileTemplete;
+import com.jeesite.common.lang.StringUtils;
+import com.jeesite.modules.cms.entity.FileTemplate;
+import org.springframework.core.io.Resource;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 模板文件公共类库
  * @author 长春叭哥、ThinkGem
  * @version 2020-7-7
  */
-public class FileTempleteUtils {
+public class FileTemplateUtils {
 
 	/**
 	 * 获取模版文件
 	 * @param fileName
 	 */
-	public static FileTemplete getFileTempleteByResource(String fileName) throws IOException {
+	public static FileTemplate getFileTemplateByResource(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);
+		return new FileTemplate(resource, fileName);
 	}
 
 	/**
 	 * 获取模板文件集合
 	 * @param path 前缀路径
 	 */
-	public static List<FileTemplete> getFileTempleteListByPath(String path) throws IOException {
-		List<FileTemplete> list = ListUtils.newArrayList();
+	public static List<FileTemplate> getFileTemplateListByPath(String path) throws IOException {
+		List<FileTemplate> list = ListUtils.newArrayList();
 		Resource[] resources = ResourceUtils.getResources("classpath*:" + path + "/**/*.html");
 		for (Resource resource : resources) {
 			if (resource.exists()) {
-				list.add(new FileTemplete(resource, path));
+				list.add(new FileTemplate(resource, path));
 			}
 		}
 		return list;
@@ -50,14 +53,14 @@ public class FileTempleteUtils {
 	 * 获取模板文件相关属性（含目录）
 	 * @param path 前缀路径
 	 */
-	public static List<FileTemplete> getFileTempleteListForEdit(String path) throws IOException {
+	public static List<FileTemplate> getFileTemplateListForEdit(String path) throws IOException {
 
-		List<FileTemplete> list = getFileTempleteListByPath(path);
-		Set<FileTemplete> set = SetUtils.newLinkedHashSet();
+		List<FileTemplate> list = getFileTemplateListByPath(path);
+		Set<FileTemplate> set = SetUtils.newLinkedHashSet();
 
 		// 获取目录
 		list.forEach(e -> {
-			set.add(new FileTemplete(e));
+			set.add(new FileTemplate(e));
 		});
 		set.addAll(list);
 		

modules/cms/src/main/java/com/jeesite/modules/cms/web/ArticleController.java

@@ -14,7 +14,7 @@ import com.jeesite.modules.cms.entity.Category;
 import com.jeesite.modules.cms.entity.Site;
 import com.jeesite.modules.cms.service.ArticleService;
 import com.jeesite.modules.cms.service.CategoryService;
-import com.jeesite.modules.cms.service.FileTempleteService;
+import com.jeesite.modules.cms.service.FileTemplateService;
 import com.jeesite.modules.cms.utils.CmsUtils;
 import com.jeesite.modules.sys.utils.UserUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -46,7 +46,7 @@ public class ArticleController extends BaseController {
 	@Autowired
 	private CategoryService categoryService;
 	@Autowired
-	private FileTempleteService fileTempleteService;
+	private FileTemplateService fileTemplateService;
 
 	/**
 	 * 获取数据
@@ -135,7 +135,7 @@ public class ArticleController extends BaseController {
 		if (StringUtils.isBlank(article.getId())) {
 			article.setStatus(Article.STATUS_DRAFT);
 		}
-		model.addAttribute("contentViewList", fileTempleteService.getTempleteContentDict(Article.DEFAULT_TEMPLATE));
+		model.addAttribute("contentViewList", fileTemplateService.getTemplateContentDict(Article.DEFAULT_TEMPLATE));
 		model.addAttribute("article_DEFAULT_TEMPLATE", Article.DEFAULT_TEMPLATE);
 		model.addAttribute("article", article);
 		CmsUtils.addViewConfigAttribute(model, article.getCategory());

modules/cms/src/main/java/com/jeesite/modules/cms/web/CategoryController.java

@@ -14,7 +14,7 @@ import com.jeesite.modules.cms.entity.Article;
 import com.jeesite.modules.cms.entity.Category;
 import com.jeesite.modules.cms.entity.Site;
 import com.jeesite.modules.cms.service.CategoryService;
-import com.jeesite.modules.cms.service.FileTempleteService;
+import com.jeesite.modules.cms.service.FileTemplateService;
 import com.jeesite.modules.cms.utils.CmsUtils;
 import com.jeesite.modules.sys.utils.DictUtils;
 import jakarta.servlet.http.HttpServletRequest;
@@ -46,7 +46,7 @@ public class CategoryController extends BaseController {
 	private CategoryService categoryService;
 
 	@Autowired
-	private FileTempleteService fileTempleteService;
+	private FileTemplateService fileTemplateService;
 
 	/**
 	 * 获取数据
@@ -157,9 +157,9 @@ public class CategoryController extends BaseController {
 		if (category.getIsNeedAudit() == null) {
 			category.setIsNeedAudit(Global.NO);
 		}
-		model.addAttribute("listViewList", fileTempleteService.getTempleteContentDict(Category.DEFAULT_TEMPLATE));
+		model.addAttribute("listViewList", fileTemplateService.getTemplateContentDict(Category.DEFAULT_TEMPLATE));
 		model.addAttribute("category_DEFAULT_TEMPLATE", Category.DEFAULT_TEMPLATE);
-		model.addAttribute("contentViewList", fileTempleteService.getTempleteContentDict(Article.DEFAULT_TEMPLATE));
+		model.addAttribute("contentViewList", fileTemplateService.getTemplateContentDict(Article.DEFAULT_TEMPLATE));
 		model.addAttribute("article_DEFAULT_TEMPLATE", Article.DEFAULT_TEMPLATE);
 		model.addAttribute("category", category);
 		return "modules/cms/categoryForm";

modules/cms/src/main/java/com/jeesite/modules/cms/web/FileTemplateController.java

@@ -4,20 +4,12 @@
  */
 package com.jeesite.modules.cms.web;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import com.jeesite.common.codec.EncodeUtils;
-import com.jeesite.common.config.Global;
-import com.jeesite.common.io.FileUtils;
-import com.jeesite.common.io.ResourceUtils;
-import com.jeesite.common.lang.DateUtils;
-import com.jeesite.common.lang.StringUtils;
-import com.jeesite.modules.gen.entity.GenTable;
-import com.jeesite.modules.gen.utils.GenTableUtils;
-import com.jeesite.modules.gen.utils.GenUtils;
+import com.jeesite.common.collect.ListUtils;
+import com.jeesite.common.collect.MapUtils;
+import com.jeesite.common.web.BaseController;
+import com.jeesite.modules.cms.entity.FileTemplate;
+import com.jeesite.modules.cms.entity.Site;
+import com.jeesite.modules.cms.service.FileTemplateService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -25,12 +17,9 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.jeesite.common.collect.ListUtils;
-import com.jeesite.common.collect.MapUtils;
-import com.jeesite.common.web.BaseController;
-import com.jeesite.modules.cms.entity.FileTemplete;
-import com.jeesite.modules.cms.entity.Site;
-import com.jeesite.modules.cms.service.FileTempleteService;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 模板管理
@@ -42,7 +31,7 @@ import com.jeesite.modules.cms.service.FileTempleteService;
 public class FileTemplateController extends BaseController {
 	
 	@Autowired
-	private FileTempleteService fileTempleteService;
+	private FileTemplateService fileTemplateService;
 
 	@RequiresPermissions("cms:template:edit")
 	@RequestMapping(value = { "list", "" })
@@ -50,19 +39,10 @@ public class FileTemplateController extends BaseController {
 		return "modules/cms/tplIndex";
 	}
 
-//	@RequiresPermissions("cms:template:edit")
-//	@RequestMapping(value = "tree")
-//	public String tree(Model model) throws IOException {
-//		//根据系统默认的主题获取模板地址
-//		model.addAttribute("templateList", fileTempleteService
-//				.getFileTempleteListForEdit(Site.TEMPLETE_BASE_DIRECTION + "/" + "default"));
-//		return "modules/cms/tplTree";
-//	}
-
 	@RequiresPermissions("cms:template:edit")
 	@RequestMapping(value = "form")
 	public String form(String name, Model model) throws IOException {
-		model.addAttribute("template", fileTempleteService.getFileTemplete(name));
+		model.addAttribute("template", fileTemplateService.getFileTemplate(name));
 		return "modules/cms/tplForm";
 	}
 
@@ -70,7 +50,7 @@ public class FileTemplateController extends BaseController {
 	@RequestMapping(value = "saveFileTemplate")
 	@ResponseBody
 	public String saveFileTemplate(String fileName, String fileContent) throws IOException {
-		FileTemplete template = fileTempleteService.getFileTemplete(fileName);
+		FileTemplate template = fileTemplateService.getFileTemplate(fileName);
 		String newFileName = FileUtils.path(FileUtils.getWebappPath() + "/WEB-INF/classes/" + fileName);
 		File templateFile = template.resource().getFile();
 		if (templateFile.getAbsoluteFile().exists()) {
@@ -86,7 +66,7 @@ public class FileTemplateController extends BaseController {
 	@RequestMapping(value = "deleteFileTemplate")
 	@ResponseBody
 	public String deleteFileTemplate(String fileName) throws IOException {
-		FileTemplete template = fileTempleteService.getFileTemplete(fileName);
+		FileTemplate template = fileTemplateService.getFileTemplate(fileName);
 		File templateFile = template.resource().getFile();
 		if (templateFile.getAbsoluteFile().exists()) {
 			FileUtils.deleteFile(templateFile.getAbsolutePath());
@@ -109,9 +89,9 @@ public class FileTemplateController extends BaseController {
 	@ResponseBody
 	public List<Map<String, Object>> treeData() throws IOException {
 		List<Map<String, Object>> mapList = ListUtils.newArrayList();
-		List<FileTemplete> listFileTemplete = fileTempleteService.getFileTempleteListForEdit(Site.TEMPLETE_BASE_DIRECTION);
-		for (int i = 0; i < listFileTemplete.size(); i++) {
-			FileTemplete e = listFileTemplete.get(i);
+		List<FileTemplate> listFileTemplate = fileTemplateService.getFileTemplateListForEdit(Site.TEMPLATE_BASE_DIRECTION);
+		for (int i = 0; i < listFileTemplate.size(); i++) {
+			FileTemplate e = listFileTemplate.get(i);
 			Map<String, Object> map = MapUtils.newHashMap();
 			map.put("id", e.getFilePath() + "/" + e.getFileName());
 			map.put("isDirectory", e.isDirectory());

modules/cms/src/main/java/com/jeesite/modules/cms/web/SiteController.java

@@ -9,7 +9,7 @@ import com.jeesite.common.entity.Page;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.web.BaseController;
 import com.jeesite.modules.cms.entity.Site;
-import com.jeesite.modules.cms.service.FileTempleteService;
+import com.jeesite.modules.cms.service.FileTemplateService;
 import com.jeesite.modules.cms.service.SiteService;
 import com.jeesite.modules.sys.utils.UserUtils;
 import jakarta.servlet.http.HttpServletRequest;
@@ -39,7 +39,7 @@ public class SiteController extends BaseController {
 	private SiteService siteService;
 
 	@Autowired
-	private FileTempleteService fileTempleteService;
+	private FileTemplateService fileTemplateService;
 
 	/**
 	 * 获取数据
@@ -79,7 +79,7 @@ public class SiteController extends BaseController {
 	@RequiresPermissions("cms:site:view")
 	@RequestMapping(value = "form")
 	public String form(Site site, Model model) throws IOException {
-		model.addAttribute("indexViewList", fileTempleteService.getTempleteContentDict(Site.DEFAULT_TEMPLATE));
+		model.addAttribute("indexViewList", fileTemplateService.getTemplateContentDict(Site.DEFAULT_TEMPLATE));
 		model.addAttribute("site_DEFAULT_TEMPLATE", Site.DEFAULT_TEMPLATE);
 		model.addAttribute("site", site);
 		model.addAttribute("demos", site);

modules/cms/src/main/resources/db/upgrade/cms/versions

@@ -35,4 +35,7 @@
 5.10.1
 5.11.0
 5.11.1
-5.12.0
+5.12.0
+5.12.1
+5.13.0
+5.13.1

modules/cms/src/main/resources/static/modules/cmsfront/themes/default/index.html

@@ -5,27 +5,6 @@
     <title>Bootswatch: Cosmo</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="./bootstrap.css" media="screen">
-    <link rel="stylesheet" href="../css/custom.min.css">
-    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!--[if lt IE 9]>
-      <script src="../bower_components/html5shiv/dist/html5shiv.js"></script>
-      <script src="../bower_components/respond/dest/respond.min.js"></script>
-    <![endif]-->
-    <script>
-
-//      var _gaq = _gaq || [];
-//       _gaq.push(['_setAccount', 'UA-23019901-1']);
-//       _gaq.push(['_setDomainName', "bootswatch.com"]);
-//         _gaq.push(['_setAllowLinker', true]);
-//       _gaq.push(['_trackPageview']);
-
-//      (function() {
-//        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-//        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-//        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-//      })();
-
-    </script>
   </head>
   <body>
     <div class="navbar navbar-default navbar-fixed-top">
@@ -105,9 +84,6 @@
             <p class="lead">An ode to Metro</p>
           </div>
           <div class="col-lg-4 col-md-5 col-sm-6">
-            <div class="sponsor">
-              <script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=bootswatchcom" id="_carbonads_js"></script>
-            </div>
           </div>
         </div>
         <div class="row">
@@ -1287,10 +1263,8 @@
 
       </footer>
 
-
     </div>
 
-
     <script src="https://cdn.bootcdn.net/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
     <script src="../js/bootstrap.min.js"></script>
     <script src="../js/custom.js"></script>

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(), {

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

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.13.1.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
@@ -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>
@@ -75,7 +75,7 @@
 		<dependency>
 			<groupId>com.dameng</groupId>
 			<artifactId>DmJdbcDriver18</artifactId>
-			<version>8.1.3.62</version>
+			<version>${dameng.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 
@@ -83,7 +83,7 @@
 		<dependency>
 			<groupId>cn.com.kingbase</groupId>
 			<artifactId>kingbase8</artifactId>
-			<version>8.6.1</version>
+			<version>${kingbase.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 
@@ -129,13 +129,6 @@
 			<version>${project.parent.version}</version>
 		</dependency>
 
-		<!-- JTA 事务（当 spring.jta.enabled 为 true 的时候开启，不使用 jta 的时候不要引入该依赖）
-		<dependency>
-			<groupId>com.atomikos</groupId>
-			<artifactId>transactions-spring-boot3-starter</artifactId>
-			<version>${atomikos.version}</version>
-		</dependency> -->
-
 		<!-- ELK 日志收集 -->
 		<dependency>
 			<groupId>net.logstash.logback</groupId>

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;

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:

modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/PostListType.java

@@ -41,7 +41,7 @@ public class PostListType implements FieldType {
 				}
 			}
 		}
-		return list.size() > 0 ? list.toArray(new String[list.size()]) : null;
+		return !list.isEmpty() ? list.toArray(new String[0]) : null;
 	}
 
 	/**

modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/RoleListType.java

@@ -41,7 +41,7 @@ public class RoleListType implements FieldType {
 				}
 			}
 		}
-		return list.size() > 0 ? list.toArray(new String[list.size()]) : null;
+		return !list.isEmpty() ? list.toArray(new String[0]) : null;
 	}
 
 	/**

modules/core/src/main/java/com/jeesite/modules/config/web/GlobalFilterConfig.java

@@ -5,6 +5,7 @@
 package com.jeesite.modules.config.web;
 
 import com.jeesite.common.config.Global;
+import com.jeesite.common.idgen.IdGen;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.utils.LocaleUtils;
 import com.jeesite.common.web.http.ServletUtils;
@@ -12,6 +13,7 @@ import jakarta.servlet.Filter;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletResponse;
+import org.slf4j.MDC;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -19,21 +21,28 @@ import org.springframework.core.Ordered;
 import org.springframework.web.servlet.LocaleContextResolver;
 
 /**
- * IP地址黑白名单过滤器配置
+ * 全局过滤器：
+ * 1、IP地址黑白名单过滤器配置
+ * 2、本地化时区上下文设置
+ * 3、Slf4j MDC 标识设置
  */
 @Configuration(proxyBeanMethods = false)
-public class IpAddrFilterConfig {
+public class GlobalFilterConfig {
 
+	private static final String TRACE_ID = "TRACE_ID";
 	private static long clearCacheTime;
 	private static String[] allowPrefixes;
 	private static String[] denyPrefixes;
 
 	@Bean
-	public FilterRegistrationBean<Filter> ipAddrFilter(LocaleContextResolver localeResolver) {
+	public FilterRegistrationBean<Filter> jeesiteGlobalFilter(LocaleContextResolver localeResolver) {
 		FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<>();
-		bean.setName("ipAddrFilter");
+		bean.setName("jeesiteGlobalFilter");
 		bean.setOrder(Ordered.HIGHEST_PRECEDENCE + 10);
 		bean.setFilter((servletRequest, servletResponse, chain) -> {
+			if (StringUtils.isBlank(MDC.get(TRACE_ID))) {
+				MDC.put(TRACE_ID, IdGen.randomShortString());
+			}
 			if (isAccessAllowed(servletRequest, servletResponse)) {
 				chain.doFilter(servletRequest, servletResponse);
 			} else {
@@ -42,6 +51,7 @@ public class IpAddrFilterConfig {
 				ServletUtils.renderString(response, Global.getText("访问拒绝"));
 			}
 			LocaleUtils.removeTimeZoneAwareLocaleContext();
+			MDC.remove(TRACE_ID);
 		});
 		LocaleUtils.setLocaleResolver(localeResolver);
 		bean.addUrlPatterns("/*");
@@ -77,9 +87,6 @@ public class IpAddrFilterConfig {
 				break;
 			}
 		}
-		if (result) {
-			return true;
-		}
-		return false;
+		return result;
 	}
 }

modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java

@@ -4,22 +4,17 @@
  */
 package com.jeesite.modules.sys.interceptor;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import org.slf4j.MDC;
-import org.springframework.core.NamedThreadLocal;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.jeesite.common.idgen.IdGen;
 import com.jeesite.common.lang.ByteUtils;
-import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.lang.TimeUtils;
 import com.jeesite.common.network.IpUtils;
 import com.jeesite.common.service.BaseService;
 import com.jeesite.modules.sys.utils.LogUtils;
 import com.jeesite.modules.sys.utils.UserUtils;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.core.NamedThreadLocal;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
 
 /**
  * 日志拦截器
@@ -28,16 +23,12 @@ import com.jeesite.modules.sys.utils.UserUtils;
  */
 public class LogInterceptor extends BaseService implements HandlerInterceptor {
 
-	private static final String TRACE_ID = "TRACE_ID";
 	private static final ThreadLocal<Long> startTimeThreadLocal =
 			new NamedThreadLocal<Long>("LogInterceptor StartTime");
 	
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, 
 			Object handler) throws Exception {
-		if (StringUtils.isBlank(MDC.get(TRACE_ID))) {
-            MDC.put(TRACE_ID, IdGen.randomShortString());
-        }
 		long beginTime = System.currentTimeMillis();// 1、开始时间  
 		startTimeThreadLocal.set(beginTime);		// 线程绑定变量（该数据只有当前请求的线程可见）  
 		if (logger.isDebugEnabled()){
@@ -82,7 +73,6 @@ public class LogInterceptor extends BaseService implements HandlerInterceptor {
 					TimeUtils.formatTime(executeTime), ByteUtils.formatByteSize(totalMemory),
 					ByteUtils.formatByteSize(totalMemory-(totalMemory-runtime.freeMemory())));
 		}
-		MDC.remove(TRACE_ID);
 	}
 
 }

modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java

@@ -8,6 +8,7 @@ import com.jeesite.common.config.Global;
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.idgen.IdGen;
 import com.jeesite.common.lang.StringUtils;
+import com.jeesite.common.mybatis.mapper.query.QueryDataScope;
 import com.jeesite.common.service.CrudService;
 import com.jeesite.common.service.ServiceException;
 import com.jeesite.common.utils.excel.ExcelImport;
@@ -72,16 +73,17 @@ public class EmpUserServiceSupport extends CrudService<EmpUserDao, EmpUser>
 	 */
 	@Override
 	public void addDataScopeFilter(EmpUser empUser, String ctrlPermi) {
-		empUser.sqlMap().getDataScope().addFilter("dsfOffice",
-				"Office", "e.office_code", "a.create_by", ctrlPermi, "office_user");
+		QueryDataScope dataScope = empUser.sqlMap().getDataScope();
+		dataScope.addFilter("dsfOffice", "Office",
+				"e.office_code", "a.create_by", ctrlPermi, "office_user");
 		if (StringUtils.isNotBlank(EmpUtils.getCompany().getCompanyCode())){
-			empUser.sqlMap().getDataScope().addFilter("dsfCompany",
-					"Company", "e.company_code", "a.create_by", ctrlPermi, "office_user");
+			dataScope.addFilter("dsfCompany", "Company",
+					"e.company_code", "a.create_by", ctrlPermi, "office_user");
 		}
-//		empUser.sqlMap().getDataScope().addFilterByPermission("dsfOffice", "sys:empUser:view",
-//				"Office", "e.office_code", "a.create_by", ctrlPermi);
-//		empUser.sqlMap().getDataScope().addFilterByPermission("dsfOffice", "sys:empUser:view",
-//				"User", "a.user_code", ctrlPermi);
+//		dataScope.addFilterByPermission("dsfOffice", "sys:empUser:view", "Office",
+//				"e.office_code", "a.create_by", ctrlPermi);
+//		dataScope.addFilterByPermission("dsfOffice", "sys:empUser:view", "User",
+//				"a.user_code", ctrlPermi);
 	}
 
 	/**
@@ -179,7 +181,7 @@ public class EmpUserServiceSupport extends CrudService<EmpUserDao, EmpUser>
 		EmployeeOffice employeeOfficeWhere = new EmployeeOffice();
 		employeeOfficeWhere.setEmpCode(employee.getEmpCode());
 		employeeOfficeDao.deleteByEntity(employeeOfficeWhere);
-		if (employee.getEmployeeOfficeList().size() > 0){
+		if (!employee.getEmployeeOfficeList().isEmpty()){
 			employee.getEmployeeOfficeList().forEach(employeeOffice -> {
 				employeeOffice.setId(IdGen.nextId());
 				employeeOffice.setEmpCode(employee.getEmpCode());

modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java

@@ -263,7 +263,7 @@ public class EmpUtils {
 				}
 			}
 		});
-		return list.toArray(new String[list.size()]);
+		return list.toArray(new String[0]);
 	}
 	
 	/**

modules/core/src/main/java/com/jeesite/modules/sys/web/CacheController.java

@@ -27,10 +27,10 @@ import com.jeesite.modules.sys.utils.UserUtils;
 public class CacheController extends BaseController {
 
 	/**
-	 * 清理全部缓存，可清理属性文件里的缓存（stste 单词写错了，将错就错）
+	 * 清理全部缓存，可清理属性文件里的缓存
 	 * @return
 	 */
-	@RequiresPermissions(value={"sys:config:edit", "sys:stste:cache"}, logical=Logical.OR)
+	@RequiresPermissions(value={"sys:config:edit", "sys:state:cache"}, logical=Logical.OR)
 	@RequestMapping(value = "clearAll")
 	@ResponseBody
 	public String clearAll() {

modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java

@@ -283,7 +283,7 @@ public class LoginController extends BaseController{
 			try {
 				request.getRequestDispatcher(passwordModifyUrl).forward(request, response);
 			} catch (Exception e) {
-				e.printStackTrace();
+				logger.error(e.getMessage(), e);
 			}
 			return null;
 		}

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

modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java

@@ -157,14 +157,12 @@ public class OnlineController extends BaseController{
 				onlineTickOutMap = MapUtils.newConcurrentMap();
 			}
 			Object pc = session.getAttribute(DefaultSubjectContext.PRINCIPALS_SESSION_KEY);
-			if (pc != null && pc instanceof PrincipalCollection){
+			if (pc instanceof PrincipalCollection){
 				Object pp = ((PrincipalCollection)pc).getPrimaryPrincipal();
-				if (pp != null) {
-					if (pp instanceof LoginInfo){
-						LoginInfo loginInfo = ((LoginInfo)pp);
-						String key = loginInfo.getId()+"_"+loginInfo.getParam("deviceType", "pc");
-						onlineTickOutMap.put(key, StringUtils.EMPTY);
-					}
+				if (pp instanceof LoginInfo){
+					LoginInfo loginInfo = ((LoginInfo)pp);
+					String key = loginInfo.getId()+"_"+loginInfo.getParam("deviceType", "pc");
+					onlineTickOutMap.put(key, StringUtils.EMPTY);
 				}
 			}
 			SysCacheUtils.put("onlineTickOutMap", onlineTickOutMap);

modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java

@@ -178,6 +178,7 @@ public class EmpUserController extends BaseController {
 	@RequiresPermissions(value={"sys:empUser:edit","sys:empUser:authRole"}, logical=Logical.OR)
 	@PostMapping(value = "save")
 	@ResponseBody
+	//@Idempotent // 幂等示例，默认规则：10秒内，相同的会话和相同的提交内容，会提示“请不要频繁操作”
 	public String save(@Validated EmpUser empUser, @Parameter(description = "操作类型") String op, HttpServletRequest request) {
 		if (!EmpUser.USER_TYPE_EMPLOYEE.equals(empUser.getUserType())){
 			return renderResult(Global.FALSE, "非法操作，不能够操作此用户！");

modules/core/src/main/resources/config/jeesite-core.yml

@@ -1,5 +1,13 @@
 # 温馨提示：不建议直接修改此文件，为了平台升级方便，建议将需要修改的参数值，复制到application.yml里进行覆盖该参数值。
 
+# 产品或项目名称、软件开发公司名称
+productName: JeeSite Demo
+companyName: ThinkGem
+
+# 产品版本、版权年份
+productVersion: V5.13
+copyrightYear: 2025
+
 #======================================#
 #========== Database sttings ==========#
 #======================================#
@@ -85,6 +93,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
     # 用户缓存
@@ -94,7 +106,7 @@ spring:
     #    maxPoolSize: 20
     #    keepAliveSeconds: 60
 
-  # JTA XA 事务（spring boot 3） 请在 jeesite-module-core/pom.xml 中打开 atomikos 依赖
+  # JTA XA 事务（spring boot 3）
   jta:
     enabled: false
     
@@ -467,8 +479,8 @@ shiro:
   
   # 记住我密钥设置，你可以通过 com.jeesite.test.RememberMeKeyGen 类快速生成一个秘钥。
   # 若不设置，则每次启动系统后自动生成一个新秘钥，这样会导致每次重启后，客户端记录的用户信息将失效。
-  rememberMe:
-    secretKey: ~
+  #rememberMe:
+  #  secretKey: ~
   
   # 指定获取客户端IP的Header名称，防止IP伪造。指定为空，则使用原生方法获取IP。
   remoteAddrHeaderName: X-Forwarded-For
@@ -506,7 +518,7 @@ shiro:
   #allowReferers: http://127.0.0.1,http://localhost
 
   # 允许重定向的地址，不设置为全部允许，设置this只允许本项目内部跳转，多个用逗号隔开，例如：this,http://*.jeesite.com
-  #allowRedirects: ~
+  allowRedirects: this
   
   # 是否在登录后生成新的Session（默认false）
   isGenerateNewSessionAfterLogin: false
@@ -548,6 +560,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

modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties

@@ -5,7 +5,7 @@ sys.login.notLongIn=您的登录信息已过期，请重新登录。
 sys.login.success=登录成功！
 sys.login.getInfo=获取信息成功！
 sys.login.failure=账号或密码错误，请重试。
-sys.login.error=对不起，系统遇见了点问题，请稍候再试！
+sys.login.error=对不起，系统遇见了点问题，请稍后再试！
 sys.logout.success=退出成功！
 
 # =========== 账号登录相关 ===========

modules/core/src/main/resources/templates/modules/gen/config.xml

@@ -23,6 +23,7 @@
 			<template>vue/vueImport.xml</template>
 			<childTable>
 				<template>category-ref:dao</template>
+				<template>vue/vueApiChild.xml</template>
 				<template>vue/vueFormChildList.xml</template>
 			</childTable>
 		</category>
@@ -33,12 +34,14 @@
 			<template>vue/vueIndex.xml</template>
 			<template>vue/vueImport.xml</template>
 			<childTable>
+				<template>vue/vueApiChild.xml</template>
 				<template>vue/vueFormChildList.xml</template>
 			</childTable>
 		</category>
 		<category value="crud_only_vue_modal" label="单表/主子表 （增删改查，弹窗表单） 仅vue ">
 			<template>category-ref:crud_only_vue</template>
 			<childTable>
+				<template>vue/vueApiChild.xml</template>
 				<template>vue/vueFormChildList.xml</template>
 			</childTable>
 		</category>
@@ -49,6 +52,7 @@
 			<template>vue/vueIndex.xml</template>
 			<template>vue/vueImport.xml</template>
 			<childTable>
+				<template>vue/vueApiChild.xml</template>
 				<template>vue/vueFormChildList.xml</template>
 			</childTable>
 		</category>
@@ -64,6 +68,7 @@
 			<template>vue/vueSelect.xml</template>
 			<childTable>
 				<template>category-ref:dao</template>
+				<template>vue/vueApiChild.xml</template>
 				<template>vue/vueFormChildList.xml</template>
 			</childTable>
 		</category>
@@ -93,6 +98,7 @@
 			<template>vue/vueImport.xml</template>
 			<childTable>
 				<template>category-ref:dao_cloud</template>
+				<template>vue/vueApiChild.xml</template>
 				<template>vue/vueFormChildList.xml</template>
 			</childTable>
 		</category>
@@ -108,6 +114,7 @@
 			<template>vue/vueSelect.xml</template>
 			<childTable>
 				<template>category-ref:dao_cloud</template>
+				<template>vue/vueApiChild.xml</template>
 				<template>vue/vueFormChildList.xml</template>
 			</childTable>
 		</category>
@@ -250,7 +257,7 @@
 	</gridRowCol>
 	<!-- 模块生成模板分类 -->
 	<moduleTplCategory>
-		<category value="module" label="生成模块代码">
+		<category value="module" label="生成模块代码（Maven）">
 			<template>module/bin/deploy.bat.xml</template>
 			<template>module/bin/deploy.sh.xml</template>
 			<template>module/bin/package.bat.xml</template>
@@ -260,8 +267,17 @@
 			<template>module/src/main/resources/config/jeesite.xml</template>
 			<template>module/src/main/resources/db/versions.xml</template>
 			<template>module/src/main/resources/static/static.xml</template>
+			<template>module/src/main/resources/application-assistant.xml</template>
 			<template>module/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>
 		<category value="module_cloud" label="生成微服务模块代码（Cloud）">
 			<template>module_cloud/client/bin/deploy.bat.xml</template>
 			<template>module_cloud/client/bin/deploy.sh.xml</template>

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/${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

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/${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接口

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}${modulePath}/entity${subModulePath}</filePath>
 	<fileName>${ClassName}.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.entity${isNotBlank(subModuleName)?'.'+subModuleName:''};

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}${modulePath}${subModulePath}</filePath>
 	<fileName>${ClassName}Dao.xml</fileName>
 	<content><![CDATA[
 <?xml version="1.0" encoding="UTF-8" ?>

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/${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;

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}${modulePath}${subModulePath}</filePath>
 	<fileName>${className}Form.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewForm.html'){} %>]]>

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}${modulePath}${subModulePath}</filePath>
 	<fileName>${className}Index.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewIndex.html'){} %>]]>

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}${modulePath}${subModulePath}</filePath>
 	<fileName>${className}List.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewList.html'){} %>]]>

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}${modulePath}${subModulePath}</filePath>
 	<fileName>${className}Select.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewSelect.html'){} %>]]>

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/${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

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/${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

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/${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;
 

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/${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接口