5.10.0

Signed-off-by: 卓源软件 <thinkgem@163.com>

README.md

@@ -2,12 +2,15 @@
 <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 3</h3>
+<h3 align="center" style="margin:30px 0 30px;font-weight:bold;font-size:30px;">快速开发平台 - Spring Boot</h3>
 <p align="center">
+ <a href="https://spring.io/projects/spring-boot" target="__blank"><img alt="SpringBoot-2.7/3.3" src="https://img.shields.io/badge/SpringBoot-V2.7/3.4-blue.svg"></a>
+ <a href="https://v3.cn.vuejs.org/" target="__blank"><img alt="TypeScript-Vue3" src="https://img.shields.io/badge/TypeScript-Vue3-green.svg"></a>
  <a href="https://jeesite.com/docs/upgrade/" target="__blank"><img alt="JeeSite-5.9" src="https://img.shields.io/badge/JeeSite-V5.9-success.svg"></a>
- <a href="https://spring.io/projects/spring-boot#learn" target="__blank"><img alt="SpringBoot-2.7/3.2" src="https://img.shields.io/badge/SpringBoot-2.7/3.2-blue.svg"></a>
- <a href="https://gitee.com/thinkgem/jeesite5/stargazers" target="__blank"><img alt="star" src="https://gitee.com/thinkgem/jeesite5/badge/star.svg?theme=dark"></a>
- <a href="https://gitee.com/thinkgem/jeesite-vue/stargazers" target="__blank"><img alt="star" src="https://gitee.com/thinkgem/jeesite-vue/badge/star.svg?theme=dark"></a>
+ <a href="https://gitee.com/thinkgem/jeesite5" target="__blank"><img alt="star" src="https://gitee.com/thinkgem/jeesite5/badge/star.svg?theme=dark"></a>
+ <a href="https://gitee.com/thinkgem/jeesite-vue" target="__blank"><img alt="star" src="https://gitee.com/thinkgem/jeesite-vue/badge/star.svg?theme=dark"></a>
+ <a href="https://gitee.com/thinkgem/jeesite" target="__blank"><img alt="star" src="https://gitee.com/thinkgem/jeesite/badge/star.svg?theme=gvp"></a>
+ <a href="https://gitcode.com/thinkgem/jeesite" target="__blank"><img alt="star" src="https://gitcode.com/thinkgem/jeesite/star/badge.svg"></a> 
 </p>
 
 ------
@@ -24,20 +27,32 @@
 * 使用文档：<https://jeesite.com/docs>
 * 问题反馈：<http://jeesite.net> [【新手必读】](https://gitee.com/thinkgem/jeesite5/issues/I18ARR)
 * 需求收集：<https://gitee.com/thinkgem/jeesite5/issues/new>
-* QQ 群：`127515876`、`209330483`、`223507718`、`709534275`、`730390092`、`1373527`、`183903863(外包)`
-* 微信群：添加客服微信 <http://s.jeesite.com> 邀请您进群
+* 联系我们：<http://s.jeesite.com>
 * 关注微信公众号，了解最新动态：
 
 <p style="padding-left:40px">　　
  <img alt="JeeSite微信公众号" src="https://jeesite.com/assets/images/mp.png" width="200">
 </p>
 
