From 023743bbe9f837069db9b838b4f2817bbce05a5a Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 23 Jun 2023 18:30:23 +0800 Subject: [PATCH] =?UTF-8?q?import=20javax.servlet.=20=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E4=B8=BA=20import=20jakarta.servlet.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeesite/common/codec/EncodeUtils.java | 2 +- .../java/com/jeesite/common/io/FileUtils.java | 6 +++--- .../com/jeesite/common/lang/ExceptionUtils.java | 2 +- .../java/com/jeesite/common/network/IpUtils.java | 2 +- .../jeesite/common/utils/excel/ExcelExport.java | 2 +- .../java/com/jeesite/common/web/CookieUtils.java | 6 +++--- .../jeesite/common/web/http/ServletUtils.java | 6 +++--- .../jeesite/common/web/http/UserAgentUtils.java | 2 +- .../modules/app/web/AppCommentController.java | 4 ++-- .../modules/app/web/AppUpgradeController.java | 4 ++-- .../com/jeesite/modules/cms/utils/CmsUtils.java | 2 +- .../modules/cms/web/ArticleController.java | 4 ++-- .../modules/cms/web/CommentController.java | 4 ++-- .../modules/cms/web/ReportController.java | 4 ++-- .../jeesite/modules/cms/web/SiteController.java | 4 ++-- .../modules/cmsfront/web/FrontController.java | 4 ++-- .../cmsfront/web/FrontSearchController.java | 4 ++-- .../jeesite/common/shiro/filter/CasFilter.java | 8 ++++---- .../jeesite/common/shiro/filter/FormFilter.java | 8 ++++---- .../jeesite/common/shiro/filter/InnerFilter.java | 6 +++--- .../jeesite/common/shiro/filter/LdapFilter.java | 4 ++-- .../common/shiro/filter/LogoutFilter.java | 8 ++++---- .../common/shiro/filter/PermissionsFilter.java | 8 ++++---- .../jeesite/common/shiro/filter/RolesFilter.java | 4 ++-- .../jeesite/common/shiro/filter/UserFilter.java | 4 ++-- .../common/shiro/realm/AuthorizingRealm.java | 2 +- .../common/shiro/realm/CasAuthorizingRealm.java | 2 +- .../common/shiro/realm/LdapAuthorizingRealm.java | 2 +- .../com/jeesite/common/ueditor/ActionEnter.java | 2 +- .../com/jeesite/common/ueditor/PathFormat.java | 2 +- .../common/ueditor/hunter/FileManager.java | 2 +- .../common/ueditor/hunter/ImageHunter.java | 2 +- .../common/ueditor/upload/Base64Uploader.java | 2 +- .../common/ueditor/upload/BinaryUploader.java | 2 +- .../jeesite/common/ueditor/upload/Uploader.java | 2 +- .../com/jeesite/modules/config/ShiroConfig.java | 2 +- .../modules/config/web/DruidStatConfig.java | 6 +++--- .../modules/config/web/SchemeHttpsConfig.java | 16 ++++++++-------- .../modules/file/web/UeditorController.java | 4 ++-- .../modules/msg/web/MsgInnerController.java | 4 ++-- .../modules/sys/interceptor/LogInterceptor.java | 4 ++-- .../sys/interceptor/MobileInterceptor.java | 4 ++-- .../com/jeesite/modules/sys/utils/LogUtils.java | 2 +- .../modules/sys/web/AccountController.java | 4 ++-- .../jeesite/modules/sys/web/AreaController.java | 4 ++-- .../modules/sys/web/CompanyController.java | 2 +- .../jeesite/modules/sys/web/LogController.java | 4 ++-- .../jeesite/modules/sys/web/LoginController.java | 4 ++-- .../modules/sys/web/OfficeController.java | 2 +- .../modules/sys/web/OnlineController.java | 4 ++-- .../jeesite/modules/sys/web/PostController.java | 4 ++-- .../jeesite/modules/sys/web/SsoController.java | 4 ++-- .../sys/web/user/CorpAdminController.java | 4 ++-- .../modules/sys/web/user/EmpUserController.java | 4 ++-- .../modules/sys/web/user/SecAdminController.java | 4 ++-- .../modules/sys/web/user/UserController.java | 4 ++-- .../templates/modules/gen/crud/controller.xml | 4 ++-- .../modules/gen/crud_cloud/controller.xml | 4 ++-- .../templates/modules/gen/query/controller.xml | 4 ++-- .../modules/test/web/TestDataController.java | 4 ++-- .../modules/test/web/TestDataController.java | 4 ++-- .../modules/test/web/TestDataController.java | 4 ++-- 62 files changed, 123 insertions(+), 123 deletions(-) diff --git a/common/src/main/java/com/jeesite/common/codec/EncodeUtils.java b/common/src/main/java/com/jeesite/common/codec/EncodeUtils.java index ab0a8ba6..d500e9df 100644 --- a/common/src/main/java/com/jeesite/common/codec/EncodeUtils.java +++ b/common/src/main/java/com/jeesite/common/codec/EncodeUtils.java @@ -16,7 +16,7 @@ import org.apache.commons.text.StringEscapeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; diff --git a/common/src/main/java/com/jeesite/common/io/FileUtils.java b/common/src/main/java/com/jeesite/common/io/FileUtils.java index 93a2b386..4db858e4 100644 --- a/common/src/main/java/com/jeesite/common/io/FileUtils.java +++ b/common/src/main/java/com/jeesite/common/io/FileUtils.java @@ -15,9 +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 jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.*; import java.util.Enumeration; import java.util.List; diff --git a/common/src/main/java/com/jeesite/common/lang/ExceptionUtils.java b/common/src/main/java/com/jeesite/common/lang/ExceptionUtils.java index 5e167b2a..3330c994 100644 --- a/common/src/main/java/com/jeesite/common/lang/ExceptionUtils.java +++ b/common/src/main/java/com/jeesite/common/lang/ExceptionUtils.java @@ -8,7 +8,7 @@ package com.jeesite.common.lang; import java.io.PrintWriter; import java.io.StringWriter; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 关于异常的工具类. diff --git a/common/src/main/java/com/jeesite/common/network/IpUtils.java b/common/src/main/java/com/jeesite/common/network/IpUtils.java index 969f17ee..096386d5 100644 --- a/common/src/main/java/com/jeesite/common/network/IpUtils.java +++ b/common/src/main/java/com/jeesite/common/network/IpUtils.java @@ -4,7 +4,7 @@ import com.jeesite.common.codec.EncodeUtils; import com.jeesite.common.io.PropertiesUtils; import com.jeesite.common.lang.StringUtils; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class IpUtils { diff --git a/common/src/main/java/com/jeesite/common/utils/excel/ExcelExport.java b/common/src/main/java/com/jeesite/common/utils/excel/ExcelExport.java index 6062530e..2a321a01 100644 --- a/common/src/main/java/com/jeesite/common/utils/excel/ExcelExport.java +++ b/common/src/main/java/com/jeesite/common/utils/excel/ExcelExport.java @@ -23,7 +23,7 @@ import org.apache.poi.xssf.usermodel.XSSFRichTextString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.*; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/common/src/main/java/com/jeesite/common/web/CookieUtils.java b/common/src/main/java/com/jeesite/common/web/CookieUtils.java index 2a0cb6be..38944263 100644 --- a/common/src/main/java/com/jeesite/common/web/CookieUtils.java +++ b/common/src/main/java/com/jeesite/common/web/CookieUtils.java @@ -8,9 +8,9 @@ import com.jeesite.common.codec.EncodeUtils; import com.jeesite.common.io.PropertiesUtils; import com.jeesite.common.lang.StringUtils; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Cookie工具类 diff --git a/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java b/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java index 91d14f61..3c8d2752 100644 --- a/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java +++ b/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java @@ -17,9 +17,9 @@ import org.springframework.http.MediaType; 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 jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.*; import java.util.Map.Entry; diff --git a/common/src/main/java/com/jeesite/common/web/http/UserAgentUtils.java b/common/src/main/java/com/jeesite/common/web/http/UserAgentUtils.java index b2558586..31684480 100644 --- a/common/src/main/java/com/jeesite/common/web/http/UserAgentUtils.java +++ b/common/src/main/java/com/jeesite/common/web/http/UserAgentUtils.java @@ -4,7 +4,7 @@ */ package com.jeesite.common.web.http; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import eu.bitwalker.useragentutils.Browser; import eu.bitwalker.useragentutils.DeviceType; diff --git a/modules/app/src/main/java/com/jeesite/modules/app/web/AppCommentController.java b/modules/app/src/main/java/com/jeesite/modules/app/web/AppCommentController.java index 9a5c97ef..02004696 100644 --- a/modules/app/src/main/java/com/jeesite/modules/app/web/AppCommentController.java +++ b/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 javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/modules/app/src/main/java/com/jeesite/modules/app/web/AppUpgradeController.java b/modules/app/src/main/java/com/jeesite/modules/app/web/AppUpgradeController.java index 2d5d4aaa..cbf10788 100644 --- a/modules/app/src/main/java/com/jeesite/modules/app/web/AppUpgradeController.java +++ b/modules/app/src/main/java/com/jeesite/modules/app/web/AppUpgradeController.java @@ -4,8 +4,8 @@ */ package com.jeesite.modules.app.web; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/utils/CmsUtils.java b/modules/cms/src/main/java/com/jeesite/modules/cms/utils/CmsUtils.java index b6ab6d04..9a9c6c6c 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/utils/CmsUtils.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/utils/CmsUtils.java @@ -20,7 +20,7 @@ import com.jeesite.modules.cms.service.CategoryService; import com.jeesite.modules.cms.service.SiteService; import org.springframework.ui.Model; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/web/ArticleController.java b/modules/cms/src/main/java/com/jeesite/modules/cms/web/ArticleController.java index 333cb150..ea60f44d 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/web/ArticleController.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/web/ArticleController.java @@ -27,8 +27,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/web/CommentController.java b/modules/cms/src/main/java/com/jeesite/modules/cms/web/CommentController.java index 55e5088b..76174747 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/web/CommentController.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/web/CommentController.java @@ -4,8 +4,8 @@ */ package com.jeesite.modules.cms.web; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/web/ReportController.java b/modules/cms/src/main/java/com/jeesite/modules/cms/web/ReportController.java index 57e8d9aa..5776ba42 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/web/ReportController.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/web/ReportController.java @@ -4,8 +4,8 @@ */ package com.jeesite.modules.cms.web; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/web/SiteController.java b/modules/cms/src/main/java/com/jeesite/modules/cms/web/SiteController.java index 108599cc..51c309ec 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/web/SiteController.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/web/SiteController.java @@ -24,8 +24,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java b/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java index 9f0de521..6a0330cf 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java @@ -21,8 +21,8 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Date; import java.util.List; diff --git a/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontSearchController.java b/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontSearchController.java index 21955790..c1cd4d18 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontSearchController.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontSearchController.java @@ -6,8 +6,8 @@ package com.jeesite.modules.cmsfront.web; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/CasFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/CasFilter.java index ac33e7a5..9cd465c3 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/CasFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/CasFilter.java @@ -14,10 +14,10 @@ import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.subject.Subject; import org.apache.shiro.web.util.WebUtils; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * CAS过滤器 diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java index 8a3b0abc..67b653f9 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java @@ -37,10 +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 jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/InnerFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/InnerFilter.java index 5ce26a8b..bd2ced20 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/InnerFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/InnerFilter.java @@ -8,9 +8,9 @@ import com.jeesite.common.config.Global; import com.jeesite.common.lang.StringUtils; import org.apache.shiro.web.filter.AccessControlFilter; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; /** * 内部系统访问过滤器 diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/LdapFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/LdapFilter.java index e2347fe0..41ba4fb4 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/LdapFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/LdapFilter.java @@ -6,8 +6,8 @@ package com.jeesite.common.shiro.filter; import java.util.Map; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import org.apache.shiro.authc.AuthenticationToken; diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/LogoutFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/LogoutFilter.java index 551301f4..2c47355d 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/LogoutFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/LogoutFilter.java @@ -4,10 +4,10 @@ */ package com.jeesite.common.shiro.filter; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.session.SessionException; diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/PermissionsFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/PermissionsFilter.java index 153e69dd..945c1fcc 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/PermissionsFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/PermissionsFilter.java @@ -6,10 +6,10 @@ package com.jeesite.common.shiro.filter; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +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; diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/RolesFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/RolesFilter.java index 7b0b5b9d..b713f5aa 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/RolesFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/RolesFilter.java @@ -6,8 +6,8 @@ package com.jeesite.common.shiro.filter; import java.io.IOException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; /** * 角色权限过滤器 diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/UserFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/UserFilter.java index 8c5f9dc0..289803d1 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/UserFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/UserFilter.java @@ -6,8 +6,8 @@ package com.jeesite.common.shiro.filter; import java.io.IOException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; /** * 用户权限过滤器 diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java b/modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java index 2b613b0f..d8e6318f 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java @@ -17,7 +17,7 @@ import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationToken; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 系统认证授权实现类 diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java b/modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java index ab67fa10..38177e98 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java @@ -30,7 +30,7 @@ import org.jasig.cas.client.validation.TicketValidationException; import org.jasig.cas.client.validation.TicketValidator; import org.springframework.beans.factory.NoSuchBeanDefinitionException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.validation.ValidationException; import java.util.Map; diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/realm/LdapAuthorizingRealm.java b/modules/core/src/main/java/com/jeesite/common/shiro/realm/LdapAuthorizingRealm.java index d14c5f07..d468ff88 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/realm/LdapAuthorizingRealm.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/realm/LdapAuthorizingRealm.java @@ -7,7 +7,7 @@ package com.jeesite.common.shiro.realm; import javax.naming.AuthenticationNotSupportedException; import javax.naming.NamingException; import javax.naming.ldap.LdapContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; diff --git a/modules/core/src/main/java/com/jeesite/common/ueditor/ActionEnter.java b/modules/core/src/main/java/com/jeesite/common/ueditor/ActionEnter.java index 3804e7f3..f884d791 100644 --- a/modules/core/src/main/java/com/jeesite/common/ueditor/ActionEnter.java +++ b/modules/core/src/main/java/com/jeesite/common/ueditor/ActionEnter.java @@ -2,7 +2,7 @@ package com.jeesite.common.ueditor; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import com.jeesite.common.config.Global; import com.jeesite.common.ueditor.define.ActionMap; diff --git a/modules/core/src/main/java/com/jeesite/common/ueditor/PathFormat.java b/modules/core/src/main/java/com/jeesite/common/ueditor/PathFormat.java index 6eedaed1..86a89f7b 100644 --- a/modules/core/src/main/java/com/jeesite/common/ueditor/PathFormat.java +++ b/modules/core/src/main/java/com/jeesite/common/ueditor/PathFormat.java @@ -5,7 +5,7 @@ import java.util.Date; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; diff --git a/modules/core/src/main/java/com/jeesite/common/ueditor/hunter/FileManager.java b/modules/core/src/main/java/com/jeesite/common/ueditor/hunter/FileManager.java index c9ce3718..436b68f0 100644 --- a/modules/core/src/main/java/com/jeesite/common/ueditor/hunter/FileManager.java +++ b/modules/core/src/main/java/com/jeesite/common/ueditor/hunter/FileManager.java @@ -5,7 +5,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.io.FileUtils; diff --git a/modules/core/src/main/java/com/jeesite/common/ueditor/hunter/ImageHunter.java b/modules/core/src/main/java/com/jeesite/common/ueditor/hunter/ImageHunter.java index 2ac577b2..99a0223e 100644 --- a/modules/core/src/main/java/com/jeesite/common/ueditor/hunter/ImageHunter.java +++ b/modules/core/src/main/java/com/jeesite/common/ueditor/hunter/ImageHunter.java @@ -8,7 +8,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.io.IOUtils; diff --git a/modules/core/src/main/java/com/jeesite/common/ueditor/upload/Base64Uploader.java b/modules/core/src/main/java/com/jeesite/common/ueditor/upload/Base64Uploader.java index e09e4daf..f4b10ef5 100644 --- a/modules/core/src/main/java/com/jeesite/common/ueditor/upload/Base64Uploader.java +++ b/modules/core/src/main/java/com/jeesite/common/ueditor/upload/Base64Uploader.java @@ -2,7 +2,7 @@ package com.jeesite.common.ueditor.upload; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.codec.binary.Base64; diff --git a/modules/core/src/main/java/com/jeesite/common/ueditor/upload/BinaryUploader.java b/modules/core/src/main/java/com/jeesite/common/ueditor/upload/BinaryUploader.java index c540a807..3c850eb8 100644 --- a/modules/core/src/main/java/com/jeesite/common/ueditor/upload/BinaryUploader.java +++ b/modules/core/src/main/java/com/jeesite/common/ueditor/upload/BinaryUploader.java @@ -8,7 +8,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; diff --git a/modules/core/src/main/java/com/jeesite/common/ueditor/upload/Uploader.java b/modules/core/src/main/java/com/jeesite/common/ueditor/upload/Uploader.java index a7e15259..efddf17d 100644 --- a/modules/core/src/main/java/com/jeesite/common/ueditor/upload/Uploader.java +++ b/modules/core/src/main/java/com/jeesite/common/ueditor/upload/Uploader.java @@ -2,7 +2,7 @@ package com.jeesite.common.ueditor.upload; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import com.jeesite.common.ueditor.define.State; diff --git a/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java index 8b7df4d2..1cb88e8e 100644 --- a/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java +++ b/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java @@ -7,7 +7,7 @@ package com.jeesite.modules.config; import java.util.Collection; import java.util.Map; -import javax.servlet.Filter; +import jakarta.servlet.Filter; import org.apache.shiro.cache.CacheManager; import org.apache.shiro.cas.CasSubjectFactory; diff --git a/modules/core/src/main/java/com/jeesite/modules/config/web/DruidStatConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/web/DruidStatConfig.java index 2f06b8c0..a32eb839 100644 --- a/modules/core/src/main/java/com/jeesite/modules/config/web/DruidStatConfig.java +++ b/modules/core/src/main/java/com/jeesite/modules/config/web/DruidStatConfig.java @@ -14,9 +14,9 @@ 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 jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/modules/core/src/main/java/com/jeesite/modules/config/web/SchemeHttpsConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/web/SchemeHttpsConfig.java index 4ec9bb22..49cf5a6d 100644 --- a/modules/core/src/main/java/com/jeesite/modules/config/web/SchemeHttpsConfig.java +++ b/modules/core/src/main/java/com/jeesite/modules/config/web/SchemeHttpsConfig.java @@ -6,14 +6,14 @@ package com.jeesite.modules.config.web; import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/modules/core/src/main/java/com/jeesite/modules/file/web/UeditorController.java b/modules/core/src/main/java/com/jeesite/modules/file/web/UeditorController.java index 5d9316f6..498aa51a 100644 --- a/modules/core/src/main/java/com/jeesite/modules/file/web/UeditorController.java +++ b/modules/core/src/main/java/com/jeesite/modules/file/web/UeditorController.java @@ -4,8 +4,8 @@ */ package com.jeesite.modules.file.web; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Controller; diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/web/MsgInnerController.java b/modules/core/src/main/java/com/jeesite/modules/msg/web/MsgInnerController.java index cee559e2..3556c1ff 100644 --- a/modules/core/src/main/java/com/jeesite/modules/msg/web/MsgInnerController.java +++ b/modules/core/src/main/java/com/jeesite/modules/msg/web/MsgInnerController.java @@ -4,8 +4,8 @@ */ package com.jeesite.modules.msg.web; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java b/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java index bf2dc8d7..cc00d7a6 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java @@ -4,8 +4,8 @@ */ package com.jeesite.modules.sys.interceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.MDC; import org.springframework.core.NamedThreadLocal; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/MobileInterceptor.java b/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/MobileInterceptor.java index ec7e13f6..c0906e16 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/MobileInterceptor.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/MobileInterceptor.java @@ -4,8 +4,8 @@ */ package com.jeesite.modules.sys.interceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java b/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java index ddd82a07..808dbf34 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java +++ b/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 javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.lang.reflect.Method; import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/AccountController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/AccountController.java index 77b7352c..b9fd0dc7 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/AccountController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/AccountController.java @@ -7,8 +7,8 @@ package com.jeesite.modules.sys.web; import java.util.Date; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.shiro.authc.AuthenticationException; import org.springframework.beans.factory.annotation.Autowired; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java index 20a4ef46..3e81e069 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java @@ -28,8 +28,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java index ddfca632..c691282b 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java @@ -27,7 +27,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 jakarta.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LogController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LogController.java index bf0f6257..00163681 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LogController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LogController.java @@ -4,8 +4,8 @@ */ package com.jeesite.modules.sys.web; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.swagger.annotations.Api; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java index c5d76f76..0440d670 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java @@ -31,8 +31,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java index aef958a9..05b4e056 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java @@ -7,7 +7,7 @@ package com.jeesite.modules.sys.web; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import io.swagger.annotations.Api; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java index c338a1ea..b5df6ea4 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java @@ -10,8 +10,8 @@ import java.util.Comparator; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.swagger.annotations.Api; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java index 2459f2f2..2339644b 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java @@ -25,8 +25,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/SsoController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/SsoController.java index 7d4d92c0..12f7b663 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/SsoController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/SsoController.java @@ -23,8 +23,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 单点登录Controller diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java index d84ed8f0..a870865f 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java @@ -7,8 +7,8 @@ package com.jeesite.modules.sys.web.user; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.swagger.annotations.Api; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java index 67b21fc4..df2e1e43 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java @@ -7,8 +7,8 @@ package com.jeesite.modules.sys.web.user; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.swagger.annotations.Api; import org.apache.shiro.authz.annotation.Logical; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java index e7bd0361..01321bd4 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java @@ -6,8 +6,8 @@ package com.jeesite.modules.sys.web.user; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.swagger.annotations.Api; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java index efa533e5..33591097 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java @@ -4,8 +4,8 @@ */ package com.jeesite.modules.sys.web.user; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml index d95c69c7..ff6a7e8a 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml @@ -13,8 +13,8 @@ import java.util.Map; <% } %> import java.util.List; <% if (!table.isTreeEntity || toBoolean(table.optionMap['isImportExport'])){ %> -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; <% } %> import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml index 3f02048e..a5f82a45 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml @@ -13,8 +13,8 @@ import java.util.Map; <% } %> import java.util.List; <% if (!table.isTreeEntity || toBoolean(table.optionMap['isImportExport'])){ %> -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; <% } %> import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml index b3a89158..59385d65 100644 --- a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml +++ b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml @@ -12,8 +12,8 @@ package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModul import java.util.List; import java.util.Map; <% }else{ %> -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; <% } %> import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/web-api/src/main/java/com/jeesite/modules/test/web/TestDataController.java b/web-api/src/main/java/com/jeesite/modules/test/web/TestDataController.java index 3eb3fb8d..35b4077f 100644 --- a/web-api/src/main/java/com/jeesite/modules/test/web/TestDataController.java +++ b/web-api/src/main/java/com/jeesite/modules/test/web/TestDataController.java @@ -6,8 +6,8 @@ package com.jeesite.modules.test.web; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; diff --git a/web-fast/src/main/java/com/jeesite/modules/test/web/TestDataController.java b/web-fast/src/main/java/com/jeesite/modules/test/web/TestDataController.java index 3eb3fb8d..35b4077f 100644 --- a/web-fast/src/main/java/com/jeesite/modules/test/web/TestDataController.java +++ b/web-fast/src/main/java/com/jeesite/modules/test/web/TestDataController.java @@ -6,8 +6,8 @@ package com.jeesite.modules.test.web; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; diff --git a/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java b/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java index f51c2ffc..6d353947 100644 --- a/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java +++ b/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java @@ -21,8 +21,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /**