Skip to content

Commit 3c175ba

Browse files
committed
chore: sync pending project changes
1 parent e34592c commit 3c175ba

5 files changed

Lines changed: 4 additions & 9 deletions

File tree

pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
<aws.sdk.version>2.28.22</aws.sdk.version>
4444
<!-- SMS 配置 -->
4545
<sms4j.version>3.3.5</sms4j.version>
46-
<!-- FastJson已移除,使用Jackson替代 -->
4746
<!-- 面向运行时的D-ORM依赖 -->
4847
<anyline.version>8.7.2-20250603</anyline.version>
4948
<!-- 工作流配置 -->
@@ -62,6 +61,8 @@
6261
<weaviate.version>1.19.6</weaviate.version>
6362
<dify.version>1.2.7</dify.version>
6463
<coze.version>0.4.2</coze.version>
64+
<!-- 智谱官方 Java SDK -->
65+
<zai-sdk.version>0.3.5</zai-sdk.version>
6566

6667
<!-- gRPC 版本 - 解决 Milvus SDK 依赖冲突 -->
6768
<grpc.version>1.62.2</grpc.version>
@@ -342,8 +343,6 @@
342343
</dependency>
343344

344345
<!-- JustAuth 的依赖配置-->
345-
<!-- 排除 fastjson(存在 RCE 漏洞且已停止维护), 项目内自定义的登录类(钉钉/企业微信/gitea/maxkey/topiam)已改用 Jackson -->
346-
<!-- 注意: JustAuth 内置平台类(github/gitee/qq 等)内部仍使用 fastjson, 排除后如需使用这些平台请自行覆写对应请求类 -->
347346
<dependency>
348347
<groupId>me.zhyd.oauth</groupId>
349348
<artifactId>JustAuth</artifactId>

ruoyi-common/ruoyi-common-chat/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<artifactId>ruoyi-common-sse</artifactId>
3838
</dependency>
3939

40-
<!-- FastJson已移除,使用Spring Boot自带的Jackson -->
4140
<dependency>
4241
<groupId>com.fasterxml.jackson.core</groupId>
4342
<artifactId>jackson-databind</artifactId>

ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ public AuthUser getUserInfo(AuthToken authToken) {
6161
String userTicket = object.has("user_ticket") ? object.get("user_ticket").asText() : null;
6262
JsonNode userDetail = getUserDetail(authToken.getAccessToken(), userId, userTicket);
6363

64-
// rawUserInfo 为 JustAuth 的 fastjson 类型字段, 项目内无消费方, 不再设置
6564
return AuthUser.builder()
6665
.username(userDetail.has("name") ? userDetail.get("name").asText() : null)
6766
.nickname(userDetail.has("alias") ? userDetail.get("alias").asText() : null)

ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AuthDingTalkV2Request.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ public AuthUser getUserInfo(AuthToken authToken) {
9191

9292
authToken.setOpenId(object.has("openId") ? object.get("openId").asText() : null);
9393
authToken.setUnionId(object.has("unionId") ? object.get("unionId").asText() : null);
94-
// rawUserInfo 为 JustAuth 的 fastjson 类型字段, 项目内无消费方, 不再设置
9594
return AuthUser.builder()
9695
.uuid(object.has("unionId") ? object.get("unionId").asText() : null)
9796
.username(object.has("nick") ? object.get("nick").asText() : null)

ruoyi-modules/ruoyi-aiflow/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>ai.z.openapi</groupId>
3030
<artifactId>zai-sdk</artifactId>
31-
<version>0.3.5</version>
31+
<version>${zai-sdk.version}</version>
3232
</dependency>
3333

3434
<dependency>
@@ -126,6 +126,7 @@
126126
<version>${langchain4j.version}</version>
127127
<scope>compile</scope>
128128
</dependency>
129+
129130
<dependency>
130131
<groupId>org.jsoup</groupId>
131132
<artifactId>jsoup</artifactId>
@@ -145,8 +146,6 @@
145146
<version>${langgraph4j.version}</version>
146147
</dependency>
147148

148-
149-
150149
<dependency>
151150
<groupId>org.apache.commons</groupId>
152151
<artifactId>commons-collections4</artifactId>

0 commit comments

Comments
 (0)