v1.31.4

CHANGELOG.md

@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.31.4](https://github.com/certd/certd/compare/v1.31.3...v1.31.4) (2025-03-21)
+
+### Bug Fixes
+
+* 修复站点监控通知通过webhook发送失败的bug ([9be1ecc](https://github.com/certd/certd/commit/9be1ecc8aab3ea23dd0dc2dab3688f4edb90ef2c))
+* 修复dns.la域名申请失败的bug ([1de8eee](https://github.com/certd/certd/commit/1de8eee6ea8307f3c11626af75303d3cc104bb95))
+
+### Performance Improvements
+
+* 宝塔支持doker站点证书部署 ([589a373](https://github.com/certd/certd/commit/589a373142ef7f50d64d3aa767a90b1f4b64da93))
+* 保存调整后的列宽 ([873f2b6](https://github.com/certd/certd/commit/873f2b618b9d7320045baf69d6da83afe48a780f))
+* 创建证书流水线时，支持更多参数展开 ([36aa7f8](https://github.com/certd/certd/commit/36aa7f82b078a053a102331b3c6f132fb9d492f9))
+* 流水线页面可以鼠标按住左右拖动 ([d85a02f](https://github.com/certd/certd/commit/d85a02feeb3183c5abd6c1ea790d5923a32d7271))
+* 流水线增加上传证书快捷方式 ([425bba6](https://github.com/certd/certd/commit/425bba67c539b734e2a85a83a4f9ecc9b2434fb4))
+* 手动上传证书部署流水线 ([fbb66f3](https://github.com/certd/certd/commit/fbb66f3c4389489aa8a43b194d82bc8cf391607b))
+* 优化选择任务时手机版展示效果 ([d01004d](https://github.com/certd/certd/commit/d01004d53071a75ac91ee21cc96bde9369f77ff3))
+* 站点监控，手动测试也发通知 ([729b19c](https://github.com/certd/certd/commit/729b19c8da60d5efb5baef7cf8df0518e7f6b471))
+* 站点证书监控支持模糊查询 ([0069c0e](https://github.com/certd/certd/commit/0069c0e3992946a8dd6410f299d4fc974ef0e76b))
+* 支持飞书通知 ([b82e1dc](https://github.com/certd/certd/commit/b82e1dcd6217b09a7d7e21cd648bb31de320cadf))
+* 支持手动上传证书并部署 ([a9fffa5](https://github.com/certd/certd/commit/a9fffa5180c83da27b35886aa2e858a92a2c5f94))
+
+## [1.31.3](https://github.com/certd/certd/compare/v1.31.2...v1.31.3) (2025-03-13)
+
+### Bug Fixes
+
+* 修复阿里云fc获取不到列表的bug ([474b337](https://github.com/certd/certd/commit/474b3372d8ce98e6d45900bf8046bc0b3f220686))
+
+### Performance Improvements
+
+* 1panel支持 apikey方式授权 ([170b2af](https://github.com/certd/certd/commit/170b2afb0e3b125e4ed057f633fe895b5ac3ac22))
+* 套餐支持3天7天等选项 ([0d71a8e](https://github.com/certd/certd/commit/0d71a8ee501a0e5bb69decf07e8729026e9d85bf))
+* 证书仓库增加有效期显示 ([be87124](https://github.com/certd/certd/commit/be87124ada7a093f281ca29a45c86b4ea4644ead))
+* 支持部署到天翼云CDN ([82a72e0](https://github.com/certd/certd/commit/82a72e0b497efa043d342ad0e33c083a2de79a05))
+* 支持dns.la ([ee8af18](https://github.com/certd/certd/commit/ee8af18d0ac0af82544d6dda1e4b4c678b733041))
+* cf授权支持配置http代理 ([27386ea](https://github.com/certd/certd/commit/27386ea04d3c1a5aebe3cfdd7ac48185eaa76629))
+
 ## [1.31.2](https://github.com/certd/certd/compare/v1.31.1...v1.31.2) (2025-03-12)
 
 ### Bug Fixes

build.trigger

@@ -1 +1 @@
-23:33
+01:19

docs/.vitepress/config.ts

@@ -12,6 +12,9 @@ export default defineConfig({
       md.use(lightbox, {});
     }
   },
+  sitemap: {
+    hostname: 'https://certd.docmirror.cn'
+  },
   head: [
     // [
     //     'meta',
@@ -25,9 +28,9 @@ export default defineConfig({
       name: "keywords",
       content: "证书自动申请、证书自动更新、证书自动续期、证书自动续签、证书管理工具、Certd、SSL证书自动部署、证书自动化，https证书，pfx证书，der证书，TLS证书，nginx证书自动续签自动部署,SSL平台，证书管理平台，证书流水线"
     }],
-    ["meta", { name: "google-site-verification",content: "V5XLTSnXoT15uQotwpxJoQolUo2d5UbSL-TacsyOsC0"}],
+    // ["meta", { name: "google-site-verification",content: "V5XLTSnXoT15uQotwpxJoQolUo2d5UbSL-TacsyOsC0"}],
       //<meta name="baidu-site-verification" content="codeva-MiWN8Y07Ua" />
-    ["meta", {name: "baidu-site-verification",content: "codeva-MiWN8Y07Ua"}],
+    // ["meta", {name: "baidu-site-verification",content: "codeva-MiWN8Y07Ua"}],
     ["link", { rel: "icon", href: "/static/logo/logo.svg" }]
   ],
   themeConfig: {

docs/guide/changelogs/CHANGELOG.md

@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.31.3](https://github.com/certd/certd/compare/v1.31.2...v1.31.3) (2025-03-13)
+
+### Bug Fixes
+
+* 修复阿里云fc获取不到列表的bug ([474b337](https://github.com/certd/certd/commit/474b3372d8ce98e6d45900bf8046bc0b3f220686))
+
+### Performance Improvements
+
+* 1panel支持 apikey方式授权 ([170b2af](https://github.com/certd/certd/commit/170b2afb0e3b125e4ed057f633fe895b5ac3ac22))
+* 套餐支持3天7天等选项 ([0d71a8e](https://github.com/certd/certd/commit/0d71a8ee501a0e5bb69decf07e8729026e9d85bf))
+* 证书仓库增加有效期显示 ([be87124](https://github.com/certd/certd/commit/be87124ada7a093f281ca29a45c86b4ea4644ead))
+* 支持部署到天翼云CDN ([82a72e0](https://github.com/certd/certd/commit/82a72e0b497efa043d342ad0e33c083a2de79a05))
+* 支持dns.la ([ee8af18](https://github.com/certd/certd/commit/ee8af18d0ac0af82544d6dda1e4b4c678b733041))
+* cf授权支持配置http代理 ([27386ea](https://github.com/certd/certd/commit/27386ea04d3c1a5aebe3cfdd7ac48185eaa76629))
+
+## [1.31.2](https://github.com/certd/certd/compare/v1.31.1...v1.31.2) (2025-03-12)
+
+### Bug Fixes
+
+* 修复cname记录查找bug ([95fb4e3](https://github.com/certd/certd/commit/95fb4e3e8be6ca13cc43b451f6141d62190ba453))
+
 ## [1.31.1](https://github.com/certd/certd/compare/v1.31.0...v1.31.1) (2025-03-11)
 
 ### Performance Improvements

docs/guide/use/custom-script/index.md

@@ -6,6 +6,10 @@
 
 ## 2. 使用示例
 ```js
+
+// 如果需要引用第三方库，必须使用import语法
+// const thirdSdk = await import("third-sdk-name")
+
 const certPem = ctx.self.cert.crt
 const certKey = ctx.self.cert.key
 

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.31.2"
+  "version": "1.31.4"
 }

package.json

@@ -9,7 +9,7 @@
     "@lerna-lite/run": "^3.9.3",
     "@lerna-lite/version": "^3.9.3",
     "medium-zoom": "^1.1.0",
-    "vitepress": "^1.4.1",
+    "vitepress": "^2.0.0-alpha.4",
     "vitepress-plugin-lightbox": "^1.0.2"
   },
   "scripts": {

packages/core/acme-client/.prettierrc

@@ -0,0 +1,7 @@
+{
+  "printWidth": 220,
+  "bracketSpacing": true,
+  "singleQuote": false,
+  "trailingComma": "es5",
+  "arrowParens": "avoid"
+}

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.31.4](https://github.com/publishlab/node-acme-client/compare/v1.31.3...v1.31.4) (2025-03-21)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.31.3](https://github.com/publishlab/node-acme-client/compare/v1.31.2...v1.31.3) (2025-03-13)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.31.2](https://github.com/publishlab/node-acme-client/compare/v1.31.1...v1.31.2) (2025-03-12)
 
 **Note:** Version bump only for package @certd/acme-client

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.31.2",
+    "version": "1.31.4",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.31.2",
+        "@certd/basic": "^1.31.4",
         "@peculiar/x509": "^1.11.0",
         "asn1js": "^3.0.5",
         "axios": "^1.7.2",
@@ -30,6 +30,8 @@
     },
     "devDependencies": {
         "@types/node": "^20.14.10",
+        "@typescript-eslint/eslint-plugin": "^8.26.1",
+        "@typescript-eslint/parser": "^8.26.1",
         "chai": "^4.4.1",
         "chai-as-promised": "^7.1.2",
         "eslint": "^8.57.0",
@@ -65,5 +67,5 @@
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
     },
-    "gitHead": "2a4d64af9502881e2e553ea86a4479158cfa8918"
+    "gitHead": "cfbbac9796477f830e1f57f77777f6554da9e31d"
 }

packages/core/basic/.eslintrc

@@ -16,7 +16,7 @@
     "@typescript-eslint/ban-ts-comment": "off",
     "@typescript-eslint/ban-ts-ignore": "off",
     "@typescript-eslint/no-explicit-any": "off",
-//    "no-unused-expressions": "off",
-    "max-len": [0, 160, 2, { "ignoreUrls": true }]
+    "@typescript-eslint/no-empty-function": "off",
+    "@typescript-eslint/no-unused-vars": "off"
   }
 }

packages/core/basic/.prettierrc

@@ -0,0 +1,7 @@
+{
+  "printWidth": 220,
+  "bracketSpacing": true,
+  "singleQuote": false,
+  "trailingComma": "es5",
+  "arrowParens": "avoid"
+}

packages/core/basic/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.31.4](https://github.com/certd/certd/compare/v1.31.3...v1.31.4) (2025-03-21)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.31.3](https://github.com/certd/certd/compare/v1.31.2...v1.31.3) (2025-03-13)
+
+### Performance Improvements
+
+* 支持部署到天翼云CDN ([82a72e0](https://github.com/certd/certd/commit/82a72e0b497efa043d342ad0e33c083a2de79a05))
+
 ## [1.31.2](https://github.com/certd/certd/compare/v1.31.1...v1.31.2) (2025-03-12)
 
 **Note:** Version bump only for package @certd/basic

packages/core/basic/build.md

@@ -1 +1 @@
-10:23
+02:06

packages/core/basic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.31.2",
+  "version": "1.31.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -33,8 +33,8 @@
     "@types/lodash-es": "^4.17.12",
     "@types/mocha": "^10.0.1",
     "@types/node-forge": "^1.3.2",
-    "@typescript-eslint/eslint-plugin": "^5.59.7",
-    "@typescript-eslint/parser": "^5.59.7",
+    "@typescript-eslint/eslint-plugin": "^8.26.1",
+    "@typescript-eslint/parser": "^8.26.1",
     "chai": "4.3.10",
     "eslint": "^8.41.0",
     "eslint-config-prettier": "^8.8.0",
@@ -44,5 +44,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "2a4d64af9502881e2e553ea86a4479158cfa8918"
+  "gitHead": "cfbbac9796477f830e1f57f77777f6554da9e31d"
 }

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

@@ -7,6 +7,10 @@ function sha256(data: string, digest: BinaryToTextEncoding = 'hex') {
   return crypto.createHash('sha256').update(data).digest(digest);
 }
 
+function hmacSha256(data: string, digest: BinaryToTextEncoding = 'base64') {
+  return crypto.createHmac('sha256', data).update(Buffer.alloc(0)).digest(digest);
+}
+
 function base64(data: string) {
   return Buffer.from(data).toString('base64');
 }
@@ -14,4 +18,5 @@ export const hashUtils = {
   md5,
   sha256,
   base64,
+  hmacSha256,
 };

packages/core/pipeline/.eslintrc

@@ -16,7 +16,7 @@
     "@typescript-eslint/ban-ts-comment": "off",
     "@typescript-eslint/ban-ts-ignore": "off",
     "@typescript-eslint/no-explicit-any": "off",
-//    "no-unused-expressions": "off",
-    "max-len": [0, 160, 2, { "ignoreUrls": true }]
+    "@typescript-eslint/no-empty-function": "off",
+    "@typescript-eslint/no-unused-vars": "off"
   }
 }

packages/core/pipeline/.prettierrc

@@ -1,3 +1,7 @@
 {
-  "printWidth": 160
+  "printWidth": 220,
+  "bracketSpacing": true,
+  "singleQuote": false,
+  "trailingComma": "es5",
+  "arrowParens": "avoid"
 }

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.31.4](https://github.com/certd/certd/compare/v1.31.3...v1.31.4) (2025-03-21)
+
+### Bug Fixes
+
+* 修复站点监控通知通过webhook发送失败的bug ([9be1ecc](https://github.com/certd/certd/commit/9be1ecc8aab3ea23dd0dc2dab3688f4edb90ef2c))
+
+### Performance Improvements
+
+* 流水线增加上传证书快捷方式 ([425bba6](https://github.com/certd/certd/commit/425bba67c539b734e2a85a83a4f9ecc9b2434fb4))
+* 支持飞书通知 ([b82e1dc](https://github.com/certd/certd/commit/b82e1dcd6217b09a7d7e21cd648bb31de320cadf))
+* 支持手动上传证书并部署 ([a9fffa5](https://github.com/certd/certd/commit/a9fffa5180c83da27b35886aa2e858a92a2c5f94))
+
+## [1.31.3](https://github.com/certd/certd/compare/v1.31.2...v1.31.3) (2025-03-13)
+
+**Note:** Version bump only for package @certd/pipeline
+
 ## [1.31.2](https://github.com/certd/certd/compare/v1.31.1...v1.31.2) (2025-03-12)
 
 **Note:** Version bump only for package @certd/pipeline

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.31.2",
+  "version": "1.31.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -16,8 +16,8 @@
     "test": "mocha   --loader=ts-node/esm"
   },
   "dependencies": {
-    "@certd/basic": "^1.31.2",
-    "@certd/plus-core": "^1.31.2",
+    "@certd/basic": "^1.31.4",
+    "@certd/plus-core": "^1.31.4",
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",
     "reflect-metadata": "^0.1.13"
@@ -31,8 +31,8 @@
     "@types/chai": "^4.3.10",
     "@types/lodash-es": "^4.17.12",
     "@types/mocha": "^10.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.59.7",
-    "@typescript-eslint/parser": "^5.59.7",
+    "@typescript-eslint/eslint-plugin": "^8.26.1",
+    "@typescript-eslint/parser": "^8.26.1",
     "chai": "4.3.10",
     "eslint": "^8.41.0",
     "eslint-config-prettier": "^8.8.0",
@@ -43,5 +43,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "2a4d64af9502881e2e553ea86a4479158cfa8918"
+  "gitHead": "cfbbac9796477f830e1f57f77777f6554da9e31d"
 }

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

@@ -7,7 +7,7 @@ import { createAxiosService, hashUtils, HttpRequestConfig, ILogger, logger, util
 import { IAccessService } from "../access/index.js";
 import { RegistryItem } from "../registry/index.js";
 import { Decorator } from "../decorator/index.js";
-import { ICnameProxyService, IEmailService, IPluginConfigService, IUrlService } from "../service/index.js";
+import { ICnameProxyService, IEmailService, IPluginConfigService, IServiceGetter, IUrlService } from "../service/index.js";
 import { FileStore } from "./file-store.js";
 import { cloneDeep, forEach, merge } from "lodash-es";
 import { INotificationService } from "../notification/index.js";
@@ -33,6 +33,7 @@ export type ExecutorOptions = {
   user: UserInfo;
   baseURL?: string;
   sysInfo?: SysInfo;
+  serviceGetter: IServiceGetter;
 };
 
 export class Executor {
@@ -365,6 +366,7 @@ export class Executor {
         step,
         pipeline: this.pipeline,
       }),
+      serviceGetter: this.options.serviceGetter,
     };
     instance.setCtx(taskCtx);
 

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

@@ -11,11 +11,13 @@ function attachProperty(target: any, propertyKey: string | symbol) {
 }
 
 function getClassProperties(target: any) {
-  //获取父类
+  //获取父类, 向上追溯三层
   const parent = Object.getPrototypeOf(target);
+  const pParent = Object.getPrototypeOf(parent);
+  const pParentMap = propertyMap[pParent] || {};
   const parentMap = propertyMap[parent] || {};
   const current = propertyMap[target] || {};
-  return _.merge({}, parentMap, current);
+  return _.merge({}, pParentMap, parentMap, current);
 }
 
 function target(target: any, propertyKey?: string | symbol) {

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

@@ -119,10 +119,12 @@ export abstract class BaseNotification implements INotification {
   }
 
   async onTestRequest() {
-    await this.doSend({
+    return await this.doSend({
       userId: 0,
       title: "【Certd】测试通知【*.foo.com】，标题长度测试、测试、测试",
-      content: "测试通知,*.foo.com",
+      content: `测试通知,*.foo.com
+换行测试
+      `,
       pipeline: {
         id: 1,
         title: "证书申请成功【测试流水线】",

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

@@ -2,7 +2,7 @@ import { Registrable } from "../registry/index.js";
 import { FileItem, FormItemProps, Pipeline, Runnable, Step } from "../dt/index.js";
 import { FileStore } from "../core/file-store.js";
 import { IAccessService } from "../access/index.js";
-import { ICnameProxyService, IEmailService, IUrlService } from "../service/index.js";
+import { ICnameProxyService, IEmailService, IServiceGetter, IUrlService } from "../service/index.js";
 import { CancelError, IContext, RunHistory, RunnableCollection } from "../core/index.js";
 import { HttpRequestConfig, ILogger, logger, utils } from "@certd/basic";
 import { HttpClient } from "@certd/basic";
@@ -55,6 +55,14 @@ export type PluginDefine = Registrable & {
     [key: string]: any;
   };
 
+  shortcut?: {
+    [key: string]: {
+      title: string;
+      icon: string;
+      action: string;
+      form: any;
+    };
+  };
   needPlus?: boolean;
 };
 
@@ -114,6 +122,9 @@ export type TaskInstanceContext = {
   user: UserInfo;
 
   emitter: TaskEmitter;
+
+  //service 容器
+  serviceGetter?: IServiceGetter;
 };
 
 export abstract class AbstractTaskPlugin implements ITaskPlugin {
@@ -221,7 +232,7 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
 
   getStepFromPipeline(stepId: string) {
     let found: any = null;
-    RunnableCollection.each(this.ctx.pipeline.stages, (step) => {
+    RunnableCollection.each(this.ctx.pipeline.stages, step => {
       if (step.id === stepId) {
         found = step;
         return;

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

@@ -3,3 +3,6 @@ export * from "./cname.js";
 export * from "./config.js";
 export * from "./url.js";
 export * from "./emit.js";
+export type IServiceGetter = {
+  get: (name: string) => Promise<any>;
+};

packages/libs/lib-huawei/.eslintrc

@@ -17,7 +17,6 @@
     "@typescript-eslint/ban-ts-ignore": "off",
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-empty-function": "off",
-//    "no-unused-expressions": "off",
-    "max-len": [0, 160, 2, { "ignoreUrls": true }]
+    "@typescript-eslint/no-unused-vars": "off"
   }
 }

packages/libs/lib-huawei/.prettierrc

@@ -1,3 +1,7 @@
 {
-  "printWidth": 160
+  "printWidth": 220,
+  "bracketSpacing": true,
+  "singleQuote": false,
+  "trailingComma": "es5",
+  "arrowParens": "avoid"
 }

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.31.4](https://github.com/certd/certd/compare/v1.31.3...v1.31.4) (2025-03-21)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.31.3](https://github.com/certd/certd/compare/v1.31.2...v1.31.3) (2025-03-13)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.31.2](https://github.com/certd/certd/compare/v1.31.1...v1.31.2) (2025-03-12)
 
 **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.31.2",
+  "version": "1.31.4",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
   "types": "./dist/d/index.d.ts",
@@ -18,8 +18,10 @@
     "rollup": "^3.7.4"
   },
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^8.26.1",
+    "@typescript-eslint/parser": "^8.26.1",
     "prettier": "^2.8.8",
     "tslib": "^2.8.1"
   },
-  "gitHead": "2a4d64af9502881e2e553ea86a4479158cfa8918"
+  "gitHead": "cfbbac9796477f830e1f57f77777f6554da9e31d"
 }

packages/libs/lib-iframe/.eslintrc

@@ -17,7 +17,6 @@
     "@typescript-eslint/ban-ts-ignore": "off",
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-empty-function": "off",
-//    "no-unused-expressions": "off",
-    "max-len": [0, 160, 2, { "ignoreUrls": true }]
+    "@typescript-eslint/no-unused-vars": "off"
   }
 }

packages/libs/lib-iframe/.prettierrc

@@ -1,7 +1,7 @@
 {
-  "printWidth": 160,
+  "printWidth": 220,
   "bracketSpacing": true,
-  "singleQuote": true,
+  "singleQuote": false,
   "trailingComma": "es5",
   "arrowParens": "avoid"
 }

packages/libs/lib-iframe/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.31.4](https://github.com/certd/certd/compare/v1.31.3...v1.31.4) (2025-03-21)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.31.3](https://github.com/certd/certd/compare/v1.31.2...v1.31.3) (2025-03-13)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
 ## [1.31.2](https://github.com/certd/certd/compare/v1.31.1...v1.31.2) (2025-03-12)
 
 **Note:** Version bump only for package @certd/lib-iframe

packages/libs/lib-iframe/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-iframe",
   "private": false,
-  "version": "1.31.2",
+  "version": "1.31.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -20,8 +20,8 @@
   },
   "devDependencies": {
     "@types/chai": "^4.3.3",
-    "@typescript-eslint/eslint-plugin": "^5.38.1",
-    "@typescript-eslint/parser": "^5.38.1",
+    "@typescript-eslint/eslint-plugin": "^8.26.1",
+    "@typescript-eslint/parser": "^8.26.1",
     "eslint": "^8.24.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
@@ -30,5 +30,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "2a4d64af9502881e2e553ea86a4479158cfa8918"
+  "gitHead": "cfbbac9796477f830e1f57f77777f6554da9e31d"
 }

packages/libs/lib-k8s/.prettierrc

@@ -1,7 +1,7 @@
 {
-  "printWidth": 160,
+  "printWidth": 220,
   "bracketSpacing": true,
-  "singleQuote": true,
+  "singleQuote": false,
   "trailingComma": "es5",
   "arrowParens": "avoid"
 }

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.31.4](https://github.com/certd/certd/compare/v1.31.3...v1.31.4) (2025-03-21)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.31.3](https://github.com/certd/certd/compare/v1.31.2...v1.31.3) (2025-03-13)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 ## [1.31.2](https://github.com/certd/certd/compare/v1.31.1...v1.31.2) (2025-03-12)
 
 **Note:** Version bump only for package @certd/lib-k8s

packages/libs/lib-k8s/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-k8s",
   "private": false,
-  "version": "1.31.2",
+  "version": "1.31.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -16,13 +16,13 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/basic": "^1.31.2",
+    "@certd/basic": "^1.31.4",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
     "@types/chai": "^4.3.3",
-    "@typescript-eslint/eslint-plugin": "^5.38.1",
-    "@typescript-eslint/parser": "^5.38.1",
+    "@typescript-eslint/eslint-plugin": "^8.26.1",
+    "@typescript-eslint/parser": "^8.26.1",
     "eslint": "^8.24.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
@@ -31,5 +31,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "2a4d64af9502881e2e553ea86a4479158cfa8918"
+  "gitHead": "cfbbac9796477f830e1f57f77777f6554da9e31d"
 }

packages/libs/lib-server/.prettierrc

@@ -1,7 +1,7 @@
 {
-  "printWidth": 160,
+  "printWidth": 220,
   "bracketSpacing": true,
-  "singleQuote": true,
+  "singleQuote": false,
   "trailingComma": "es5",
   "arrowParens": "avoid"
 }

packages/libs/lib-server/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.31.4](https://github.com/certd/certd/compare/v1.31.3...v1.31.4) (2025-03-21)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.31.3](https://github.com/certd/certd/compare/v1.31.2...v1.31.3) (2025-03-13)
+
+**Note:** Version bump only for package @certd/lib-server
+
 ## [1.31.2](https://github.com/certd/certd/compare/v1.31.1...v1.31.2) (2025-03-12)
 
 **Note:** Version bump only for package @certd/lib-server

packages/libs/lib-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/lib-server",
-  "version": "1.31.2",
+  "version": "1.31.4",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -27,10 +27,10 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.31.2",
-    "@certd/basic": "^1.31.2",
-    "@certd/pipeline": "^1.31.2",
-    "@certd/plus-core": "^1.31.2",
+    "@certd/acme-client": "^1.31.4",
+    "@certd/basic": "^1.31.4",
+    "@certd/pipeline": "^1.31.4",
+    "@certd/plus-core": "^1.31.4",
     "@midwayjs/cache": "~3.14.0",
     "@midwayjs/core": "~3.20.3",
     "@midwayjs/i18n": "~3.20.3",
@@ -50,8 +50,8 @@
   "devDependencies": {
     "@types/chai": "^4.3.3",
     "@types/node": "^18",
-    "@typescript-eslint/eslint-plugin": "^5.38.1",
-    "@typescript-eslint/parser": "^5.38.1",
+    "@typescript-eslint/eslint-plugin": "^8.26.1",
+    "@typescript-eslint/parser": "^8.26.1",
     "eslint": "^8.24.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
@@ -61,5 +61,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "2a4d64af9502881e2e553ea86a4479158cfa8918"
+  "gitHead": "cfbbac9796477f830e1f57f77777f6554da9e31d"
 }

packages/libs/lib-server/src/basic/base-service.ts

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

packages/libs/midway-flyway-js/.prettierrc

@@ -1,7 +1,7 @@
 {
-  "printWidth": 160,
+  "printWidth": 220,
   "bracketSpacing": true,
-  "singleQuote": true,
+  "singleQuote": false,
   "trailingComma": "es5",
   "arrowParens": "avoid"
 }

packages/libs/midway-flyway-js/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.31.4](https://github.com/certd/certd/compare/v1.31.3...v1.31.4) (2025-03-21)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.31.3](https://github.com/certd/certd/compare/v1.31.2...v1.31.3) (2025-03-13)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
 ## [1.31.2](https://github.com/certd/certd/compare/v1.31.1...v1.31.2) (2025-03-12)
 
 **Note:** Version bump only for package @certd/midway-flyway-js

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

@@ -1,6 +1,6 @@
 {
   "name": "@certd/midway-flyway-js",
-  "version": "1.31.2",
+  "version": "1.31.4",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -33,8 +33,8 @@
   "devDependencies": {
     "@types/chai": "^4.3.3",
     "@types/node": "^18",
-    "@typescript-eslint/eslint-plugin": "^5.38.1",
-    "@typescript-eslint/parser": "^5.38.1",
+    "@typescript-eslint/eslint-plugin": "^8.26.1",
+    "@typescript-eslint/parser": "^8.26.1",
     "eslint": "^8.24.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
@@ -46,5 +46,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "2a4d64af9502881e2e553ea86a4479158cfa8918"
+  "gitHead": "cfbbac9796477f830e1f57f77777f6554da9e31d"
 }

packages/plugins/plugin-cert/.eslintrc

@@ -17,7 +17,6 @@
     "@typescript-eslint/ban-ts-ignore": "off",
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-empty-function": "off",
-//    "no-unused-expressions": "off",
-    "max-len": [0, 160, 2, { "ignoreUrls": true }]
+    "@typescript-eslint/no-unused-vars": "off"
   }
 }

packages/plugins/plugin-cert/.prettierrc

@@ -1,3 +1,7 @@
 {
-  "printWidth": 160
+  "printWidth": 220,
+  "bracketSpacing": true,
+  "singleQuote": false,
+  "trailingComma": "es5",
+  "arrowParens": "avoid"
 }

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.31.4](https://github.com/certd/certd/compare/v1.31.3...v1.31.4) (2025-03-21)
+
+### Bug Fixes
+
+* 修复dns.la域名申请失败的bug ([1de8eee](https://github.com/certd/certd/commit/1de8eee6ea8307f3c11626af75303d3cc104bb95))
+
+### Performance Improvements
+
+* 流水线增加上传证书快捷方式 ([425bba6](https://github.com/certd/certd/commit/425bba67c539b734e2a85a83a4f9ecc9b2434fb4))
+* 手动上传证书部署流水线 ([fbb66f3](https://github.com/certd/certd/commit/fbb66f3c4389489aa8a43b194d82bc8cf391607b))
+* 支持手动上传证书并部署 ([a9fffa5](https://github.com/certd/certd/commit/a9fffa5180c83da27b35886aa2e858a92a2c5f94))
+
+## [1.31.3](https://github.com/certd/certd/compare/v1.31.2...v1.31.3) (2025-03-13)
+
+### Performance Improvements
+
+* 1panel支持 apikey方式授权 ([170b2af](https://github.com/certd/certd/commit/170b2afb0e3b125e4ed057f633fe895b5ac3ac22))
+
 ## [1.31.2](https://github.com/certd/certd/compare/v1.31.1...v1.31.2) (2025-03-12)
 
 ### Bug Fixes

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.31.2",
+  "version": "1.31.4",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -15,10 +15,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.31.2",
-    "@certd/basic": "^1.31.2",
-    "@certd/pipeline": "^1.31.2",
-    "@certd/plugin-lib": "^1.31.2",
+    "@certd/acme-client": "^1.31.4",
+    "@certd/basic": "^1.31.4",
+    "@certd/pipeline": "^1.31.4",
+    "@certd/plugin-lib": "^1.31.4",
     "@google-cloud/publicca": "^1.3.0",
     "dayjs": "^1.11.7",
     "jszip": "^3.10.1",
@@ -30,8 +30,8 @@
     "@types/chai": "^4.3.3",
     "@types/mocha": "^10.0.0",
     "@types/psl": "^1.1.3",
-    "@typescript-eslint/eslint-plugin": "^5.38.1",
-    "@typescript-eslint/parser": "^5.38.1",
+    "@typescript-eslint/eslint-plugin": "^8.26.1",
+    "@typescript-eslint/parser": "^8.26.1",
     "chai": "^4.3.6",
     "eslint": "^8.24.0",
     "eslint-config-prettier": "^8.5.0",
@@ -41,5 +41,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "2a4d64af9502881e2e553ea86a4479158cfa8918"
+  "gitHead": "cfbbac9796477f830e1f57f77777f6554da9e31d"
 }

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

@@ -60,6 +60,7 @@ type AcmeServiceOptions = {
   reverseProxy?: string;
   privateKeyType?: PrivateKeyType;
   signal?: AbortSignal;
+  maxCheckRetryCount?: number;
 };
 
 export class AcmeService {
@@ -144,7 +145,7 @@ export class AcmeService {
       accountKey: conf.key,
       accountUrl: conf.accountUrl,
       externalAccountBinding: this.eab,
-      backoffAttempts: 20,
+      backoffAttempts: this.options.maxCheckRetryCount || 20,
       backoffMin: 5000,
       backoffMax: 10000,
       urlMapping,
@@ -282,15 +283,7 @@ export class AcmeService {
    * @returns {Promise}
    */
 
-  async challengeRemoveFn(
-    authz: any,
-    challenge: any,
-    keyAuthorization: string,
-    recordReq: any,
-    recordRes: any,
-    dnsProvider?: IDnsProvider,
-    httpUploader?: HttpChallengeUploader
-  ) {
+  async challengeRemoveFn(authz: any, challenge: any, keyAuthorization: string, recordReq: any, recordRes: any, dnsProvider?: IDnsProvider, httpUploader?: HttpChallengeUploader) {
     this.logger.info("执行清理");
 
     /* http-01 */
@@ -387,14 +380,7 @@ export class AcmeService {
       ): Promise<{ recordReq?: any; recordRes?: any; dnsProvider?: any; challenge: Challenge; keyAuthorization: string }> => {
         return await this.challengeCreateFn(authz, keyAuthorizationGetter, providers);
       },
-      challengeRemoveFn: async (
-        authz: acme.Authorization,
-        challenge: Challenge,
-        keyAuthorization: string,
-        recordReq: any,
-        recordRes: any,
-        dnsProvider: IDnsProvider
-      ): Promise<any> => {
+      challengeRemoveFn: async (authz: acme.Authorization, challenge: Challenge, keyAuthorization: string, recordReq: any, recordRes: any, dnsProvider: IDnsProvider): Promise<any> => {
         return await this.challengeRemoveFn(authz, challenge, keyAuthorization, recordReq, recordRes, dnsProvider, httpUploader);
       },
       signal: this.options.signal,

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

@@ -0,0 +1,188 @@
+import { AbstractTaskPlugin, IContext, Step, TaskInput, TaskOutput } from "@certd/pipeline";
+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";
+export const EVENT_CERT_APPLY_SUCCESS = "CertApply.success";
+
+export abstract class CertApplyBaseConvertPlugin extends AbstractTaskPlugin {
+  @TaskInput({
+    title: "域名",
+    component: {
+      name: "a-select",
+      vModel: "value",
+      mode: "tags",
+      open: false,
+      placeholder: "foo.com / *.foo.com / *.bar.com",
+      tokenSeparators: [",", " ", "，", "、", "|"],
+    },
+    rules: [{ type: "domains" }],
+    required: true,
+    col: {
+      span: 24,
+    },
+    order: -999,
+    helper:
+      "1、支持多个域名打到一个证书上，例如： foo.com，*.foo.com，*.bar.com\n" +
+      "2、子域名被通配符包含的不要填写，例如：www.foo.com已经被*.foo.com包含，不要填写www.foo.com\n" +
+      "3、泛域名只能通配*号那一级（*.foo.com的证书不能用于xxx.yyy.foo.com、不能用于foo.com）\n" +
+      "4、输入一个，空格之后，再输入下一个",
+  })
+  domains!: string[];
+
+  @TaskInput({
+    title: "证书加密密码",
+    component: {
+      name: "input-password",
+      vModel: "value",
+    },
+    required: false,
+    order: 100,
+    helper: "转换成PFX、jks格式证书是否需要加密\njks必须设置密码，不传则默认123456\npfx不传则为空密码",
+  })
+  pfxPassword!: string;
+
+  @TaskInput({
+    title: "PFX证书转换参数",
+    value: "-macalg SHA1 -keypbe PBE-SHA1-3DES -certpbe PBE-SHA1-3DES",
+    component: {
+      name: "a-auto-complete",
+      vModel: "value",
+      options: [
+        { value: "", label: "兼容 Windows Server 最新" },
+        { value: "-macalg SHA1 -keypbe PBE-SHA1-3DES -certpbe PBE-SHA1-3DES", label: "兼容 Windows Server 2016" },
+        { value: "-nomac -keypbe PBE-SHA1-3DES -certpbe PBE-SHA1-3DES", label: "兼容 Windows Server 2008" },
+      ],
+    },
+    required: false,
+    order: 100,
+    helper: "兼容Windows Server各个版本",
+  })
+  pfxArgs = "-macalg SHA1 -keypbe PBE-SHA1-3DES -certpbe PBE-SHA1-3DES";
+
+  userContext!: IContext;
+  lastStatus!: Step;
+
+  @TaskOutput({
+    title: "域名证书",
+  })
+  cert?: CertInfo;
+
+  async onInstance() {
+    this.userContext = this.ctx.userContext;
+    this.lastStatus = this.ctx.lastStatus as Step;
+    await this.onInit();
+  }
+
+  abstract onInit(): Promise<void>;
+
+  //必须output之后执行
+  async emitCertApplySuccess() {
+    const emitter = this.ctx.emitter;
+    const value = {
+      cert: this.cert,
+      file: this._result.files[0].path,
+    };
+    await emitter.emit(EVENT_CERT_APPLY_SUCCESS, value);
+  }
+
+  async output(certReader: CertReader, isNew: boolean) {
+    const cert: CertInfo = certReader.toCertInfo();
+    this.cert = cert;
+
+    this._result.pipelineVars.certExpiresTime = dayjs(certReader.detail.notAfter).valueOf();
+    if (!this._result.pipelinePrivateVars) {
+      this._result.pipelinePrivateVars = {};
+    }
+    this._result.pipelinePrivateVars.cert = cert;
+
+    if (isNew) {
+      try {
+        const converter = new CertConverter({ logger: this.logger });
+        const res = await converter.convert({
+          cert,
+          pfxPassword: this.pfxPassword,
+          pfxArgs: this.pfxArgs,
+        });
+        if (cert.pfx == null && res.pfx) {
+          cert.pfx = res.pfx;
+        }
+
+        if (cert.der == null && res.der) {
+          cert.der = res.der;
+        }
+
+        if (cert.jks == null && res.jks) {
+          cert.jks = res.jks;
+        }
+
+        this.logger.info("转换证书格式成功");
+      } catch (e) {
+        this.logger.error("转换证书格式失败", e);
+      }
+    }
+
+    if (isNew) {
+      const zipFileName = certReader.buildCertFileName("zip", certReader.detail.notBefore);
+      await this.zipCert(cert, zipFileName);
+    } else {
+      this.extendsFiles();
+    }
+  }
+
+  async zipCert(cert: CertInfo, filename: string) {
+    const zip = new JSZip();
+    zip.file("证书.pem", cert.crt);
+    zip.file("私钥.pem", cert.key);
+    zip.file("中间证书.pem", cert.ic);
+    zip.file("cert.crt", cert.crt);
+    zip.file("cert.key", cert.key);
+    zip.file("intermediate.crt", cert.ic);
+    zip.file("origin.crt", cert.oc);
+    zip.file("one.pem", cert.one);
+    if (cert.pfx) {
+      zip.file("cert.pfx", Buffer.from(cert.pfx, "base64"));
+    }
+    if (cert.der) {
+      zip.file("cert.der", Buffer.from(cert.der, "base64"));
+    }
+    if (cert.jks) {
+      zip.file("cert.jks", Buffer.from(cert.jks, "base64"));
+    }
+
+    zip.file(
+      "说明.txt",
+      `证书文件说明
+cert.crt：证书文件，包含证书链，pem格式
+cert.key：私钥文件，pem格式
+intermediate.crt：中间证书文件，pem格式
+origin.crt：原始证书文件，不含证书链，pem格式
+one.pem： 证书和私钥简单合并成一个文件，pem格式，crt正文+key正文
+cert.pfx：pfx格式证书文件，iis服务器使用
+cert.der：der格式证书文件
+cert.jks：jks格式证书文件，java服务器使用
+    `
+    );
+
+    const content = await zip.generateAsync({ type: "nodebuffer" });
+    this.saveFile(filename, content);
+    this.logger.info(`已保存文件:${filename}`);
+  }
+
+  formatCert(pem: string) {
+    pem = pem.replace(/\r/g, "");
+    pem = pem.replace(/\n\n/g, "\n");
+    pem = pem.replace(/\n$/g, "");
+    return pem;
+  }
+
+  formatCerts(cert: { crt: string; key: string; csr: string }) {
+    const newCert: CertInfo = {
+      crt: this.formatCert(cert.crt),
+      key: this.formatCert(cert.key),
+      csr: this.formatCert(cert.csr),
+    };
+    return newCert;
+  }
+}

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

@@ -1,42 +1,10 @@
-import { AbstractTaskPlugin, IContext, NotificationBody, Step, TaskEmitter, TaskInput, TaskOutput } from "@certd/pipeline";
+import { NotificationBody, Step, TaskInput } from "@certd/pipeline";
 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 { pick } from "lodash-es";
+import { CertApplyBaseConvertPlugin } from "./base-convert.js";
 
-export const EVENT_CERT_APPLY_SUCCESS = "CertApply.success";
-
-export async function emitCertApplySuccess(emitter: TaskEmitter, cert: CertReader) {
-  await emitter.emit(EVENT_CERT_APPLY_SUCCESS, cert);
-}
-
-export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
-  @TaskInput({
-    title: "域名",
-    component: {
-      name: "a-select",
-      vModel: "value",
-      mode: "tags",
-      open: false,
-      placeholder: "foo.com / *.foo.com / *.bar.com",
-      tokenSeparators: [",", " ", "，", "、", "|"],
-    },
-    rules: [{ type: "domains" }],
-    required: true,
-    col: {
-      span: 24,
-    },
-    order: -999,
-    helper:
-      "1、支持多个域名打到一个证书上，例如： foo.com，*.foo.com，*.bar.com\n" +
-      "2、子域名被通配符包含的不要填写，例如：www.foo.com已经被*.foo.com包含，不要填写www.foo.com\n" +
-      "3、泛域名只能通配*号那一级（*.foo.com的证书不能用于xxx.yyy.foo.com、不能用于foo.com）\n" +
-      "4、输入一个，空格之后，再输入下一个",
-  })
-  domains!: string[];
-
+export abstract class CertApplyBasePlugin extends CertApplyBaseConvertPlugin {
   @TaskInput({
     title: "邮箱",
     component: {
@@ -50,36 +18,6 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
   })
   email!: string;
 
-  @TaskInput({
-    title: "证书密码",
-    component: {
-      name: "input-password",
-      vModel: "value",
-    },
-    required: false,
-    order: 100,
-    helper: "PFX、jks格式证书是否加密\njks必须设置密码，不传则默认123456\npfx不传则为空密码",
-  })
-  pfxPassword!: string;
-
-  @TaskInput({
-    title: "PFX证书转换参数",
-    value: "-macalg SHA1 -keypbe PBE-SHA1-3DES -certpbe PBE-SHA1-3DES",
-    component: {
-      name: "a-auto-complete",
-      vModel: "value",
-      options: [
-        { value: "", label: "兼容 Windows Server 最新" },
-        { value: "-macalg SHA1 -keypbe PBE-SHA1-3DES -certpbe PBE-SHA1-3DES", label: "兼容 Windows Server 2016" },
-        { value: "-nomac -keypbe PBE-SHA1-3DES -certpbe PBE-SHA1-3DES", label: "兼容 Windows Server 2008" },
-      ],
-    },
-    required: false,
-    order: 100,
-    helper: "兼容Windows Server各个版本",
-  })
-  pfxArgs = "-macalg SHA1 -keypbe PBE-SHA1-3DES -certpbe PBE-SHA1-3DES";
-
   @TaskInput({
     title: "更新天数",
     value: 35,
@@ -111,14 +49,6 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
   // })
   csrInfo!: string;
 
-  userContext!: IContext;
-  lastStatus!: Step;
-
-  @TaskOutput({
-    title: "域名证书",
-  })
-  cert?: CertInfo;
-
   async onInstance() {
     this.userContext = this.ctx.userContext;
     this.lastStatus = this.ctx.lastStatus as Step;
@@ -139,7 +69,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
     if (cert != null) {
       await this.output(cert, true);
 
-      await emitCertApplySuccess(this.ctx.emitter, cert);
+      await this.emitCertApplySuccess();
       //清空后续任务的状态，让后续任务能够重新执行
       this.clearLastStatus();
 
@@ -151,89 +81,6 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
     }
   }
 
-  async output(certReader: CertReader, isNew: boolean) {
-    const cert: CertInfo = certReader.toCertInfo();
-    this.cert = cert;
-
-    this._result.pipelineVars.certExpiresTime = dayjs(certReader.detail.notAfter).valueOf();
-    if (!this._result.pipelinePrivateVars) {
-      this._result.pipelinePrivateVars = {};
-    }
-    this._result.pipelinePrivateVars.cert = cert;
-
-    if (isNew) {
-      try {
-        const converter = new CertConverter({ logger: this.logger });
-        const res = await converter.convert({
-          cert,
-          pfxPassword: this.pfxPassword,
-          pfxArgs: this.pfxArgs,
-        });
-        if (cert.pfx == null && res.pfx) {
-          cert.pfx = res.pfx;
-        }
-
-        if (cert.der == null && res.der) {
-          cert.der = res.der;
-        }
-
-        if (cert.jks == null && res.jks) {
-          cert.jks = res.jks;
-        }
-
-        this.logger.info("转换证书格式成功");
-      } catch (e) {
-        this.logger.error("转换证书格式失败", e);
-      }
-    }
-
-    if (isNew) {
-      const zipFileName = certReader.buildCertFileName("zip", certReader.detail.notBefore);
-      await this.zipCert(cert, zipFileName);
-    } else {
-      this.extendsFiles();
-    }
-  }
-
-  async zipCert(cert: CertInfo, filename: string) {
-    const zip = new JSZip();
-    zip.file("证书.pem", cert.crt);
-    zip.file("私钥.pem", cert.key);
-    zip.file("中间证书.pem", cert.ic);
-    zip.file("cert.crt", cert.crt);
-    zip.file("cert.key", cert.key);
-    zip.file("intermediate.crt", cert.ic);
-    zip.file("origin.crt", cert.oc);
-    zip.file("one.pem", cert.one);
-    if (cert.pfx) {
-      zip.file("cert.pfx", Buffer.from(cert.pfx, "base64"));
-    }
-    if (cert.der) {
-      zip.file("cert.der", Buffer.from(cert.der, "base64"));
-    }
-    if (cert.jks) {
-      zip.file("cert.jks", Buffer.from(cert.jks, "base64"));
-    }
-
-    zip.file(
-      "说明.txt",
-      `证书文件说明
-cert.crt：证书文件，包含证书链，pem格式
-cert.key：私钥文件，pem格式
-intermediate.crt：中间证书文件，pem格式
-origin.crt：原始证书文件，不含证书链，pem格式
-one.pem： 证书和私钥简单合并成一个文件，pem格式，crt正文+key正文
-cert.pfx：pfx格式证书文件，iis服务器使用
-cert.der：der格式证书文件
-cert.jks：jks格式证书文件，java服务器使用
-    `
-    );
-
-    const content = await zip.generateAsync({ type: "nodebuffer" });
-    this.saveFile(filename, content);
-    this.logger.info(`已保存文件:${filename}`);
-  }
-
   /**
    * 是否更新证书
    */
@@ -279,22 +126,6 @@ cert.jks：jks格式证书文件，java服务器使用
     return null;
   }
 
-  formatCert(pem: string) {
-    pem = pem.replace(/\r/g, "");
-    pem = pem.replace(/\n\n/g, "\n");
-    pem = pem.replace(/\n$/g, "");
-    return pem;
-  }
-
-  formatCerts(cert: { crt: string; key: string; csr: string }) {
-    const newCert: CertInfo = {
-      crt: this.formatCert(cert.crt),
-      key: this.formatCert(cert.key),
-      csr: this.formatCert(cert.csr),
-    };
-    return newCert;
-  }
-
   async readLastCert(): Promise<CertReader | undefined> {
     const cert = this.lastStatus?.status?.output?.cert;
     if (cert == null) {

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

@@ -23,6 +23,7 @@ export class CertReader {
   cert: CertInfo;
 
   detail: CertificateInfo;
+  //毫秒时间戳
   expires: number;
   constructor(certInfo: CertInfo) {
     this.cert = certInfo;
@@ -39,9 +40,13 @@ export class CertReader {
       this.cert.one = this.cert.crt + "\n" + this.cert.key;
     }
 
-    const { detail, expires } = this.getCrtDetail(this.cert.crt);
-    this.detail = detail;
-    this.expires = expires.getTime();
+    try {
+      const { detail, expires } = this.getCrtDetail(this.cert.crt);
+      this.detail = detail;
+      this.expires = expires.getTime();
+    } catch (e) {
+      throw new Error("证书解析失败:" + e.message);
+    }
   }
 
   getIc() {

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

@@ -0,0 +1,158 @@
+import { IsTaskPlugin, pluginGroups, RunStrategy, Step, TaskInput, TaskOutput } from "@certd/pipeline";
+import type { CertInfo } from "../acme.js";
+import { CertReader } from "../cert-reader.js";
+import { CertApplyBaseConvertPlugin } from "../base-convert.js";
+import dayjs from "dayjs";
+
+export { CertReader };
+export type { CertInfo };
+@IsTaskPlugin({
+  name: "CertApplyUpload",
+  icon: "ph:certificate",
+  title: "证书手动上传",
+  group: pluginGroups.cert.key,
+  desc: "在证书仓库手动上传后触发部署证书",
+  default: {
+    strategy: {
+      runStrategy: RunStrategy.AlwaysRun,
+    },
+  },
+  shortcut: {
+    certUpdate: {
+      title: "更新证书",
+      icon: "ion:upload",
+      action: "onCertUpdate",
+      form: {
+        columns: {
+          crt: {
+            title: "证书",
+            type: "text",
+            form: {
+              component: {
+                name: "pem-input",
+                vModel: "modelValue",
+                textarea: {
+                  rows: 4,
+                  placeholder: "-----BEGIN CERTIFICATE-----\n...\n...\n-----END CERTIFICATE-----",
+                },
+              },
+              rules: [{ required: true, message: "此项必填" }],
+              col: { span: 24 },
+            },
+          },
+          key: {
+            title: "私钥",
+            type: "text",
+            form: {
+              component: {
+                name: "pem-input",
+                vModel: "modelValue",
+                textarea: {
+                  rows: 4,
+                  placeholder: "-----BEGIN PRIVATE KEY-----\n...\n...\n-----END PRIVATE KEY----- ",
+                },
+              },
+              rules: [{ required: true, message: "此项必填" }],
+              col: { span: 24 },
+            },
+          },
+        },
+      },
+    },
+  },
+})
+export class CertApplyUploadPlugin extends CertApplyBaseConvertPlugin {
+  @TaskInput({
+    title: "手动上传证书",
+    component: {
+      name: "cert-info-updater",
+      vModel: "modelValue",
+    },
+    helper: "手动上传证书",
+    order: -9999,
+    required: true,
+    mergeScript: `
+    return {
+      component:{
+        on:{
+          updated(scope){
+            scope.form.input.domains = scope.$event?.domains
+          }
+        }
+      }
+    }
+    `,
+  })
+  uploadCert!: CertInfo;
+
+  @TaskOutput({
+    title: "证书MD5",
+  })
+  certMd5?: string;
+
+  async onInstance() {
+    this.accessService = this.ctx.accessService;
+    this.logger = this.ctx.logger;
+    this.userContext = this.ctx.userContext;
+    this.lastStatus = this.ctx.lastStatus as Step;
+  }
+  async onInit(): Promise<void> {}
+
+  async getCertFromStore() {
+    const certReader = new CertReader(this.uploadCert);
+    if (!certReader.expires && certReader.expires < new Date().getTime()) {
+      throw new Error("证书已过期，停止部署，请重新上传证书");
+    }
+
+    return certReader;
+  }
+
+  async execute(): Promise<string | void> {
+    const certReader = await this.getCertFromStore();
+    const crtMd5 = this.ctx.utils.hash.md5(certReader.cert.crt);
+
+    const leftDays = dayjs(certReader.expires).diff(dayjs(), "day");
+    this.logger.info(`证书过期时间${dayjs(certReader.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${leftDays}天`);
+
+    if (!this.ctx.inputChanged) {
+      this.logger.info("输入参数无变化");
+      const lastCrtMd5 = this.lastStatus?.status?.output?.certMd5;
+      this.logger.info("证书MD5", crtMd5);
+      this.logger.info("上次证书MD5", lastCrtMd5);
+      if (lastCrtMd5 === crtMd5) {
+        this.logger.info("证书无变化，跳过");
+        //输出证书MD5
+        this.certMd5 = crtMd5;
+        await this.output(certReader, false);
+        return "skip";
+      }
+      this.logger.info("证书有变化，重新部署");
+    } else {
+      this.logger.info("输入参数有变化，重新部署");
+    }
+
+    this.clearLastStatus();
+    //输出证书MD5
+    this.certMd5 = crtMd5;
+    await this.output(certReader, true);
+
+    //必须output之后执行
+    await this.emitCertApplySuccess();
+    return;
+  }
+
+  async onCertUpdate(data: any) {
+    const certReader = new CertReader(data);
+    return {
+      input: {
+        uploadCert: {
+          crt: data.crt,
+          key: data.key,
+        },
+        domains: certReader.getAllDomains(),
+      },
+    };
+  }
+}
+
+new CertApplyUploadPlugin();

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

@@ -66,7 +66,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
       ],
     },
     required: true,
-    helper: `DNS直接验证：域名是在阿里云、腾讯云、华为云、Cloudflare、NameSilo、西数注册的，选它；
+    helper: `DNS直接验证：域名是在阿里云、腾讯云、华为云、Cloudflare、NameSilo、西数、dns.la注册的，选它；
 CNAME代理验证：支持任何注册商注册的域名，但第一次需要手动添加CNAME记录；
 HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
   })
@@ -203,8 +203,7 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
     },
     maybeNeed: true,
     required: false,
-    helper:
-      "google服务账号授权与EAB授权选填其中一个，[服务账号授权获取方法](https://certd.docmirror.cn/guide/use/google/)\n服务账号授权需要配置代理或者服务器本身在海外",
+    helper: "google服务账号授权与EAB授权选填其中一个，[服务账号授权获取方法](https://certd.docmirror.cn/guide/use/google/)\n服务账号授权需要配置代理或者服务器本身在海外",
     mergeScript: `
     return {
         show: ctx.compute(({form})=>{
@@ -268,6 +267,17 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
   })
   skipLocalVerify = false;
 
+  @TaskInput({
+    title: "检查解析重试次数",
+    value: 35,
+    component: {
+      name: "a-input-number",
+      vModel: "value",
+    },
+    helper: "检查域名验证解析记录重试次数，如果你的域名服务商解析生效速度慢，可以适当增加此值",
+  })
+  maxCheckRetryCount = 35;
+
   acme!: AcmeService;
 
   eab!: EabAccess;
@@ -314,6 +324,7 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
       reverseProxy: this.reverseProxy,
       privateKeyType: this.privateKeyType,
       signal: this.ctx.signal,
+      maxCheckRetryCount: this.maxCheckRetryCount,
       // cnameProxyService: this.ctx.cnameProxyService,
       // dnsProviderCreator: this.createDnsProvider.bind(this),
     });

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

@@ -1,2 +1,6 @@
+export { EVENT_CERT_APPLY_SUCCESS } from "./cert-plugin/base-convert.js";
+
 export * from "./cert-plugin/index.js";
 export * from "./cert-plugin/lego/index.js";
+export * from "./cert-plugin/custom/index.js";
+export const CertApplyPluginNames = ["CertApply", "CertApplyLego", "CertApplyUpload"];

packages/plugins/plugin-lib/.eslintrc

@@ -17,7 +17,6 @@
     "@typescript-eslint/ban-ts-ignore": "off",
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-empty-function": "off",
-//    "no-unused-expressions": "off",
-    "max-len": [0, 160, 2, { "ignoreUrls": true }]
+    "@typescript-eslint/no-unused-vars": "off"
   }
 }

packages/plugins/plugin-lib/.prettierrc

@@ -1,3 +1,7 @@
 {
-  "printWidth": 160
+  "printWidth": 220,
+  "bracketSpacing": true,
+  "singleQuote": false,
+  "trailingComma": "es5",
+  "arrowParens": "avoid"
 }

packages/plugins/plugin-lib/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.31.4](https://github.com/certd/certd/compare/v1.31.3...v1.31.4) (2025-03-21)
+
+### Performance Improvements
+
+* 流水线增加上传证书快捷方式 ([425bba6](https://github.com/certd/certd/commit/425bba67c539b734e2a85a83a4f9ecc9b2434fb4))
+
+## [1.31.3](https://github.com/certd/certd/compare/v1.31.2...v1.31.3) (2025-03-13)
+
+### Performance Improvements
+
+* 支持部署到天翼云CDN ([82a72e0](https://github.com/certd/certd/commit/82a72e0b497efa043d342ad0e33c083a2de79a05))
+
 ## [1.31.2](https://github.com/certd/certd/compare/v1.31.1...v1.31.2) (2025-03-12)
 
 **Note:** Version bump only for package @certd/plugin-lib

packages/plugins/plugin-lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-lib",
   "private": false,
-  "version": "1.31.2",
+  "version": "1.31.4",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -16,8 +16,8 @@
   },
   "dependencies": {
     "@alicloud/pop-core": "^1.7.10",
-    "@certd/basic": "^1.31.2",
-    "@certd/pipeline": "^1.31.2",
+    "@certd/basic": "^1.31.4",
+    "@certd/pipeline": "^1.31.4",
     "@kubernetes/client-node": "0.21.0",
     "ali-oss": "^6.21.0",
     "basic-ftp": "^5.0.5",
@@ -37,8 +37,8 @@
     "@types/chai": "^4.3.3",
     "@types/mocha": "^10.0.0",
     "@types/psl": "^1.1.3",
-    "@typescript-eslint/eslint-plugin": "^5.38.1",
-    "@typescript-eslint/parser": "^5.38.1",
+    "@typescript-eslint/eslint-plugin": "^8.26.1",
+    "@typescript-eslint/parser": "^8.26.1",
     "chai": "^4.3.6",
     "eslint": "^8.24.0",
     "eslint-config-prettier": "^8.5.0",
@@ -48,5 +48,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "2a4d64af9502881e2e553ea86a4479158cfa8918"
+  "gitHead": "cfbbac9796477f830e1f57f77777f6554da9e31d"
 }

packages/plugins/plugin-lib/src/ctyun/access/ctyun-access.ts

@@ -0,0 +1,31 @@
+import { IsAccess, AccessInput, BaseAccess } from "@certd/pipeline";
+
+@IsAccess({
+  name: "ctyun",
+  title: "天翼云授权",
+  desc: "",
+  icon: "ant-design:aliyun-outlined",
+})
+export class CtyunAccess extends BaseAccess {
+  @AccessInput({
+    title: "accessKeyId",
+    component: {
+      placeholder: "accessKeyId",
+    },
+    helper: "[前往创建天翼云AccessKey](https://iam.ctyun.cn/myAccessKey)",
+    required: true,
+  })
+  accessKeyId = "";
+  @AccessInput({
+    title: "securityKey",
+    component: {
+      placeholder: "securityKey",
+    },
+    required: true,
+    encrypt: true,
+    helper: "",
+  })
+  securityKey = "";
+}
+
+new CtyunAccess();

packages/plugins/plugin-lib/src/ctyun/index.ts

@@ -0,0 +1 @@
+export * from "./access/ctyun-access.js";

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

@@ -4,3 +4,4 @@ export * from "./common/index.js";
 export * from "./ftp/index.js";
 export * from "./tencent/index.js";
 export * from "./qiniu/index.js";
+export * from "./ctyun/index.js";

packages/plugins/plugin-lib/src/ssh/ssh.ts

@@ -61,7 +61,17 @@ export class AsyncSsh2Client {
             this.conn = conn;
             resolve(this.conn);
           })
-          .connect(this.connConf);
+          .connect({
+            ...this.connConf,
+            algorithms: {
+              kex: [
+                "ecdh-sha2-nistp256",
+                "diffie-hellman-group1-sha1",
+                "diffie-hellman-group14-sha1", // 示例：添加服务器支持的旧算法
+                "diffie-hellman-group-exchange-sha256",
+              ],
+            },
+          });
       } catch (e) {
         reject(e);
       }

packages/ui/certd-client/.eslintrc.js

@@ -3,34 +3,34 @@ module.exports = {
   env: {
     browser: true,
     node: true,
-    es6: true
+    es6: true,
   },
-  parser: "vue-eslint-parser",
+  parser: 'vue-eslint-parser',
   parserOptions: {
-    parser: "@typescript-eslint/parser",
+    parser: '@typescript-eslint/parser',
     ecmaVersion: 2020,
-    sourceType: "module",
-    jsxPragma: "React",
+    sourceType: 'module',
+    jsxPragma: 'React',
     ecmaFeatures: {
       jsx: true,
-      tsx: true
-    }
+      tsx: true,
+    },
   },
-  extends: ["plugin:vue/vue3-recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended", "prettier"],
+  extends: ['plugin:vue/vue3-recommended', 'plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended', 'prettier'],
   rules: {
     //"max-len": [0, 200, 2, { ignoreUrls: true }],
-    "@typescript-eslint/no-unused-vars": "off",
-    "no-unused-vars": "off",
-    "@typescript-eslint/ban-ts-ignore": "off",
-    "@typescript-eslint/ban-ts-comment": "off",
-    "@typescript-eslint/ban-types": "off",
-    "@typescript-eslint/explicit-function-return-type": "off",
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-var-requires": "off",
-    "@typescript-eslint/no-empty-function": "off",
-    "@typescript-eslint/no-use-before-define": "off",
-    "@typescript-eslint/no-non-null-assertion": "off",
-    "@typescript-eslint/explicit-module-boundary-types": "off"
+    '@typescript-eslint/no-unused-vars': 'off',
+    'no-unused-vars': 'off',
+    '@typescript-eslint/ban-ts-ignore': 'off',
+    '@typescript-eslint/ban-ts-comment': 'off',
+    '@typescript-eslint/ban-types': 'off',
+    '@typescript-eslint/explicit-function-return-type': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-var-requires': 'off',
+    '@typescript-eslint/no-empty-function': 'off',
+    '@typescript-eslint/no-use-before-define': 'off',
+    '@typescript-eslint/no-non-null-assertion': 'off',
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
     // "@typescript-eslint/no-unused-vars": [
     //   "error",
     //   {
@@ -69,5 +69,5 @@ module.exports = {
     //     math: "always",
     //   },
     // ],
-  }
+  },
 };

packages/ui/certd-client/.prettierrc

@@ -1,5 +1,7 @@
 {
-
-  "trailingComma": "none",
-  "printWidth": 220
+  "printWidth": 220,
+  "bracketSpacing": true,
+  "singleQuote": false,
+  "trailingComma": "es5",
+  "arrowParens": "avoid"
 }

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.31.4](https://github.com/certd/certd/compare/v1.31.3...v1.31.4) (2025-03-21)
+
+### Bug Fixes
+
+* 修复站点监控通知通过webhook发送失败的bug ([9be1ecc](https://github.com/certd/certd/commit/9be1ecc8aab3ea23dd0dc2dab3688f4edb90ef2c))
+
+### Performance Improvements
+
+* 宝塔支持doker站点证书部署 ([589a373](https://github.com/certd/certd/commit/589a373142ef7f50d64d3aa767a90b1f4b64da93))
+* 保存调整后的列宽 ([873f2b6](https://github.com/certd/certd/commit/873f2b618b9d7320045baf69d6da83afe48a780f))
+* 创建证书流水线时，支持更多参数展开 ([36aa7f8](https://github.com/certd/certd/commit/36aa7f82b078a053a102331b3c6f132fb9d492f9))
+* 流水线页面可以鼠标按住左右拖动 ([d85a02f](https://github.com/certd/certd/commit/d85a02feeb3183c5abd6c1ea790d5923a32d7271))
+* 流水线增加上传证书快捷方式 ([425bba6](https://github.com/certd/certd/commit/425bba67c539b734e2a85a83a4f9ecc9b2434fb4))
+* 手动上传证书部署流水线 ([fbb66f3](https://github.com/certd/certd/commit/fbb66f3c4389489aa8a43b194d82bc8cf391607b))
+* 优化选择任务时手机版展示效果 ([d01004d](https://github.com/certd/certd/commit/d01004d53071a75ac91ee21cc96bde9369f77ff3))
+* 站点证书监控支持模糊查询 ([0069c0e](https://github.com/certd/certd/commit/0069c0e3992946a8dd6410f299d4fc974ef0e76b))
+* 支持飞书通知 ([b82e1dc](https://github.com/certd/certd/commit/b82e1dcd6217b09a7d7e21cd648bb31de320cadf))
+* 支持手动上传证书并部署 ([a9fffa5](https://github.com/certd/certd/commit/a9fffa5180c83da27b35886aa2e858a92a2c5f94))
+
+## [1.31.3](https://github.com/certd/certd/compare/v1.31.2...v1.31.3) (2025-03-13)
+
+### Performance Improvements
+
+* 套餐支持3天7天等选项 ([0d71a8e](https://github.com/certd/certd/commit/0d71a8ee501a0e5bb69decf07e8729026e9d85bf))
+* 证书仓库增加有效期显示 ([be87124](https://github.com/certd/certd/commit/be87124ada7a093f281ca29a45c86b4ea4644ead))
+* 支持部署到天翼云CDN ([82a72e0](https://github.com/certd/certd/commit/82a72e0b497efa043d342ad0e33c083a2de79a05))
+
 ## [1.31.2](https://github.com/certd/certd/compare/v1.31.1...v1.31.2) (2025-03-12)
 
 **Note:** Version bump only for package @certd/ui-client

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.31.2",
+  "version": "1.31.4",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -67,6 +67,7 @@
     "lucide-vue-next": "^0.477.0",
     "mitt": "^3.0.1",
     "nanoid": "^4.0.0",
+    "node-forge": "^1.3.1",
     "nprogress": "^0.2.0",
     "object-assign": "^4.1.1",
     "pinia": "2.1.7",
@@ -95,8 +96,8 @@
     "zod-defaults": "^0.1.3"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.31.2",
-    "@certd/pipeline": "^1.31.2",
+    "@certd/lib-iframe": "^1.31.4",
+    "@certd/pipeline": "^1.31.4",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

packages/ui/certd-client/public/static/icons/demo_index.html

@@ -54,6 +54,18 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe61d;</span>
+                <div class="name">WAF-长亭-雷池</div>
+                <div class="code-name">&amp;#xe61d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe719;</span>
+                <div class="name">ctyun</div>
+                <div class="code-name">&amp;#xe719;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe610;</span>
                 <div class="name">华为</div>
@@ -108,7 +120,7 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.svg?t=1730278432006#iconfont') format('svg');
+  src: url('iconfont.svg?t=1741879397012#iconfont') format('svg');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -134,6 +146,24 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-WAF-changting-leichi"></span>
+            <div class="name">
+              WAF-长亭-雷池
+            </div>
+            <div class="code-name">.icon-WAF-changting-leichi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-ctyun"></span>
+            <div class="name">
+              ctyun
+            </div>
+            <div class="code-name">.icon-ctyun
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-huawei"></span>
             <div class="name">
@@ -215,6 +245,22 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-WAF-changting-leichi"></use>
+                </svg>
+                <div class="name">WAF-长亭-雷池</div>
+                <div class="code-name">#icon-WAF-changting-leichi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-ctyun"></use>
+                </svg>
+                <div class="name">ctyun</div>
+                <div class="code-name">#icon-ctyun</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-huawei"></use>

packages/ui/certd-client/public/static/icons/iconfont.css

@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4688792 */
-  src: url('iconfont.svg?t=1730278432006#iconfont') format('svg');
+  src: url('iconfont.svg?t=1741879397012#iconfont') format('svg');
 }
 
 .iconfont {
@@ -11,6 +11,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-WAF-changting-leichi:before {
+  content: "\e61d";
+}
+
+.icon-ctyun:before {
+  content: "\e719";
+}
+
 .icon-huawei:before {
   content: "\e610";
 }

packages/ui/certd-client/public/static/icons/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "35327761",
+      "name": "WAF-长亭-雷池",
+      "font_class": "WAF-changting-leichi",
+      "unicode": "e61d",
+      "unicode_decimal": 58909
+    },
+    {
+      "icon_id": "41854563",
+      "name": "ctyun",
+      "font_class": "ctyun",
+      "unicode": "e719",
+      "unicode_decimal": 59161
+    },
     {
       "icon_id": "24164616",
       "name": "华为",

packages/ui/certd-client/public/static/icons/iconfont.svg

@@ -14,6 +14,10 @@
     />
       <missing-glyph />
       
+      <glyph glyph-name="WAF-changting-leichi" unicode="&#58909;" d="M458.05659 855.665019l-349.292316-303.154973 259.503141-241.755022h134.916779l-255.153493 238.298606 264.046972 220.006779 311.077546-264.66835v-74.487732l92.507705-60.856244v180.510417l-349.136972 304.281221-103.537171 1.825298zM544.894217 454.565282h-24.505609l256.90112-238.881148-261.677966-224.822461-317.718528 265.056711v83.653063l-89.556158 57.36099v-175.267536l361.331523-309.32992h97.09037l344.593143 303.310317-260.085685 238.919984z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="ctyun" unicode="&#59161;" d="M274.334333 547.401c10.313 15.506 19.968 33.207 31.452 48.713 25.234 33.207 57.856 57.783 95.67 74.46a244.443 244.443 0 0 0 131.658 19.529c40.082-4.608 76.8-18.359 108.763-41.911 16.603-11.995 31.525-26.331 46.373-40.082 2.852-2.853 5.12-4.023 9.728-2.195 18.944 5.12 37.814 7.315 57.27 5.706 31.452-2.853 57.856-16.604 78.995-40.083 19.017-20.626 32.183-44.69 44.105-70.436 1.17-2.268 2.267-5.12 3.438-7.46 41.837-6.291 79.579-21.724 111.177-49.811 36.571-32.11 58.368-72.777 66.925-120.247 10.387-57.856 0.586-112.274-30.866-161.5-31.524-48.64-77.312-78.994-133.486-93.915-21.211-5.778-42.35-6.875-63.634-5.12a211.383 211.383 0 0 0-97.865 32.622 244.37 244.37 0 0 0-98.011 116.882c-7.315 18.871-11.338 39.497-17.116 58.953-1.17 4.023-2.194 5.779-6.875 5.779h-41.838a60.343 60.343 0 0 0-14.263 1.755c-12.654 3.438-14.921 17.189-5.193 28.672 7.387 8.558 15.506 16.603 22.894 24.576 19.529 20.553 38.912 41.253 58.44 61.294 6.876 6.802 13.167 14.92 20.627 20.553 11.996 9.143 21.724 8.046 32.037-2.853 33.792-34.377 68.169-68.68 101.376-103.131a39.717 39.717 0 0 0 8.557-17.7c1.756-7.388-4.534-13.752-14.336-14.337-8.557-0.585-17.115-0.585-25.746-0.585-3.438 0-5.705-0.585-6.29-4.608-2.268-30.281 4.535-57.198 27.502-77.824 17.7-16.018 39.497-24.576 64.073-26.916 25.16-2.853 48.713 2.194 71.607 10.971 10.971 3.95 18.285 11.922 25.746 20.48a133.12 133.12 0 0 1 32.695 59.611c8.557 39.498-0.585 74.46-26.917 105.326a121.125 121.125 0 0 1-73.289 40.74c-21.723 4.024-42.935 1.171-64.073-4.607-1.17-0.585-2.268-0.585-4.608-0.585 8.558 26.331 9.143 51.565-4.023 75.63a79.726 79.726 0 0 1-38.327 35.474c-28.087 12.58-70.436 13.165-103.131-32.037-6.29 11.995-12.58 24.576-19.968 36.06-28.672 43.52-68.17 72.191-119.15 80.75a137.509 137.509 0 0 1-113.371-28.088c-29.696-24.137-47.543-56.1-57.783-92.16a640 640 0 0 1-9.216-38.912 151.771 151.771 0 0 1-16.53 7.973 127.634 127.634 0 0 1-71.68 5.778c-24.577-5.193-47.47-14.921-66.926-30.94-25.82-21.21-41.838-47.542-45.86-80.749-4.609-37.303 2.852-71.68 25.745-101.376 17.774-24.137 42.35-38.327 70.949-44.617 16.091-3.511 32.695-5.193 49.298-5.852 27.502-1.097 54.419-0.512 81.92-0.512 77.824-0.585 156.307-0.585 234.204-0.585 6.29 0 10.24-1.755 13.75-7.46 21.724-34.377 50.396-61.22 84.7-82.432 1.17-0.585 2.267-1.756 5.193-4.023H290.864333c-42.934 0-85.357 6.363-124.854 24.649a227.474 227.474 0 0 0-61.88 41.838c-28.671 28.672-46.372 63.56-56.1 102.4-5.778 22.381-9.728 44.69-8.046 68.169 4.17 54.71 20.188 105.18 56.32 147.529a196.17 196.17 0 0 0 112.275 66.414c22.82 4.023 44.617 4.023 65.755 6.363z"  horiz-adv-x="1097" />
+      
       <glyph glyph-name="huawei" unicode="&#58896;" d="M418.325 157.246875Q310.4375 62.38125 238.38125 62.315625t-109.940625 89.128125l289.884375 5.85z m189.525 0l289.884375-5.803125Q859.8125 62.315625 787.79375 62.315625T607.85 157.29375zM46.915625 405.46875q166.875-89.0625 214.209375-117.50625t161.146875-102.075q-181.03125-11.25-236.953125-0.3c-42.646875 8.334375-75.84375 26.521875-104.26875 54.99375Q24.29375 297.3375 46.915625 405.46875z m932.34375 0Q1001.9 297.365625 945.125 240.5625c-28.415625-28.471875-61.6125-46.659375-104.26875-54.99375q-55.9125-10.96875-236.90625 0.3 113.690625 73.640625 161.109375 102.075t214.2 117.525zM183.3875 649.996875q87.2625-115.65 119.446875-164.94375t145.3125-265.66875Q225.0125 319.734375 137.9375 418.6875c-41.709375 47.38125-41.709375 125.11875 5.625 191.465625q10.3125 14.4375 39.815625 39.815625z m659.353125 0q29.540625-25.40625 39.815625-39.815625c47.38125-66.346875 47.38125-144.046875 5.68125-191.49375q-87.075-99-310.3125-199.33125 113.11875 216.375 145.3125 265.715625t119.503125 164.925zM445.0625 784.575q43.603125-128.925 49.275-181.96875T484.878125 246.1875Q295.259375 519.159375 295.259375 642.384375T445.0625 784.575z m136.134375 0Q730.953125 765.5625 730.953125 642.384375T541.38125 246.1875q-15.159375 303.328125-9.459375 356.4t49.275 181.96875z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="qiniuyun" unicode="&#58883;" d="M102.32915 778.142528a661.623328 661.623328 0 0 1 49.120892-88.136914 760.040544 760.040544 0 0 1 69.962185-90.59296c5.719075-10.315387 17.157226-14.876613 22.911387-26.349849 10.280301-9.157538 20.595688-19.437839 30.911076-29.753227a959.716971 959.716971 0 0 1 112.276324-81.295076c16.034462-9.192624 30.946162-17.192312 46.980625-25.192 3.508635-4.596312 1.122763-9.192624 2.280613-13.75385 5.719075-33.226775 7.999688-67.576313 12.596-100.768001 2.280613-19.472925 3.508635-40.103699 6.841838-59.646798 5.754161-33.226775 9.192624-67.576313 13.75385-100.803087 5.719075-37.788 9.157538-75.540915 16.034463-113.328915 3.508635-18.350162 13.75385-33.226775 21.753538-50.419087 2.280613-3.508635 5.719075-5.719075 8.034774-10.280301 29.753226-37.788 69.821839-53.822463 117.925228-53.822463h269.112315c68.699076 0 116.802464 33.191689 143.152313 97.329538 12.596 30.911076 14.876613 64.13785 18.315076 96.206777l24.034151 195.816927c2.315699 10.280301-1.122763 11.438151-10.280301 11.438151-22.911388 0-43.542162-5.719075-64.137851-13.753851-16.034462-4.561225-26.34985-16.034462-37.788-26.34985a19.893961 19.893961 0 0 1-7.999689-5.719075c-8.034775-12.596-18.350162-22.911388-22.911387-36.63015a385.142879 385.142879 0 0 1-13.75385-38.945851c-9.157538-32.033839-18.315076-65.260614-27.472613-98.452301-3.508635-16.034462-12.596-27.507699-22.911387-40.103701a38.349382 38.349382 0 0 0-27.472613-12.596c-56.138162-3.508635-111.083389-2.280613-167.186465-1.122763a54.52419 54.52419 0 0 0-46.980625 28.595377c-7.999688 13.75385-11.438151 27.507699-14.876612 42.384312-4.561225 20.630775-13.718763 40.068613-16.034463 61.857237a10.525905 10.525905 0 0 0-1.122764 5.683989c-16.034462 59.646798-33.226775 117.960313-49.120891 177.501852-1.122763 3.508635-3.508635 7.01727-1.122764 9.157538 2.280613 3.508635 6.841839 1.15785 10.280301 0a623.554637 623.554637 0 0 1 66.418464-13.718763 761.163308 761.163308 0 0 1 191.255702-5.719076 408.334958 408.334958 0 0 1 73.295387 12.596c19.472925 7.999688 40.068613 11.438151 60.664302 17.157226 26.34985 8.034775 51.54185 18.315076 77.8917 27.5077 11.438151 5.719075 24.034151 11.438151 35.472301 17.157226a787.337726 787.337726 0 0 1 84.768625 50.384c4.561225 3.508635 9.157538 9.157538 13.718764 11.473237 12.596 7.01727 22.911388 15.999376 34.349538 24.034151a49.120892 49.120892 0 0 1 19.472925 14.876613c5.719075 8.034775 13.75385 13.75385 20.630775 20.595688s14.876613 12.631087 20.595688 20.630775c5.719075 7.01727 13.75385 13.75385 20.630774 20.595688s7.01727 16.069549 16.034463 20.630775c7.01727 4.561225 10.280301 12.596 16.034462 18.315075 2.280613 2.280613 4.561225 3.508635 5.719076 5.754162 1.122763 3.508635 3.508635 5.719075 4.561225 9.157538 13.75385 16.034462 24.069237 35.472301 36.665237 53.787376 10.280301 14.911699 16.034462 30.946162 26.314765 44.700012 1.15785 3.508635 0 7.01727 2.315699 10.280301 12.596 17.192312 18.315076 37.788 26.314763 57.260925 3.508635 7.01727 1.15785 9.157538-5.719075 9.157538-7.999688 1.15785-16.034462 2.280613-21.753538-4.596312-1.15785-2.280613-3.508635-2.280613-5.719076-2.280613a14.455577 14.455577 0 0 1-14.876612-7.999688c-8.034775-13.75385-25.227087-21.753538-28.630464-38.94585h-1.157849c-8.034775 3.508635-11.438151-3.508635-14.876613-7.999688a670.149312 670.149312 0 0 0-67.576313-60.699388 702.112978 702.112978 0 0 0-59.646797-42.384313c-26.34985-16.034462-50.384-33.191689-79.014463-44.629838-1.15785-1.15785-2.280613-2.315699-2.280614-3.508636 0-3.508635-2.315699-2.315699-4.596311-2.315699a16.104635 16.104635 0 0 1-7.01727-2.280613c-30.911076-18.315076-65.260614-30.911076-98.452303-42.384312-46.980625-17.157226-97.364625-27.472613-146.590775-34.349538a478.472574 478.472574 0 0 0-69.856926-5.719076c-56.138162 0-111.083389-2.280613-167.186465 8.034775a1064.660247 1064.660247 0 0 0-116.802464 26.314764 8.385638 8.385638 0 0 0-7.01727 8.034774 125.679311 125.679311 0 0 1-8.034775 29.753226c-11.438151 37.788-15.999376 77.856614-36.630151 113.364001-1.15785 1.15785-2.280613 1.15785-4.596311 1.15785a1.122763 1.122763 0 0 1-1.122763-1.15785v2.315699c-8.034775 10.315387-20.630775 14.876613-33.191689 17.157227-14.911699 3.508635-19.472925-1.122763-17.192313-14.876614 4.596312-35.507388 7.999688-72.137538 13.718765-108.767689 1.15785-2.280613 2.315699-5.719075-1.122764-6.841839a7.227788 7.227788 0 0 0-7.017271 0c-16.034462 9.157538-30.911076 17.157226-46.945538 25.192-21.753538 10.280301-41.226463 24.034151-60.699388 36.630152-9.157538 4.596312-16.034462 11.438151-24.03415 17.157225a581.661533 581.661533 0 0 0-76.733851 62.980002 417.176718 417.176718 0 0 0-63.155433 64.13785A46.770107 46.770107 0 0 1 96.08378 832.877237C82.365016 832.877237 78.926554 828.280925 84.645629 815.684924z"  horiz-adv-x="1525" />

packages/ui/certd-client/src/App.vue

@@ -1,7 +1,7 @@
 <template>
   <AConfigProvider :locale="locale" :theme="tokenTheme">
-    <contextHolder />
     <fs-form-provider>
+      <contextHolder />
       <router-view />
     </fs-form-provider>
   </AConfigProvider>
@@ -21,7 +21,7 @@ import AConfigProvider from "ant-design-vue/es/config-provider";
 import { Modal } from "ant-design-vue";
 
 defineOptions({
-  name: "App"
+  name: "App",
 });
 const [modal, contextHolder] = Modal.useModal();
 provide("modal", modal);
@@ -59,7 +59,7 @@ const tokenTheme = computed(() => {
 
   return {
     algorithm,
-    token: tokens
+    token: tokens,
   };
 });
 //其他初始化

packages/ui/certd-client/src/components/file-input.vue

@@ -0,0 +1,27 @@
+<template>
+  <div class="file-input">
+    <a-button :type="type" @click="onClick">{{ text }}</a-button> {{ fileName }}
+    <div class="hidden">
+      <input ref="fileInputRef" type="file" @change="onFileChange" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, defineEmits, defineProps } from "vue";
+const fileInputRef = ref<HTMLInputElement | null>(null);
+
+const props = defineProps<{
+  text: string;
+  type: string;
+}>();
+const fileName = ref("");
+const emit = defineEmits(["change"]);
+function onClick() {
+  fileInputRef.value.click();
+}
+function onFileChange(e: any) {
+  fileName.value = e.target.files[0].name;
+  emit("change", e);
+}
+</script>

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

@@ -10,10 +10,14 @@ import Plugins from "./plugins/index";
 import LoadingButton from "./loading-button.vue";
 import IconSelect from "./icon-select.vue";
 import ExpiresTimeText from "./expires-time-text.vue";
+import FileInput from "./file-input.vue";
+import PemInput from "./pem-input.vue";
 export default {
   install(app: any) {
     app.component("PiContainer", PiContainer);
     app.component("TextEditable", TextEditable);
+    app.component("FileInput", FileInput);
+    app.component("PemInput", PemInput);
 
     app.component("CronLight", CronLight);
     app.component("CronEditor", CronEditor);
@@ -29,5 +33,5 @@ export default {
     app.component("ExpiresTimeText", ExpiresTimeText);
     app.use(vip);
     app.use(Plugins);
-  }
+  },
 };

packages/ui/certd-client/src/components/pem-input.vue

@@ -0,0 +1,60 @@
+<template>
+  <div class="pem-input">
+    <FileInput v-bind="fileInput" class="mb-5" type="primary" text="选择文件" @change="onChange" />
+    <a-textarea v-bind="textarea" v-model:value="textRef"></a-textarea>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { notification } from "ant-design-vue";
+import { ref, watch, defineEmits } from "vue";
+import FileInput from "/@/components/file-input.vue";
+
+const props = defineProps<{
+  modelValue?: string;
+  textarea?: any;
+  fileInput?: any;
+}>();
+
+const emit = defineEmits(["update:modelValue"]);
+const textRef = ref();
+
+function emitValue(value: string) {
+  emit("update:modelValue", value);
+}
+
+function onChange(e: any) {
+  const file = e.target.files[0];
+  const size = file.size;
+  if (size > 100 * 1024) {
+    notification.error({
+      message: "文件超过100k，请选择正确的证书文件",
+    });
+    return;
+  }
+  const fileReader = new FileReader();
+  fileReader.onload = function (e: any) {
+    const value = e.target.result;
+    emitValue(value);
+  };
+  fileReader.readAsText(file); // 以文本形式读取文件
+}
+
+watch(
+  () => props.modelValue,
+  value => {
+    textRef.value = value;
+  },
+  {
+    immediate: true,
+  }
+);
+</script>
+
+<style lang="less">
+.pem-input {
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+}
+</style>

packages/ui/certd-client/src/components/plugins/common/api-test.vue

@@ -60,6 +60,9 @@ const doTest = async () => {
       }
     );
     message.value = "测试请求成功";
+    if (res) {
+      message.value += `，返回：${JSON.stringify(res)}`;
+    }
   } finally {
     loading.value = false;
   }

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

@@ -6,6 +6,7 @@ import DnsProviderSelector from "/@/components/plugins/cert/dns-provider-selecto
 import DomainsVerifyPlanEditor from "/@/components/plugins/cert/domains-verify-plan-editor/index.vue";
 import AccessSelector from "/@/views/certd/access/access-selector/index.vue";
 import InputPassword from "./common/input-password.vue";
+import CertInfoUpdater from "/@/views/certd/pipeline/cert-upload/index.vue";
 import ApiTest from "./common/api-test.vue";
 export * from "./cert/index.js";
 export default {
@@ -14,11 +15,13 @@ export default {
     app.component("DnsProviderSelector", DnsProviderSelector);
     app.component("DomainsVerifyPlanEditor", DomainsVerifyPlanEditor);
     app.component("AccessSelector", AccessSelector);
+    app.component("CertInfoUpdater", CertInfoUpdater);
+
     app.component("ApiTest", ApiTest);
 
     app.component("SynologyDeviceIdGetter", SynologyIdDeviceGetter);
     app.component("RemoteSelect", RemoteSelect);
     app.component("CertDomainsGetter", CertDomainsGetter);
     app.component("InputPassword", InputPassword);
-  }
+  },
 };

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

@@ -24,9 +24,9 @@ export async function doRequest(req: RequestHandleReq, opts: any = {}) {
       typeName,
       action,
       data,
-      input
+      input,
     },
-    ...opts
+    ...opts,
   });
   return res;
 }

packages/ui/certd-client/src/plugin/fast-crud/index.tsx

@@ -6,16 +6,48 @@ import { FsExtendsCopyable, FsExtendsEditor, FsExtendsJson, FsExtendsTime, FsExt
 import "@fast-crud/fast-extends/dist/style.css";
 import UiAntdv from "@fast-crud/ui-antdv4";
 import "@fast-crud/ui-antdv4/dist/style.css";
-import { merge } from "lodash-es";
+import { debounce, merge } from "lodash-es";
 import { useCrudPermission } from "../permission";
 import { App } from "vue";
 import { notification } from "ant-design-vue";
 import { usePreferences } from "/@/vben/preferences";
+import { LocalStorage } from "/@/utils/util.storage";
+
+class ColumnSizeSaver {
+  save: (key: string, size: number) => void;
+  constructor() {
+    this.save = debounce((key: string, size: number) => {
+      const saveKey = this.getKey();
+      let data = LocalStorage.get(saveKey);
+      if (!data) {
+        data = {};
+      }
+      data[key] = size;
+      LocalStorage.set(saveKey, data);
+    });
+  }
+  getKey() {
+    const loc = window.location;
+    const currentUrl = `${loc.pathname}${loc.search}${loc.hash}`;
+    return `columnSize-${currentUrl}`;
+  }
+  get(key: string) {
+    const saveKey = this.getKey();
+    const row = LocalStorage.get(saveKey);
+    return row?.[key];
+  }
+  clear() {
+    const saveKey = this.getKey();
+    LocalStorage.remove(saveKey);
+  }
+}
+const columnSizeSaver = new ColumnSizeSaver();
 
 function install(app: App, options: any = {}) {
   app.use(UiAntdv);
   //设置日志级别
   setLogger({ level: "info" });
+
   app.use(FastCrud, {
     i18n: options.i18n,
     async dictRequest({ url }: any) {
@@ -39,20 +71,21 @@ function install(app: App, options: any = {}) {
             mobile: {
               enabled: true,
               props: {
-                isMobile: isMobile
-              }
-            }
-          }
+                isMobile: isMobile,
+              },
+            },
+          },
         },
         table: {
           scroll: {
-            x: 960
+            x: 960,
           },
           size: "small",
           pagination: false,
-          onResizeColumn: (w: number | string, col: any) => {
+          onResizeColumn: (w: number, col: any) => {
             if (crudBinding.value?.table?.columnsMap && crudBinding.value?.table?.columnsMap[col.key]) {
               crudBinding.value.table.columnsMap[col.key].width = w;
+              columnSizeSaver.save(col.key, w);
             }
           },
           conditionalRender: {
@@ -70,13 +103,18 @@ function install(app: App, options: any = {}) {
             },
             render() {
               return "-";
-            }
-          }
+            },
+          },
         },
         toolbar: {
           export: {
-            fileType: "excel"
-          }
+            fileType: "excel",
+          },
+          columnsFilter: {
+            async onReset() {
+              columnSizeSaver.clear();
+            },
+          },
         },
         rowHandle: {
           fixed: "right",
@@ -84,13 +122,15 @@ function install(app: App, options: any = {}) {
             view: { type: "link", text: null, icon: "ion:eye-outline" },
             copy: { show: true, type: "link", text: null, icon: "ion:copy-outline" },
             edit: { type: "link", text: null, icon: "ion:create-outline" },
-            remove: { type: "link", style: { color: "red" }, text: null, icon: "ion:trash-outline" }
+            remove: { type: "link", style: { color: "red" }, text: null, icon: "ion:trash-outline" },
           },
           dropdown: {
             more: {
-              type: "link"
-            }
-          }
+              type: "link",
+            },
+          },
+          resizable: true,
+          width: 200,
         },
         request: {
           transformQuery: ({ page, form, sort }: PageQuery): UserPageQuery => {
@@ -103,10 +143,10 @@ function install(app: App, options: any = {}) {
             return {
               page: {
                 limit,
-                offset
+                offset,
               },
               query: form,
-              sort
+              sort,
             };
           },
           transformRes: ({ res }: TransformResProps): PageRes => {
@@ -116,16 +156,16 @@ function install(app: App, options: any = {}) {
               currentPage++;
             }
             return { currentPage, pageSize, records: res.records, total: res.total, ...res };
-          }
+          },
         },
         search: {
           formItem: {
             wrapperCol: {
               style: {
-                width: "50%"
-              }
-            }
-          }
+                width: "50%",
+              },
+            },
+          },
         },
         form: {
           display: "flex",
@@ -133,8 +173,8 @@ function install(app: App, options: any = {}) {
             //固定label宽度
             span: null,
             style: {
-              width: "145px"
-            }
+              width: "145px",
+            },
           },
           async afterSubmit({ mode }) {
             if (mode === "add") {
@@ -144,13 +184,13 @@ function install(app: App, options: any = {}) {
             }
           },
           wrapperCol: {
-            span: null
+            span: null,
           },
           wrapper: {
-            saveRemind: true
+            saveRemind: true,
             // inner: true,
             // innerContainerSelector: "main.fs-framework-content"
-          }
+          },
         },
         columns: {
           //最后一列空白，用于自动伸缩列宽
@@ -158,23 +198,23 @@ function install(app: App, options: any = {}) {
             title: "",
             type: "text",
             form: {
-              show: false
+              show: false,
             },
             column: {
               order: 99999,
               width: -1,
               columnSetShow: false,
-              resizable: false
-            }
-          }
-        }
+              resizable: false,
+            },
+          },
+        },
       };
 
       // 从 useCrud({permission}) 里获取permission参数，去设置各个按钮的权限
       const permission = props.context?.permission || null;
       const crudPermission = useCrudPermission({ permission });
       return crudPermission.merge(opts);
-    }
+    },
   });
 
   // fast-extends里面的扩展组件均为异步组件，只有在使用时才会被加载，并不会影响首页加载速度
@@ -202,19 +242,19 @@ function install(app: App, options: any = {}) {
           url: action,
           method: "post",
           headers: {
-            "Content-Type": "multipart/form-data"
+            "Content-Type": "multipart/form-data",
           },
           timeout: 60000,
           data,
           onUploadProgress: (p: any) => {
             onProgress({ percent: Math.round((p.loaded / p.total) * 100) });
-          }
+          },
         });
       },
       successHandle(res: any) {
         return res;
-      }
-    }
+      },
+    },
   });
 
   //安装editor
@@ -222,10 +262,10 @@ function install(app: App, options: any = {}) {
     //编辑器的公共配置
     wangEditor: {
       editorConfig: {
-        MENU_CONF: {}
+        MENU_CONF: {},
       },
-      toolbarConfig: {}
-    }
+      toolbarConfig: {},
+    },
   });
   app.use(FsExtendsJson);
   app.use(FsExtendsTime);
@@ -250,8 +290,8 @@ function install(app: App, options: any = {}) {
       column: { component: { name: "fs-date-format", format: "YYYY-MM-DD" } },
       valueBuilder(context: any) {
         console.log("time2,valueBuilder", context);
-      }
-    }
+      },
+    },
   });
 
   // 此处演示自定义字段合并插件
@@ -266,32 +306,14 @@ function install(app: App, options: any = {}) {
         // 合并column配置
         merge(columnProps, {
           form: { show: false },
-          viewForm: { show: true }
+          viewForm: { show: true },
         });
       }
       return columnProps;
-    }
+    },
   });
 
   //默认宽度，支持自动拖动调整列宽
-  registerMergeColumnPlugin({
-    name: "resize-column-plugin",
-    order: 2,
-    handle: (columnProps: ColumnCompositionProps) => {
-      if (!columnProps.column) {
-        columnProps.column = {};
-      }
-      if (columnProps.column.resizable == null) {
-        columnProps.column.resizable = true;
-        if (!columnProps.column.width) {
-          columnProps.column.width = 200;
-        }
-      }
-
-      return columnProps;
-    }
-  });
-
   registerMergeColumnPlugin({
     name: "resize-column-plugin",
     order: 2,
@@ -300,16 +322,19 @@ function install(app: App, options: any = {}) {
         columnProps.column = {};
       }
       columnProps.column.resizable = true;
-      if (columnProps.column.width == null) {
+      const savedColumnWidth = columnSizeSaver.get(columnProps.key as string);
+      if (savedColumnWidth) {
+        columnProps.column.width = savedColumnWidth;
+      } else if (columnProps.column.width == null) {
         columnProps.column.width = 200;
       } else if (typeof columnProps.column?.width === "string" && columnProps.column.width.indexOf("px") > -1) {
         columnProps.column.width = parseInt(columnProps.column.width.replace("px", ""));
       }
       return columnProps;
-    }
+    },
   });
 }
 
 export default {
-  install
+  install,
 };

packages/ui/certd-client/src/router/source/modules/certd.ts

@@ -67,13 +67,24 @@ export const certdResources = [
         title: "设置",
         name: "MineSetting",
         path: "/certd/setting",
-        redirect: "/certd/cname/record",
+        redirect: "/certd/access",
         meta: {
           icon: "ion:settings-outline",
           auth: true,
           cache: true
         },
         children: [
+          {
+            title: "授权管理",
+            name: "AccessManager",
+            path: "/certd/access",
+            component: "/certd/access/index.vue",
+            meta: {
+              icon: "ion:disc-outline",
+              auth: true,
+              cache: true
+            }
+          },
           {
             title: "CNAME记录管理",
             name: "CnameRecord",
@@ -94,17 +105,7 @@ export const certdResources = [
               auth: true
             }
           },
-          {
-            title: "授权管理",
-            name: "AccessManager",
-            path: "/certd/access",
-            component: "/certd/access/index.vue",
-            meta: {
-              icon: "ion:disc-outline",
-              auth: true,
-              cache: true
-            }
-          },
+
           {
             title: "OpenKey",
             name: "OpenKey",

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

@@ -88,4 +88,9 @@ body a{
   &:hover{
     color: #40a9ff;
   }
+}
+
+span.fs-icon-svg{
+  display: flex;
+  align-items: center;
 }

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

@@ -4,6 +4,10 @@ export function createAccessApi(from = "user") {
   const apiPrefix = from === "sys" ? "/sys/access" : "/pi/access";
   return {
     async GetList(query: any) {
+      if (query?.query) {
+        delete query.query.access;
+      }
+
       return await request({
         url: apiPrefix + "/page",
         method: "post",

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

@@ -77,7 +77,7 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
       type: "dict-select",
       dict: AccessTypeDictRef,
       search: {
-        show: false
+        show: true
       },
       column: {
         width: 200,

packages/ui/certd-client/src/views/certd/monitor/cert/api.ts

@@ -7,7 +7,7 @@ export const certInfoApi = {
     return await request({
       url: apiPrefix + "/page",
       method: "post",
-      data: query
+      data: query,
     });
   },
 
@@ -15,7 +15,7 @@ export const certInfoApi = {
     return await request({
       url: apiPrefix + "/add",
       method: "post",
-      data: obj
+      data: obj,
     });
   },
 
@@ -23,7 +23,7 @@ export const certInfoApi = {
     return await request({
       url: apiPrefix + "/update",
       method: "post",
-      data: obj
+      data: obj,
     });
   },
 
@@ -31,7 +31,7 @@ export const certInfoApi = {
     return await request({
       url: apiPrefix + "/delete",
       method: "post",
-      params: { id }
+      params: { id },
     });
   },
 
@@ -39,27 +39,35 @@ export const certInfoApi = {
     return await request({
       url: apiPrefix + "/info",
       method: "post",
-      params: { id }
+      params: { id },
     });
   },
   async ListAll() {
     return await request({
       url: apiPrefix + "/all",
-      method: "post"
+      method: "post",
     });
   },
   async Upload(body: { id?: number; cert: { crt: string; key: string } }) {
     return await request({
       url: apiPrefix + "/upload",
       method: "post",
-      data: body
+      data: body,
     });
   },
   async GetCert(id: number): Promise<CertInfo> {
     return await request({
       url: apiPrefix + "/getCert",
       method: "post",
-      params: { id: id }
+      params: { id: id },
     });
-  }
+  },
+
+  async GetOptionsByIds(ids: number[]): Promise<any[]> {
+    return await request({
+      url: apiPrefix + "/getOptionsByIds",
+      method: "post",
+      data: { ids },
+    });
+  },
 };

packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx

@@ -1,17 +1,15 @@
 // @ts-ignore
 import { useI18n } from "vue-i18n";
-import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, EditReq, useFormWrapper, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, useFormWrapper, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { certInfoApi } from "./api";
 import dayjs from "dayjs";
-import { useUserStore } from "/@/store/modules/user";
 import { useRouter } from "vue-router";
 import { useModal } from "/@/use/use-modal";
-import * as api from "/@/views/certd/pipeline/api";
 import { notification } from "ant-design-vue";
 import CertView from "/@/views/certd/pipeline/cert-view.vue";
+import { useCertUpload } from "/@/views/certd/pipeline/cert-upload/use";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
-  const { t } = useI18n();
   const api = certInfoApi;
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
     return await api.GetList(query);
@@ -50,32 +48,33 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
       width: 800,
       content: () => {
         return <CertView cert={cert}></CertView>;
-      }
+      },
     });
   };
 
+  const { openUploadCreateDialog, openUpdateCertDialog } = useCertUpload();
   return {
     crudOptions: {
       request: {
         pageRequest,
         addRequest,
         editRequest,
-        delRequest
+        delRequest,
       },
       form: {
         labelCol: {
           //固定label宽度
           span: null,
           style: {
-            width: "100px"
-          }
+            width: "100px",
+          },
         },
         col: {
-          span: 22
+          span: 22,
         },
         wrapper: {
-          width: 600
-        }
+          width: 600,
+        },
       },
       actionbar: {
         show: true,
@@ -85,62 +84,17 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             type: "primary",
             show: false,
             async click() {
-              function createCrudOptions() {
-                return {
-                  crudOptions: {
-                    request: {
-                      addRequest: async (form: any) => {
-                        return await api.Upload(form);
-                      },
-                      editRequest: async (form: any) => {
-                        return await api.Upload(form);
-                      }
-                    },
-                    columns: {
-                      id: {
-                        title: "ID",
-                        type: "number",
-                        form: {
-                          show: false
-                        }
-                      },
-                      "cert.crt": {
-                        title: "证书",
-                        type: "textarea",
-                        form: {
-                          component: {
-                            rows: 4
-                          },
-                          rules: [{ required: true, message: "此项必填" }]
-                        }
-                      },
-                      "cert.key": {
-                        title: "私钥",
-                        type: "textarea",
-                        form: {
-                          component: {
-                            rows: 4
-                          },
-                          rules: [{ required: true, message: "此项必填" }]
-                        }
-                      }
-                    },
-                    form: {
-                      wrapper: {
-                        title: "上传自定义证书"
-                      }
-                    }
-                  }
-                };
-              }
-              const { crudOptions } = createCrudOptions();
-              const wrapperRef = await openCrudFormDialog({ crudOptions });
-            }
-          }
-        }
+              await openUploadCreateDialog();
+            },
+          },
+        },
+      },
+      tabs: {
+        name: "fromType",
+        show: true,
       },
       rowHandle: {
-        width: 200,
+        width: 100,
         fixed: "right",
         buttons: {
           view: { show: false },
@@ -151,12 +105,28 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             icon: "ph:certificate",
             async click({ row }) {
               await viewCert(row);
-            }
+            },
           },
           copy: { show: false },
           edit: { show: false },
-          remove: { show: false }
-        }
+          remove: {
+            order: 10,
+            show: false,
+          },
+          download: {
+            order: 9,
+            title: "下载证书",
+            type: "link",
+            icon: "ant-design:download-outlined",
+            async click({ row }) {
+              if (!row.certFile) {
+                notification.error({ message: "证书还未生成，请先运行流水线" });
+                return;
+              }
+              window.open("/api/monitor/cert/download?id=" + row.id);
+            },
+          },
+        },
       },
       columns: {
         id: {
@@ -164,77 +134,91 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           key: "id",
           type: "number",
           search: {
-            show: false
+            show: false,
           },
           column: {
             width: 100,
             editable: {
-              disabled: true
-            }
+              disabled: true,
+            },
           },
           form: {
-            show: false
-          }
+            show: false,
+          },
         },
-        // domain: {
-        //   title: "主域名",
-        //   search: {
-        //     show: true
-        //   },
-        //   type: "text",
-        //   form: {
-        //     show: false
-        //   },
-        //   column: {
-        //     width: 180,
-        //     sorter: true,
-        //     component: {
-        //       name: "fs-values-format"
-        //     }
-        //   }
-        // },
-        domains: {
-          title: "全部域名",
+        fromType: {
+          title: "来源",
           search: {
-            show: true
+            show: true,
+          },
+          type: "dict-select",
+          dict: dict({
+            data: [
+              { label: "流水线", value: "pipeline" },
+              { label: "手动上传", value: "upload" },
+            ],
+          }),
+          form: {
+            show: false,
+          },
+          column: {
+            width: 100,
+            sorter: true,
+            component: {
+              color: "auto",
+            },
+            conditionalRender: false,
+          },
+          valueBuilder({ value, row, key }) {
+            if (!value) {
+              row[key] = "pipeline";
+            }
+          },
+        },
+        domains: {
+          title: "域名",
+          search: {
+            show: true,
           },
           type: "text",
           form: {
-            rules: [{ required: true, message: "请输入域名" }]
+            rules: [{ required: true, message: "请输入域名" }],
           },
           column: {
             width: 450,
             sorter: true,
             component: {
               name: "fs-values-format",
-              color: "auto"
-            }
-          }
+              color: "auto",
+            },
+          },
         },
         domainCount: {
           title: "域名数量",
           type: "number",
           form: {
-            show: false
+            show: false,
           },
           column: {
             width: 120,
             sorter: true,
-            show: false
-          }
+            show: false,
+          },
         },
-        expiresTime: {
-          title: "过期时间",
+        expiresLeft: {
+          title: "有效天数",
           search: {
-            show: false
+            show: false,
           },
           type: "date",
           form: {
-            show: false
+            show: false,
           },
           column: {
             sorter: true,
-            cellRender({ value }) {
+            conditionalRender: false,
+            cellRender({ row }) {
+              const value = row.expiresTime;
               if (!value) {
                 return "-";
               }
@@ -243,41 +227,54 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
               const color = leftDays < 20 ? "red" : "#389e0d";
               const percent = (leftDays / 90) * 100;
               return <a-progress title={expireDate + "过期"} percent={percent} strokeColor={color} format={(percent: number) => `${leftDays}天`} />;
-            }
-          }
+            },
+          },
+        },
+        expiresTime: {
+          title: "过期时间",
+          search: {
+            show: false,
+          },
+          type: "datetime",
+          form: {
+            show: false,
+          },
+          column: {
+            sorter: true,
+          },
         },
         certProvider: {
           title: "证书颁发机构",
           search: {
-            show: false
+            show: false,
           },
           type: "text",
           form: {
-            show: false
+            show: false,
           },
           column: {
-            width: 200
-          }
+            width: 200,
+          },
         },
         applyTime: {
           title: "申请时间",
           search: {
-            show: false
+            show: false,
           },
           type: "datetime",
           form: {
-            show: false
+            show: false,
           },
           column: {
-            sorter: true
-          }
+            sorter: true,
+          },
         },
         "pipeline.title": {
           title: "关联流水线",
           search: { show: false },
           type: "link",
           form: {
-            show: false
+            show: false,
           },
           column: {
             width: 350,
@@ -286,12 +283,12 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
               on: {
                 onClick({ row }) {
                   router.push({ path: "/certd/pipeline/detail", query: { id: row.pipelineId, editMode: "false" } });
-                }
-              }
-            }
-          }
-        }
-      }
-    }
+                },
+              },
+            },
+          },
+        },
+      },
+    },
   };
 }

packages/ui/certd-client/src/views/certd/monitor/cert/index.vue

@@ -3,7 +3,7 @@
     <template #header>
       <div class="title">
         证书仓库
-        <span class="sub">从流水线生成的证书，后续将支持手动上传证书并部署</span>
+        <span class="sub">从流水线生成的证书</span>
       </div>
     </template>
     <fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
@@ -11,12 +11,12 @@
 </template>
 
 <script lang="ts" setup>
-import { defineComponent, onActivated, onMounted } from "vue";
+import { onActivated, onMounted } from "vue";
 import { useFs } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
-import { createApi } from "./api";
+
 defineOptions({
-  name: "CertStore"
+  name: "CertStore",
 });
 const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: {} });
 

packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx

@@ -34,28 +34,35 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
 
   const settingsStore = useSettingStore();
 
+  const checkStatusDict = dict({
+    data: [
+      { label: "成功", value: "ok", color: "green" },
+      { label: "检查中", value: "checking", color: "blue" },
+      { label: "异常", value: "error", color: "red" },
+    ],
+  });
   return {
     crudOptions: {
       request: {
         pageRequest,
         addRequest,
         editRequest,
-        delRequest
+        delRequest,
       },
       form: {
         labelCol: {
           //固定label宽度
           span: null,
           style: {
-            width: "100px"
-          }
+            width: "100px",
+          },
         },
         col: {
-          span: 22
+          span: 22,
         },
         wrapper: {
-          width: 600
-        }
+          width: 600,
+        },
       },
       actionbar: {
         buttons: {
@@ -65,7 +72,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
                 //非plus
                 if (crudBinding.value.data.length >= 1) {
                   notification.error({
-                    message: "基础版只能添加一个监控站点，请赞助升级专业版"
+                    message: "基础版只能添加一个监控站点，请赞助升级专业版",
                   });
                   mitter.emit("openVipModal");
                   return;
@@ -79,15 +86,15 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
                 const max = suiteDetail.monitorCount.max;
                 if (max != -1 && max <= suiteDetail.monitorCount.used) {
                   notification.error({
-                    message: `对不起，您最多只能创建条${max}监控记录，请购买或升级套餐`
+                    message: `对不起，您最多只能创建条${max}监控记录，请购买或升级套餐`,
                   });
                   return;
                 }
               }
               await crudExpose.openAdd({});
-            }
-          }
-        }
+            },
+          },
+        },
       },
       rowHandle: {
         fixed: "right",
@@ -98,18 +105,18 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             type: "link",
             text: null,
             tooltip: {
-              title: "立即检查"
+              title: "立即检查",
             },
             icon: "ion:play-sharp",
             click: async ({ row }) => {
               await api.DoCheck(row.id);
               await crudExpose.doRefresh();
               notification.success({
-                message: "检查完成"
+                message: "检查完成",
               });
-            }
-          }
-        }
+            },
+          },
+        },
       },
       columns: {
         id: {
@@ -117,77 +124,67 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           key: "id",
           type: "number",
           search: {
-            show: false
+            show: false,
           },
           column: {
             width: 80,
-            align: "center"
+            align: "center",
           },
           form: {
-            show: false
-          }
+            show: false,
+          },
         },
         name: {
           title: "站点名称",
           search: {
-            show: true
+            show: true,
           },
           type: "text",
           form: {
-            rules: [{ required: true, message: "请输入站点名称" }]
+            rules: [{ required: true, message: "请输入站点名称" }],
           },
           column: {
-            width: 160
-          }
+            width: 160,
+          },
         },
         domain: {
           title: "网站域名",
           search: {
-            show: true
+            show: true,
           },
           type: "text",
           form: {
             rules: [
               { required: true, message: "请输入域名" },
               //@ts-ignore
-              { type: "domains", message: "请输入正确的域名" }
-            ]
+              { type: "domains", message: "请输入正确的域名" },
+            ],
           },
           column: {
-            width: 200,
+            width: 230,
             sorter: true,
-            cellRender({ value }) {
+            cellRender({ value, row }) {
+              const url = `https://${value}:${row.httpsPort}`;
               return (
                 <a-tooltip title={value} placement="left">
-                  <fs-copyable modelValue={value}></fs-copyable>
+                  <fs-copyable modelValue={value}>
+                    <a target="_blank" href={url}>
+                      {value}:{row.httpsPort}
+                    </a>
+                  </fs-copyable>
                 </a-tooltip>
               );
-            }
-          }
-        },
-        httpsPort: {
-          title: "HTTPS端口",
-          search: {
-            show: false
+            },
           },
-          type: "number",
-          form: {
-            value: 443,
-            rules: [{ required: true, message: "请输入端口" }]
-          },
-          column: {
-            align: "center",
-            width: 100
-          }
         },
         certDomains: {
           title: "证书域名",
           search: {
-            show: false
+            show: true,
           },
           type: "text",
           form: {
-            show: false
+            show: false,
           },
           column: {
             width: 200,
@@ -199,55 +196,56 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
                   {value}
                 </a-tooltip>
               );
-            }
-          }
+            },
+          },
         },
         certProvider: {
-          title: "证书颁发者",
+          title: "颁发机构",
           search: {
-            show: false
+            show: false,
           },
           type: "text",
           form: {
-            show: false
+            show: false,
           },
           column: {
             width: 200,
             sorter: true,
             cellRender({ value }) {
               return <a-tooltip title={value}>{value}</a-tooltip>;
-            }
-          }
+            },
+          },
         },
         certStatus: {
           title: "证书状态",
           search: {
-            show: true
+            show: true,
           },
           type: "dict-select",
           dict: dict({
             data: [
               { label: "正常", value: "ok", color: "green" },
-              { label: "过期", value: "expired", color: "red" }
-            ]
+              { label: "过期", value: "expired", color: "red" },
+            ],
           }),
           form: {
-            show: false
+            show: false,
           },
           column: {
             width: 100,
             sorter: true,
-            show: false
-          }
+            show: true,
+            align: "center",
+          },
         },
         certExpiresTime: {
           title: "证书到期时间",
           search: {
-            show: false
+            show: false,
           },
           type: "date",
           form: {
-            show: false
+            show: false,
           },
           column: {
             sorter: true,
@@ -260,109 +258,111 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
               const color = leftDays < 20 ? "red" : "#389e0d";
               const percent = (leftDays / 90) * 100;
               return <a-progress title={expireDate + "过期"} percent={percent} strokeColor={color} format={(percent: number) => `${leftDays}天`} />;
-            }
-          }
+            },
+          },
         },
         lastCheckTime: {
           title: "上次检查时间",
           search: {
-            show: false
+            show: false,
           },
           type: "datetime",
           form: {
-            show: false
+            show: false,
           },
           column: {
             sorter: true,
-            width: 155
-          }
-        },
-        checkStatus: {
-          title: "检查状态",
-          search: {
-            show: false
+            width: 155,
           },
-          type: "dict-select",
-          dict: dict({
-            data: [
-              { label: "正常", value: "ok", color: "green" },
-              { label: "检查中", value: "checking", color: "blue" },
-              { label: "异常", value: "error", color: "red" }
-            ]
-          }),
-          form: {
-            show: false
-          },
-          column: {
-            width: 100,
-            align: "center",
-            sorter: true
-          }
-        },
-        error: {
-          title: "错误信息",
-          search: {
-            show: false
-          },
-          type: "text",
-          form: {
-            show: false
-          },
-          column: {
-            width: 200,
-            sorter: true,
-            cellRender({ value }) {
-              return <a-tooltip title={value}>{value}</a-tooltip>;
-            }
-          }
-        },
-        pipelineId: {
-          title: "关联流水线id",
-          search: {
-            show: false
-          },
-          form: { show: false },
-          type: "number",
-          column: {
-            width: 200,
-            sorter: true,
-            show: false
-          }
-        },
-        certInfoId: {
-          title: "证书id",
-          search: {
-            show: false
-          },
-          type: "number",
-          form: { show: false },
-          column: {
-            width: 100,
-            sorter: true,
-            show: false
-          }
         },
         disabled: {
           title: "禁用启用",
           search: {
-            show: false
+            show: false,
           },
           type: "dict-switch",
           dict: dict({
             data: [
               { label: "启用", value: false, color: "green" },
-              { label: "禁用", value: true, color: "red" }
-            ]
+              { label: "禁用", value: true, color: "red" },
+            ],
           }),
           form: {
-            value: false
+            value: false,
           },
           column: {
-            width: 90,
-            sorter: true
-          }
-        }
-      }
-    }
+            width: 100,
+            sorter: true,
+            align: "center",
+          },
+        },
+        checkStatus: {
+          title: "检查状态",
+          search: {
+            show: false,
+          },
+          type: "dict-select",
+          dict: checkStatusDict,
+          form: {
+            show: false,
+          },
+          column: {
+            width: 100,
+            align: "center",
+            sorter: true,
+            cellRender({ value, row, key }) {
+              return (
+                <a-tooltip title={row.error}>
+                  <fs-values-format v-model={value} dict={checkStatusDict}></fs-values-format>
+                </a-tooltip>
+              );
+            },
+          },
+        },
+        // error: {
+        //   title: "错误信息",
+        //   search: {
+        //     show: false
+        //   },
+        //   type: "text",
+        //   form: {
+        //     show: false
+        //   },
+        //   column: {
+        //     width: 200,
+        //     sorter: true,
+        //     cellRender({ value }) {
+        //       return <a-tooltip title={value}>{value}</a-tooltip>;
+        //     }
+        //   }
+        // },
+        pipelineId: {
+          title: "关联流水线id",
+          search: {
+            show: false,
+          },
+          form: { show: false },
+          type: "number",
+          column: {
+            width: 200,
+            sorter: true,
+            show: false,
+          },
+        },
+        certInfoId: {
+          title: "证书id",
+          search: {
+            show: false,
+          },
+          type: "number",
+          form: { show: false },
+          column: {
+            width: 100,
+            sorter: true,
+            show: false,
+          },
+        },
+      },
+    },
   };
 }

