5.9.0

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

README.md

@@ -2,15 +2,12 @@
 <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://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> 
+ <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>
 </p>
 
 ------
@@ -27,32 +24,20 @@
 * 使用文档：<https://jeesite.com/docs>
 * 问题反馈：<http://jeesite.net> [【新手必读】](https://gitee.com/thinkgem/jeesite5/issues/I18ARR)
 * 需求收集：<https://gitee.com/thinkgem/jeesite5/issues/new>
-* 联系我们：<http://s.jeesite.com>
+* QQ 群：`127515876`、`209330483`、`223507718`、`709534275`、`730390092`、`1373527`、`183903863(外包)`
+* 微信群：添加客服微信 <http://s.jeesite.com> 邀请您进群
 * 关注微信公众号，了解最新动态：
 
 <p style="padding-left:40px">　　
  <img alt="JeeSite微信公众号" src="https://jeesite.com/assets/images/mp.png" width="200">
 </p>
 
-* 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)
+* 源码仓库地址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>
 
 ## 平台介绍
 
@@ -95,17 +80,17 @@
 
 ## 技术选型
 
-* 主框架：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
+* 主框架：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.1、符合 BPMN 规范、在线流程设计器、中国式流程、退回、撤回、自由流
-* Bootstrap 版 支持 IE10 及以上版本及其他所有现代浏览器，如：谷歌、火狐、国产浏览器 等
+* 工作流引擎：Flowable 6.6、符合 BPMN 规范、在线流程设计器、中国式流程、退回、撤回、自由流
+* Bootstrap 版 支持 IE9 及以上版本及其他所有现代浏览器，如：谷歌、火狐、国产浏览器 等
 * 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>
 
 ## 更多介绍
 
