From b4fa11a605b73e9d3de0054d95c62d9720873e12 Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Thu, 16 Oct 2025 10:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90sa-token=E3=80=91=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E5=92=8C=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?token=E6=9C=89=E6=95=88=E7=9A=84API=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/common/aspect/AutoLogAspect.java | 2 +- .../exception/JeecgBootExceptionHandler.java | 2 +- .../base/controller/JeecgController.java | 6 ++-- .../org/jeecg/common/system/util/JwtUtil.java | 2 -- .../jeecg/config/filter/WebsocketFilter.java | 7 +---- .../interceptor/LowCodeModeInterceptor.java | 2 +- .../config/mybatis/MybatisInterceptor.java | 2 +- .../service/impl/BaseCommonServiceImpl.java | 2 +- .../service/impl/AiragChatServiceImpl.java | 2 +- .../controller/JeecgOrderMainController.java | 6 +--- .../service/impl/JeecgDemoServiceImpl.java | 2 +- .../jimureport/JimuReportTokenService.java | 2 +- .../modules/aop/TenantPackUserLogAspect.java | 2 +- .../controller/QuartzJobController.java | 3 +- .../controller/SysAnnouncementController.java | 10 +++---- .../SysAnnouncementSendController.java | 6 ++-- .../controller/SysCategoryController.java | 2 +- .../controller/SysCommentController.java | 2 +- .../controller/SysDepartController.java | 8 ++--- .../SysDepartPermissionController.java | 3 +- .../controller/SysDepartRoleController.java | 3 +- .../system/controller/SysDictController.java | 2 +- .../controller/SysPositionController.java | 2 +- .../system/controller/SysRoleController.java | 11 +++---- .../controller/SysTenantController.java | 30 +++++++++---------- .../system/controller/SysUserController.java | 15 +++++----- .../system/controller/ThirdAppController.java | 4 +-- .../controller/ThirdLoginController.java | 2 +- .../modules/system/entity/SysDataLog.java | 2 +- .../impl/SysAnnouncementServiceImpl.java | 8 ++--- .../system/service/impl/SysBaseApiImpl.java | 2 +- .../service/impl/SysDepartServiceImpl.java | 2 +- .../impl/SysTenantPackServiceImpl.java | 3 +- .../service/impl/SysTenantServiceImpl.java | 21 ++++++------- .../impl/SysThirdAccountServiceImpl.java | 2 +- .../impl/SysUserDepartServiceImpl.java | 6 ++-- .../service/impl/SysUserServiceImpl.java | 9 ++---- 37 files changed, 85 insertions(+), 112 deletions(-) diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java index 5a371dcda..5f8e42bd2 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java @@ -100,7 +100,7 @@ public class AutoLogAspect { //设置IP地址 dto.setIp(IpUtils.getIpAddr(request)); //获取登录用户信息 - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); if(sysUser!=null){ dto.setUserid(sysUser.getUsername()); dto.setUsername(sysUser.getRealname()); diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java index c88b843f7..c497d1510 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java @@ -267,7 +267,7 @@ public class JeecgBootExceptionHandler { //获取登录用户信息 - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); if(sysUser!=null){ log.setUserid(sysUser.getUsername()); log.setUsername(sysUser.getRealname()); diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java index 6a95f09cd..730e4ab8c 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java @@ -52,7 +52,7 @@ public class JeecgController> { protected ModelAndView exportXls(HttpServletRequest request, T object, Class clazz, String title) { // Step.1 组装查询条件 QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap()); - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); // 过滤选中数据 String selections = request.getParameter("selections"); @@ -90,7 +90,7 @@ public class JeecgController> { protected ModelAndView exportXlsSheet(HttpServletRequest request, T object, Class clazz, String title,String exportFields,Integer pageNum) { // Step.1 组装查询条件 QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap()); - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); // Step.2 计算分页sheet数据 double total = service.count(); int count = (int)Math.ceil(total/pageNum); @@ -142,7 +142,7 @@ public class JeecgController> { protected ModelAndView exportXlsForBigData(HttpServletRequest request, T object, Class clazz, String title,Integer pageSize) { // 组装查询条件 QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap()); - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); // 计算分页数 double total = service.count(); int count = (int) Math.ceil(total / pageSize); diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java index 718580cd1..d06755d04 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java @@ -16,13 +16,11 @@ import java.util.stream.Collectors; import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; -import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.DataBaseConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.constant.TenantConstant; diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java index b9a788e4c..5fbbf4519 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java @@ -24,23 +24,18 @@ public class WebsocketFilter implements Filter { private static CommonAPI commonApi; - private static RedisUtil redisUtil; - @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { if (commonApi == null) { commonApi = SpringContextUtils.getBean(CommonAPI.class); } - if (redisUtil == null) { - redisUtil = SpringContextUtils.getBean(RedisUtil.class); - } HttpServletRequest request = (HttpServletRequest)servletRequest; String token = request.getHeader(TOKEN_KEY); log.debug("Websocket连接 Token安全校验，Path = {}，token:{}", request.getRequestURI(), token); try { - TokenUtils.verifyToken(token, commonApi, redisUtil); + TokenUtils.verifyToken(token, commonApi); } catch (Exception exception) { //log.error("Websocket连接 Token安全校验失败，IP:{}, Token:{}, Path = {}，异常：{}", oConvertUtils.getIpAddrByRequest(request), token, request.getRequestURI(), exception.getMessage()); log.debug("Websocket连接 Token安全校验失败，IP:{}, Token:{}, Path = {}，异常：{}", oConvertUtils.getIpAddrByRequest(request), token, request.getRequestURI(), exception.getMessage()); diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeInterceptor.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeInterceptor.java index 2519814db..dfa45c54e 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeInterceptor.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeInterceptor.java @@ -68,7 +68,7 @@ public class LowCodeModeInterceptor implements HandlerInterceptor { if (jeecgBaseConfig.getFirewall()!=null && LowCodeModeInterceptor.LOW_CODE_MODE_PROD.equals(jeecgBaseConfig.getFirewall().getLowCodeMode())) { String requestURI = request.getRequestURI().substring(request.getContextPath().length()); log.info("低代码模式，拦截请求路径：" + requestURI); - LoginUser loginUser = LoginUserUtils.getLoginUser(); + LoginUser loginUser = LoginUserUtils.getSessionUser(); Set hasRoles = null; if (loginUser == null) { loginUser = commonAPI.getUserByName(JwtUtil.getUserNameByToken(SpringContextUtils.getHttpServletRequest())); diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java index 6828efa93..f3837b7b6 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java @@ -192,7 +192,7 @@ public class MybatisInterceptor implements Interceptor { private LoginUser getLoginUser() { LoginUser sysUser = null; try { - sysUser = LoginUserUtils.getLoginUser() != null ? LoginUserUtils.getLoginUser() : null; + sysUser = LoginUserUtils.getSessionUser() != null ? LoginUserUtils.getSessionUser() : null; } catch (Exception e) { //e.printStackTrace(); sysUser = null; diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java index 58d4ac926..e7e642fe1 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java @@ -74,7 +74,7 @@ public class BaseCommonServiceImpl implements BaseCommonService { //获取登录用户信息 if(user==null){ try { - user = LoginUserUtils.getLoginUser(); + user = LoginUserUtils.getSessionUser(); } catch (Exception e) { //e.printStackTrace(); } diff --git a/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/impl/AiragChatServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/impl/AiragChatServiceImpl.java index 6fff5d99e..542d8308e 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/impl/AiragChatServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/impl/AiragChatServiceImpl.java @@ -1081,7 +1081,7 @@ public class AiragChatServiceImpl implements IAiragChatService { } else { token = TokenUtils.getTokenByRequest(); } - if (TokenUtils.verifyToken(token, sysBaseApi, redisUtil)) { + if (TokenUtils.verifyToken(token, sysBaseApi)) { return JwtUtil.getUsername(token); } } catch (Exception e) { diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java index c71abc6ff..be4130bac 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java @@ -13,12 +13,9 @@ import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.LoginUserUtils; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.demo.test.entity.JeecgDemo; import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer; import org.jeecg.modules.demo.test.entity.JeecgOrderMain; import org.jeecg.modules.demo.test.entity.JeecgOrderTicket; -import org.jeecg.modules.demo.test.service.IJeecgDemoService; import org.jeecg.modules.demo.test.service.IJeecgOrderCustomerService; import org.jeecg.modules.demo.test.service.IJeecgOrderMainService; import org.jeecg.modules.demo.test.service.IJeecgOrderTicketService; @@ -33,7 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -184,7 +180,7 @@ public class JeecgOrderMainController extends JeecgController pageList = new ArrayList(); diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java index 4cb351592..f465750f1 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java @@ -97,7 +97,7 @@ public class JeecgDemoServiceImpl extends ServiceImpl noAuthList = new ArrayList<>(); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java index 3fe54d1ad..059dc2d21 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java @@ -56,7 +56,7 @@ public class JimuReportTokenService implements JmReportTokenServiceI { @Override public Boolean verifyToken(String token) { - return TokenUtils.verifyToken(token, sysBaseApi, redisUtil); + return TokenUtils.verifyToken(token, sysBaseApi); } @Override diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java index 6cd49479b..fbbf6a393 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java @@ -79,7 +79,7 @@ public class TenantPackUserLogAspect { dto.setOperateType(opType); dto.setTenantId(tenantId); //获取登录用户信息 - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); if(sysUser!=null){ dto.setUserid(sysUser.getUsername()); dto.setUsername(sysUser.getRealname()); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java index 462d3b189..78ebdafc0 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java @@ -8,7 +8,6 @@ import io.swagger.v3.oas.annotations.Operation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.util.LoginUserUtils; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaCheckRole; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; @@ -221,7 +220,7 @@ public class QuartzJobController { mv.addObject(NormalExcelConstants.CLASS, QuartzJob.class); //获取当前登录用户 //update-begin---author:wangshuai ---date:20211227 for：[JTC-116]导出人写死了------------ - LoginUser user = LoginUserUtils.getLoginUser(); + LoginUser user = LoginUserUtils.getSessionUser(); mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("定时任务列表数据", "导出人:"+user.getRealname(), "导出信息")); //update-end---author:wangshuai ---date:20211227 for：[JTC-116]导出人写死了------------ mv.addObject(NormalExcelConstants.DATA_LIST, pageList); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java index 62ee369a6..9c36d1f37 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java @@ -378,7 +378,7 @@ public class SysAnnouncementController { long start = System.currentTimeMillis(); Result> result = new Result>(); Map sysMsgMap = new HashMap(5); - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); String userId = sysUser.getId(); @@ -423,7 +423,7 @@ public class SysAnnouncementController { */ @RequestMapping(value = "/getUnreadMessageCount", method = RequestMethod.GET) public Result> getUnreadMessageCount(@RequestParam(required = false, defaultValue = "5") Integer pageSize, HttpServletRequest request) { - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); String userId = sysUser.getId(); // 获取上个月的第一天（只查近两个月的通知） @@ -466,7 +466,7 @@ public class SysAnnouncementController { //导出文件名称 mv.addObject(NormalExcelConstants.FILE_NAME, "系统通告列表"); mv.addObject(NormalExcelConstants.CLASS, SysAnnouncement.class); - LoginUser user = LoginUserUtils.getLoginUser(); + LoginUser user = LoginUserUtils.getSessionUser(); mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("系统通告列表数据", "导出人:"+user.getRealname(), "导出信息")); mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; @@ -567,7 +567,7 @@ public class SysAnnouncementController { boolean tokenOk = false; try { // 验证Token有效性 - tokenOk = TokenUtils.verifyToken(request, sysBaseApi, redisUtil); + tokenOk = TokenUtils.verifyToken(request, sysBaseApi); } catch (Exception ignored) { } // 判断是否传递了Token，并且Token有效，如果传了就不做查看限制，直接返回 @@ -643,7 +643,7 @@ public class SysAnnouncementController { JSONObject obj = new JSONObject(); obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER); - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); webSocket.sendMessage(sysUser.getId(), obj.toJSONString()); // 4、性能统计耗时 diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java index 435807dbc..9e56038e0 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java @@ -195,7 +195,7 @@ public class SysAnnouncementSendController { public Result editById(@RequestBody JSONObject json) { Result result = new Result(); String anntId = json.getString("anntId"); - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); String userId = sysUser.getId(); LambdaUpdateWrapper updateWrapper = new UpdateWrapper().lambda(); updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG); @@ -220,7 +220,7 @@ public class SysAnnouncementSendController { @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { Result> result = new Result>(); - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); String userId = sysUser.getId(); announcementSendModel.setUserId(userId); announcementSendModel.setPageNo((pageNo-1)*pageSize); @@ -247,7 +247,7 @@ public class SysAnnouncementSendController { @PutMapping(value = "/readAll") public Result readAll() { Result result = new Result(); - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); String userId = sysUser.getId(); LambdaUpdateWrapper updateWrapper = new UpdateWrapper().lambda(); updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java index 4ec5683f6..1ba712d18 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java @@ -237,7 +237,7 @@ public class SysCategoryController { //导出文件名称 mv.addObject(NormalExcelConstants.FILE_NAME, "分类字典列表"); mv.addObject(NormalExcelConstants.CLASS, SysCategory.class); - LoginUser user = LoginUserUtils.getLoginUser(); + LoginUser user = LoginUserUtils.getSessionUser(); mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("分类字典列表数据", "导出人:"+user.getRealname(), "导出信息")); return mv; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java index fd3ca0601..6127712c0 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java @@ -126,7 +126,7 @@ public class SysCommentController extends JeecgController> queryMyDeptTreeList() { Result> result = new Result<>(); - LoginUser user = LoginUserUtils.getLoginUser(); + LoginUser user = LoginUserUtils.getSessionUser(); try { if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals( CommonConstant.USER_IDENTITY_2 )){ //update-begin--Author:liusq Date:20210624 for:部门查询ids为空后的前端显示问题 issues/I3UD06 @@ -352,7 +352,7 @@ public class SysDepartController { @RequestParam(name = "departIds", required = false) String depIds) { Result> result = new Result>(); //部门查询，myDeptSearch为1时为我的部门查询，登录用户为上级时查只查负责部门下数据 - LoginUser user = LoginUserUtils.getLoginUser(); + LoginUser user = LoginUserUtils.getSessionUser(); String departIds = null; if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals( CommonConstant.USER_IDENTITY_2 )){ departIds = user.getDepartIds(); @@ -409,7 +409,7 @@ public class SysDepartController { //导出文件名称 mv.addObject(NormalExcelConstants.FILE_NAME, "部门列表"); mv.addObject(NormalExcelConstants.CLASS, SysDepartExportVo.class); - LoginUser user = LoginUserUtils.getLoginUser(); + LoginUser user = LoginUserUtils.getSessionUser(); ExportParams exportParams = new ExportParams("导入规则：\n" + "1、标题为第三行，部门路径和部门名称的标题不允许修改，否则会匹配失败；第四行为数据填写范围;\n" + "2、部门路径用英文字符/分割，部门名称为部门路径的最后一位;\n" + @@ -674,7 +674,7 @@ public class SysDepartController { //导出文件名称 mv.addObject(NormalExcelConstants.FILE_NAME, "部门列表"); mv.addObject(NormalExcelConstants.CLASS, ExportDepartVo.class); - LoginUser user = LoginUserUtils.getLoginUser(); + LoginUser user = LoginUserUtils.getSessionUser(); mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("部门列表数据", "导出人:"+user.getRealname(), "导出信息")); mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java index 2bd031417..ace9edb06 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java @@ -11,7 +11,6 @@ import org.jeecg.common.util.LoginUserUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.base.service.BaseCommonService; @@ -260,7 +259,7 @@ public class SysDepartPermissionController extends JeecgController pageList = sysPositionService.list(queryWrapper); - LoginUser user = LoginUserUtils.getLoginUser(); + LoginUser user = LoginUserUtils.getSessionUser(); //导出文件名称 mv.addObject(NormalExcelConstants.FILE_NAME, "职务表列表"); mv.addObject(NormalExcelConstants.CLASS, SysPosition.class); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java index 9d8d79715..cab8a4d75 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java @@ -1,10 +1,8 @@ package org.jeecg.modules.system.controller; -import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -17,7 +15,6 @@ import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import cn.dev33.satoken.annotation.SaCheckPermission; import org.jeecg.common.api.vo.Result; -import org.jeecg.common.base.BaseMap; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; @@ -191,7 +188,7 @@ public class SysRoleController { //如果是saas隔离的情况下，判断当前租户id是否是当前租户下的 if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) { //获取当前用户 - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); Integer tenantId = oConvertUtils.getInt(TenantContext.getTenant(), 0); String username = "admin"; if (!tenantId.equals(sysrole.getTenantId()) && !username.equals(sysUser.getUsername())) { @@ -220,7 +217,7 @@ public class SysRoleController { //如果是saas隔离的情况下，判断当前租户id是否是当前租户下的 if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){ //获取当前用户 - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); int tenantId = oConvertUtils.getInt(TenantContext.getTenant(), 0); Long getRoleCount = sysRoleService.getRoleCountByTenantId(id, tenantId); String username = "admin"; @@ -257,7 +254,7 @@ public class SysRoleController { if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){ int tenantId = oConvertUtils.getInt(TenantContext.getTenant(), 0); String[] roleIds = ids.split(SymbolConstant.COMMA); - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); String username = "admin"; for (String id:roleIds) { Long getRoleCount = sysRoleService.getRoleCountByTenantId(id, tenantId); @@ -400,7 +397,7 @@ public class SysRoleController { //导出文件名称 mv.addObject(NormalExcelConstants.FILE_NAME,"角色列表"); mv.addObject(NormalExcelConstants.CLASS,SysRole.class); - LoginUser user = LoginUserUtils.getLoginUser(); + LoginUser user = LoginUserUtils.getSessionUser(); mv.addObject(NormalExcelConstants.PARAMS,new ExportParams("角色列表数据","导出人:"+user.getRealname(),"导出信息")); mv.addObject(NormalExcelConstants.DATA_LIST,pageList); return mv; diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java index 6963d8a0d..33615d0c7 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java @@ -198,7 +198,7 @@ public class SysTenantController { //如果是saas隔离的情况下，判断当前租户id是否是当前租户下的 if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) { //获取当前用户 - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); SysTenant sysTenant = sysTenantService.getById(id); String username = "admin"; @@ -234,7 +234,7 @@ public class SysTenantController { //如果是saas隔离的情况下，判断当前租户id是否是当前租户下的 if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) { //获取当前用户 - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); SysTenant sysTenant = sysTenantService.getById(id); String username = "admin"; @@ -269,7 +269,7 @@ public class SysTenantController { } //------------------------------------------------------------------------------------------------ //获取登录用户信息 - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】, admin给特权可以管理所有租户 if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL && !"admin".equals(sysUser.getUsername())){ Integer loginSessionTenant = oConvertUtils.getInt(TenantContext.getTenant()); @@ -385,7 +385,7 @@ public class SysTenantController { public Result> getCurrentUserTenant() { Result> result = new Result>(); try { - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); //update-begin---author:wangshuai ---date:20221223 for：[QQYUN-3371]租户逻辑改造，改成关系表------------ List tenantIdList = relationService.getTenantIdsByUserId(sysUser.getId()); Map map = new HashMap(5); @@ -455,7 +455,7 @@ public class SysTenantController { @RequestParam("tenantId") String tenantId){ Result result = new Result<>(); //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】 - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL && !"admin".equals(sysUser.getUsername())){ Integer loginSessionTenant = oConvertUtils.getInt(TenantContext.getTenant()); if(loginSessionTenant!=null && !loginSessionTenant.equals(Integer.valueOf(tenantId))){ @@ -501,7 +501,7 @@ public class SysTenantController { @PostMapping("/saveTenantJoinUser") public Result saveTenantJoinUser(@RequestBody SysTenant sysTenant){ Result result = new Result<>(); - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); Integer tenantId = sysTenantService.saveTenantJoinUser(sysTenant, sysUser.getId()); result.setSuccess(true); result.setMessage("创建成功"); @@ -515,7 +515,7 @@ public class SysTenantController { */ @PostMapping("/joinTenantByHouseNumber") public Result joinTenantByHouseNumber(@RequestBody SysTenant sysTenant){ - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); Integer tenantId = sysTenantService.joinTenantByHouseNumber(sysTenant, sysUser.getId()); Result result = new Result<>(); if(tenantId != 0){ @@ -550,7 +550,7 @@ public class SysTenantController { SysUser user, HttpServletRequest req) { Page page = new Page(pageNo, pageSize); - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); String tenantId = oConvertUtils.getString(TenantContext.getTenant(), "0"); IPage list = relationService.getUserTenantPageList(page, Arrays.asList(userTenantStatus.split(SymbolConstant.COMMA)), user, Integer.valueOf(tenantId)); return Result.ok(list); @@ -565,7 +565,7 @@ public class SysTenantController { @GetMapping("/getTenantListByUserId") //@SaCheckPermission("system:tenant:getTenantListByUserId") public Result> getTenantListByUserId(@RequestParam(name = "userTenantStatus", required = false) String userTenantStatus) { - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); List list = null; if (oConvertUtils.isNotEmpty(userTenantStatus)) { list = Arrays.asList(userTenantStatus.split(SymbolConstant.COMMA)); @@ -598,7 +598,7 @@ public class SysTenantController { @PutMapping("/cancelTenant") //@SaCheckPermission("system:tenant:cancelTenant") public Result cancelTenant(@RequestBody SysTenant sysTenant,HttpServletRequest request) { - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); SysTenant tenant = sysTenantService.getById(sysTenant.getId()); if (null == tenant) { return Result.error("未找到当前租户信息"); @@ -641,7 +641,7 @@ public class SysTenantController { */ @PutMapping("/cancelApplyTenant") public Result cancelApplyTenant(@RequestParam("tenantId") String tenantId){ - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); sysTenantService.leaveTenant(sysUser.getId(),tenantId); return Result.ok("取消申请成功"); } @@ -680,7 +680,7 @@ public class SysTenantController { */ @DeleteMapping("/exitUserTenant") public Result exitUserTenant(@RequestBody SysTenant sysTenant,HttpServletRequest request){ - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); //验证用户是否已存在 Integer count = relationService.userTenantIzExist(sysUser.getId(),sysTenant.getId()); if (count == 0) { @@ -905,7 +905,7 @@ public class SysTenantController { public Result> getTenantPageListByUserId(SysUserTenantVo sysUserTenantVo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); List list = null; String userTenantStatus = sysUserTenantVo.getUserTenantStatus(); if (oConvertUtils.isNotEmpty(userTenantStatus)) { @@ -923,7 +923,7 @@ public class SysTenantController { public Result agreeOrRefuseJoinTenant(@RequestParam("tenantId") Integer tenantId, @RequestParam("status") String status){ //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】 - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); String userId = sysUser.getId(); SysTenant tenant = sysTenantService.getById(tenantId); if(null == tenant){ @@ -974,7 +974,7 @@ public class SysTenantController { public Result> getCurrentUserTenantForFile() { Result> result = new Result>(); try { - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); List tenantList = sysTenantService.getTenantListByUserId(sysUser.getId()); Map map = new HashMap<>(5); //在开启saas租户隔离的时候并且租户数据不为空，则返回租户信息 diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 351561fc3..4a0ec404a 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.stp.StpUtil; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.PermissionData; import org.jeecg.common.config.TenantContext; @@ -349,7 +348,7 @@ public class SysUserController { } sysUser.setId(u.getId()); //update-begin---author:wangshuai ---date:20220316 for：[VUEN-234]修改密码添加敏感日志------------ - LoginUser loginUser = LoginUserUtils.getLoginUser(); + LoginUser loginUser = LoginUserUtils.getSessionUser(); baseCommonService.addLog("修改用户 "+sysUser.getUsername()+" 的密码，操作人： " +loginUser.getUsername() ,CommonConstant.LOG_TYPE_2, 2); //update-end---author:wangshuai ---date:20220316 for：[VUEN-234]修改密码添加敏感日志------------ return sysUserService.changePassword(sysUser); @@ -483,7 +482,7 @@ public class SysUserController { //导出文件名称 mv.addObject(NormalExcelConstants.FILE_NAME, "用户列表"); mv.addObject(NormalExcelConstants.CLASS, SysUserExportVo.class); - LoginUser user = LoginUserUtils.getLoginUser(); + LoginUser user = LoginUserUtils.getSessionUser(); ExportParams exportParams = new ExportParams("导入规则：\n" + "1. 用户名为必填项，仅支持新增数据导入；\n" + "2. 多个部门、角色或负责部门请用英文分号 ; 分隔，如：财务部;研发部；\n" + @@ -569,7 +568,7 @@ public class SysUserController { String oldpassword = json.getString("oldpassword"); String password = json.getString("password"); String confirmpassword = json.getString("confirmpassword"); - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); if(!sysUser.getUsername().equals(username)){ return Result.error("只允许修改自己的密码！"); } @@ -578,7 +577,7 @@ public class SysUserController { return Result.error("用户不存在！"); } //update-begin---author:wangshuai ---date:20220316 for：[VUEN-234]修改密码添加敏感日志------------ - LoginUser loginUser = LoginUserUtils.getLoginUser(); + LoginUser loginUser = LoginUserUtils.getSessionUser(); baseCommonService.addLog("修改密码，username： " +loginUser.getUsername() ,CommonConstant.LOG_TYPE_2, 2); //update-end---author:wangshuai ---date:20220316 for：[VUEN-234]修改密码添加敏感日志------------ return sysUserService.resetPassword(username,oldpassword,password,confirmpassword); @@ -692,7 +691,7 @@ public class SysUserController { List subDepids = new ArrayList<>(); //部门id为空时，查询我的部门下所有用户 if(oConvertUtils.isEmpty(depId)){ - LoginUser user = LoginUserUtils.getLoginUser(); + LoginUser user = LoginUserUtils.getSessionUser(); int userIdentity = user.getUserIdentity() != null?user.getUserIdentity():CommonConstant.USER_IDENTITY_1; //update-begin---author:chenrui ---date:20250107 for：[QQYUN-10775]验证码可以复用 #7674------------ if(oConvertUtils.isNotEmpty(userIdentity) && userIdentity == CommonConstant.USER_IDENTITY_2 @@ -857,7 +856,7 @@ public class SysUserController { public Result> getCurrentUserDeparts() { Result> result = new Result>(); try { - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); List list = this.sysDepartService.queryUserDeparts(sysUser.getId()); Map map = new HashMap(5); map.put("list", list); @@ -1721,7 +1720,7 @@ public class SysUserController { public Result changeLoginTenantId(@RequestBody SysUser sysUser){ Result result = new Result<>(); Integer tenantId = sysUser.getLoginTenantId(); - LoginUser loginUser = LoginUserUtils.getLoginUser(); + LoginUser loginUser = LoginUserUtils.getSessionUser(); String userId = loginUser.getId(); // 判断 指定的租户ID是不是当前登录用户的租户 diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdAppController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdAppController.java index 94873eba2..5a480ffb5 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdAppController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdAppController.java @@ -509,7 +509,7 @@ public class ThirdAppController { */ @GetMapping("/getThirdAccountByUserId") public Result> getThirdAccountByUserId(@RequestParam(name="thirdType") String thirdType){ - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); LambdaQueryWrapper query = new LambdaQueryWrapper<>(); //根据id查询 query.eq(SysThirdAccount::getSysUserId,sysUser.getId()); @@ -540,7 +540,7 @@ public class ThirdAppController { */ @DeleteMapping("/deleteThirdAccount") public Result deleteThirdAccountById(@RequestBody SysThirdAccount sysThirdAccount){ - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); if(!sysUser.getId().equals(sysThirdAccount.getSysUserId())){ return Result.error("无权修改他人信息"); } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java index 05da9a25f..866139f01 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java @@ -233,7 +233,7 @@ public class ThirdLoginController { Result result = new Result(); String username = JwtUtil.getUsername(token); //update-begin---author:chenrui ---date:20250210 for：[QQYUN-11021]三方登录接口通过token获取用户信息漏洞修复------------ - if (!TokenUtils.verifyToken(token, sysBaseAPI, redisUtil)) { + if (!TokenUtils.verifyToken(token, sysBaseAPI)) { return Result.noauth("token验证失败"); } //update-end---author:chenrui ---date:20250210 for：[QQYUN-11021]三方登录接口通过token获取用户信息漏洞修复------------ diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java index 65b14c2c1..0beb0fe39 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java @@ -96,7 +96,7 @@ public class SysDataLog implements Serializable { */ public void autoSetCreateName() { try { - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); this.setCreateName(sysUser.getRealname()); } catch (Exception e) { // QQYUN-13669 进一步优化：解决某些异步场景下获取用户信息为空的问题 diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java index afe6b221d..4ada5894e 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java @@ -165,7 +165,7 @@ public class SysAnnouncementServiceImpl extends ServiceImpl announcementIds = this.getNotSendedAnnouncementlist(userId); List sysAnnouncementSendList = new ArrayList<>(); @@ -215,7 +215,7 @@ public class SysAnnouncementServiceImpl extends ServiceImpl page = new Page(pageNo,pageSize); List list = baseMapper.queryAllMessageList(page, sysUser.getId(), fromUser, starFlag, busType, msgCategory,beginDate, endDate, noticeType); @@ -224,13 +224,13 @@ public class SysAnnouncementServiceImpl extends ServiceImpl annoceIdList) { - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); sysAnnouncementSendMapper.updateReaded(sysUser.getId(), annoceIdList); } @Override public void clearAllUnReadMessage() { - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); sysAnnouncementSendMapper.clearAllUnReadMessage(sysUser.getId()); } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index 6a3e4e41c..3e275bff5 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -658,7 +658,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { public void updateSysAnnounReadFlag(String busType, String busId) { SysAnnouncement announcement = sysAnnouncementMapper.selectOne(new QueryWrapper().eq("bus_type",busType).eq("bus_id",busId)); if(announcement != null){ - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); String userId = sysUser.getId(); LambdaUpdateWrapper updateWrapper = new UpdateWrapper().lambda(); updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java index 8a76d91be..6b95306b4 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java @@ -1016,7 +1016,7 @@ public class SysDepartServiceImpl extends ServiceImpl getMyDepartList() { - LoginUser user = LoginUserUtils.getLoginUser(); + LoginUser user = LoginUserUtils.getSessionUser(); String userId = user.getId(); //字典code集合 List list = new ArrayList<>(); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java index c23b511cb..a09c977e1 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java @@ -13,7 +13,6 @@ import org.jeecg.modules.aop.TenantLog; import org.jeecg.modules.system.entity.SysPackPermission; import org.jeecg.modules.system.entity.SysTenantPack; import org.jeecg.modules.system.entity.SysTenantPackUser; -import org.jeecg.modules.system.entity.SysUserTenant; import org.jeecg.modules.system.mapper.*; import org.jeecg.modules.system.service.ISysTenantPackService; import org.springframework.beans.BeanUtils; @@ -226,7 +225,7 @@ public class SysTenantPackServiceImpl extends ServiceImpl invitationUser(String phone, String departId) { Result result = new Result<>(); - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); //1、查询用户信息,判断用户是否存在 SysUser userByPhone = userService.getUserByPhone(phone); @@ -492,7 +489,7 @@ public class SysTenantServiceImpl extends ServiceImpl pageList = null; // 部门ID不存在 直接查询用户表即可 Page page = new Page<>(pageNo, pageSize); - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); if(oConvertUtils.isEmpty(departId)){ LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(SysUser::getStatus,Integer.parseInt(CommonConstant.STATUS_1)); @@ -286,7 +284,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl pageList = null; // 部门ID不存在 直接查询用户表即可 Page page = new Page<>(pageNo, pageSize); - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); List userIdList = new ArrayList<>(); if(oConvertUtils.isNotEmpty(excludeUserIdList)){ diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index c62fed013..06e55c34e 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSONObject; import com.aliyuncs.exceptions.ClientException; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; @@ -54,11 +53,9 @@ import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jetbrains.annotations.Nullable; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -1662,7 +1659,7 @@ public class SysUserServiceImpl extends ServiceImpl impl //导出文件名称 mv.addObject(NormalExcelConstants.FILE_NAME, "用户列表"); mv.addObject(NormalExcelConstants.CLASS, AppExportUserVo.class); - LoginUser user = LoginUserUtils.getLoginUser(); + LoginUser user = LoginUserUtils.getSessionUser(); ExportParams exportParams = new ExportParams("导入规则：\n" + "1、存在用户编号时，数据会根据用户编号进行匹配，匹配成功后只会更新职位和工号;\n" + "2、不存在用户编号时，支持手机号、邮箱、姓名、部们、职位、工号导入,其中手机号必填;\n" + @@ -2046,7 +2043,7 @@ public class SysUserServiceImpl extends ServiceImpl impl userTenantMapper.insert(userTenant); //update-begin---author:wangshuai ---date:20230710 for：【QQYUN-5731】导入用户时，没有提醒------------ //发送系统消息通知 - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); MessageDTO messageDTO = new MessageDTO(); String title = sysUser.getRealname() + " 邀请您加入 " + tenantName + "。"; messageDTO.setTitle(title); @@ -2652,7 +2649,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public void updatePasswordNotBindPhone(String oldPassword, String password, String username) { - LoginUser sysUser = LoginUserUtils.getLoginUser(); + LoginUser sysUser = LoginUserUtils.getSessionUser(); //step1 只能修改自己的密码 if(!sysUser.getUsername().equals(username)){ throw new JeecgBootBizTipException("只允许修改自己的密码！");