From 4b8346ec80917a13fcea9a6103380f167424e98d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 5 May 2026 11:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BE=9D=E8=B5=96=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E3=80=91Phase=204=EF=BC=9ASpring=20Cloud=202025.0.1=20+=20Spri?=
 =?UTF-8?q?ng=20Cloud=20Alibaba=202025.0.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

升级内容：
- spring-cloud 2025.0.0 → 2025.0.1
- spring-cloud-alibaba 2023.0.3.3 → 2025.0.0.0
- 移除 nacos-discovery 的 logback-adapter 排除（BOM 管理 + 新版不再依赖）
- yudao-spring-boot-starter-rpc 引入 httpclient 4.5.14
  （Spring Cloud Alibaba 2025.0.0.0 的 Nacos 不再传递 HttpClient 4.x，WxJava 4.8.x 仍需要）
---
 yudao-dependencies/pom.xml                     | 18 +++---------------
 .../yudao-spring-boot-starter-rpc/pom.xml      | 11 +++++++++++
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 2d1a474af..668c20637 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -18,8 +18,8 @@
         <flatten-maven-plugin.version>1.7.2</flatten-maven-plugin.version>
         <!-- 统一依赖管理 -->
         <spring.boot.version>3.5.14</spring.boot.version>
-        <spring.cloud.version>2025.0.0</spring.cloud.version>
-        <spring.cloud.alibaba.version>2023.0.3.3</spring.cloud.alibaba.version>
+        <spring.cloud.version>2025.0.1</spring.cloud.version>
+        <spring.cloud.alibaba.version>2025.0.0.0</spring.cloud.alibaba.version>
         <!-- Web 相关 -->
         <springdoc.version>2.8.17</springdoc.version>
         <knife4j.version>4.5.0</knife4j.version>
@@ -318,19 +318,6 @@
 
             <!-- Registry 注册中心相关 -->
 
-            <dependency>
-                <groupId>com.alibaba.cloud</groupId>
-                <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-                <version>${spring.cloud.alibaba.version}</version>
-                <exclusions>
-                    <!-- 目的：解决 Nacos 启动的 NAMING_LOG_FILE 告警 -->
-                    <exclusion>
-                        <artifactId>logback-adapter</artifactId>
-                        <groupId>com.alibaba.nacos</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
             <!-- Config 配置中心相关 -->
 
             <!-- Job 定时任务相关 -->
@@ -664,6 +651,7 @@
                 <version>${j2mod.version}</version>
             </dependency>
 
+
             <!-- 三方云服务相关 -->
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/pom.xml b/yudao-framework/yudao-spring-boot-starter-rpc/pom.xml
index 767156231..937ef56bc 100644
--- a/yudao-framework/yudao-spring-boot-starter-rpc/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-rpc/pom.xml
@@ -36,6 +36,17 @@
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-okhttp</artifactId>
         </dependency>
+        <!--
+            TODO 芋艿：WxJava 4.8.x 的 AbstractWxMpConfigStorageConfiguration 仍引用了 HttpClient 4.x 的
+            org.apache.http.ssl.TrustStrategy 类。升级 Spring Cloud Alibaba 到 2025.0.0.0 后，Nacos 不再
+            传递 HttpClient 4.x（httpcore），导致 ClassNotFoundException。
+            临时解决：显式引入 httpclient 4.x。待 WxJava 修复后移除。
+        -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.14</version>
+        </dependency>
 
         <!-- 工具相关 -->
         <dependency>