packages/ui/certd-client/src/views/certd/monitor/site/index.vue

@@ -4,7 +4,7 @@
       <div class="title flex items-center">
         站点证书监控
         <div class="sub flex-1">
-          <div>每天0点，检查网站证书的过期时间，并发出提醒;</div>
+          <div>每天0点，检查网站证书的过期时间，到期前10天时将发出提醒（使用默认通知渠道）;</div>
           <div class="flex items-center">基础版限制1条，专业版以上无限制，当前<vip-button class="ml-5" mode="nav"></vip-button></div>
         </div>
       </div>

packages/ui/certd-client/src/views/certd/notification/notification-selector/index.vue

@@ -1,16 +1,7 @@
 <template>
   <div class="notification-selector">
     <div class="flex-o w-100">
-      <fs-dict-select
-        class="flex-1"
-        :value="modelValue"
-        :dict="optionsDictRef"
-        :disabled="disabled"
-        :render-label="renderLabel"
-        :slots="selectSlots"
-        :allow-clear="true"
-        @update:value="onChange"
-      />
+      <fs-dict-select class="flex-1" :value="modelValue" :dict="optionsDictRef" :disabled="disabled" :render-label="renderLabel" :slots="selectSlots" :allow-clear="true" @update:value="onChange" />
       <fs-table-select
         ref="tableSelectRef"
         class="flex-0"
