v1.24.2

perf: 支持西部数码DNS

.github/workflows/build-image.yml

@@ -58,12 +58,20 @@ jobs:
           username: ${{ secrets.aliyun_cs_username }}
           password: ${{ secrets.aliyun_cs_password }}
 
-      - name: Build and push
-        uses: docker/build-push-action@v6.5.0
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
         with:
-          platforms: linux/amd64,linux/arm64
+          username: ${{ secrets.dockerhub_username }}
+          password: ${{ secrets.dockerhub_password }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           context: ./packages/ui/
           tags: |
             registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest
             registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}}
+            greper/certd:latest
+            greper/certd:${{steps.get_certd_version.outputs.result}}

.gitignore

@@ -19,23 +19,13 @@ gen
 /*.log
 
 /packages/ui/*/.idea
-
 /packages/ui/*/node_modules
-
 /packages/*/node_modules
-/packages/ui/certd-server/tmp/
-/packages/ui/certd-ui/dist/
-/other
-/dev-sidecar-test
-/packages/core/certd/yarn.lock
-/packages/test
-/test/own
 /pnpm-lock.yaml
 
-docker/image/workspace
-/packages/core/lego
 
 tsconfig.tsbuildinfo
 test/**/*.js
 /packages/ui/certd-server/data/db.sqlite
 /packages/ui/certd-server/data/keys.yaml
+/packages/pro/

CHANGELOG.md

