From 8b2de3cb7aa9160e9de3ca547cc86f0d5bb1b32c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 12 Feb 2025 17:28:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A2=9E=E5=8A=A0userId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AuthorizationController.java | 5 ++-- .../java/com/czg/config/StpInterfaceImpl.java | 7 +---- .../src/main/java/com/czg/sa/MyStpLogic.java | 29 ++----------------- .../impl/AuthorizationServiceImpl.java | 3 +- 4 files changed, 9 insertions(+), 35 deletions(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/AuthorizationController.java b/cash-api/account-server/src/main/java/com/czg/controller/AuthorizationController.java index 844afcbf..14d9d4d4 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/AuthorizationController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/AuthorizationController.java @@ -4,6 +4,7 @@ import com.czg.account.dto.SysLoginDTO; import com.czg.account.service.AuthorizationService; import com.czg.account.service.PermissionService; import com.czg.account.vo.LoginVO; +import com.czg.annotation.SaAdminCheckPermission; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; import jakarta.annotation.Resource; @@ -49,9 +50,9 @@ public class AuthorizationController { return CzgResult.success(); } + @SaAdminCheckPermission("/adadas") @GetMapping("test") public CzgResult login() { - StpKit.ADMIN.login(1); - return CzgResult.success(Map.of("token", StpKit.ADMIN.getTokenInfo())); + return CzgResult.success(Map.of("token", StpKit.ADMIN.getShopId())); } } diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/config/StpInterfaceImpl.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/config/StpInterfaceImpl.java index 6e735b02..a5bf098b 100644 --- a/cash-common/cash-common-sa-token/src/main/java/com/czg/config/StpInterfaceImpl.java +++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/config/StpInterfaceImpl.java @@ -32,13 +32,8 @@ public class StpInterfaceImpl implements StpInterface { } private static @Nullable List getCashInfo(String key) { - Object value = StpKit.ADMIN.getSaTokenDao().getObject(key); + Object value = StpKit.ADMIN.getSession().get(key); if (value instanceof List list) { - // 续费时间 - long timeout = StpKit.ADMIN.getTokenTimeout(); - if (timeout > 0) { - StpKit.ADMIN.getSaTokenDao().updateObjectTimeout(key, StpKit.ADMIN.getTokenTimeout() + 120); - } return (List) list; } return null; diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java index 2810603e..5595a0fc 100644 --- a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java +++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java @@ -26,41 +26,18 @@ public class MyStpLogic extends StpLogic { super(loginType); } - /** - * 用户登录 - * @param sysUserId 系统用户id - * @param shopId 店铺id - */ - public void login(Long sysUserId, Long shopId) { - login(sysUserId); - setShopId(shopId); - } - /** * 获取店铺id * @return 返回店铺id，不存在抛出异常 */ public Long getShopId() { - String key = "sa:shopId:" + getLoginType() + ":" + getLoginId(); - Object object = getSaTokenDao().getObject(key); + Object object = StpKit.ADMIN.getSession().get("shopId"); if (object == null) { throw new ApiNotPrintException("shopId获取失败"); } - // 续费时间 - long timeout = getTokenTimeout(); - if (timeout > 0) { - getSaTokenDao().updateObjectTimeout(key, getTokenTimeout() + 120); - } return (Long) object; } - /** - * 设置店铺id - * @param shopId 店铺id - */ - private void setShopId(Long shopId) { - this.getSaTokenDao().setObject("sa:shopId:" + getLoginType() + ":" + getLoginId(), shopId, getTokenTimeout() + 120); - } /** * 添加当前账号的角色 @@ -68,7 +45,7 @@ public class MyStpLogic extends StpLogic { * @return 当前实例 */ public MyStpLogic addRoleList(List roleList) { - this.getSaTokenDao().setObject("sa:roleList:" + getLoginType() + ":" + getLoginId(), roleList, getTokenTimeout() + 120); + getSession().set("sa:roleList:" + getLoginType() + ":" + getLoginId(), roleList); return this; } @@ -78,7 +55,7 @@ public class MyStpLogic extends StpLogic { * @return 当前实例 */ public MyStpLogic addPermissionList(List permissionList) { - this.getSaTokenDao().setObject("sa:permissionList:" + getLoginType() + ":" + getLoginId(), permissionList, getTokenTimeout() + 120); + getSession().set("sa:permissionList:" + getLoginType() + ":" + getLoginId(), permissionList); return this; } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java index 6a38aae6..ebe9830b 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java @@ -100,7 +100,8 @@ public class AuthorizationServiceImpl implements AuthorizationService { } } - StpKit.ADMIN.login(user.getId(), shopInfo.getId()); + StpKit.ADMIN.login(user.getId()); + StpKit.ADMIN.getSession().set("userId", user.getId()).set("shopId", shopInfo.getId()).set("isAdmin", user.getIsAdmin()); StpKit.ADMIN.setAdmin(user.getIsAdmin()); // 查询角色 List roleList = sysRoleService.getByUserId(user.getId());