@@ -18,12 +9,12 @@
         :dict="optionsDictRef"
         :create-crud-options="createCrudOptions"
         :crud-options-override="{
-          search: { show: false },
+          search: { show: false, initialForm: { fromType: 'upload' } },
           table: {
             scroll: {
-              x: 540
-            }
-          }
+              x: 540,
+            },
+          },
         }"
         :show-current="false"
         :show-select="false"
@@ -50,7 +41,7 @@ import createCrudOptions from "../crud";
 import { notificationProvide } from "/@/views/certd/notification/common";
 
 defineOptions({
-  name: "NotificationSelector"
+  name: "NotificationSelector",
 });
 
 const props = defineProps<{
@@ -89,12 +80,12 @@ const optionsDictRef = dict({
       {
         id: 0,
         name: "使用默认通知",
-        icon: "ion:notifications"
+        icon: "ion:notifications",
       },
-      ...dict.data
+      ...dict.data,
     ];
     dict.setData(data);
-  }
+  },
 });
 const renderLabel = (option: any) => {
   return <span>{option.name}</span>;
@@ -115,7 +106,7 @@ const selectSlots = ref({
     // res.push(<a-space style="padding: 4px 8px" />);
     // res.push(<fs-button class="w-100" type="text" icon="plus-outlined" text="新建通知渠道" onClick={openTableSelectDialog}></fs-button>);
     return res;
-  }
+  },
 });
 
 const target: Ref<any> = ref({});
