update README.md

README.md

@@ -2,7 +2,7 @@
 <p align="center">
  <img alt="JeeSite" src="https://jeesite.com/assets/images/logo.png" width="120" height="120" style="margin-bottom: 10px;">
 </p>
-<h3 align="center" style="margin:30px 0 30px;font-weight:bold;font-size:30px;">快速开发平台 - Spring Boot</h3>
+<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://v3.cn.vuejs.org/" target="__blank"><img alt="TypeScript-Vue3" src="https://img.shields.io/badge/TypeScript-Vue3-green.svg"></a>
@@ -37,7 +37,7 @@
 * QQ 群：`127515876`、`209330483`、`223507718`、`709534275`、`730390092`、`1373527`、`183903863(外包)`
 * 微信群：如果二维码过期，请尝试刷新图片，或者添加客服微信 jeesitex 邀请您进群
 
-<p style="padding-left:40px"><a href="https://jeesite.com/assets/images/wxg_cur.png" target="_blank">　　
+<p style="padding-left:40px"><a href="https://jeesite.com/assets/images/wxg_cur.png" target="_blank">
  <img alt="JeeSite微信群" src="https://jeesite.com/assets/images/wxg_cur.png" width="200"/></a>
 </p>
 
@@ -95,17 +95,17 @@
 
 ## 技术选型
 
-* 主框架：Spring Boot 2.7、Spring Framework 5.3、Apache Shiro 1.12、J2Cache
-* 持久层：Apache MyBatis 3.5、Hibernate Validator 6.2、Alibaba Druid 1.2
-* 视图层：Spring MVC 5.3、Beetl 3.10（替换JSP）、Bootstrap 3.3、AdminLTE 2.4
+* 主框架：Spring Boot 3.3、Spring Framework 6.1、Apache Shiro 2.0、J2Cache
+* 持久层：Apache MyBatis 3.5、Hibernate Validator 8.0、Alibaba Druid 1.2
+* 视图层：Spring MVC 6.1、Beetl 3.10（替换JSP）、Bootstrap 3.3、AdminLTE 2.4
 * 前端组件：jQuery 3.7、jqGrid 4.7、layer 3.5、zTree 3.5、jQuery Validation
 * 分离前端版：Node.js、TypeScript、Vue3、Vite、Ant Design Vue、Vue Vben Admin
-* 工作流引擎：Flowable 6.6、符合 BPMN 规范、在线流程设计器、中国式流程、退回、撤回、自由流
+* 工作流引擎：Flowable 7.1、符合 BPMN 规范、在线流程设计器、中国式流程、退回、撤回、自由流
 * Bootstrap 版 支持 IE10 及以上版本及其他所有现代浏览器，如：谷歌、火狐、国产浏览器 等
 * Vue3 版 支持现代浏览器，如：谷歌 Chrome 86+、火狐、国产浏览器 等
 * 技术选型（详细）：<http://jeesite.com/docs/technology/>
 * JeeSite Vue 版本：<https://gitee.com/thinkgem/jeesite-vue>
-* Spring Boot 3.x 版本：<https://gitee.com/thinkgem/jeesite5/tree/v5.springboot3>
+* Spring Boot 2.x 版本：<https://gitee.com/thinkgem/jeesite5/tree/v5.9>
 
 ## 更多介绍
 
@@ -138,8 +138,8 @@
 
 ### 本地运行
 
