Ver Fonte

fix(plugin-market): 市场目录迁到 qingjian/system 并由 PathConst 维护

插件市场属于程序资产,不应放在 ai-server/data 这类运行目录。PathConst
新增 PLUGIN_MARKET_PATH、PLUGIN_MARKET_CATALOG_PATH 和
PLUGIN_MARKET_PACKAGES_PATH,统一指向 qingjian/system/plugin-market。

控制器改用这些常量,删除 plugin.market.root-path 配置,接口路径与行为
不变。目录和 117 个最新包已迁移到新位置。
cc há 1 semana atrás
pai
commit
ca04f74a3c

+ 13 - 0
ai-server/src/main/java/com/zsjz/ai/common/constants/PathConst.java

@@ -103,6 +103,19 @@ public class PathConst {
     public static final Path TOOLS_PATH = SYSTEM_PATH.resolve("tools");
     public static final Path TOOLS_PATH = SYSTEM_PATH.resolve("tools");
     public static final Path EXTENSION_PATH = SYSTEM_PATH.resolve("extension");
     public static final Path EXTENSION_PATH = SYSTEM_PATH.resolve("extension");
 
 
+    /**
+     * 本机插件市场(桌面端 {@code /plugin/**} 接口),属于系统资产。
+     *
+     * <pre>
+     * qingjian/system/plugin-market/
+     * ├── catalog.json
+     * └── packages/*.piplug
+     * </pre>
+     */
+    public static final Path PLUGIN_MARKET_PATH = SYSTEM_PATH.resolve("plugin-market");
+    public static final Path PLUGIN_MARKET_CATALOG_PATH = PLUGIN_MARKET_PATH.resolve("catalog.json");
+    public static final Path PLUGIN_MARKET_PACKAGES_PATH = PLUGIN_MARKET_PATH.resolve("packages");
+
     /**
     /**
      * 内置 Python 解释器(随项目分发,不依赖系统 PATH)。
      * 内置 Python 解释器(随项目分发,不依赖系统 PATH)。
      *
      *

+ 7 - 12
ai-server/src/main/java/com/zsjz/ai/module/plugin/controller/PluginMarketController.java

@@ -2,8 +2,8 @@ package com.zsjz.ai.module.plugin.controller;
 
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.zsjz.ai.common.constants.PathConst;
 import com.zsjz.ai.common.exception.ServerException;
 import com.zsjz.ai.common.exception.ServerException;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.CacheControl;
 import org.springframework.http.CacheControl;
@@ -19,7 +19,6 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
 
 import java.nio.file.Files;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.time.Duration;
 import java.time.Duration;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.List;
@@ -30,9 +29,9 @@ import java.util.regex.Pattern;
  * 本机插件市场:目录、插件包和安装解析接口。
  * 本机插件市场:目录、插件包和安装解析接口。
  *
  *
  * <p>桌面端 host-core 以匿名 HTTP 直接读取这三个接口,不走登录态,因此
  * <p>桌面端 host-core 以匿名 HTTP 直接读取这三个接口,不走登录态,因此
- * {@code /plugin/**} 必须加入 Sa-Token 白名单。目录与包位于
- * {@code plugin.market.root-path} 下:{@code catalog.json} 与
- * {@code packages/*.piplug}。
+ * {@code /plugin/**} 必须加入 Sa-Token 白名单。目录与包属于系统资产,路径由
+ * {@link PathConst#PLUGIN_MARKET_PATH} 维护:{@code qingjian/system/plugin-market}
+ * 下的 {@code catalog.json} 与 {@code packages/*.piplug}。
  */
  */
 @RestController
 @RestController
 @RequestMapping("/plugin")
 @RequestMapping("/plugin")
@@ -42,13 +41,9 @@ public class PluginMarketController {
     private static final Pattern PACKAGE_NAME =
     private static final Pattern PACKAGE_NAME =
             Pattern.compile("^[A-Za-z0-9][A-Za-z0-9._-]*\\.piplug$");
             Pattern.compile("^[A-Za-z0-9][A-Za-z0-9._-]*\\.piplug$");
 
 
-    private final Path marketRoot;
     private final ObjectMapper objectMapper;
     private final ObjectMapper objectMapper;
 
 
-    public PluginMarketController(
-            @Value("${plugin.market.root-path:./data/plugin-market}") String rootPath,
-            ObjectMapper objectMapper) {
-        this.marketRoot = Paths.get(rootPath).toAbsolutePath().normalize();
+    public PluginMarketController(ObjectMapper objectMapper) {
         this.objectMapper = objectMapper;
         this.objectMapper = objectMapper;
     }
     }
 
 
@@ -71,7 +66,7 @@ public class PluginMarketController {
         if (!PACKAGE_NAME.matcher(filename).matches()) {
         if (!PACKAGE_NAME.matcher(filename).matches()) {
             throw new ServerException(400, "非法的插件包文件名");
             throw new ServerException(400, "非法的插件包文件名");
         }
         }
-        Path packagesRoot = marketRoot.resolve("packages").normalize();
+        Path packagesRoot = PathConst.PLUGIN_MARKET_PACKAGES_PATH.toAbsolutePath().normalize();
         Path file = packagesRoot.resolve(filename).normalize();
         Path file = packagesRoot.resolve(filename).normalize();
         if (!file.startsWith(packagesRoot) || !Files.isRegularFile(file)) {
         if (!file.startsWith(packagesRoot) || !Files.isRegularFile(file)) {
             throw new ServerException(404, "插件包不存在");
             throw new ServerException(404, "插件包不存在");
@@ -130,7 +125,7 @@ public class PluginMarketController {
     }
     }
 
 
     private Path catalogPath() {
     private Path catalogPath() {
-        return marketRoot.resolve("catalog.json").normalize();
+        return PathConst.PLUGIN_MARKET_CATALOG_PATH.toAbsolutePath().normalize();
     }
     }
 
 
     private static JsonNode findVersion(JsonNode catalog, String pluginId, String version) {
     private static JsonNode findVersion(JsonNode catalog, String pluginId, String version) {

+ 0 - 7
ai-server/src/main/resources/application.yaml

@@ -29,13 +29,6 @@ storage:
     # /files/** 由 LocalFileResourceConfig 映射到 root-path。
     # /files/** 由 LocalFileResourceConfig 映射到 root-path。
     base-url: "${STORAGE_LOCAL_BASE_URL:http://localhost:8980/js/a}"
     base-url: "${STORAGE_LOCAL_BASE_URL:http://localhost:8980/js/a}"
 
 
-# 本机插件市场(桌面端 /plugin/** 接口,匿名可读)。
-# catalog.json 与 packages/*.piplug 放在 root-path 下;目录和包的访问地址
-# 固定为 http://127.0.0.1:8980/js/a/plugin/...,与桌面端内置的市场地址一致。
-plugin:
-  market:
-    root-path: "${PLUGIN_MARKET_ROOT:./data/plugin-market}"
-
 # 主 Agent 运行参数
 # 主 Agent 运行参数
 agent:
 agent:
   # 单次提问的最大「推理→工具」循环轮数(专家未单独配置 max_iters 时生效)。
   # 单次提问的最大「推理→工具」循环轮数(专家未单独配置 max_iters 时生效)。