@@ -141,13 +132,13 @@ watch(
   () => {
     return props.modelValue;
   },
-  async (value) => {
+  async value => {
     await optionsDictRef.loadDict();
     target.value = optionsDictRef.dataMap[value];
     emit("selectedChange", target.value);
   },
   {
-    immediate: true
+    immediate: true,
   }
 );
 

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

@@ -6,8 +6,8 @@ const apiPrefix = "/pi/plugin";
 const defaultInputDefine = {
   component: {
     name: "a-input",
-    vModel: "modelValue"
-  }
+    vModel: "modelValue",
+  },
 };
 
 function initPlugins(plugins: any) {
@@ -35,7 +35,7 @@ export async function GetList(query: any) {
   const plugins = await request({
     url: apiPrefix + "/list",
     method: "post",
-    params: query
+    params: query,
   });
   initPlugins(plugins);
   return plugins;
@@ -45,7 +45,7 @@ export async function GetGroups(query: any) {
   const groups = await request({
     url: apiPrefix + "/groups",
     method: "post",
-    params: query
+    params: query,
   });
   const plugins: any = [];
   for (const groupKey in groups) {
@@ -60,8 +60,8 @@ export async function GetPluginDefine(type: string) {
     url: apiPrefix + "/getDefineByType",
     method: "post",
     data: {
-      type
-    }
+      type,
+    },
   });
   initPlugins([define]);
   return define;
@@ -71,6 +71,6 @@ export async function GetPluginConfig(req: { id?: number; name: string; type: st
   return await request({
     url: apiPrefix + "/config",
     method: "post",
-    data: req
+    data: req,
   });
 }

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

@@ -8,7 +8,7 @@ export async function GetList(query: any) {
   return await request({
     url: apiPrefix + "/page",
     method: "post",
-    data: query
+    data: query,
   });
 }
 
@@ -16,7 +16,7 @@ export async function AddObj(obj: any) {
   return await request({
     url: apiPrefix + "/add",
     method: "post",
-    data: obj
+    data: obj,
   });
 }
 
@@ -24,7 +24,7 @@ export async function UpdateObj(obj: any) {
   return await request({
     url: apiPrefix + "/update",
     method: "post",
-    data: obj
+    data: obj,
   });
 }
 
@@ -32,7 +32,7 @@ export async function DelObj(id: any) {
   return await request({
     url: apiPrefix + "/delete",
     method: "post",
-    params: { id }
+    params: { id },
   });
 }
 
@@ -40,7 +40,7 @@ export async function GetObj(id: any) {
   return await request({
     url: apiPrefix + "/info",
     method: "post",
-    params: { id }
+    params: { id },
   });
 }
 
@@ -48,7 +48,7 @@ export async function GetDetail(id: any) {
   return await request({
     url: apiPrefix + "/detail",
     method: "post",
-    params: { id }
+    params: { id },
   });
 }
 
@@ -56,7 +56,7 @@ export async function Save(pipelineEntity: any) {
   return await request({
     url: apiPrefix + "/save",
     method: "post",
-    data: pipelineEntity
+    data: pipelineEntity,
   });
 }
 
@@ -64,7 +64,7 @@ export async function Trigger(id: any, stepId?: string) {
   return await request({
     url: apiPrefix + "/trigger",
     method: "post",
-    params: { id, stepId }
+    params: { id, stepId },
   });
 }
 
@@ -72,7 +72,7 @@ export async function Cancel(historyId: any) {
   return await request({
     url: apiPrefix + "/cancel",
     method: "post",
-    params: { historyId }
+    params: { historyId },
   });
 }
 
@@ -80,7 +80,7 @@ export async function BatchUpdateGroup(pipelineIds: number[], groupId: number):
   return await request({
     url: apiPrefix + "/batchUpdateGroup",
     method: "post",
-    data: { ids: pipelineIds, groupId }
+    data: { ids: pipelineIds, groupId },
   });
 }
 
@@ -88,7 +88,7 @@ export async function BatchDelete(pipelineIds: number[]): Promise<CertInfo> {
   return await request({
     url: apiPrefix + "/batchDelete",
     method: "post",
-    data: { ids: pipelineIds }
+    data: { ids: pipelineIds },
   });
 }
 
@@ -96,14 +96,14 @@ export async function GetFiles(pipelineId: number) {
   return await request({
     url: historyApiPrefix + "/files",
     method: "post",
-    params: { pipelineId }
+    params: { pipelineId },
   });
 }
 
 export async function GetCount() {
   return await request({
     url: apiPrefix + "/count",
-    method: "post"
+    method: "post",
   });
 }
 
@@ -119,6 +119,6 @@ export async function GetCert(pipelineId: number): Promise<CertInfo> {
   return await request({
     url: certApiPrefix + "/get",
     method: "post",
-    params: { id: pipelineId }
+    params: { id: pipelineId },
   });
 }

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

@@ -0,0 +1,10 @@
+import { request } from "/src/api/service";
+
+const apiPrefix = "/monitor/cert";
+export async function UploadCert(body: { id?: number; cert: { crt: string; key: string }; pipeline?: any }) {
+  return await request({
+    url: apiPrefix + "/upload",
+    method: "post",
+    data: body,
+  });
+}

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

@@ -0,0 +1,58 @@
+<template>
+  <div class="cert-info-updater w-full flex items-center">
+    <div class="flex-o">
+      <a-tag>{{ domain }}</a-tag>
+      <fs-button type="primary" size="small" class="ml-1" icon="ion:upload" text="更新证书" @click="onUploadClick" />
+    </div>
+  </div>
+</template>
+
+<script lang="tsx" setup>
+import { computed, inject } from "vue";
+import { useCertUpload } from "./use";
+import { getAllDomainsFromCrt } from "/@/views/certd/pipeline/utils";
+
+defineOptions({
+  name: "CertInfoUpdater",
+});
+
+const props = defineProps<{
+  modelValue?: { crt: string; key: string };
+  type?: string;
+  placeholder?: string;
+  size?: string;
+  disabled?: boolean;
+}>();
+const emit = defineEmits(["updated", "update:modelValue"]);
+
+const { openUpdateCertDialog } = useCertUpload();
+
+const domain = computed(() => {
+  if (!props.modelValue?.crt) {
+    return "";
+  }
+  const domains = getAllDomainsFromCrt(props.modelValue?.crt);
+
+  return domains[0];
+});
+
+function onUpdated(res: { uploadCert: any }) {
+  debugger;
+  emit("update:modelValue", res.uploadCert);
+  const domains = getAllDomainsFromCrt(res.uploadCert.crt);
+  emit("updated", { domains });
+}
+
+const pipeline: any = inject("pipeline");
+function onUploadClick() {
+  debugger;
+  openUpdateCertDialog({
+    onSubmit: onUpdated,
+  });
+}
+</script>
+<style lang="less">
+.cert-info-selector {
+  width: 100%;
+}
+</style>

packages/ui/certd-client/src/views/certd/pipeline/cert-upload/use.tsx

@@ -0,0 +1,237 @@
+import { compute, useFormWrapper } from "@fast-crud/fast-crud";
+import NotificationSelector from "/@/views/certd/notification/notification-selector/index.vue";
+import { cloneDeep, omit } from "lodash-es";
+import { useReference } from "/@/use/use-refrence";
+import { ref } from "vue";
+import * as pluginApi from "../api.plugin";
+import * as api from "../api";
+import { checkPipelineLimit, getAllDomainsFromCrt } from "/@/views/certd/pipeline/utils";
+import { useRouter } from "vue-router";
+import { nanoid } from "nanoid";
+
+export function useCertUpload() {
+  const { openCrudFormDialog } = useFormWrapper();
+  const router = useRouter();
+
+  const certInputs = {
+    "uploadCert.crt": {
+      title: "证书",
+      type: "text",
+      form: {
+        component: {
+          name: "pem-input",
+          vModel: "modelValue",
+          textarea: {
+            rows: 4,
+            placeholder: "-----BEGIN CERTIFICATE-----\n...\n...\n-----END CERTIFICATE-----",
+          },
+        },
+        helper: "选择pem格式证书文件，或者粘贴到此",
+        rules: [{ required: true, message: "此项必填" }],
+        col: { span: 24 },
+        order: -9999,
+      },
+    },
+    "uploadCert.key": {
+      title: "证书私钥",
+      type: "text",
+      form: {
+        component: {
+          name: "pem-input",
+          vModel: "modelValue",
+          textarea: {
+            rows: 4,
+            placeholder: "-----BEGIN PRIVATE KEY-----\n...\n...\n-----END PRIVATE KEY----- ",
+          },
+        },
+        helper: "选择pem格式证书私钥文件，或者粘贴到此",
+        rules: [{ required: true, message: "此项必填" }],
+        col: { span: 24 },
+        order: -9999,
+      },
+    },
+  };
+
+  async function buildUploadCertPluginInputs(getFormData: any) {
+    const plugin: any = await pluginApi.GetPluginDefine("CertApplyUpload");
+    const inputs: any = {};
+    for (const inputKey in plugin.input) {
+      if (inputKey === "uploadCert" || inputKey === "domains") {
+        continue;
+      }
+      const inputDefine = cloneDeep(plugin.input[inputKey]);
+      useReference(inputDefine);
+      inputs[inputKey] = {
+        title: inputDefine.title,
+        form: {
+          ...inputDefine,
+          show: compute(ctx => {
+            const form = getFormData();
+            if (!form) {
+              return false;
+            }
+
+            let inputDefineShow = true;
+            if (inputDefine.show != null) {
+              const computeShow = inputDefine.show as any;
+              if (computeShow === false) {
+                inputDefineShow = false;
+              } else if (computeShow && computeShow.computeFn) {
+                inputDefineShow = computeShow.computeFn({ form });
+              }
+            }
+            return inputDefineShow;
+          }),
+        },
+      };
+    }
+    return inputs;
+  }
+
+  async function openUploadCreateDialog() {
+    //检查是否流水线数量超出限制
+    await checkPipelineLimit();
+
+    const wrapperRef = ref();
+    function getFormData() {
+      if (!wrapperRef.value) {
+        return null;
+      }
+      return wrapperRef.value.getFormData();
+    }
+    const inputs = await buildUploadCertPluginInputs(getFormData);
+
+    function createCrudOptions() {
+      return {
+        crudOptions: {
+          columns: {
+            ...cloneDeep(certInputs),
+            ...inputs,
+            notification: {
+              title: "失败通知",
+              type: "text",
+              form: {
+                value: 0,
+                component: {
+                  name: NotificationSelector,
+                  vModel: "modelValue",
+                  on: {
+                    selectedChange({ $event, form }: any) {
+                      form.notificationTarget = $event;
+                    },
+                  },
+                },
+                order: 101,
+                helper: "任务执行失败实时提醒",
+              },
+            },
+          },
+          form: {
+            wrapper: {
+              title: "上传证书&创建部署流水线",
+              saveRemind: false,
+            },
+            async doSubmit({ form }: any) {
+              const cert = form.uploadCert;
+              const domains = getAllDomainsFromCrt(cert.crt);
+
+              const notifications = [];
+              if (form.notification != null) {
+                notifications.push({
+                  type: "custom",
+                  when: ["error", "turnToSuccess", "success"],
+                  notificationId: form.notification,
+                  title: form.notificationTarget?.name || "自定义通知",
+                });
+              }
+
+              const pipelineTitle = domains[0] + "上传证书部署";
+              const input = omit(form, ["id", "cert", "notification", "notificationTarget"]);
+              const pipeline = {
+                title: pipelineTitle,
+                runnableType: "pipeline",
+                stages: [
+                  {
+                    id: nanoid(10),
+                    title: "上传证书解析阶段",
+                    maxTaskCount: 1,
+                    runnableType: "stage",
+                    tasks: [
+                      {
+                        id: nanoid(10),
+                        title: "上传证书解析转换",
+                        runnableType: "task",
+                        steps: [
+                          {
+                            id: nanoid(10),
+                            title: "上传证书解析转换",
+                            runnableType: "step",
+                            input: {
+                              cert: cert,
+                              domains: domains,
+                              ...input,
+                            },
+                            strategy: {
+                              runStrategy: 0, // 正常执行
+                            },
+                            type: "CertApplyUpload",
+                          },
+                        ],
+                      },
+                    ],
+                  },
+                ],
+                notifications,
+              };
+
+              const id = await api.Save({
+                title: pipeline.title,
+                content: JSON.stringify(pipeline),
+                keepHistoryCount: 30,
+                type: "cert_upload",
+              });
+              router.push({
+                path: "/certd/pipeline/detail",
+                query: { id: id, editMode: "true" },
+              });
+            },
+          },
+        },
+      };
+    }
+    const { crudOptions } = createCrudOptions();
+    const wrapper = await openCrudFormDialog({ crudOptions });
+    wrapperRef.value = wrapper;
+  }
+
+  async function openUpdateCertDialog(opts: { onSubmit?: any }) {
+    function createCrudOptions() {
+      return {
+        crudOptions: {
+          columns: {
+            ...cloneDeep(certInputs),
+          },
+          form: {
+            wrapper: {
+              title: "手动上传证书",
+              saveRemind: false,
+            },
+            async afterSubmit() {},
+            async doSubmit({ form }: any) {
+              if (opts.onSubmit) {
+                await opts.onSubmit(form);
+              }
+            },
+          },
+        },
+      };
+    }
+    const { crudOptions } = createCrudOptions();
+    await openCrudFormDialog({ crudOptions });
+  }
+
+  return {
+    openUploadCreateDialog,
+    openUpdateCertDialog,
+  };
+}

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

@@ -10,22 +10,24 @@ export default function (certPlugins: any[], formWrapperRef: any): CreateCrudOpt
   const inputs: any = {};
   const userStore = useUserStore();
   const settingStore = useSettingStore();
+  const moreParams = [];
   for (const plugin of certPlugins) {
     for (const inputKey in plugin.input) {
       if (inputs[inputKey]) {
-        inputs[inputKey].form.show = true;
+        // inputs[inputKey].form.show = true;
         continue;
       }
       const inputDefine = _.cloneDeep(plugin.input[inputKey]);
       if (!inputDefine.required && !inputDefine.maybeNeed) {
-        continue;
+        moreParams.push(inputKey);
+        // continue;
       }
       useReference(inputDefine);
       inputs[inputKey] = {
         title: inputDefine.title,
         form: {
           ...inputDefine,
-          show: compute((ctx) => {
+          show: compute(ctx => {
             const form = formWrapperRef.value.getFormData();
             if (!form) {
               return false;
@@ -34,11 +36,15 @@ export default function (certPlugins: any[], formWrapperRef: any): CreateCrudOpt
             let inputDefineShow = true;
             if (inputDefine.show != null) {
               const computeShow = inputDefine.show as any;
-              inputDefineShow = computeShow.computeFn({ form });
+              if (computeShow === false) {
+                inputDefineShow = false;
+              } else if (computeShow && computeShow.computeFn) {
+                inputDefineShow = computeShow.computeFn({ form });
+              }
             }
             return form?.certApplyPlugin === plugin.name && inputDefineShow;
-          })
-        }
+          }),
+        },
       };
     }
   }
@@ -51,8 +57,17 @@ export default function (certPlugins: any[], formWrapperRef: any): CreateCrudOpt
         wrapper: {
           width: 1350,
           saveRemind: false,
-          title: "创建证书流水线"
-        }
+          title: "创建证书流水线",
+        },
+        group: {
+          groups: {
+            more: {
+              header: "更多参数",
+              columns: moreParams,
+              collapsed: true,
+            },
+          },
+        },
       },
       columns: {
         certApplyPlugin: {
@@ -61,8 +76,8 @@ export default function (certPlugins: any[], formWrapperRef: any): CreateCrudOpt
           dict: dict({
             data: [
               { value: "CertApply", label: "JS-ACME" },
-              { value: "CertApplyLego", label: "Lego-ACME" }
-            ]
+              { value: "CertApplyLego", label: "Lego-ACME" },
+            ],
           }),
           form: {
             order: 0,
@@ -75,21 +90,21 @@ export default function (certPlugins: any[], formWrapperRef: any): CreateCrudOpt
                     <li>Lego-ACME：基于Lego实现，支持海量DNS提供商，熟悉LEGO的用户可以使用</li>
                   </ul>
                 );
-              }
+              },
             },
             valueChange: {
               handle: async ({ form, value }) => {
                 const config = await api.GetPluginConfig({
                   name: value,
-                  type: "builtIn"
+                  type: "builtIn",
                 });
                 if (config.sysSetting?.input) {
                   merge(form, config.sysSetting.input);
                 }
               },
-              immediate: true
-            }
-          }
+              immediate: true,
+            },
+          },
         },
         ...inputs,
         triggerCron: {
@@ -100,11 +115,11 @@ export default function (certPlugins: any[], formWrapperRef: any): CreateCrudOpt
             component: {
               name: "cron-editor",
               vModel: "modelValue",
-              placeholder: "0 0 4 * * *"
+              placeholder: "0 0 4 * * *",
             },
             helper: "点击上面的按钮，选择每天几点定时执行。\n建议设置为每天触发一次，证书未到期之前任务会跳过，不会重复执行",
-            order: 100
-          }
+            order: 100,
+          },
         },
         notification: {
           title: "失败通知",
@@ -117,14 +132,14 @@ export default function (certPlugins: any[], formWrapperRef: any): CreateCrudOpt
               on: {
                 selectedChange({ $event, form }) {
                   form.notificationTarget = $event;
-                }
-              }
+                },
+              },
             },
             order: 101,
