From 143d56e6ef42668c842bd871f4e4ac678fc567ee Mon Sep 17 00:00:00 2001
From: liulin <lin.liu@aliyun.com>
Date: 星期三, 07 八月 2024 10:34:57 +0800
Subject: [PATCH] 处理token
---
src/main/java/com/lunhan/xxx/common/jwt/JWTUtil.java | 12 +-----
src/main/java/com/lunhan/xxx/common/jwt/LoginUserDTO.java | 49 ------------------------
src/main/java/com/lunhan/xxx/entity/enums/EUserType.java | 9 ----
3 files changed, 3 insertions(+), 67 deletions(-)
diff --git a/src/main/java/com/lunhan/xxx/common/jwt/JWTUtil.java b/src/main/java/com/lunhan/xxx/common/jwt/JWTUtil.java
index 2efbe21..dbe9370 100644
--- a/src/main/java/com/lunhan/xxx/common/jwt/JWTUtil.java
+++ b/src/main/java/com/lunhan/xxx/common/jwt/JWTUtil.java
@@ -54,10 +54,6 @@
loginUser.setHeadImg(jwt.getClaim("headImg").asString());
loginUser.setListRole(StringUtil.splitLongList(jwt.getClaim("listRole").asString()));
loginUser.setListRoleName(StringUtil.splitList(jwt.getClaim("listRoleName").asString()));
- loginUser.setCustomerCompany(NumericUtil.tryParseLong(jwt.getClaim("customerCompany").asString(), 0L));
- loginUser.setCustomerCompanyName(jwt.getClaim("customerCompanyName").asString());
- loginUser.setCustomerRegion(jwt.getClaim("customerRegion").asString());
- loginUser.setIsChild(NumericUtil.tryParseInt(jwt.getClaim("isChild").asString(), 0));
return loginUser;
}
@@ -79,12 +75,8 @@
builder.withClaim("phone", loginUser.getPhone());
builder.withClaim("nickName", loginUser.getNickName());
builder.withClaim("headImg", loginUser.getHeadImg());
- builder.withClaim("listRole", loginUser.getListRole().toString());
- builder.withClaim("listRoleName", loginUser.getListRoleName().toString());
- builder.withClaim("customerCompany", loginUser.getCustomerCompany().toString());
- builder.withClaim("customerCompanyName", loginUser.getCustomerCompanyName());
- builder.withClaim("customerRegion", loginUser.getCustomerRegion());
- builder.withClaim("isChild", loginUser.getIsChild().toString());
+ builder.withClaim("listRole", StringUtil.joinLong(loginUser.getListRole()));
+ builder.withClaim("listRoleName", StringUtil.join(loginUser.getListRoleName()));
return builder
//生成token字符串
.sign(Algorithm.HMAC256(SysConfig.jwt.getSecret()))
diff --git a/src/main/java/com/lunhan/xxx/common/jwt/LoginUserDTO.java b/src/main/java/com/lunhan/xxx/common/jwt/LoginUserDTO.java
index fb12bf3..b8ca96c 100644
--- a/src/main/java/com/lunhan/xxx/common/jwt/LoginUserDTO.java
+++ b/src/main/java/com/lunhan/xxx/common/jwt/LoginUserDTO.java
@@ -39,23 +39,6 @@
* 拥有角色-名称列表
*/
private List<String> listRoleName;
- /**
- * 所属客户公司(当 userType=3 时)
- */
- private Long customerCompany;
- /**
- * 所属客户公司名称
- */
- private String customerCompanyName;
-
- /**
- * 客户公司所属区域
- */
- private String customerRegion;
- /**
- * 是否是子帐号(当 userType=3 时)
- */
- private Integer isChild;
public String getToken() {
return token;
@@ -127,37 +110,5 @@
public void setListRoleName(List<String> listRoleName) {
this.listRoleName = listRoleName;
- }
-
- public Long getCustomerCompany() {
- return customerCompany;
- }
-
- public void setCustomerCompany(Long customerCompany) {
- this.customerCompany = customerCompany;
- }
-
- public String getCustomerCompanyName() {
- return customerCompanyName;
- }
-
- public void setCustomerCompanyName(String customerCompanyName) {
- this.customerCompanyName = customerCompanyName;
- }
-
- public String getCustomerRegion() {
- return customerRegion;
- }
-
- public void setCustomerRegion(String customerRegion) {
- this.customerRegion = customerRegion;
- }
-
- public Integer getIsChild() {
- return isChild;
- }
-
- public void setIsChild(Integer isChild) {
- this.isChild = isChild;
}
}
diff --git a/src/main/java/com/lunhan/xxx/entity/enums/EUserType.java b/src/main/java/com/lunhan/xxx/entity/enums/EUserType.java
index 2e8eb8b..0e8a087 100644
--- a/src/main/java/com/lunhan/xxx/entity/enums/EUserType.java
+++ b/src/main/java/com/lunhan/xxx/entity/enums/EUserType.java
@@ -15,14 +15,7 @@
* 普通管理员=2,
*/
ADMIN_USER("普通管理员", 2),
- /**
- * 客户=3,
- */
- CUSTOMER("客户", 3),
- /**
- * 客户会员=4,
- */
- CUSTOMER_MEMBER("客户会员", 4)
+
;
private String desc;//枚举描述
--
Gitblit v1.9.3