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 cc9a0327..bc763e88 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/LoginTodo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/LoginTodo.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.entity; +import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.databind.ObjectMapper; @@ -97,4 +98,21 @@ public class LoginTodo implements Serializable { ObjectMapper mapper = new ObjectMapper(); return mapper.writeValueAsString(this); } + + /** + * 功能描述:
+ * JSON转换成该实体类 + * + * @return {@link LoginTodo} + * @Author: lx + * @Date: 2022/12/11 17:33 + */ + @SneakyThrows + public static LoginTodo jsonToEntity(String json) { + if (ObjectUtil.isNotEmpty(json)) { + ObjectMapper mapper = new ObjectMapper(); + return mapper.readValue(json, 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 be69f22c..166bb041 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java @@ -35,6 +35,8 @@ import java.util.Date; import java.util.List; import java.util.stream.Collectors; +import static com.ibeetl.jlw.entity.LoginTodo.jsonToEntity; + /** * ResourcesApplication Service */ @@ -211,6 +213,7 @@ public class ResourcesApplicationService extends CoreBaseService { String applicationLink = item.getApplicationLink(); applicationLink = makeHaveKeyStr(applicationLink); + // 根据应用设置的Key生成单点登录的真实链接 String realUrl = applicationLink.concat(getKeyByCurrentUser(item.getLinkSecretKey())); item.set("realUrl", realUrl); }); @@ -244,11 +247,16 @@ public class ResourcesApplicationService extends CoreBaseService