@@ -3,6 +3,43 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06)
+
+### Bug Fixes
+
+* 修复复制流水线出现的各种问题 ([6314e8d](https://github.com/certd/certd/commit/6314e8d7eb58cd52e2a7bd3b5ffb9112b0b69577))
+* 修复windows下无法执行第二条命令的bug ([71ac8aa](https://github.com/certd/certd/commit/71ac8aae4aa694e1a23761e9761c9fba30b43a21))
+
+### Performance Improvements
+
+* 阶段、任务、步骤全面支持拖动排序 ([bd73a16](https://github.com/certd/certd/commit/bd73a163cd0497f062bd424ddc6bc9bbc95f81ea))
+* 任务配置不需要的字段可以自动隐藏 ([192d9dc](https://github.com/certd/certd/commit/192d9dc7e36737d684c769f255f407c28b1152ac))
+* 任务支持拖动排序 ([1e9b563](https://github.com/certd/certd/commit/1e9b5638aa36a8ce70019a9c750230ba41938327))
+* 西部数据支持用户级的apikey ([1c17b41](https://github.com/certd/certd/commit/1c17b41e160944b073e1849e6f9467c3659a4bfc))
+* 修复windows下无法执行第二条命令的bug ([d5bfcdb](https://github.com/certd/certd/commit/d5bfcdb6de1dcc1702155442e2e00237d0bbb6e5))
+* 优化跳过处理逻辑 ([b80210f](https://github.com/certd/certd/commit/b80210f24bf5db1c958d06ab27c9e5d3db452eda))
+* 支持阿里云oss ([87a2673](https://github.com/certd/certd/commit/87a2673e8c33dff6eda1b836d92ecc121564ed78))
+* 支持西部数码DNS ([c59cab1](https://github.com/certd/certd/commit/c59cab1aaeb19f86df8e3e0d8127cbd0a9ef77f3))
+* 支持pfx、der ([fbeaed2](https://github.com/certd/certd/commit/fbeaed203519f59b6d9396c4e8953353ccb5e723))
+* client 请求超时时间延长为10s ([ff46771](https://github.com/certd/certd/commit/ff46771d8dd43e71c1ca70e3ba783945750342cc))
+
+## [1.24.1](https://github.com/certd/certd/compare/v1.24.0...v1.24.1) (2024-09-02)
+
+### Bug Fixes
+
+* 激活仅限管理员 ([1c17970](https://github.com/certd/certd/commit/1c17970b981f0987c506744ee6b2283fd5e40493))
+* 修复在没有勾选使用代理的情况下，仍然会使用代理的bug ([0f66794](https://github.com/certd/certd/commit/0f6679425f6a736bb0128527dd99c085fac17d84))
+
+### Performance Improvements
+
+* 部署插件支持宝塔、易盾云等 ([ee61709](https://github.com/certd/certd/commit/ee617095efa1171548cf52fd45f0f98a368555a3))
+* 授权配置支持加密 ([42a56b5](https://github.com/certd/certd/commit/42a56b581d754c3e5f9838179d19ab0d004ef2eb))
+* 优化内存占用 ([db61033](https://github.com/certd/certd/commit/db6103363364440b650bc10bb334834e4a9470c7))
+* 支持阿里云 DCDN ([98b77f8](https://github.com/certd/certd/commit/98b77f80843834616fb26f83b4c42245326abd06))
+* 支持已跳过的步骤重新运行 ([ea775ad](https://github.com/certd/certd/commit/ea775adae18d57a04470cfba6b9460d761d74035))
+* 支持cdnfly ([724a850](https://github.com/certd/certd/commit/724a85028b4a7146c9e3b4df4497dcf2a7bf7c67))
+* 支持ftp上传 ([b9bddbf](https://github.com/certd/certd/commit/b9bddbfabb5664365f1232e9432532187c98006c))
+
 # [1.24.0](https://github.com/certd/certd/compare/v1.23.1...v1.24.0) (2024-08-25)
 
 ### Bug Fixes

README.md

@@ -10,10 +10,16 @@ Certd 是一个免费全自动申请和自动部署更新SSL证书的工具。
 https://afdian.com/a/greper
 
 发电权益：
-1. 可加入发电专属群（先加我好友，发送发电截图，我拉你进群）
-2. 你的需求优先实现
-3. 可以获得作者一对一技术支持
-4. 更多权益陆续增加中...
+1. 可加入发电专属群，可以获得作者一对一技术支持
+2. 您的需求我们将优先实现，并且将作为专业版功能提供
+3. 一年期专业版激活码
+4. 赠送国外免费服务器部署方案（0成本使用Certd，不过该服务器需要翻墙）
+
+专业版特权
+1. 证书流水线条数无限制（免费版限制10条）
+2. 免配置发邮件功能
+3. FTP上传、cdnfly、宝塔等部署插件
+4. 更多功能增加中...
 ************************
 
 ## 一、特性
@@ -93,8 +99,11 @@ docker compose up -d
 > https://docs.docker.com/compose/install/linux/
 
 #### 镜像说明：
-* certd镜像地址:
+* 国内镜像地址:
   * `registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest`
+* DockerHub地址：
+  * `https://hub.docker.com/r/greper/certd`
+  * `docker pull greper/certd:latest`
 
 * 镜像构建通过`Actions`自动执行，过程公开透明，请放心使用
   * [点我查看镜像构建日志](https://github.com/certd/certd/actions/workflows/build-image.yml) 
@@ -112,11 +121,16 @@ http://your_server_ip:7001
 ## 五、 升级
 如果使用固定版本号
 1. 修改`docker-compose.yaml`中的镜像版本号
-2. 运行 `docker compose up -d` 即可
+2. 运行`docker compose up -d` 即可
 
 如果使用`latest`版本
-1. 重新拉取镜像 `docker pull registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest` 
-2. 重新启动容器 `docker compose restart`
+```shell
+#重新拉取镜像
+docker pull registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest
+# 重新启动容器
+docker compose down
+docker compose up -d
+```
 
 > 数据默认存在`/data/certd`目录下，不用担心数据丢失   
 

build.trigger

@@ -1 +1 @@
-11:39
+23:58

docker/run/docker-compose.yaml

@@ -1,31 +1,38 @@
 version: '3.3'
 services:
   certd:
-    # 镜像                                                  #  ↓↓↓↓↓ --- 1、 镜像版本号，建议改成固定版本号【可选】
+    # 镜像                                                  #  ↓↓↓↓↓ --- 镜像版本号，建议改成固定版本号【可选】
     image: registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest
     container_name: certd # 容器名
     restart: unless-stopped # 自动重启
     volumes:
-      #   ↓↓↓↓↓ ------------------------------------------------------- 2、 数据库以及证书存储路径,默认存在宿主机的/data/certd/目录下【可选】
+      #   ↓↓↓↓↓ -------------------------------------------------------- 数据库以及证书存储路径,默认存在宿主机的/data/certd/目录下【可选】
       - /data/certd:/app/data
     ports: # 端口映射
-      #  ↓↓↓↓ ----------------------------------------------------------3、如果端口有冲突，可以修改第一个7001为其他不冲突的端口号【可选】
+      #  ↓↓↓↓ ---------------------------------------------------------- 如果端口有冲突，可以修改第一个7001为其他不冲突的端口号【可选】
       - "7001:7001"
     dns:
       # 如果出现getaddrinfo ENOTFOUND等错误，可以尝试修改或注释dns配置
       - 223.5.5.5
       - 223.6.6.6
-      #  ↓↓↓↓ ----------------------------------------------------------如果你服务器部署在国外，可以用8.8.8.8替换上面的dns【可选】
+      #  ↓↓↓↓ ---------------------------------------------------------- 如果你服务器部署在国外，可以用8.8.8.8替换上面的dns【可选】
 #      - 8.8.8.8
 #      - 8.8.4.4
     environment: # 环境变量
       - TZ=Asia/Shanghai
+      #- HTTPS_PROXY=http://xxxxxx:xx
+      #- HTTP_PROXY=http://xxxxxx:xx
+                          #  ↑↑↑↑↑ ------------------------------------- 这里可以设置http代理【可选】
       - certd_system_resetAdminPasswd=false
-                                     #  ↑↑↑↑↑---------------------------4、如果忘记管理员密码，可以设置为true，重启之后，管理员密码将改成123456，然后请及时修改回false【可选】
+                                     #  ↑↑↑↑↑--------------------------- 如果忘记管理员密码，可以设置为true，重启之后，管理员密码将改成123456，然后请及时修改回false【可选】
       - certd_cron_immediateTriggerOnce=false
-                                     #  ↑↑↑↑↑---------------------------5、如果设置为true，启动后所有配置了cron的流水线任务都将被立即触发一次【可选】
+                                     #  ↑↑↑↑↑--------------------------- 如果设置为true，启动后所有配置了cron的流水线任务都将被立即触发一次【可选】
       - VITE_APP_ICP_NO=
-                      #  ↑↑↑↑↑ -----------------------------------------6、这里可以设置备案号【可选】
+                      #  ↑↑↑↑↑ ----------------------------------------- 这里可以设置备案号【可选】
+      #- certd_koa_key=./data/ssl/cert.key
+      #- certd_koa_cert=./data/ssl/cert.crt
+                      #  ↑↑↑↑↑ ----------------------------------------- 配置证书和key，则表示https方式启动，访问网址要使用 https://your.domain:7001【可选】
+
       # 设置环境变量即可自定义certd配置
       # 服务端配置项见： packages/ui/certd-server/src/config/config.default.ts
       # 服务端配置规则： certd_ + 配置项, 点号用_代替

init.sh

@@ -0,0 +1,20 @@
+current_pwd=$(pwd)
+
+echo "开始设置git配置"
+
+read -p "请输入username：" username
+git config  user.name $username
+
+read -p "请输入email：" email
+git config  user.email $email
+
+git config credential.helper "store --file=$current_pwd/.git/credential.store"
+echo "已设置记住git账号密码"
+
+git config  core.autocrlf input   
+echo "已设置auto crlf = input"
+
+git config core.filemode false
+echo "已设置忽略文件模式变化"
+
+echo "git配置完成"

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.24.0"
+  "version": "1.24.2"
 }

package.json

@@ -24,9 +24,9 @@
   "license": "AGPL-3.0",
   "dependencies": {
     "axios": "^1.7.2",
-    "lodash": "^4.17.21"
+    "lodash-es": "^4.17.21"
   },
   "workspaces": [
     "packages/**"
   ]
-}
+}

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.24.2](https://github.com/publishlab/node-acme-client/compare/v1.24.1...v1.24.2) (2024-09-06)
+
+### Performance Improvements
+
+* 修复windows下无法执行第二条命令的bug ([d5bfcdb](https://github.com/publishlab/node-acme-client/commit/d5bfcdb6de1dcc1702155442e2e00237d0bbb6e5))
+
+## [1.24.1](https://github.com/publishlab/node-acme-client/compare/v1.24.0...v1.24.1) (2024-09-02)
+
+### Bug Fixes
+
+* 修复在没有勾选使用代理的情况下，仍然会使用代理的bug ([0f66794](https://github.com/publishlab/node-acme-client/commit/0f6679425f6a736bb0128527dd99c085fac17d84))
+
+### Performance Improvements
+
+* 部署插件支持宝塔、易盾云等 ([ee61709](https://github.com/publishlab/node-acme-client/commit/ee617095efa1171548cf52fd45f0f98a368555a3))
+* 授权配置支持加密 ([42a56b5](https://github.com/publishlab/node-acme-client/commit/42a56b581d754c3e5f9838179d19ab0d004ef2eb))
+
 # [1.24.0](https://github.com/publishlab/node-acme-client/compare/v1.23.1...v1.24.0) (2024-08-25)
 
 ### Bug Fixes

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.24.0",
+    "version": "1.24.2",
     "main": "src/index.js",
     "types": "types/index.d.ts",
     "license": "MIT",
@@ -59,5 +59,5 @@
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
     },
-    "gitHead": "e5da46cfc31b2e30a4903bcb2251b1851265ef41"
+    "gitHead": "bef6b981e26a010a797734e508de6822de8564f5"
 }

packages/core/acme-client/src/auto.js

@@ -13,8 +13,12 @@ const defaultOpts = {
     termsOfServiceAgreed: false,
     skipChallengeVerification: false,
     challengePriority: ['http-01', 'dns-01'],
-    challengeCreateFn: async () => { throw new Error('Missing challengeCreateFn()'); },
-    challengeRemoveFn: async () => { throw new Error('Missing challengeRemoveFn()'); },
+    challengeCreateFn: async () => {
+        throw new Error('Missing challengeCreateFn()');
+    },
+    challengeRemoveFn: async () => {
+        throw new Error('Missing challengeRemoveFn()');
+    },
 };
 
 /**
@@ -209,6 +213,7 @@ module.exports = async (client, userOpts) => {
     }
 
     log(`[auto] challengeGroups:${allChallengePromises.length}`);
+
     function runAllPromise(tasks) {
         let promise = Promise.resolve();
         tasks.forEach((task) => {
@@ -228,48 +233,48 @@ module.exports = async (client, userOpts) => {
         return Promise.all(results);
     }
 
-    try {
-        log(`开始challenge，共${allChallengePromises.length}组`);
-        let i = 0;
-        // eslint-disable-next-line no-restricted-syntax
-        for (const challengePromises of allChallengePromises) {
-            i += 1;
-            log(`开始第${i}组`);
-            if (opts.signal && opts.signal.aborted) {
-                throw new Error('用户取消');
-            }
+    log(`开始challenge，共${allChallengePromises.length}组`);
+    let i = 0;
+    // eslint-disable-next-line no-restricted-syntax
+    for (const challengePromises of allChallengePromises) {
+        i += 1;
+        log(`开始第${i}组`);
+        if (opts.signal && opts.signal.aborted) {
+            throw new Error('用户取消');
+        }
+
+        try {
             // eslint-disable-next-line no-await-in-loop
             await runPromisePa(challengePromises);
         }
-        log('challenge结束');
-
-        // log('[auto] Waiting for challenge valid status');
-        // await Promise.all(challengePromises);
-
-        /**
-         * Finalize order and download certificate
-         */
-
-        log('[auto] Finalizing order and downloading certificate');
-        const finalized = await client.finalizeOrder(order, opts.csr);
-        return await client.getCertificate(finalized, opts.preferredChain);
-    }
-    catch (e) {
-        log('证书申请失败');
-        log(e);
-        throw new Error(`证书申请失败:${e.message}`);
-    }
-    finally {
-        log(`清理challenge痕迹，length:${clearTasks.length}`);
-        try {
-            await runAllPromise(clearTasks);
-        }
         catch (e) {
-            log('清理challenge失败');
-            log(e);
+            log(`证书申请失败${e.message}`);
+            throw e;
+        }
+        finally {
+            log(`清理challenge痕迹，length:${clearTasks.length}`);
+            try {
+                // eslint-disable-next-line no-await-in-loop
+                await runAllPromise(clearTasks);
+            }
+            catch (e) {
+                log('清理challenge失败');
+                log(e);
+            }
         }
     }
+    log('challenge结束');
 
+    // log('[auto] Waiting for challenge valid status');
+    // await Promise.all(challengePromises);
+    /**
+     * Finalize order and download certificate
+     */
+
+    log('[auto] Finalizing order and downloading certificate');
+    const finalized = await client.finalizeOrder(order, opts.csr);
+    const res = await client.getCertificate(finalized, opts.preferredChain);
+    return res;
     // try {
     //     await Promise.allSettled(challengePromises);
     // }

packages/core/acme-client/src/crypto/index.js

@@ -290,7 +290,6 @@ exports.readCsrDomains = (csrPem) => {
     if (Buffer.isBuffer(csrPem)) {
         csrPem = csrPem.toString();
     }
-
     const dec = x509.PemConverter.decodeFirst(csrPem);
     const csr = new x509.Pkcs10CertificateRequest(dec);
     return parseDomains(csr);

packages/core/acme-client/src/http.js

@@ -55,7 +55,7 @@ class HttpClient {
      */
 
     async request(url, method, opts = {}) {
-        if (this.urlMapping && this.urlMapping.mappings) {
+        if (this.urlMapping && this.urlMapping.enabled && this.urlMapping.mappings) {
             // eslint-disable-next-line no-restricted-syntax
             for (const key in this.urlMapping.mappings) {
                 if (url.includes(key)) {

packages/core/acme-client/src/index.js

@@ -32,7 +32,7 @@ exports.directory = {
  */
 
 exports.crypto = require('./crypto');
-exports.forge = require('./crypto/forge');
+// exports.forge = require('./crypto/forge');
 
 /**
  * Axios

packages/core/acme-client/src/verify.js

@@ -111,7 +111,7 @@ async function verifyDnsChallenge(authz, challenge, keyAuthorization, prefix = '
     log(`DNS query finished successfully, found ${recordValues.length} TXT records`);
 
     if (!recordValues.length || !recordValues.includes(keyAuthorization)) {
-        throw new Error(`Authorization not found in DNS TXT record: ${recordName}`);
+        throw new Error(`Authorization not found in DNS TXT record: ${recordName}，need:${keyAuthorization},found:${recordValues}`);
     }
 
     log(`Key authorization match for ${challenge.type}/${recordName}, ACME challenge verified`);

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06)
+
+### Performance Improvements
+
+* 优化跳过处理逻辑 ([b80210f](https://github.com/certd/certd/commit/b80210f24bf5db1c958d06ab27c9e5d3db452eda))
+* 支持pfx、der ([fbeaed2](https://github.com/certd/certd/commit/fbeaed203519f59b6d9396c4e8953353ccb5e723))
+
+## [1.24.1](https://github.com/certd/certd/compare/v1.24.0...v1.24.1) (2024-09-02)
+
+### Performance Improvements
+
+* 部署插件支持宝塔、易盾云等 ([ee61709](https://github.com/certd/certd/commit/ee617095efa1171548cf52fd45f0f98a368555a3))
+* 授权配置支持加密 ([42a56b5](https://github.com/certd/certd/commit/42a56b581d754c3e5f9838179d19ab0d004ef2eb))
+* 支持阿里云 DCDN ([98b77f8](https://github.com/certd/certd/commit/98b77f80843834616fb26f83b4c42245326abd06))
+* 支持已跳过的步骤重新运行 ([ea775ad](https://github.com/certd/certd/commit/ea775adae18d57a04470cfba6b9460d761d74035))
+
 # [1.24.0](https://github.com/certd/certd/compare/v1.23.1...v1.24.0) (2024-08-25)
 
 ### Bug Fixes

packages/core/pipeline/build.md

@@ -1 +1 @@
-14:26
+22:33

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.24.0",
+  "version": "1.24.2",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -14,6 +14,7 @@
     "test": "mocha   --loader=ts-node/esm"
   },
   "dependencies": {
+    "@certd/plus": "1.22.1",
     "axios": "^1.7.2",
     "fix-path": "^4.0.0",
     "lodash-es": "^4.17.21",
@@ -56,5 +57,5 @@
     "vite": "^4.3.8",
     "vue-tsc": "^1.6.5"
   },
-  "gitHead": "e5da46cfc31b2e30a4903bcb2251b1851265ef41"
+  "gitHead": "bef6b981e26a010a797734e508de6822de8564f5"
 }

packages/core/pipeline/src/access/api.ts

@@ -4,6 +4,7 @@ import { FormItemProps } from "../dt/index.js";
 export type AccessInputDefine = FormItemProps & {
   title: string;
   required?: boolean;
+  encrypt?: boolean;
 };
 export type AccessDefine = Registrable & {
   input?: {

packages/core/pipeline/src/core/executor.ts

@@ -12,6 +12,7 @@ import { RegistryItem } from "../registry/index.js";
 import { Decorator } from "../decorator/index.js";
 import { IEmailService } from "../service/index.js";
 import { FileStore } from "./file-store.js";
+import { hashUtils } from "../utils/index.js";
 // import { TimeoutPromise } from "../utils/util.promise.js";
 
 export type ExecutorOptions = {
@@ -36,6 +37,8 @@ export class Executor {
   options: ExecutorOptions;
   abort: AbortController = new AbortController();
 
+  _inited = false;
+
   onChanged: (history: RunHistory) => Promise<void>;
   constructor(options: ExecutorOptions) {
     this.options = options;
@@ -50,6 +53,10 @@ export class Executor {
   }
 
   async init() {
+    if (this._inited) {
+      return;
+    }
+    this._inited = true;
     const lastRuntime = await this.pipelineContext.getObj(`lastRuntime`);
     this.lastRuntime = lastRuntime;
     this.lastStatusMap = new RunnableCollection(lastRuntime?.pipeline);
@@ -63,6 +70,7 @@ export class Executor {
   }
 
   async run(runtimeId: any = 0, triggerType: string) {
+    let intervalFlushLogId: any = undefined;
     try {
       await this.init();
       const trigger = { type: triggerType };
@@ -70,64 +78,50 @@ export class Executor {
       this.runtime = new RunHistory(runtimeId, trigger, this.pipeline);
       this.logger.info(`pipeline.${this.pipeline.id}  start`);
       await this.notification("start");
+
+      this.runtime.start(this.pipeline);
+      intervalFlushLogId = setInterval(async () => {
+        await this.onChanged(this.runtime);
+      }, 5000);
+
       await this.runWithHistory(this.pipeline, "pipeline", async () => {
-        await this.runStages(this.pipeline);
+        return await this.runStages(this.pipeline);
       });
       if (this.lastRuntime && this.lastRuntime.pipeline.status?.status === ResultType.error) {
         await this.notification("turnToSuccess");
       }
       await this.notification("success");
-    } catch (e) {
+    } catch (e: any) {
       await this.notification("error", e);
-      this.logger.error("pipeline 执行失败", e);
+      this.logger.error("pipeline 执行失败", e.stack);
     } finally {
+      clearInterval(intervalFlushLogId);
+      await this.onChanged(this.runtime);
       await this.pipelineContext.setObj("lastRuntime", this.runtime);
       this.logger.info(`pipeline.${this.pipeline.id}  end`);
     }
   }
 
-  async runWithHistory(runnable: Runnable, runnableType: string, run: () => Promise<void>) {
+  async runWithHistory(runnable: Runnable, runnableType: string, run: () => Promise<ResultType | void>) {
     runnable.runnableType = runnableType;
     this.runtime.start(runnable);
+    // const timeout = runnable.timeout ?? 20 * 60 * 1000;
     await this.onChanged(this.runtime);
 
-    if (runnable.strategy?.runStrategy === RunStrategy.SkipWhenSucceed) {
-      //如果是成功后跳过策略
-      const lastNode = this.lastStatusMap.get(runnable.id);
-      const lastResult = lastNode?.status?.status;
-      const lastInput = JSON.stringify(lastNode?.status?.input);
-      let inputChanged = false;
-      if (runnableType === "step") {
-        const step = runnable as Step;
-        const input = JSON.stringify(step.input);
-        if (input != null && lastInput !== input) {
-          //参数有变化
-          inputChanged = true;
-        }
-      }
-      if (lastResult != null && lastResult === ResultType.success && !inputChanged) {
-        runnable.status!.output = lastNode?.status?.output;
-        runnable.status!.files = lastNode?.status?.files;
-        this.runtime.skip(runnable);
-        await this.onChanged(this.runtime);
-        return ResultType.skip;
-      }
-    }
-    const intervalFlushLogId = setInterval(async () => {
-      await this.onChanged(this.runtime);
-    }, 5000);
-
-    // const timeout = runnable.timeout ?? 20 * 60 * 1000;
     try {
       if (this.abort.signal.aborted) {
         this.runtime.cancel(runnable);
         return ResultType.canceled;
       }
-      await run();
+      const resultType = await run();
       if (this.abort.signal.aborted) {
         this.runtime.cancel(runnable);
         return ResultType.canceled;
       }
+      if (resultType == ResultType.skip) {
+        this.runtime.skip(runnable);
+        return resultType;
+      }
       this.runtime.success(runnable);
       return ResultType.success;
     } catch (e: any) {
@@ -135,7 +129,6 @@ export class Executor {
       throw e;
     } finally {
       this.runtime.finally(runnable);
-      clearInterval(intervalFlushLogId);
       await this.onChanged(this.runtime);
     }
   }
@@ -144,7 +137,7 @@ export class Executor {
     const resList: ResultType[] = [];
     for (const stage of pipeline.stages) {
       const res: ResultType = await this.runWithHistory(stage, "stage", async () => {
-        await this.runStage(stage);
+        return await this.runStage(stage);
       });
       resList.push(res);
     }
@@ -157,6 +150,7 @@ export class Executor {
       const runner = async () => {
         return this.runWithHistory(task, "task", async () => {
           await this.runTask(task);
+          return ResultType.success;
         });
       };
       runnerList.push(runner);
@@ -199,7 +193,7 @@ export class Executor {
     for (const step of task.steps) {
       step.runnableType = "step";
       const res: ResultType = await this.runWithHistory(step, "step", async () => {
-        await this.runStep(step);
+        return await this.runStep(step);
       });
       resList.push(res);
     }
@@ -218,19 +212,40 @@ export class Executor {
     // @ts-ignore
     const define: PluginDefine = plugin.define;
     //从outputContext读取输入参数
-    Decorator.inject(define.input, instance, step.input, (item, key) => {
+    const input = _.cloneDeep(step.input);
+    Decorator.inject(define.input, instance, input, (item, key) => {
       if (item.component?.name === "pi-output-selector") {
-        const contextKey = step.input[key];
+        const contextKey = input[key];
         if (contextKey != null) {
           // "cert": "step.-BNFVPMKPu2O-i9NiOQxP.cert",
           const arr = contextKey.split(".");
           const id = arr[1];
           const outputKey = arr[2];
-          step.input[key] = this.currentStatusMap.get(id)?.status?.output[outputKey] ?? this.lastStatusMap.get(id)?.status?.output[outputKey];
+          input[key] = this.currentStatusMap.get(id)?.status?.output[outputKey] ?? this.lastStatusMap.get(id)?.status?.output[outputKey];
         }
       }
     });
 
+    const newInputHash = hashUtils.md5(JSON.stringify(input));
+    step.status!.inputHash = newInputHash;
+    //判断是否需要跳过
+    const lastNode = this.lastStatusMap.get(step.id);
+    const lastResult = lastNode?.status?.status;
+    if (step.strategy?.runStrategy === RunStrategy.SkipWhenSucceed) {
+      //如果是成功后跳过策略
+      let inputChanged = true;
+      const lastInputHash = lastNode?.status?.inputHash;
+      if (lastInputHash && newInputHash && lastInputHash === newInputHash) {
+        //参数有变化
+        inputChanged = false;
+      }
+      if (lastResult != null && lastResult === ResultType.success && !inputChanged) {
+        step.status!.output = lastNode?.status?.output;
+        step.status!.files = lastNode?.status?.files;
+        return ResultType.skip;
+      }
+    }
+
     const http = createAxiosService({ logger: currentLogger });
     const taskCtx: TaskInstanceContext = {
       pipeline: this.pipeline,
@@ -265,7 +280,6 @@ export class Executor {
       // this.runtime.context[stepOutputKey] = instance[key];
     });
     step.status!.files = instance.getFiles();
-
     //更新pipeline vars
     if (Object.keys(instance._result.pipelineVars).length > 0) {
       // 判断 pipelineVars 有值时更新
@@ -282,17 +296,17 @@ export class Executor {
     let subject = "";
     let content = "";
     if (when === "start") {
-      subject = `【CertD】开始执行，${this.pipeline.title}, buildId:${this.runtime.id}`;
-      content = subject;
+      subject = `【CertD】开始执行，【${this.pipeline.id}】${this.pipeline.title}`;
+      content = `buildId:${this.runtime.id}`;
     } else if (when === "success") {
-      subject = `【CertD】执行成功，${this.pipeline.title}, buildId:${this.runtime.id}`;
-      content = subject;
+      subject = `【CertD】执行成功，【${this.pipeline.id}】${this.pipeline.title}`;
+      content = `buildId:${this.runtime.id}`;
     } else if (when === "turnToSuccess") {
-      subject = `【CertD】执行成功（错误转成功），${this.pipeline.title}, buildId:${this.runtime.id}`;
-      content = subject;
+      subject = `【CertD】执行成功（错误转成功），【${this.pipeline.id}】${this.pipeline.title}`;
+      content = `buildId:${this.runtime.id}`;
     } else if (when === "error") {
-      subject = `【CertD】执行失败，${this.pipeline.title}, buildId:${this.runtime.id}`;
-      content = `<pre>${error.message}</pre>`;
+      subject = `【CertD】执行失败，【${this.pipeline.id}】${this.pipeline.title}`;
+      content = `buildId:${this.runtime.id}\nerror:${error.message}`;
     } else {
       return;
     }
@@ -315,4 +329,8 @@ export class Executor {
       }
     }
   }
+
+  clearLastStatus(stepId: string) {
+    this.lastStatusMap.clearById(stepId);
+  }
 }

packages/core/pipeline/src/core/license.spec.ts

@@ -1,14 +0,0 @@
-import { isPlus, verify } from "./license.js";
-import { equal } from "assert";
-describe("license", function () {
-  it("#license", async function () {
-    const req = {
-      subjectId: "999",
-      license: "",
-    };
-    const plus = isPlus();
-    equal(plus, false);
-    const res = await verify(req);
-    equal(res, true);
-  });
-});

packages/core/pipeline/src/core/license.ts

@@ -1,138 +1,10 @@
-import { createVerify } from "node:crypto";
 import { logger } from "../utils/index.js";
-import dayjs from "dayjs";
+import { setLogger, isPlus } from "@certd/plus";
+setLogger(logger);
+export * from "@certd/plus";
 
-let SecreteKey =
-  "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJDZ0tDQVFFQW9VWE1EWUhjdi82WFROWEZFSUI2RlpuR2FER0cwZnR5bTV1dVhPck9NaVl0UkxSb1lvSGMKNVZxenE0N00rdEFqRFBhaTBlOFhWS1c3aytUQUw3MUs0N2JCQVEyWTBxNU5Ya3lYcE5PTVdueVFMYXBwb0tWNgpPMkFJMnpFVURWMVJVa0ZtMFZTVjU0VXNzMDcrdjI2aW5aQU1CWitDMU42eWFDc2tZL3grNnVlNkVRNVcyZXdFCjZOWEhJcUU1bHdEUmU2SXJtdEpnU2doSnlHTS91azIyejN6NGEraFVPVUlWMy9DbEhYV0VhRHBBRFFsakt3NSsKeHR0dURiTHZyUmdzdWp6czB0dEI2OE1SbXE0R0FJL0JtNWVPWkhlNGxFQjBFVVhFUXdVWE1jV1N1VFZSMUE2cApUM21LRGo5MGcwVDFZUlNOdE5TMm9aRzgvRWIwOVlxK3Z3SURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K";
-let appKey = "kQth6FHM71IPV3qdWc";
-if (process.env.NODE_ENV !== "production") {
-  SecreteKey =
-    "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJDZ0tDQVFFQXY3TGtMaUp1dGM0NzhTU3RaTExjajVGZXh1YjJwR2NLMGxwa0hwVnlZWjhMY29rRFhuUlAKUGQ5UlJSTVRTaGJsbFl2Mzd4QUhOV1ZIQ0ZsWHkrQklVU001bUlBU1NDQTV0azlJNmpZZ2F4bEFDQm1BY0lGMwozKzBjeGZIYVkrVW9YdVluMkZ6YUt2Ym5GdFZIZ0lkMDg4a3d4clZTZzlCT3BDRVZIR1pxR2I5TWN5MXVHVXhUClFTVENCbmpoTWZlZ0p6cXVPYWVOY0ZPSE5tbmtWRWpLTythbTBPeEhNS1lyS3ZnQnVEbzdoVnFENlBFMUd6V3AKZHdwZUV4QXZDSVJxL2pWTkdRK3FtMkRWOVNJZ3U5bmF4MktmSUtFeU50dUFFS1VpekdqL0VmRFhDM1cxMExhegpKaGNYNGw1SUFZU1o3L3JWVmpGbExWSVl0WDU1T054L1Z3SURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K";
-  appKey = "z4nXOeTeSnnpUpnmsV1";
-}
-
-export const AppKey = appKey;
-
-export type LicenseVerifyReq = {
-  subjectId: string;
-  license: string;
-};
-
-type License = {
-  appKey: string;
-  code: string;
-  subjectId: string;
-  expireTime: number;
-  activeTime: number;
-  duration: number;
-  version: number;
-  secret: string;
-  vipType: string;
-  signature: string;
-};
-
-class LicenseHolder {
-  isPlus = false;
-  expireTime = 0;
-  vipType = "";
-  message?: string = undefined;
-  secret?: string = undefined;
-}
-const holder = new LicenseHolder();
-holder.isPlus = false;
-
-class LicenseVerifier {
-  checked = false;
-  licenseReq?: LicenseVerifyReq = undefined;
-  async reVerify(req: LicenseVerifyReq) {
-    this.checked = false;
-    return await this.verify(req);
-  }
-
-  setPlus(value: boolean, info: any = {}) {
-    if (value && info) {
-      holder.isPlus = true;
-      holder.expireTime = info.expireTime;
-      holder.secret = info.secret;
-      holder.vipType = info.vipType;
-    } else {
-      holder.isPlus = false;
-      holder.expireTime = 0;
-      holder.vipType = "";
-      holder.message = info.message;
-      holder.secret = undefined;
-    }
-    return {
-      ...holder,
-    };
-  }
-  async verify(req: LicenseVerifyReq) {
-    this.licenseReq = req;
-    if (this.checked) {
-      return this.setPlus(false);
-    }
-    const license = req?.license;
-    if (!license) {
-      this.checked = true;
-      return this.setPlus(false);
-    }
-
-    const licenseJson = Buffer.from(license, "base64").toString();
-    const json: License = JSON.parse(licenseJson);
-    if (json.expireTime < Date.now()) {
-      logger.warn("授权已过期");
-      return this.setPlus(false, { message: "授权已过期" });
-    }
-    const content = `${appKey},${this.licenseReq.subjectId},${json.code},${json.secret},${json.vipType},${json.activeTime},${json.duration},${json.expireTime},${json.version}`;
-    // content := fmt.Sprintf("%s,%s,%s,%s,%d,%d,%d,%d,%d", entity.AppKey, entity.SubjectId, entity.Code, entity.Secret, entity.Level, entity.ActiveTime, entity.Duration, entity.ExpireTime, entity.Version)
-    //z4nXOeTeSnnpUpnmsV,_m9jFTdNHktdaEN4xBDw_,HZz7rAAR3h3zGlDMhScO1wGBYPjXpZ9S_1,uUpr9I8p6K3jWSzu2Wh5NECvgG2FNynU,0,1724199847470,365,1787271324416,1
-    logger.debug("content:", content);
-    const publicKey = Buffer.from(SecreteKey, "base64").toString();
-    const res = this.verifySignature(content, json.signature, publicKey);
-    this.checked = true;
-    if (!res) {
-      logger.warn("授权校验失败");
-      return this.setPlus(false, { message: "授权校验失败" });
-    }
-    logger.info(`授权校验成功，到期时间：${dayjs(json.expireTime).format("YYYY-MM-DD HH:mm:ss")}`);
-    return this.setPlus(true, {
-      expireTime: json.expireTime,
-      vipType: json.vipType || "plus",
-      secret: json.secret,
-    });
-  }
-
-  verifySignature(content: string, signature: any, publicKey: string) {
-    const verify = createVerify("RSA-SHA256");
-    verify.update(content);
-    return verify.verify(publicKey, signature, "base64");
-  }
-}
-
-const verifier = new LicenseVerifier();
-
-export function isPlus() {
-  return holder.isPlus && holder.expireTime > Date.now();
-}
-
-export function isCommercial() {
-  return holder.isPlus && holder.vipType === "comm" && holder.expireTime > Date.now();
-}
-
-export function getPlusInfo() {
-  return {
-    isPlus: holder.isPlus,
-    vipType: holder.vipType,
-    expireTime: holder.expireTime,
-    secret: holder.secret,
-  };
-}
-
-export async function verify(req: LicenseVerifyReq) {
-  try {
-    return await verifier.reVerify(req);
-  } catch (e) {
-    logger.error(e);
-    return verifier.setPlus(false, { message: "授权校验失败" });
+export function checkPlus() {
+  if (!isPlus()) {
+    throw new Error("此为专业版功能，请升级到专业版");
   }
 }

packages/core/pipeline/src/core/run-history.ts

@@ -41,10 +41,8 @@ export class RunHistory {
     this._loggers[runnable.id] = buildLogger((text) => {
       this.logs[runnable.id].push(text);
     });
-    const input = (runnable as Step).input;
     const status: HistoryResult = {
       output: {},
-      input: _.cloneDeep(input),
       status: ResultType.start,
       startTime: now,
       result: ResultType.start,
@@ -104,12 +102,13 @@ export class RunHistory {
 
   log(runnable: Runnable, text: string) {
     // @ts-ignore
-    this._loggers[runnable.id].info(`[${runnable.title}]<id:${runnable.id}> [${runnable.runnableType}]`, text);
+    this._loggers[runnable.id].info(`[${runnable.runnableType}] [${runnable.title}]<id:${runnable.id}> ：`, text);
   }
 
   logError(runnable: Runnable, e: Error) {
     // @ts-ignore
-    this._loggers[runnable.id].error(`[${runnable.title}]<id:${runnable.id}> [${runnable.runnableType}]`, e);
+    const errorInfo = runnable.runnableType == "step" ? e.stack : e.message;
+    this._loggers[runnable.id].error(`[${runnable.runnableType}] [${runnable.title}]<id:${runnable.id}> ：${errorInfo}`);
   }
 
   finally(runnable: Runnable) {
@@ -166,6 +165,14 @@ export class RunnableCollection {
     });
   }
 
+  clearById(id: string) {
+    const runnable = this.collection[id];
+    if (runnable?.status) {
+      runnable.status.status = ResultType.none;
+      runnable.status.result = ResultType.none;
+    }
+  }
+
   add(runnable: Runnable) {
     this.collection[runnable.id] = runnable;
   }

packages/core/pipeline/src/dt/pipeline.ts

@@ -118,7 +118,8 @@ export type HistoryResultGroup = {
   };
 };
 export type HistoryResult = {
-  input: any;
+  // input: any;
+  inputHash?: string;
   output: any;
   files?: FileItem[];
   /**

packages/core/pipeline/src/plugin/api.ts

@@ -17,6 +17,7 @@ export enum ContextScope {
 export type TaskOutputDefine = {
   title: string;
   value?: any;
+  type?: string;
 };
 
 export type TaskInputDefine = FormItemProps;
@@ -40,6 +41,8 @@ export type PluginDefine = Registrable & {
     dest: string;
     type: "computed";
   }[];
+
+  needPlus?: boolean;
 };
 
 export type ITaskPlugin = {

packages/core/pipeline/src/utils/index.ts

@@ -4,6 +4,7 @@ export * from "./util.log.js";
 export * from "./util.file.js";
 export * from "./util.sp.js";
 export * as promises from "./util.promise.js";
+export * from "./util.hash.js";
 export const utils = {
   sleep,
   http: request,

packages/core/pipeline/src/utils/util.hash.ts

@@ -0,0 +1,9 @@
+import crypto from "crypto";
+
+function md5(data: string) {
+  return crypto.createHash("md5").update(data).digest("hex");
+}
+
+export const hashUtils = {
+  md5,
+};

packages/core/pipeline/src/utils/util.request.ts

@@ -1,8 +1,31 @@
 import axios from "axios";
-// @ts-ignore
-import qs from "qs";
 import { logger } from "./util.log.js";
 import { Logger } from "log4js";
+
+export class HttpError extends Error {
+  request?: { url: string; method: string; data?: any };
+  response?: { data: any };
+  status?: number;
+  statusText?: string;
+  constructor(error: any) {
+    if (!error) {
+      return;
+    }
+    super(error.message);
+    this.name = error.name;
+    this.stack = error.stack;
+    this.status = error?.response?.status;
+    this.statusText = error?.response?.statusText;
+    this.request = {
+      url: error?.response?.config?.url,
+      method: error?.response?.config?.method,
+      data: error?.response?.config?.data,
+    };
+    this.response = {
+      data: error?.response?.data,
+    };
+  }
+}
 /**
  * @description 创建请求实例
  */
@@ -12,13 +35,6 @@ export function createAxiosService({ logger }: { logger: Logger }) {
   // 请求拦截
   service.interceptors.request.use(
     (config: any) => {
-      if (config.formData) {
-        config.data = qs.stringify(config.formData, {
-          arrayFormat: "indices",
-          allowDots: true,
-        }); // 序列化请求参数
-        delete config.formData;
-      }
       logger.info(`http request:${config.url}，method:${config.method}`);
       return config;
     },
@@ -50,26 +66,12 @@ export function createAxiosService({ logger }: { logger: Logger }) {
       //   case 505: error.message = 'HTTP版本不受支持'; break
       //   default: break
       // }
-      logger.error(`请求出错：url:${error?.response?.config.url},method:${error?.response?.config?.method},status:${error?.response?.status}`);
-      logger.info("返回数据:", JSON.stringify(error?.response?.data));
-      delete error.config;
-      const data = error?.response?.data;
-      if (!data) {
-        error.message = data.message || data.msg || data.error || data;
-      }
-      if (error?.response) {
-        return Promise.reject({
-          status: error?.response?.status,
-          statusText: error?.response?.statusText,
-          request: {
-            url: error?.response?.config?.url,
-            method: error?.response?.config?.method,
-            data: error?.response?.data,
-          },
-          data: error?.response?.data,
-        });
-      }
-      return Promise.reject(error);
+      logger.error(
+        `请求出错：status:${error?.response?.status},statusText:${error?.response?.statusText},url:${error?.config?.url},method:${error?.config?.method}。`
+      );
+      logger.error("返回数据:", JSON.stringify(error?.response?.data));
+      const err = new HttpError(error);
+      return Promise.reject(err);
     }
   );
   return service;

packages/core/pipeline/src/utils/util.sp.ts

@@ -51,7 +51,7 @@ export type SpawnOption = {
   cmd: string | string[];
   onStdout?: (data: string) => void;
   onStderr?: (data: string) => void;
-  env: any;
+  env?: any;
   logger?: ILogger;
   options?: any;
 };
@@ -66,6 +66,8 @@ async function spawn(opts: SpawnOption): Promise<string> {
         cmd = item;
       }
     }
+  } else {
+    cmd = opts.cmd;
   }
   log.info(`执行命令: ${cmd}`);
   let stdout = "";

packages/libs/lib-huawei/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.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.24.1](https://github.com/certd/certd/compare/v1.24.0...v1.24.1) (2024-09-02)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20)
 
 **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.22.1",
+  "version": "1.24.2",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
   "types": "./dist/d/index.d.ts",
@@ -16,5 +16,5 @@
     "axios": "^1.7.2",
     "rollup": "^3.7.4"
   },
-  "gitHead": "47fe3d5826661f678d081ab53e67c847a3239d88"
+  "gitHead": "bef6b981e26a010a797734e508de6822de8564f5"
 }

packages/libs/lib-huawei/rollup.config.js

@@ -26,7 +26,7 @@ module.exports = {
       rootDir: "src",
       declaration: true,
       declarationDir: "dist/d",
-      exclude: ["./node_modules/**", "./src/**/*.vue"],
+      exclude: ["./node_modules/**", "./src/**/*.vue", "./src/**/*.spec.ts"],
       allowSyntheticDefaultImports: true,
     }),
     json(),

packages/libs/lib-huawei/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "compileOnSave": true,
+  "compileOnSave": false,
   "compilerOptions": {
     "target": "ESNext",
     "module": "ESNext",

packages/libs/lib-k8s/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.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.24.1](https://github.com/certd/certd/compare/v1.24.0...v1.24.1) (2024-09-02)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 # [1.24.0](https://github.com/certd/certd/compare/v1.23.1...v1.24.0) (2024-08-25)
 
 ### Performance Improvements

packages/libs/lib-k8s/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-k8s",
   "private": false,
-  "version": "1.24.0",
+  "version": "1.24.2",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -16,7 +16,7 @@
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
-    "@certd/pipeline": "^1.24.0",
+    "@certd/pipeline": "^1.24.2",
     "@rollup/plugin-commonjs": "^23.0.4",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
@@ -37,5 +37,5 @@
     "tslib": "^2.5.2",
     "typescript": "^4.8.4"
   },
-  "gitHead": "e5da46cfc31b2e30a4903bcb2251b1851265ef41"
+  "gitHead": "bef6b981e26a010a797734e508de6822de8564f5"
 }

packages/plugins/plugin-cert/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.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06)
+
+### Performance Improvements
+
+* 任务配置不需要的字段可以自动隐藏 ([192d9dc](https://github.com/certd/certd/commit/192d9dc7e36737d684c769f255f407c28b1152ac))
+* 修复windows下无法执行第二条命令的bug ([d5bfcdb](https://github.com/certd/certd/commit/d5bfcdb6de1dcc1702155442e2e00237d0bbb6e5))
+* 优化跳过处理逻辑 ([b80210f](https://github.com/certd/certd/commit/b80210f24bf5db1c958d06ab27c9e5d3db452eda))
+* 支持pfx、der ([fbeaed2](https://github.com/certd/certd/commit/fbeaed203519f59b6d9396c4e8953353ccb5e723))
+
+## [1.24.1](https://github.com/certd/certd/compare/v1.24.0...v1.24.1) (2024-09-02)
+
+### Performance Improvements
+
+* 授权配置支持加密 ([42a56b5](https://github.com/certd/certd/commit/42a56b581d754c3e5f9838179d19ab0d004ef2eb))
+
 # [1.24.0](https://github.com/certd/certd/compare/v1.23.1...v1.24.0) (2024-08-25)
 
 ### Bug Fixes

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.24.0",
+  "version": "1.24.2",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -13,8 +13,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.24.0",
-    "@certd/pipeline": "^1.24.0",
+    "@certd/acme-client": "^1.24.2",
+    "@certd/pipeline": "^1.24.2",
     "jszip": "^3.10.1",
     "node-forge": "^0.10.0",
     "psl": "^1.9.0"
@@ -53,5 +53,5 @@
     "vite": "^3.1.0",
     "vue-tsc": "^0.38.9"
   },
-  "gitHead": "e5da46cfc31b2e30a4903bcb2251b1851265ef41"
+  "gitHead": "bef6b981e26a010a797734e508de6822de8564f5"
 }

packages/plugins/plugin-cert/src/access/eab-access.ts

@@ -13,6 +13,7 @@ export class EabAccess {
     },
     helper: "EAB KID",
     required: true,
+    encrypt: true,
   })
   kid = "";
   @AccessInput({
@@ -22,6 +23,7 @@ export class EabAccess {
     },
     helper: "EAB HMAC Key",
     required: true,
+    encrypt: true,
   })
   hmacKey = "";
 }

packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts

@@ -7,11 +7,13 @@ import { IContext } from "@certd/pipeline";
 import { IDnsProvider } from "../../dns-provider/index.js";
 import psl from "psl";
 import { ClientExternalAccountBindingOptions, UrlMapping } from "@certd/acme-client";
-
+import { utils } from "@certd/pipeline";
 export type CertInfo = {
   crt: string;
   key: string;
   csr: string;
+  pfx?: string;
+  der?: string;
 };
 export type SSLProvider = "letsencrypt" | "google" | "zerossl";
 export type PrivateKeyType = "rsa_1024" | "rsa_2048" | "rsa_3072" | "rsa_4096" | "ec_256" | "ec_384" | "ec_521";
@@ -81,6 +83,7 @@ export class AcmeService {
     if (conf.key == null) {
       conf.key = await this.createNewKey();
       await this.saveAccountConfig(email, conf);
+      this.logger.info(`创建新的Accountkey:${email}`);
     }
     let directoryUrl = "";
     if (isTest) {
@@ -90,6 +93,13 @@ export class AcmeService {
     }
     if (this.options.useMappingProxy) {
       urlMapping.enabled = true;
+    } else {
+      //测试directory是否可以访问
+      const isOk = await this.testDirectory(directoryUrl);
+      if (!isOk) {
+        this.logger.info("测试访问失败，自动使用代理");
+        urlMapping.enabled = true;
+      }
     }
     const client = new acme.Client({
       directoryUrl: directoryUrl,
@@ -117,7 +127,7 @@ export class AcmeService {
   }
 
   async createNewKey() {
-    const key = await acme.forge.createPrivateKey();
+    const key = await acme.crypto.createPrivateKey(2048);
     return key.toString();
   }
 
@@ -229,7 +239,10 @@ export class AcmeService {
     const privateKeyType = options.privateKeyType || "rsa_2048";
     const privateKeyArr = privateKeyType.split("_");
     const type = privateKeyArr[0];
-    const size = parseInt(privateKeyArr[1]);
+    let size = 2048;
+    if (privateKeyArr.length > 1) {
+      size = parseInt(privateKeyArr[1]);
+    }
     if (type == "ec") {
       const name: any = "P-" + size;
       privateKey = await acme.crypto.createPrivateEcdsaKey(name);
@@ -295,4 +308,19 @@ export class AcmeService {
       altNames,
     };
   }
+
+  private async testDirectory(directoryUrl: string) {
+    try {
+      await utils.http({
+        url: directoryUrl,
+        method: "GET",
+        timeout: 10000,
+      });
+    } catch (e) {
+      this.logger.error(`${directoryUrl}，测试访问失败`, e.stack);
+      return false;
+    }
+    this.logger.info(`${directoryUrl}，测试访问成功`);
+    return true;
+  }
 }

packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts

@@ -3,6 +3,8 @@ import dayjs from "dayjs";
 import type { CertInfo } from "./acme.js";
 import { CertReader } from "./cert-reader.js";
 import JSZip from "jszip";
+import { CertConverter } from "./convert.js";
+import fs from "fs";
 
 export { CertReader };
 export type { CertInfo };
@@ -15,6 +17,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
       vModel: "value",
       mode: "tags",
       open: false,
+      tokenSeparators: [",", " ", "，", "、", "|"],
     },
     required: true,
     col: {
@@ -25,7 +28,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
       "1、支持通配符域名，例如： *.foo.com、foo.com、*.test.handsfree.work\n" +
       "2、支持多个域名、多个子域名、多个通配符域名打到一个证书上（域名必须是在同一个DNS提供商解析）\n" +
       "3、多级子域名要分成多个域名输入（*.foo.com的证书不能用于xxx.yyy.foo.com、foo.com）\n" +
-      "4、输入一个回车之后，再输入下一个",
+      "4、输入一个空格之后，再输入下一个",
   })
   domains!: string[];
 
@@ -41,6 +44,18 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
   })
   email!: string;
 
+  @TaskInput({
+    title: "PFX密码",
+    component: {
+      name: "a-input-password",
+      vModel: "value",
+    },
+    required: false,
+    order: 100,
+    helper: "PFX格式证书是否需要加密",
+  })
+  pfxPassword!: string;
+
   @TaskInput({
     title: "更新天数",
     value: 20,
@@ -77,13 +92,6 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
   })
   successNotify = true;
 
-  @TaskInput({
-    title: "配置说明",
-    order: 9999,
-    helper: "运行策略请选择总是运行，其他证书部署任务请选择成功后跳过；当证书快到期前将会自动重新申请证书，然后会清空后续任务的成功状态，部署任务将会重新运行",
-  })
-  intro!: string;
-
   // @TaskInput({
   //   title: "CsrInfo",
   //   helper: "暂时没有用",
@@ -135,22 +143,44 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
 
     this._result.pipelineVars.certExpiresTime = dayjs(certReader.detail.notAfter).valueOf();
 
+    if (cert.pfx == null || cert.der == null) {
+      try {
+        const converter = new CertConverter({ logger: this.logger });
+        const res = await converter.convert({
+          cert,
+          pfxPassword: this.pfxPassword,
+        });
+        const pfxBuffer = fs.readFileSync(res.pfxPath);
+        cert.pfx = pfxBuffer.toString("base64");
+
+        const derBuffer = fs.readFileSync(res.derPath);
+        cert.der = derBuffer.toString("base64");
+
+        this.logger.info("转换证书格式成功");
+        isNew = true;
+      } catch (e) {
+        this.logger.error("转换证书格式失败", e);
+      }
+    }
+
     if (isNew) {
-      const applyTime = dayjs(certReader.detail.notBefore).format("YYYYMMDD_HHmmss");
-      await this.zipCert(cert, applyTime);
+      const zipFileName = certReader.buildCertFileName("zip", certReader.detail.notBefore);
+      await this.zipCert(cert, zipFileName);
     } else {
       this.extendsFiles();
     }
-    // thi
-    // s.logger.info(JSON.stringify(certReader.detail));
   }
 
-  async zipCert(cert: CertInfo, applyTime: string) {
+  async zipCert(cert: CertInfo, filename: string) {
     const zip = new JSZip();
     zip.file("cert.crt", cert.crt);
     zip.file("cert.key", cert.key);
-    const domain_name = this.domains[0].replace(".", "_").replace("*", "_");
-    const filename = `cert_${domain_name}_${applyTime}.zip`;
+    if (cert.pfx) {
+      zip.file("cert.pfx", Buffer.from(cert.pfx, "base64"));
+    }
+    if (cert.der) {
+      zip.file("cert.der", Buffer.from(cert.der, "base64"));
+    }
     const content = await zip.generateAsync({ type: "nodebuffer" });
     this.saveFile(filename, content);
     this.logger.info(`已保存文件:${filename}`);

packages/plugins/plugin-cert/src/plugin/cert-plugin/cert-reader.ts

@@ -3,7 +3,14 @@ import fs from "fs";
 import os from "os";
 import path from "path";
 import { crypto } from "@certd/acme-client";
-export class CertReader implements CertInfo {
+import { ILogger } from "@certd/pipeline";
+import dayjs from "dayjs";
+
+export type CertReaderHandleContext = { reader: CertReader; tmpCrtPath: string; tmpKeyPath: string; tmpPfxPath?: string; tmpDerPath?: string };
+export type CertReaderHandle = (ctx: CertReaderHandleContext) => Promise<void>;
+export type HandleOpts = { logger: ILogger; handle: CertReaderHandle };
+export class CertReader {
+  cert: CertInfo;
   crt: string;
   key: string;
   csr: string;
@@ -11,30 +18,31 @@ export class CertReader implements CertInfo {
   detail: any;
   expires: number;
   constructor(certInfo: CertInfo) {
+    this.cert = certInfo;
     this.crt = certInfo.crt;
     this.key = certInfo.key;
     this.csr = certInfo.csr;
 
-    const { detail, expires } = this.getCrtDetail(this.crt);
+    const { detail, expires } = this.getCrtDetail(this.cert.crt);
     this.detail = detail;
     this.expires = expires.getTime();
   }
 
   toCertInfo(): CertInfo {
-    return {
-      crt: this.crt,
-      key: this.key,
-      csr: this.csr,
-    };
+    return this.cert;
   }
 
-  getCrtDetail(crt: string) {
+  getCrtDetail(crt: string = this.cert.crt) {
     const detail = crypto.readCertificateInfo(crt.toString());
     const expires = detail.notAfter;
     return { detail, expires };
   }
 
-  saveToFile(type: "crt" | "key", filepath?: string) {
+  saveToFile(type: "crt" | "key" | "pfx" | "der", filepath?: string) {
+    if (!this.cert[type]) {
+      return;
+    }
+
     if (filepath == null) {
       //写入临时目录
       filepath = path.join(os.tmpdir(), "/certd/tmp/", Math.floor(Math.random() * 1000000) + "", `cert.${type}`);
@@ -44,8 +52,50 @@ export class CertReader implements CertInfo {
     if (!fs.existsSync(dir)) {
       fs.mkdirSync(dir, { recursive: true });
     }
-
-    fs.writeFileSync(filepath, this[type]);
+    if (type === "crt" || type === "key") {
+      fs.writeFileSync(filepath, this.cert[type]);
+    } else {
+      fs.writeFileSync(filepath, Buffer.from(this.cert[type], "base64"));
+    }
     return filepath;
   }
+
+  async readCertFile(opts: HandleOpts) {
+    const logger = opts.logger;
+    logger.info("将证书写入本地缓存文件");
+    const tmpCrtPath = this.saveToFile("crt");
+    const tmpKeyPath = this.saveToFile("key");
+    const tmpPfxPath = this.saveToFile("pfx");
+    const tmpDerPath = this.saveToFile("der");
+    logger.info("本地文件写入成功");
+    try {
+      await opts.handle({
+        reader: this,
+        tmpCrtPath: tmpCrtPath,
+        tmpKeyPath: tmpKeyPath,
+        tmpPfxPath: tmpPfxPath,
+        tmpDerPath: tmpDerPath,
+      });
+    } finally {
+      //删除临时文件
+      logger.info("删除临时文件");
+      function removeFile(filepath?: string) {
+        if (filepath) {
+          fs.unlinkSync(filepath);
+        }
+      }
+      removeFile(tmpCrtPath);
+      removeFile(tmpKeyPath);
+      removeFile(tmpPfxPath);
+      removeFile(tmpDerPath);
+    }
+  }
+
+  buildCertFileName(suffix: string, applyTime: number, prefix = "cert") {
+    const detail = this.getCrtDetail();
+    let domain = detail.detail.domains.commonName;
+    domain = domain.replace(".", "_").replace("*", "_");
+    const timeStr = dayjs(applyTime).format("YYYYMMDDHHmmss");
+    return `${prefix}_${domain}_${timeStr}.${suffix}`;
+  }
 }

packages/plugins/plugin-cert/src/plugin/cert-plugin/convert.ts

@@ -0,0 +1,91 @@
+import { ILogger, sp } from "@certd/pipeline";
+import type { CertInfo } from "../cert-plugin/acme.js";
+import { CertReader, CertReaderHandleContext } from "../cert-plugin/cert-reader.js";
+import path from "path";
+import os from "os";
+import fs from "fs";
+
+export { CertReader };
+export type { CertInfo };
+
+export class CertConverter {
+  logger: ILogger;
+
+  constructor(opts: { logger: ILogger }) {
+    this.logger = opts.logger;
+  }
+  async convert(opts: { cert: CertInfo; pfxPassword: string }): Promise<{
+    pfxPath: string;
+    derPath: string;
+  }> {
+    const certReader = new CertReader(opts.cert);
+    let pfxPath: string;
+    let derPath: string;
+    const handle = async (opts: CertReaderHandleContext) => {
+      // 调用openssl 转pfx
+      pfxPath = await this.convertPfx(opts);
+
+      // 转der
+      derPath = await this.convertDer(opts);
+    };
+
+    await certReader.readCertFile({ logger: this.logger, handle });
+
+    return {
+      pfxPath,
+      derPath,
+    };
+  }
+
+  async exec(cmd: string) {
+    await sp.spawn({
+      cmd: cmd,
+      logger: this.logger,
+    });
+  }
+
+  private async convertPfx(opts: CertReaderHandleContext, pfxPassword?: string) {
+    const { tmpCrtPath, tmpKeyPath } = opts;
+
+    const pfxPath = path.join(os.tmpdir(), "/certd/tmp/", Math.floor(Math.random() * 1000000) + "", "cert.pfx");
+
+    const dir = path.dirname(pfxPath);
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+
+    let passwordArg = "-passout pass:";
+    if (pfxPassword) {
+      passwordArg = `-password pass:${pfxPassword}`;
+    }
+    await this.exec(`openssl pkcs12 -export -out ${pfxPath} -inkey ${tmpKeyPath} -in ${tmpCrtPath} ${passwordArg}`);
+    return pfxPath;
+    // const fileBuffer = fs.readFileSync(pfxPath);
+    // this.pfxCert = fileBuffer.toString("base64");
+    //
+    // const applyTime = new Date().getTime();
+    // const filename = reader.buildCertFileName("pfx", applyTime);
+    // this.saveFile(filename, fileBuffer);
+  }
+
+  private async convertDer(opts: CertReaderHandleContext) {
+    const { tmpCrtPath } = opts;
+    const derPath = path.join(os.tmpdir(), "/certd/tmp/", Math.floor(Math.random() * 1000000) + "", `cert.der`);
+
+    const dir = path.dirname(derPath);
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+
+    await this.exec(`openssl x509 -outform der -in ${tmpCrtPath} -out ${derPath}`);
+
+    return derPath;
+
+    // const fileBuffer = fs.readFileSync(derPath);
+    // this.derCert = fileBuffer.toString("base64");
+    //
+    // const applyTime = new Date().getTime();
+    // const filename = reader.buildCertFileName("der", applyTime);
+    // this.saveFile(filename, fileBuffer);
+  }
+}

packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts

@@ -6,8 +6,8 @@ import { DnsProviderContext, DnsProviderDefine, dnsProviderRegistry } from "../.
 import { CertReader } from "./cert-reader.js";
 import { CertApplyBasePlugin } from "./base.js";
 
-export { CertReader };
 export type { CertInfo };
+export * from "./cert-reader.js";
 
 @IsTaskPlugin({
   name: "CertApply",
@@ -37,11 +37,31 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
         { value: "zerossl", label: "ZeroSSL" },
       ],
     },
-    helper: "如果letsencrypt.org或dv.acme-v02.api.pki.goog无法访问，请尝试开启代理选项\n如果使用ZeroSSL、google证书，需要提供EAB授权",
+    helper: "Let's Encrypt最简单，如果使用ZeroSSL、google证书，需要提供EAB授权",
     required: true,
   })
   sslProvider!: SSLProvider;
 
+  @TaskInput({
+    title: "EAB授权",
+    component: {
+      name: "pi-access-selector",
+      type: "eab",
+    },
+    maybeNeed: true,
+    required: true,
+    helper:
+      "需要提供EAB授权\nZeroSSL：请前往[zerossl开发者中心](https://app.zerossl.com/developer),生成 'EAB Credentials' \n Google：请查看[google获取eab帮助文档](https://github.com/certd/certd/blob/v2/doc/google/google.md)",
+    mergeScript: `
+    return {
+        show: ctx.compute(({form})=>{
+            return form.sslProvider === 'zerossl' || form.sslProvider === 'google'
+        })
+    }
+    `,
+  })
+  eabAccessId!: number;
+
   @TaskInput({
     title: "加密算法",
     value: "rsa_2048",
@@ -62,25 +82,14 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
   })
   privateKeyType!: PrivateKeyType;
 
-  @TaskInput({
-    title: "EAB授权",
-    component: {
-      name: "pi-access-selector",
-      type: "eab",
-    },
-    maybeNeed: true,
-    helper:
-      "如果使用ZeroSSL或者google证书，需要提供EAB授权\nZeroSSL：请前往 https://app.zerossl.com/developer 生成 'EAB Credentials' \n Google：请前往https://github.com/certd/certd/blob/v2/doc/google/google.md",
-  })
-  eabAccessId!: number;
-
   @TaskInput({
     title: "DNS提供商",
     component: {
       name: "pi-dns-provider-selector",
     },
     required: true,
-    helper: "请选择dns解析提供商",
+    helper:
+      "请选择dns解析提供商，您的域名是在哪里注册的，或者域名的dns解析服务器属于哪个平台\n如果这里没有您需要的dns解析提供商，您需要将域名解析服务器设置成上面的任意一个提供商",
   })
   dnsProviderType!: string;
 
@@ -91,13 +100,14 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
     },
     required: true,
     helper: "请选择dns解析提供商授权",
-    reference: [
-      {
-        src: "form.dnsProviderType",
-        dest: "component.type",
-        type: "computed",
-      },
-    ],
+    mergeScript: `return {
+      component:{
+        type: ctx.compute(({form})=>{
+            return form.dnsProviderType
+        })
+      }
+    }
+    `,
   })
   dnsProviderAccess!: string;
 
@@ -108,7 +118,6 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
       name: "a-switch",
       vModel: "checked",
     },
-    maybeNeed: true,
     helper: "如果acme-v02.api.letsencrypt.org或dv.acme-v02.api.pki.goog被墙无法访问，请尝试开启此选项",
   })
   useProxy = false;

packages/ui/Dockerfile

@@ -10,6 +10,7 @@ RUN cd /workspace/certd-server && pnpm install && npm run build-on-docker
 
 
 FROM node:20-alpine
+RUN apk add --no-cache openssl
 WORKDIR /app/
 COPY --from=builder /workspace/certd-server/ /app/
 RUN chmod +x /app/tools/linux/*

packages/ui/certd-client/.dependency-cruiser.js

@@ -1,463 +0,0 @@
-/** @type {import('dependency-cruiser').IConfiguration} */
-module.exports = {
-  forbidden: [
-    /* rules from the 'recommended' preset: */
-    {
-      name: 'no-circular',
-      severity: 'warn',
-      comment:
-        'This dependency is part of a circular relationship. You might want to revise ' +
-        'your solution (i.e. use dependency inversion, make sure the modules have a single responsibility) ',
-      from: {},
-      to: {
-        circular: true
-      }
-    },
-    {
-      name: 'no-orphans',
-      comment:
-        "This is an orphan module - it's likely not used (anymore?). Either use it or " +
-        "remove it. If it's logical this module is an orphan (i.e. it's a config file), " +
-        "add an exception for it in your dependency-cruiser configuration. By default " +
-        "this rule does not scrutinize dot-files (e.g. .eslintrc.js), TypeScript declaration " +
-        "files (.d.ts), tsconfig.json and some of the babel and webpack configs.",
-      severity: 'warn',
-      from: {
-        orphan: true,
-        pathNot: [
-          '(^|/)\\.[^/]+\\.(js|cjs|mjs|ts|json)$', // dot files
-          '\\.d\\.ts$',                            // TypeScript declaration files
-          '(^|/)tsconfig\\.json$',                 // TypeScript config
-          '(^|/)(babel|webpack)\\.config\\.(js|cjs|mjs|ts|json)$' // other configs
-        ]
-      },
-      to: {},
-    },
-    {
-      name: 'no-deprecated-core',
-      comment:
-        'A module depends on a node core module that has been deprecated. Find an alternative - these are ' +
-        "bound to exist - node doesn't deprecate lightly.",
-      severity: 'warn',
-      from: {},
-      to: {
-        dependencyTypes: [
-          'core'
-        ],
-        path: [
-          '^(v8\/tools\/codemap)$',
-          '^(v8\/tools\/consarray)$',
-          '^(v8\/tools\/csvparser)$',
-          '^(v8\/tools\/logreader)$',
-          '^(v8\/tools\/profile_view)$',
-          '^(v8\/tools\/profile)$',
-          '^(v8\/tools\/SourceMap)$',
-          '^(v8\/tools\/splaytree)$',
-          '^(v8\/tools\/tickprocessor-driver)$',
-          '^(v8\/tools\/tickprocessor)$',
-          '^(node-inspect\/lib\/_inspect)$',
-          '^(node-inspect\/lib\/internal\/inspect_client)$',
-          '^(node-inspect\/lib\/internal\/inspect_repl)$',
-          '^(async_hooks)$',
-          '^(punycode)$',
-          '^(domain)$',
-          '^(constants)$',
-          '^(sys)$',
-          '^(_linklist)$',
-          '^(_stream_wrap)$'
-        ],
-      }
-    },
-    {
-      name: 'not-to-deprecated',
-      comment:
-        'This module uses a (version of an) npm module that has been deprecated. Either upgrade to a later ' +
-        'version of that module, or find an alternative. Deprecated modules are a security risk.',
-      severity: 'warn',
-      from: {},
-      to: {
-        dependencyTypes: [
-          'deprecated'
-        ]
-      }
-    },
-    {
-      name: 'no-non-package-json',
-      severity: 'error',
-      comment:
-        "This module depends on an npm package that isn't in the 'dependencies' section of your package.json. " +
-        "That's problematic as the package either (1) won't be available on live (2 - worse) will be " +
-        "available on live with an non-guaranteed version. Fix it by adding the package to the dependencies " +
-        "in your package.json.",
-      from: {},
-      to: {
-        dependencyTypes: [
-          'npm-no-pkg',
-          'npm-unknown'
-        ]
-      }
-    },
-    {
-      name: 'not-to-unresolvable',
-      comment:
-        "This module depends on a module that cannot be found ('resolved to disk'). If it's an npm " +
-        'module: add it to your package.json. In all other cases you likely already know what to do.',
-      severity: 'error',
-      from: {},
-      to: {
-        couldNotResolve: true
-      }
-    },
-    {
-      name: 'no-duplicate-dep-types',
-      comment:
-        "Likely this module depends on an external ('npm') package that occurs more than once " +
-        "in your package.json i.e. bot as a devDependencies and in dependencies. This will cause " +
-        "maintenance problems later on.",
-      severity: 'warn',
-      from: {},
-      to: {
-        moreThanOneDependencyType: true,
-        // as it's pretty common to have a type import be a type only import 
-        // _and_ (e.g.) a devDependency - don't consider type-only dependency
-        // types for this rule
-        dependencyTypesNot: ["type-only"]
-      }
-    },
-
-    /* rules you might want to tweak for your specific situation: */
-    {
-      name: 'not-to-test',
-      comment:
-        "This module depends on code within a folder that should only contain tests. As tests don't " +
-        "implement functionality this is odd. Either you're writing a test outside the test folder " +
-        "or there's something in the test folder that isn't a test.",
-      severity: 'error',
-      from: {
-        pathNot: '^(tests)'
-      },
-      to: {
-        path: '^(tests)'
-      }
-    },
-    {
-      name: 'not-to-spec',
-      comment:
-        'This module depends on a spec (test) file. The sole responsibility of a spec file is to test code. ' +
-        "If there's something in a spec that's of use to other modules, it doesn't have that single " +
-        'responsibility anymore. Factor it out into (e.g.) a separate utility/ helper or a mock.',
-      severity: 'error',
-      from: {},
-      to: {
-        path: '\\.(spec|test)\\.(js|mjs|cjs|ts|ls|coffee|litcoffee|coffee\\.md)$'
-      }
-    },
-    {
-      name: 'not-to-dev-dep',
-      severity: 'error',
-      comment:
-        "This module depends on an npm package from the 'devDependencies' section of your " +
-        'package.json. It looks like something that ships to production, though. To prevent problems ' +
-        "with npm packages that aren't there on production declare it (only!) in the 'dependencies'" +
-        'section of your package.json. If this module is development only - add it to the ' +
-        'from.pathNot re of the not-to-dev-dep rule in the dependency-cruiser configuration',
-      from: {
-        path: '^(src)',
-        pathNot: '\\.(spec|test)\\.(js|mjs|cjs|ts|ls|coffee|litcoffee|coffee\\.md)$'
-      },
-      to: {
-        dependencyTypes: [
-          'npm-dev'
-        ]
-      }
-    },
-    {
-      name: 'optional-deps-used',
-      severity: 'info',
-      comment:
-        "This module depends on an npm package that is declared as an optional dependency " +
-        "in your package.json. As this makes sense in limited situations only, it's flagged here. " +
-        "If you're using an optional dependency here by design - add an exception to your" +
-        "dependency-cruiser configuration.",
-      from: {},
-      to: {
-        dependencyTypes: [
-          'npm-optional'
-        ]
-      }
-    },
-    {
-      name: 'peer-deps-used',
-      comment:
-        "This module depends on an npm package that is declared as a peer dependency " +
-        "in your package.json. This makes sense if your package is e.g. a plugin, but in " +
-        "other cases - maybe not so much. If the use of a peer dependency is intentional " +
-        "add an exception to your dependency-cruiser configuration.",
-      severity: 'warn',
-      from: {},
-      to: {
-        dependencyTypes: [
-          'npm-peer'
-        ]
-      }
-    }
-  ],
-  options: {
-
-    /* conditions specifying which files not to follow further when encountered:
-       - path: a regular expression to match
-       - dependencyTypes: see https://github.com/sverweij/dependency-cruiser/blob/master/doc/rules-reference.md#dependencytypes-and-dependencytypesnot
-       for a complete list
-    */
-    doNotFollow: {
-      path: 'node_modules'
-    },
-
-    /* conditions specifying which dependencies to exclude
-       - path: a regular expression to match
-       - dynamic: a boolean indicating whether to ignore dynamic (true) or static (false) dependencies.
-          leave out if you want to exclude neither (recommended!)
-    */
-    // exclude : {
-    //   path: '',
-    //   dynamic: true
-    // },
-
-    /* pattern specifying which files to include (regular expression)
-       dependency-cruiser will skip everything not matching this pattern
-    */
-    // includeOnly : '',
-
-    /* dependency-cruiser will include modules matching against the focus
-       regular expression in its output, as well as their neighbours (direct
-       dependencies and dependents)
-    */
-    // focus : '',
-
-    /* list of module systems to cruise */
-    // moduleSystems: ['amd', 'cjs', 'es6', 'tsd'],
-
-    /* prefix for links in html and svg output (e.g. 'https://github.com/you/yourrepo/blob/develop/'
-       to open it on your online repo or `vscode://file/${process.cwd()}/` to 
-       open it in visual studio code),
-     */
-    // prefix: '',
-
-    /* false (the default): ignore dependencies that only exist before typescript-to-javascript compilation
-       true: also detect dependencies that only exist before typescript-to-javascript compilation
-       "specify": for each dependency identify whether it only exists before compilation or also after
-     */
-    tsPreCompilationDeps: true,
-    
-    /* 
-       list of extensions to scan that aren't javascript or compile-to-javascript. 
-       Empty by default. Only put extensions in here that you want to take into
-       account that are _not_ parsable. 
-    */
-    // extraExtensionsToScan: [".json", ".jpg", ".png", ".svg", ".webp"],
-
-    /* if true combines the package.jsons found from the module up to the base
-       folder the cruise is initiated from. Useful for how (some) mono-repos
-       manage dependencies & dependency definitions.
-     */
-    // combinedDependencies: false,
-
-    /* if true leave symlinks untouched, otherwise use the realpath */
-    // preserveSymlinks: false,
-
-    /* TypeScript project file ('tsconfig.json') to use for
-       (1) compilation and
-       (2) resolution (e.g. with the paths property)
-
-       The (optional) fileName attribute specifies which file to take (relative to
-       dependency-cruiser's current working directory). When not provided
-       defaults to './tsconfig.json'.
-     */
-    tsConfig: {
-      fileName: 'tsconfig.json'
-    },
-
-    /* Webpack configuration to use to get resolve options from.
-
-       The (optional) fileName attribute specifies which file to take (relative
-       to dependency-cruiser's current working directory. When not provided defaults
-       to './webpack.conf.js'.
-
-       The (optional) `env` and `args` attributes contain the parameters to be passed if
-       your webpack config is a function and takes them (see webpack documentation
-       for details)
-     */
-    // webpackConfig: {
-    //  fileName: './webpack.config.js',
-    //  env: {},
-    //  args: {},
-    // },
-
-    /* Babel config ('.babelrc', '.babelrc.json', '.babelrc.json5', ...) to use
-      for compilation (and whatever other naughty things babel plugins do to
-      source code). This feature is well tested and usable, but might change
-      behavior a bit over time (e.g. more precise results for used module 
-      systems) without dependency-cruiser getting a major version bump.
-     */
-    // babelConfig: {
-    //   fileName: './.babelrc'
-    // },
-
-    /* List of strings you have in use in addition to cjs/ es6 requires
-       & imports to declare module dependencies. Use this e.g. if you've
-       re-declared require, use a require-wrapper or use window.require as
-       a hack.
-    */
-    // exoticRequireStrings: [],
-    /* options to pass on to enhanced-resolve, the package dependency-cruiser
-       uses to resolve module references to disk. You can set most of these
-       options in a webpack.conf.js - this section is here for those
-       projects that don't have a separate webpack config file.
-
-       Note: settings in webpack.conf.js override the ones specified here.
-     */
-    enhancedResolveOptions: {
-      /* List of strings to consider as 'exports' fields in package.json. Use
-         ['exports'] when you use packages that use such a field and your environment
-         supports it (e.g. node ^12.19 || >=14.7 or recent versions of webpack).
-
-         If you have an `exportsFields` attribute in your webpack config, that one
-         will have precedence over the one specified here.
-      */ 
-      exportsFields: ["exports"],
-      /* List of conditions to check for in the exports field. e.g. use ['imports']
-         if you're only interested in exposed es6 modules, ['require'] for commonjs,
-         or all conditions at once `(['import', 'require', 'node', 'default']`)
-         if anything goes for you. Only works when the 'exportsFields' array is
-         non-empty.
-
-        If you have a 'conditionNames' attribute in your webpack config, that one will
-        have precedence over the one specified here.
-      */
-      conditionNames: ["import", "require", "node", "default"],
-      /*
-         The extensions, by default are the same as the ones dependency-cruiser
-         can access (run `npx depcruise --info` to see which ones that are in
-         _your_ environment. If that list is larger than what you need (e.g. 
-         it contains .js, .jsx, .ts, .tsx, .cts, .mts - but you don't use 
-         TypeScript you can pass just the extensions you actually use (e.g. 
-         [".js", ".jsx"]). This can speed up the most expensive step in 
-         dependency cruising (module resolution) quite a bit.
-       */
-      // extensions: [".js", ".jsx", ".ts", ".tsx", ".d.ts"],
-      /* 
-         If your TypeScript project makes use of types specified in 'types'
-         fields in package.jsons of external dependencies, specify "types"
-         in addition to "main" in here, so enhanced-resolve (the resolver
-         dependency-cruiser uses) knows to also look there. You can also do
-         this if you're not sure, but still use TypeScript. In a future version
-         of dependency-cruiser this will likely become the default.
-       */
-      mainFields: ["main", "types"],
-    },
-    reporterOptions: {
-      dot: {
-        /* pattern of modules that can be consolidated in the detailed
-           graphical dependency graph. The default pattern in this configuration
-           collapses everything in node_modules to one folder deep so you see
-           the external modules, but not the innards your app depends upon.
-         */
-        collapsePattern: 'node_modules/(@[^/]+/[^/]+|[^/]+)',
-
-        /* Options to tweak the appearance of your graph.See
-           https://github.com/sverweij/dependency-cruiser/blob/master/doc/options-reference.md#reporteroptions
-           for details and some examples. If you don't specify a theme
-           don't worry - dependency-cruiser will fall back to the default one.
-        */
-        // theme: {
-        //   graph: {
-        //     /* use splines: "ortho" for straight lines. Be aware though
-        //       graphviz might take a long time calculating ortho(gonal)
-        //       routings.
-        //    */
-        //     splines: "true"
-        //   },
-        //   modules: [
-        //     {
-        //       criteria: { matchesFocus: true },
-        //       attributes: {
-        //         fillcolor: "lime",
-        //         penwidth: 2,
-        //       },
-        //     },
-        //     {
-        //       criteria: { matchesFocus: false },
-        //       attributes: {
-        //         fillcolor: "lightgrey",
-        //       },
-        //     },
-        //     {
-        //       criteria: { matchesReaches: true },
-        //       attributes: {
-        //         fillcolor: "lime",
-        //         penwidth: 2,
-        //       },
-        //     },
-        //     {
-        //       criteria: { matchesReaches: false },
-        //       attributes: {
-        //         fillcolor: "lightgrey",
-        //       },
-        //     },
-        //     {
-        //       criteria: { source: "^src/model" },
-        //       attributes: { fillcolor: "#ccccff" }
-        //     },
-        //     {
-        //       criteria: { source: "^src/view" },
-        //       attributes: { fillcolor: "#ccffcc" }
-        //     },
-        //   ],
-        //   dependencies: [
-        //     {
-        //       criteria: { "rules[0].severity": "error" },
-        //       attributes: { fontcolor: "red", color: "red" }
-        //     },
-        //     {
-        //       criteria: { "rules[0].severity": "warn" },
-        //       attributes: { fontcolor: "orange", color: "orange" }
-        //     },
-        //     {
-        //       criteria: { "rules[0].severity": "info" },
-        //       attributes: { fontcolor: "blue", color: "blue" }
-        //     },
-        //     {
-        //       criteria: { resolved: "^src/model" },
-        //       attributes: { color: "#0000ff77" }
-        //     },
-        //     {
-        //       criteria: { resolved: "^src/view" },
-        //       attributes: { color: "#00770077" }
-        //     }
-        //   ]
-        // }
-      },
-      archi: {
-        /* pattern of modules that can be consolidated in the high level
-          graphical dependency graph. If you use the high level graphical
-          dependency graph reporter (`archi`) you probably want to tweak
-          this collapsePattern to your situation.
-        */
-        collapsePattern: '^(packages|src|lib|app|bin|test(s?)|spec(s?))/[^/]+|node_modules/(@[^/]+/[^/]+|[^/]+)',
-
-        /* Options to tweak the appearance of your graph.See
-           https://github.com/sverweij/dependency-cruiser/blob/master/doc/options-reference.md#reporteroptions
-           for details and some examples. If you don't specify a theme
-           for 'archi' dependency-cruiser will use the one specified in the
-           dot section (see above), if any, and otherwise use the default one.
-         */
-        // theme: {
-        // },
-      },
-      "text": {
-        "highlightFocused": true
-      },
-    }
-  }
-};
-// generated: dependency-cruiser@12.11.0 on 2023-03-24T14:11:38.647Z

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06)
+
+### Bug Fixes
+
+* 修复复制流水线出现的各种问题 ([6314e8d](https://github.com/certd/certd/commit/6314e8d7eb58cd52e2a7bd3b5ffb9112b0b69577))
+
+### Performance Improvements
+
+* 阶段、任务、步骤全面支持拖动排序 ([bd73a16](https://github.com/certd/certd/commit/bd73a163cd0497f062bd424ddc6bc9bbc95f81ea))
+* 任务配置不需要的字段可以自动隐藏 ([192d9dc](https://github.com/certd/certd/commit/192d9dc7e36737d684c769f255f407c28b1152ac))
+* 任务支持拖动排序 ([1e9b563](https://github.com/certd/certd/commit/1e9b5638aa36a8ce70019a9c750230ba41938327))
+* client 请求超时时间延长为10s ([ff46771](https://github.com/certd/certd/commit/ff46771d8dd43e71c1ca70e3ba783945750342cc))
+
+## [1.24.1](https://github.com/certd/certd/compare/v1.24.0...v1.24.1) (2024-09-02)
+
+### Bug Fixes
+
+* 激活仅限管理员 ([1c17970](https://github.com/certd/certd/commit/1c17970b981f0987c506744ee6b2283fd5e40493))
+
+### Performance Improvements
+
+* 授权配置支持加密 ([42a56b5](https://github.com/certd/certd/commit/42a56b581d754c3e5f9838179d19ab0d004ef2eb))
+* 支持阿里云 DCDN ([98b77f8](https://github.com/certd/certd/commit/98b77f80843834616fb26f83b4c42245326abd06))
+* 支持已跳过的步骤重新运行 ([ea775ad](https://github.com/certd/certd/commit/ea775adae18d57a04470cfba6b9460d761d74035))
+* 支持cdnfly ([724a850](https://github.com/certd/certd/commit/724a85028b4a7146c9e3b4df4497dcf2a7bf7c67))
+* 支持ftp上传 ([b9bddbf](https://github.com/certd/certd/commit/b9bddbfabb5664365f1232e9432532187c98006c))
+
 # [1.24.0](https://github.com/certd/certd/compare/v1.23.1...v1.24.0) (2024-08-25)
 
 ### Bug Fixes

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.24.0",
+  "version": "1.24.2",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -23,13 +23,14 @@
   "license": "AGPL-3.0",
   "dependencies": {
     "@ant-design/colors": "^7.0.2",
-    "@ant-design/icons-vue": "^7.0.1",
+    "@ant-design/icons-vue": "^6.1.0",
     "@fast-crud/fast-crud": "^1.21.2",
     "@fast-crud/fast-extends": "^1.21.2",
     "@fast-crud/ui-antdv4": "^1.21.2",
     "@fast-crud/ui-interface": "^1.21.2",
     "@iconify/vue": "^4.1.1",
     "@soerenmartius/vue3-clipboard": "^0.1.2",
+    "@vue-js-cron/light": "^4.0.5",
     "ant-design-vue": "^4.1.2",
     "axios": "^1.7.2",
     "axios-mock-adapter": "^1.22.0",
@@ -54,10 +55,10 @@
     "vue-cropperjs": "^5.0.0",
     "vue-i18n": "^9.10.2",
     "vue-router": "^4.3.0",
-    "vuedraggable": "^2.24.3"
+    "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
-    "@certd/pipeline": "^1.24.0",
+    "@certd/pipeline": "^1.24.2",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",
@@ -104,7 +105,7 @@
     "tslint": "^6.1.3",
     "typescript": "5.4.2",
     "unplugin-vue-define-options": "^1.4.2",
-    "vite": "^5.1.6",
+    "vite": "^5.3.1",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-html": "^3.2.2",
     "vite-plugin-windicss": "^1.9.3",

packages/ui/certd-client/src/api/service.ts

@@ -112,7 +112,7 @@ function createRequestFunction(service: any) {
       headers: {
         "Content-Type": get(config, "headers.Content-Type", "application/json")
       },
-      timeout: 5000,
+      timeout: 10000,
       baseURL: env.API,
       data: {}
     };

packages/ui/certd-client/src/components/cron-editor/index.vue

@@ -0,0 +1,81 @@
+<template>
+  <div class="cron-editor">
+    <div class="flex-o">
+      <cron-light
+        :disabled="disabled"
+        :readonly="readonly"
+        :period="period"
+        class="flex-o cron-ant"
+        locale="zh-CN"
+        format="quartz"
+        :model-value="modelValue"
+        @update:model-value="onUpdate"
+        @error="onError"
+      />
+    </div>
+    <div class="mt-5">
+      <a-input :disabled="true" :readonly="readonly" :value="modelValue" @change="onChange"></a-input>
+    </div>
+    <div class="fs-helper">{{ errorMessage }}</div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref } from "vue";
+const props = defineProps<{
+  modelValue?: string;
+  disabled?: boolean;
+  readonly?: boolean;
+}>();
+
+const period = ref<string>("day");
+
+const emit = defineEmits<{
+  "update:modelValue": any;
+}>();
+
+const errorMessage = ref<string | null>(null);
+
+const onUpdate = (value: string) => {
+  if (value === props.modelValue) {
+    return;
+  }
+  emit("update:modelValue", value);
+  errorMessage.value = undefined;
+};
+
+const onPeriod = (value: string) => {
+  period.value = value;
+};
+
+const onChange = (e: any) => {
+  const value = e.target.value;
+  onUpdate(value);
+};
+const onError = (error: any) => {
+  errorMessage.value = error;
+};
+</script>
+<style lang="less">
+.cron-editor {
+  .cron-ant {
+    flex-wrap: wrap;
+    &* > {
+      margin-bottom: 2px;
+      display: flex;
+      align-items: center;
+    }
+    .vcron-select-list {
+      min-width: 56px;
+    }
+    .vcron-select-input {
+      min-height: 22px;
+      background-color: #fff;
+    }
+    .vcron-select-container {
+      display: flex;
+      align-items: center;
+    }
+  }
+}
+</style>

packages/ui/certd-client/src/components/index.ts

@@ -3,8 +3,11 @@ import PiAccessSelector from "../views/certd/access/access-selector/index.vue";
 import PiDnsProviderSelector from "./dns-provider-selector/index.vue";
 import PiOutputSelector from "../views/certd/pipeline/pipeline/component/output-selector/index.vue";
 import PiEditable from "./editable.vue";
-import VipButton from "./vip-button/index.vue";
+import vip from "./vip-button/install.js";
 import { CheckCircleOutlined, InfoCircleOutlined, UndoOutlined } from "@ant-design/icons-vue";
+import CronEditor from "./cron-editor/index.vue";
+import { CronLight } from "@vue-js-cron/light";
+import "@vue-js-cron/light/dist/light.css";
 export default {
   install(app: any) {
     app.component("PiContainer", PiContainer);
@@ -12,10 +15,14 @@ export default {
     app.component("PiEditable", PiEditable);
     app.component("PiOutputSelector", PiOutputSelector);
     app.component("PiDnsProviderSelector", PiDnsProviderSelector);
-    app.component("VipButton", VipButton);
+
+    app.component("CronLight", CronLight);
+    app.component("CronEditor", CronEditor);
 
     app.component("CheckCircleOutlined", CheckCircleOutlined);
     app.component("InfoCircleOutlined", InfoCircleOutlined);
     app.component("UndoOutlined", UndoOutlined);
+
+    app.use(vip);
   }
 };

packages/ui/certd-client/src/components/vip-button/directive.ts

@@ -0,0 +1,23 @@
+import { message, notification } from "ant-design-vue";
+import { useUserStore } from "/@/store/modules/user";
+export default {
+  mounted(el: any, binding: any, vnode: any) {
+    const { value } = binding;
+    const userStore = useUserStore();
+    el.className = el.className + " need-plus";
+    if (!userStore.isPlus) {
+      function checkPlus() {
+        // 事件处理代码
+        notification.warn({
+          message: "此为专业版功能，请升级到专业版"
+        });
+      }
+      el.addEventListener("click", function (event: any) {
+        checkPlus();
+      });
+      el.addEventListener("move", function (event: any) {
+        checkPlus();
+      });
+    }
+  }
+};

packages/ui/certd-client/src/components/vip-button/index.vue

@@ -1,20 +1,13 @@
 <template>
-  <div class="layout-vip isPlus">
+  <div class="layout-vip isPlus" @click="openUpgrade">
     <contextHolder />
-    <fs-icon icon="mingcute:vip-1-line"></fs-icon>
-    <div class="text">
-      <template v-if="userStore.isPlus">
-        <a-tooltip>
-          <template #title> 到期时间：{{ expireTime }} </template>
-          <span @click="openUpgrade">{{ texts.plus }}</span>
-        </a-tooltip>
-      </template>
-      <template v-else>
-        <a-tooltip>
-          <template #title> 升级专业版，享受更多VIP特权 </template>
-          <span @click="openUpgrade"> {{ texts.free }} {{ expiredDays }} </span>
-        </a-tooltip>
-      </template>
+    <fs-icon icon="mingcute:vip-1-line" :title="text.title" />
+
+    <div v-if="mode !== 'icon'" class="text">
+      <a-tooltip>
+        <template #title> {{ text.title }}</template>
+        <span>{{ text.name }}</span>
+      </a-tooltip>
     </div>
   </div>
 </template>
@@ -26,24 +19,53 @@ import { message, Modal } from "ant-design-vue";
 import * as api from "./api";
 import { useSettingStore } from "/@/store/modules/settings";
 
-const props = defineProps<{
-  mode?: "button" | "nav";
-}>();
-type Texts = {
-  plus: string;
-  free: string;
+const props = withDefaults(
+  defineProps<{
+    mode?: "button" | "nav" | "icon";
+  }>(),
+  {
+    mode: "button"
+  }
+);
+type Text = {
+  name: string;
+  title?: string;
 };
-const texts = computed<Texts>(() => {
-  if (props.mode === "button") {
-    return {
-      plus: "专业版已开通",
-      free: "此为专业版功能"
-    };
+const text = computed<Text>(() => {
+  const map = {
+    isPlus: {
+      button: {
+        name: "专业版已开通",
+        title: "到期时间：" + expireTime.value
+      },
+      icon: {
+        name: "",
+        title: "专业版已开通"
+      },
+      nav: {
+        name: "专业版",
+        title: "到期时间：" + expireTime.value
+      }
+    },
+    free: {
+      button: {
+        name: "此为专业版功能",
+        title: "升级专业版，享受更多VIP特权"
+      },
+      icon: {
+        name: "",
+        title: "此为专业版功能"
+      },
+      nav: {
+        name: "免费版",
+        title: "升级专业版，享受更多VIP特权"
+      }
+    }
+  };
+  if (userStore.isPlus) {
+    return map.isPlus[props.mode];
   } else {
-    return {
-      plus: "专业版",
-      free: "免费版"
-    };
+    return map.free[props.mode];
   }
 });
 
@@ -86,10 +108,16 @@ async function doActive() {
 const settingStore = useSettingStore();
 const computedSiteId = computed(() => settingStore.installInfo?.siteId);
 const [modal, contextHolder] = Modal.useModal();
+
 function openUpgrade() {
+  if (!userStore.isAdmin) {
+    message.info("仅限管理员操作");
+    return;
+  }
   const placeholder = "请输入激活码";
+  const isPlus = userStore.isPlus;
   modal.confirm({
-    title: "升级/续期专业版",
+    title: isPlus ? "续期专业版" : "激活专业版",
     async onOk() {
       return await doActive();
     },
@@ -101,13 +129,16 @@ function openUpgrade() {
           <div>
             <h3 class="block-header">专业版特权</h3>
             <ul>
-              <li>证书流水线数量无限制</li>
               <li>可加VIP群，需求优先实现</li>
+              <li>证书流水线数量无限制（免费版限制10条）</li>
+              <li>免配置发邮件功能</li>
+              <li>FTP上传、cdnfly、宝塔、易盾等部署插件</li>
               <li>更多特权敬请期待</li>
             </ul>
           </div>
           <div>
-            <h3 class="block-header">立刻激活/续期</h3>
+            <h3 class="block-header">{isPlus ? "续期" : "立刻激活"}</h3>
+            <div>{isPlus ? "当前专业版已激活，到期时间" + dayjs(userStore.plusInfo.expireTime).format("YYYY-MM-DD") : ""}</div>
             <div class="mt-10">
               <div class="flex-o w-100">
                 <span>站点ID：</span>
@@ -137,6 +168,7 @@ function openUpgrade() {
   justify-content: center;
   height: 100%;
   cursor: pointer;
+
   &.isPlus {
     color: #c5913f;
   }

packages/ui/certd-client/src/components/vip-button/install.ts

@@ -0,0 +1,6 @@
+import VipButton from "./index.vue";
+import plus from "./directive.js";
+export default function (app: any) {
+  app.component("VipButton", VipButton);
+  app.directive("plus", plus);
+}

packages/ui/certd-client/src/layout/layout-framework.vue

@@ -18,7 +18,7 @@
             <MenuFoldOutlined v-else />
           </div>
           <fs-menu class="header-menu" mode="horizontal" :expand-selected="false" :selectable="false" :menus="frameworkMenus" />
-          <vip-button class="flex-center header-btn"></vip-button>
+          <vip-button class="flex-center header-btn" mode="nav" />
         </div>
         <div class="header-right header-buttons">
           <!--          <button-->

packages/ui/certd-client/src/store/modules/user.ts

@@ -7,7 +7,7 @@ import * as UserApi from "/src/api/modules/api.user";
 import { RegisterReq } from "/src/api/modules/api.user";
 // @ts-ignore
 import { LoginReq, UserInfoRes } from "/@/api/modules/api.user";
-import { Modal, notification } from "ant-design-vue";
+import { message, Modal, notification } from "ant-design-vue";
 import { useI18n } from "vue-i18n";
 
 import { mitter } from "/src/utils/util.mitt";
@@ -67,7 +67,14 @@ export const useUserStore = defineStore({
       LocalStorage.remove(TOKEN_KEY);
       LocalStorage.remove(USER_INFO_KEY);
     },
-
+    checkPlus() {
+      if (!this.isPlus) {
+        notification.warn({
+          message: "此为专业版功能，请先升级到专业版"
+        });
+        throw new Error("此为专业版功能，请升级到专业版");
+      }
+    },
     async register(user: RegisterReq) {
       await UserApi.register(user);
       notification.success({

packages/ui/certd-client/src/style/common.less

@@ -22,15 +22,14 @@ h1, h2, h3, h4, h5, h6 {
   margin-bottom: 0;
 }
 
-.fs-desc{
+.fs-desc {
   font-size: 12px;
-  color:#888888;
+  color: #888888;
   margin-left: 5px;
   margin-right: 5px;
 }
 
 
-
 .ant-btn-link {
   height: 24px;
 }
@@ -45,60 +44,88 @@ h1, h2, h3, h4, h5, h6 {
   vertical-align: 0 !important;
 }
 
-.flex-center{
-    display: flex;
-    justify-content: center;
-    align-items: center;
+.pointer {
+  cursor: pointer;
 }
-.flex-o{
+
+.flex-center {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.flex-o {
   display: flex !important;
   align-items: center;
 }
 
-.flex{
+.flex {
   display: flex;
   align-items: center;
 }
 
-.flex-1{
+.flex-1 {
   flex: 1;
 }
 
-
-.ml-5{
-  margin-left:5px;
-}
-.ml-20{
-  margin-left:20px;
-}
-.ml-15{
-  margin-left:15px;
+.mb-2 {
+  margin-bottom: 2px;
 }
 
-.mr-5{
+.ml-5 {
+  margin-left: 5px;
+}
+
+.ml-10 {
+  margin-left: 10px;
+}
+
+.ml-20 {
+  margin-left: 20px;
+}
+
+.ml-15 {
+  margin-left: 15px;
+}
+
+.mr-5 {
   margin-right: 5px;
 }
-.mr-20{
-  margin-right: 20px;
-}
-.mr-15{
-  margin-right: 15px;
-}
-.mt-10{
-  margin-top:10px;
-}
-.mb-10{
-  margin-bottom: 10px;
-}
-.m-10{
-  margin:10px;
+
+.mr-10 {
+  margin-right: 10px;
 }
 
-.p-5{
-  padding:5px;
+.mr-20 {
+  margin-right: 20px;
 }
-.p-10{
-  padding:10px;
+
+.mr-15 {
+  margin-right: 15px;
+}
+
+.mt-5 {
+  margin-top: 5px;
+}
+
+.mt-10 {
+  margin-top: 10px;
+}
+
+.mb-10 {
+  margin-bottom: 10px;
+}
+
+.m-10 {
+  margin: 10px;
+}
+
+.p-5 {
+  padding: 5px;
+}
+
+.p-10 {
+  padding: 10px;
 }
 
 .ellipsis {
@@ -107,13 +134,35 @@ h1, h2, h3, h4, h5, h6 {
   text-overflow: ellipsis;
 }
 
-.w-100{
-    width: 100%;
+.w-100 {
+  width: 100%;
 }
 
-.block-header{
-  margin:3px;
+.block-header {
+  margin: 3px;
   padding-top: 15px;
-  padding-bottom:3px;
+  padding-bottom: 3px;
   border-bottom: 1px solid #dedede;
 }
+
+
+.color-blue {
+  color: #1890ff;
+}
+
+
+.icon-box {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+
+  .fs-icon {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
+
+.need-plus {
+  color: #c5913f !important;
+}

packages/ui/certd-client/src/use/use-refrence.ts

@@ -1,17 +0,0 @@
-import _ from "lodash-es";
-import { compute } from "@fast-crud/fast-crud";
-
-export function useReference(form: any) {
-  if (!form.reference) {
-    return;
-  }
-  for (const reference of form.reference) {
-    _.set(
-      form,
-      reference.dest,
-      compute<any>((scope) => {
-        return _.get(scope, reference.src);
-      })
-    );
-  }
-}

packages/ui/certd-client/src/use/use-refrence.tsx

@@ -0,0 +1,40 @@
+import _ from "lodash-es";
+import { compute } from "@fast-crud/fast-crud";
+
+export function useReference(formItem: any) {
+  if (formItem.reference) {
+    for (const reference of formItem.reference) {
+      _.set(
+        formItem,
+        reference.dest,
+        compute<any>((scope) => {
+          return _.get(scope, reference.src);
+        })
+      );
+    }
+    delete formItem.reference;
+  }
+
+  if (formItem.mergeScript) {
+    const ctx = {
+      compute
+    };
+    const script = formItem.mergeScript;
+    const func = new Function("ctx", script);
+    const merged = func(ctx);
+    _.merge(formItem, merged);
+
+    delete formItem.mergeScript;
+  }
+  //helper
+  if (formItem.helper && typeof formItem.helper === "string") {
+    //正则表达式替换 [name](url) 成 <a href="url" >
+    let helper = formItem.helper.replace(/\[(.*)\]\((.*)\)/g, '<a href="$2" target="_blank">$1</a>');
+    helper = helper.replace(/\n/g, "<br/>");
+    formItem.helper = {
+      render: () => {
+        return <div innerHTML={helper}></div>;
+      }
+    };
+  }
+}

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

@@ -1,4 +1,4 @@
-import { ColumnCompositionProps, dict } from "@fast-crud/fast-crud";
+import { ColumnCompositionProps, dict, compute } from "@fast-crud/fast-crud";
 // @ts-ignore
 import * as api from "./api";
 // @ts-ignore
@@ -16,7 +16,7 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any) {
     }
   };
 
-  function buildDefineFields(define: any) {
+  function buildDefineFields(define: any, form: any) {
     const formWrapperRef = crudExpose.getFormWrapperRef();
     const columnsRef = toRef(formWrapperRef.formOptions, "columns");
 
@@ -32,7 +32,26 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any) {
         ...value,
         key
       };
-      columnsRef.value[key] = _.merge({ title: key }, defaultPluginConfig, field);
+      let column = _.merge({ title: key }, defaultPluginConfig, field);
+
+      //eval
+      if (column.mergeScript) {
+        const ctx = {
+          compute
+        };
+        const script = column.mergeScript;
+        delete column.mergeScript;
+        const func = new Function("ctx", script);
+        const merged = func(ctx);
+        column = _.merge(column, merged);
+      }
+
+      //设置默认值
+      if (column.value != null && _.get(form, key) == null) {
+        _.set(form, key, column.value);
+      }
+      //字段配置赋值
+      columnsRef.value[key] = column;
       console.log("form", columnsRef.value);
     });
   }
@@ -50,18 +69,26 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any) {
       },
       form: {
         component: {
-          disabled: false
+          disabled: false,
+          showSearch: true,
+          filterOption: (input: string, option: any) => {
+            input = input?.toLowerCase();
+            return option.value.toLowerCase().indexOf(input) >= 0 || option.label.toLowerCase().indexOf(input) >= 0;
+          }
         },
         rules: [{ required: true, message: "请选择类型" }],
         valueChange: {
           immediate: true,
-          async handle({ value, mode, form }) {
+          async handle({ value, mode, form, immediate }) {
             if (value == null) {
               return;
             }
             const define = await api.GetProviderDefine(value);
             console.log("define", define);
-            buildDefineFields(define);
+            if (!immediate) {
+              form.access = {};
+            }
+            buildDefineFields(define, form);
           }
         }
       },

packages/ui/certd-client/src/views/certd/pipeline/api.ts

@@ -59,11 +59,11 @@ export function Save(pipelineEntity: any) {
   });
 }
 
-export function Trigger(id: any) {
+export function Trigger(id: any, stepId?: string) {
   return request({
     url: apiPrefix + "/trigger",
     method: "post",
-    params: { id }
+    params: { id, stepId }
   });
 }
 

packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx

@@ -22,12 +22,17 @@ export default function (certPluginGroup: PluginGroup, formWrapperRef: any): Cre
         form: {
           ...inputDefine,
           show: compute((ctx) => {
-            console.log(formWrapperRef);
             const form = formWrapperRef.value.getFormData();
             if (!form) {
               return false;
             }
-            return form?.certApplyPlugin === plugin.name;
+
+            let inputDefineShow = true;
+            if (inputDefine.show != null) {
+              const computeShow = inputDefine.show as any;
+              inputDefineShow = computeShow.computeFn({ form });
+            }
+            return form?.certApplyPlugin === plugin.name && inputDefineShow;
           })
         }
       };
@@ -39,7 +44,8 @@ export default function (certPluginGroup: PluginGroup, formWrapperRef: any): Cre
       form: {
         wrapper: {
           width: "1150px",
-          saveRemind: false
+          saveRemind: false,
+          title: "创建证书申请流水线"
         }
       },
       columns: {
@@ -59,8 +65,8 @@ export default function (certPluginGroup: PluginGroup, formWrapperRef: any): Cre
               render: () => {
                 return (
                   <ul>
-                    <li>Lego-ACME：基于Lego实现，支持海量DNS提供商</li>
-                    <li>JS-ACME：如果你的域名DNS属于阿里云、腾讯云、Cloudflare可以选择用它来申请</li>
+                    <li>JS-ACME：如果你的域名DNS属于阿里云、腾讯云、Cloudflare、西部数码可以选择用它来申请</li>
+                    <li>Lego-ACME：基于Lego实现，支持海量DNS提供商，熟悉LEGO的用户可以使用</li>
                   </ul>
                 );
               }
@@ -73,9 +79,11 @@ export default function (certPluginGroup: PluginGroup, formWrapperRef: any): Cre
           type: "text",
           form: {
             component: {
+              name: "cron-editor",
+              vModel: "modelValue",
               placeholder: "0 0 4 * * *"
             },
-            helper: "请输入cron表达式, 例如：0 0 4 * * *，每天凌晨4点触发",
+            helper: "点击上面的按钮，选择每天几点几分定时执行, 例如：0 0 4 * * *，每天凌晨4点0分0秒触发",
             order: 100
           }
         },

packages/ui/certd-client/src/views/certd/pipeline/crud.tsx

@@ -2,7 +2,7 @@ import * as api from "./api";
 import { useI18n } from "vue-i18n";
 import { computed, ref } from "vue";
 import { useRouter } from "vue-router";
-import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes, useUi } from "@fast-crud/fast-crud";
 import { statusUtil } from "/@/views/certd/pipeline/pipeline/utils/util.status";
 import { nanoid } from "nanoid";
 import { message, Modal } from "ant-design-vue";
@@ -10,11 +10,52 @@ import { env } from "/@/utils/util.env";
 import { useUserStore } from "/@/store/modules/user";
 import dayjs from "dayjs";
 import { useSettingStore } from "/@/store/modules/settings";
+import _ from "lodash-es";
 
 export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
   const { t } = useI18n();
   const lastResRef = ref();
+
+  function setRunnableIds(pipeline: any) {
+    const idMap: any = {};
+    function createId(oldId: any) {
+      if (oldId == null) {
+        return nanoid();
+      }
+      const newId = nanoid();
+      idMap[oldId] = newId;
+      return newId;
+    }
+    if (pipeline.stages) {
+      for (const stage of pipeline.stages) {
+        stage.id = createId(stage.id);
+        if (stage.tasks) {
+          for (const task of stage.tasks) {
+            task.id = createId(task.id);
+            if (task.steps) {
+              for (const step of task.steps) {
+                step.id = createId(step.id);
+              }
+            }
+          }
+        }
+      }
+    }
+
+    for (const trigger of pipeline.triggers) {
+      trigger.id = nanoid();
+    }
+    for (const notification of pipeline.notifications) {
+      notification.id = nanoid();
+    }
+
+    let content = JSON.stringify(pipeline);
+    for (const key in idMap) {
+      content = content.replaceAll(key, idMap[key]);
+    }
+    return JSON.parse(content);
+  }
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
     return await api.GetList(query);
   };
@@ -29,9 +70,23 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
   };
 
   const addRequest = async ({ form }: AddReq) => {
-    form.content = JSON.stringify({
-      title: form.title
-    });
+    if (form.content == null) {
+      form.content = JSON.stringify({
+        title: form.title
+      });
+    } else {
+      //复制的流水线
+      delete form.status;
+      delete form.lastHistoryTime;
+      delete form.lastVars;
+      delete form.createTime;
+      delete form.id;
+      let pipeline = JSON.parse(form.content);
+      pipeline.title = form.title;
+      pipeline = setRunnableIds(pipeline);
+      form.content = JSON.stringify(pipeline);
+    }
+
     const res = await api.AddObj(form);
     lastResRef.value = res;
     return res;
@@ -41,12 +96,11 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
       // 添加certd pipeline
       const triggers = [];
       if (form.triggerCron) {
-        triggers.push({ id: nanoid(), title: "定时触发", type: "timer", props: { cron: form.triggerCron } });
+        triggers.push({ title: "定时触发", type: "timer", props: { cron: form.triggerCron } });
       }
       const notifications = [];
       if (form.emailNotify) {
         notifications.push({
-          id: nanoid(),
           type: "email",
           when: ["error", "turnToSuccess"],
           options: {
@@ -54,19 +108,16 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
           }
         });
       }
-      const pipeline = {
+      let pipeline = {
         title: form.domains[0] + "证书自动化",
         stages: [
           {
-            id: nanoid(),
             title: "证书申请阶段",
             tasks: [
               {
-                id: nanoid(),
                 title: "证书申请任务",
                 steps: [
                   {
-                    id: nanoid(),
                     title: "申请证书",
                     input: {
                       renewDays: 20,
@@ -85,8 +136,10 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
         triggers,
         notifications
       };
+      pipeline = setRunnableIds(pipeline);
 
       const id = await api.Save({
+        title: pipeline.title,
         content: JSON.stringify(pipeline),
         keepHistoryCount: 30
       });
@@ -112,7 +165,7 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
           },
           addCertd: {
             order: 1,
-            text: "添加证书流水线",
+            text: "创建证书流水线",
             type: "primary",
             click() {
               addCertdPipeline();
@@ -136,6 +189,21 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
               router.push({ path: "/certd/pipeline/detail", query: { id: row.id, editMode: "false" } });
             }
           },
+          copy: {
+            click: async (context) => {
+              userStore.checkPlus();
+              const { ui } = useUi();
+              // @ts-ignore
+              let row = context[ui.tableColumn.row];
+              row = _.cloneDeep(row);
+              row.title = row.title + "_copy";
+              await crudExpose.openCopy({
+                row: row,
+                index: context.index
+              });
+            },
+            class: "need-plus"
+          },
           config: {
             order: 1,
             title: null,
@@ -158,7 +226,7 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
               const files = await api.GetFiles(row.id);
               Modal.success({
                 title: "文件下载",
-                okText: "↑↑↑ 点击链接下载",
+                okText: "↑↑↑ 点击上面链接下载",
                 content: () => {
                   const children = [];
                   for (const file of files) {

packages/ui/certd-client/src/views/certd/pipeline/detail.vue

@@ -54,9 +54,9 @@ export default defineComponent({
           content: JSON.stringify(pipelineConfig)
         });
       },
-      async doTrigger(options: { pipelineId: number }) {
-        const { pipelineId } = options;
-        await api.Trigger(pipelineId);
+      async doTrigger(options: { pipelineId: number; stepId?: string }) {
+        const { pipelineId, stepId } = options;
+        await api.Trigger(pipelineId, stepId);
       }
     };
 

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/history-timeline-item.vue

@@ -5,7 +5,7 @@
     </template>
     <p>
       <fs-date-format :model-value="runnable.status?.startTime"></fs-date-format>
-      <a-tag class="ml-1" :color="status.color" :closable="status.value === 'start'" @close="cancelTask">
+      <a-tag class="ml-5" :color="status.color" :closable="status.value === 'start'" @close="cancelTask">
         {{ status.label }}
       </a-tag>
       <a-tag v-if="isCurrent" class="pointer" color="green" :closable="true" @close="cancel">当前</a-tag>

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/status-show.vue

@@ -1,5 +1,5 @@
 <template>
-  <span v-if="statusRef" class="pi-status-show">
+  <span v-if="statusRef" class="pi-status-show flex-o">
     <template v-if="type === 'icon'">
       <fs-icon class="status-icon" v-bind="statusRef" :style="{ color: statusRef.color }" />
     </template>

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-drawer v-model:open="stepDrawerVisible" placement="right" :closable="true" width="700px" @after-open-change="stepDrawerOnAfterVisibleChange">
+  <a-drawer v-model:open="stepDrawerVisible" placement="right" :closable="true" width="700px">
     <template #title>
       编辑步骤
       <a-button v-if="editMode" @click="stepDelete()">
@@ -25,6 +25,7 @@
                     <template #title>
                       <a-avatar :src="item.icon || '/images/plugin.png'" />
                       <span class="title">{{ item.title }}</span>
+                      <vip-button v-if="item.needPlus" mode="icon" />
                     </template>
                     <template #description>
                       <span :title="item.desc">{{ item.desc }}</span>
@@ -58,7 +59,7 @@
             :get-context-fn="blankFn"
           />
           <template v-for="(item, key) in currentPlugin.input" :key="key">
-            <fs-form-item v-model="currentStep.input[key]" :item="item" :get-context-fn="blankFn" />
+            <fs-form-item v-if="item.show !== false" v-model="currentStep.input[key]" :item="item" :get-context-fn="blankFn" />
           </template>
 
           <fs-form-item v-model="currentStep.strategy.runStrategy" :item="runStrategyProps" :get-context-fn="blankFn" />
@@ -81,9 +82,13 @@ import _ from "lodash-es";
 import { nanoid } from "nanoid";
 import { CopyOutlined } from "@ant-design/icons-vue";
 import { PluginGroups } from "/@/views/certd/pipeline/pipeline/type";
+import { useUserStore } from "/@/store/modules/user";
+import { compute, useCompute } from "@fast-crud/fast-crud";
+import { useReference } from "/@/use/use-refrence";
 
 export default {
   name: "PiStepForm",
+  // eslint-disable-next-line vue/no-unused-components
   components: { CopyOutlined },
   props: {
     editMode: {
@@ -98,12 +103,12 @@ export default {
      * @returns
      */
     function useStepForm() {
+      const useStore = useUserStore();
       const getPluginGroups: any = inject("getPluginGroups");
       const pluginGroups: PluginGroups = getPluginGroups();
       const mode: Ref = ref("add");
       const callback: Ref = ref();
       const currentStep: Ref = ref({ title: undefined, input: {} });
-      const currentPlugin: Ref = ref({});
       const stepFormRef: Ref = ref(null);
       const stepDrawerVisible: Ref = ref(false);
       const rules: Ref = ref({
@@ -117,6 +122,10 @@ export default {
       });
 
       const stepTypeSelected = (item: any) => {
+        if (item.needPlus && !useStore.isPlus) {
+          message.warn("此插件需要开通专业版才能使用");
+          throw new Error("此插件需要开通专业版才能使用");
+        }
         currentStep.value.type = item.name;
         currentStep.value.title = item.title;
         console.log("currentStepTypeChanged:", currentStep.value);
@@ -128,6 +137,7 @@ export default {
           message.warn("请先选择类型");
           return;
         }
+
         // 给step的input设置默认值
         changeCurrentPlugin(currentStep.value);
 
@@ -142,15 +152,10 @@ export default {
         stepDrawerVisible.value = false;
       };
 
-      const stepDrawerOnAfterVisibleChange = (val: any) => {
-        console.log("stepDrawerOnAfterVisibleChange", val);
-      };
-
       const stepOpen = (step: any, emit: any) => {
         callback.value = emit;
         currentStep.value = _.merge({ input: {}, strategy: {} }, step);
 
-        console.log("currentStepOpen", currentStep.value);
         if (step.type) {
           changeCurrentPlugin(currentStep.value);
         }
@@ -181,33 +186,41 @@ export default {
         stepOpen(step, emit);
       };
 
+      const currentPluginDefine = ref();
+
+      function getContext() {
+        return {
+          form: currentStep.value.input
+        };
+      }
+      const { doComputed } = useCompute();
+      const currentPlugin = doComputed(() => {
+        return currentPluginDefine.value;
+      }, getContext);
       const changeCurrentPlugin = (step: any) => {
         const stepType = step.type;
-        const pluginDefine = pluginGroups.get(stepType);
-        if (pluginDefine) {
-          step.type = stepType;
-          step._isAdd = false;
-          currentPlugin.value = _.cloneDeep(pluginDefine);
-          for (let key in currentPlugin.value.input) {
-            const input = currentPlugin.value.input[key];
-            if (input?.reference) {
-              for (const reference of input.reference) {
-                _.set(
-                  input,
-                  reference.dest,
-                  computed<any>(() => {
-                    const scope = {
-                      form: currentStep.value.input
-                    };
-                    return _.get(scope, reference.src);
-                  })
-                );
-              }
-            }
-            //设置初始值
-            if ((input.default != null || input.value != null) && currentStep.value.input[key] == null) {
-              currentStep.value.input[key] = input.default ?? input.value;
-            }
+        step.type = stepType;
+        step._isAdd = false;
+
+        let pluginDefine = pluginGroups.get(stepType);
+        if (pluginDefine == null) {
+          console.log("插件未找到", stepType);
+          return;
+        }
+        pluginDefine = _.cloneDeep(pluginDefine);
+        const columns = pluginDefine.input;
+        for (let key in columns) {
+          const column = columns[key];
+          useReference(column);
+        }
+
+        currentPluginDefine.value = pluginDefine;
+
+        for (let key in pluginDefine.input) {
+          const column = pluginDefine.input[key];
+          //设置初始值
+          if ((column.default != null || column.value != null) && currentStep.value.input[key] == null) {
+            currentStep.value.input[key] = column.default ?? column.value;
           }
         }
 
@@ -261,7 +274,6 @@ export default {
         stepView,
         stepDrawerShow,
         stepDrawerVisible,
-        stepDrawerOnAfterVisibleChange,
         currentStep,
         currentPlugin,
         stepSave,
@@ -347,7 +359,7 @@ export default {
       overflow-y: hidden;
 
       .ant-card-meta-description {
-        font-size: 10px;
+        font-size: 12px;
         line-height: 20px;
         height: 40px;
         color: #7f7f7f;

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-form/index.vue

@@ -43,25 +43,22 @@
                   <a-button type="primary" @click="stepAdd(currentTask)">添加步骤</a-button>
                 </template>
               </a-descriptions>
-              <a-list class="step-list" item-layout="horizontal" :data-source="currentTask.steps">
-                <template #renderItem="{ item, index }">
-                  <a-list-item>
-                    <template #actions>
-                      <a key="edit" @click="stepEdit(currentTask, item, index)">编辑</a>
-                      <a key="edit" @click="stepCopy(currentTask, item, index)">复制</a>
+              <v-draggable v-model="currentTask.steps" class="step-list" handle=".handle" item-key="id" :disabled="!userStore.isPlus">
+                <template #item="{ element, index }">
+                  <div class="step-row">
+                    <div class="text">
+                      <fs-icon icon="ion:flash"></fs-icon>
+                      <h4 class="title">{{ element.title }}</h4>
+                    </div>
+                    <div class="action">
+                      <a key="edit" @click="stepEdit(currentTask, element, index)">编辑</a>
+                      <a key="edit" @click="stepCopy(currentTask, element, index)">复制</a>
                       <a key="remove" @click="stepDelete(currentTask, index)">删除</a>
-                    </template>
-                    <a-list-item-meta>
-                      <template #title>
-                        {{ item.title }}
-                      </template>
-                      <template #avatar>
-                        <fs-icon icon="ion:flash"></fs-icon>
-                      </template>
-                    </a-list-item-meta>
-                  </a-list-item>
+                      <fs-icon v-plus class="icon-button handle" title="拖动排序" icon="ion:move-outline"></fs-icon>
+                    </div>
+                  </div>
                 </template>
-              </a-list>
+              </v-draggable>
             </a-form-item>
           </div>
         </a-form>
@@ -85,10 +82,11 @@ import { nanoid } from "nanoid";
 import PiStepForm from "../step-form/index.vue";
 import { Modal } from "ant-design-vue";
 import { CopyOutlined } from "@ant-design/icons-vue";
-
+import VDraggable from "vuedraggable";
+import { useUserStore } from "/@/store/modules/user";
 export default {
   name: "PiTaskForm",
-  components: { CopyOutlined, PiStepForm },
+  components: { CopyOutlined, PiStepForm, VDraggable },
   props: {
     editMode: {
       type: Boolean,
@@ -97,6 +95,7 @@ export default {
   },
   emits: ["update"],
   setup(props: any, ctx: any) {
+    const userStore = useUserStore();
     function useStep() {
       const stepFormRef: Ref<any> = ref(null);
       const currentStepIndex = ref(0);
@@ -251,6 +250,7 @@ export default {
       };
     }
     return {
+      userStore,
       labelCol: { span: 6 },
       wrapperCol: { span: 16 },
       ...useTaskForm(),
@@ -268,5 +268,42 @@ export default {
   .ant-list .ant-list-item .ant-list-item-meta .ant-list-item-meta-title {
     margin: 0;
   }
+  .ant-list .ant-list-item .ant-list-item-action {
+    display: flex;
+    > li {
+      display: flex;
+      align-items: center;
+    }
+  }
+  .step-list {
+    padding: 10px;
+    .icon-button {
+      font-size: 18px;
+      color: #1677ff;
+      cursor: pointer;
+    }
+
+    .step-row {
+      padding: 10px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      .text {
+        display: flex;
+        > * {
+          margin: 0px;
+          margin-right: 15px;
+        }
+      }
+      .action {
+        display: flex;
+        align-items: center;
+        > * {
+          margin-right: 15px;
+          font-size: 14px;
+        }
+      }
+    }
+  }
 }
 </style>

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/trigger-form/index.vue

@@ -15,13 +15,7 @@
     </template>
     <template v-if="currentTrigger">
       <pi-container>
-        <a-form
-          ref="triggerFormRef"
-          class="trigger-form"
-          :model="currentTrigger"
-          :label-col="labelCol"
-          :wrapper-col="wrapperCol"
-        >
+        <a-form ref="triggerFormRef" class="trigger-form" :model="currentTrigger" :label-col="labelCol" :wrapper-col="wrapperCol">
           <fs-form-item
             v-model="currentTrigger.title"
             :item="{
@@ -59,10 +53,10 @@
               key: 'props.cron',
               component: {
                 disabled: !editMode,
-                name: 'a-input',
-                vModel: 'value'
+                name: 'cron-editor',
+                vModel: 'modelValue'
               },
-              helper: 'cron表达式，例如： 0 0 3 * * * ，表示每天凌晨3点触发',
+              helper: '点击上面的按钮，选择每天几点几分定时执行, 例如：0 0 4 * * *，每天凌晨4点0分0秒触发',
               rules: [{ required: true, message: '此项必填' }]
             }"
           />

packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue

@@ -20,167 +20,204 @@
       <div class="layout-left">
         <div class="pipeline-container">
           <div class="pipeline">
-            <div class="stages">
-              <div class="stage first-stage">
-                <div class="title">
-                  <pi-editable model-value="触发源" :disabled="true" />
-                </div>
-                <div class="tasks">
-                  <div class="task-container first-task">
-                    <div class="line">
-                      <div class="flow-line"></div>
-                    </div>
-                    <div class="task">
-                      <a-button shape="round" type="primary" @click="run">
-                        <fs-icon icon="ion:play"></fs-icon>
-                        手动触发
-                      </a-button>
-                    </div>
+            <v-draggable v-model="pipeline.stages" class="stages" item-key="id" handle=".stage-move-handle" :disabled="!userStore.isPlus">
+              <template #header>
+                <div class="stage first-stage">
+                  <div class="title stage-move-handle">
+                    <pi-editable model-value="触发源" :disabled="true" />
                   </div>
-                  <div v-for="(trigger, index) of pipeline.triggers" :key="trigger.id" class="task-container">
-                    <div class="line">
-                      <div class="flow-line"></div>
-                    </div>
-                    <div class="task">
-                      <a-button shape="round" @click="triggerEdit(trigger, index)">
-                        <fs-icon icon="ion:time"></fs-icon>
-                        {{ trigger.title }}
-                      </a-button>
-                    </div>
-                  </div>
-
-                  <div v-if="editMode" class="task-container is-add">
-                    <div class="line">
-                      <div class="flow-line"></div>
-                    </div>
-                    <div class="task">
-                      <a-button shape="round" type="dashed" @click="triggerAdd">
-                        <fs-icon icon="ion:add-circle-outline"></fs-icon>
-                        触发源（定时）
-                      </a-button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-
-              <div v-for="(stage, index) of pipeline.stages" :key="stage.id" class="stage" :class="{ 'last-stage': isLastStage(index) }">
-                <div class="title">
-                  <pi-editable v-model="stage.title" :disabled="!editMode"></pi-editable>
-                </div>
-                <div class="tasks">
-                  <div
-                    v-for="(task, taskIndex) of stage.tasks"
-                    :key="task.id"
-                    class="task-container"
-                    :class="{
-                      'first-task': taskIndex === 0
-                    }"
-                  >
-                    <div class="line">
-                      <div class="flow-line"></div>
-                      <fs-icon v-if="editMode" class="add-stage-btn" title="添加新阶段" icon="ion:add-circle" @click="stageAdd(index)"></fs-icon>
-                    </div>
-                    <div class="task">
-                      <a-button shape="round" @click="taskEdit(stage, index, task, taskIndex)">
-                        <span class="flex-o w-100">
-                          <span class="ellipsis flex-1" :class="{ 'mr-15': editMode }">{{ task.title }}</span>
-                          <pi-status-show :status="task.status?.result"></pi-status-show>
-                        </span>
-                      </a-button>
-                      <fs-icon v-if="editMode" class="copy" title="复制" icon="ion:copy-outline" @click="taskCopy(stage, index, task)"></fs-icon>
-                    </div>
-                  </div>
-                  <div v-if="editMode" class="task-container is-add">
-                    <div class="line">
-                      <div class="flow-line"></div>
-                    </div>
-                    <div class="task">
-                      <a-tooltip>
-                        <a-button type="dashed" shape="round" @click="taskAdd(stage, index)">
-                          <fs-icon class="font-20" icon="ion:add-circle-outline"></fs-icon>
-                          并行任务
+                  <div class="tasks">
+                    <div class="task-container first-task">
+                      <div class="line line-right">
+                        <div class="flow-line"></div>
+                      </div>
+                      <div class="task">
+                        <a-button shape="round" type="primary" @click="run()">
+                          <fs-icon icon="ion:play"></fs-icon>
+                          手动触发
                         </a-button>
-                      </a-tooltip>
+                      </div>
+                    </div>
+                    <div v-for="(trigger, index) of pipeline.triggers" :key="trigger.id" class="task-container">
+                      <div class="line line-right">
+                        <div class="flow-line"></div>
+                      </div>
+                      <div class="task">
+                        <a-button shape="round" @click="triggerEdit(trigger, index)">
+                          <fs-icon icon="ion:time"></fs-icon>
+                          {{ trigger.title }}
+                        </a-button>
+                      </div>
                     </div>
-                  </div>
-                </div>
-              </div>
 
-              <div v-if="editMode" class="stage last-stage">
-                <div class="title">
-                  <pi-editable model-value="新阶段" :disabled="true" />
-                </div>
-                <div class="tasks">
-                  <div class="task-container first-task">
-                    <div class="line">
-                      <div class="flow-line"></div>
-                      <fs-icon class="add-stage-btn" title="添加新阶段" icon="ion:add-circle" @click="stageAdd()"></fs-icon>
-                    </div>
-                    <div class="task">
-                      <a-button shape="round" type="dashed" @click="stageAdd()">
-                        <fs-icon icon="ion:add-circle-outline"></fs-icon>
-                        添加任务
-                      </a-button>
+                    <div v-if="editMode" class="task-container is-add">
+                      <div class="line line-right">
+                        <div class="flow-line"></div>
+                      </div>
+                      <div class="task">
+                        <a-button shape="round" type="dashed" @click="triggerAdd">
+                          <fs-icon icon="ion:add-circle-outline"></fs-icon>
+                          触发源（定时）
+                        </a-button>
+                      </div>
                     </div>
                   </div>
-                  <div class="task-container">
-                    <div class="line">
-                      <div class="flow-line"></div>
-                    </div>
-                    <div class="task">
-                      <a-button shape="round" type="dashed" @click="notificationAdd()">
-                        <fs-icon icon="ion:add-circle-outline"></fs-icon>
+                </div>
+              </template>
 
-                        添加通知
-                      </a-button>
+              <template #item="{ element: stage, index }">
+                <div :key="stage.id" class="stage" :class="{ 'last-stage': isLastStage(index) }">
+                  <div class="title">
+                    <pi-editable v-model="stage.title" :disabled="!editMode"></pi-editable>
+                    <div v-plus class="icon-box stage-move-handle">
+                      <fs-icon v-if="editMode" title="拖动排序" icon="ion:move-outline"></fs-icon>
                     </div>
                   </div>
-                  <div v-for="(item, ii) of pipeline.notifications" :key="ii" class="task-container">
-                    <div class="line">
-                      <div class="flow-line"></div>
-                    </div>
-                    <div class="task">
-                      <a-button shape="round" @click="notificationEdit(item, ii as number)">
-                        <fs-icon icon="ion:notifications"></fs-icon>
-                        【通知】 {{ item.type }}
-                      </a-button>
-                    </div>
+                  <v-draggable v-model="stage.tasks" item-key="id" class="tasks" group="task" handle=".task-move-handle" :disabled="!userStore.isPlus">
+                    <template #item="{ element: task, index: taskIndex }">
+                      <div
+                        class="task-container"
+                        :class="{
+                          'first-task': taskIndex === 0
+                        }"
+                      >
+                        <div class="line line-left">
+                          <div class="flow-line"></div>
+                          <fs-icon v-if="editMode" class="add-stage-btn" title="添加新阶段" icon="ion:add-circle" @click="stageAdd(index)"></fs-icon>
+                        </div>
+                        <div class="line line-right">
+                          <div class="flow-line"></div>
+                        </div>
+                        <div class="task">
+                          <a-button shape="round" @click="taskEdit(stage, index, task, taskIndex)">
+                            <a-popover title="步骤" :trigger="editMode ? 'none' : 'hover'">
+                              <!--                          :open="true"-->
+                              <template #content>
+                                <div v-for="(item, index) of task.steps" class="flex-o w-100">
+                                  <span class="ellipsis flex-1">{{ index + 1 }}. {{ item.title }} </span>
+                                  <pi-status-show v-if="!editMode" :status="item.status?.result"></pi-status-show>
+                                  <fs-icon
+                                    v-if="!editMode"
+                                    class="pointer color-blue ml-2"
+                                    title="重新运行此步骤"
+                                    icon="SyncOutlined"
+                                    @click="run(item.id)"
+                                  ></fs-icon>
+                                </div>
+                              </template>
+                              <span class="flex-o w-100">
+                                <span class="ellipsis flex-1 task-title" :class="{ 'in-edit': editMode }">{{ task.title }}</span>
+                                <pi-status-show :status="task.status?.result"></pi-status-show>
+                              </span>
+                            </a-popover>
+                          </a-button>
+                          <div class="icon-box action copy">
+                            <fs-icon v-if="editMode" title="复制" icon="ion:copy-outline" @click="taskCopy(stage, index, task)"></fs-icon>
+                          </div>
+                          <div v-plus class="icon-box task-move-handle action drag">
+                            <fs-icon v-if="editMode" title="拖动排序" icon="ion:move-outline"></fs-icon>
+                          </div>
+                        </div>
+                      </div>
+                    </template>
+                    <template #footer>
+                      <div v-if="editMode" class="task-container is-add">
+                        <div class="line line-left">
+                          <div class="flow-line"></div>
+                        </div>
+                        <div class="line line-right">
+                          <div class="flow-line"></div>
+                        </div>
+                        <div class="task">
+                          <a-tooltip>
+                            <a-button type="dashed" shape="round" @click="taskAdd(stage, index)">
+                              <fs-icon class="font-20" icon="ion:add-circle-outline"></fs-icon>
+                              并行任务
+                            </a-button>
+                          </a-tooltip>
+                        </div>
+                      </div>
+                    </template>
+                  </v-draggable>
+                </div>
+              </template>
+              <template #footer>
+                <div v-if="editMode" class="stage last-stage">
+                  <div class="title">
+                    <pi-editable model-value="新阶段" :disabled="true" />
                   </div>
-                </div>
-              </div>
-              <div v-else class="stage last-stage">
-                <div class="title">
-                  <pi-editable model-value="结束" :disabled="true" />
-                </div>
-                <div v-if="pipeline.notifications?.length > 0" class="tasks">
-                  <div v-for="(item, index) of pipeline.notifications" :key="index" class="task-container" :class="{ 'first-task': index == 0 }">
-                    <div class="line">
-                      <div class="flow-line"></div>
+                  <div class="tasks">
+                    <div class="task-container first-task">
+                      <div class="line line-left">
+                        <div class="flow-line"></div>
+                        <fs-icon class="add-stage-btn" title="添加新阶段" icon="ion:add-circle" @click="stageAdd()"></fs-icon>
+                      </div>
+                      <div class="task">
+                        <a-button shape="round" type="dashed" @click="stageAdd()">
+                          <fs-icon icon="ion:add-circle-outline"></fs-icon>
+                          添加任务
+                        </a-button>
+                      </div>
                     </div>
-                    <div class="task">
-                      <a-button shape="round" @click="notificationEdit(item, index)">
-                        <fs-icon icon="ion:notifications"></fs-icon>
+                    <div class="task-container">
+                      <div class="line line-left">
+                        <div class="flow-line"></div>
+                      </div>
+                      <div class="task">
+                        <a-button shape="round" type="dashed" @click="notificationAdd()">
+                          <fs-icon icon="ion:add-circle-outline"></fs-icon>
 
-                        【通知】 {{ item.type }}
-                      </a-button>
+                          添加通知
+                        </a-button>
+                      </div>
+                    </div>
+                    <div v-for="(item, ii) of pipeline.notifications" :key="ii" class="task-container">
+                      <div class="line line-left">
+                        <div class="flow-line"></div>
+                      </div>
+                      <div class="task">
+                        <a-button shape="round" @click="notificationEdit(item, ii as number)">
+                          <fs-icon icon="ion:notifications"></fs-icon>
+                          【通知】 {{ item.type }}
+                        </a-button>
+                      </div>
                     </div>
                   </div>
                 </div>
-                <div v-else class="tasks">
-                  <div class="task-container first-task">
-                    <div class="line">
-                      <div class="flow-line"></div>
+                <div v-else class="stage last-stage">
+                  <div class="title">
+                    <pi-editable model-value="结束" :disabled="true" />
+                  </div>
+                  <div v-if="pipeline.notifications?.length > 0" class="tasks">
+                    <div v-for="(item, index) of pipeline.notifications" :key="index" class="task-container" :class="{ 'first-task': index == 0 }">
+                      <div class="line line-left">
+                        <div class="flow-line"></div>
+                      </div>
+                      <div class="task">
+                        <a-button shape="round" @click="notificationEdit(item, index)">
+                          <fs-icon icon="ion:notifications"></fs-icon>
+
+                          【通知】 {{ item.type }}
+                        </a-button>
+                      </div>
                     </div>
-                    <div class="task">
-                      <a-button shape="round" type="dashed">
-                        <fs-icon icon="ion:notifications"></fs-icon>
-                        通知未设置
-                      </a-button>
+                  </div>
+                  <div v-else class="tasks">
+                    <div class="task-container first-task">
+                      <div class="line line-left">
+                        <div class="flow-line"></div>
+                      </div>
+                      <div class="task">
+                        <a-button shape="round" type="dashed">
+                          <fs-icon icon="ion:notifications"></fs-icon>
+                          通知未设置
+                        </a-button>
+                      </div>
                     </div>
                   </div>
                 </div>
-              </div>
-            </div>
+              </template>
+            </v-draggable>
           </div>
         </div>
       </div>
@@ -219,17 +256,19 @@ import PiTriggerForm from "./component/trigger-form/index.vue";
 import PiNotificationForm from "./component/notification-form/index.vue";
 import PiTaskView from "./component/task-view/index.vue";
 import PiStatusShow from "./component/status-show.vue";
+import VDraggable from "vuedraggable";
 import _ from "lodash-es";
 import { message, Modal, notification } from "ant-design-vue";
-import { pluginManager } from "/@/views/certd/pipeline/pipeline/plugin";
 import { nanoid } from "nanoid";
 import { PipelineDetail, PipelineOptions, PluginGroups, RunHistory } from "./type";
 import type { Runnable } from "@certd/pipeline";
 import PiHistoryTimelineItem from "/@/views/certd/pipeline/pipeline/component/history-timeline-item.vue";
+import { FsIcon } from "@fast-crud/fast-crud";
+import { useUserStore } from "/@/store/modules/user";
 export default defineComponent({
   name: "PipelineEdit",
   // eslint-disable-next-line vue/no-unused-components
-  components: { PiHistoryTimelineItem, PiTaskForm, PiTriggerForm, PiTaskView, PiStatusShow, PiNotificationForm },
+  components: { FsIcon, PiHistoryTimelineItem, PiTaskForm, PiTriggerForm, PiTaskView, PiStatusShow, PiNotificationForm, VDraggable },
   props: {
     pipelineId: {
       type: [Number, String],
@@ -260,6 +299,8 @@ export default defineComponent({
       router.back();
     }
 
+    const userStore = useUserStore();
+
     const loadCurrentHistoryDetail = async () => {
       console.log("load history logs");
       const detail: RunHistory = await props.options?.getHistoryDetail({ historyId: currentHistory.value.id });
@@ -529,7 +570,7 @@ export default defineComponent({
 
     function useActions() {
       const saveLoading = ref();
-      const run = async () => {
+      const run = async (stepId?: string) => {
         if (props.editMode) {
           message.warn("请先保存，再运行管道");
           return;
@@ -549,11 +590,12 @@ export default defineComponent({
             //@ts-ignore
             await changeCurrentHistory(null);
             watchNewHistoryList();
-            await props.options.doTrigger({ pipelineId: pipeline.value.id });
+            await props.options.doTrigger({ pipelineId: pipeline.value.id, stepId: stepId });
             notification.success({ message: "管道已经开始运行" });
           }
         });
       };
+
       function toggleEditMode(editMode: boolean) {
         ctx.emit("update:editMode", editMode);
       }
@@ -614,6 +656,7 @@ export default defineComponent({
       currentHistory,
       histories,
       goBack,
+      userStore,
       ...useTaskRet,
       ...useStageRet,
       ...useTrigger(),
@@ -688,39 +731,39 @@ export default defineComponent({
         .title {
           padding: 20px;
           color: gray;
-        }
-        &.first-stage {
-          .line {
-            width: 50% !important;
-            .flow-line {
-              border-left: 0;
-            }
+          display: flex;
+          .stage-move-handle {
+            cursor: move;
+            margin-left: 4px;
           }
         }
-        &.last-stage {
-          .line {
-            width: 50% !important;
-            left: 0;
-            right: auto;
-            .flow-line {
-              border-right: 0;
-            }
-            .add-stage-btn {
-              visibility: hidden;
-            }
-          }
-        }
-
+        //.sortable-ghost {
+        //  .line {
+        //    visibility: hidden;
+        //  }
+        //}
         .line {
           height: 50px;
           position: absolute;
           top: -25px;
-          right: 0;
-          width: 100%;
+          width: 25px;
+
+          &.line-left {
+            left: 25px;
+            .flow-line {
+              border-right: 0;
+            }
+          }
+
+          &.line-right {
+            right: 25px;
+            .flow-line {
+              border-left: 0;
+            }
+          }
+
           .flow-line {
             height: 100%;
-            margin-left: 28px;
-            margin-right: 28px;
             border: 1px solid #c7c7c7;
             border-top: 0;
           }
@@ -739,6 +782,52 @@ export default defineComponent({
           }
         }
 
+        .task-container:first-child {
+          .line {
+            width: 50px;
+
+            &.line-left {
+              left: 0;
+              .flow-line {
+                border-right: 0;
+                border-left: 0;
+              }
+            }
+
+            &.line-right {
+              right: 0;
+              .flow-line {
+                border-left: 0;
+                border-right: 0;
+              }
+            }
+
+            .add-stage-btn {
+              visibility: visible;
+            }
+          }
+        }
+
+        &.first-stage {
+          .line {
+            .flow-line {
+              border-left: 0;
+            }
+          }
+        }
+        &.last-stage {
+          .line {
+            width: 50% !important;
+            right: auto;
+            .flow-line {
+              border-right: 0;
+            }
+            .add-stage-btn {
+              visibility: hidden;
+            }
+          }
+        }
+
         .tasks {
           .task-container {
             width: 100%;
@@ -748,18 +837,6 @@ export default defineComponent({
             justify-content: center;
             align-items: center;
             position: relative;
-            &.first-task {
-              .line {
-                .flow-line {
-                  margin: 0;
-                  border-left: 0;
-                  border-right: 0;
-                }
-                .add-stage-btn {
-                  visibility: visible;
-                }
-              }
-            }
             .task {
               display: flex;
               flex-direction: column;
@@ -768,14 +845,29 @@ export default defineComponent({
               height: 100%;
               z-index: 2;
 
-              .copy {
+              .task-title {
+                &.in-edit {
+                  margin-right: 28px;
+                }
+              }
+
+              .action {
                 position: absolute;
                 right: 60px;
                 top: 18px;
+                //font-size: 18px;
                 cursor: pointer;
+                z-index: 10;
                 &:hover {
                   color: #1890ff;
                 }
+                &.copy {
+                  right: 80px;
+                }
+                &.drag {
+                  right: 60px;
+                  cursor: move;
+                }
               }
 
               .ant-btn {

packages/ui/certd-client/src/views/certd/pipeline/pipeline/type.ts

@@ -1,5 +1,5 @@
 import type { Pipeline } from "@certd/pipeline";
-import { FormItemProps } from "@fast-crud/fast-crud";
+import { DynamicType, FormItemProps } from "@fast-crud/fast-crud";
 export type PipelineDetail = {
   pipeline: Pipeline;
 };
@@ -24,7 +24,7 @@ export type PluginDefine = {
   title: string;
   desc?: string;
   input: {
-    [key: string]: FormItemProps;
+    [key: string]: DynamicType<FormItemProps>;
   };
   output: {
     [key: string]: any;
@@ -117,7 +117,7 @@ export class PluginGroups {
 }
 
 export type PipelineOptions = {
-  doTrigger(options: { pipelineId: number }): Promise<void>;
+  doTrigger(options: { pipelineId: number; stepId?: string }): Promise<void>;
   doSave(pipelineConfig: Pipeline): Promise<void>;
   getPipelineDetail(query: { pipelineId: number }): Promise<PipelineDetail>;
   getHistoryList(query: { pipelineId: number }): Promise<RunHistory[]>;

packages/ui/certd-server/.dockerignore

@@ -16,4 +16,4 @@ run/
 /data/db.sqlite
 */node_modules
 certd-server/tools/windows/
-
+.clinic

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

@@ -1,6 +1,10 @@
 koa:
   port: 7001
-
+#  key: ./data/ssl/cert.key
+#  cert: ./data/ssl/cert.crt
+#plus:
+#  server:
+#    baseUrl: 'http://127.0.0.1:11007'
 plus:
   server:
-    baseUrl: 'http://127.0.0.1:11007'
+     baseUrl: 'https://api.ai.handsfree.work'

packages/ui/certd-server/.gitignore

@@ -16,3 +16,4 @@ run/
 /test/setup.js
 /test/setup.ts
 /data/
+.clinic

packages/ui/certd-server/CHANGELOG.md

@@ -3,6 +3,35 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06)
+
+### Bug Fixes
+
+* 修复复制流水线出现的各种问题 ([6314e8d](https://github.com/certd/certd/commit/6314e8d7eb58cd52e2a7bd3b5ffb9112b0b69577))
+* 修复windows下无法执行第二条命令的bug ([71ac8aa](https://github.com/certd/certd/commit/71ac8aae4aa694e1a23761e9761c9fba30b43a21))
+
+### Performance Improvements
+
+* 任务配置不需要的字段可以自动隐藏 ([192d9dc](https://github.com/certd/certd/commit/192d9dc7e36737d684c769f255f407c28b1152ac))
+* 任务支持拖动排序 ([1e9b563](https://github.com/certd/certd/commit/1e9b5638aa36a8ce70019a9c750230ba41938327))
+* 西部数据支持用户级的apikey ([1c17b41](https://github.com/certd/certd/commit/1c17b41e160944b073e1849e6f9467c3659a4bfc))
+* 修复windows下无法执行第二条命令的bug ([d5bfcdb](https://github.com/certd/certd/commit/d5bfcdb6de1dcc1702155442e2e00237d0bbb6e5))
+* 支持阿里云oss ([87a2673](https://github.com/certd/certd/commit/87a2673e8c33dff6eda1b836d92ecc121564ed78))
+* 支持西部数码DNS ([c59cab1](https://github.com/certd/certd/commit/c59cab1aaeb19f86df8e3e0d8127cbd0a9ef77f3))
+* 支持pfx、der ([fbeaed2](https://github.com/certd/certd/commit/fbeaed203519f59b6d9396c4e8953353ccb5e723))
+
+## [1.24.1](https://github.com/certd/certd/compare/v1.24.0...v1.24.1) (2024-09-02)
+
+### Performance Improvements
+
+* 部署插件支持宝塔、易盾云等 ([ee61709](https://github.com/certd/certd/commit/ee617095efa1171548cf52fd45f0f98a368555a3))
+* 授权配置支持加密 ([42a56b5](https://github.com/certd/certd/commit/42a56b581d754c3e5f9838179d19ab0d004ef2eb))
+* 优化内存占用 ([db61033](https://github.com/certd/certd/commit/db6103363364440b650bc10bb334834e4a9470c7))
+* 支持阿里云 DCDN ([98b77f8](https://github.com/certd/certd/commit/98b77f80843834616fb26f83b4c42245326abd06))
+* 支持已跳过的步骤重新运行 ([ea775ad](https://github.com/certd/certd/commit/ea775adae18d57a04470cfba6b9460d761d74035))
+* 支持cdnfly ([724a850](https://github.com/certd/certd/commit/724a85028b4a7146c9e3b4df4497dcf2a7bf7c67))
+* 支持ftp上传 ([b9bddbf](https://github.com/certd/certd/commit/b9bddbfabb5664365f1232e9432532187c98006c))
+
 # [1.24.0](https://github.com/certd/certd/compare/v1.23.1...v1.24.0) (2024-08-25)
 
 ### Bug Fixes

packages/ui/certd-server/db/migration-pg/v10008__access_encrypt.sql

@@ -0,0 +1 @@
+alter table cd_access  add "encrypt_setting" text;

packages/ui/certd-server/db/migration/v10008__access_encrypt.sql

@@ -0,0 +1,2 @@
+alter table cd_access  add COLUMN "encrypt_setting" text;
+

packages/ui/certd-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-server",
-  "version": "1.24.0",
+  "version": "1.24.2",
   "description": "fast-server base midway",
   "private": true,
   "type": "module",
@@ -15,19 +15,20 @@
     "ci": "npm run cov",
     "build": "mwtsc --cleanOutDir --skipLibCheck",
     "build-on-docker": "node ./before-build.js && npm run build",
-    "up-mw-deps": "npx midway-version -u -w"
+    "up-mw-deps": "npx midway-version -u -w",
+    "clinic": "clinic heapprofiler   -- node ./bootstrap.js"
   },
   "dependencies": {
     "@alicloud/cs20151215": "^3.0.3",
-    "@alicloud/openapi-client": "^0.4.0",
     "@alicloud/pop-core": "^1.7.10",
-    "@certd/acme-client": "^1.24.0",
-    "@certd/lib-huawei": "^1.22.1",
-    "@certd/lib-k8s": "^1.24.0",
+    "@certd/acme-client": "^1.24.2",
+    "@certd/lib-huawei": "^1.24.2",
+    "@certd/lib-k8s": "^1.24.2",
     "@certd/midway-flyway-js": "^1.22.6",
-    "@certd/pipeline": "^1.24.0",
-    "@certd/plugin-cert": "^1.24.0",
-    "@koa/cors": "^3.4.3",
+    "@certd/pipeline": "^1.24.2",
+    "@certd/plugin-cert": "^1.24.2",
+    "@certd/plugin-plus": "^1.24.2",
+    "@koa/cors": "^5.0.0",
     "@midwayjs/bootstrap": "^3.16.2",
     "@midwayjs/cache": "^3.14.0",
     "@midwayjs/core": "^3.16.2",
@@ -38,17 +39,19 @@
     "@midwayjs/static-file": "^3.16.4",
     "@midwayjs/typeorm": "^3.16.4",
     "@midwayjs/validate": "^3.16.4",
+    "ali-oss": "^6.21.0",
     "axios": "^1.7.2",
+    "basic-ftp": "^5.0.5",
     "bcryptjs": "^2.4.3",
     "better-sqlite3": "^11.1.2",
     "cache-manager": "^3.6.3",
     "cron-parser": "^4.9.0",
     "dayjs": "^1.11.7",
     "glob": "^10.4.5",
-    "https-proxy-agent": "^7.0.4",
+    "https-proxy-agent": "^7.0.5",
     "iconv-lite": "^0.6.3",
     "js-yaml": "^4.1.0",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.0",
     "koa-send": "^5.0.1",
     "kubernetes-client": "^9.0.0",
     "lodash-es": "^4.17.21",
@@ -61,14 +64,14 @@
     "pg": "^8.12.0",
     "reflect-metadata": "^0.1.13",
     "ssh2": "^1.15.0",
+    "strip-ansi": "^7.1.0",
     "svg-captcha": "^1.4.0",
     "tencentcloud-sdk-nodejs": "^4.0.44",
-    "tencentcloud-sdk-nodejs-dnspod": "^4.0.866",
-    "tencentcloud-sdk-nodejs-teo": "^4.0.919",
-    "typeorm": "^0.3.11"
+    "typeorm": "^0.3.20"
   },
   "devDependencies": {
     "@midwayjs/mock": "^3.16.4",
+    "@types/ali-oss": "^6.16.11",
     "@types/cache-manager": "^3.4.3",
     "@types/jest": "^26.0.24",
     "@types/koa": "2.13.4",

packages/ui/certd-server/src/basic/base-service.ts

@@ -17,7 +17,7 @@ export abstract class BaseService<T> {
 
   async transaction(callback: (entityManager: EntityManager) => Promise<any>) {
     const dataSource = this.dataSourceManager.getDataSource('default');
-    await dataSource.transaction(callback);
+    await dataSource.transaction(callback as any);
   }
 
   /**

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

@@ -12,13 +12,11 @@ import { PipelineEntity } from '../modules/pipeline/entity/pipeline.js';
 //import { logger } from '../utils/logger';
 // load .env file in process.cwd
 import { mergeConfig } from './loader.js';
-import { Keys } from './keys.js';
 
 const env = process.env.NODE_ENV || 'development';
 
-const keys = Keys.load();
 const development = {
-  keys: keys.cookieKeys,
+  keys: 'certd',
   koa: {
     port: 7001,
   },
@@ -78,7 +76,6 @@ const development = {
 
   auth: {
     jwt: {
-      secret: keys.jwtKey,
       expire: 7 * 24 * 60 * 60, //单位秒
     },
   },

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

@@ -1,31 +0,0 @@
-import fs from 'fs';
-import yaml from 'js-yaml';
-import * as _ from 'lodash-es';
-import { nanoid } from 'nanoid';
-import path from 'path';
-const KEYS_FILE = './data/keys.yaml';
-export class Keys {
-  jwtKey: string = nanoid();
-  cookieKeys: string[] = [nanoid()];
-
-  static load(): Keys {
-    const keys = new Keys();
-    if (fs.existsSync(KEYS_FILE)) {
-      const content = fs.readFileSync(KEYS_FILE, 'utf8');
-      const json = yaml.load(content);
-      _.merge(keys, json);
-    }
-    keys.save();
-    return keys;
-  }
-
-  save() {
-    const parent = path.dirname(KEYS_FILE);
-    if (!fs.existsSync(parent)) {
-      fs.mkdirSync(parent, {
-        recursive: true,
-      });
-    }
-    fs.writeFileSync(KEYS_FILE, yaml.dump(this));
-  }
-}

packages/ui/certd-server/src/middleware/authority.ts

@@ -1,21 +1,31 @@
-import { Config, Inject, MidwayWebRouterService, Provide } from '@midwayjs/core';
+import { Init, Inject, MidwayWebRouterService, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { IMidwayKoaContext, IWebMiddleware, NextFunction } from '@midwayjs/koa';
 import jwt from 'jsonwebtoken';
 import { Constants } from '../basic/constants.js';
 import { logger } from '../utils/logger.js';
 import { AuthService } from '../modules/authority/service/auth-service.js';
+import { SysSettingsService } from '../modules/system/service/sys-settings-service.js';
+import { SysPrivateSettings } from '../modules/system/service/models.js';
 
 /**
  * 权限校验
  */
 @Provide()
+@Scope(ScopeEnum.Singleton)
 export class AuthorityMiddleware implements IWebMiddleware {
-  @Config('auth.jwt.secret')
-  private secret: string;
   @Inject()
   webRouterService: MidwayWebRouterService;
   @Inject()
   authService: AuthService;
+  @Inject()
+  sysSettingsService: SysSettingsService;
+
+  secret: string;
+  @Init()
+  async init() {
+    const setting: SysPrivateSettings = await this.sysSettingsService.getSetting(SysPrivateSettings);
+    this.secret = setting.jwtKey;
+  }
 
   resolve() {
     return async (ctx: IMidwayKoaContext, next: NextFunction) => {

packages/ui/certd-server/src/modules/authority/controller/permission-controller.ts

@@ -49,7 +49,7 @@ export class PermissionController extends CrudController<PermissionService> {
   @Post('/delete', { summary: 'sys:auth:per:remove' })
   async delete(
     @Query('id')
-    id
+    id : number
   ) {
     return await super.delete(id);
   }

packages/ui/certd-server/src/modules/authority/controller/role-controller.ts

@@ -1,12 +1,4 @@
-import {
-  ALL,
-  Body,
-  Controller,
-  Inject,
-  Post,
-  Provide,
-  Query,
-} from '@midwayjs/core';
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { CrudController } from '../../../basic/crud-controller.js';
 import { RoleService } from '../service/role-service.js';
 
@@ -55,7 +47,7 @@ export class RoleController extends CrudController<RoleService> {
   @Post('/delete', { summary: 'sys:auth:role:remove' })
   async delete(
     @Query('id')
-    id
+    id: number
   ) {
     return await super.delete(id);
   }
@@ -63,7 +55,7 @@ export class RoleController extends CrudController<RoleService> {
   @Post('/getPermissionTree', { summary: 'sys:auth:role:view' })
   async getPermissionTree(
     @Query('id')
-    id
+    id: number
   ) {
     const ret = await this.service.getPermissionTreeByRoleId(id);
     return this.ok(ret);
@@ -72,7 +64,7 @@ export class RoleController extends CrudController<RoleService> {
   @Post('/getPermissionIds', { summary: 'sys:auth:role:view' })
   async getPermissionIds(
     @Query('id')
-    id
+    id: number
   ) {
     const ret = await this.service.getPermissionIdsByRoleId(id);
     return this.ok(ret);

packages/ui/certd-server/src/modules/authority/controller/user-controller.ts

@@ -73,7 +73,7 @@ export class UserController extends CrudController<UserService> {
   @Post('/delete', { summary: 'sys:auth:user:remove' })
   async delete(
     @Query('id')
-    id
+    id : number
   ) {
     return await super.delete(id);
   }

packages/ui/certd-server/src/modules/authority/service/user-service.ts

@@ -11,10 +11,10 @@ import { PermissionService } from './permission-service.js';
 import { UserRoleService } from './user-role-service.js';
 import { Constants } from '../../../basic/constants.js';
 import { UserRoleEntity } from '../entity/user-role.js';
-import { randomText } from 'svg-captcha';
 import bcrypt from 'bcryptjs';
 import { SysSettingsService } from '../../system/service/sys-settings-service.js';
 import { SysInstallInfo } from '../../system/service/models.js';
+import { RandomUtil } from '../../../utils/random.js';
 
 /**
  * 系统用户
@@ -64,7 +64,7 @@ export class UserService extends BaseService<UserEntity> {
     if (!_.isEmpty(exists)) {
       throw new CommonException('用户名已经存在');
     }
-    const plainPassword = param.password ?? randomText(6);
+    const plainPassword = param.password ?? RandomUtil.randomStr(6);
     param.passwordVersion = 2;
     param.password = await this.genPassword(plainPassword, param.passwordVersion); // 默认密码  建议未改密码不能登陆
     await super.add(param);
@@ -156,7 +156,7 @@ export class UserService extends BaseService<UserEntity> {
       passwordVersion: 2,
     });
     if (!newUser.password) {
-      newUser.password = randomText(6);
+      newUser.password = RandomUtil.randomStr(6);
     }
     newUser.password = await this.genPassword(newUser.password, newUser.passwordVersion);
 

packages/ui/certd-server/src/modules/auto/auto-init-site.ts

@@ -1,11 +1,11 @@
-import { Autoload, Init, Inject, Scope, ScopeEnum } from '@midwayjs/core';
+import { Autoload, Config, Init, Inject, Scope, ScopeEnum } from '@midwayjs/core';
 import { logger } from '../../utils/logger.js';
 import { UserService } from '../authority/service/user-service.js';
 import { SysSettingsService } from '../system/service/sys-settings-service.js';
 import { nanoid } from 'nanoid';
-import { SysInstallInfo, SysLicenseInfo } from '../system/service/models.js';
+import { SysInstallInfo, SysLicenseInfo, SysPrivateSettings } from '../system/service/models.js';
 import { verify } from '@certd/pipeline';
-
+import crypto from 'crypto';
 export type InstallInfo = {
   installTime: number;
   instanceId?: string;
@@ -17,12 +17,17 @@ export class AutoInitSite {
   @Inject()
   userService: UserService;
 
+  @Config('typeorm.dataSource.default.type')
+  dbType: string;
+
   @Inject()
   sysSettingsService: SysSettingsService;
 
   @Init()
   async init() {
     logger.info('初始化站点开始');
+    await this.startOptimizeDb();
+    //安装信息
     const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
     if (!installInfo.siteId) {
       installInfo.siteId = nanoid();
@@ -33,6 +38,19 @@ export class AutoInitSite {
       await this.sysSettingsService.saveSetting(installInfo);
     }
 
+    //private信息
+    const privateInfo = await this.sysSettingsService.getSetting<SysPrivateSettings>(SysPrivateSettings);
+    if (!privateInfo.jwtKey) {
+      privateInfo.jwtKey = nanoid();
+      await this.sysSettingsService.saveSetting(privateInfo);
+    }
+
+    if (!privateInfo.encryptSecret) {
+      const secretKey = crypto.randomBytes(32);
+      privateInfo.encryptSecret = secretKey.toString('base64');
+      await this.sysSettingsService.saveSetting(privateInfo);
+    }
+
     // 授权许可
     const licenseInfo: SysLicenseInfo = await this.sysSettingsService.getSetting(SysLicenseInfo);
     const req = {
@@ -43,4 +61,25 @@ export class AutoInitSite {
 
     logger.info('初始化站点完成');
   }
+
+  async startOptimizeDb() {
+    //优化数据库
+    //检查当前数据库类型为sqlite
+    if (this.dbType === 'better-sqlite3') {
+      const res = await this.userService.repository.query('PRAGMA auto_vacuum;');
+      if (!(res && res.length > 0 && res[0].auto_vacuum > 0)) {
+        //未开启自动优化
+        await this.userService.repository.query('PRAGMA auto_vacuum = INCREMENTAL;');
+        logger.info('sqlite数据库自动优化已开启');
+      }
+
+      const optimizeDb = async () => {
+        logger.info('sqlite数据库空间优化开始');
+        await this.userService.repository.query('VACUUM');
+        logger.info('sqlite数据库空间优化完成');
+      };
+      await optimizeDb();
+      setInterval(optimizeDb, 1000 * 60 * 60 * 24);
+    }
+  }
 }

packages/ui/certd-server/src/modules/basic/service/code-service.ts

@@ -1,6 +1,5 @@
 import { Inject, Provide } from '@midwayjs/core';
 import { CacheManager } from '@midwayjs/cache';
-import svgCaptcha from 'svg-captcha';
 
 // {data: '<svg.../svg>', text: 'abcd'}
 /**
@@ -14,6 +13,7 @@ export class CodeService {
    */
   async generateCaptcha(randomStr) {
     console.assert(randomStr < 10, 'randomStr 过长');
+    const svgCaptcha = await import('svg-captcha');
     const c = svgCaptcha.create();
     //{data: '<svg.../svg>', text: 'abcd'}
     const imgCode = c.text; // = RandomUtil.randomStr(4, true);

packages/ui/certd-server/src/modules/basic/service/plus-service.ts

@@ -14,7 +14,7 @@ export class PlusService {
   @Config('plus.server.baseUrl')
   plusServerBaseUrl;
 
-  async requestWithoutSign(config: any) {
+  async requestWithoutSign(config: any): Promise<any> {
     config.baseURL = this.plusServerBaseUrl;
     return await request(config);
   }

packages/ui/certd-server/src/modules/login/service/login-service.ts

@@ -4,6 +4,8 @@ import jwt from 'jsonwebtoken';
 import { CommonException } from '../../../basic/exception/common-exception.js';
 import { RoleService } from '../../authority/service/role-service.js';
 import { UserEntity } from '../../authority/entity/user.js';
+import { SysSettingsService } from '../../system/service/sys-settings-service.js';
+import { SysPrivateSettings } from '../../system/service/models.js';
 
 /**
  * 系统用户
@@ -17,6 +19,9 @@ export class LoginService {
   @Config('auth.jwt')
   private jwt: any;
 
+  @Inject()
+  sysSettingsService: SysSettingsService;
+
   /**
    * login
    */
@@ -47,7 +52,11 @@ export class LoginService {
       roles: roleIds,
     };
     const expire = this.jwt.expire;
-    const token = jwt.sign(tokenInfo, this.jwt.secret, {
+
+    const setting = await this.sysSettingsService.getSetting<SysPrivateSettings>(SysPrivateSettings);
+    const jwtSecret = setting.jwtKey;
+
+    const token = jwt.sign(tokenInfo, jwtSecret, {
       expiresIn: expire,
     });
 

packages/ui/certd-server/src/modules/mine/controller/user-settings-controller.ts

@@ -49,13 +49,13 @@ export class UserSettingsController extends CrudController<UserSettingsService>
     return super.update(bean);
   }
   @Post('/info', { summary: Constants.per.authOnly })
-  async info(@Query('id') id) {
+  async info(@Query('id') id: number) {
     await this.service.checkUserId(id, this.ctx.user.id);
     return super.info(id);
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
-  async delete(@Query('id') id) {
+  async delete(@Query('id') id: number) {
     await this.service.checkUserId(id, this.ctx.user.id);
     return super.delete(id);
   }

packages/ui/certd-server/src/modules/mine/service/user-settings-service.ts

@@ -30,10 +30,7 @@ export class UserSettingsService extends BaseService<UserSettingsEntity> {
     };
   }
 
-  async getByKey(
-    key: string,
-    userId: number
-  ): Promise<UserSettingsEntity | null> {
+  async getByKey(key: string, userId: number): Promise<UserSettingsEntity | null> {
     if (!key || !userId) {
       return null;
     }

packages/ui/certd-server/src/modules/pipeline/controller/access-controller.ts

@@ -1,12 +1,4 @@
-import {
-  ALL,
-  Body,
-  Controller,
-  Inject,
-  Post,
-  Provide,
-  Query,
-} from '@midwayjs/core';
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { CrudController } from '../../../basic/crud-controller.js';
 import { AccessService } from '../service/access-service.js';
 import { Constants } from '../../../basic/constants.js';
@@ -28,7 +20,7 @@ export class AccessController extends CrudController<AccessService> {
   async page(@Body(ALL) body) {
     body.query = body.query ?? {};
     body.query.userId = this.ctx.user.id;
-    return super.page(body);
+    return await super.page(body);
   }
 
   @Post('/list', { summary: Constants.per.authOnly })
@@ -49,19 +41,19 @@ export class AccessController extends CrudController<AccessService> {
     return super.update(bean);
   }
   @Post('/info', { summary: Constants.per.authOnly })
-  async info(@Query('id') id) {
+  async info(@Query('id') id: number) {
     await this.service.checkUserId(id, this.ctx.user.id);
     return super.info(id);
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
-  async delete(@Query('id') id) {
+  async delete(@Query('id') id: number) {
     await this.service.checkUserId(id, this.ctx.user.id);
     return super.delete(id);
   }
 
   @Post('/define', { summary: Constants.per.authOnly })
-  async define(@Query('type') type) {
+  async define(@Query('type') type:string) {
     const access = this.service.getDefineByType(type);
     return this.ok(access);
   }

packages/ui/certd-server/src/modules/pipeline/controller/dns-provider-controller.ts

@@ -13,7 +13,7 @@ export class DnsProviderController extends BaseController {
   service: DnsProviderService;
 
   @Post('/list', { summary: Constants.per.authOnly })
-  async list(@Query(ALL) query) {
+  async list(@Query(ALL) query:any) {
     query.userId = this.ctx.user.id;
     const list = this.service.getList();
     return this.ok(list);

packages/ui/certd-server/src/modules/pipeline/controller/history-controller.ts

@@ -99,14 +99,14 @@ export class HistoryController extends CrudController<HistoryService> {
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
-  async delete(@Query('id') id) {
+  async delete(@Query('id') id: number) {
     await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
     await super.delete(id);
     return this.ok();
   }
 
   @Post('/deleteByIds', { summary: Constants.per.authOnly })
-  async deleteByIds(@Body(ALL) body) {
+  async deleteByIds(@Body(ALL) body: any) {
     await this.authService.checkEntityUserId(this.ctx, this.getService(), body.ids);
     const isAdmin = await this.authService.isAdmin(this.ctx);
     const userId = isAdmin ? null : this.ctx.user.id;
@@ -115,21 +115,21 @@ export class HistoryController extends CrudController<HistoryService> {
   }
 
   @Post('/detail', { summary: Constants.per.authOnly })
-  async detail(@Query('id') id) {
+  async detail(@Query('id') id: number) {
     await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
     const detail = await this.service.detail(id);
     return this.ok(detail);
   }
 
   @Post('/logs', { summary: Constants.per.authOnly })
-  async logs(@Query('id') id) {
+  async logs(@Query('id') id: number) {
     await this.authService.checkEntityUserId(this.ctx, this.logService, id);
     const logInfo = await this.logService.info(id);
     return this.ok(logInfo);
   }
 
   @Post('/files', { summary: Constants.per.authOnly })
-  async files(@Query('pipelineId') pipelineId, @Query('historyId') historyId) {
+  async files(@Query('pipelineId') pipelineId: number, @Query('historyId') historyId: number) {
     await this.authService.checkEntityUserId(this.ctx, this.service, historyId);
     const files = await this.getFiles(historyId, pipelineId);
     return this.ok(files);
@@ -153,7 +153,7 @@ export class HistoryController extends CrudController<HistoryService> {
   }
 
   @Get('/download', { summary: Constants.per.authOnly })
-  async download(@Query('pipelineId') pipelineId, @Query('historyId') historyId, @Query('fileId') fileId) {
+  async download(@Query('pipelineId') pipelineId: number, @Query('historyId') historyId: number, @Query('fileId') fileId: string) {
     await this.authService.checkEntityUserId(this.ctx, this.service, historyId);
     const files = await this.getFiles(historyId, pipelineId);
     const file = files.find(f => f.id === fileId);

packages/ui/certd-server/src/modules/pipeline/controller/pipeline-controller.ts

@@ -73,28 +73,28 @@ export class PipelineController extends CrudController<PipelineService> {
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
-  async delete(@Query('id') id) {
+  async delete(@Query('id') id: number) {
     await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
     await this.service.delete(id);
     return this.ok({});
   }
 
   @Post('/detail', { summary: Constants.per.authOnly })
-  async detail(@Query('id') id) {
+  async detail(@Query('id') id: number) {
     await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
     const detail = await this.service.detail(id);
     return this.ok(detail);
   }
 
   @Post('/trigger', { summary: Constants.per.authOnly })
-  async trigger(@Query('id') id) {
+  async trigger(@Query('id') id: number, @Query('stepId') stepId?: string) {
     await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
-    await this.service.trigger(id);
+    await this.service.trigger(id, stepId);
     return this.ok({});
   }
 
   @Post('/cancel', { summary: Constants.per.authOnly })
-  async cancel(@Query('historyId') historyId) {
+  async cancel(@Query('historyId') historyId: number) {
     await this.authService.checkEntityUserId(this.ctx, this.historyService, historyId);
     await this.service.cancel(historyId);
     return this.ok({});

packages/ui/certd-server/src/modules/pipeline/controller/plugin-controller.ts

@@ -13,14 +13,14 @@ export class PluginController extends BaseController {
   service: PluginService;
 
   @Post('/list', { summary: Constants.per.authOnly })
-  async list(@Query(ALL) query) {
+  async list(@Query(ALL) query: any) {
     query.userId = this.ctx.user.id;
     const list = this.service.getList();
     return this.ok(list);
   }
 
   @Post('/groups', { summary: Constants.per.authOnly })
-  async groups(@Query(ALL) query) {
+  async groups(@Query(ALL) query: any) {
     query.userId = this.ctx.user.id;
     const group = this.service.getGroups();
     return this.ok(group);

packages/ui/certd-server/src/modules/pipeline/entity/access.ts

@@ -15,9 +15,12 @@ export class AccessEntity {
   @Column({ comment: '类型', length: 100 })
   type: string;
 
-  @Column({ name: 'setting', comment: '设置', length: 1024, nullable: true })
+  @Column({ name: 'setting', comment: '设置', length: 10240, nullable: true })
   setting: string;
 
+  @Column({ name: 'encrypt_setting', comment: '已加密设置', length: 10240, nullable: true })
+  encryptSetting: string;
+
   @Column({
     name: 'create_time',
     comment: '创建时间',

packages/ui/certd-server/src/modules/pipeline/service/access-service.ts

@@ -1,33 +1,128 @@
-import { Provide, Scope, ScopeEnum } from '@midwayjs/core';
+import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { Repository } from 'typeorm';
 import { BaseService } from '../../../basic/base-service.js';
 import { AccessEntity } from '../entity/access.js';
-import { accessRegistry, IAccessService } from '@certd/pipeline';
+import { AccessDefine, accessRegistry, IAccessService } from '@certd/pipeline';
+import { EncryptService } from './encrypt-service.js';
+import { ValidateException } from '../../../basic/exception/validation-exception.js';
 
 /**
  * 授权
  */
 @Provide()
 @Scope(ScopeEnum.Singleton)
-export class AccessService
-  extends BaseService<AccessEntity>
-  implements IAccessService
-{
+export class AccessService extends BaseService<AccessEntity> implements IAccessService {
   @InjectEntityModel(AccessEntity)
   repository: Repository<AccessEntity>;
 
+  @Inject()
+  encryptService: EncryptService;
+
   getRepository() {
     return this.repository;
   }
 
+  async page(query, page = { offset: 0, limit: 20 }, order, buildQuery) {
+    const res = await super.page(query, page, order, buildQuery);
+    res.records = res.records.map(item => {
+      delete item.encryptSetting;
+      return item;
+    });
+    return res;
+  }
+
+  async add(param) {
+    this.encryptSetting(param, null);
+    return await super.add(param);
+  }
+
+  encryptSetting(param: any, oldSettingEntity?: AccessEntity) {
+    const accessType = param.type;
+    const accessDefine: AccessDefine = accessRegistry.getDefine(accessType);
+    if (!accessDefine) {
+      throw new ValidateException(`授权类型${accessType}不存在`);
+    }
+    const setting = param.setting;
+    if (!setting) {
+      return;
+    }
+    const json = JSON.parse(setting);
+    let oldSetting = {};
+    let encryptSetting = {};
+    const firstEncrypt = !oldSettingEntity || !oldSettingEntity.encryptSetting || oldSettingEntity.encryptSetting === '{}';
+    if (oldSettingEntity) {
+      oldSetting = JSON.parse(oldSettingEntity.setting || '{}');
+      encryptSetting = JSON.parse(oldSettingEntity.encryptSetting || '{}');
+    }
+    for (const key in json) {
+      //加密
+      const value = json[key];
+      const accessInputDefine = accessDefine.input[key];
+      if (!accessInputDefine) {
+        throw new ValidateException(`授权类型${accessType}不存在字段${key}`);
+      }
+      if (!accessInputDefine.encrypt || !value || typeof value !== 'string') {
+        //定义无需加密、value为空、不是字符串 这些不需要加密
+        encryptSetting[key] = {
+          value: value,
+          encrypt: false,
+        };
+        continue;
+      }
+
+      if (firstEncrypt || oldSetting[key] !== value) {
+        //星号保护
+        const length = value.length;
+        const subIndex = Math.min(2, length);
+        let starLength = length - subIndex * 2;
+        starLength = Math.max(2, starLength);
+        const starString = '*'.repeat(starLength);
+        json[key] = value.substring(0, subIndex) + starString + value.substring(value.length - subIndex);
+        encryptSetting[key] = {
+          value: this.encryptService.encrypt(value),
+          encrypt: true,
+        };
+      }
+      //未改变情况下，不做修改
+    }
+    param.encryptSetting = JSON.stringify(encryptSetting);
+    param.setting = JSON.stringify(json);
+  }
+  /**
+   * 修改
+   * @param param 数据
+   */
+  async update(param) {
+    const oldEntity = await this.info(param.id);
+    if (oldEntity == null) {
+      throw new ValidateException('该授权配置不存在,请确认是否已被删除');
+    }
+    this.encryptSetting(param, oldEntity);
+    return await super.update(param);
+  }
+
   async getById(id: any): Promise<any> {
     const entity = await this.info(id);
     if (entity == null) {
       throw new Error(`该授权配置不存在,请确认是否已被删除:id=${id}`);
     }
     // const access = accessRegistry.get(entity.type);
-    const setting = JSON.parse(entity.setting);
+    let setting = {};
+    if (entity.encryptSetting && entity.encryptSetting !== '{}') {
+      setting = JSON.parse(entity.encryptSetting);
+      for (const key in setting) {
+        //解密
+        const encryptValue = setting[key];
+        let value = encryptValue.value;
+        if (encryptValue.encrypt) {
+          value = this.encryptService.decrypt(value);
+        }
+        setting[key] = value;
+      }
+    } else if (entity.setting) {
+      setting = JSON.parse(entity.setting);
+    }
     return {
       id: entity.id,
       ...setting,