diff --git a/web/src/main/java/com/ibeetl/jlw/entity/LoginTodo.java b/web/src/main/java/com/ibeetl/jlw/entity/LoginTodo.java
index c89f8f7e..8e5c21ee 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/LoginTodo.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/LoginTodo.java
@@ -1,6 +1,8 @@
package com.ibeetl.jlw.entity;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
+import com.auth0.jwt.interfaces.Claim;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonValue;
@@ -10,6 +12,8 @@ import lombok.*;
import lombok.experimental.Accessors;
import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
/**
* 功能描述:
@@ -102,6 +106,10 @@ public class LoginTodo implements Serializable {
return mapper.writeValueAsString(this);
}
+ public Map toMap() {
+ return JSONUtil.toBean(toJSONString(), HashMap.class);
+ }
+
/**
* 功能描述:
* JSON转换成该实体类
@@ -118,4 +126,25 @@ public class LoginTodo implements Serializable {
}
return null;
}
+
+ /**
+ * 功能描述:
+ * JSON转换成该实体类
+ *
+ * @return {@link LoginTodo}
+ * @Author: lx
+ * @Date: 2022/12/11 17:33
+ */
+ @SneakyThrows
+ public static LoginTodo jsonToEntity(Map claims) {
+ if (ObjectUtil.isNotEmpty(claims)) {
+ Map tempMap = new HashMap(20);
+ claims.forEach((key, val) -> {
+ tempMap.put(key, val.asString());
+ });
+ ObjectMapper mapper = new ObjectMapper();
+ return mapper.readValue(JSONUtil.toJsonStr(tempMap), LoginTodo.class);
+ }
+ return null;
+ }
}
\ No newline at end of file
diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java
index 3c6b239f..4484cdce 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java
@@ -9,10 +9,10 @@ import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.URLUtil;
-import com.alibaba.fastjson.JSONObject;
import com.auth0.jwt.JWT;
import com.auth0.jwt.JWTVerifier;
import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.interfaces.Claim;
import com.auth0.jwt.interfaces.DecodedJWT;
import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.util.PlatformException;
@@ -34,6 +34,7 @@ import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
import static com.ibeetl.jlw.entity.LoginTodo.jsonToEntity;
@@ -233,7 +234,7 @@ public class ResourcesApplicationService extends CoreBaseService
* 解密加密的url,用于第三方应用
@@ -291,8 +255,8 @@ public class ResourcesApplicationService extends CoreBaseService claims = jwt.getClaims();
+ return jsonToEntity(claims);
}catch(Exception e) {
System.err.println(e.getMessage());
}