fix: support import skill/worker from nacos

Author: learnerjohn

himarket-dal/src/main/java/com/alibaba/himarket/support/product/SkillConfig.java

@@ -32,32 +32,27 @@
 public class SkillConfig {
 
     /**
-     * 技能标签列表
+     * List of skill tags
      */
     private List<String> skillTags;
 
     /**
-     * 下载次数
+     * Download count
      */
     private Long downloadCount;
 
     /**
-     * 关联的 Nacos 实例 ID（nacos_instance.nacos_id）
+     * Associated Nacos instance ID (nacos_instance.nacos_id)
      */
     private String nacosId;
 
     /**
-     * Nacos 命名空间，默认 "public"
+     * Nacos namespace, defaults to "public"
      */
     private String namespace;
 
     /**
-     * Nacos Skill name（唯一标识）
+     * Nacos Skill name (unique identifier)
      */
     private String skillName;
-
-    /**
-     * Last published version in Nacos (e.g. v3)
-     */
-    private String currentVersion;
 }

himarket-dal/src/main/java/com/alibaba/himarket/support/product/WorkerConfig.java

@@ -50,4 +50,9 @@ public class WorkerConfig {
      * Worker tags for categorization and search
      */
     private List<String> tags;
+
+    /**
+     * Worker download count
+     */
+    private long downloadCount;
 }

himarket-server/src/main/java/com/alibaba/himarket/controller/DeveloperController.java

@@ -21,6 +21,7 @@
 
 import com.alibaba.himarket.core.annotation.AdminAuth;
 import com.alibaba.himarket.core.annotation.DeveloperAuth;
+import com.alibaba.himarket.core.annotation.PublicAccess;
 import com.alibaba.himarket.dto.params.admin.ResetPasswordParam;
 import com.alibaba.himarket.dto.params.developer.*;
 import com.alibaba.himarket.dto.params.login.LoginParam;
@@ -73,20 +74,18 @@ public PageResult<DeveloperResult> listDevelopers(
         return developerService.listDevelopers(param, pageable);
     }
 
-    @Operation(summary = "获取当前开发者信息", description = "开发者功能：获取当前登录开发者的个人信息")
+    @Operation(summary = "获取当前开发者信息", description = "获取当前登录开发者的个人信息，未登录返回 null")
     @GetMapping("/profile")
-    @DeveloperAuth
+    @PublicAccess
     public DeveloperResult getCurrentDeveloperInfo() {
         return developerService.getCurrentDeveloperInfo();
     }
 
     @Operation(summary = "开发者修改密码", description = "修改当前登录开发者的密码")
     @PatchMapping("/password")
     @DeveloperAuth