@@ -138,8 +123,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` 启动服务即可
@@ -149,8 +134,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>
@@ -243,11 +228,10 @@ docker run --name jeesite-web -p 8980:8980 -d --restart unless-stopped \
 7. 本项目已申请软件著作权，请尊重开源，感谢阅读。
 8. 无用户数限制，无在线人数限制，放心使用。
 
-## 技术支持与服务
+## 技术服务与支持
 
-* 本软件免费，我们也提供了相应的收费服务，因为：
 * 没有资金的支撑就很难得到发展，特别是一个好的产品，如果 JeeSite 帮助了您，请为我们点赞。支持我们，您可以获得更多回馈，我们会把公益事业做的更好，开放更多资源，回报社区和社会。请给我们一些动力吧，在此非常感谢已支持我们的朋友！
-* **联系我们**：请访问技术支持与服务页面：<http://s.jeesite.com> 
+* **联系我们**：请访问技术支持服务页面：<https://jeesite.com/docs/support/> 
 
 ## 今后如何升级？
 

common/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>5.10.0.springboot3-SNAPSHOT</version>
+		<version>5.9.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>
 		
@@ -45,12 +45,12 @@
 			<artifactId>commons-io</artifactId>
 			<version>${commons-io.version}</version>
 		</dependency>
-
-		<!-- Fury serialize -->
+		
+		<!-- Java serialization -->
 		<dependency>
-			<groupId>org.apache.fury</groupId>
-			<artifactId>fury-core</artifactId>
-			<version>${fury.version}</version>
+			<groupId>de.ruedigermoeller</groupId>
+			<artifactId>fst</artifactId>
+			<version>${fst.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 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/io/PropertiesUtils.java

@@ -36,7 +36,9 @@ 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();

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;
@@ -28,8 +28,6 @@ public class ExceptionUtils {
 			ex = (Throwable) request.getAttribute("exception");
 		} else if (request.getAttribute(RequestDispatcher.ERROR_EXCEPTION) != null) {
 			ex = (Throwable) request.getAttribute(RequestDispatcher.ERROR_EXCEPTION);
-		} else if (request.getAttribute("org.springframework.web.servlet.DispatcherServlet.EXCEPTION") != null) {
-			ex = (Throwable) request.getAttribute("org.springframework.web.servlet.DispatcherServlet.EXCEPTION");
 		}
 		return ex;
 	}

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

@@ -4,14 +4,12 @@
  */
 package com.jeesite.common.lang;
 
-import com.jeesite.common.io.PropertiesUtils;
 import org.apache.commons.lang3.BooleanUtils;
-import org.apache.fury.Fury;
-import org.apache.fury.ThreadSafeFury;
-import org.apache.fury.config.Language;
+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;
@@ -27,24 +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 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();
-		}
+	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 类型
 	 */
@@ -166,7 +153,8 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 			return null;
 		}
     	byte[] bytes = ObjectUtils.serialize(source);
-		return ObjectUtils.unserialize(bytes);
+    	Object target = ObjectUtils.unserialize(bytes);
+	    return target;
 	}
 	
 	/**
@@ -176,10 +164,10 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 	 */
 	public static byte[] serialize(Object object) {
 		try {
-			if (Static.isJavaSerialize) {
+			if (isJavaSerialize) {
 				return ObjectUtils.serializeJava(object);
-			} else {
-				return ObjectUtils.serializeFury(object);
+			}else {
+				return ObjectUtils.serializeFst(object);
 			}
 		} catch (Exception e) {
 			logger.error("serialize: {}", e.getMessage());
@@ -194,10 +182,10 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 	 */
 	public static Object unserialize(byte[] bytes) {
 		try {
-			if (Static.isJavaSerialize) {
+			if (isJavaSerialize) {
 				return ObjectUtils.unserializeJava(bytes);
-			} else {
-				return ObjectUtils.unserializeFury(bytes);
+			}else {
+				return ObjectUtils.unserializeFst(bytes);
 			}
 		} catch (Exception e) {
 			logger.error("unserialize: {}", e.getMessage());
@@ -255,88 +243,51 @@ 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[] serializeFury(Object object) {
+	public static byte[] serializeFst(Object object) {
 		if (object == null){
 			return null;
 		}
 		long beginTime = System.currentTimeMillis();
-		byte[] bytes = Static.fury.serialize(object);
+		byte[] bytes = fstConfiguration.get().asByteArray(object);
 		long totalTime = System.currentTimeMillis() - beginTime;
 		if (totalTime > 30000){
-			logger.warn(object.getClass() + " serialize time: " + TimeUtils.formatTime(totalTime));
+			logger.warn(object.getClass() + " fst serialize time: " + TimeUtils.formatTime(totalTime));
 		}
 		return bytes;
 	}
 
 	/**
-	 * 反序列化对象
+	 * FST 反序列化对象
 	 * @param bytes
 	 * @return
 	 */
-	public static Object unserializeFury(byte[] bytes) {
+	public static Object unserializeFst(byte[] bytes) {
 		if (bytes == null){
 			return null;
 		}
 		long beginTime = System.currentTimeMillis();
-		Object object = Static.fury.deserialize(bytes);
+		Object object = fstConfiguration.get().asObject(bytes);
 		long totalTime = System.currentTimeMillis() - beginTime;
 		if (totalTime > 30000 && object != null){
-			logger.warn(object.getClass() + " unserialize time: " + TimeUtils.formatTime(totalTime));
+			logger.warn(object.getClass() + " fst 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/lang/StringUtils.java

@@ -26,7 +26,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 	public static final String COLON = ":";
 	public static final String TILDE = "~";
 	public static final String UNDERLINE = "_";
-	public static final String MINUS = "-";
 
 	/**
 	 * 分隔字符串（逗号分隔）
@@ -285,7 +284,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         boolean upperCase = false;
         for (int i = 0; i < s.length(); i++) {
             char c = s.charAt(i);
-            if (c == UNDERLINE.charAt(0) || c == MINUS.charAt(0)) {
+            if (c == UNDERLINE.charAt(0)) {
                 upperCase = i != 1; // 不允许第二个字符是大写
             } else if (upperCase) {
                 sb.append(Character.toUpperCase(c));

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,6 +77,7 @@ 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

@@ -1,44 +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.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,14 @@ 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;
@@ -58,11 +57,6 @@ public class ServletUtils {
 	// 是否打印错误信息参数到视图页面（生产环境关闭）
 	private static final Boolean PRINT_ERROR_INFO = PROPS.getPropertyToBoolean("error.page.printErrorInfo", "true");
 
-	// 允许重定向的地址，不设置为全部允许，设置this只允许本项目内部跳转，多个用逗号隔开，例如：this,http://*.jeesite.com
-	private static final String[] ALLOW_REDIRECTS = PROPS.getPropertyToArray("shiro.allowRedirects", "");
-	private static final Boolean SCHEME_HTTPS = PROPS.getPropertyToBoolean("server.schemeHttps", "false");
-	private static final AntPathMatcher PATH_MATCHER = new AntPathMatcher();
-
 	/**
 	 * 获取当前请求对象
 	 * web.xml: <listener><listener-class>
@@ -390,15 +384,10 @@ public class ServletUtils {
 	}
 
 	/**
-	 * 获取当前请求的域名（含端口）
-	 * @author ThinkGem
+	 * 获取请求的域名（含端口）
 	 */
-	public static String getThisDomain(HttpServletRequest request) {
-        String url = request.getRequestURL().toString();
+	public static String getRequestDomain(String url) {
 		String scheme = StringUtils.substringBefore(url, "://");
-		if (SCHEME_HTTPS && StringUtils.equals(scheme, "http")) {
-            scheme = "https";
-        }
 		String domain = StringUtils.substringAfter(url, "://");
 		if (StringUtils.contains(domain, "/")) {
 			domain = StringUtils.substringBefore(domain, "/");
@@ -406,28 +395,6 @@ public class ServletUtils {
 		return scheme + "://" + domain;
 	}
 
-	/**
-	 * 验证地址是否允许重定向
-	 * @author ThinkGem
-	 */
-	public static boolean isAllowRedirects(HttpServletRequest request, String url) {
-		if (ALLOW_REDIRECTS == null || ALLOW_REDIRECTS.length == 0) {
-			return true;
-		}
-		boolean allow = false;
-		for (String pattern : ALLOW_REDIRECTS) {
-			String p = StringUtils.trim(pattern);
-			if ("this".equals(p)) {
-				p = getThisDomain(request);
-			}
-			if (PATH_MATCHER.match(p + "/**", url)){
-				allow = true;
-				break;
-			}
-		}
-		return allow;
-	}
-
 	/**
 	 * 获得请求参数值
 	 */

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/main/resources/static/adminlte/css/skins/skin-blue-light3.css

@@ -235,6 +235,3 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .ui-jqgrid .ui-jqgrid-frozen .ui-jqgrid-htable th div {height:46px!important;}
 .ui-jqgrid .ui-jqgrid-htable th div {padding:15px 0 15px 2px;}
 .ui-jqgrid tr.jqgrow td {height: 49px;}
-.table-form .ui-jqgrid .ui-jqgrid-frozen .ui-jqgrid-htable th div {height:36px!important;}
-.table-form .ui-jqgrid .ui-jqgrid-htable th div {padding:9px 0 8px 2px;}
-.table-form .ui-jqgrid tr.jqgrow td {height: 39px;}

common/src/main/resources/static/adminlte/css/skins/skin-blue3.css

@@ -235,6 +235,3 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .ui-jqgrid .ui-jqgrid-frozen .ui-jqgrid-htable th div {height:46px!important;}
 .ui-jqgrid .ui-jqgrid-htable th div {padding:15px 0 15px 2px;}
 .ui-jqgrid tr.jqgrow td {height: 49px;}
-.table-form .ui-jqgrid .ui-jqgrid-frozen .ui-jqgrid-htable th div {height:36px!important;}
-.table-form .ui-jqgrid .ui-jqgrid-htable th div {padding:9px 0 8px 2px;}
-.table-form .ui-jqgrid tr.jqgrow td {height: 39px;}

common/src/main/resources/static/adminlte/css/skins/skin-dark.css

@@ -296,9 +296,6 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .ui-jqgrid .ui-jqgrid-frozen .ui-jqgrid-htable th div {height:46px!important;}
 .ui-jqgrid .ui-jqgrid-htable th div {padding:15px 0 15px 2px;}
 .ui-jqgrid tr.jqgrow td {height: 49px;}
-.table-form .ui-jqgrid .ui-jqgrid-frozen .ui-jqgrid-htable th div {height:36px!important;}
-.table-form .ui-jqgrid .ui-jqgrid-htable th div {padding:9px 0 8px 2px;}
-.table-form .ui-jqgrid tr.jqgrow td {height: 39px;}
 
 .ui-jqgrid tr.jqgroup td, .ui-jqgrid tr.footrow td, .ui-jqgrid tr.jqfoot td {background:#323232;}
 .ui-jqgrid .actions .moreItems {background:#1a1a1a;border-color:#3c3c3c;box-shadow:none;}

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

@@ -20,11 +20,11 @@ span{display:block;font-size:12px;line-height:12px;}
 <p>您正在使用 Internet Explorer 的过期版本（IE6、IE7、IE8 内核的浏览器）。这意味着在升级浏览器前，您将无法继续访问。</p>
 <hr>
 <h2>为什么会出现这个页面？</h2>
-<p>如果您不知道升级浏览器是什么意思，请请教一些熟练电脑操作的朋友。如果您使用的不是Internet Explorer，而是360、QQ、搜狗等，双核浏览器，出现这个页面可能是您切换到了兼容模式，请<strong style="color:#f00;">切换到极速模式</strong>下，如果还不行请升级至最新版浏览器。</p>
+<p>如果您不知道升级浏览器是什么意思，请请教一些熟练电脑操作的朋友。如果您使用的不是IE6/7/8，而是360、QQ、搜狗等，双核浏览器，出现这个页面可能是您切换到了兼容模式，请<strong style="color:#f00;">切换到极速模式</strong>下，如果还不行请升级至最新版浏览器。</p>
 <hr>
-<h2>请注意：微软（Microsoft）对 Windows XP、Vista、7、8、8.1 及 Internet Explorer 的支持已经结束</h2>
-<p>微软（Microsoft）不再为已经结束的版本提供相应支持和更新。如果您继续使用这些，您将可能受到病毒、间谍软件和其他恶意软件的攻击，无法确保个人信息的安全。请参阅 <a href="http://windows.microsoft.com/zh-cn/windows/end-support-help">Windows XP 支持已经结束的说明</a> 。</p>
-<p>于 2022 年 6 月 15 日，微软对 Internet Explorer 11 的支持也已结束。请参阅 <a href="http://windows.microsoft.com/zh-cn/internet-explorer/download-ie"> Internet Explorer 浏览器下载</a>。</p>
+<h2>请注意：微软（Microsoft）对  Windows XP 及 IE6、IE7、IE8、IE9、IE10 的支持已经结束</h2>
+<p>自 2014 年 4 月 8 日起，微软（Microsoft）不再为 Windows XP 和 Internet Explorer 8 及以下版本提供相应支持和更新。如果您继续使用这些，您将可能受到病毒、间谍软件和其他恶意软件的攻击，无法确保个人信息的安全。请参阅 <a href="http://windows.microsoft.com/zh-cn/windows/end-support-help">Microsoft 关于 Windows XP 支持已经结束的说明</a> 。</p>
+<p>尽管 Internet Explorer 11 将于 2022 年 6 月 15 日也停止了支持。但您也可以继续使用 <a href="http://windows.microsoft.com/zh-cn/internet-explorer/download-ie"> Internet Explorer 11 浏览器</a>。</p>
 <hr>
 <h2>您可以选择更先进的浏览器</h2>
 <p>推荐使用以下浏览器的最新版本。如果您的电脑已有以下浏览器的最新版本则直接使用该浏览器访问 <b id="url"></b>即可。</p>
@@ -32,7 +32,7 @@ span{display:block;font-size:12px;line-height:12px;}
 <li><img src="img/chrome360.jpg"><a href="http://chrome.360.cn/"> 360极速浏览器<span>360 Chrome</span></a></li>
 <li><img src="img/chrome.jpg"><a href="http://www.google.cn/intl/zh-CN/chrome/browser/desktop/index.html"> 谷歌浏览器<span>Google Chrome</span></a></li>
 <li><img src="img/firefox.jpg"><a href="http://www.firefox.com.cn/download/"> 火狐浏览器<span>Mozilla Firefox</span></a></li>
-<li><img src="img/edge.png"><a href="https://www.microsoft.com/zh-cn/edge"> Edge 浏览器<span>Microsoft Edge</span></a></li>
+<li><img src="img/ie.jpg"><a href="https://www.microsoft.com/zh-cn/edge"> Edge 浏览器<span>Microsoft Edge</span></a></li>
 </ul><div class="clean"></div></div>
 <hr><br/>
 <script>

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/db/app.erm

@@ -329,7 +329,7 @@
 		</word>
 		<word>
 			<id>a63e3fda50530388ba263296184d8a6919a75791</id>
-			<length>4000</length>
+			<length>1000</length>
 			<decimal>null</decimal>
 			<array>false</array>
 			<array_dimension>null</array_dimension>

modules/app/db/db2/app.sql

@@ -16,7 +16,7 @@ CREATE TABLE js_app_comment
 	update_date timestamp NOT NULL,
 	remarks vargraphic(500),
 	create_by_name varchar(200),
-	device_info varchar(4000),
+	device_info varchar(1000),
 	reply_date date,
 	reply_content vargraphic(500),
 	reply_user_code varchar(64),

modules/app/db/h2/app.sql

@@ -16,7 +16,7 @@ CREATE TABLE js_app_comment
 	update_date datetime NOT NULL,
 	remarks varchar(500),
 	create_by_name varchar(200),
-	device_info varchar(4000),
+	device_info varchar(1000),
 	reply_date date,
 	reply_content varchar(500),
 	reply_user_code varchar(64),

modules/app/db/mssql/app.sql

@@ -16,7 +16,7 @@ CREATE TABLE [js_app_comment]
 	[update_date] datetime NOT NULL,
 	[remarks] nvarchar(500),
 	[create_by_name] varchar(200),
-	[device_info] varchar(4000),
+	[device_info] varchar(1000),
 	[reply_date] date,
 	[reply_content] nvarchar(500),
 	[reply_user_code] varchar(64),

modules/app/db/mysql/app.sql

@@ -17,7 +17,7 @@ CREATE TABLE js_app_comment
 	update_date datetime NOT NULL COMMENT '更新时间',
 	remarks varchar(500) COMMENT '备注信息',
 	create_by_name varchar(200) COMMENT '提问人员姓名',
-	device_info varchar(4000) COMMENT '设备信息',
+	device_info varchar(1000) COMMENT '设备信息',
 	reply_date date COMMENT '回复时间',
 	reply_content varchar(500) COMMENT '回复意见',
 	reply_user_code varchar(64) COMMENT '回复人员',

modules/app/db/oracle/app.sql

@@ -16,7 +16,7 @@ CREATE TABLE js_app_comment
 	update_date timestamp NOT NULL,
 	remarks nvarchar2(500),
 	create_by_name varchar2(200),
-	device_info varchar2(4000),
+	device_info varchar2(1000),
 	reply_date date,
 	reply_content nvarchar2(500),
 	reply_user_code varchar2(64),

modules/app/db/postgresql/app.sql

@@ -16,7 +16,7 @@ CREATE TABLE js_app_comment
 	update_date timestamp NOT NULL,
 	remarks varchar(500),
 	create_by_name varchar(200),
-	device_info varchar(4000),
+	device_info varchar(1000),
 	reply_date date,
 	reply_content varchar(500),
 	reply_user_code varchar(64),

modules/app/pom.xml

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

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

@@ -4,15 +4,17 @@
  */
 package com.jeesite.modules.app.entity;
 
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import javax.validation.constraints.Size;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 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 java.util.Date;
 
 /**
  * APP意见反馈Entity
@@ -82,7 +84,7 @@ public class AppComment extends DataEntity<AppComment> {
 		this.contact = contact;
 	}
 
-	@Size(min=0, max=4000, message="设备信息长度不能超过 4000 个字符")
+	@Size(min=0, max=1000, message="设备信息长度不能超过 1000 个字符")
 	public String getDeviceInfo() {
 		return deviceInfo;
 	}

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/create/db2/app.sql

@@ -16,7 +16,7 @@ CREATE TABLE ${_prefix}app_comment
 	update_date timestamp NOT NULL,
 	remarks vargraphic(500),
 	create_by_name varchar(200),
-	device_info varchar(4000),
+	device_info varchar(1000),
 	reply_date date,
 	reply_content vargraphic(500),
 	reply_user_code varchar(64),

modules/app/src/main/resources/db/create/h2/app.sql

@@ -16,7 +16,7 @@ CREATE TABLE ${_prefix}app_comment
 	update_date datetime NOT NULL,
 	remarks varchar(500),
 	create_by_name varchar(200),
-	device_info varchar(4000),
+	device_info varchar(1000),
 	reply_date date,
 	reply_content varchar(500),
 	reply_user_code varchar(64),

modules/app/src/main/resources/db/create/mssql/app.sql

@@ -16,7 +16,7 @@ CREATE TABLE [${_prefix}app_comment]
 	[update_date] datetime NOT NULL,
 	[remarks] nvarchar(500),
 	[create_by_name] varchar(200),
-	[device_info] varchar(4000),
+	[device_info] varchar(1000),
 	[reply_date] date,
 	[reply_content] nvarchar(500),
 	[reply_user_code] varchar(64),

modules/app/src/main/resources/db/create/mysql/app.sql

@@ -17,7 +17,7 @@ CREATE TABLE ${_prefix}app_comment
 	update_date datetime NOT NULL COMMENT '更新时间',
 	remarks varchar(500) COMMENT '备注信息',
 	create_by_name varchar(200) COMMENT '提问人员姓名',
-	device_info varchar(4000) COMMENT '设备信息',
+	device_info varchar(1000) COMMENT '设备信息',
 	reply_date date COMMENT '回复时间',
 	reply_content varchar(500) COMMENT '回复意见',
 	reply_user_code varchar(64) COMMENT '回复人员',

modules/app/src/main/resources/db/create/oracle/app.sql

@@ -16,7 +16,7 @@ CREATE TABLE ${_prefix}app_comment
 	update_date timestamp NOT NULL,
 	remarks nvarchar2(500),
 	create_by_name varchar2(200),
-	device_info varchar2(4000),
+	device_info varchar2(1000),
 	reply_date date,
 	reply_content nvarchar2(500),
 	reply_user_code varchar2(64),

modules/app/src/main/resources/db/create/postgresql/app.sql

@@ -16,7 +16,7 @@ CREATE TABLE ${_prefix}app_comment
 	update_date timestamp NOT NULL,
 	remarks varchar(500),
 	create_by_name varchar(200),
-	device_info varchar(4000),
+	device_info varchar(1000),
 	reply_date date,
 	reply_content varchar(500),
 	reply_user_code varchar(64),

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

@@ -20,7 +20,4 @@
 5.7.1
 5.8.0
 5.8.1
-5.9.0
-5.9.1
-5.9.2
-5.10.0
+5.9.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.10.0.springboot3-SNAPSHOT</version>
+		<version>5.9.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

@@ -28,7 +28,4 @@
 5.7.1
 5.8.0
 5.8.1
-5.9.0
-5.9.1
-5.9.2
-5.10.0
+5.9.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.10.0.springboot3-SNAPSHOT</version>
+		<version>5.9.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

@@ -17,12 +17,13 @@ import com.jeesite.common.shiro.realm.BaseAuthorizingRealm;
 import com.jeesite.common.utils.SpringUtils;
 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 com.jeesite.modules.sys.entity.Log;
+import com.jeesite.modules.sys.entity.Role;
+import com.jeesite.modules.sys.entity.User;
+import com.jeesite.modules.sys.utils.CorpUtils;
+import com.jeesite.modules.sys.utils.LogUtils;
+import com.jeesite.modules.sys.utils.UserUtils;
+import com.jeesite.modules.sys.utils.ValidCodeUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.authc.IncorrectCredentialsException;
@@ -36,6 +37,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;
@@ -419,8 +424,8 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica
 			Global.setLang((String)paramMap.get("lang"), request, response);
 		}
 		data.put("demoMode", Global.isDemoMode());
-		data.put("useCorpModel", Global.isUseCorpModel());
-		data.put("loginCodeCorpUnique", Global.getConfigToBoolean("user.loginCodeCorpUnique", "false"));
+		data.put("useCorpModel", Global.isUseCorpModel()
+				&& Global.getConfigToBoolean("user.loginCodeCorpUnique", "false"));
 		data.put("title", Global.getProperty("productName"));
 		data.put("company", Global.getProperty("companyName"));
 		data.put("version", Global.getProperty("productVersion"));
@@ -447,7 +452,6 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica
 		data.put("msgEnabled", Global.getPropertyToBoolean("msg.enabled", "false"));
 		data.put("sysCode", session.getAttribute("sysCode"));
 		data.put("roleCode", session.getAttribute("roleCode"));
-		data.put("postCode", session.getAttribute("postCode"));
 		data.put("title", Global.getProperty("productName"));
 		data.put("company", Global.getProperty("companyName"));
 		data.put("version", Global.getProperty("productVersion"));
@@ -467,21 +471,6 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica
 			}
 		}
 		data.put("roleList", roleList);
-		List<Map<String, Object>> postList = ListUtils.newArrayList();
-		if (Global.getConfigToBoolean("user.postRolePermi", "false")
-				&& User.USER_TYPE_EMPLOYEE.equals(user.getUserType())) {
-			Employee employee = user.getRefObj();
-			for (EmployeePost ep : EmpUtils.getEmployeePostList(employee.getEmpCode())){
-				Post post = ep.getPost();
-				if (post != null) {
-					Map<String, Object> postMap = MapUtils.newHashMap();
-					postMap.put("postCode", post.getPostCode());
-					postMap.put("postName", post.getPostName());
-					postList.add(postMap);
-				}
-			}
-		}
-		data.put("postList", postList);
 		data.put("desktopUrl", desktopUrl != null ? desktopUrl : Global.getConfig("sys.index.desktopUrl"));
 		return data;
 	}

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;
 
 /**
@@ -25,7 +25,7 @@ import java.io.IOException;
  * @version 2017年11月30日
  */
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnProperty(name={"state.enabled","state.druid"}, havingValue="true", matchIfMissing=true)
+@ConditionalOnProperty(name="state.enabled", havingValue="true", matchIfMissing=true)
 public class DruidStatConfig {
 
 	/**
@@ -43,7 +43,7 @@ public class DruidStatConfig {
 		bean.addUrlPatterns("/*");
 		return bean;
 	}
-
+	
 	/**
 	 * 注册DruidServlet
 	 */

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;
 
@@ -35,7 +35,7 @@ public class FileUploadController extends BaseController {
 
 	@Autowired
 	private FileUploadService fileUploadService;
-	
+
 	/**
 	 * 上传文件参数
 	 */
@@ -53,7 +53,7 @@ public class FileUploadController extends BaseController {
 		model.put("imageMaxHeight", Global.getConfigToInteger("file.imageMaxHeight", "768"));
 		return model;
 	}
-	
+
 	/**
 	 * 上传文件
 	 */
@@ -62,14 +62,14 @@ public class FileUploadController extends BaseController {
 	public Map<String, Object> uploadFile(FileUploadParams params) {
 		return fileUploadService.uploadFile(new FileUpload(), params);
 	}
-	
+
 	/**
 	 * 下载文件
 	 */
 	@RequestMapping(value = "/download/{fileUploadId}")
 	public String downloadFile(@PathVariable("fileUploadId") String fileUploadId, String preview, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 		FileUpload fileUpload = fileUploadService.getFile(new FileUpload(fileUploadId));
-		return fileUploadService.downloadFile(fileUpload, preview, "file", request, response);
+		return fileUploadService.downloadFile(fileUpload, preview, 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,11 +29,11 @@ import java.io.IOException;
  */
 @Controller
 @ConditionalOnProperty(name="file.isFileStreamDown", havingValue="true", matchIfMissing=true)
-@Hidden
+@ApiIgnore
 public class UserfilesController extends BaseController {
 
 	@RequestMapping(value="/userfiles/**")
-	public String fileStreamDown(HttpServletRequest request, HttpServletResponse response) 
+	public String fileStreamDown(HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
 
 		// 获取相对文件地址
@@ -49,8 +49,7 @@ public class UserfilesController extends BaseController {
 			String uid = request.getParameter("uid");
 			if (StringUtils.isNotBlank(url) && StringUtils.isNotBlank(uid)){
 				fileUrl = url; //EncodeUtils.decodeUrl(url); 不用解码，否则腾讯云存储的时候预览不能显示
-				String type = StringUtils.defaultIfBlank(request.getParameter("type"), "file");
-				fileUri = Global.getCtxPath() + Global.getAdminPath() + "/" + type + "/download/" + uid;
+				fileUri = Global.getCtxPath() + Global.getAdminPath() + "/file/download/" + uid;
 				filePath = fileName;
 			} else if (StringUtils.isNotBlank(fileName)){
 				fileUri += "?fileName=" + EncodeUtils.encodeUrl(fileName);
@@ -59,9 +58,7 @@ public class UserfilesController extends BaseController {
 			request.setAttribute("fileUrl", fileUrl);	// 文件访问地址
 			request.setAttribute("fileUri", fileUri);	// 文件下载地址（fileDown）
 			request.setAttribute("filePath", filePath);	// 文件相对路径或文件名
-			request.setAttribute("fileUrls", request.getParameter("urls"));		// 文件地址列表
-			request.setAttribute("fileNames", request.getParameter("names"));	// 文件名称列表
-			request.setAttribute("imageFlag", request.getParameter("image"));	// 是否图片控件
+			request.setAttribute("fileUrls", request.getParameter("urls"));	// 前后照片列表
 			request.setAttribute(RequestDispatcher.FORWARD_REQUEST_URI, previewUrl);
 			request.getRequestDispatcher(previewUrl).forward(request, response);
 			return null;

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