fix: support worker label

Author: learnerjohn

himarket-bootstrap/src/main/java/com/alibaba/himarket/config/SecurityConfig.java

@@ -69,7 +69,7 @@ public class SecurityConfig {
         "/cli-providers",
         "/skills/*/download",
         "/workers/*/download",
-        "/worker-templates/*/package"
+        "/workers/*/files/**"
     };
 
     // Swagger endpoints

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

@@ -19,6 +19,7 @@
 
 package com.alibaba.himarket.support.product;
 
+import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -44,4 +45,9 @@ public class WorkerConfig {
      * AgentSpec name (corresponds to name in manifest.json)
      */
     private String agentSpecName;
+
+    /**
+     * Worker tags for categorization and search
+     */
+    private List<String> tags;
 }

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

@@ -20,11 +20,13 @@
 package com.alibaba.himarket.controller;
 
 import com.alibaba.himarket.core.annotation.AdminAuth;
+import com.alibaba.himarket.core.annotation.PublicAccess;
 import com.alibaba.himarket.dto.params.consumer.QuerySubscriptionParam;
 import com.alibaba.himarket.dto.params.portal.BindDomainParam;
 import com.alibaba.himarket.dto.params.portal.CreatePortalParam;
 import com.alibaba.himarket.dto.params.portal.UpdatePortalParam;
 import com.alibaba.himarket.dto.result.common.PageResult;
+import com.alibaba.himarket.dto.result.portal.PortalProfileResult;
 import com.alibaba.himarket.dto.result.portal.PortalResult;
 import com.alibaba.himarket.dto.result.product.ProductPublicationResult;
 import com.alibaba.himarket.dto.result.product.SubscriptionResult;
@@ -43,14 +45,14 @@
 @Slf4j
 @Validated
 @Tag(name = "门户管理")
