将FileService和GitService迁移至service子包；控制器参数使用@Body注解并结合Reactive方式改进MCP错误处理

Author: SolonCode

soloncode-cli/src/main/java/org/noear/solon/codecli/portal/web/WebController.java

@@ -26,6 +26,8 @@
 import org.noear.solon.annotation.*;
 import org.noear.solon.codecli.config.AgentFlags;
 import org.noear.solon.codecli.command.builtin.*;
+import org.noear.solon.codecli.portal.web.service.FileService;
+import org.noear.solon.codecli.portal.web.service.GitService;
 import org.noear.solon.core.handle.Context;
 import org.noear.solon.core.handle.Result;
 import org.noear.solon.core.handle.UploadedFile;

soloncode-cli/src/main/java/org/noear/solon/codecli/portal/web/WebSettingsController.java

@@ -75,6 +75,7 @@
 import java.time.Duration;
 import java.util.*;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Web 设置控制器 —— SolonCode Web UI 的设置管理 HTTP 入口。
@@ -782,9 +783,9 @@ public Result mcpServersToggle(@Param("name") String name, @Param("enabled") boo
      */
     @Post
     @Mapping("/web/settings/mcp/servers/check")
-    public Result mcpServersCheck(Context ctx) {
+    public Result mcpServersCheck(String json) {
         try {
-            ONode root = ONode.ofJson(ctx.body());
+            ONode root = ONode.ofJson(json);
             String type = root.get("type").getString();
             if (type == null || type.isEmpty()) type = "stdio";
 
@@ -842,10 +843,22 @@ public Result mcpServersCheck(Context ctx) {
                 }
 
                 McpClientProvider client = builder.build();
+                AtomicReference<Throwable> errorRef = new AtomicReference<>();
                 try {
                     // 通过 getTools() 触发 MCP 初始化握手，验证连接有效性
-                    client.getTools();
+                    client.getClient().listTools()
+                            .doOnError(err -> {
+                                errorRef.set(err);
+                            })
+                            .block();
+
                     return Result.succeed("连接成功：MCP 初始化握手完成（" + type + "）");
+                } catch (Exception e) {
+                    if (errorRef.get() != null) {
+                        throw errorRef.get();
+                    } else {
+                        throw e;
+                    }
                 } finally {
                     client.close();
                 }
@@ -858,7 +871,7 @@ public Result mcpServersCheck(Context ctx) {
             return Result.failure("连接超时，请检查地址是否可达");
         } catch (java.io.IOException e) {
             return Result.failure("连接失败: " + e.getMessage());
-        } catch (Exception e) {
+        } catch (Throwable e) {
             return Result.failure("检测失败: " + e.getMessage());
         }
     }
@@ -1170,8 +1183,8 @@ public Result<List<Map>> openapiServers() throws Exception {
      */
     @Post
     @Mapping("/web/settings/openapi/servers/add")
-    public Result openapiServersAdd(Context ctx) throws Exception {
-        ONode root = ONode.ofJson(ctx.body());
+    public Result openapiServersAdd(@Body String json) throws Exception {
+        ONode root = ONode.ofJson(json);
         String name = root.get("name").getString();
         String apiBaseUrl = root.get("apiBaseUrl").getString();
 
@@ -1226,8 +1239,8 @@ public Result openapiServersAdd(Context ctx) throws Exception {
      */
     @Post
     @Mapping("/web/settings/openapi/servers/update")
-    public Result openapiServersUpdate(Context ctx) throws Exception {
-        ONode root = ONode.ofJson(ctx.body());
+    public Result openapiServersUpdate(@Body String json) throws Exception {
+        ONode root = ONode.ofJson(json);
         String name = root.get("name").getString();
         String originalName = root.get("originalName").getString();
 

…olon/codecli/portal/web/FileService.java …ecli/portal/web/service/FileService.javasoloncode-cli/src/main/java/org/noear/solon/codecli/portal/web/FileService.java renamed to soloncode-cli/src/main/java/org/noear/solon/codecli/portal/web/service/FileService.java soloncode-cli/src/main/java/org/noear/solon/codecli/portal/web/FileService.java renamed to soloncode-cli/src/main/java/org/noear/solon/codecli/portal/web/service/FileService.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.noear.solon.codecli.portal.web;
+package org.noear.solon.codecli.portal.web.service;
 
+import org.noear.solon.codecli.portal.web.WebController;
 import org.noear.solon.core.handle.Result;
 
 import java.io.BufferedReader;

…solon/codecli/portal/web/GitService.java …decli/portal/web/service/GitService.javasoloncode-cli/src/main/java/org/noear/solon/codecli/portal/web/GitService.java renamed to soloncode-cli/src/main/java/org/noear/solon/codecli/portal/web/service/GitService.java soloncode-cli/src/main/java/org/noear/solon/codecli/portal/web/GitService.java renamed to soloncode-cli/src/main/java/org/noear/solon/codecli/portal/web/service/GitService.java

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.noear.solon.codecli.portal.web;
+package org.noear.solon.codecli.portal.web.service;
 
 import org.noear.solon.ai.agent.AgentSession;
 import org.noear.solon.ai.chat.ChatModel;
 import org.noear.solon.ai.harness.HarnessEngine;
 import org.noear.solon.ai.agent.react.ReActAgent;
+import org.noear.solon.codecli.portal.web.WebController;
 import org.noear.solon.core.handle.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;