-1. 环境准备：`JDK 1.8 or 11、17`、`Maven 3.6+`、使用 `MySQL 5.7 or 8.0` 数据库、[其它数据库](https://jeesite.com/docs/technology/#_8、已支持数据库)
-2. 下载源码：<https://gitee.com/thinkgem/jeesite5/repository/archive/v5.9.zip> 并解压
+1. 环境准备：`JDK 17+`、`Maven 3.8+`、使用 `MySQL 5.7 or 8.x` 数据库、[其它数据库](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` 初始化数据库
 5. 执行脚本：`/web/bin/run-tomcat.bat` 启动服务即可
@@ -149,8 +149,8 @@
 
 ### 快速运行
 
-1. 环境准备：`JDK 1.8 or 11、17`、`Maven 3.6+`、无需准备数据库（使用内嵌 H2 DB、Vue资源包）
-2. 下载源码：<https://gitee.com/thinkgem/jeesite5/repository/archive/v5.9.zip> 并解压
+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` 启动服务即可（自动初始化库）
 4. Vue分离版本地址：<http://127.0.0.1:8980/vue/login>
 5. 全栈版本地址：<http://127.0.0.1:8980/a/login>

common/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.11.0-SNAPSHOT</version>
+		<version>5.10.1.springboot3-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
@@ -21,8 +21,8 @@
 
 		<!-- Servlet Api -->
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		
@@ -45,12 +45,12 @@
 			<artifactId>commons-io</artifactId>
 			<version>${commons-io.version}</version>
 		</dependency>
-		
-		<!-- Java serialization -->
+
+		<!-- Fury serialize -->
 		<dependency>
-			<groupId>de.ruedigermoeller</groupId>
-			<artifactId>fst</artifactId>
-			<version>${fst.version}</version>
+			<groupId>org.apache.fury</groupId>
+			<artifactId>fury-core</artifactId>
+			<version>${fury.version}</version>
 		</dependency>
 		
 		<!-- Jackson json -->

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

@@ -15,7 +15,7 @@ import org.apache.commons.text.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;

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

@@ -7,6 +7,9 @@ package com.jeesite.common.io;
 import com.jeesite.common.codec.EncodeUtils;
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.lang.StringUtils;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import net.sf.jmimemagic.Magic;
 import net.sf.jmimemagic.MagicMatch;
 import org.apache.commons.io.IOUtils;
@@ -15,9 +18,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ClassPathResource;
 
 import javax.activation.MimetypesFileTypeMap;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.util.Enumeration;
 import java.util.List;

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

@@ -36,9 +36,7 @@ public class PropertiesUtils {
 	// 默认加载的文件，可通过继承覆盖（若有相同Key，优先加载后面的）
 	public static final String[] DEFAULT_CONFIG_FILE = new String[]{
 		"classpath:application.yml", "classpath:config/application.yml",
-		"classpath:bootstrap.yml", "classpath:config/bootstrap.yml",
 		"file:application.yml", "file:config/application.yml",
-		"file:bootstrap.yml", "file:config/bootstrap.yml",
 	};
 
 	private static final Logger logger = PropertiesUtils.initLogger();
@@ -174,7 +172,7 @@ public class PropertiesUtils {
 	private static final Pattern p1 = Pattern.compile("\\$\\{.*?\\}");
 
 	/**
-	 * 获取属性值，取不到从System.getProperty和System.getenv获取，都取不到返回null
+	 * 获取属性值，取不到从System.getProperty()获取，都取不到返回null
 	 */
 	public String getProperty(String key) {
 		if (environment != null){
@@ -196,10 +194,9 @@ public class PropertiesUtils {
 	    	String systemProperty = System.getProperty(key);
 			if (systemProperty != null) {
 				return systemProperty;
-			}else{
-				return System.getenv(key);
 			}
 	    }
+		return null;
 	}
 
 	/**

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

@@ -4,8 +4,8 @@
  */
 package com.jeesite.common.lang;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletRequest;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

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

@@ -4,12 +4,14 @@
  */
 package com.jeesite.common.lang;
 
+import com.jeesite.common.io.PropertiesUtils;
 import org.apache.commons.lang3.BooleanUtils;
-import org.nustaq.serialization.FSTConfiguration;
+import org.apache.fury.Fury;
+import org.apache.fury.ThreadSafeFury;
+import org.apache.fury.config.Language;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
-import org.springframework.core.NamedThreadLocal;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -25,13 +27,24 @@ import java.lang.reflect.InvocationTargetException;
 public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 
 	private static final Logger logger = LoggerFactory.getLogger(ObjectUtils.class);
-	private static final boolean isJavaSerialize; 
-	
-	static {
-		String[] ver = StringUtils.split(System.getProperty("java.version"), StringUtils.DOT);
-		isJavaSerialize = ver.length > 0 && Integer.parseInt(ver[0]) > 1;
+
+	/**
+	 * 当前类的实例持有者（静态内部类，延迟加载，懒汉式，线程安全的单例模式）
+	 */
+	private static final class Static {
+		private static final Boolean isJavaSerialize;
+		private static final ThreadSafeFury fury;
+		static {
+			isJavaSerialize = PropertiesUtils.getInstance()
+					.getPropertyToBoolean("isJavaSerialize", "false");
+			org.apache.fury.logging.LoggerFactory.useSlf4jLogging(true);
+			fury = Fury.builder().withLanguage(Language.JAVA)
+                .withRefTracking(true)
+                .requireClassRegistration(false)
+                .buildThreadSafeFury();
+		}
 	}
-	
+
 	/**
 	 * 转换为 Double 类型
 	 */
@@ -186,10 +199,10 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 	 */
 	public static byte[] serialize(Object object) {
 		try {
-			if (isJavaSerialize) {
+			if (Static.isJavaSerialize) {
 				return ObjectUtils.serializeJava(object);
-			}else {
-				return ObjectUtils.serializeFst(object);
+			} else {
+				return ObjectUtils.serializeFury(object);
 			}
 		} catch (Exception e) {
 			logger.error("serialize: {}", e.getMessage());
@@ -204,10 +217,10 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 	 */
 	public static Object unserialize(byte[] bytes) {
 		try {
-			if (isJavaSerialize) {
+			if (Static.isJavaSerialize) {
 				return ObjectUtils.unserializeJava(bytes);
-			}else {
-				return ObjectUtils.unserializeFst(bytes);
+			} else {
+				return ObjectUtils.unserializeFury(bytes);
 			}
 		} catch (Exception e) {
 			logger.error("unserialize: {}", e.getMessage());
@@ -265,51 +278,88 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 		}
 		return object;
 	}
-	
-	private static ThreadLocal<FSTConfiguration> fstConfiguration = 
-				new NamedThreadLocal<FSTConfiguration>("FSTConfiguration") {
-		@Override
-		public FSTConfiguration initialValue() {
-			return FSTConfiguration.createDefaultConfiguration();
-		}
-	};
+
 
 	/**
-	 * FST 序列化对象
+	 * 序列化对象
 	 * @param object
 	 * @return
 	 */
-	public static byte[] serializeFst(Object object) {
+	public static byte[] serializeFury(Object object) {
 		if (object == null){
 			return null;
 		}
 		long beginTime = System.currentTimeMillis();
-		byte[] bytes = fstConfiguration.get().asByteArray(object);
+		byte[] bytes = Static.fury.serialize(object);
 		long totalTime = System.currentTimeMillis() - beginTime;
 		if (totalTime > 30000){
-			logger.warn(object.getClass() + " fst serialize time: " + TimeUtils.formatTime(totalTime));
+			logger.warn(object.getClass() + " serialize time: " + TimeUtils.formatTime(totalTime));
 		}
 		return bytes;
 	}
 
 	/**
-	 * FST 反序列化对象
+	 * 反序列化对象
 	 * @param bytes
 	 * @return
 	 */
-	public static Object unserializeFst(byte[] bytes) {
+	public static Object unserializeFury(byte[] bytes) {
 		if (bytes == null){
 			return null;
 		}
 		long beginTime = System.currentTimeMillis();
-		Object object = fstConfiguration.get().asObject(bytes);
+		Object object = Static.fury.deserialize(bytes);
 		long totalTime = System.currentTimeMillis() - beginTime;
 		if (totalTime > 30000 && object != null){
-			logger.warn(object.getClass() + " fst unserialize time: " + TimeUtils.formatTime(totalTime));
+			logger.warn(object.getClass() + " unserialize time: " + TimeUtils.formatTime(totalTime));
 		}
 		return object;
 	}
 
+//	private static ThreadLocal<FSTConfiguration> fstConfiguration =
+//				new NamedThreadLocal<FSTConfiguration>("FSTConfiguration") {
+//		@Override
+//		public FSTConfiguration initialValue() {
+//			return FSTConfiguration.createDefaultConfiguration();
+//		}
+//	};
+//
+//	/**
+//	 * FST 序列化对象
+//	 * @param object
+//	 * @return
+//	 */
+//	public static byte[] serializeFst(Object object) {
+//		if (object == null){
+//			return null;
+//		}
+//		long beginTime = System.currentTimeMillis();
+//		byte[] bytes = fstConfiguration.get().asByteArray(object);
+//		long totalTime = System.currentTimeMillis() - beginTime;
+//		if (totalTime > 30000){
+//			logger.warn(object.getClass() + " fst serialize time: " + TimeUtils.formatTime(totalTime));
+//		}
+//		return bytes;
+//	}
+//
+//	/**
+//	 * FST 反序列化对象
+//	 * @param bytes
+//	 * @return
+//	 */
+//	public static Object unserializeFst(byte[] bytes) {
+//		if (bytes == null){
+//			return null;
+//		}
+//		long beginTime = System.currentTimeMillis();
+//		Object object = fstConfiguration.get().asObject(bytes);
+//		long totalTime = System.currentTimeMillis() - beginTime;
+//		if (totalTime > 30000 && object != null){
+//			logger.warn(object.getClass() + " fst unserialize time: " + TimeUtils.formatTime(totalTime));
+//		}
+//		return object;
+//	}
+
 //	private static Pool<Kryo> kryoPool = new Pool<Kryo>(true, false, 8) {
 //		protected Kryo create() {
 //			Kryo kryo = new Kryo();

common/src/main/java/com/jeesite/common/mapper/JsonMapper.java

@@ -182,8 +182,8 @@ public class JsonMapper extends ObjectMapper {
 	 * 反序列化POJO或简单Collection如List<String>.
 	 * 如果JSON字符串为Null或"null"字符串, 返回Null.
 	 * 如果JSON字符串为"[]", 返回空集合.
-	 * 如需反序列化复杂Collection如List<MyBean>, 请使用fromJson(String, Class)
-	 * @see #fromJson(String, Class)
+	 * 如需反序列化复杂Collection如List<MyBean>, 请使用fromJson(String,JavaType)
+	 * @see #fromJson(String, JavaType)
 	 */
 	public <T> T fromJsonString(String jsonString, Class<T> clazz) {
 		if (StringUtils.isEmpty(jsonString) || "<CLOB>".equals(jsonString)) {

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

@@ -4,7 +4,7 @@ import com.jeesite.common.codec.EncodeUtils;
 import com.jeesite.common.io.PropertiesUtils;
 import com.jeesite.common.lang.StringUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public class IpUtils {
 

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

@@ -23,7 +23,7 @@ import org.apache.poi.xssf.usermodel.XSSFRichTextString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

common/src/main/java/com/jeesite/common/web/CookieUtils.java

@@ -7,9 +7,9 @@ package com.jeesite.common.web;
 import com.jeesite.common.codec.EncodeUtils;
 import com.jeesite.common.io.PropertiesUtils;
 import com.jeesite.common.lang.StringUtils;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Cookie工具类

common/src/main/java/com/jeesite/common/web/http/ResultUtils.java

@@ -5,8 +5,8 @@
 package com.jeesite.common.web.http;
 
 import com.jeesite.common.io.PropertiesUtils;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * 统一包装结果输出类：{ code: 200, msg: "", data: {} | [] }

common/src/main/java/com/jeesite/common/web/http/ServletUtils.java

@@ -12,15 +12,15 @@ import com.jeesite.common.lang.ExceptionUtils;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.mapper.JsonMapper;
 import com.jeesite.common.mapper.XmlMapper;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.Validate;
 import org.springframework.http.MediaType;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;
 import java.util.Map.Entry;

common/src/main/java/com/jeesite/common/web/http/UserAgentUtils.java

@@ -4,7 +4,7 @@
  */
 package com.jeesite.common.web.http;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import eu.bitwalker.useragentutils.Browser;
 import eu.bitwalker.useragentutils.DeviceType;

common/src/main/resources/static/jquery-ztree/3.5/log v3.x.txt

@@ -0,0 +1,170 @@
+=ZTree v3.x (JQuery Tree插件) 更新日志=
+
+<font color="red">为了更好的优化及扩展zTree, 因此决定升级为v3.x，并且对之前的v2.x不兼容，会有很多结构上的修改，对此深感无奈与抱歉，请大家谅解。</font>
+<font color="red">
+
+具体修改内容可参考：
+
+   * [http://www.ztree.me/v3/api.php zTree v3.0 API 文档]
+
+   * [http://www.ztree.me/v3/demo.php#_101 zTree v3.0 Demo 演示]
+
+   * [http://www.ztree.me/v3/faq.php#_101 zTree v3.0 常见问题]
+
+</font>
+
+<font color=#041594>
+*2013.03.11* v3.5.12
+   * 【修改】由于 jquery 1.9 中移除 event.srcElement 导致的 js 报错的bug。
+   * 【修改】在异步加载模式下，使用 moveNode 方法，且 moveType != "inner" 时，也会导致 targetNode 自动加载子节点的 bug
+   * 【修改】对已经显示的节点(nochecked=true)使用 showNodes 或 showNode 方法后，导致勾选框出现的bug。
+   * 【修改】对已经隐藏的节点(nochecked=false)使用 hideNodes 或 hideNode 方法后，导致勾选框消失的bug。
+   * 【修改】getNodesByParamFuzzy 支持 大小写模糊。
+   * 【修改】className 结构，提取 _consts.className.BUTTON / LEVEL / ICO_LOADING / SWITCH，便于快速修改 css 冲突。
+     例如：与 WordPress 产生冲突后，直接修改 core 中的 "button" 和 "level" 即可。  Issue: https://github.com/zTree/zTree_v3/issues/2
+
+*2013.01.28* v3.5.02
+   * 【增加】setting.check.chkDisabledInherit 属性，用于设置 chkDisabled 在初始化时子节点是否可以继承父节点的 chkDisabled 属性
+   * 【删除】内部 noSel 方法，使用 selectstart事件 和 "-moz-user-select"样式 处理禁止 节点文字被选择的功能
+   * 【修改】不兼容 jQuery 1.9 的bug
+   * 【修改】onDrop 的触发规则，保证异步加载模式下，可以在延迟加载结束后触发，避免 onDrop 中被拖拽的节点是已经更新后的数据。
+   * 【修改】setChkDisabled 方法，增加 inheritParent, inheritChildren 参数设置是否让父子节点继承 disabled
+   * 【修改】异步加载时 拼接参数的方法，由 string 修改为 json 对象
+   * 【修正】1-2-3 3级节点时，如果 2级节点 全部设置为 nocheck 或 chkDisabled后，勾选3级节点时，1级节点的半勾选状态错误的 bug
+   * 【修改】Demo: checkbox_nocheck.html & checkbox_chkDisabled.html;
+   * 【修改】Demo: edit_super.html，增加 showRenameBtn & showRemoveBtn 的演示
+   * 【修改】Demo: asyncForAll, 将 post 修改为 get；为了避免由于 IE10 的 bug 造成的客户端 以及 服务端崩溃
+      IE10 ajax Post 无法提交参数的bug (http://bugs.jquery.com/ticket/12790)
+
+*2012.12.21* v3.5.01
+   * 【优化】clone 方法
+   * 【修正】对于初始化无 children 属性的父节点进行 reAsyncChildNodes 操作时出错的 bug
+   * 【修正】beforeRename 回调中使用 cancelEditName 方法后，再 return false 导致无法重新进行编辑的 bug
+   * 【修正】exedit 扩展包让 setting.data.key.url 失效的 bug
+   * 【修正】setting.check.autoCheckTrigger 设置为 true 时，onCheck 回调缺少 event 参数的 bug
+   * 【修正】singlepath.html Demo 中的 bug
+
+*2012.11.20* v3.5
+   * 【优化】原先的 clone 方法 （特别感谢：愚人码头）
+   * 【修改】隐藏父节点后，使用 expandAll 方法导致 父节点展开的 bug
+   * 【修改】使用 jQuery v1.7 以上时，设置 zTree 容器 ul 隐藏（visibility: hidden;）后， 调用 selectNode 导致 IE 浏览器报错 Can't move focus 的 bug
+   * 【修改】正在异步加载时，执行 destory 或 init 方法后，异步加载的节点影响新树的 bug
+   * 【修改】方法 reAsyncChildNodes 在 refresh 的时候未清空内部 cache 导致内存泄露 的 bug
+   * 【修改】批量节点拖拽到其他父节点内（inner）时，导致顺序反转 的 bug
+   * 【修改】对于 使用 html格式的 节点无法触发 双击事件 的 bug
+   * 【修改】onCheck 回调中的 event ，保证与触发事件中的 event 一致
+   * 【修改】异步加载时，在 onNodeCreated 中执行 selectNode 后，导致节点折叠的 bug
+   * 【修改】API 中 dataFilter 的参数名称 childNodes ->  responseData
+   * 【修改】API 中 iconSkin 的 举例内容
+   * 【修改】API 中 chkDisabled 的说明
+   * 【修改】Demo 中 index.html 内的 loadReady 重复绑定问题
+
+*2012.09.03* v3.4
+   * 【增加】 Demo —— OutLook 样式的左侧菜单
+   * 【增加】清空 zTree 的方法 $.fn.zTree.destory(treeId) & zTree.destory()
+
+   * 【修改】core核心文件内 _eventProxy 方法中获取 tId 的方法，提高 DOM 的灵活性
+   * 【修改】初始化时 多层父节点的 checkbox 半选状态计算错误的 bug
+   * 【修改】同时选中父、子节点后，利用 getSelectedNodes 获取选中节点并利用 removeNode 删除时报错的 bug
+   * 【修改】treeNode.chkDisabled / nocheck 属性，支持字符串格式的 "false"/"true"
+   * 【修改】异步加载模式下无法利用 server 返回 xml 并且 在 dataFilter 中继续处理的 bug
+   * 【修改】title 只允许设置为 string 类型值的问题。 修正后允许设置为 number 类型的值
+   * 【修改】zId 计数规则 & Cache 保存，减少 IE9 的 bug 造成的内存泄漏
+   * 【修改】API 页面搜索功能导致 IE 崩溃的 bug
+
+*2012.07.16* v3.3
+   * 【增加】扩展库 exhide -- 节点隐藏功能
+
+   * 【修改】getNodesByFilter 方法，添加 invokeParam 自定义参数
+   * 【修改】拖拽中测试代码未删除，导致出现黄颜色的 iframe 遮罩层的 bug
+   * 【修改】延迟加载方法 对于使用 expandAll 进行全部展开时，导致 onNodeCreated 回调 和 addDiyDom 方法触发过早的 bug
+   * 【修改】使用 moveNode 移动尚未生成 DOM 的节点时，视图会出现异常的 bug
+   * 【修改】删除节点后，相关节点的 isFirstNode 属性未重置的 bug
+   * 【修改】getPreNode(),getNextNode() 方法在对于特殊情况时计算错误的 bug
+   * 【修改】设置 title 之后，如果重新将 title 内容设置为空后，会导致无法更新 title 的 bug
+   * 【修改】针对 setting.check.chkStyle=="radio" && setting.check.radioType=="all" 的情况时，getTreeCheckedNodes方法优化，找到一个结果就 break
+   * 【修改】zTreeObj.getCheckedNodes(false) 在 radioType = "all" 时计算错误的 bug
+   * 【修改】完善 API 中 beforeDrop / onDrop 的关于 treeId 的说明
+
+*2012.05.13* v3.2
+   * 【增加】setting.data.key.url 允许修改 treeNode.url 属性
+   * 【增加】getNodesByFilter(filter, isSingle) 方法
+   * 【增加】"与其他 DOM 拖拽互动" 的 Demo (http://www.ztree.me/v3/demo.php#_511)
+   * 【增加】"异步加载模式下全部展开" 的 Demo (http://www.ztree.me/v3/demo.php#_512)
+
+   * 【修改】代码结构，将 addNodes、removeNode、removeChildNodes 方法 和 beforeRemove、onRemove 回调 转移到 core 内
+   * 【修改】IE7的环境下无子节点的父节点反复展开出现多余空行的 bug
+   * 【修改】异步加载时，如果出现网络异常等，会导致 图标显示错误的 bug
+   * 【修改】dataFilter中 return null 导致异常 的 bug
+   * 【修改】removeChildNodes 方法清空子节点后，无法正常添加节点的 bug
+   * 【修改】moveNode 后节点中的自定义元素的事件丢失的 bug
+   * 【修改】moveNode 方法中设置 isSilent = true 时，如果移动到已展开的 父节点后，出现异常的 bug
+   * 【修改】onClick/onDrag/onDrop 回调中 event 不是原始 event 的 bug
+   * 【修改】onDrop 回调中 当拖拽无效时，无法获得 treeNodes 的 bug
+   * 【修改】onDrop 无法判断拖拽是 移动还是复制的问题
+   * 【修改】未开启异步加载模式时，拖拽节点到子节点为空的父节点内时 出现异常 的 bug
+   * 【修改】拖拽过程中，反复在 父节点图标上划动时，会出现停顿的 bug
+            (需要css 结构—— button -> span.button)
+
+   * 【修改】拖拽操作时箭头 与 targetNode 背景之间的细节现实问题，便于用户拖拽时更容易区分 prev、next 和 inner 操作
+   * 【修改】拖拽操作时IE6/7 下 在 节点<a> 右侧 10px 内会导致 targetNode = root 的 bug
+   * 【修改】编辑模式下 默认的编辑按钮、删除按钮点击后，如果相应的 before 回调 return false 时会触发 onClick 回调的 bug
+
+*2012.02.14* v3.1
+   * 【增加】ajax 的参数 setting.async.contentType ，让提交参数适用于 json 数据提交 （主要适用于 .Net 的开发）。
+   * 【增加】setting.edit.editNameSelectAll, 用于设定编辑节点名称时初次显示 input 后 text 内容为全选
+   * 【修改】异步加载 规则，不再仅仅依靠父节点的子节点数来判定，增加内部属性 zAsync，保证默认状态下父节点及时无子节点也只能异步加载一次，除非使用 reAsyncChildNodes 方法强行控制异步加载。
+   * 【修改】放大浏览器后导致 界面出现多余连接线的bug （需要更新：icon 图标和 css ）
+   * 【修改】在编辑状态，如果节点名超过编辑框宽度，左右键在框内不起作用的bug（IE 6 7 8 出现）
+      CSS 中 filter:alpha(opacity=80) 造成的，应该是 ie 的 bug，需要更新 css 文件
+   * 【修改】title 设置后，如果属性不存在，则默认为 title 为空，便于数据容错和用户灵活使用
+   * 【修改】editName 方法如果针对尚未展开的 父节点，会导致该父节点自动展开的 bug
+   * 【修改】title 中存在标签时导致 title 显示异常的bug（例如：蓝色字22%"'`<input/>`）
+
+*2012.01.10* v3.0
+   * 【增加】setting.check.autoCheckTrigger 默认值 false，可以设置联动选中时是否触发事件回调函数
+   * 【增加】setting.callback.beforeEditName 回调函数，以保证用户可以捕获点击编辑按钮的事件
+   * 【增加】treeNode.chkDisabled 属性，显示 checkbox 但是用户无法修改 checkbox 状态，并且该 checkbox 会影响父节点的 checkbox 的半选状态
+   * 【增加】setting.check.nocheckInherit 属性，用户设置子节点继承 nocheck 属性，用于批量初始化节点，不适用于已经显示的节点
+   * 【增加】setting.edit.drag.autoExpandTrigger 默认值 false，可以设置自动展开、折叠操作时是否触发事件回调函数
+   * 【增加】setting.view.nameIsHTML 默认值 false，允许用户对 name 设置 DOM 对象
+   * 【增加】treeNode.click 属性的说明文档
+   * 【增加】treeObj.setChkDisabled 方法用于设置 checkbox / radio disabled 状态
+   * 【增加】treeNode.halfCheck 属性，用于强制设定节点的半选状态
+
+   * 【修改】异步加载 & 编辑功能 共存时，拖拽节点 或 增加节点 导致 ie 上报错的 bug （apply 方法引起）
+   * 【修改】zTreeStyle 样式冲突
+   * 【修改】setting.data.key.title 默认值设置为 ""，初始化时自动赋值为 setting.data.key.name 这样可避免希望 title 与 name 一致的用户反复设置参数
+   * 【修改】点击叶子节点的连接线会触发 expand 事件的 bug
+   * 【修改】IE 下 点击叶子节点连线会出现虚线框的 bug
+   * 【修改】updateNode 导致 checkbox 半选状态错误的 bug
+   * 【修改】checkNode 方法实现 toggle 操作, 取消 expandAll 方法的 toggle 操作
+   * 【修改】zTree 内鼠标移动会抢页面上 input 内的焦点的 bug
+   * 【修改】beforeRename / onRename 的触发方式——即使名称内容未改变也会触发，便于用户配合 beforeEditName 捕获编辑状态的结束，赋予用户更多调整规则的权利
+   * 【修改】与 easyUI 共存时无法拖拽的bug
+   * 【修改】beforeRename 在 Firefox 下如果利用 alert，会触发两次的 bug
+   * 【修改】checkNode/expandNode/removeNode 方法，默认不触发回调函数，恢复 v2.6 的默认状态，同时增加 callbackFlag 参数，设置为 true 时，可以触发回调函数
+   * 【修改】IE9下“根据参数查找节点”的Demo 报错：行14 重新声明常量属性(Demo 自身的问题，定义了history变量)
+   * 【修改】初始化 zTree 时 onNodeCreated 事件回调函数中无法 用 getZTreeObj 获取 zTree 对象的 bug
+   * 【修改】setting.edit.drag.prev / next / inner 参数，增加被拖拽的节点集合
+   * 【修改】异步加载模式下，otherParam 使用Array数组会出错的 bug。例如： ["id", "1", "name", "test"]
+   * 【修改】FireFox 下多棵树拖拽异常的 bug
+   * 【修改】exedit 中调用 excheck库的方法时没有进行容错处理，导致如果只加入 exedit 而没有 excheck的时候，会出现 js 错误
+   * 【修改】显示 checkbox 的 zTree 在编辑模式下，移动节点不会更新父节点半选状态的 bug
+   * 【修改】treeNode.childs --> children; treeObject.removeChilds --> removeChildNodes; setting.data.key.childs --> children（英文不好惹的祸！抱歉了！）
+   * 【修改】onRemove 回调中得到的 treeNode 还可以查找 preNode、nextNode 的bug。 修正后，getPreNode 和 getNextNode 都返回 null； 为了便于查找父节点，getParentNode 仍保留
+   * 【修改】简单数据模式下，如果 id 与 pId 的值相同会导致该节点无法正常加载的 bug
+   * 【修改】移动或删除中间节点会导致最后一个节点连接线图标变小的 bug
+
+*2011.09.05* v3.0 beta
+   * 【修改】zTree 的 js 代码架构全面修改，并且拆分
+   * 【修改】zTree 的 css 样式全面修改，对浏览器可以更好地兼容，同时解决了以前1个像素差的问题
+   * 【优化】采用延迟加载技术，一次性加载大数据量的节点性能飞速提升
+   * 【增加】支持多节点同时选中、拖拽
+   * 【增加】checkNode、checkAllNodes 等多种方法
+   * 【增加】IE6 自动取消动画展开、折叠的功能
+   * 【修正】异步加载 & 编辑模式 能够更完美的共存
+   * 【修正】setting 配置更加合理，并且增加了若干项配置参数
+   * 【修正】treeNode 节点数据的属性更加合理，并且增加了一些方法
+   * 【修正】拖拽操作更加灵活方便，更容易制定自己的规则
+   * 【修正】其他若干修改，详细对比请参考 url：[http://www.ztree.me/v3/faq.php#_101 zTree v3.0 常见问题]

common/src/test/java/com/jeesite/test/web/http/HttpClientUtilsTest.java

@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ */
+package com.jeesite.test.web.http;
+
+import com.jeesite.common.web.http.HttpClientUtils;
+
+/**
+ * HTTP客户端测试工具类（支持HTTPS）
+ * @author ThinkGem
+ * @version 2017-3-27
+ */
+public class HttpClientUtilsTest {
+
+	public static void main(String[] args) {
+		String content = HttpClientUtils.get("https://jeesite.com");
+		System.out.println(content);
+	}
+
+}

modules/app/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.11.0-SNAPSHOT</version>
+		<version>5.10.1.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	

modules/app/src/main/java/com/jeesite/modules/app/entity/AppComment.java

@@ -9,9 +9,9 @@ import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
 import java.util.Date;
 
 /**
@@ -24,14 +24,13 @@ import java.util.Date;
 		@Column(name="category", attrName="category", label="问题分类"),
 		@Column(name="content", attrName="content", label="问题和意见"),
 		@Column(name="contact", attrName="contact", label="联系方式"),
+		@Column(includeEntity=DataEntity.class),
 		@Column(name="create_by_name", attrName="createByName", label="提问人员姓名", queryType=QueryType.LIKE),
 		@Column(name="device_info", attrName="deviceInfo", label="设备信息"),
 		@Column(name="reply_date", attrName="replyDate", label="回复时间"),
 		@Column(name="reply_content", attrName="replyContent", label="回复意见"),
 		@Column(name="reply_user_code", attrName="replyUserCode", label="回复人员"),
 		@Column(name="reply_user_name", attrName="replyUserName", label="回复人员姓名", queryType=QueryType.LIKE),
-		@Column(name="status", attrName="status", label="状态", isUpdate=true), // save时，允许更新status字段
-		@Column(includeEntity=DataEntity.class),
 	}, orderBy="a.create_date DESC"
 )
 public class AppComment extends DataEntity<AppComment> {

modules/app/src/main/java/com/jeesite/modules/app/entity/AppUpgrade.java

@@ -6,7 +6,7 @@ package com.jeesite.modules.app.entity;
 
 import java.util.Date;
 
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeesite.common.entity.DataEntity;

modules/app/src/main/java/com/jeesite/modules/app/web/AppCommentController.java

@@ -4,11 +4,11 @@
  */
 package com.jeesite.modules.app.web;
 
-import com.jeesite.common.config.Global;
-import com.jeesite.common.entity.Page;
-import com.jeesite.common.web.BaseController;
-import com.jeesite.modules.app.entity.AppComment;
-import com.jeesite.modules.app.service.AppCommentService;
+import java.util.Date;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,9 +20,11 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
+import com.jeesite.common.config.Global;
+import com.jeesite.common.entity.Page;
+import com.jeesite.common.web.BaseController;
+import com.jeesite.modules.app.entity.AppComment;
+import com.jeesite.modules.app.service.AppCommentService;
 
 /**
  * APP意见反馈Controller
@@ -95,6 +97,7 @@ public class AppCommentController extends BaseController {
 			}
 		}
 		appCommentService.save(appComment);
+		appCommentService.updateStatus(appComment);
 		return renderResult(Global.TRUE, text("保存意见成功！"));
 	}
 	

modules/app/src/main/java/com/jeesite/modules/app/web/AppUpgradeController.java

@@ -4,8 +4,8 @@
  */
 package com.jeesite.modules.app.web;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -24,5 +24,4 @@
 5.9.1
 5.9.2
 5.10.0
-5.10.1
-5.11.0
+5.10.1

modules/app/src/main/resources/views/modules/app/appCommentForm.html

@@ -160,7 +160,7 @@
 </div>
 <% } %>
 <script>
-$("#inputForm").validate({
+$('#inputForm').validate({
 	submitHandler: function(form){
 		js.ajaxSubmitForm($(form), function(data){
 			js.showMessage(data.message);

modules/app/src/main/resources/views/modules/app/appUpgradeForm.html

@@ -132,7 +132,7 @@
 </div>
 <% } %>
 <script>
-$("#inputForm").validate({
+$('#inputForm').validate({
 	submitHandler: function(form){
 		js.ajaxSubmitForm($(form), function(data){
 			js.showMessage(data.message);

modules/cms/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.11.0-SNAPSHOT</version>
+		<version>5.10.1.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 
@@ -24,12 +24,6 @@
 			<artifactId>jeesite-module-core</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-configuration-processor</artifactId>
-			<optional>true</optional>
-		</dependency>
 		
 	</dependencies>
 

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

@@ -13,9 +13,9 @@ import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
 import com.jeesite.modules.cms.utils.CmsUtils;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.Date;
 
 /**
@@ -61,7 +61,7 @@ import java.util.Date;
 				@Column(name = "site_code"),
 				@Column(name = "site_name"),
 			})
-	}, extWhereKeys = "dsfCategory", orderBy = "a.weight DESC, a.update_date DESC"
+	}, extWhereKeys = "dsfCategory", orderBy = "a.update_date DESC"
 )
 public class Article extends DataEntity<Article> {
 	

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

@@ -4,7 +4,7 @@
  */
 package com.jeesite.modules.cms.entity;
 
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 
 import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.entity.Extend;

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

@@ -14,8 +14,8 @@ import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
 import com.jeesite.modules.cms.utils.CmsUtils;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 
 /**

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

@@ -6,10 +6,10 @@ package com.jeesite.modules.cms.entity;
 
 import java.util.Date;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeesite.common.entity.BaseEntity;

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

@@ -4,7 +4,7 @@
  */
 package com.jeesite.modules.cms.entity;
 
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 
 import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.mybatis.annotation.Column;

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

@@ -14,8 +14,8 @@ import com.jeesite.modules.cms.utils.CmsUtils;
 import com.jeesite.modules.sys.utils.CorpUtils;
 import com.jeesite.modules.sys.utils.UserUtils;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 
 /**

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

@@ -4,7 +4,7 @@
  */
 package com.jeesite.modules.cms.entity;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.mybatis.annotation.Column;

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

@@ -6,7 +6,7 @@ package com.jeesite.modules.cms.entity;
 
 import java.util.Date;
 
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeesite.common.entity.BaseEntity;

modules/cms/src/main/java/com/jeesite/modules/cms/properties/properties/CmsProperties.java

@@ -1,81 +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.properties.properties;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * CmsProperties
- * @author ThinkGem
- * @version 2022-4-10
- */
-@ConfigurationProperties(prefix = "cms")
-public class CmsProperties {
-
-	private PageCache pageCache = new PageCache();
-
-	public static class PageCache {
-
-		/**
-		 * 是否开启页面静态化缓存
-		 */
-		private Boolean enabled = false;
-
-		/**
-		 * 缓存名称标识
-		 */
-		private String cacheName = "cmsPageCache";
-
-		/**
-		 * 拦截的网页地址
-		 */
-		private String urlPatterns = "${frontPath}/*";
-
-		/**
-		 * 只静态化 .html 后缀的网页
-		 */
-		private String urlSuffixes = ".html";
-
-		public Boolean getEnabled() {
-			return enabled;
-		}
-
-		public void setEnabled(Boolean enabled) {
-			this.enabled = enabled;
-		}
-
-		public String getCacheName() {
-			return cacheName;
-		}
-
-		public void setCacheName(String cacheName) {
-			this.cacheName = cacheName;
-		}
-
-		public String getUrlPatterns() {
-			return urlPatterns;
-		}
-
-		public void setUrlPatterns(String urlPatterns) {
-			this.urlPatterns = urlPatterns;
-		}
-
-		public String getUrlSuffixes() {
-			return urlSuffixes;
-		}
-
-		public void setUrlSuffixes(String urlSuffixes) {
-			this.urlSuffixes = urlSuffixes;
-		}
-	}
-
-	public PageCache getPageCache() {
-		return pageCache;
-	}
-
-	public void setPageCache(PageCache pageCache) {
-		this.pageCache = pageCache;
-	}
-}

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

@@ -20,7 +20,7 @@ import com.jeesite.modules.cms.service.CategoryService;
 import com.jeesite.modules.cms.service.SiteService;
 import org.springframework.ui.Model;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;

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

@@ -27,8 +27,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 

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

@@ -4,8 +4,8 @@
  */
 package com.jeesite.modules.cms.web;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -4,8 +4,8 @@
  */
 package com.jeesite.modules.cms.web;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -24,8 +24,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**

modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java

@@ -21,8 +21,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
 

modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontSearchController.java

@@ -6,8 +6,8 @@ package com.jeesite.modules.cmsfront.web;
 
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

modules/cms/src/main/resources/application-assistant.yml

@@ -1,12 +0,0 @@
-
-## 重要提示（Tip）：
-
-## 请勿在该配置文件中添加其它任何配置（添加也不会生效）。
-## 该文件，仅仅是为了让 jeesite-cms.yml 文件，
-## 在 IDEA 中有一个自动完成及帮助提示，并无其它用意。
-## 参数配置请在 jeesite-cms.yml 文件中添加。
-
-spring:
-  config:
-    import:
-      - classpath:config/jeesite-cms.yml

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

@@ -3,7 +3,7 @@
 cms:
   pageCache:
     # 是否开启页面静态化缓存
-    enabled: false
+    #enabled: true
     # 缓存名称标识
     cacheName: cmsPageCache
     # 拦截的网页地址

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

@@ -32,5 +32,4 @@
 5.9.1
 5.9.2
 5.10.0
-5.10.1
-5.11.0
+5.10.1

modules/cms/src/main/resources/static/modules/cmsfront/themes/css/custom.css

@@ -4,10 +4,6 @@ body>.navbar{-webkit-transition:background-color .3s ease-in;transition:backgrou
 	body>.navbar-transparent{background-color:transparent}
 	body>.navbar-transparent .navbar-nav>.open>a{background-color:transparent!important}
 }
-h1,.h1{font-size:26px}
-h2,.h2{font-size:24px}
-h3,.h3{font-size:22px}
-p{margin:5px 0 10px;line-height:1.75;}
 #home{padding-top:0}
 #home .navbar-brand{padding:13.5px 15px 12.5px}
 #home .navbar-brand>img{display:inline;margin:0 10px;height:100%}
@@ -84,7 +80,7 @@ footer p{clear:left;margin-bottom:0}
 .article-title {color:#333;font-size:30px;text-align:center;border-bottom:1px solid #ddd;padding:15px 20px 20px 20px;margin-bottom:30px;}
 .article-info {border-top:1px solid #ddd;padding:10px;margin:30px 0 0;}
 .article-desc {padding:8px 10px 8px;margin:10px 20px 20px 35px;font-size:14px;}
-.article-content {padding-top:10px;}
+.article-content {padding-top:20px;}
 
 .pagination {margin:8px 0;display:block;/* text-align:center; */font-size:13px;} /* .pagination .controls a{border:0;} */
 .pagination>li>a, .pagination>li>span {min-width:37px;text-align:center;padding:6px;border:1px solid #ddd;background:transparent;/* border-radius:3px; */}

modules/cms/src/main/resources/views/modules/cms/commentForm.html

@@ -173,7 +173,7 @@
 </div>
 <% } %>
 <script>
-$("#inputForm").validate({
+$('#inputForm').validate({
 	submitHandler: function(form){
 		js.ajaxSubmitForm($(form), function(data){
 			js.showMessage(data.message);

modules/cms/src/main/resources/views/modules/cms/reportForm.html

@@ -107,7 +107,7 @@
 </div>
 <% } %>
 <script>
-$("#inputForm").validate({
+$('#inputForm').validate({
 	submitHandler: function(form){
 		js.ajaxSubmitForm($(form), function(data){
 			js.showMessage(data.message);

modules/cms/src/main/resources/views/modules/cms/visitLogForm.html

@@ -351,7 +351,7 @@
 </div>
 <% } %>
 <script>
-$("#inputForm").validate({
+$('#inputForm').validate({
 	submitHandler: function(form){
 		js.ajaxSubmitForm($(form), function(data){
 			js.showMessage(data.message);

modules/cms/src/main/resources/views/modules/cmsfront/themes/default/search.html

@@ -25,7 +25,7 @@ if (message != ''){
 function page(n,s){
 	$("#pageNo").val(n);
 	$("#pageSize").val(s);
-	$("#searchForm").submit();
+	$('#searchForm').submit();
 	return false;
 }
 function sel(th, val){

modules/core/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.11.0-SNAPSHOT</version>
+		<version>5.10.1.springboot3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
@@ -127,6 +127,13 @@
 			<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/autoconfigure/core/ShiroAutoConfiguration.java

@@ -17,6 +17,7 @@ import com.jeesite.common.shiro.session.SessionDAO;
 import com.jeesite.common.shiro.session.SessionManager;
 import com.jeesite.common.shiro.web.ShiroFilterFactoryBean;
 import com.jeesite.common.shiro.web.WebSecurityManager;
+import jakarta.servlet.Filter;
 import org.apache.shiro.cache.CacheManager;
 import org.apache.shiro.realm.Realm;
 import org.apache.shiro.realm.ldap.JndiLdapContextFactory;
@@ -34,7 +35,6 @@ import org.springframework.context.annotation.DependsOn;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 
-import javax.servlet.Filter;
 import java.util.Collection;
 import java.util.Map;
 

modules/core/src/main/java/com/jeesite/common/shiro/filter/CasFilter.java

@@ -16,10 +16,10 @@ import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.web.util.WebUtils;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * CAS过滤器

modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java

@@ -20,6 +20,10 @@ import com.jeesite.common.web.CookieUtils;
 import com.jeesite.common.web.http.ServletUtils;
 import com.jeesite.modules.sys.entity.*;
 import com.jeesite.modules.sys.utils.*;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.authc.IncorrectCredentialsException;
@@ -33,10 +37,6 @@ import org.apache.shiro.web.util.WebUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;

modules/core/src/main/java/com/jeesite/common/shiro/filter/InnerFilter.java

@@ -8,9 +8,9 @@ import com.jeesite.common.config.Global;
 import com.jeesite.common.lang.StringUtils;
 import org.apache.shiro.web.filter.AccessControlFilter;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * 内部系统访问过滤器

modules/core/src/main/java/com/jeesite/common/shiro/filter/LdapFilter.java

@@ -6,8 +6,8 @@ package com.jeesite.common.shiro.filter;
 
 import java.util.Map;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 
 import org.apache.shiro.authc.AuthenticationToken;
 

modules/core/src/main/java/com/jeesite/common/shiro/filter/LogoutFilter.java

@@ -4,10 +4,10 @@
  */
 package com.jeesite.common.shiro.filter;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.session.SessionException;

modules/core/src/main/java/com/jeesite/common/shiro/filter/PermissionsFilter.java

@@ -9,15 +9,15 @@ import com.jeesite.common.config.Global;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.web.http.ServletUtils;
 import com.jeesite.common.web.http.wrapper.GetHttpServletRequestWrapper;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.web.util.WebUtils;
 
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
 /**

modules/core/src/main/java/com/jeesite/common/shiro/filter/RolesFilter.java

@@ -4,8 +4,9 @@
  */
 package com.jeesite.common.shiro.filter;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+
 import java.io.IOException;
 
 /**

modules/core/src/main/java/com/jeesite/common/shiro/filter/UserFilter.java

@@ -6,10 +6,10 @@ package com.jeesite.common.shiro.filter;
 
 import com.jeesite.common.config.Global;
 import com.jeesite.common.lang.StringUtils;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**

modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java

@@ -15,6 +15,7 @@ import com.jeesite.modules.sys.entity.User;
 import com.jeesite.modules.sys.service.UserService;
 import com.jeesite.modules.sys.utils.LogUtils;
 import com.jeesite.modules.sys.utils.UserUtils;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
@@ -22,8 +23,6 @@ import org.apache.shiro.authz.AuthorizationInfo;
 import org.apache.shiro.session.Session;
 import org.apache.shiro.subject.Subject;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * 系统认证授权实现类
  * @author ThinkGem

modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java

@@ -30,8 +30,8 @@ import org.jasig.cas.client.validation.TicketValidationException;
 import org.jasig.cas.client.validation.TicketValidator;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.ValidationException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.ValidationException;
 import java.util.Map;
 
 /**

modules/core/src/main/java/com/jeesite/common/shiro/realm/LdapAuthorizingRealm.java

@@ -4,11 +4,17 @@
  */
 package com.jeesite.common.shiro.realm;
 
-import javax.naming.AuthenticationNotSupportedException;
-import javax.naming.NamingException;
-import javax.naming.ldap.LdapContext;
-import javax.servlet.http.HttpServletRequest;
-
+import com.jeesite.common.shiro.authc.FormToken;
+import com.jeesite.common.shiro.authc.LdapToken;
+import com.jeesite.common.utils.SpringUtils;
+import com.jeesite.common.web.http.ServletUtils;
+import com.jeesite.modules.sys.entity.Log;
+import com.jeesite.modules.sys.entity.User;
+import com.jeesite.modules.sys.service.EmpUserService;
+import com.jeesite.modules.sys.service.UserService;
+import com.jeesite.modules.sys.utils.LogUtils;
+import com.jeesite.modules.sys.utils.UserUtils;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
@@ -21,20 +27,13 @@ import org.apache.shiro.realm.ldap.LdapContextFactory;
 import org.apache.shiro.realm.ldap.LdapUtils;
 import org.apache.shiro.session.Session;
 import org.apache.shiro.subject.Subject;
-import org.apache.shiro.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.StringUtils;
 
-import com.jeesite.common.shiro.authc.FormToken;
-import com.jeesite.common.shiro.authc.LdapToken;
-import com.jeesite.common.utils.SpringUtils;
-import com.jeesite.common.web.http.ServletUtils;
-import com.jeesite.modules.sys.entity.Log;
-import com.jeesite.modules.sys.entity.User;
-import com.jeesite.modules.sys.service.EmpUserService;
-import com.jeesite.modules.sys.service.UserService;
-import com.jeesite.modules.sys.utils.LogUtils;
-import com.jeesite.modules.sys.utils.UserUtils;
+import javax.naming.AuthenticationNotSupportedException;
+import javax.naming.NamingException;
+import javax.naming.ldap.LdapContext;
 
 /**
  * 系统认证授权实现类

modules/core/src/main/java/com/jeesite/common/ueditor/ActionEnter.java

@@ -8,7 +8,7 @@ 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 javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import java.util.Map;
 

modules/core/src/main/java/com/jeesite/common/ueditor/PathFormat.java

@@ -5,7 +5,7 @@ import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
 

modules/core/src/main/java/com/jeesite/common/ueditor/hunter/FileManager.java

@@ -6,9 +6,9 @@ import com.jeesite.common.ueditor.define.AppInfo;
 import com.jeesite.common.ueditor.define.BaseState;
 import com.jeesite.common.ueditor.define.MultiState;
 import com.jeesite.common.ueditor.define.State;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.io.FileUtils;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.util.Arrays;
 import java.util.Collection;

modules/core/src/main/java/com/jeesite/common/ueditor/hunter/ImageHunter.java

@@ -1,12 +1,5 @@
 package com.jeesite.common.ueditor.hunter;
 
-import com.jeesite.common.config.Global;
-import com.jeesite.common.ueditor.PathFormat;
-import com.jeesite.common.ueditor.define.*;
-import com.jeesite.common.ueditor.upload.StorageManager;
-import org.apache.commons.io.IOUtils;
-
-import javax.servlet.http.HttpServletRequest;
 import java.net.HttpURLConnection;
 import java.net.InetAddress;
 import java.net.URL;
@@ -15,6 +8,19 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import com.jeesite.common.config.Global;
+import jakarta.servlet.http.HttpServletRequest;
+
+import org.apache.commons.io.IOUtils;
+
+import com.jeesite.common.ueditor.PathFormat;
+import com.jeesite.common.ueditor.define.AppInfo;
+import com.jeesite.common.ueditor.define.BaseState;
+import com.jeesite.common.ueditor.define.MIMEType;
+import com.jeesite.common.ueditor.define.MultiState;
+import com.jeesite.common.ueditor.define.State;
+import com.jeesite.common.ueditor.upload.StorageManager;
+
 /**
  * 图片抓取器
  *

modules/core/src/main/java/com/jeesite/common/ueditor/upload/Base64Uploader.java

@@ -6,9 +6,9 @@ import com.jeesite.common.ueditor.define.AppInfo;
 import com.jeesite.common.ueditor.define.BaseState;
 import com.jeesite.common.ueditor.define.FileType;
 import com.jeesite.common.ueditor.define.State;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.codec.binary.Base64;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 public final class Base64Uploader {

modules/core/src/main/java/com/jeesite/common/ueditor/upload/BinaryUploader.java

@@ -6,10 +6,10 @@ import com.jeesite.common.io.FileUtils;
 import com.jeesite.common.media.VideoUtils;
 import com.jeesite.common.ueditor.PathFormat;
 import com.jeesite.common.ueditor.define.*;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

modules/core/src/main/java/com/jeesite/common/ueditor/upload/Uploader.java

@@ -2,7 +2,7 @@ package com.jeesite.common.ueditor.upload;
 
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.jeesite.common.ueditor.define.State;
 

modules/core/src/main/java/com/jeesite/modules/biz/entity/BizCategory.java

@@ -10,9 +10,9 @@ import com.jeesite.common.entity.TreeEntity;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 /**
  * 业务分类Entity

modules/core/src/main/java/com/jeesite/modules/biz/web/BizCategoryController.java

@@ -12,7 +12,7 @@ import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.web.BaseController;
 import com.jeesite.modules.biz.entity.BizCategory;
 import com.jeesite.modules.biz.service.BizCategoryService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -32,7 +32,7 @@ import java.util.Map;
  * @version 2019-08-12
  */
 @Controller
-@Api(tags = "BizCategory - 业务分类")
+@Tag(name = "BizCategory - 业务分类")
 @RequestMapping(value = "${adminPath}/biz/bizCategory")
 public class BizCategoryController extends BaseController {
 

modules/core/src/main/java/com/jeesite/modules/config/interceptor/LogInterceptorConfig.java

@@ -4,16 +4,14 @@
  */
 package com.jeesite.modules.config.interceptor;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
 import com.jeesite.common.config.Global;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.modules.sys.interceptor.LogInterceptor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
  * 后台管理日志记录拦截器
@@ -22,7 +20,6 @@ import com.jeesite.modules.sys.interceptor.LogInterceptor;
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(name="web.interceptor.log.enabled", havingValue="true", matchIfMissing=true)
-@EnableWebMvc
 public class LogInterceptorConfig implements WebMvcConfigurer {
 
 	@Override

modules/core/src/main/java/com/jeesite/modules/config/interceptor/MobileViewInterceptorConfig.java

@@ -4,16 +4,14 @@
  */
 package com.jeesite.modules.config.interceptor;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
 import com.jeesite.common.config.Global;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.modules.sys.interceptor.MobileInterceptor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
  * 前台自动切换到手机视图拦截器
@@ -22,7 +20,6 @@ import com.jeesite.modules.sys.interceptor.MobileInterceptor;
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(name="web.interceptor.mobile.enabled", havingValue="true", matchIfMissing=false)
-@EnableWebMvc
 public class MobileViewInterceptorConfig implements WebMvcConfigurer {
 
 	@Override

modules/core/src/main/java/com/jeesite/modules/config/server/SchemeHttpsConfig.java

@@ -4,9 +4,9 @@
  */
 package com.jeesite.modules.config.server;
 
-import javax.servlet.Filter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.Filter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
@@ -26,6 +26,7 @@ public class SchemeHttpsConfig {
 	public FilterRegistrationBean<Filter> schemeHttpsFilter() {
 		FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<>();
 		bean.setName("schemeHttpsFilter");
+		bean.setOrder(Ordered.HIGHEST_PRECEDENCE);
 		bean.setFilter((request, response, chain) -> {
 			chain.doFilter(new HttpServletRequestWrapper((HttpServletRequest) request) {
 				@Override

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

@@ -4,19 +4,19 @@
  */
 package com.jeesite.modules.config.web;
 
-import com.alibaba.druid.support.http.StatViewServlet;
-import com.alibaba.druid.support.http.WebStatFilter;
+import com.alibaba.druid.support.jakarta.StatViewServlet;
+import com.alibaba.druid.support.jakarta.WebStatFilter;
 import com.alibaba.druid.util.Utils;
 import com.jeesite.common.web.http.ServletUtils;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**

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

@@ -7,16 +7,15 @@ package com.jeesite.modules.config.web;
 import com.jeesite.common.config.Global;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.web.http.ServletUtils;
+import jakarta.servlet.Filter;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 
-import javax.servlet.Filter;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * IP地址黑白名单过滤器配置
  */

modules/core/src/main/java/com/jeesite/modules/file/web/FileUploadController.java

@@ -10,6 +10,9 @@ import com.jeesite.common.web.BaseController;
 import com.jeesite.modules.file.entity.FileUpload;
 import com.jeesite.modules.file.entity.FileUploadParams;
 import com.jeesite.modules.file.service.FileUploadService;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Controller;
@@ -17,9 +20,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 

modules/core/src/main/java/com/jeesite/modules/file/web/UeditorController.java

@@ -4,8 +4,8 @@
  */
 package com.jeesite.modules.file.web;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Controller;

modules/core/src/main/java/com/jeesite/modules/file/web/UserfilesController.java

@@ -9,16 +9,16 @@ import com.jeesite.common.config.Global;
 import com.jeesite.common.io.FileUtils;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.web.BaseController;
+import io.swagger.v3.oas.annotations.Hidden;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import springfox.documentation.annotations.ApiIgnore;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 
@@ -29,7 +29,7 @@ import java.io.IOException;
  */
 @Controller
 @ConditionalOnProperty(name="file.isFileStreamDown", havingValue="true", matchIfMissing=true)
-@ApiIgnore
+@Hidden
 public class UserfilesController extends BaseController {
 
 	@RequestMapping(value="/userfiles/**")

modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInner.java

@@ -6,9 +6,9 @@ package com.jeesite.modules.msg.entity;
 
 import java.util.Date;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeesite.common.entity.DataEntity;

modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInnerRecord.java

@@ -6,9 +6,9 @@ package com.jeesite.modules.msg.entity;
 
 import java.util.Date;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeesite.common.entity.DataEntity;

modules/core/src/main/java/com/jeesite/modules/msg/web/MsgInnerController.java

@@ -4,14 +4,9 @@
  */
 package com.jeesite.modules.msg.web;
 
-import com.jeesite.common.config.Global;
-import com.jeesite.common.entity.Page;
-import com.jeesite.common.lang.StringUtils;
-import com.jeesite.common.web.BaseController;
-import com.jeesite.modules.msg.entity.MsgInner;
-import com.jeesite.modules.msg.entity.MsgInnerRecord;
-import com.jeesite.modules.msg.entity.MsgPush;
-import com.jeesite.modules.msg.service.MsgInnerService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -23,8 +18,14 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.jeesite.common.config.Global;
+import com.jeesite.common.entity.Page;
+import com.jeesite.common.lang.StringUtils;
+import com.jeesite.common.web.BaseController;
+import com.jeesite.modules.msg.entity.MsgInner;
+import com.jeesite.modules.msg.entity.MsgInnerRecord;
+import com.jeesite.modules.msg.entity.MsgPush;
+import com.jeesite.modules.msg.service.MsgInnerService;
 
 /**
  * 内部消息Controller

modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java

@@ -37,11 +37,6 @@ public interface EmpUserDao extends CrudDao<EmpUser> {
 	 * 根据部门编码查询用户，仅返回基本信息
 	 */
 	List<EmpUser> findUserListByOfficeCodes(EmpUser empUser);
-
-	/**
-	 * 根据公司编码查询用户，仅返回基本信息
-	 */
-	List<EmpUser> findUserListByCompanyCodes(EmpUser empUser);
 	
 	/**
 	 * 根据角色编码查询用户，仅返回基本信息

modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java

@@ -338,7 +338,6 @@ public class InitCoreData extends BaseInitDataTests {
 		job.setConcurrent(Global.NO);
 		job.setMisfireInstruction(CronTrigger.MISFIRE_INSTRUCTION_DO_NOTHING);
 		job.setStatus(JobEntity.STATUS_PAUSED);
-		job.setRemarks("实时推送和设定计划推送时间的定时推送消息。");
 		jobDao.insert(job);
 		job = new JobEntity(MsgLocalMergePushTask.class.getSimpleName(), "SYSTEM");
 		job.setDescription("消息推送服务 (合并推送)");
@@ -347,19 +346,6 @@ public class InitCoreData extends BaseInitDataTests {
 		job.setConcurrent(Global.NO);
 		job.setMisfireInstruction(CronTrigger.MISFIRE_INSTRUCTION_DO_NOTHING);
 		job.setStatus(JobEntity.STATUS_PAUSED);
-		job.setRemarks("不重要的通知进行汇总，30分钟或更长执行一次，将多条消息合并为一条消息延迟推送给用户。");
-		jobDao.insert(job);
-		job = new JobEntity("DeleteLogBefore", "SYSTEM");
-		job.setDescription("清理访问日志 (3个月前)");
-		job.setInvokeTarget("logService.deleteLogBefore(0, 3, 0)");
-		job.setCronExpression("0 0 0 1 1/1 ? *");
-		job.setConcurrent(Global.NO);
-		job.setMisfireInstruction(CronTrigger.MISFIRE_INSTRUCTION_DO_NOTHING);
-		job.setStatus(JobEntity.STATUS_PAUSED);
-		job.setRemarks("1、清理1年前的所有日志：logService.deleteLogBefore(1, 0, 0)\n" +
-				"2、清理6个月前的所有日志：logService.deleteLogBefore(0, 6, 0)\n" +
-				"3、清理7天前的所有日志：logService.deleteLogBefore(0, 0, 7)\n" +
-				"4、清理1年6个月前的所有日志：logService.deleteLogBefore(1, 6, 0)");
 		jobDao.insert(job);
 	}
 

modules/core/src/main/java/com/jeesite/modules/sys/entity/Area.java

@@ -4,15 +4,15 @@
  */
 package com.jeesite.modules.sys.entity;
 
+import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+
 import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.entity.TreeEntity;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
 /**
  * 行政区划Entity
  * @author ThinkGem

modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java

@@ -16,9 +16,9 @@ import com.jeesite.common.mybatis.annotation.JoinTable.Type;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 
 /**

modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java

@@ -17,9 +17,8 @@ import com.jeesite.common.utils.excel.annotation.ExcelField.Align;
 import com.jeesite.common.utils.excel.annotation.ExcelFields;
 import com.jeesite.common.utils.excel.fieldtype.CompanyType;
 import com.jeesite.common.utils.excel.fieldtype.OfficeType;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.Valid;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.Valid;
 
 /**
  * 员工用户管理Entity
@@ -129,7 +128,7 @@ public class EmpUser extends User {
 		super.setRefObj(employee);
 	}
 
-	@ApiModelProperty("根据各种编码查询")
+	@Schema(description = "根据各种编码查询")
 	public String[] getCodes() {
 		return codes;
 	}

modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java

@@ -13,10 +13,10 @@ import com.jeesite.common.mybatis.annotation.JoinTable;
 import com.jeesite.common.mybatis.annotation.JoinTable.Type;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -130,7 +130,7 @@ public class Employee extends DataEntity<Employee> {
 		this.company = company;
 	}
 
-	@ApiModelProperty("根据岗位编码查询")
+	@Schema(description = "根据岗位编码查询")
 	public String getPostCode() {
 		return postCode;
 	}
@@ -147,7 +147,7 @@ public class Employee extends DataEntity<Employee> {
 		this.employeePostList = employeePostList;
 	}
 
-	@ApiModelProperty("员工岗位关系")
+	@Schema(description = "员工岗位关系")
 	public String getEmployeePosts() {
 //		List<String> list = ListUtils.extractToList(employeePostList, "postCode");
 //		return StringUtils.join(list, ",");

modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeeOffice.java

@@ -10,7 +10,7 @@ import com.jeesite.common.mybatis.annotation.JoinTable;
 import com.jeesite.common.mybatis.annotation.JoinTable.Type;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 
 /**
  * 附属机构Entity

modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java

@@ -14,10 +14,10 @@ import com.jeesite.common.lang.TimeUtils;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import java.util.Date;
 import java.util.Map;
 
@@ -230,7 +230,7 @@ public class Log extends DataEntity<Log> {
 		this.executeTime = executeTime;
 	}
 
-	@ApiModelProperty("格式化后的执行时间")
+	@Schema(description = "格式化后的执行时间")
 	public String getExecuteTimeFormat(){
 		if (executeTime == null) {
 			executeTime = 0L;
@@ -252,7 +252,7 @@ public class Log extends DataEntity<Log> {
 		}
 		StringBuilder params = new StringBuilder();
 		for (Map.Entry<String, String[]> param : ((Map<String, String[]>)paramsMap).entrySet()){
-			if (params.length() != 0) {
+			if (!params.isEmpty()) {
 				params.append("&");
 			}
 			params.append(param.getKey() + "=");

modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java

@@ -16,11 +16,11 @@ import com.jeesite.common.utils.excel.annotation.ExcelField;
 import com.jeesite.common.utils.excel.annotation.ExcelField.Align;
 import com.jeesite.common.utils.excel.annotation.ExcelFields;
 import com.jeesite.modules.sys.utils.EmpUtils;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 /**
  * 组织机构Entity
@@ -44,6 +44,7 @@ import javax.validation.constraints.Size;
 		@Column(includeEntity=Extend.class, attrName="extend"),
 	}, extWhereKeys="dsf", orderBy="a.tree_sorts, a.office_code"
 )
+@Schema
 public class Office extends TreeEntity<Office> {
 	
 	private static final long serialVersionUID = 1L;
@@ -57,6 +58,9 @@ public class Office extends TreeEntity<Office> {
 	private String address;		// 联系地址
 	private String zipCode;		// 邮政编码
 	private String email;		// 邮箱
+
+	@Hidden
+	@Schema(hidden = true)
 	private Extend extend;		// 扩展字段
 
 	private String companyCode; // 根据公司查询机构，组织机构所属公司
@@ -82,6 +86,8 @@ public class Office extends TreeEntity<Office> {
 	}
 	
 	@Override
+	@Hidden
+	@Schema(hidden = true)
 	public Office getParent() {
 		return parent;
 	}
@@ -147,7 +153,7 @@ public class Office extends TreeEntity<Office> {
 		this.officeType = officeType;
 	}
 
-	@ApiModelProperty("包含某机构类型")
+	@Schema(description = "包含某机构类型")
 	public String[] getOfficeType_in(){
 		return sqlMap.getWhere().getValue("office_type", QueryType.IN);
 	}
@@ -200,7 +206,9 @@ public class Office extends TreeEntity<Office> {
 	public void setEmail(String email) {
 		this.email = email;
 	}
-	
+
+	@Hidden
+	@Schema(hidden = true)
 	public Extend getExtend() {
 		return extend;
 	}
@@ -209,7 +217,7 @@ public class Office extends TreeEntity<Office> {
 		this.extend = extend;
 	}
 
-	@ApiModelProperty("公司编码")
+	@Schema(description = "公司编码")
 	public String getCompanyCode() {
 		return companyCode;
 	}

modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java

@@ -9,11 +9,11 @@ import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 @Table(name="${_prefix}sys_post", alias="a", label="岗位信息", columns={
 		@Column(includeEntity=BaseEntity.class),
@@ -84,7 +84,7 @@ public class Post extends DataEntity<Post> {
 		this.postName = postName;
 	}
 
-	@ApiModelProperty("模糊查询岗位名称")
+	@Schema(description = "模糊查询岗位名称")
 	public String getPostName_like() {
 		return sqlMap().getWhere().getValue("post_name", QueryType.LIKE);
 	}
@@ -110,7 +110,7 @@ public class Post extends DataEntity<Post> {
 		this.postSort = postSort;
 	}
 
-	@ApiModelProperty("根据员工编码查询")
+	@Schema(description = "根据员工编码查询")
 	public String getEmpCode() {
 		return empCode;
 	}
@@ -119,7 +119,7 @@ public class Post extends DataEntity<Post> {
 		this.empCode = empCode;
 	}
 
-	@ApiModelProperty("根据用户编码查询")
+	@Schema(description = "根据用户编码查询")
 	public String getUserCode() {
 		return userCode;
 	}
@@ -128,7 +128,7 @@ public class Post extends DataEntity<Post> {
 		this.userCode = userCode;
 	}
 
-	@ApiModelProperty("岗位绑定角色编码")
+	@Schema(description = "岗位绑定角色编码")
 	public String getRoleCodes() {
 		return roleCodes;
 	}
@@ -137,6 +137,7 @@ public class Post extends DataEntity<Post> {
 		this.roleCodes = roleCodes;
 	}
 
+	@Schema(description = "岗位绑定角色名称")
 	public String getRoleNames() {
 		return roleNames;
 	}

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

@@ -4,6 +4,14 @@
  */
 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;
@@ -12,13 +20,6 @@ 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 org.slf4j.MDC;
-import org.springframework.core.NamedThreadLocal;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * 日志拦截器

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

@@ -4,15 +4,16 @@
  */
 package com.jeesite.modules.sys.interceptor;
 
-import com.jeesite.common.lang.StringUtils;
-import com.jeesite.common.service.BaseService;
 import com.jeesite.common.web.BaseController;
-import com.jeesite.common.web.http.UserAgentUtils;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.jeesite.common.lang.StringUtils;
+import com.jeesite.common.service.BaseService;
+import com.jeesite.common.web.http.UserAgentUtils;
 
 /**
  * 手机端视图拦截器

modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java

@@ -47,11 +47,6 @@ public interface EmpUserService extends CrudServiceApi<EmpUser> {
 	 * 根据部门编码查询用户，仅返回基本信息
 	 */
 	List<EmpUser> findUserListByOfficeCodes(EmpUser empUser);
-
-	/**
-	 * 根据公司编码查询用户，仅返回基本信息
-	 */
-	List<EmpUser> findUserListByCompanyCodes(EmpUser empUser);
 	
 	/**
 	 * 根据角色编码查询用户，仅返回基本信息

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

@@ -5,19 +5,15 @@
 package com.jeesite.modules.sys.service.support;
 
 import com.jeesite.common.collect.ListUtils;
-import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.service.TreeService;
-import com.jeesite.common.utils.PageUtils;
 import com.jeesite.modules.sys.dao.CompanyDao;
 import com.jeesite.modules.sys.dao.CompanyOfficeDao;
 import com.jeesite.modules.sys.entity.Company;
 import com.jeesite.modules.sys.entity.CompanyOffice;
-import com.jeesite.modules.sys.entity.EmpUser;
 import com.jeesite.modules.sys.service.CompanyService;
 import com.jeesite.modules.sys.service.DataScopeService;
-import com.jeesite.modules.sys.service.EmpUserService;
 import com.jeesite.modules.sys.utils.EmpUtils;
-import com.jeesite.modules.sys.utils.UserUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -33,10 +29,9 @@ public class CompanyServiceSupport extends TreeService<CompanyDao, Company>
 
 	@Autowired
 	private CompanyOfficeDao companyOfficeDao;
+	
 	@Autowired
 	private DataScopeService dataScopeService;
-	@Autowired
-	private EmpUserService empUserService;
 	
 	/**
 	 * 获取单条数据
@@ -91,7 +86,7 @@ public class CompanyServiceSupport extends TreeService<CompanyDao, Company>
 			companyOfficeDao.insertBatch(list, null);
 		}
 		// 清理公司相关缓存
-		clearCompanyCache(company);
+		clearCompanyCache();
 	}
 	
 	/**
@@ -100,10 +95,9 @@ public class CompanyServiceSupport extends TreeService<CompanyDao, Company>
 	@Override
 	@Transactional
 	public void delete(Company company) {
-		company.sqlMap().markIdDelete();
 		super.delete(company);
 		// 清理公司相关缓存
-		clearCompanyCache(company);
+		clearCompanyCache();
 	}
 
 	/**
@@ -114,37 +108,15 @@ public class CompanyServiceSupport extends TreeService<CompanyDao, Company>
 	public void updateStatus(Company company) {
 		dao.updateStatus(company);
 		// 清理公司相关缓存
-		clearCompanyCache(company);
+		clearCompanyCache();
 	}
 	
 	/**
 	 * 清理公司相关缓存
 	 */
-	private void clearCompanyCache(Company company){
+	private void clearCompanyCache(){
+//		EmpUtils.removeCache(EmpUtils.CACHE_COMPANY_LIST);
 		EmpUtils.removeCache(EmpUtils.CACHE_COMPANY_ALL_LIST);
-		// 清理公司下的用户缓存，包含子公司
-		if (company == null || StringUtils.isBlank(company.getCompanyCode())){
-			return;
-		}
-		if (StringUtils.isBlank(company.getParentCode())){
-			company = get(company);
-			if (company == null){
-				return;
-			}
-		}
-		Company where = new Company();
-		where.setStatus(Company.STATUS_NORMAL);
-		where.setParentCodes(company.getParentCodes() + company.getCompanyCode() + ",%");
-		EmpUser empUserWhere = new EmpUser();
-		empUserWhere.setCodes(this.findByParentCodesLike(where).stream().map(Company::getCompanyCode).toArray(String[]::new));
-		if (empUserWhere.getCodes().length == 0) {
-			return;
-		}
-		PageUtils.findList(empUserWhere, null, e -> {
-			List<EmpUser> empUserList = empUserService.findUserListByCompanyCodes((EmpUser)e);
-			empUserList.forEach(UserUtils::clearCache);
-			return !empUserList.isEmpty();
-		});
 	}
 
 }

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

@@ -23,13 +23,13 @@ import com.jeesite.modules.sys.service.EmployeeService;
 import com.jeesite.modules.sys.service.UserService;
 import com.jeesite.modules.sys.utils.EmpUtils;
 import com.jeesite.modules.sys.utils.UserUtils;
+import jakarta.annotation.PostConstruct;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.PostConstruct;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
 import java.util.List;
 
 /**
@@ -115,13 +115,6 @@ public class EmpUserServiceSupport extends CrudService<EmpUserDao, EmpUser>
 	public List<EmpUser> findUserListByOfficeCodes(EmpUser empUser){
 		return dao.findUserListByOfficeCodes(empUser);
 	}
-	/**
-	 * 根据公司编码查询用户，仅返回基本信息
-	 */
-	@Override
-	public List<EmpUser> findUserListByCompanyCodes(EmpUser empUser){
-		return dao.findUserListByCompanyCodes(empUser);
-	}
 	
 	/**
 	 * 根据角色编码查询用户，仅返回基本信息

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

@@ -5,26 +5,21 @@
 package com.jeesite.modules.sys.service.support;
 
 import com.jeesite.common.config.Global;
-import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.service.ServiceException;
 import com.jeesite.common.service.TreeService;
-import com.jeesite.common.utils.PageUtils;
 import com.jeesite.common.utils.excel.ExcelImport;
 import com.jeesite.common.validator.ValidatorUtils;
 import com.jeesite.modules.sys.dao.OfficeDao;
-import com.jeesite.modules.sys.entity.EmpUser;
 import com.jeesite.modules.sys.entity.Office;
 import com.jeesite.modules.sys.service.DataScopeService;
-import com.jeesite.modules.sys.service.EmpUserService;
 import com.jeesite.modules.sys.service.OfficeService;
 import com.jeesite.modules.sys.utils.EmpUtils;
-import com.jeesite.modules.sys.utils.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
 import java.util.List;
 
 /**
@@ -37,8 +32,6 @@ public class OfficeServiceSupport extends TreeService<OfficeDao, Office>
 
 	@Autowired
 	private DataScopeService dataScopeService;
-	@Autowired
-	private EmpUserService empUserService;
 	
 	/**
 	 * 获取单条数据
@@ -81,7 +74,7 @@ public class OfficeServiceSupport extends TreeService<OfficeDao, Office>
 		}
 		super.save(office);
 		// 清理部门相关缓存
-		clearOfficeCache(office);
+		clearOfficeCache();
 	}
 
 	/**
@@ -156,7 +149,7 @@ public class OfficeServiceSupport extends TreeService<OfficeDao, Office>
 	public void updateStatus(Office office) {
 		super.updateStatus(office);
 		// 清理部门相关缓存
-		clearOfficeCache(office);
+		clearOfficeCache();
 	}
 
 	/**
@@ -168,37 +161,15 @@ public class OfficeServiceSupport extends TreeService<OfficeDao, Office>
 		office.sqlMap().markIdDelete();
 		super.delete(office);
 		// 清理部门相关缓存
-		clearOfficeCache(office);
+		clearOfficeCache();
 	}
 	
 	/**
 	 * 清理部门相关缓存
 	 */
-	private void clearOfficeCache(Office office){
+	private void clearOfficeCache(){
+//		EmpUtils.removeCache(EmpUtils.CACHE_OFFICE_LIST);
 		EmpUtils.removeCache(EmpUtils.CACHE_OFFICE_ALL_LIST);
-		// 清理组织下的用户缓存，包含子机构
-		if (office == null || StringUtils.isBlank(office.getOfficeCode())){
-			return;
-		}
-		if (StringUtils.isBlank(office.getParentCode())){
-			office = get(office);
-			if (office == null){
-				return;
-			}
-		}
-		Office where = new Office();
-		where.setStatus(Office.STATUS_NORMAL);
-		where.setParentCodes(office.getParentCodes() + office.getOfficeCode() + ",%");
-		EmpUser empUserWhere = new EmpUser();
-		empUserWhere.setCodes(this.findByParentCodesLike(where).stream().map(Office::getOfficeCode).toArray(String[]::new));
-		if (empUserWhere.getCodes().length == 0) {
-			return;
-		}
-		PageUtils.findList(empUserWhere, null, e -> {
-			List<EmpUser> empUserList = empUserService.findUserListByOfficeCodes((EmpUser)e);
-			empUserList.forEach(UserUtils::clearCache);
-			return !empUserList.isEmpty();
-		});
 	}
 
 }

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

@@ -15,10 +15,10 @@ import com.jeesite.modules.sys.entity.*;
 import com.jeesite.modules.sys.service.CompanyService;
 import com.jeesite.modules.sys.service.EmployeeService;
 import com.jeesite.modules.sys.service.OfficeService;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.shiro.session.Session;
 import org.springframework.core.NamedThreadLocal;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Set;