-            helper: "任务执行失败实时提醒"
-          }
-        }
-      }
-    }
+            helper: "任务执行失败实时提醒",
+          },
+        },
+      },
+    },
   };
 }

packages/ui/certd-client/src/views/certd/pipeline/certd-form/dicts.ts

@@ -4,11 +4,11 @@ export const Dicts = {
   sslProviderDict: dict({
     data: [
       { value: "letsencrypt", label: "Let‘s Encrypt" },
-      { value: "zerossl", label: "ZeroSSL" }
-    ]
+      { value: "zerossl", label: "ZeroSSL" },
+    ],
   }),
   challengeTypeDict: dict({ data: [{ value: "dns", label: "DNS校验" }] }),
   dnsProviderTypeDict: dict({
-    url: "pi/dnsProvider/dnsProviderTypeDict"
-  })
+    url: "pi/dnsProvider/dnsProviderTypeDict",
+  }),
 };

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

@@ -44,8 +44,8 @@ export default {
                 const notificationApi = createNotificationApi();
                 await notificationApi.GetOrCreateDefault({ email: form.email });
               }
-            }
-          }
+            },
+          },
         }) as any
       );
 
@@ -60,9 +60,9 @@ export default {
     return {
       formWrapperRef,
       open,
-      formWrapperOptions
+      formWrapperOptions,
     };
-  }
+  },
 };
 </script>
 

packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.ts

@@ -0,0 +1,126 @@
+import { checkPipelineLimit, readCertDetail } from "/@/views/certd/pipeline/utils";
+import { omit } from "lodash-es";
+import * as api from "/@/views/certd/pipeline/api";
+import { message } from "ant-design-vue";
+import { nanoid } from "nanoid";
+import { useRouter } from "vue-router";
+
+export 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);
+}
+
+export function useCertd(certdFormRef: any) {
+  const router = useRouter();
+  async function openAddCertdPipelineDialog() {
+    //检查是否流水线数量超出限制
+    await checkPipelineLimit();
+
+    certdFormRef.value.open(async ({ form }: any) => {
+      const certDetail = readCertDetail(form.cert.crt);
+      // 添加certd pipeline
+      const triggers = [];
+      if (form.triggerCron) {
+        triggers.push({ title: "定时触发", type: "timer", props: { cron: form.triggerCron } });
+      }
+      const notifications = [];
+      if (form.notification != null) {
+        notifications.push({
+          type: "custom",
+          when: ["error", "turnToSuccess", "success"],
+          notificationId: form.notification,
+          title: form.notificationTarget?.name || "自定义通知",
+        });
+      }
+      const pluginInput = omit(form, ["triggerCron", "notification", "notificationTarget", "certApplyPlugin"]);
+      let pipeline = {
+        title: form.domains[0] + "证书自动化",
+        runnableType: "pipeline",
+        stages: [
+          {
+            title: "证书申请阶段",
+            maxTaskCount: 1,
+            runnableType: "stage",
+            tasks: [
+              {
+                title: "证书申请任务",
+                runnableType: "task",
+                steps: [
+                  {
+                    title: "申请证书",
+                    runnableType: "step",
+                    input: {
+                      renewDays: 35,
+                      ...pluginInput,
+                    },
+                    strategy: {
+                      runStrategy: 0, // 正常执行
+                    },
+                    type: form.certApplyPlugin,
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+        triggers,
+        notifications,
+      };
+      pipeline = setRunnableIds(pipeline);
+
+      /**
+       *  // cert: 证书; backup: 备份; custom:自定义;
+       *   type: string;
+       *   // custom: 自定义; monitor: 监控;
+       *   from: string;
+       */
+      const id = await api.Save({
+        title: pipeline.title,
+        content: JSON.stringify(pipeline),
+        keepHistoryCount: 30,
+        type: "cert",
+      });
+      message.success("创建成功,请添加证书部署任务");
+      router.push({ path: "/certd/pipeline/detail", query: { id, editMode: "true" } });
+    });
+  }
+
+  return {
+    openAddCertdPipelineDialog,
+  };
+}

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

@@ -4,62 +4,26 @@ import { computed, ref } from "vue";
 import { useRouter } from "vue-router";
 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, notification } from "ant-design-vue";
+import { Modal, notification } from "ant-design-vue";
 import { env } from "/@/utils/util.env";
 import { useUserStore } from "/@/store/modules/user";
 import dayjs from "dayjs";
 import { useSettingStore } from "/@/store/modules/settings";
-import * as _ from "lodash-es";
+import { cloneDeep } from "lodash-es";
 import { useModal } from "/@/use/use-modal";
 import CertView from "./cert-view.vue";
 import { eachStages } from "./utils";
-import { createNotificationApi as createNotificationApi } from "../notification/api";
-import { mySuiteApi } from "/@/views/certd/suite/mine/api";
+import { setRunnableIds, useCertd } from "/@/views/certd/pipeline/certd-form/use";
+import { useCertUpload } from "/@/views/certd/pipeline/cert-upload/use";
+
 export default function ({ crudExpose, context: { certdFormRef, groupDictRef, selectedRowKeys } }: 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);
-              }
-            }
-          }
-        }
-      }
-    }
+  const { openAddCertdPipelineDialog } = useCertd(certdFormRef);
+  const { openUploadCreateDialog } = useCertUpload();
 
