v1.38.9

CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
+
+### Bug Fixes
+
+* 修复部署到openwrt错误的bug ([9ac33f9](https://github.com/certd/certd/commit/9ac33f9b9ba7727fcbbd320dd866bc048cbb3d72))
+* 修复新版本上传到阿里云cas后，其他依赖任务无法部署的bug ([99f5b8e](https://github.com/certd/certd/commit/99f5b8ebc1c64798ceb42042ad71cf71e967beb0))
+* esxi部署失败的bug ([6ab1fca](https://github.com/certd/certd/commit/6ab1fcaf894f7ce343af4b5bf4b0d67438df6618))
+
+### Performance Improvements
+
+* 修改sql升级语句，兼容mysql5.7 ([02f89a9](https://github.com/certd/certd/commit/02f89a9c9d77850437285844670aed441e5953c3))
+* 已登录状态访问登录页面自动跳转到首页 ([bd8caff](https://github.com/certd/certd/commit/bd8caff0b754cb13530cf0f1644b33e29fde5d01))
+* 优化access授权支持remote-auto-complete ([2f40f79](https://github.com/certd/certd/commit/2f40f795ee6131132d3fab2601f92a567bbdc4b7))
+* access 插件支持remote-select等配置 ([d286c04](https://github.com/certd/certd/commit/d286c040a5232dcca829945734affead3ee08b3c))
+
 ## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
 
 ### Performance Improvements

docker/run/docker-compose.yaml

@@ -62,7 +62,7 @@ services:
 #      - certd_typeorm_dataSource_default_password=yourpasswd            # 密码
 #      - certd_typeorm_dataSource_default_database=certd                 # 数据库名
 
-#                                    #↓↓↓↓ ----------------------------- 使用mysql数据库，需要提前创建数据库 charset=utf8mb4, collation=utf8mb4_bin
+#                                    #↓↓↓↓ ----------------------------- 使用mysql8数据库，需要提前创建数据库 charset=utf8mb4, collation=utf8mb4_bin
 #      - certd_flyway_scriptDir=./db/migration-mysql                     # 升级脚本目录
 #      - certd_typeorm_dataSource_default_type=mysql                     # 数据库类型， 或者 mariadb
 #      - certd_typeorm_dataSource_default_host=localhost                 # 数据库地址

docs/guide/plugins/deploy.md

@@ -58,7 +58,7 @@
 | 3.| **Dokploy-部署server证书** | 自动更新Dokploy server证书 | 
 | 4.| **飞牛NAS-部署证书** |  | 
 | 5.| **1Panel-部署面板证书** | 更新1Panel的面板证书 | 
-| 6.| **1Panel-更新证书** | 更新1Panel的证书，包括面板证书和站点证书 | 
+| 6.| **1Panel-更新站点证书** | 更新1Panel的站点证书 | 
 | 7.| **宝塔-删除过期证书** | 删除证书夹中过期证书 | 
 | 8.| **宝塔-WAF证书部署** | 部署宝塔云WAF/aaWAF | 
 | 9.| **宝塔-面板证书部署** | 部署宝塔面板本身的ssl证书 | 

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.38.8"
+  "version": "1.38.9"
 }

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.9](https://github.com/publishlab/node-acme-client/compare/v1.38.8...v1.38.9) (2026-02-09)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.38.8](https://github.com/publishlab/node-acme-client/compare/v1.38.7...v1.38.8) (2026-02-06)
 
 ### Performance Improvements

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.38.8",
+    "version": "1.38.9",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.38.8",
+        "@certd/basic": "^1.38.9",
         "@peculiar/x509": "^1.11.0",
         "asn1js": "^3.0.5",
         "axios": "^1.9.0",

packages/core/basic/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
+
+### Bug Fixes
+
+* esxi部署失败的bug ([6ab1fca](https://github.com/certd/certd/commit/6ab1fcaf894f7ce343af4b5bf4b0d67438df6618))
+
 ## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
 
 **Note:** Version bump only for package @certd/basic

packages/core/basic/build.md

@@ -1 +1 @@
-02:23
+23:08

packages/core/basic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.38.8",
+  "version": "1.38.9",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

packages/core/basic/src/utils/util.merge.ts

@@ -1,4 +1,4 @@
-import * as _ from 'lodash-es';
+import * as _ from "lodash-es";
 function isUnMergeable(srcValue: any) {
   return srcValue != null && srcValue instanceof UnMergeable;
 }

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
+
+**Note:** Version bump only for package @certd/pipeline
+
 ## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
 
 **Note:** Version bump only for package @certd/pipeline

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.38.8",
+  "version": "1.38.9",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -18,8 +18,8 @@
     "compile": "tsc --skipLibCheck --watch"
   },
   "dependencies": {
-    "@certd/basic": "^1.38.8",
+    "@certd/basic": "^1.38.9",
-    "@certd/plus-core": "^1.38.8",
+    "@certd/plus-core": "^1.38.9",
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",
     "reflect-metadata": "^0.1.13"

packages/libs/lib-huawei/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
 
 **Note:** Version bump only for package @certd/lib-huawei

packages/libs/lib-huawei/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-huawei",
   "private": false,
-  "version": "1.38.8",
+  "version": "1.38.9",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
   "types": "./dist/d/index.d.ts",

packages/libs/lib-iframe/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
 ## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
 
 **Note:** Version bump only for package @certd/lib-iframe

packages/libs/lib-iframe/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-iframe",
   "private": false,
-  "version": "1.38.8",
+  "version": "1.38.9",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

packages/libs/lib-jdcloud/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
+
+**Note:** Version bump only for package @certd/jdcloud
+
 ## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
 
 **Note:** Version bump only for package @certd/jdcloud

packages/libs/lib-jdcloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/jdcloud",
-  "version": "1.38.8",
+  "version": "1.38.9",
   "description": "jdcloud openApi sdk",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",

packages/libs/lib-k8s/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 ## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
 
 **Note:** Version bump only for package @certd/lib-k8s

packages/libs/lib-k8s/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-k8s",
   "private": false,
-  "version": "1.38.8",
+  "version": "1.38.9",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -17,7 +17,7 @@
     "pub": "npm publish"
   },
   "dependencies": {
-    "@certd/basic": "^1.38.8",
+    "@certd/basic": "^1.38.9",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {

packages/libs/lib-server/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
+
+**Note:** Version bump only for package @certd/lib-server
+
 ## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
 
 ### Performance Improvements

packages/libs/lib-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/lib-server",
-  "version": "1.38.8",
+  "version": "1.38.9",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -28,11 +28,11 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.38.8",
+    "@certd/acme-client": "^1.38.9",
-    "@certd/basic": "^1.38.8",
+    "@certd/basic": "^1.38.9",
-    "@certd/pipeline": "^1.38.8",
+    "@certd/pipeline": "^1.38.9",
-    "@certd/plugin-lib": "^1.38.8",
+    "@certd/plugin-lib": "^1.38.9",
-    "@certd/plus-core": "^1.38.8",
+    "@certd/plus-core": "^1.38.9",
     "@midwayjs/cache": "3.14.0",
     "@midwayjs/core": "3.20.11",
     "@midwayjs/i18n": "3.20.13",

packages/libs/midway-flyway-js/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
+
+### Performance Improvements
+
+* 修改sql升级语句，兼容mysql5.7 ([02f89a9](https://github.com/certd/certd/commit/02f89a9c9d77850437285844670aed441e5953c3))
+
 ## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
 
 **Note:** Version bump only for package @certd/midway-flyway-js

packages/libs/midway-flyway-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/midway-flyway-js",
-  "version": "1.38.8",
+  "version": "1.38.9",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",

packages/libs/midway-flyway-js/src/flyway.ts

@@ -31,6 +31,12 @@ const DefaultLogger = {
     console.error(args);
   },
 };
+
+let customLogger:any = null;
+export function setFlywayLogger (logger: any) {
+  customLogger = logger;
+};
+
 export class Flyway {
   scriptDir;
   flywayTableName;
@@ -43,7 +49,7 @@ export class Flyway {
     this.flywayTableName = opts.flywayTableName ?? 'flyway_history';
     this.baseline = opts.baseline ?? false;
     this.allowHashNotMatch = opts.allowHashNotMatch ?? false;
-    this.logger = opts.logger || DefaultLogger;
+    this.logger = customLogger || opts.logger || DefaultLogger;
     this.connection = opts.connection;
   }
 

packages/libs/midway-flyway-js/src/index.ts

@@ -1,6 +1,3 @@
-// src/index.ts
 export { FlywayConfiguration as Configuration } from './configuration.js';
-// eslint-disable-next-line node/no-unpublished-import
+export { Flyway, setFlywayLogger } from './flyway.js';
-export { Flyway } from './flyway.js';
-// eslint-disable-next-line node/no-unpublished-import
 export { FlywayHistory } from './entity.js';

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
 ## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
 
 **Note:** Version bump only for package @certd/plugin-cert

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.38.8",
+  "version": "1.38.9",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -17,10 +17,10 @@
     "compile": "tsc --skipLibCheck --watch"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.38.8",
+    "@certd/acme-client": "^1.38.9",
-    "@certd/basic": "^1.38.8",
+    "@certd/basic": "^1.38.9",
-    "@certd/pipeline": "^1.38.8",
+    "@certd/pipeline": "^1.38.9",
-    "@certd/plugin-lib": "^1.38.8",
+    "@certd/plugin-lib": "^1.38.9",
     "psl": "^1.9.0",
     "punycode.js": "^2.3.1"
   },

packages/plugins/plugin-lib/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
 ## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
 
 **Note:** Version bump only for package @certd/plugin-lib

packages/plugins/plugin-lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-lib",
   "private": false,
-  "version": "1.38.8",
+  "version": "1.38.9",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -22,10 +22,10 @@
     "@alicloud/pop-core": "^1.7.10",
     "@alicloud/tea-util": "^1.4.11",
     "@aws-sdk/client-s3": "^3.964.0",
-    "@certd/acme-client": "^1.38.8",
+    "@certd/acme-client": "^1.38.9",
-    "@certd/basic": "^1.38.8",
+    "@certd/basic": "^1.38.9",
-    "@certd/pipeline": "^1.38.8",
+    "@certd/pipeline": "^1.38.9",
-    "@certd/plus-core": "^1.38.8",
+    "@certd/plus-core": "^1.38.9",
     "@kubernetes/client-node": "0.21.0",
     "ali-oss": "^6.22.0",
     "basic-ftp": "^5.0.5",

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
+
+### Performance Improvements
+
+* 已登录状态访问登录页面自动跳转到首页 ([bd8caff](https://github.com/certd/certd/commit/bd8caff0b754cb13530cf0f1644b33e29fde5d01))
+* 优化access授权支持remote-auto-complete ([2f40f79](https://github.com/certd/certd/commit/2f40f795ee6131132d3fab2601f92a567bbdc4b7))
+* access 插件支持remote-select等配置 ([d286c04](https://github.com/certd/certd/commit/d286c040a5232dcca829945734affead3ee08b3c))
+
 ## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
 
 ### Performance Improvements

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.38.8",
+  "version": "1.38.9",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -106,8 +106,8 @@
     "zod-defaults": "^0.1.3"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.38.8",
+    "@certd/lib-iframe": "^1.38.9",
-    "@certd/pipeline": "^1.38.8",
+    "@certd/pipeline": "^1.38.9",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

packages/ui/certd-client/src/components/plugins/common/remote-auto-complete.vue

@@ -23,7 +23,7 @@ defineOptions({
 
 const props = defineProps<
   {
-    watches: string[];
+    watches?: string[];
   } & ComponentPropsType
 >();
 
@@ -48,6 +48,18 @@ const message = ref("");
 const hasError = ref(false);
 const loading = ref(false);
 
+function getInputFromForm(form: any, pluginType: string) {
+  let input: any = {};
+  if (pluginType === "plugin") {
+    input = form?.input || {};
+  } else if (pluginType === "access") {
+    input = form?.access || {};
+  } else {
+    input = form || {};
+  }
+  return input;
+}
+
 const getOptions = async () => {
   if (loading.value) {
     return;
@@ -63,15 +75,14 @@ const getOptions = async () => {
   }
   const pluginType = getPluginType();
   const { form } = getScope();
-  const input = (pluginType === "plugin" ? form?.input : form) || {};
+  const input = getInputFromForm(form, pluginType);
-
   for (let key in define.input) {
     const inWatches = props.watches?.includes(key);
     const inputDefine = define.input[key];
     if (inWatches && inputDefine.required) {
       const value = input[key];
       if (value == null || value === "") {
-        console.log("remote-select required", key);
+        console.log("remote-auto-complete required", key);
         return;
       }
     }
@@ -129,12 +140,14 @@ watch(
   () => {
     const pluginType = getPluginType();
     const { form, key } = getScope();
-    const input = (pluginType === "plugin" ? form?.input : form) || {};
+    const input = getInputFromForm(form, pluginType);
-    const watches = {};
+    const watches: any = {};
-    for (const key of props.watches) {
+    if (props.watches && props.watches.length > 0) {
-      //@ts-ignore
+      for (const key of props.watches) {
-      watches[key] = input[key];
+        watches[key] = input[key];
+      }
     }
+
     return {
       form: watches,
       key,
@@ -144,6 +157,9 @@ watch(
     const { form } = value;
     const oldForm: any = oldValue?.form;
     let changed = oldForm == null || optionsRef.value.length == 0;
+    if (!props.watches || props.watches.length === 0) {
+      return;
+    }
     for (const key of props.watches) {
       //@ts-ignore
       if (oldForm && form[key] != oldForm[key]) {

packages/ui/certd-client/src/components/plugins/common/remote-select.vue

@@ -57,7 +57,7 @@ const VNodes = defineComponent({
 
 const props = defineProps<
   {
-    watches: string[];
+    watches?: string[];
     search?: boolean;
     pager?: boolean;
   } & ComponentPropsType
@@ -79,6 +79,17 @@ const getPluginType: any = inject("get:plugin:type", () => {
   return "plugin";
 });
 
+function getInputFromForm(form: any, pluginType: string) {
+  let input: any = {};
+  if (pluginType === "plugin") {
+    input = form?.input || {};
+  } else if (pluginType === "access") {
+    input = form?.access || {};
+  } else {
+    input = form || {};
+  }
+  return input;
+}
 const searchKeyRef = ref("");
 const optionsRef = ref([]);
 const message = ref("");
@@ -104,7 +115,7 @@ const getOptions = async () => {
   }
   const pluginType = getPluginType();
   const { form } = getScope();
-  const input = (pluginType === "plugin" ? form?.input : form) || {};
+  const input = getInputFromForm(form, pluginType);
 
   for (let key in define.input) {
     const inWatches = props.watches?.includes(key);
@@ -200,12 +211,14 @@ watch(
   () => {
     const pluginType = getPluginType();
     const { form, key } = getScope();
-    const input = (pluginType === "plugin" ? form?.input : form) || {};
+    const input = getInputFromForm(form, pluginType);
-    const watches = {};
+    const watches: any = {};
-    for (const key of props.watches) {
+    if (props.watches && props.watches.length > 0) {
-      //@ts-ignore
+      for (const key of props.watches) {
-      watches[key] = input[key];
+        watches[key] = input[key];
+      }
     }
+
     return {
       form: watches,
       key,
@@ -215,11 +228,12 @@ watch(
     const { form } = value;
     const oldForm: any = oldValue?.form;
     let changed = oldForm == null || optionsRef.value.length == 0;
-    for (const key of props.watches) {
+    if (props.watches && props.watches.length > 0) {
-      //@ts-ignore
+      for (const key of props.watches) {
-      if (oldForm && form[key] != oldForm[key]) {
+        if (oldForm && form[key] != oldForm[key]) {
-        changed = true;
+          changed = true;
-        break;
+          break;
+        }
       }
     }
     if (changed) {

packages/ui/certd-client/src/router/guard.ts

@@ -101,6 +101,14 @@ function setupAccessGuard(router: Router) {
       return r.meta?.auth || r.meta?.permission;
     });
 
+    if (to.path === LOGIN_PATH && accessStore.accessToken) {
+      return {
+        path: DEFAULT_HOME_PATH,
+        // 携带当前跳转的页面，登录后重新跳转该页面
+        replace: true,
+      };
+    }
+
     if (!needAuth) {
       return true;
     }

packages/ui/certd-client/src/views/certd/access/common.tsx

@@ -10,6 +10,9 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
   provide("get:plugin:type", () => {
     return "access";
   });
+  provide("getCurrentPluginDefine", () => {
+    return currentDefine;
+  });
   const AccessTypeDictRef = dict({
     url: "/pi/access/accessTypeDict",
   });

packages/ui/certd-client/src/views/certd/addon/common.tsx

@@ -1,12 +1,11 @@
 import { ColumnCompositionProps, compute, dict } from "@fast-crud/fast-crud";
+import { Modal } from "ant-design-vue";
+import { forEach, get, merge, set } from "lodash-es";
 import { computed, provide, ref, toRef } from "vue";
 import { useReference } from "/@/use/use-refrence";
-import { forEach, get, merge, set } from "lodash-es";
-import { Modal } from "ant-design-vue";
 import { mitter } from "/@/utils/util.mitt";
-import { useI18n } from "/src/locales";
-import * as pipelineApi from "/@/views/certd/pipeline/api";
 import { getAddonTypeDefine } from "/@/views/certd/addon/api";
+import { useI18n } from "/src/locales";
 
 export function addonProvide(api: any) {
   provide("addonApi", api);
@@ -30,6 +29,10 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any, a
     },
   };
 
+  provide("getCurrentPluginDefine", () => {
+    return currentDefine;
+  });
+
   function buildDefineFields(define: any, form: any, mode: string) {
     const formWrapperRef = crudExpose.getFormWrapperRef();
     const columnsRef = toRef(formWrapperRef.formOptions, "columns");

packages/ui/certd-client/src/views/certd/notification/common.tsx

@@ -26,6 +26,10 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
     },
   };
 
+  provide("getCurrentPluginDefine", () => {
+    return currentDefine;
+  });
+
   function buildDefineFields(define: any, form: any, mode: string) {
     const formWrapperRef = crudExpose.getFormWrapperRef();
     const columnsRef = toRef(formWrapperRef.formOptions, "columns");

packages/ui/certd-client/src/views/framework/login/index.vue

@@ -103,7 +103,7 @@ import SmsCode from "/@/views/framework/login/sms-code.vue";
 import { useI18n } from "/@/locales";
 import { LanguageToggle } from "/@/vben/layouts";
 import CaptchaInput from "/@/components/captcha/captcha-input.vue";
-import { useRoute } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import OauthFooter from "/@/views/framework/oauth/oauth-footer.vue";
 import * as oauthApi from "../oauth/api";
 import { notification } from "ant-design-vue";
@@ -113,6 +113,7 @@ export default defineComponent({
   setup() {
     const { t } = useI18n();
     const route = useRoute();
+    const userStore = useUserStore();
 
     const queryBindCode = ref(route.query.bindCode as string | undefined);
 
@@ -120,7 +121,7 @@ export default defineComponent({
     const urlLoginType = route.query.loginType as string | undefined;
     const verifyCodeInputRef = ref();
     const loading = ref(false);
-    const userStore = useUserStore();
+
     const settingStore = useSettingStore();
     const formRef = ref();
     let defaultLoginType = settingStore.sysPublic.defaultLoginType || "password";
@@ -250,6 +251,7 @@ export default defineComponent({
       }
       return sysPublicSettings.oauthOnly && settingStore.isPlus && sysPublicSettings.oauthEnabled;
     });
+
     return {
       t,
       loading,

packages/ui/certd-server/.env.production.yaml

@@ -11,6 +11,8 @@ typeorm:
     default:
       logging: false
 
+flyway:
+  allowHashNotMatch: true
 
 account:
   server:

packages/ui/certd-server/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
+
+### Bug Fixes
+
+* 修复部署到openwrt错误的bug ([9ac33f9](https://github.com/certd/certd/commit/9ac33f9b9ba7727fcbbd320dd866bc048cbb3d72))
+* 修复新版本上传到阿里云cas后，其他依赖任务无法部署的bug ([99f5b8e](https://github.com/certd/certd/commit/99f5b8ebc1c64798ceb42042ad71cf71e967beb0))
+* esxi部署失败的bug ([6ab1fca](https://github.com/certd/certd/commit/6ab1fcaf894f7ce343af4b5bf4b0d67438df6618))
+
+### Performance Improvements
+
+* 修改sql升级语句，兼容mysql5.7 ([02f89a9](https://github.com/certd/certd/commit/02f89a9c9d77850437285844670aed441e5953c3))
+* 优化access授权支持remote-auto-complete ([2f40f79](https://github.com/certd/certd/commit/2f40f795ee6131132d3fab2601f92a567bbdc4b7))
+* access 插件支持remote-select等配置 ([d286c04](https://github.com/certd/certd/commit/d286c040a5232dcca829945734affead3ee08b3c))
+
 ## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
 
 ### Performance Improvements

packages/ui/certd-server/db/migration-mysql/v10018__suite.sql

@@ -97,7 +97,7 @@ CREATE TABLE `cd_cert_info`
 
 CREATE INDEX `index_cert_info_user_id` ON `cd_cert_info` (`user_id`);
 CREATE INDEX `index_cert_info_domain` ON `cd_cert_info` (`domain`);
-CREATE INDEX `index_cert_info_domains` ON `cd_cert_info` (`domains`(200));
+CREATE INDEX `index_cert_info_domains` ON `cd_cert_info` (`domains`(190));
 CREATE INDEX `index_cert_info_pipeline` ON `cd_cert_info` (`pipeline_id`);
 
 
@@ -124,7 +124,7 @@ CREATE TABLE `cd_site_info`
 
   `create_time`       timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `update_time`       timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-);
+) ENGINE=InnoDB;
 
 CREATE INDEX `index_site_info_user_id` ON `cd_site_info` (`user_id`);
 CREATE INDEX `index_site_info_domain` ON `cd_site_info` (`domain`);

packages/ui/certd-server/db/migration-mysql/v10027__auto.sql

@@ -16,5 +16,5 @@ CREATE TABLE `cd_domain`
 );
 
 CREATE INDEX `index_domain_user_id` ON `cd_domain` (`user_id`);
-CREATE INDEX `index_domain_domain` ON `cd_domain` (`domain`);
+CREATE INDEX `index_domain_domain` ON `cd_domain` (`domain`(100));
 

packages/ui/certd-server/db/migration-mysql/v10034__oauth_bound.sql

@@ -1,5 +1,5 @@
 
-CREATE TABLE `cd_oauth_bound`
+CREATE TABLE IF NOT EXISTS `cd_oauth_bound`
 (
   `id`          bigint PRIMARY KEY AUTO_INCREMENT NOT NULL,
   `user_id`     bigint      NOT NULL,
@@ -7,8 +7,8 @@ CREATE TABLE `cd_oauth_bound`
   `open_id`     varchar(512) NOT NULL,
   `create_time` timestamp     NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `update_time` timestamp     NOT NULL DEFAULT CURRENT_TIMESTAMP
-);
+) ENGINE=InnoDB;
 
 
 CREATE INDEX `index_oauth_bound_user_id` ON `cd_oauth_bound` (`user_id`);
-CREATE INDEX `index_oauth_bound_open_id` ON `cd_oauth_bound` (`open_id`);
+CREATE INDEX `index_oauth_bound_open_id` ON `cd_oauth_bound` (`open_id`(190));

packages/ui/certd-server/db/transform.js

@@ -75,6 +75,8 @@ function transformMysql() {
     pgSql = pgSql.replaceAll(/text/g, 'longtext');
     //双引号 替换成反引号
     pgSql = pgSql.replaceAll(/"/g, '`');
+    //create table if not exists
+    pgSql = pgSql.replaceAll(/CREATE TABLE ([ ]+)`/g, 'CREATE TABLE IF NOT EXISTS `');
 
     fs.writeFileSync(`./migration-mysql/${notFile}`, pgSql);
   }

packages/ui/certd-server/metadata/access_alioss.yaml

@@ -14,72 +14,26 @@ input:
   region:
     title: 大区
     component:
-      name: a-auto-complete
+      name: remote-auto-complete
       vModel: value
-      options:
+      type: access
-        - value: oss-cn-hangzhou
+      typeName: alioss
-          label: 华东1（杭州）
+      action: onGetRegionList
-        - value: oss-cn-shanghai
-          label: 华东2（上海）
-        - value: oss-cn-nanjing
-          label: 华东5（南京-本地地域）
-        - value: oss-cn-fuzhou
-          label: 华东6（福州-本地地域）
-        - value: oss-cn-wuhan-lr
-          label: 华中1（武汉-本地地域）
-        - value: oss-cn-qingdao
-          label: 华北1（青岛）
-        - value: oss-cn-beijing
-          label: 华北2（北京）
-        - value: oss-cn-zhangjiakou
-          label: 华北 3（张家口）
-        - value: oss-cn-huhehaote
-          label: 华北5（呼和浩特）
-        - value: oss-cn-wulanchabu
-          label: 华北6（乌兰察布）
-        - value: oss-cn-shenzhen
-          label: 华南1（深圳）
-        - value: oss-cn-heyuan
-          label: 华南2（河源）
-        - value: oss-cn-guangzhou
-          label: 华南3（广州）
-        - value: oss-cn-chengdu
-          label: 西南1（成都）
-        - value: oss-cn-hongkong
-          label: 中国香港
-        - value: oss-us-west-1
-          label: 美国（硅谷）①
-        - value: oss-us-east-1
-          label: 美国（弗吉尼亚）①
-        - value: oss-ap-northeast-1
-          label: 日本（东京）①
-        - value: oss-ap-northeast-2
-          label: 韩国（首尔）
-        - value: oss-ap-southeast-1
-          label: 新加坡①
-        - value: oss-ap-southeast-2
-          label: 澳大利亚（悉尼）①
-        - value: oss-ap-southeast-3
-          label: 马来西亚（吉隆坡）①
-        - value: oss-ap-southeast-5
-          label: 印度尼西亚（雅加达）①
-        - value: oss-ap-southeast-6
-          label: 菲律宾（马尼拉）
-        - value: oss-ap-southeast-7
-          label: 泰国（曼谷）
-        - value: oss-eu-central-1
-          label: 德国（法兰克福）①
-        - value: oss-eu-west-1
-          label: 英国（伦敦）
-        - value: oss-me-east-1
-          label: 阿联酋（迪拜）①
-        - value: oss-rg-china-mainland
-          label: 无地域属性（中国内地）
     required: true
   bucket:
     title: Bucket
     helper: 存储桶名称
     required: true
+    component:
+      name: remote-auto-complete
+      vModel: value
+      type: access
+      action: onGetBucketList
+      search: false
+      pager: false
+      watches:
+        - accessId
+        - region
 pluginType: access
 type: builtIn
 scriptFilePath: /plugins/plugin-lib/aliyun/access/alioss-access.js

packages/ui/certd-server/metadata/deploy_1PanelDeployToWebsitePlugin.yaml

@@ -3,9 +3,9 @@ default:
   strategy:
     runStrategy: 1
 name: 1PanelDeployToWebsitePlugin
-title: 1Panel-更新证书
+title: 1Panel-更新站点证书
 icon: svg:icon-onepanel
-desc: 更新1Panel的证书，包括面板证书和站点证书
+desc: 更新1Panel的站点证书
 group: panel
 needPlus: false
 input:

packages/ui/certd-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-server",
-  "version": "1.38.8",
+  "version": "1.38.9",
   "description": "fast-server base midway",
   "private": true,
   "type": "module",
@@ -48,20 +48,20 @@
     "@aws-sdk/client-iam": "^3.964.0",
     "@aws-sdk/client-route-53": "^3.964.0",
     "@aws-sdk/client-s3": "^3.964.0",
-    "@certd/acme-client": "^1.38.8",
+    "@certd/acme-client": "^1.38.9",
-    "@certd/basic": "^1.38.8",
+    "@certd/basic": "^1.38.9",
-    "@certd/commercial-core": "^1.38.8",
+    "@certd/commercial-core": "^1.38.9",
     "@certd/cv4pve-api-javascript": "^8.4.2",
-    "@certd/jdcloud": "^1.38.8",
+    "@certd/jdcloud": "^1.38.9",
-    "@certd/lib-huawei": "^1.38.8",
+    "@certd/lib-huawei": "^1.38.9",
-    "@certd/lib-k8s": "^1.38.8",
+    "@certd/lib-k8s": "^1.38.9",
-    "@certd/lib-server": "^1.38.8",
+    "@certd/lib-server": "^1.38.9",
-    "@certd/midway-flyway-js": "^1.38.8",
+    "@certd/midway-flyway-js": "^1.38.9",
-    "@certd/pipeline": "^1.38.8",
+    "@certd/pipeline": "^1.38.9",
-    "@certd/plugin-cert": "^1.38.8",
+    "@certd/plugin-cert": "^1.38.9",
-    "@certd/plugin-lib": "^1.38.8",
+    "@certd/plugin-lib": "^1.38.9",
-    "@certd/plugin-plus": "^1.38.8",
+    "@certd/plugin-plus": "^1.38.9",
-    "@certd/plus-core": "^1.38.8",
+    "@certd/plus-core": "^1.38.9",
     "@google-cloud/publicca": "^1.3.0",
     "@huaweicloud/huaweicloud-sdk-cdn": "^3.1.185",
     "@huaweicloud/huaweicloud-sdk-core": "^3.1.185",

packages/ui/certd-server/src/config/config.default.ts

@@ -4,7 +4,7 @@ import { MidwayConfig } from '@midwayjs/core';
 // import { fileURLToPath } from 'node:url';
 // // const __filename = fileURLToPath(import.meta.url);
 // const __dirname = dirname(fileURLToPath(import.meta.url));
-import { FlywayHistory } from '@certd/midway-flyway-js';
+import { FlywayHistory, setFlywayLogger } from '@certd/midway-flyway-js';
 import { UserEntity } from '../modules/sys/authority/entity/user.js';
 import { PipelineEntity } from '../modules/pipeline/entity/pipeline.js';
 //import { logger } from '../utils/logger';
@@ -15,6 +15,7 @@ import { commercialEntities } from '@certd/commercial-core';
 import { tmpdir } from 'node:os';
 import { DefaultUploadFileMimeType, uploadWhiteList } from '@midwayjs/upload';
 import path from 'path';
+import { logger } from '@certd/basic';
 
 const env = process.env.NODE_ENV || 'development';
 
@@ -137,4 +138,6 @@ mergeConfig(development, 'development');
 
 mergeConfig(development, env);
 
+setFlywayLogger(logger);
+
 export default development;

packages/ui/certd-server/src/configuration.ts

@@ -78,7 +78,7 @@ export class MainConfiguration {
   app: koa.Application;
 
   async onReady() {
-
+    // 设置flyway logger
 
 
     // add middleware

packages/ui/certd-server/src/controller/user/pipeline/handle-controller.ts

@@ -53,6 +53,7 @@ export class HandleController extends BaseController {
     const accessGetter = new AccessGetter(userId, this.accessService.getById.bind(this.accessService));
     const access = await newAccess(body.typeName, inputAccess,accessGetter);
 
+    mergeUtils.merge(access, body.input);
     const res = await access.onRequest(body);
 
     return this.ok(res);

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-alb/index.ts

@@ -5,7 +5,7 @@ import {
   createRemoteSelectInputDefine
 } from "@certd/plugin-lib";
 import { AliyunAccess } from "../../../plugin-lib/aliyun/access/index.js";
-import { AliyunClient, AliyunSslClient } from "../../../plugin-lib/aliyun/lib/index.js";
+import { AliyunClient, AliyunSslClient, CasCertId } from "../../../plugin-lib/aliyun/lib/index.js";
 import { AliyunClientV2 } from "../../../plugin-lib/aliyun/lib/aliyun-client-v2.js";
 
 @IsTaskPlugin({
@@ -31,7 +31,7 @@ export class AliyunDeployCertToALB extends AbstractTaskPlugin {
     },
     required: true
   })
-  cert!: CertInfo | number;
+  cert!: CertInfo | CasCertId | number;
 
   @TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
   certDomains!: string[];
@@ -298,18 +298,25 @@ export class AliyunDeployCertToALB extends AbstractTaskPlugin {
   async getAliyunCertId(access: AliyunAccess) {
     let certId: any = this.cert;
     if (typeof this.cert === "object") {
+
+      const certInfo = this.cert as CertInfo;
+      const casCert =  this.cert as CasCertId;
       const sslClient = new AliyunSslClient({
         access,
         logger: this.logger,
         endpoint: this.casEndpoint
       });
 
-      const certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt));
+      if (certInfo.crt) {
-      const certIdRes = await sslClient.uploadCertificate({
+        const certName = this.buildCertName(CertReader.getMainDomain(certInfo.crt));
-        name: certName,
+        const certIdRes = await sslClient.uploadCertificate({
-        cert: this.cert
+          name: certName,
-      });
+          cert: certInfo,
-      certId = certIdRes.certId as any; 
+        });
+        certId = certIdRes.certId as any; 
+      }else if (casCert.certId){
+        certId = casCert.certId;
+      }
     }
 
     return certId;

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-all/index.ts

@@ -2,7 +2,7 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput
 import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert";
 import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib";
 import { AliyunAccess } from "../../../plugin-lib/aliyun/access/index.js";
-import { AliyunSslClient } from "../../../plugin-lib/aliyun/lib/ssl-client.js";
+import { AliyunSslClient, CasCertId } from "../../../plugin-lib/aliyun/lib/ssl-client.js";
 
 @IsTaskPlugin({
   name: "AliyunDeployCertToAll",
@@ -27,7 +27,7 @@ export class AliyunDeployCertToAll extends AbstractTaskPlugin {
     },
     required: true,
   })
-  cert!: CertInfo | number;
+  cert!: CertInfo | CasCertId | number;
 
   @TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
   certDomains!: string[];
@@ -155,11 +155,17 @@ export class AliyunDeployCertToAll extends AbstractTaskPlugin {
     //
     let certId: any = this.cert;
     if (typeof this.cert === "object") {
-      const certIdRes = await sslClient.uploadCertificate({
+      const certInfo = this.cert as CertInfo;
-        name: this.appendTimeSuffix("certd"),
+      const casCert = this.cert as CasCertId;
-        cert: this.cert,
+      if (casCert.certId) {
-      });
+        certId = casCert.certId;
-      certId = certIdRes.certId as any;
+      } else {
+        const certIdRes = await sslClient.uploadCertificate({
+          name: this.appendTimeSuffix("certd"),
+          cert: certInfo,
+        });
+        certId = certIdRes.certId as any;
+      }
     }
 
     const jobId = await this.createDeployJob(sslClient, certId);

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apig/index.ts

@@ -4,7 +4,7 @@ import {
   createRemoteSelectInputDefine
 } from "@certd/plugin-lib";
 import { AliyunAccess } from "../../../plugin-lib/aliyun/access/index.js";
-import { AliyunSslClient } from "../../../plugin-lib/aliyun/lib/ssl-client.js";
+import { AliyunSslClient, CasCertId } from "../../../plugin-lib/aliyun/lib/ssl-client.js";
 import { CertApplyPluginNames, CertInfo, CertReader } from "@certd/plugin-cert";
 import {optionsUtils} from "@certd/basic";
 
@@ -30,7 +30,7 @@ export class DeployCertToAliyunApig extends AbstractTaskPlugin {
     },
     required: true,
   })
-  cert!: CertInfo | string;
+  cert!: CertInfo | CasCertId |number;
 
   @TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
   certDomains!: string[];
@@ -137,11 +137,16 @@ export class DeployCertToAliyunApig extends AbstractTaskPlugin {
         logger: this.logger,
         region: this.casRegion,
       });
-
+      const certInfo = this.cert as CertInfo;
-      certId = await sslClient.uploadCert({
+      const casCert = this.cert as CasCertId;
-        name: this.buildCertName(CertReader.getMainDomain(this.cert.crt)),
+      if (casCert.certId) {
-        cert: this.cert,
+        certId = casCert.certId;
-      });
+      } else {
+        certId = await sslClient.uploadCert({
+          name: this.buildCertName(CertReader.getMainDomain(certInfo.crt)),
+          cert: certInfo,
+        });
+      }
     }
 
     const certIdentify  = `${certId}-${this.casRegion}`

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts

@@ -1,9 +1,9 @@
 import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
-import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib';
+import { CertInfo, createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib';
 import { AliyunAccess } from "../../../plugin-lib/aliyun/access/index.js";
 import { optionsUtils } from '@certd/basic';
 import { CertApplyPluginNames, CertReader } from "@certd/plugin-cert";
-import { AliyunClient, AliyunSslClient } from "../../../plugin-lib/aliyun/lib/index.js";
+import { AliyunClient, AliyunSslClient, CasCertId } from "../../../plugin-lib/aliyun/lib/index.js";
 @IsTaskPlugin({
   name: 'DeployCertToAliyunCDN',
   title: '阿里云-部署证书至CDN',
@@ -43,7 +43,7 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin {
     template:false,
     required: true,
   })
-  cert!: string;
+  cert!: CertInfo | CasCertId |number;
 
   @TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
   certDomains!: string[];
@@ -113,13 +113,18 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin {
     let certName =  this.appendTimeSuffix(this.certName);
 
     if (typeof this.cert === 'object') {
-      // @ts-ignore
+      const certInfo = this.cert as CertInfo;
-      const certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt))
+      const casCert = this.cert as CasCertId;
-      const certIdRes = await sslClient.uploadCertificate({
+      if (casCert.certId) {
-        name:certName,
+        certId = casCert.certId;
-        cert: this.cert,
+      } else {
-      });
+        certName = this.buildCertName(CertReader.getMainDomain(certInfo.crt))
-      certId = certIdRes.certId as any;
+        const certIdRes = await sslClient.uploadCertificate({
+          name:certName,
+          cert: certInfo,
+        });
+        certId = certIdRes.certId as any;
+      }
     }
 
     const client = await this.getClient(access);

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts

@@ -7,9 +7,9 @@ import {
 import { AliyunAccess } from "../../../plugin-lib/aliyun/access/index.js";
 
 import { CertInfo } from '@certd/plugin-cert';
-import { CertApplyPluginNames} from '@certd/plugin-cert';
+import { CertApplyPluginNames } from '@certd/plugin-cert';
 import { optionsUtils } from "@certd/basic";
-import { AliyunClient } from "../../../plugin-lib/aliyun/lib/index.js";
+import { AliyunClient, CasCertId } from "../../../plugin-lib/aliyun/lib/index.js";
 @IsTaskPlugin({
   name: 'DeployCertToAliyunDCDN',
   title: '阿里云-部署证书至DCDN',
@@ -32,7 +32,7 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
     },
     required: true,
   })
-  cert!: CertInfo | number;
+  cert!: CertInfo | CasCertId | number;
 
   @TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
   certDomains!: string[];
@@ -68,18 +68,18 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
   domainName!: string | string[];
 
 
-  async onInstance() {}
+  async onInstance() { }
   async execute(): Promise<void> {
     this.logger.info('开始部署证书到阿里云DCDN');
-    if(!this.domainName){
+    if (!this.domainName) {
       throw new Error('您还未选择DCDN域名');
     }
     const access = (await this.getAccess(this.accessId)) as AliyunAccess;
     const client = await this.getClient(access);
-    if(typeof this.domainName  === 'string'){
+    if (typeof this.domainName === 'string') {
       this.domainName = [this.domainName];
     }
-    for (const domainName of this.domainName ) {
+    for (const domainName of this.domainName) {
       this.logger.info(`[${domainName}]开始部署`)
       const params = await this.buildParams(domainName);
       await this.doRequest(client, params);
@@ -100,30 +100,32 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
     return client;
   }
 
-  async buildParams(domainName:string) {
+  async buildParams(domainName: string) {
     const CertName = (this.certName ?? 'certd') + '-' + dayjs().format('YYYYMMDDHHmmss');
 
-    if (typeof this.cert !== 'object') {
+    let certId: any = this.cert
-      const certId = this.cert;
+    if (typeof this.cert === 'object') {
-      this.logger.info('使用已上传的证书:', certId);
+      const certInfo = this.cert as CertInfo;
-      return {
+      if (certInfo.crt) {
-        DomainName: domainName,
+        this.logger.info('上传证书:', CertName);
-        SSLProtocol: 'on',
+        const cert: any = this.cert;
-        CertType: 'cas',
+        return {
-        CertName: CertName,
+          DomainName: domainName,
-        CertId: certId,
+          SSLProtocol: 'on',
-      };
+          CertName: CertName,
+          CertType: 'upload',
+          SSLPub: cert.crt,
+          SSLPri: cert.key,
+        };
+      }
     }
-
+    this.logger.info('使用已上传的证书:', certId);
-    this.logger.info('上传证书:', CertName);
-    const cert: any = this.cert;
     return {
       DomainName: domainName,
       SSLProtocol: 'on',
+      CertType: 'cas',
       CertName: CertName,
-      CertType: 'upload',
+      CertId: certId,
-      SSLPub: cert.crt,
-      SSLPri: cert.key,
     };
   }
 

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-esa/index.ts

@@ -5,7 +5,7 @@ import {
   createRemoteSelectInputDefine
 } from "@certd/plugin-lib";
 import { AliyunAccess } from "../../../plugin-lib/aliyun/access/index.js";
-import { AliyunSslClient } from "../../../plugin-lib/aliyun/lib/ssl-client.js";
+import { AliyunSslClient, CasCertId } from "../../../plugin-lib/aliyun/lib/ssl-client.js";
 import { AliyunClientV2 } from "../../../plugin-lib/aliyun/lib/aliyun-client-v2.js";
 import dayjs from "dayjs";
 
@@ -32,7 +32,7 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin {
     },
     required: true
   })
-  cert!: CertInfo;
+  cert!: CertInfo | CasCertId | number;
 
   @TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
   certDomains!: string[];
@@ -117,14 +117,21 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin {
         endpoint: this.casEndpoint
       });
 
-      certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt));
+      const certInfo = this.cert as CertInfo;
+      const casCert = this.cert as CasCertId;
+      if (casCert.certId) {
+        certId = casCert.certId;
+        certName = casCert.certName;
+      } else {
+        certName = this.buildCertName(CertReader.getMainDomain(certInfo.crt));
 
-      const certIdRes = await sslClient.uploadCertificate({
+        const certIdRes = await sslClient.uploadCertificate({
-        name: certName,
+          name: certName,
-        cert: this.cert
+          cert: certInfo
-      });
+        });
-      certId = certIdRes.certId as any;
+        certId = certIdRes.certId as any;
-      this.logger.info("上传证书成功", certId, certName);
+        this.logger.info("上传证书成功", certId, certName);
+      }
     }
     return {
       certId,

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-ga/index.ts

@@ -5,7 +5,7 @@ import {
   createRemoteSelectInputDefine
 } from "@certd/plugin-lib";
 import { AliyunAccess } from "../../../plugin-lib/aliyun/access/index.js";
-import { AliyunSslClient } from "../../../plugin-lib/aliyun/lib/ssl-client.js";
+import { AliyunSslClient, CasCertId } from "../../../plugin-lib/aliyun/lib/ssl-client.js";
 
 @IsTaskPlugin({
   name: "AliyunDeployCertToGA",
@@ -30,7 +30,7 @@ export class AliyunDeployCertToGA extends AbstractTaskPlugin {
     },
     required: true
   })
-  cert!: CertInfo|number;
+  cert!: CertInfo|number | CasCertId;
 
   @TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
   certDomains!: string[];
@@ -123,7 +123,7 @@ export class AliyunDeployCertToGA extends AbstractTaskPlugin {
       logger: this.logger,
       endpoint: this.casEndpoint
     });
-    return await sslClient.uploadCertOrGet(this.cert)
+    return await sslClient.uploadCertOrGet(this.cert as any)
   }
 
   async execute(): Promise<void> {

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-nlb/index.ts

@@ -6,7 +6,7 @@ import {
 } from "@certd/plugin-lib";
 import { CertApplyPluginNames} from '@certd/plugin-cert';
 import { AliyunAccess } from "../../../plugin-lib/aliyun/access/index.js";
-import { AliyunClient, AliyunSslClient } from "../../../plugin-lib/aliyun/lib/index.js";
+import { AliyunClient, AliyunSslClient, CasCertId } from "../../../plugin-lib/aliyun/lib/index.js";
 import { AliyunClientV2 } from '../../../plugin-lib/aliyun/lib/aliyun-client-v2.js';
 @IsTaskPlugin({
   name: 'AliyunDeployCertToNLB',
@@ -31,7 +31,7 @@ export class AliyunDeployCertToNLB extends AbstractTaskPlugin {
     },
     required: true,
   })
-  cert!: CertInfo | number;
+  cert!: CertInfo | number | CasCertId;
 
   @TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
   certDomains!: string[];
@@ -286,17 +286,25 @@ export class AliyunDeployCertToNLB extends AbstractTaskPlugin {
   async getAliyunCertId(access: AliyunAccess) {
     let certId: any = this.cert;
     if (typeof this.cert === 'object') {
+
+      const casCert = this.cert as CasCertId;
+      if (casCert.certId) {
+        return casCert.certId;
+      }
+
+      const certInfo = this.cert as CertInfo;
+
       const sslClient = new AliyunSslClient({
         access,
         logger: this.logger,
         endpoint: this.casEndpoint,
       });
 
-      const certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt))
+      const certName = this.buildCertName(CertReader.getMainDomain(certInfo.crt))
 
       const certIdRes = await sslClient.uploadCertificate({
         name: certName,
-        cert: this.cert,
+        cert: certInfo,
       });
       certId = certIdRes.certId as any;
     }

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts

@@ -1,14 +1,13 @@
-import {AbstractTaskPlugin, IsTaskPlugin, Pager, pluginGroups, RunStrategy, TaskInput} from '@certd/pipeline';
+import { optionsUtils } from "@certd/basic";
+import { AbstractTaskPlugin, IsTaskPlugin, Pager, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
+import { CertApplyPluginNames, CertInfo } from '@certd/plugin-cert';
 import {
   createCertDomainGetterInputDefine,
   createRemoteSelectInputDefine
 } from '@certd/plugin-lib';
-import {CertInfo, CertReader} from '@certd/plugin-cert';
+import { isArray } from "lodash-es";
-import { CertApplyPluginNames} from '@certd/plugin-cert';
-import {optionsUtils} from "@certd/basic";
-import {isArray} from "lodash-es";
 import { AliyunAccess } from '../../../plugin-lib/aliyun/access/index.js';
-import { AliyunSslClient } from '../../../plugin-lib/aliyun/lib/index.js';
+import { CasCertId } from '../../../plugin-lib/aliyun/lib/index.js';
 @IsTaskPlugin({
   name: 'DeployCertToAliyunOSS',
   title: '阿里云-部署证书至OSS',
@@ -32,7 +31,7 @@ export class DeployCertToAliyunOSS extends AbstractTaskPlugin {
     },
     required: true,
   })
-  cert!: CertInfo | string;
+  cert!: CertInfo | number | CasCertId;
 
   @TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
   certDomains!: string[];
@@ -147,7 +146,6 @@ export class DeployCertToAliyunOSS extends AbstractTaskPlugin {
     this.logger.info('开始部署证书到阿里云OSS');
     const access = (await this.getAccess(this.accessId)) as AliyunAccess;
 
-    await this.getAliyunCertId(access)
     this.logger.info(`bucket: ${this.bucket}, region: ${this.region}, domainName: ${this.domainName}`);
     const client = await this.getClient(access);
     if (typeof this.domainName === "string"){
@@ -169,12 +167,19 @@ export class DeployCertToAliyunOSS extends AbstractTaskPlugin {
     });
 
     let certStr =  ""
+
     if (typeof this.cert === "object" ){
-      certStr = `
+      const certInfo = this.cert as CertInfo;
-      <PrivateKey>${this.cert.key}</PrivateKey>
+      if (certInfo.crt){
-      <Certificate>${this.cert.crt}</Certificate>
+        certStr = `
-`
+              <PrivateKey>${certInfo.key}</PrivateKey>
-    }else{
+              <Certificate>${certInfo.crt}</Certificate>
+        `
+      }else{
+        const casCert = this.cert as CasCertId;
+        certStr = `<CertId>${casCert.certIdentifier}</CertId>`
+      }
+    }else {
       certStr = `<CertId>${this.cert}-${this.casRegion}</CertId>`
     }
 
@@ -196,34 +201,6 @@ export class DeployCertToAliyunOSS extends AbstractTaskPlugin {
     return res;
   }
 
-  async getAliyunCertId(access: AliyunAccess) {
-    let certId: any = this.cert;
-    let certName: any = this.appendTimeSuffix("certd");
-    if (typeof this.cert === "object") {
-      let endpoint = `cas.${this.casRegion}.aliyuncs.com`;
-      if (this.casRegion === "cn-hangzhou" || !this.casRegion){
-        endpoint = "cas.aliyuncs.com";
-      }
-      const sslClient = new AliyunSslClient({
-        access,
-        logger: this.logger,
-        endpoint: endpoint
-      });
-
-      certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt));
-
-      const certIdRes = await sslClient.uploadCertificate({
-        name: certName,
-        cert: this.cert
-      });
-      certId = certIdRes.certId as any;
-      this.logger.info("上传证书成功", certId, certName);
-    }
-    return {
-      certId,
-      certName
-    };
-  }
 
   async getClient(access: AliyunAccess) {
     // @ts-ignore

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-slb/index.ts

@@ -1,10 +1,10 @@
-import {AbstractTaskPlugin, IsTaskPlugin, PageSearch, pluginGroups, RunStrategy, TaskInput} from '@certd/pipeline';
+import { AbstractTaskPlugin, IsTaskPlugin, PageSearch, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
-import {CertInfo} from '@certd/plugin-cert';
+import { CertInfo } from '@certd/plugin-cert';
 import {
   createCertDomainGetterInputDefine,
   createRemoteSelectInputDefine
 } from '@certd/plugin-lib';
-import {CertApplyPluginNames} from '@certd/plugin-cert';
+import { CertApplyPluginNames } from '@certd/plugin-cert';
 import { AliyunAccess } from '../../../plugin-lib/aliyun/access/index.js';
 import { AliyunClient, AliyunSslClient, CasCertInfo } from '../../../plugin-lib/aliyun/lib/index.js';
 
@@ -31,9 +31,9 @@ export class AliyunDeployCertToSLB extends AbstractTaskPlugin {
     },
     required: true,
   })
-  cert!: CertInfo | number;
+  cert!: CertInfo | number | CasCertInfo;
 
-  @TaskInput(createCertDomainGetterInputDefine({props: {required: false}}))
+  @TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
   certDomains!: string[];
 
 
@@ -44,9 +44,9 @@ export class AliyunDeployCertToSLB extends AbstractTaskPlugin {
     component: {
       name: 'a-select',
       options: [
-        {value: 'cas.aliyuncs.com', label: '中国大陆'},
+        { value: 'cas.aliyuncs.com', label: '中国大陆' },
-        {value: 'cas.ap-southeast-1.aliyuncs.com', label: '新加坡'},
+        { value: 'cas.ap-southeast-1.aliyuncs.com', label: '新加坡' },
-        {value: 'cas.eu-central-1.aliyuncs.com', label: '德国（法兰克福）'},
+        { value: 'cas.eu-central-1.aliyuncs.com', label: '德国（法兰克福）' },
       ],
     },
     required: true,
@@ -99,24 +99,24 @@ export class AliyunDeployCertToSLB extends AbstractTaskPlugin {
 
 
   @TaskInput({
-      title: "部署默认证书",
+    title: "部署默认证书",
-      value: true,
+    value: true,
-      component: {
+    component: {
-        name: "a-switch",
+      name: "a-switch",
-        vModel: "checked"
+      vModel: "checked"
-      }
     }
+  }
   )
   deployDefault!: boolean;
 
   @TaskInput({
-      title: "部署扩展证书",
+    title: "部署扩展证书",
-      value: false,
+    value: false,
-      component: {
+    component: {
-        name: "a-switch",
+      name: "a-switch",
-        vModel: "checked"
+      vModel: "checked"
-      }
     }
+  }
   )
   deployExtension!: boolean;
 
@@ -126,8 +126,8 @@ export class AliyunDeployCertToSLB extends AbstractTaskPlugin {
       title: '扩展域名列表',
       helper: '要部署扩展域名列表',
       action: AliyunDeployCertToSLB.prototype.onGetExtensionDomainList.name,
-      watches: ['listeners','deployExtension'],
+      watches: ['listeners', 'deployExtension'],
-      mergeScript:`
+      mergeScript: `
         return {
         show: ctx.compute(({form})=>{
           return form.deployExtension;
@@ -143,7 +143,7 @@ export class AliyunDeployCertToSLB extends AbstractTaskPlugin {
   }
 
   async getLBClient(access: AliyunAccess, region: string) {
-    const client = new AliyunClient({logger: this.logger});
+    const client = new AliyunClient({ logger: this.logger });
     const version = '2014-05-15';
     await client.init({
       accessKeyId: access.accessKeyId,
@@ -163,10 +163,10 @@ export class AliyunDeployCertToSLB extends AbstractTaskPlugin {
     const aliyunCert = await this.getAliyunCertId(access);
     const slbServerCertId = await this.uploadServerCert(client, aliyunCert);
 
-    if (this.deployDefault!==false) {
+    if (this.deployDefault !== false) {
       this.logger.info("部署监听器默认证书")
       for (const listener of this.listeners) {
-        const {port, loadBalanceId} = this.resolveListenerKey(listener)
+        const { port, loadBalanceId } = this.resolveListenerKey(listener)
         const params = {
           RegionId: this.regionId,
           LoadBalancerId: loadBalanceId,
@@ -185,7 +185,7 @@ export class AliyunDeployCertToSLB extends AbstractTaskPlugin {
 
       const clientV2 = this.getCLBClientV2(access);
       for (const domainStr of this.extensionDomains) {
-        const {extensionDomainId} = this.resolveListenerKey(domainStr)
+        const { extensionDomainId } = this.resolveListenerKey(domainStr)
         const res = await clientV2.doRequest({
           action: "SetDomainExtensionAttribute",
           // 接口版本
@@ -251,11 +251,20 @@ export class AliyunDeployCertToSLB extends AbstractTaskPlugin {
 
     if (typeof this.cert === 'object') {
       const name = this.appendTimeSuffix('certd');
-      const certIdRes = await sslClient.uploadCertificate({
+
-        name: name,
+      const casCert = this.cert as CasCertInfo;
-        cert: this.cert,
+      if (casCert.certIdentifier) {
-      });
+        certId = casCert.certId;
-      certId = certIdRes.certId as any;
+      } else {
+        const cert = this.cert as CertInfo;
+        const certIdRes = await sslClient.uploadCertificate({
+          name: name,
+          cert: cert,
+        });
+        certId = certIdRes.certId as any;
+      }
+
+
     }
 
     return await sslClient.getCertInfo(certId);
@@ -360,7 +369,7 @@ export class AliyunDeployCertToSLB extends AbstractTaskPlugin {
 
     const allDomains: any[] = []
     for (const ls of this.listeners) {
-      const {port, loadBalanceId, protocol} = this.resolveListenerKey(ls)
+      const { port, loadBalanceId, protocol } = this.resolveListenerKey(ls)
       const domains = await this.doGetExtensionDomainList({
         access,
         loadBalancerId: loadBalanceId,
@@ -381,7 +390,7 @@ export class AliyunDeployCertToSLB extends AbstractTaskPlugin {
     listenerProtocol: string,
     access: AliyunAccess
   }) {
-    const {loadBalancerId, listenerPort, listenerProtocol, access} = data;
+    const { loadBalancerId, listenerPort, listenerProtocol, access } = data;
     const client = access.getClient(`slb.${this.regionId}.aliyuncs.com`)
 
     let queries = {
@@ -412,7 +421,7 @@ export class AliyunDeployCertToSLB extends AbstractTaskPlugin {
       return {
         value: value,
         label: label,
-        domain:i.Domain
+        domain: i.Domain
       };
     });
   }

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts

@@ -1,11 +1,11 @@
-import { AbstractTaskPlugin, IsTaskPlugin, Pager,PageSearch, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
+import { AbstractTaskPlugin, IsTaskPlugin, Pager, PageSearch, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
 import { CertApplyPluginNames, CertInfo, CertReader } from "@certd/plugin-cert";
 import {
   createCertDomainGetterInputDefine,
   createRemoteSelectInputDefine
 } from "@certd/plugin-lib";
 import { AliyunAccess } from "../../../plugin-lib/aliyun/access/index.js";
-import { AliyunClient, AliyunSslClient } from "../../../plugin-lib/aliyun/lib/index.js";
+import { AliyunClient, AliyunSslClient, CasCertInfo } from "../../../plugin-lib/aliyun/lib/index.js";
 
 @IsTaskPlugin({
   name: 'AliyunDeployCertToWaf',
@@ -30,7 +30,7 @@ export class AliyunDeployCertToWaf extends AbstractTaskPlugin {
     },
     required: true,
   })
-  cert!: CertInfo | number;
+  cert!: CertInfo | number | CasCertInfo;
 
   @TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
   certDomains!: string[];
@@ -83,8 +83,8 @@ export class AliyunDeployCertToWaf extends AbstractTaskPlugin {
       helper: '请选择要部署证书的CNAME站点',
       action: AliyunDeployCertToWaf.prototype.onGetCnameList.name,
       watches: ['accessId', 'regionId'],
-      pager:true,
+      pager: true,
-      search:true,
+      search: true,
     })
   )
   cnameDomains!: string[];
@@ -105,7 +105,7 @@ export class AliyunDeployCertToWaf extends AbstractTaskPlugin {
   })
   tlsVersion!: string;
 
-    @TaskInput({
+  @TaskInput({
     title: '启用TLSv3',
     value: true,
     component: {
@@ -118,7 +118,7 @@ export class AliyunDeployCertToWaf extends AbstractTaskPlugin {
 
 
 
-  async onInstance() {}
+  async onInstance() { }
 
   async getWafClient(access: AliyunAccess) {
     const client = new AliyunClient({ logger: this.logger });
@@ -152,11 +152,17 @@ export class AliyunDeployCertToWaf extends AbstractTaskPlugin {
         endpoint: this.casEndpoint,
       });
 
-      const certIdRes = await sslClient.uploadCertificate({
+      const cert = this.cert as CertInfo;
-        name: this.buildCertName(CertReader.getMainDomain(this.cert.crt)),
+      if (cert.crt) {
-        cert: this.cert,
+        const certIdRes = await sslClient.uploadCertificate({
-      });
+          name: this.buildCertName(CertReader.getMainDomain(cert.crt)),
-      certId = certIdRes.certId as any;
+          cert: cert,
+        });
+        certId = certIdRes.certId as any;
+      }else {
+        const casCert = this.cert as CasCertInfo;
+        certId = casCert.certId;
+      }
     }
 
     const client = await this.getWafClient(access);
@@ -211,13 +217,13 @@ export class AliyunDeployCertToWaf extends AbstractTaskPlugin {
     const pager = new Pager(data)
 
     const instanceId = await this.getInstanceId(client);
-    const params:any = {
+    const params: any = {
       RegionId: this.regionId,
       InstanceId: instanceId,
       PageSize: pager.pageSize,
       PageNumber: pager.pageNo,
     };
-    if (data.searchKey){
+    if (data.searchKey) {
       params.Domain = data.searchKey
     }
 
@@ -235,7 +241,7 @@ export class AliyunDeployCertToWaf extends AbstractTaskPlugin {
         domain: item.Domain,
       };
     });
-    const list= this.ctx.utils.options.buildGroupOptions(options, this.certDomains);
+    const list = this.ctx.utils.options.buildGroupOptions(options, this.certDomains);
 
     // const list = [{value:"1",label:"1"},{value:"2",label:"2"}]
     // const total = 120

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts

@@ -1,7 +1,7 @@
 import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, TaskOutput } from '@certd/pipeline';
 import { CertApplyPluginNames, CertReader } from "@certd/plugin-cert";
 import { AliyunAccess } from '../../../plugin-lib/aliyun/access/index.js';
-import { AliyunSslClient } from '../../../plugin-lib/aliyun/lib/index.js';
+import { AliyunSslClient, CasCertId } from '../../../plugin-lib/aliyun/lib/index.js';
 /**
  * 华东1（杭州）	cn-hangzhou	cas.aliyuncs.com	cas-vpc.cn-hangzhou.aliyuncs.com
  * 马来西亚（吉隆坡）	ap-southeast-3	cas.ap-southeast-3.aliyuncs.com	cas-vpc.ap-southeast-3.aliyuncs.com
@@ -78,7 +78,7 @@ export class UploadCertToAliyun extends AbstractTaskPlugin {
   @TaskOutput({
     title: '上传成功后的阿里云CertId',
   })
-  aliyunCertId!: string;
+  aliyunCertId!: CasCertId;
 
   async onInstance() {}
 

packages/ui/certd-server/src/plugins/plugin-lib/aliyun/access/alioss-access.ts

@@ -1,4 +1,5 @@
 import { AccessInput, BaseAccess, IsAccess } from "@certd/pipeline";
+import { AliyunAccess } from "./aliyun-access.js";
 
 @IsAccess({
   name: "alioss",
@@ -22,9 +23,36 @@ export class AliossAccess extends BaseAccess {
   @AccessInput({
     title: "大区",
     component: {
-      name: "a-auto-complete",
+      name: "remote-auto-complete",
       vModel: "value",
-      options: [
+      type: "access",
+      typeName: "alioss",
+      action: AliossAccess.prototype.onGetRegionList.name
+    },
+    required: true,
+  })
+  region!: string;
+
+  @AccessInput({
+    title: "Bucket",
+    helper: "存储桶名称",
+    required: true,
+    component: {
+      name: "remote-auto-complete",
+      vModel: "value",
+      type: "access",
+      action: AliossAccess.prototype.onGetBucketList.name,
+      search: false,
+      pager: false,
+      watches: ["accessId", "region"],
+    },
+  })
+  bucket!: string;
+
+
+  onGetRegionList(){
+    return {
+      list: [
         { value: "oss-cn-hangzhou", label: "华东1（杭州）" },
         { value: "oss-cn-shanghai", label: "华东2（上海）" },
         { value: "oss-cn-nanjing", label: "华东5（南京-本地地域）" },
@@ -54,18 +82,36 @@ export class AliossAccess extends BaseAccess {
         { value: "oss-eu-west-1", label: "英国（伦敦）" },
         { value: "oss-me-east-1", label: "阿联酋（迪拜）①" },
         { value: "oss-rg-china-mainland", label: "无地域属性（中国内地）" },
-      ],
+      ]
-    },
+    }
-    required: true,
+  }
-  })
-  region!: string;
 
-  @AccessInput({
+  async onGetBucketList() {
-    title: "Bucket",
+    const access = (await this.ctx.accessService.getById(this.accessId)) as AliyunAccess;
-    helper: "存储桶名称",
+    const client = await this.getClient(access);
-    required: true,
+
-  })
+    let res;
-  bucket!: string;
+    const buckets = [];
+    do {
+      const requestData = { marker: res?.nextMarker || null, "max-keys": 1000 };
+      res = await client.listBuckets(requestData);
+      buckets.push(...(res?.buckets || []));
+    } while (!!res?.nextMarker);
+    return buckets.filter(bucket => bucket?.region === this.region).map(bucket => ({ label: `${bucket.name}<${bucket.region}>`, value: bucket.name }));
+  }
+
+  async getClient(access: AliyunAccess) {
+    // @ts-ignore
+    const OSS = await import("ali-oss");
+    return new OSS.default({
+      accessKeyId: access.accessKeyId,
+      accessKeySecret: access.accessKeySecret,
+      // yourRegion填写Bucket所在地域。以华东1（杭州）为例，Region填写为oss-cn-hangzhou。
+      region: this.region,
+      //@ts-ignore
+      authorizationV4: true,
+    });
+  }
 }
 
 new AliossAccess();

packages/ui/certd-server/src/plugins/plugin-lib/aliyun/lib/ssl-client.ts

@@ -126,18 +126,25 @@ export class AliyunSslClient {
     }
   }
 
-  async uploadCertOrGet(cert: CertInfo | number )  :Promise<CasCertId>{
+  async uploadCertOrGet(cert: CertInfo | number | CasCertId )  :Promise<CasCertId>{
     if (typeof cert === "object") {
+
+      const casCert = cert as CasCertId;
+      if (casCert.certId) {
+        return casCert;
+      }
+      const certInfo = cert as CertInfo;
       // 上传证书到阿里云
       this.logger.info(`开始上传证书`);
-      const certName = CertReader.buildCertName(cert);
+      const certName = CertReader.buildCertName(certInfo);
       const res = await this.uploadCertificate({
         name: certName,
-        cert: cert
+        cert: certInfo
       });
       this.logger.info("上传证书成功", JSON.stringify(res));
       return res
     }
+    //number类型
     const certId = cert as any;
     let certName: any = utils.string.appendTimeSuffix(certId);
     const certIdentifier = this.getCertIdentifier(certId);

packages/ui/certd-server/src/plugins/plugin-plus/1panel/plugins/deploy-to-website.ts

@@ -7,9 +7,9 @@ import { OnePanelClient } from "../client.js";
 
 @IsTaskPlugin({
   name: "1PanelDeployToWebsitePlugin",
-  title: "1Panel-更新证书",
+  title: "1Panel-更新站点证书",
   icon: "svg:icon-onepanel",
-  desc: "更新1Panel的证书，包括面板证书和站点证书",
+  desc: "更新1Panel的站点证书",
   group: pluginGroups.panel.key,
   default: {
     strategy: {
@@ -195,7 +195,7 @@ export class OnePanelDeployToWebsitePlugin extends AbstractTaskPlugin {
       currentNode: this.currentNode,
     });
     if (!res?.items) {
-      throw new Error("没有找到证书，请先在1Panel中手动上传证书，并关联站点或设置面板证书，后续才可以自动更新");
+      throw new Error("没有找到证书，请先在1Panel中手动上传证书，并关联站点，后续才可以自动更新");
     }
     const list = res.items.map(item => {
       const domains = item.domains ? [] : item.domains.split(",");

packages/ui/certd-server/src/plugins/plugin-plus/esxi/plugin-deploy-to-esxi.ts

@@ -59,7 +59,7 @@ export class EsxiDeployCertPlugin extends AbstractPlusTaskPlugin {
       handle: async (ctx) => {
         const crtPath = ctx.tmpCrtPath;
         const keyPath = ctx.tmpKeyPath;
-        sshClient.uploadFiles({
+        await sshClient.uploadFiles({
           connectConf: sshConf,
           transports: [
             {

packages/ui/certd-server/src/plugins/plugin-plus/openwrt/plugin-deploy-to-openwrt.ts

@@ -59,7 +59,7 @@ export class OpenwrtDeployCertPlugin extends AbstractPlusTaskPlugin {
       handle: async (ctx) => {
         const crtPath = ctx.tmpCrtPath;
         const keyPath = ctx.tmpKeyPath;
-        sshClient.uploadFiles({
+        await sshClient.uploadFiles({
           connectConf: sshConf,
           transports: [
             {