-* 源码仓库地址1：<https://gitee.com/thinkgem/jeesite5>
-* 源码仓库地址2：<https://github.com/thinkgem/jeesite5>
-* 源码仓库地址3：<https://gitcode.com/thinkgem/jeesite5>
-* 分离版前端源码仓库地址1：<https://gitee.com/thinkgem/jeesite-vue>
-* 分离版前端源码仓库地址2：<https://github.com/thinkgem/jeesite-vue>
-* 分离版前端源码仓库地址3：<https://gitcode.com/thinkgem/jeesite-vue>
+* QQ 群：`127515876`、`209330483`、`223507718`、`709534275`、`730390092`、`1373527`、`183903863(外包)`
+* 微信群：如果无法进入，可添加客服微信 jeesitex 邀请您进群
+
+<p style="padding-left:40px">　　
+ <img alt="JeeSite微信群" src="https://jeesite.com/assets/images/wxg_cur.png" width="200"/>
+</p>
+
+* 源码仓库地址：
+  [Gitee](https://gitee.com/thinkgem/jeesite5)、
+  [GitCode](https://gitcode.com/thinkgem/jeesite5)、
+  [GitHub](https://github.com/thinkgem/jeesite5)
+* 分离版源码仓库地址：
+  [Gitee](https://gitee.com/thinkgem/jeesite-vue)、
+  [GitCode](https://gitcode.com/thinkgem/jeesite-vue)、
+  [GitHub](https://github.com/thinkgem/jeesite-vue)
+* 源码合集仓库地址：
+  [GVP](https://gitee.com/thinkgem/jeesite/tree/v5.springboot3)、
+  [G-Star](https://gitcode.com/thinkgem/jeesite/overview?ref=v5.springboot3)、
+  [GitHub](https://github.com/thinkgem/jeesite/tree/v5.springboot3)
 
 ## 平台介绍
 
@@ -80,17 +95,17 @@
 
 ## 技术选型
 
-* 主框架：Spring Boot 3.1、Spring Framework 6.0、Apache Shiro 2.0、J2Cache
-* 持久层：Apache MyBatis 3.5、Hibernate Validator 8.0、Alibaba Druid 1.2
-* 视图层：Spring MVC 6.0、Beetl 3.10（替换JSP）、Bootstrap 3.3、AdminLTE 2.4
+* 主框架：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
 * 前端组件：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 7.0、符合 BPMN 规范、在线流程设计器、中国式流程、退回、撤回、自由流
-* Bootstrap 版 支持 IE9 及以上版本及其他所有现代浏览器，如：谷歌、火狐、国产浏览器 等
+* 工作流引擎：Flowable 6.6、符合 BPMN 规范、在线流程设计器、中国式流程、退回、撤回、自由流
+* Bootstrap 版 支持 IE10 及以上版本及其他所有现代浏览器，如：谷歌、火狐、国产浏览器 等
 * Vue3 版 支持现代浏览器，如：谷歌 Chrome 86+、火狐、国产浏览器 等
 * 技术选型（详细）：<http://jeesite.com/docs/technology/>
 * JeeSite Vue 版本：<https://gitee.com/thinkgem/jeesite-vue>
-* Spring Boot 2.x 版本：<https://gitee.com/thinkgem/jeesite5/tree/v5.9>
+* Spring Boot 3.x 版本：<https://gitee.com/thinkgem/jeesite5/tree/v5.springboot3>
 
 ## 更多介绍
 
@@ -123,8 +138,8 @@
 
 ### 本地运行
 
-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> 并解压
+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> 并解压
 3. 打开文件：`/web/src/main/resources/config/application.yml` 配置JDBC连接
 4. 执行脚本：`/web/bin/init-data.bat` 初始化数据库
 5. 执行脚本：`/web/bin/run-tomcat.bat` 启动服务即可
@@ -134,8 +149,8 @@
 
 ### 快速运行
 
-1. 环境准备：`JDK 17+`、`Maven 3.8+`、无需准备数据库（使用内嵌 H2 DB、Vue资源包）
-2. 下载源码：<https://gitee.com/thinkgem/jeesite5/repository/archive/v5.springboot3.zip> 并解压
+1. 环境准备：`JDK 1.8 or 11、17`、`Maven 3.6+`、无需准备数据库（使用内嵌 H2 DB、Vue资源包）
+2. 下载源码：<https://gitee.com/thinkgem/jeesite5/repository/archive/v5.9.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>
@@ -228,10 +243,10 @@ docker run --name jeesite-web -p 8980:8980 -d --restart unless-stopped \
 7. 本项目已申请软件著作权，请尊重开源，感谢阅读。
 8. 无用户数限制，无在线人数限制，放心使用。
 
-## 技术服务与支持
+## 技术支持与服务
 
 * 没有资金的支撑就很难得到发展，特别是一个好的产品，如果 JeeSite 帮助了您，请为我们点赞。支持我们，您可以获得更多回馈，我们会把公益事业做的更好，开放更多资源，回报社区和社会。请给我们一些动力吧，在此非常感谢已支持我们的朋友！
-* **联系我们**：请访问技术支持服务页面：<https://jeesite.com/docs/support/> 
+* **联系我们**：请访问技术支持与服务页面：<http://s.jeesite.com> 
 
 ## 今后如何升级？
 

common/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.9.2.springboot3-SNAPSHOT</version>
+		<version>5.10.0-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
@@ -21,8 +21,8 @@
 
 		<!-- Servlet Api -->
 		<dependency>
-			<groupId>jakarta.servlet</groupId>
-			<artifactId>jakarta.servlet-api</artifactId>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		
@@ -46,6 +46,13 @@
 			<version>${commons-io.version}</version>
 		</dependency>
 		
+		<!-- Java serialization -->
+		<dependency>
+			<groupId>de.ruedigermoeller</groupId>
+			<artifactId>fst</artifactId>
+			<version>${fst.version}</version>
+		</dependency>
+		
 		<!-- Jackson json -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>

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 jakarta.servlet.http.HttpServletRequest;
+import javax.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,9 +7,6 @@ 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;
@@ -18,6 +15,9 @@ 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/lang/ExceptionUtils.java

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

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

@@ -5,9 +5,11 @@
 package com.jeesite.common.lang;
 
 import org.apache.commons.lang3.BooleanUtils;
+import org.nustaq.serialization.FSTConfiguration;
 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;
@@ -23,7 +25,13 @@ 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;
+	}
+	
 	/**
 	 * 转换为 Double 类型
 	 */
@@ -156,7 +164,11 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 	 */
 	public static byte[] serialize(Object object) {
 		try {
-			return ObjectUtils.serializeJava(object);
+			if (isJavaSerialize) {
+				return ObjectUtils.serializeJava(object);
+			}else {
+				return ObjectUtils.serializeFst(object);
+			}
 		} catch (Exception e) {
 			logger.error("serialize: {}", e.getMessage());
 		}
@@ -170,7 +182,11 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 	 */
 	public static Object unserialize(byte[] bytes) {
 		try {
-			return ObjectUtils.unserializeJava(bytes);
+			if (isJavaSerialize) {
+				return ObjectUtils.unserializeJava(bytes);
+			}else {
+				return ObjectUtils.unserializeFst(bytes);
+			}
 		} catch (Exception e) {
 			logger.error("unserialize: {}", e.getMessage());
 		}
@@ -227,50 +243,50 @@ 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();
+		}
+	};
 
-//	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;
-//	}
+	/**
+	 * 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() {

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

@@ -50,7 +50,7 @@ public class JsonMapper extends ObjectMapper {
 	private static final class JsonMapperHolder {
 		private static final JsonMapper INSTANCE = new JsonMapper();
 	}
-	
+
 	public JsonMapper() {
 		// Spring ObjectMapper 初始化配置，支持 @JsonView
 		new Jackson2ObjectMapperBuilder().configure(this);

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 jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
 
 public class IpUtils {
 

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

@@ -77,7 +77,6 @@ public class ReflectUtils {
 							//Method method = getAccessibleMethodByName(object, methodName, 0);
 							//if (method == null) { return; }
 							//Class<?> returnType = method.getReturnType();
-							System.out.println(object.getClass());
 							MethodAccess ma = MethodAccess.get(object.getClass());
 							Class<?> returnType = ma.getReturnTypes()[ma.getIndex(methodName)];
 							childObj = returnType.getDeclaredConstructor().newInstance();

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 jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

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

@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
+ */
+package com.jeesite.common.utils.excel.fieldtype;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+
+
+/**
+ * BigDecimal类型转换
+ * @author ThinkGem
+ * @version 2020-3-5
+ * @example fieldType = BigDecimalType.class
+ */
+public class BigDecimalType implements FieldType {
+	
+	/**
+	 * 获取对象值（导入）
+	 */
+	@Override
+	public Object getValue(String val) {
+		return new BigDecimal(val);
+	}
+
+	/**
+	 * 获取对象值（导出）
+	 */
+	@Override
+	public String setValue(Object val) {
+		return val == null ? StringUtils.EMPTY : val.toString();
+	}
+	
+	/**
+	 * 获取对象值格式（导出）
+	 */
+	@Override
+	public String getDataFormat() {
+		return "0.00";
+	}
+	
+}

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 jakarta.servlet.http.Cookie;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.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 jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.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 jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
 
 import eu.bitwalker.useragentutils.Browser;
 import eu.bitwalker.useragentutils.DeviceType;

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

@@ -1,21 +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.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.9.2.springboot3-SNAPSHOT</version>
+		<version>5.10.0-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;
 
 /**

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 jakarta.validation.constraints.Size;
+import javax.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

@@ -6,8 +6,8 @@ package com.jeesite.modules.app.web;
 
 import java.util.Date;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;

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

@@ -4,8 +4,8 @@
  */
 package com.jeesite.modules.app.web;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.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

@@ -22,4 +22,5 @@
 5.8.1
 5.9.0
 5.9.1
-5.9.2
+5.9.2
+5.10.0

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

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 jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.util.Date;
 
 /**

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

@@ -4,7 +4,7 @@
  */
 package com.jeesite.modules.cms.entity;
 
-import jakarta.validation.constraints.Size;
+import javax.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 jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.NotBlank;
+import javax.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 jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
-import jakarta.validation.constraints.Size;
+import javax.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 jakarta.validation.constraints.Size;
+import javax.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 jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.NotBlank;
+import javax.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 jakarta.validation.constraints.NotNull;
+import javax.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 jakarta.validation.constraints.Size;
+import javax.validation.constraints.Size;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeesite.common.entity.BaseEntity;

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 jakarta.servlet.ServletContext;
+import javax.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 jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.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 jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.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 jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.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 jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.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 jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.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 jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

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

@@ -30,4 +30,5 @@
 5.8.1
 5.9.0
 5.9.1
-5.9.2
+5.9.2
+5.10.0

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.9.2.springboot3-SNAPSHOT</version>
+		<version>5.10.0-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
@@ -127,13 +127,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/autoconfigure/core/ShiroAutoConfiguration.java

@@ -17,7 +17,6 @@ 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;
@@ -35,6 +34,7 @@ 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 jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * CAS过滤器

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

@@ -19,10 +19,6 @@ 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;
@@ -36,6 +32,10 @@ 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 jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.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 jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
+import javax.servlet.ServletRequest;
+import javax.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 jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.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,9 +4,8 @@
  */
 package com.jeesite.common.shiro.filter;
 
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-
+import javax.servlet.ServletRequest;
+import javax.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,7 +15,6 @@ 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;
@@ -23,6 +22,8 @@ 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 jakarta.servlet.http.HttpServletRequest;
-import jakarta.validation.ValidationException;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.ValidationException;
 import java.util.Map;
 
 /**

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

@@ -4,17 +4,11 @@
  */
 package com.jeesite.common.shiro.realm;
 
-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 javax.naming.AuthenticationNotSupportedException;
+import javax.naming.NamingException;
+import javax.naming.ldap.LdapContext;
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
@@ -27,13 +21,20 @@ 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 javax.naming.AuthenticationNotSupportedException;
-import javax.naming.NamingException;
-import javax.naming.ldap.LdapContext;
+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;
 
 /**
  * 系统认证授权实现类

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 jakarta.servlet.http.HttpServletRequest;
+import javax.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 jakarta.servlet.http.HttpServletRequest;
+import javax.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,5 +1,12 @@
 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;
@@ -8,19 +15,6 @@ 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 jakarta.servlet.http.HttpServletRequest;
+import javax.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 jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Pattern;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.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.v3.oas.annotations.tags.Tag;
+import io.swagger.annotations.Api;
 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
-@Tag(name = "BizCategory - 业务分类")
+@Api(tags = "BizCategory - 业务分类")
 @RequestMapping(value = "${adminPath}/biz/bizCategory")
 public class BizCategoryController extends BaseController {
 

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

@@ -4,9 +4,9 @@
  */
 package com.jeesite.modules.config.server;
 
-import jakarta.servlet.Filter;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.Filter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
@@ -26,7 +26,6 @@ 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.jakarta.StatViewServlet;
-import com.alibaba.druid.support.jakarta.WebStatFilter;
+import com.alibaba.druid.support.http.StatViewServlet;
+import com.alibaba.druid.support.http.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,15 +7,16 @@ 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,9 +10,6 @@ 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;
@@ -20,6 +17,9 @@ 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;
 
@@ -69,7 +69,7 @@ public class FileUploadController extends BaseController {
 	@RequestMapping(value = "/download/{fileUploadId}")
 	public String downloadFile(@PathVariable("fileUploadId") String fileUploadId, String preview, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 		FileUpload fileUpload = fileUploadService.getFile(new FileUpload(fileUploadId));
-		return fileUploadService.downloadFile(fileUpload, preview, request, response);
+		return fileUploadService.downloadFile(fileUpload, preview, "file", request, response);
 	}
 
 	/**

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

@@ -4,8 +4,8 @@
  */
 package com.jeesite.modules.file.web;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.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)
-@Hidden
+@ApiIgnore
 public class UserfilesController extends BaseController {
 
 	@RequestMapping(value="/userfiles/**")
@@ -49,7 +49,8 @@ public class UserfilesController extends BaseController {
 			String uid = request.getParameter("uid");
 			if (StringUtils.isNotBlank(url) && StringUtils.isNotBlank(uid)){
 				fileUrl = url; //EncodeUtils.decodeUrl(url); 不用解码，否则腾讯云存储的时候预览不能显示
-				fileUri = Global.getCtxPath() + Global.getAdminPath() + "/file/download/" + uid;
+				String type = StringUtils.defaultIfBlank(request.getParameter("type"), "file");
+				fileUri = Global.getCtxPath() + Global.getAdminPath() + "/" + type + "/download/" + uid;
 				filePath = fileName;
 			} else if (StringUtils.isNotBlank(fileName)){
 				fileUri += "?fileName=" + EncodeUtils.encodeUrl(fileName);

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 jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 
-import jakarta.validation.constraints.Size;
+import javax.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 jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 
-import jakarta.validation.constraints.Size;
+import javax.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,9 +4,14 @@
  */
 package com.jeesite.modules.msg.web;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.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;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -18,14 +23,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-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 javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * 内部消息Controller

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 jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Pattern;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
 import java.util.List;
 
 /**

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

@@ -17,8 +17,9 @@ 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.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.Valid;
 
 /**
  * 员工用户管理Entity
@@ -128,7 +129,7 @@ public class EmpUser extends User {
 		super.setRefObj(employee);
 	}
 
-	@Schema(description = "根据各种编码查询")
+	@ApiModelProperty("根据各种编码查询")
 	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.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.NotNull;
+import javax.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;
 	}
 
-	@Schema(description = "根据岗位编码查询")
+	@ApiModelProperty("根据岗位编码查询")
 	public String getPostCode() {
 		return postCode;
 	}
@@ -147,7 +147,7 @@ public class Employee extends DataEntity<Employee> {
 		this.employeePostList = employeePostList;
 	}
 
-	@Schema(description = "员工岗位关系")
+	@ApiModelProperty("员工岗位关系")
 	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

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

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.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 import java.util.Date;
 import java.util.Map;
 
@@ -230,7 +230,7 @@ public class Log extends DataEntity<Log> {
 		this.executeTime = executeTime;
 	}
 
-	@Schema(description = "格式化后的执行时间")
+	@ApiModelProperty("格式化后的执行时间")
 	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.isEmpty()) {
+			if (params.length() != 0) {
 				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.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;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
 
 /**
  * 组织机构Entity
@@ -44,7 +44,6 @@ import jakarta.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;
@@ -58,9 +57,6 @@ 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; // 根据公司查询机构，组织机构所属公司
@@ -86,8 +82,6 @@ public class Office extends TreeEntity<Office> {
 	}
 	
 	@Override
-	@Hidden
-	@Schema(hidden = true)
 	public Office getParent() {
 		return parent;
 	}
@@ -153,7 +147,7 @@ public class Office extends TreeEntity<Office> {
 		this.officeType = officeType;
 	}
 
-	@Schema(description = "包含某机构类型")
+	@ApiModelProperty("包含某机构类型")
 	public String[] getOfficeType_in(){
 		return sqlMap.getWhere().getValue("office_type", QueryType.IN);
 	}
@@ -206,9 +200,7 @@ public class Office extends TreeEntity<Office> {
 	public void setEmail(String email) {
 		this.email = email;
 	}
-
-	@Hidden
-	@Schema(hidden = true)
+	
 	public Extend getExtend() {
 		return extend;
 	}
@@ -217,7 +209,7 @@ public class Office extends TreeEntity<Office> {
 		this.extend = extend;
 	}
 
-	@Schema(description = "公司编码")
+	@ApiModelProperty("公司编码")
 	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.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModelProperty;
 
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Pattern;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.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;
 	}
 
-	@Schema(description = "模糊查询岗位名称")
+	@ApiModelProperty("模糊查询岗位名称")
 	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;
 	}
 
-	@Schema(description = "根据员工编码查询")
+	@ApiModelProperty("根据员工编码查询")
 	public String getEmpCode() {
 		return empCode;
 	}
@@ -119,7 +119,7 @@ public class Post extends DataEntity<Post> {
 		this.empCode = empCode;
 	}
 
-	@Schema(description = "根据用户编码查询")
+	@ApiModelProperty("根据用户编码查询")
 	public String getUserCode() {
 		return userCode;
 	}
@@ -128,7 +128,7 @@ public class Post extends DataEntity<Post> {
 		this.userCode = userCode;
 	}
 
-	@Schema(description = "岗位绑定角色编码")
+	@ApiModelProperty("岗位绑定角色编码")
 	public String getRoleCodes() {
 		return roleCodes;
 	}
@@ -137,7 +137,6 @@ 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,14 +4,6 @@
  */
 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;
@@ -20,6 +12,13 @@ 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,16 +4,15 @@
  */
 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 jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
+import com.jeesite.common.web.http.UserAgentUtils;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.jeesite.common.lang.StringUtils;
-import com.jeesite.common.service.BaseService;
-import com.jeesite.common.web.http.UserAgentUtils;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * 手机端视图拦截器

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.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 jakarta.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
 import java.util.List;
 
 /**

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

@@ -18,8 +18,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import jakarta.validation.ConstraintViolation;
-import jakarta.validation.ConstraintViolationException;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
 import java.util.List;
 
 /**

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;
 

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

@@ -31,7 +31,7 @@ import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.method.HandlerMethod;
 
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;

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

@@ -20,13 +20,10 @@ import com.jeesite.modules.sys.service.UserService;
 import com.jeesite.modules.sys.utils.PwdUtils;
 import com.jeesite.modules.sys.utils.UserUtils;
 import com.jeesite.modules.sys.utils.ValidCodeUtils;
-import io.swagger.v3.oas.annotations.Hidden;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authc.AuthenticationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -36,7 +33,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import springfox.documentation.annotations.ApiIgnore;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -49,7 +49,7 @@ import java.util.stream.Collectors;
  * @version 2020-9-20
  */
 @Controller
-@Tag(name = "Account - 账号服务")
+@Api(tags = "Account - 账号服务")
 @RequestMapping(value = "/account")
 @ConditionalOnProperty(name={"user.enabled","web.core.enabled"}, havingValue="true", matchIfMissing=true)
 public class AccountController extends BaseController{
@@ -65,10 +65,10 @@ public class AccountController extends BaseController{
 	 */
 	@PostMapping(value = "getLoginValidCode")
 	@ResponseBody
-	@Operation(summary = "获取登录的短信或邮件验证码")
-	@Parameters({
-		@Parameter(name = "mobile", description = "手机号码", required = true),
-		@Parameter(name = "validCode", description = "图片验证码，防止重复机器人", required = true),
+	@ApiOperation(value = "获取登录的短信或邮件验证码")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "mobile", value = "登录手机号", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "validCode", value = "图片验证码，防止重复机器人", required = true),
 	})
 	public String getLoginValidCode(String mobile, String validCode, HttpServletRequest request) {
 		return getValidCode("login", mobile, validCode, "mobile", request, "登录验证码");
@@ -80,10 +80,10 @@ public class AccountController extends BaseController{
 	 */
 	@PostMapping(value = "loginByValidCode")
 	@ResponseBody
-	@Operation(summary = "根据短信或邮件验证码登录系统")
-	@Parameters({
-		@Parameter(name = "loginValidCode", description = "手机接受的验证码", required = true),
-		@Parameter(name = "selectLoginCode", description = "手机号绑定多个账号时的登录账号", required = true),
+	@ApiOperation(value = "根据短信或邮件验证码登录系统")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "loginValidCode", value = "手机或邮箱接受的验证码", required = true),
+		@ApiImplicitParam(name = "selectLoginCode", value = "手机号绑定多个账号时的登录账号", required = true),
 	})
 	public String loginByValidCode(String selectLoginCode, String loginValidCode, HttpServletRequest request, HttpServletResponse response) {
 		if (!Global.getConfigToBoolean("user.loginByValidCode", "true")) {
@@ -122,7 +122,7 @@ public class AccountController extends BaseController{
 	 * 忘记密码页面
 	 */
 	@GetMapping(value = "forgetPwd")
-	@Hidden
+	@ApiIgnore
 	public String forgetPwd(Model model) {
 		return "modules/sys/forgetPwd";
 	}
@@ -134,11 +134,11 @@ public class AccountController extends BaseController{
 	 */
 	@PostMapping(value = "getFpValidCode")
 	@ResponseBody
-	@Operation(summary = "获取找回密码的短信或邮件验证码")
-	@Parameters({
-		@Parameter(name = "loginCode", description = "登录账号", required = true),
-		@Parameter(name = "validCode", description = "图片验证码，防止重复机器人", required = true),
-		@Parameter(name = "validType", description = "验证方式（mobile、email）", required = true),
+	@ApiOperation(value = "获取找回密码的短信或邮件验证码")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "loginCode", value = "登录账号", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "validCode", value = "图片验证码，防止重复机器人", required = true),
+		@ApiImplicitParam(name = "validType", value = "验证方式（mobile、email）", required = true),
 	})
 	public String getFpValidCode(User user, String validCode, String validType, HttpServletRequest request) {
 		return getValidCode("fp", user.getLoginCode(), validCode, validType, request, "找回密码");
@@ -149,11 +149,11 @@ public class AccountController extends BaseController{
 	 */
 	@PostMapping(value = "savePwdByValidCode")
 	@ResponseBody
-	@Operation(summary = "根据短信或邮件验证码重置密码")
-	@Parameters({
-		@Parameter(name = "loginCode", description = "登录账号", required = true),
-		@Parameter(name = "fpValidCode", description = "手机或邮箱接受的验证码", required = true),
-		@Parameter(name = "password", description = "新密码", required = true),
+	@ApiOperation(value = "根据短信或邮件验证码重置密码")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "loginCode", value = "登录账号", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "fpValidCode", value = "手机或邮箱接受的验证码", required = true),
+		@ApiImplicitParam(name = "password", value = "新密码", required = true, paramType="query", type="String"),
 	})
 	public String savePwdByValidCode(String password, String fpValidCode, HttpServletRequest request) {
 		String type = "fp";
@@ -283,10 +283,10 @@ public class AccountController extends BaseController{
 	 */
 	@PostMapping(value = "getPwdQuestion")
 	@ResponseBody
-	@Operation(summary = "获取找回密码的保密问题")
-	@Parameters({
-		@Parameter(name = "loginCode", description = "登录账号", required = true),
-		@Parameter(name = "validCode", description = "图片验证码，防止重复机器人", required = true),
+	@ApiOperation(value = "获取找回密码的保密问题")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "loginCode", value = "登录账号", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "validCode", value = "图片验证码，防止重复机器人", required = true),
 	})
 	public String getPwdQuestion(String loginCode, String validCode, HttpServletRequest request) {
 		// 校验图片验证码，防止重复机器人。
@@ -329,13 +329,13 @@ public class AccountController extends BaseController{
 	 */
 	@PostMapping(value = "savePwdByPwdQuestion")
 	@ResponseBody
-	@Operation(summary = "根据保密问题重置密码")
-	@Parameters({
-		@Parameter(name = "loginCode", description = "登录账号", required = true),
-		@Parameter(name = "pwdQuestionAnswer", description = "保密问题答案（1）", required = true),
-		@Parameter(name = "pwdQuestionAnswer2", description = "保密问题答案（2）", required = true),
-		@Parameter(name = "pwdQuestionAnswer3", description = "保密问题答案（3）", required = true),
-		@Parameter(name = "password", description = "新密码", required = true),
+	@ApiOperation(value = "根据保密问题重置密码")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "loginCode", value = "登录账号", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "pwdQuestionAnswer", value = "保密问题答案（1）", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "pwdQuestionAnswer2", value = "保密问题答案（2）", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "pwdQuestionAnswer3", value = "保密问题答案（3）", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "password", value = "新密码", required = true, paramType="query", type="String"),
 	})
 	public String savePwdByPwdQuestion(User user, HttpServletRequest request) {
 		String userCode = UserUtils.getCache("fpUserCode");
@@ -382,7 +382,7 @@ public class AccountController extends BaseController{
 	 * @param user 用户信息参数
 	 */
 	@GetMapping(value = "registerUser")
-	@Hidden
+	@ApiIgnore
 	public String registerUser(User user, HttpServletRequest request) {
 		return "modules/sys/registerUser";
 	}
@@ -394,17 +394,17 @@ public class AccountController extends BaseController{
 	 */
 	@PostMapping(value = "getRegValidCode")
 	@ResponseBody
-	@Operation(summary = "获取注册用户短信或邮件验证码")
-	@Parameters({
-		@Parameter(name = "loginCode", description = "登录账号", required = true),
-		@Parameter(name = "userName", description = "用户姓名", required = true),
-		@Parameter(name = "email", description = "电子邮箱", required = true),
-		@Parameter(name = "mobile", description = "手机号码", required = true),
-		@Parameter(name = "corpCode_", description = "租户编号", required = true),
-		@Parameter(name = "corpName_", description = "租户名称", required = true),
-		@Parameter(name = "userType", description = "用户类型（employee）", required = true),
-		@Parameter(name = "validCode", description = "图片验证码，防止重复机器人", required = true),
-		@Parameter(name = "validType", description = "验证方式（mobile、email）", required = true),
+	@ApiOperation(value = "获取注册用户短信或邮件验证码")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "loginCode", value = "登录账号", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "userName", value = "用户姓名", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "email", value = "电子邮箱", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "mobile", value = "手机号码", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "corpCode_", value = "租户编号", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "corpName_", value = "租户名称", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "userType", value = "用户类型（employee）", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "validCode", value = "图片验证码，防止重复机器人", required = true),
+		@ApiImplicitParam(name = "validType", value = "验证方式（mobile、email）", required = true),
 	})
 	public String getRegValidCode(User user, String validCode, String validType, HttpServletRequest request) {
 		// 校验图片验证码，防止重复机器人。
@@ -471,11 +471,11 @@ public class AccountController extends BaseController{
 	 */
 	@PostMapping(value = "saveRegByValidCode")
 	@ResponseBody
-	@Operation(summary = "根据短信或邮件验证码注册用户")
-	@Parameters({
-		@Parameter(name = "loginCode", description = "登录账号", required = true),
-		@Parameter(name = "password", description = "登录密码", required = true),
-		@Parameter(name = "regValidCode", description = "手机或邮箱接受的验证码", required = true),
+	@ApiOperation(value = "根据短信或邮件验证码注册用户")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "loginCode", value = "登录账号", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "password", value = "登录密码", required = true, paramType="query", type="String"),
+		@ApiImplicitParam(name = "regValidCode", value = "手机或邮箱接受的验证码", required = true),
 	})
 	public String saveRegByValidCode(User user, String regValidCode, HttpServletRequest request) {
 		if (!"true".equals(Global.getConfig("sys.account.registerUser"))){

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

@@ -14,9 +14,7 @@ import com.jeesite.common.web.BaseController;
 import com.jeesite.modules.sys.entity.Area;
 import com.jeesite.modules.sys.service.AreaService;
 import com.jeesite.modules.sys.utils.AreaUtils;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import io.swagger.annotations.Api;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -28,6 +26,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 java.util.List;
 import java.util.Map;
 
@@ -37,7 +37,7 @@ import java.util.Map;
  * @version 2014-8-19
  */
 @Controller
-@Tag(name = "Area - 行政区划")
+@Api(tags = "Area - 行政区划")
 @RequestMapping(value = "${adminPath}/sys/area")
 @ConditionalOnProperty(name={"user.enabled","web.core.enabled"}, havingValue="true", matchIfMissing=true)
 public class AreaController extends BaseController {

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

@@ -4,6 +4,20 @@
  */
 package com.jeesite.modules.sys.web;
 
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Controller;
+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.entity.Page;
@@ -12,22 +26,11 @@ import com.jeesite.common.lang.ObjectUtils;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.utils.excel.ExcelExport;
 import com.jeesite.common.web.BaseController;
-import com.jeesite.modules.sys.entity.Audit;
 import com.jeesite.modules.sys.entity.Menu;
+import com.jeesite.modules.sys.entity.Audit;
 import com.jeesite.modules.sys.service.AuditService;
-import io.swagger.v3.oas.annotations.Hidden;
-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;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.List;
-import java.util.Map;
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * 安全审计Controller
@@ -37,7 +40,7 @@ import java.util.Map;
 @Controller
 @RequestMapping(value = "${adminPath}/sys/audit")
 @ConditionalOnProperty(name={"user.enabled","web.core.enabled"}, havingValue="true", matchIfMissing=true)
-@Hidden
+@ApiIgnore
 public class AuditController extends BaseController {
 
 	@Autowired

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

@@ -1,8 +1,8 @@
 package com.jeesite.modules.sys.web;
 
-import jakarta.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
 
-import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.annotations.Api;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
@@ -22,7 +22,7 @@ import com.jeesite.modules.sys.utils.UserUtils;
  * @version 20167-8-27
  */
 @Controller
-@Tag(name = "Cache - 缓存管理")
+@Api(tags = "Cache - 缓存管理")
 @RequestMapping(value = "${adminPath}/sys/cache")
 public class CacheController extends BaseController {
 

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

@@ -14,8 +14,7 @@ import com.jeesite.modules.sys.entity.Company;
 import com.jeesite.modules.sys.entity.Office;
 import com.jeesite.modules.sys.service.CompanyService;
 import com.jeesite.modules.sys.service.OfficeService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.servlet.http.HttpServletRequest;
+import io.swagger.annotations.Api;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -27,6 +26,7 @@ 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 java.util.List;
 import java.util.Map;
 
@@ -36,7 +36,7 @@ import java.util.Map;
  * @version 2014-8-19
  */
 @Controller
-@Tag(name = "Company - 公司管理")
+@Api(tags = "Company - 公司管理")
 @RequestMapping(value = "${adminPath}/sys/company")
 @ConditionalOnProperty(name={"user.enabled","web.core.enabled"}, havingValue="true", matchIfMissing=true)
 public class CompanyController extends BaseController {

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

@@ -4,9 +4,8 @@
  */
 package com.jeesite.modules.sys.web;
 
-import io.swagger.v3.oas.annotations.Hidden;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,16 +25,17 @@ import com.jeesite.common.web.BaseController;
 import com.jeesite.modules.sys.entity.Config;
 import com.jeesite.modules.sys.service.ConfigService;
 
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * 参数设置Controller
  * @author ThinkGem
- * @version 2019-07-31
+ * @version 2014-07-31
  */
 @Controller
 @RequestMapping(value = "${adminPath}/sys/config")
-@ConditionalOnProperty(name={"config.enabled","web.core.enabled"}, havingValue="true", matchIfMissing=true)
-@Hidden
+@ConditionalOnProperty(name="web.core.enabled", havingValue="true", matchIfMissing=true)
+@ApiIgnore
 public class ConfigController extends BaseController {
 
 	@Autowired

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

@@ -15,8 +15,6 @@ import com.jeesite.modules.sys.entity.DictType;
 import com.jeesite.modules.sys.service.DictDataService;
 import com.jeesite.modules.sys.service.DictTypeService;
 import com.jeesite.modules.sys.utils.DictUtils;
-import io.swagger.v3.oas.annotations.Hidden;
-import jakarta.servlet.http.HttpServletRequest;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -27,11 +25,12 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import springfox.documentation.annotations.ApiIgnore;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
-
 /**
  * 字典管理Controller
  * @author ThinkGem
@@ -39,8 +38,8 @@ import java.util.Map;
  */
 @Controller
 @RequestMapping(value = "${adminPath}/sys/dictData")
-@ConditionalOnProperty(name={"config.enabled","web.core.enabled"}, havingValue="true", matchIfMissing=true)
-@Hidden
+@ConditionalOnProperty(name="web.core.enabled", havingValue="true", matchIfMissing=true)
+@ApiIgnore
 public class DictDataController extends BaseController {
 
 	@Autowired
@@ -89,7 +88,7 @@ public class DictDataController extends BaseController {
 		// 创建并初始化下一个节点信息
 		dictData = createNextNode(dictData);
 		model.addAttribute("dictData", dictData);
-		return "modules/sys/dictDataForm";		
+		return "modules/sys/dictDataForm";
 	}
 	
 	/**
@@ -168,7 +167,7 @@ public class DictDataController extends BaseController {
 			dictData.setIsSys(dictType.getIsSys());
 		}
 		dictDataService.save(dictData);
-		return renderResult(Global.TRUE, text("保存字典成功"));		
+		return renderResult(Global.TRUE, text("保存字典成功"));
 	}
 	
 	/**

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

@@ -4,6 +4,24 @@
  */
 package com.jeesite.modules.sys.web;
 
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.collect.MapUtils;
 import com.jeesite.common.config.Global;
@@ -12,29 +30,18 @@ import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.web.BaseController;
 import com.jeesite.modules.sys.entity.DictType;
 import com.jeesite.modules.sys.service.DictTypeService;
-import io.swagger.v3.oas.annotations.Hidden;
-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;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import java.util.Map;
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * 字典分类管理Controller
  * @author ThinkGem
- * @version 2019-3-24
+ * @version 2017-3-24
  */
 @Controller
 @RequestMapping(value = "${adminPath}/sys/dictType")
-@ConditionalOnProperty(name={"config.enabled","web.core.enabled"}, havingValue="true", matchIfMissing=true)
-@Hidden
+@ConditionalOnProperty(name="web.core.enabled", havingValue="true", matchIfMissing=true)
+@ApiIgnore
 public class DictTypeController extends BaseController {
 
 	@Autowired

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

@@ -4,10 +4,10 @@
  */
 package com.jeesite.modules.sys.web;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
-import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.annotations.Api;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -28,7 +28,7 @@ import com.jeesite.modules.sys.service.LogService;
  * @version 2013-6-2
  */
 @Controller
-@Tag(name = "Log - 访问日志")
+@Api(tags = "Log - 访问日志")
 @RequestMapping(value = "${adminPath}/sys/log")
 @ConditionalOnProperty(name={"user.enabled","web.core.enabled"}, havingValue="true", matchIfMissing=true)
 public class LogController extends BaseController {