-    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);
   };
@@ -76,7 +40,7 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
   const addRequest = async ({ form }: AddReq) => {
     if (form.content == null) {
       form.content = JSON.stringify({
-        title: form.title
+        title: form.title,
       });
     } else {
       //复制的流水线
@@ -96,90 +60,6 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
     return res;
   };
 
-  const settingsStore = useSettingStore();
-  async function addCertdPipeline() {
-    //检查是否流水线数量超出限制
-    if (settingsStore.isComm && settingsStore.suiteSetting.enabled) {
-      //检查数量是否超限
-
-      const suiteDetail = await mySuiteApi.SuiteDetailGet();
-      const max = suiteDetail.pipelineCount.max;
-      if (max != -1 && max <= suiteDetail.pipelineCount.used) {
-        notification.error({
-          message: `对不起，您最多只能创建${max}条流水线，请购买或升级套餐`
-        });
-        return;
-      }
-    }
-
-    certdFormRef.value.open(async ({ form }: any) => {
-      // 添加certd pipeline
-      const triggers = [];
-      if (form.triggerCron) {
-        triggers.push({ title: "定时触发", type: "timer", props: { cron: form.triggerCron } });
-      }
-      const notifications = [];
-      if (form.notification != null) {
-        notifications.push({
-          type: "custom",
-          when: ["error", "turnToSuccess", "success"],
-          notificationId: form.notification,
-          title: form.notificationTarget?.name || "自定义通知"
-        });
-      }
-      let pipeline = {
-        title: form.domains[0] + "证书自动化",
-        runnableType: "pipeline",
-        stages: [
-          {
-            title: "证书申请阶段",
-            maxTaskCount: 1,
-            runnableType: "stage",
-            tasks: [
-              {
-                title: "证书申请任务",
-                runnableType: "task",
-                steps: [
-                  {
-                    title: "申请证书",
-                    runnableType: "step",
-                    input: {
-                      renewDays: 35,
-                      ...form
-                    },
-                    strategy: {
-                      runStrategy: 0 // 正常执行
-                    },
-                    type: form.certApplyPlugin
-                  }
-                ]
-              }
-            ]
-          }
-        ],
-        triggers,
-        notifications
-      };
-      pipeline = setRunnableIds(pipeline);
-
-      /**
-       *  // cert: 证书; backup: 备份; custom:自定义;
-       *   type: string;
-       *   // custom: 自定义; monitor: 监控;
-       *   from: string;
-       */
-      const id = await api.Save({
-        title: pipeline.title,
-        content: JSON.stringify(pipeline),
-        keepHistoryCount: 30,
-        type: "cert",
-        from: "custom"
-      });
-      message.success("创建成功,请添加证书部署任务");
-      router.push({ path: "/certd/pipeline/detail", query: { id, editMode: "true" } });
-    });
-  }
-
   const model = useModal();
   const viewCert = async (row: any) => {
     const cert = await api.GetCert(row.id);
@@ -195,7 +75,7 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
       width: 800,
       content: () => {
         return <CertView cert={cert}></CertView>;
-      }
+      },
     });
   };
 