-@AdminAuth
 @RequiredArgsConstructor
 public class PortalController {
 
     private final PortalService portalService;
 
     @Operation(summary = "创建门户")
     @PostMapping
+    @AdminAuth
     public PortalResult createPortal(@Valid @RequestBody CreatePortalParam param) {
         return portalService.createPortal(param);
     }
@@ -61,34 +63,46 @@ public PortalResult getPortal(@PathVariable String portalId) {
         return portalService.getPortal(portalId);
     }
 
+    @Operation(summary = "获取当前门户信息")
+    @GetMapping("/profile")
+    @PublicAccess
+    public PortalProfileResult getPortalProfile() {
+        return portalService.getPortalProfile();
+    }
+
     @Operation(summary = "获取门户列表")
     @GetMapping
+    @AdminAuth
     public PageResult<PortalResult> listPortals(Pageable pageable) {
         return portalService.listPortals(pageable);
     }
 
     @Operation(summary = "更新门户信息")
     @PutMapping("/{portalId}")
+    @AdminAuth
     public PortalResult updatePortal(
             @PathVariable String portalId, @Valid @RequestBody UpdatePortalParam param) {
         return portalService.updatePortal(portalId, param);
     }
 
     @Operation(summary = "删除门户")
     @DeleteMapping("/{portalId}")
+    @AdminAuth
     public void deletePortal(@PathVariable String portalId) {
         portalService.deletePortal(portalId);
     }
 
     @Operation(summary = "绑定域名")
     @PostMapping("/{portalId}/domains")
+    @AdminAuth
     public PortalResult bindDomain(
             @PathVariable String portalId, @Valid @RequestBody BindDomainParam param) {
         return portalService.bindDomain(portalId, param);
     }
 
     @Operation(summary = "解绑域名")
     @DeleteMapping("/{portalId}/domains/{domain}")
+    @AdminAuth
     public PortalResult unbindDomain(@PathVariable String portalId, @PathVariable String domain) {
         return portalService.unbindDomain(portalId, domain);
     }
@@ -103,6 +117,7 @@ public PageResult<ProductPublicationResult> getPortalPublications(
 
     @Operation(summary = "获取门户上的API产品订阅列表")
     @GetMapping("/{portalId}/subscriptions")
+    @AdminAuth
     public PageResult<SubscriptionResult> listSubscriptions(
             @PathVariable String portalId, QuerySubscriptionParam param, Pageable pageable) {
         return portalService.listSubscriptions(portalId, param, pageable);

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

@@ -1,11 +1,11 @@
 package com.alibaba.himarket.controller;
 
 import com.alibaba.himarket.core.annotation.AdminAuth;
-import com.alibaba.himarket.core.annotation.AdminOrDeveloperAuth;
 import com.alibaba.himarket.core.annotation.PublicAccess;
 import com.alibaba.himarket.dto.params.worker.PublishWorkerVersionParam;
 import com.alibaba.himarket.dto.params.worker.SetLatestWorkerVersionParam;
 import com.alibaba.himarket.dto.params.worker.UpdateWorkerVersionStatusParam;
+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.VersionResult;
@@ -68,7 +68,7 @@ public FileContentResult getFileContent(
 
     @Operation(summary = "List Skill versions")
     @GetMapping("/{productId}/versions")
-    @AdminOrDeveloperAuth
+    @PublicAccess
     public List<VersionResult> listVersions(@PathVariable String productId) {
         return skillService.listVersions(productId);
     }
@@ -115,4 +115,11 @@ public void downloadPackage(
             throws IOException {
         skillService.downloadPackage(productId, version, response);
     }
+
+    @Operation(summary = "Get CLI download info for Skill detail page")
+    @GetMapping("/{productId}/cli-info")
+    @PublicAccess
+    public CliDownloadInfo getCliDownloadInfo(@PathVariable String productId) {
+        return skillService.getCliDownloadInfo(productId);
+    }
 }

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

@@ -1,10 +1,11 @@
 package com.alibaba.himarket.controller;
 
 import com.alibaba.himarket.core.annotation.AdminAuth;
-import com.alibaba.himarket.core.annotation.AdminOrDeveloperAuth;
+import com.alibaba.himarket.core.annotation.PublicAccess;
 import com.alibaba.himarket.dto.params.worker.PublishWorkerVersionParam;
 import com.alibaba.himarket.dto.params.worker.SetLatestWorkerVersionParam;
 import com.alibaba.himarket.dto.params.worker.UpdateWorkerVersionStatusParam;
+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.VersionResult;
@@ -48,15 +49,15 @@ public void deleteWorker(@PathVariable String productId) {
 
     @Operation(summary = "Get Worker file tree")
     @GetMapping("/{productId}/files")
-    @AdminOrDeveloperAuth
+    @PublicAccess
     public List<FileTreeNode> getFileTree(
             @PathVariable String productId, @RequestParam(required = false) String version) {
         return workerService.getFileTree(productId, version);
     }
 
     @Operation(summary = "Get Worker file content")
     @GetMapping("/{productId}/files/{*filePath}")
-    @AdminOrDeveloperAuth
+    @PublicAccess
     public FileContentResult getFileContent(
             @PathVariable String productId,
             @PathVariable String filePath,
@@ -67,7 +68,7 @@ public FileContentResult getFileContent(
 
     @Operation(summary = "List Worker versions")
     @GetMapping("/{productId}/versions")
-    @AdminOrDeveloperAuth
+    @PublicAccess
     public List<VersionResult> listVersions(@PathVariable String productId) {
         return workerService.listVersions(productId);
     }
@@ -114,4 +115,11 @@ public void downloadPackage(
             throws IOException {
         workerService.downloadPackage(productId, version, response);
     }
+
+    @Operation(summary = "Get CLI download info for Worker detail page")
+    @GetMapping("/{productId}/cli-info")
+    @PublicAccess
+    public CliDownloadInfo getCliDownloadInfo(@PathVariable String productId) {
+        return workerService.getCliDownloadInfo(productId);
+    }
 }

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

@@ -24,7 +24,6 @@
 import com.alibaba.himarket.support.enums.DomainType;
 import com.alibaba.himarket.support.enums.ProtocolType;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data
@@ -33,8 +32,7 @@ public class BindDomainParam implements InputConverter<PortalDomain> {
     @NotBlank(message = "Portal domain cannot be blank")
     private String domain;
 
-    @NotNull(message = "Domain protocol cannot be null")
-    private ProtocolType protocol;
+    private ProtocolType protocol = ProtocolType.HTTP;
 
     private DomainType type = DomainType.CUSTOM;
 }

himarket-server/src/main/java/com/alibaba/himarket/dto/params/portal/BindDomainParam.java

@@ -39,7 +39,7 @@ public class CreateProductParam implements InputConverter<Product> {
     @Size(max = 50, message = "API product name cannot exceed 50 characters")
     private String name;
 
-    @Size(max = 256, message = "API product description cannot exceed 256 characters")
+    @Size(max = 512, message = "API product description cannot exceed 512 characters")
     private String description;
 
     @NotNull(message = "API product type cannot be null")

himarket-server/src/main/java/com/alibaba/himarket/dto/params/product/CreateProductParam.java

@@ -0,0 +1,50 @@
+/*
+ * 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.cli;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * CLI download command info for Skill/Worker detail pages.
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CliDownloadInfo {
+
+    /**
+     * Nacos host address (without protocol and port)
+     */
+    private String nacosHost;
+
+    /**
+     * Skill or Worker name in Nacos
+     */
+    private String resourceName;
+
+    /**
+     * Resource type: "skill" or "worker"
+     */
+    private String resourceType;
+}

himarket-server/src/main/java/com/alibaba/himarket/dto/result/cli/CliDownloadInfo.java

@@ -33,14 +33,6 @@ public class NacosResult implements OutputConverter<NacosResult, NacosInstance>
 
     private String serverUrl;
 
-    private String username;
-
-    private String accessKey;
-
-    private String description;
-
-    private String adminId;
-
     private Boolean isDefault;
 
     private String defaultNamespace;