diff --git a/pom.xml b/pom.xml index 8d3fcb4b..6c9238c7 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,6 @@ 2.28.22 3.3.5 - 8.7.2-20250603 @@ -62,6 +61,8 @@ 1.19.6 1.2.7 0.4.2 + + 0.3.5 1.62.2 @@ -342,8 +343,6 @@ - - me.zhyd.oauth JustAuth diff --git a/ruoyi-common/ruoyi-common-chat/pom.xml b/ruoyi-common/ruoyi-common-chat/pom.xml index 7de6f70d..eb6d395c 100644 --- a/ruoyi-common/ruoyi-common-chat/pom.xml +++ b/ruoyi-common/ruoyi-common-chat/pom.xml @@ -37,7 +37,6 @@ ruoyi-common-sse - com.fasterxml.jackson.core jackson-databind diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java b/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java index 031f00aa..8fc8d022 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java +++ b/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java @@ -61,7 +61,6 @@ public abstract class AbstractAuthWeChatEnterpriseRequest extends AuthDefaultReq String userTicket = object.has("user_ticket") ? object.get("user_ticket").asText() : null; JsonNode userDetail = getUserDetail(authToken.getAccessToken(), userId, userTicket); - // rawUserInfo 为 JustAuth 的 fastjson 类型字段, 项目内无消费方, 不再设置 return AuthUser.builder() .username(userDetail.has("name") ? userDetail.get("name").asText() : null) .nickname(userDetail.has("alias") ? userDetail.get("alias").asText() : null) diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AuthDingTalkV2Request.java b/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AuthDingTalkV2Request.java index dbfeec9e..23d3d723 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AuthDingTalkV2Request.java +++ b/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AuthDingTalkV2Request.java @@ -91,7 +91,6 @@ public class AuthDingTalkV2Request extends AuthDefaultRequest { authToken.setOpenId(object.has("openId") ? object.get("openId").asText() : null); authToken.setUnionId(object.has("unionId") ? object.get("unionId").asText() : null); - // rawUserInfo 为 JustAuth 的 fastjson 类型字段, 项目内无消费方, 不再设置 return AuthUser.builder() .uuid(object.has("unionId") ? object.get("unionId").asText() : null) .username(object.has("nick") ? object.get("nick").asText() : null) diff --git a/ruoyi-modules/ruoyi-aiflow/pom.xml b/ruoyi-modules/ruoyi-aiflow/pom.xml index 0970ec70..f469e39b 100644 --- a/ruoyi-modules/ruoyi-aiflow/pom.xml +++ b/ruoyi-modules/ruoyi-aiflow/pom.xml @@ -28,7 +28,7 @@ ai.z.openapi zai-sdk - 0.3.5 + ${zai-sdk.version} @@ -126,6 +126,7 @@ ${langchain4j.version} compile + org.jsoup jsoup @@ -145,8 +146,6 @@ ${langgraph4j.version} - - org.apache.commons commons-collections4