-    public String changePassword(@RequestBody ResetPasswordParam param) {
-        developerService.changeCurrentDeveloperPassword(
-                param.getOldPassword(), param.getNewPassword());
-        return "修改密码成功";
+    public void changePassword(@RequestBody ResetPasswordParam param) {
+        developerService.resetDeveloperPassword(param.getOldPassword(), param.getNewPassword());
     }
 
     @Operation(summary = "开发者更新个人信息", description = "开发者功能：更新当前登录开发者的个人信息")

himarket-server/src/main/java/com/alibaba/himarket/controller/SkillController.java

@@ -8,6 +8,7 @@
 import com.alibaba.himarket.dto.result.cli.CliDownloadInfo;
 import com.alibaba.himarket.dto.result.common.FileContentResult;
 import com.alibaba.himarket.dto.result.common.FileTreeNode;
+import com.alibaba.himarket.dto.result.common.ImportResult;
 import com.alibaba.himarket.dto.result.common.VersionResult;
 import com.alibaba.himarket.service.SkillService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -122,4 +123,12 @@ public void downloadPackage(
     public CliDownloadInfo getCliDownloadInfo(@PathVariable String productId) {
         return skillService.getCliDownloadInfo(productId);
     }
+
+    @Operation(summary = "Import Skills from Nacos")
+    @PostMapping("/import")
+    @AdminAuth
+    public ImportResult importFromNacos(
+            @RequestParam String nacosId, @RequestParam(required = false) String namespace) {
+        return skillService.importFromNacos(nacosId, namespace);
+    }
 }

himarket-server/src/main/java/com/alibaba/himarket/controller/WorkerController.java

@@ -8,6 +8,7 @@
 import com.alibaba.himarket.dto.result.cli.CliDownloadInfo;
 import com.alibaba.himarket.dto.result.common.FileContentResult;
 import com.alibaba.himarket.dto.result.common.FileTreeNode;
+import com.alibaba.himarket.dto.result.common.ImportResult;
 import com.alibaba.himarket.dto.result.common.VersionResult;
 import com.alibaba.himarket.service.WorkerService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -122,4 +123,12 @@ public void downloadPackage(
     public CliDownloadInfo getCliDownloadInfo(@PathVariable String productId) {
         return workerService.getCliDownloadInfo(productId);
     }
+
+    @Operation(summary = "Import Workers from Nacos")
+    @PostMapping("/import")
+    @AdminAuth
+    public ImportResult importFromNacos(
+            @RequestParam String nacosId, @RequestParam(required = false) String namespace) {
+        return workerService.importFromNacos(nacosId, namespace);
+    }
 }

himarket-server/src/main/java/com/alibaba/himarket/core/event/ProductQueriedEvent.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.alibaba.himarket.core.event;
+
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Event triggered when products are queried (list or get). Used to trigger async sync of download
+ * counts from Nacos.
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductQueriedEvent {
+
+    /** List of product IDs that were queried */
+    private List<String> productIds;
+}

himarket-server/src/main/java/com/alibaba/himarket/dto/result/common/ImportResult.java

@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.alibaba.himarket.dto.result.common;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Result of importing resources from Nacos.
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ImportResult {
+
+    /** Resource type: "skill" or "worker" */
+    private String resourceType;
+
+    /** Number of successfully imported resources */
+    private int successCount;
+
+    /** Number of skipped resources (already exist) */
+    private int skippedCount;
+}

himarket-server/src/main/java/com/alibaba/himarket/service/DeveloperService.java

@@ -150,7 +150,6 @@ public interface DeveloperService {
      *
      * @param oldPassword 旧密码
      * @param newPassword 新密码
-     * @return 是否成功
      */
-    boolean changeCurrentDeveloperPassword(String oldPassword, String newPassword);
+    void resetDeveloperPassword(String oldPassword, String newPassword);
 }

himarket-server/src/main/java/com/alibaba/himarket/service/SkillService.java

@@ -3,6 +3,7 @@
 import com.alibaba.himarket.dto.result.cli.CliDownloadInfo;
 import com.alibaba.himarket.dto.result.common.FileContentResult;
 import com.alibaba.himarket.dto.result.common.FileTreeNode;
+import com.alibaba.himarket.dto.result.common.ImportResult;
 import com.alibaba.himarket.dto.result.common.VersionResult;
 import com.alibaba.nacos.api.ai.model.skills.Skill;
 import jakarta.servlet.http.HttpServletResponse;
@@ -146,4 +147,13 @@ void downloadPackage(String productId, String version, HttpServletResponse respo
      * @return the CLI download info containing nacosHost and resource name
      */
     CliDownloadInfo getCliDownloadInfo(String productId);
+
+    /**
+     * Import skills from Nacos
+     *
+     * @param nacosId   Nacos instance ID
+     * @param namespace Nacos namespace
+     * @return import result with success and skipped counts
+     */
+    ImportResult importFromNacos(String nacosId, String namespace);
 }

himarket-server/src/main/java/com/alibaba/himarket/service/WorkerService.java

@@ -3,6 +3,7 @@
 import com.alibaba.himarket.dto.result.cli.CliDownloadInfo;
 import com.alibaba.himarket.dto.result.common.FileContentResult;
 import com.alibaba.himarket.dto.result.common.FileTreeNode;
+import com.alibaba.himarket.dto.result.common.ImportResult;
 import com.alibaba.himarket.dto.result.common.VersionResult;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -102,4 +103,13 @@ void downloadPackage(String productId, String version, HttpServletResponse respo
      * @return the CLI download info containing nacosHost and resource name
      */
     CliDownloadInfo getCliDownloadInfo(String productId);
+
+    /**
+     * Import workers from Nacos
+     *
+     * @param nacosId Nacos instance ID
+     * @param namespace Nacos namespace
+     * @return import result with success and skipped counts
+     */
+    ImportResult importFromNacos(String nacosId, String namespace);
 }