@@ -230,7 +110,7 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
             <div> {children}</div>
           </div>
         );
-      }
+      },
     });
   };
   const userStore = useUserStore();
@@ -242,7 +122,7 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
         pageRequest,
         addRequest,
         editRequest,
-        delRequest
+        delRequest,
       },
       settings: {
         plugins: {
@@ -259,46 +139,57 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
               selectedRowKeys,
               onSelectedChanged(selected) {
                 console.log("已选择变化：", selected);
-              }
-            }
-          }
-        }
+              },
+            },
+          },
+        },
       },
       actionbar: {
         buttons: {
           add: {
             order: 5,
-            text: "自定义流水线"
+            icon: "ion:ios-add-circle-outline",
+            text: "自定义流水线",
           },
           addCertd: {
             order: 1,
             text: "创建证书流水线",
             type: "primary",
+            icon: "ion:ios-add-circle-outline",
             click() {
-              addCertdPipeline();
-            }
-          }
-        }
+              openAddCertdPipelineDialog();
+            },
+          },
+          uploadCert: {
+            order: 2,
+            text: "上传证书部署",
+            type: "primary",
+            icon: "ion:cloud-upload-outline",
+            click() {
+              openUploadCreateDialog();
+            },
+          },
+        },
       },
       form: {
         afterSubmit({ form, res, mode }) {
           if (mode === "add") {
             router.push({ path: "/certd/pipeline/detail", query: { id: res.id, editMode: "true" } });
           }
-        }
+        },
       },
       table: {
-        scroll: { x: 1500 }
+        scroll: { x: 1500 },
       },
       tabs: {
         name: "groupId",
-        show: true
+        show: true,
       },
       rowHandle: {
         width: 200,
         fixed: "right",
         dropdown: {
-          show: true
+          show: true,
         },
         buttons: {
           play: {
@@ -313,30 +204,30 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
                 async onOk() {
                   await api.Trigger(row.id);
                   notification.success({ message: "管道已经开始运行" });
-                }
+                },
               });
-            }
+            },
           },
           view: {
             show: false,
             click({ row }) {
               router.push({ path: "/certd/pipeline/detail", query: { id: row.id, editMode: "false" } });
-            }
+            },
           },
           copy: {
-            click: async (context) => {
+            click: async context => {
               settingStore.checkPlus();
               const { ui } = useUi();
               // @ts-ignore
               let row = context[ui.tableColumn.row];
-              row = _.cloneDeep(row);
+              row = cloneDeep(row);
               row.title = row.title + "_copy";
               await crudExpose.openCopy({
                 row: row,
-                index: context.index
+                index: context.index,
               });
             },
-            class: "need-plus"
+            class: "need-plus",
           },
           config: {
             order: 1,
@@ -346,13 +237,13 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
             icon: "ant-design:edit-outlined",
             click({ row }) {
               router.push({ path: "/certd/pipeline/detail", query: { id: row.id, editMode: "true" } });
-            }
+            },
           },
           edit: {
             order: 2,
             title: "修改配置/分组",
             icon: "ant-design:setting-outlined",
-            dropdown: true
+            dropdown: true,
           },
           viewCert: {
             order: 3,
@@ -361,7 +252,7 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
             icon: "ph:certificate",
             async click({ row }) {
               await viewCert(row);
-            }
+            },
           },
           download: {
             order: 4,
@@ -370,13 +261,13 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
             icon: "ant-design:download-outlined",
             async click({ row }) {
               await downloadCert(row);
-            }
+            },
           },
           remove: {
             order: 5,
-            dropdown: true
-          }
-        }
+            dropdown: true,
+          },
+        },
       },
       columns: {
         id: {
@@ -384,14 +275,14 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
           key: "id",
           type: "number",
           search: {
-            show: true
+            show: true,
           },
           column: {
-            width: 100
+            width: 100,
           },
           form: {
-            show: false
-          }
+            show: false,
+          },
         },
         userId: {
           title: "用户Id",
@@ -399,17 +290,17 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
           search: {
             show: computed(() => {
               return userStore.isAdmin && settingStore.sysPublic.managerOtherUserPipeline;
-            })
+            }),
           },
           form: {
-            show: false
+            show: false,
           },
           column: {
             show: computed(() => {
               return userStore.isAdmin && settingStore.sysPublic.managerOtherUserPipeline;
             }),
-            width: 100
-          }
+            width: 100,
+          },
         },
         title: {
           title: "流水线名称",
@@ -418,11 +309,11 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
             show: true,
             title: "关键字",
             component: {
-              name: "a-input"
-            }
+              name: "a-input",
+            },
           },
           form: {
-            rules: [{ required: true, message: "此项必填" }]
+            rules: [{ required: true, message: "此项必填" }],
           },
           column: {
             width: 350,
@@ -432,16 +323,16 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
                 // 注意：必须要on前缀
                 onClick({ row }) {
                   router.push({ path: "/certd/pipeline/detail", query: { id: row.id, editMode: "false" } });
-                }
-              }
-            }
-          }
+                },
+              },
+            },
+          },
         },
         content: {
           title: "流水线内容",
           form: { show: false },
           column: {
-            show: false
+            show: false,
           },
           valueBuilder({ row }) {
             if (row.content) {
@@ -463,18 +354,18 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
             if (row.content) {
               row.content = JSON.stringify(row.content);
             }
-          }
+          },
         },
         _triggerCount: {
           title: "定时任务数",
           type: "number",
           column: {
             align: "center",
-            width: 100
+            width: 100,
           },
           form: {
-            show: false
-          }
+            show: false,
+          },
         },
         _stepCount: {
           title: "部署任务数",
@@ -482,14 +373,14 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
           form: { show: false },
           column: {
             align: "center",
-            width: 100
-          }
+            width: 100,
+          },
         },
         lastVars: {
           title: "到期剩余",
           type: "number",
           form: {
-            show: false
+            show: false,
           },
           column: {
             cellRender({ row }) {
@@ -501,38 +392,53 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
               const percent = (leftDays / 90) * 100;
               return <a-progress percent={percent} strokeColor={color} format={(percent: number) => `${leftDays} 天`} />;
             },
-            width: 150
-          }
+            width: 150,
+          },
+        },
+        "lastVars.certExpiresTime": {
+          title: "过期时间",
+          search: {
+            show: false,
+          },
+          type: "datetime",
+          form: {
+            show: false,
+          },
+          column: {
+            sorter: true,
+            width: 150,
+            align: "center",
+          },
         },
         status: {
           title: "状态",
           type: "dict-select",
           search: {
-            show: true
+            show: true,
           },
           dict: dict({
-            data: statusUtil.getOptions()
+            data: statusUtil.getOptions(),
           }),
           form: {
-            show: false
+            show: false,
           },
           column: {
             sorter: true,
             width: 120,
-            align: "center"
-          }
+            align: "center",
+          },
         },
         lastHistoryTime: {
           title: "最后运行",
           type: "datetime",
           form: {
-            show: false
+            show: false,
           },
           column: {
             sorter: true,
             width: 150,
-            align: "center"
-          }
+            align: "center",
+          },
         },
         disabled: {
           title: "启用",
@@ -540,12 +446,12 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
           dict: dict({
             data: [
               { value: false, label: "启用" },
-              { value: true, label: "禁用" }
-            ]
+              { value: true, label: "禁用" },
+            ],
           }),
           form: {
             value: false,
-            show: false
+            show: false,
           },
           column: {
             sorter: true,
@@ -553,30 +459,58 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
             align: "center",
             component: {
               name: "fs-dict-switch",
-              vModel: "checked"
+              vModel: "checked",
             },
             async valueChange({ row, key, value }) {
               return await api.UpdateObj({
                 id: row.id,
-                disabled: row[key]
+                disabled: row[key],
               });
-            }
-          }
+            },
+          },
         },
         groupId: {
           title: "分组",
           type: "dict-select",
           search: {
-            show: true
+            show: true,
           },
           dict: groupDictRef,
           column: {
             width: 130,
             align: "center",
             component: {
-              color: "auto"
-            }
-          }
+              color: "auto",
+            },
+            sorter: true,
+          },
+        },
+        type: {
+          title: "类型",
+          type: "dict-select",
+          search: {
+            show: true,
+          },
+          dict: dict({
+            data: [
+              { value: "cert", label: "证书申请" },
+              { value: "cert_upload", label: "证书上传" },
+              { value: "custom", label: "自定义" },
+            ],
+          }),
+          form: {
+            show: false,
+            value: "custom",
+          },
+          column: {
+            sorter: true,
+            width: 90,
+            align: "center",
+            show: true,
+            component: {
+              color: "auto",
+            },
+          },
         },
         order: {
           title: "排序号",
@@ -584,48 +518,50 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
           column: {
             sorter: true,
             align: "center",
-            width: 80
+            width: 80,
           },
           form: {
-            value: 0
-          }
+            value: 0,
+          },
         },
         keepHistoryCount: {
           title: "历史记录保持数",
           type: "number",
           form: {
             value: 20,
-            helper: "历史记录保持条数，多余的会被删除"
+            helper: "历史记录保持条数，多余的会被删除",
           },
           column: {
             width: 130,
-            show: false
-          }
+            show: false,
+            sorter: true,
+          },
         },
         createTime: {
           title: "创建时间",
           type: "datetime",
           form: {
-            show: false
+            show: false,
           },
           column: {
             sorter: true,
             width: 155,
-            align: "center"
-          }
+            align: "center",
+          },
         },
         updateTime: {
           title: "更新时间",
           type: "datetime",
           form: {
-            show: false
+            show: false,
           },
           column: {
             width: 125,
-            show: false
-          }
-        }
-      }
-    }
+            show: false,
+            sorter: true,
+          },
+        },
+      },
+    },
   };
 }