chore:

CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.11](https://github.com/certd/certd/compare/v1.36.10...v1.36.11) (2025-07-22)
+
+### Bug Fixes
+
+* 安全更新，备份数据库插件仅限管理员运行 ([13dfca1](https://github.com/certd/certd/commit/13dfca1749275526c82465a17c482b607c820fdd))
+
+## [1.36.10](https://github.com/certd/certd/compare/v1.36.9...v1.36.10) (2025-07-18)
+
+### Bug Fixes
+
+* 企业微信通知改成text类型，因为markdown类型不支持@用户 ([747d266](https://github.com/certd/certd/commit/747d26674248082e678a3fd5ecc94712641a2716))
+* api接口获取不到证书的bug ([05a33a0](https://github.com/certd/certd/commit/05a33a0ec9999e2802f6c7b23cc1c61a2b9e963d))
+
+### Performance Improvements
+
+* 部署到阿里云oss插件支持选择上传到阿里云cas中的证书 ([2ea2c8c](https://github.com/certd/certd/commit/2ea2c8c05fc40f79595f1bbde67c1413558bf684))
+* 优化子域名托管的说明 ([b15f514](https://github.com/certd/certd/commit/b15f514018b728acb0922ee3f93c1f302eb5d471))
+* 账号即将过期通知 ([e403450](https://github.com/certd/certd/commit/e40345095f31e2fb8e2333a6647466659133fa0c))
+* 子域名托管重复域名不允许添加 ([ffc0c7b](https://github.com/certd/certd/commit/ffc0c7bb7b16d9904fd2d905d1c4e1d4854e92a9))
+
 ## [1.36.9](https://github.com/certd/certd/compare/v1.36.7...v1.36.9) (2025-07-15)
 
 ### Bug Fixes

build.trigger

@@ -1 +1 @@
-15:36
+12:27

docs/guide/changelogs/CHANGELOG.md

@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.11](https://github.com/certd/certd/compare/v1.36.10...v1.36.11) (2025-07-22)
+
+### Bug Fixes
+
+* 安全更新，备份数据库插件仅限管理员运行 ([13dfca1](https://github.com/certd/certd/commit/13dfca1749275526c82465a17c482b607c820fdd))
+
+## [1.36.10](https://github.com/certd/certd/compare/v1.36.9...v1.36.10) (2025-07-18)
+
+### Bug Fixes
+
+* 企业微信通知改成text类型，因为markdown类型不支持@用户 ([747d266](https://github.com/certd/certd/commit/747d26674248082e678a3fd5ecc94712641a2716))
+* api接口获取不到证书的bug ([05a33a0](https://github.com/certd/certd/commit/05a33a0ec9999e2802f6c7b23cc1c61a2b9e963d))
+
+### Performance Improvements
+
+* 部署到阿里云oss插件支持选择上传到阿里云cas中的证书 ([2ea2c8c](https://github.com/certd/certd/commit/2ea2c8c05fc40f79595f1bbde67c1413558bf684))
+* 优化子域名托管的说明 ([b15f514](https://github.com/certd/certd/commit/b15f514018b728acb0922ee3f93c1f302eb5d471))
+* 账号即将过期通知 ([e403450](https://github.com/certd/certd/commit/e40345095f31e2fb8e2333a6647466659133fa0c))
+* 子域名托管重复域名不允许添加 ([ffc0c7b](https://github.com/certd/certd/commit/ffc0c7bb7b16d9904fd2d905d1c4e1d4854e92a9))
+
+## [1.36.9](https://github.com/certd/certd/compare/v1.36.7...v1.36.9) (2025-07-15)
+
+### Bug Fixes
+
+* 修复ssh无法执行命令的bug ([9763cb0](https://github.com/certd/certd/commit/9763cb00e5d95b2fa5d1c2d3d4a8eecac71600e6))
+
 ## [1.36.7](https://github.com/certd/certd/compare/v1.36.6...v1.36.7) (2025-07-15)
 
 ### Bug Fixes

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.36.9"
+  "version": "1.36.11"
 }

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.36.11](https://github.com/publishlab/node-acme-client/compare/v1.36.10...v1.36.11) (2025-07-22)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.36.10](https://github.com/publishlab/node-acme-client/compare/v1.36.9...v1.36.10) (2025-07-18)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.36.9](https://github.com/publishlab/node-acme-client/compare/v1.36.7...v1.36.9) (2025-07-15)
 
 **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.36.9",
+    "version": "1.36.11",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.36.9",
+        "@certd/basic": "^1.36.11",
         "@peculiar/x509": "^1.11.0",
         "asn1js": "^3.0.5",
         "axios": "^1.7.2",
@@ -69,5 +69,5 @@
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
     },
-    "gitHead": "e0408f30ba604c4dbe7cb415d1eac8cb588fbc45"
+    "gitHead": "7f9c4e52ac5c3837b251d3b2508457ce802e11cb"
 }

packages/core/basic/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.36.11](https://github.com/certd/certd/compare/v1.36.10...v1.36.11) (2025-07-22)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.36.10](https://github.com/certd/certd/compare/v1.36.9...v1.36.10) (2025-07-18)
+
+**Note:** Version bump only for package @certd/basic
+
 ## [1.36.9](https://github.com/certd/certd/compare/v1.36.7...v1.36.9) (2025-07-15)
 
 **Note:** Version bump only for package @certd/basic

packages/core/basic/build.md

@@ -1 +1 @@
-16:46
+12:23

packages/core/basic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.36.9",
+  "version": "1.36.11",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -45,5 +45,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "e0408f30ba604c4dbe7cb415d1eac8cb588fbc45"
+  "gitHead": "7f9c4e52ac5c3837b251d3b2508457ce802e11cb"
 }

packages/core/pipeline/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.36.11](https://github.com/certd/certd/compare/v1.36.10...v1.36.11) (2025-07-22)
+
+### Bug Fixes
+
+* 安全更新，备份数据库插件仅限管理员运行 ([13dfca1](https://github.com/certd/certd/commit/13dfca1749275526c82465a17c482b607c820fdd))
+
+## [1.36.10](https://github.com/certd/certd/compare/v1.36.9...v1.36.10) (2025-07-18)
+
+**Note:** Version bump only for package @certd/pipeline
+
 ## [1.36.9](https://github.com/certd/certd/compare/v1.36.7...v1.36.9) (2025-07-15)
 
 **Note:** Version bump only for package @certd/pipeline

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.36.9",
+  "version": "1.36.11",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -17,8 +17,8 @@
     "pub": "npm publish"
   },
   "dependencies": {
-    "@certd/basic": "^1.36.9",
-    "@certd/plus-core": "^1.36.9",
+    "@certd/basic": "^1.36.11",
+    "@certd/plus-core": "^1.36.11",
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",
     "reflect-metadata": "^0.1.13"
@@ -44,5 +44,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "e0408f30ba604c4dbe7cb415d1eac8cb588fbc45"
+  "gitHead": "7f9c4e52ac5c3837b251d3b2508457ce802e11cb"
 }

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

@@ -352,6 +352,7 @@ export class Executor {
       pipeline: this.pipeline,
       runtime: this.runtime,
       step,
+      define: cloneDeep(define),
       lastStatus,
       http,
       download,

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

@@ -59,6 +59,7 @@ export type PluginDefine = Registrable & {
       form: any;
     };
   };
+  onlyAdmin?: boolean;
   needPlus?: boolean;
   showRunStrategy?: boolean;
   pluginType?: string; //类型
@@ -85,6 +86,7 @@ export type TaskInstanceContext = {
   runtime: RunHistory;
   //步骤定义
   step: Step;
+  define: PluginDefine;
   //日志
   logger: ILogger;
   //当前步骤输入参数跟上一次执行比较是否有变化
@@ -162,6 +164,12 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
       this.registerSecret(cert.key);
       this.registerSecret(cert.one);
     }
+
+    if (this.ctx.define.onlyAdmin) {
+      if (!this.isAdmin()) {
+        throw new Error("只有管理员才能运行此任务");
+      }
+    }
   }
 
   async getAccess<T = any>(accessId: string | number, isCommon = false) {

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

@@ -30,4 +30,5 @@ export const pluginGroups = {
   qiniu: new PluginGroup("qiniu", "七牛云", 5, "svg:icon-qiniuyun"),
   aws: new PluginGroup("aws", "亚马逊云", 6, "svg:icon-aws"),
   other: new PluginGroup("other", "其他", 10, "clarity:plugin-line"),
+  admin: new PluginGroup("admin", "管理", 11, "ion:settings-outline"),
 };

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.36.11](https://github.com/certd/certd/compare/v1.36.10...v1.36.11) (2025-07-22)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.36.10](https://github.com/certd/certd/compare/v1.36.9...v1.36.10) (2025-07-18)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.36.9](https://github.com/certd/certd/compare/v1.36.7...v1.36.9) (2025-07-15)
 
 **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.36.9",
+  "version": "1.36.11",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
   "types": "./dist/d/index.d.ts",
@@ -24,5 +24,5 @@
     "prettier": "^2.8.8",
     "tslib": "^2.8.1"
   },
-  "gitHead": "e0408f30ba604c4dbe7cb415d1eac8cb588fbc45"
+  "gitHead": "7f9c4e52ac5c3837b251d3b2508457ce802e11cb"
 }

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.36.11](https://github.com/certd/certd/compare/v1.36.10...v1.36.11) (2025-07-22)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.36.10](https://github.com/certd/certd/compare/v1.36.9...v1.36.10) (2025-07-18)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
 ## [1.36.9](https://github.com/certd/certd/compare/v1.36.7...v1.36.9) (2025-07-15)
 
 **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.36.9",
+  "version": "1.36.11",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -31,5 +31,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "e0408f30ba604c4dbe7cb415d1eac8cb588fbc45"
+  "gitHead": "7f9c4e52ac5c3837b251d3b2508457ce802e11cb"
 }

packages/libs/lib-jdcloud/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.36.11](https://github.com/certd/certd/compare/v1.36.10...v1.36.11) (2025-07-22)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.36.10](https://github.com/certd/certd/compare/v1.36.9...v1.36.10) (2025-07-18)
+
+**Note:** Version bump only for package @certd/jdcloud
+
 ## [1.36.9](https://github.com/certd/certd/compare/v1.36.7...v1.36.9) (2025-07-15)
 
 **Note:** Version bump only for package @certd/jdcloud

packages/libs/lib-jdcloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/jdcloud",
-  "version": "1.36.9",
+  "version": "1.36.11",
   "description": "jdcloud openApi sdk",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
@@ -61,5 +61,5 @@
       "fetch"
     ]
   },
-  "gitHead": "e0408f30ba604c4dbe7cb415d1eac8cb588fbc45"
+  "gitHead": "7f9c4e52ac5c3837b251d3b2508457ce802e11cb"
 }

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.36.11](https://github.com/certd/certd/compare/v1.36.10...v1.36.11) (2025-07-22)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.36.10](https://github.com/certd/certd/compare/v1.36.9...v1.36.10) (2025-07-18)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 ## [1.36.9](https://github.com/certd/certd/compare/v1.36.7...v1.36.9) (2025-07-15)
 
 **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.36.9",
+  "version": "1.36.11",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -17,7 +17,7 @@
     "pub": "npm publish"
   },
   "dependencies": {
-    "@certd/basic": "^1.36.9",
+    "@certd/basic": "^1.36.11",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
@@ -32,5 +32,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "e0408f30ba604c4dbe7cb415d1eac8cb588fbc45"
+  "gitHead": "7f9c4e52ac5c3837b251d3b2508457ce802e11cb"
 }

packages/libs/lib-k8s/src/index.ts

@@ -1 +1 @@
-export * from './lib/k8s.client.js';
+export * from "./lib/k8s.client.js";

packages/libs/lib-k8s/src/lib/k8s.client.ts

@@ -1,7 +1,7 @@
-import { CoreV1Api, KubeConfig, NetworkingV1Api, V1Ingress, V1Secret } from '@kubernetes/client-node';
-import dns from 'dns';
-import { ILogger } from '@certd/basic';
-import _ from 'lodash-es';
+import { CoreV1Api, KubeConfig, NetworkingV1Api, V1Ingress, V1Secret } from "@kubernetes/client-node";
+import dns from "dns";
+import { ILogger } from "@certd/basic";
+import _ from "lodash-es";
 
 export type K8sClientOpts = {
   kubeConfigStr: string;
@@ -9,6 +9,7 @@ export type K8sClientOpts = {
   //{  [domain]:{ip:'xxx.xx.xxx'} }
   //暂时没用
   lookup?: any;
+  skipTLSVerify?: boolean;
 };
 export class K8sClient {
   kubeconfig!: KubeConfig;
@@ -16,10 +17,12 @@ export class K8sClient {
   lookup!: (hostnameReq: any, options: any, callback: any) => void;
   client!: CoreV1Api;
   logger: ILogger;
+  skipTLSVerify?: boolean;
   constructor(opts: K8sClientOpts) {
     this.kubeConfigStr = opts.kubeConfigStr;
     this.logger = opts.logger;
     this.setLookup(opts.lookup);
+    this.skipTLSVerify = opts.skipTLSVerify;
     this.init();
   }
 
@@ -27,6 +30,18 @@ export class K8sClient {
     const kubeconfig = new KubeConfig();
     kubeconfig.loadFromString(this.kubeConfigStr);
     this.kubeconfig = kubeconfig;
+
+    try {
+      if (this.skipTLSVerify == true) {
+        for (const cluster of kubeconfig.getClusters()) {
+          // @ts-ignore
+          cluster["skipTLSVerify"] = this.skipTLSVerify;
+        }
+      }
+    } catch (e) {
+      this.logger.warn("skipTLSVerify error", e);
+    }
+
     this.client = kubeconfig.makeApiClient(CoreV1Api);
 
     // const reqOpts = { kubeconfig, request: {} } as any;
@@ -47,9 +62,9 @@ export class K8sClient {
       return;
     }
     this.lookup = (hostnameReq: any, options: any, callback: any) => {
-      this.logger.info('custom lookup', hostnameReq, localRecords);
+      this.logger.info("custom lookup", hostnameReq, localRecords);
       if (localRecords[hostnameReq]) {
-        this.logger.info('local record', hostnameReq, localRecords[hostnameReq]);
+        this.logger.info("local record", hostnameReq, localRecords[hostnameReq]);
         callback(null, localRecords[hostnameReq].ip, 4);
       } else {
         dns.lookup(hostnameReq, options, callback);
@@ -63,7 +78,7 @@ export class K8sClient {
    * @returns secretsList
    */
   async getSecrets(opts: { namespace: string }) {
-    const namespace = opts.namespace || 'default';
+    const namespace = opts.namespace || "default";
     return await this.client.listNamespacedSecret(namespace);
   }
 
@@ -73,9 +88,9 @@ export class K8sClient {
    * @returns {Promise<*>}
    */
   async createSecret(opts: { namespace: string; body: V1Secret }) {
-    const namespace = opts.namespace || 'default';
+    const namespace = opts.namespace || "default";
     const created = await this.client.createNamespacedSecret(namespace, opts.body);
-    this.logger.info('new secrets:', opts.body);
+    this.logger.info("new secrets:", opts.body);
     return created.body;
   }
 
@@ -89,24 +104,24 @@ export class K8sClient {
   // }
 
   async patchSecret(opts: { namespace: string; secretName: string; body: V1Secret }) {
-    const namespace = opts.namespace || 'default';
+    const namespace = opts.namespace || "default";
     const secretName = opts.secretName;
     if (secretName == null) {
-      throw new Error('secretName 不能为空');
+      throw new Error("secretName 不能为空");
     }
-    this.logger.info('patch secret:', secretName, namespace);
+    this.logger.info("patch secret:", secretName, namespace);
     const oldSecret = await this.client.readNamespacedSecret(secretName, namespace);
     const newSecret = _.merge(oldSecret.body, opts.body);
     const res = await this.client.replaceNamespacedSecret(secretName, namespace, newSecret);
-    this.logger.info('secret updated');
+    this.logger.info("secret updated");
     return res.body;
   }
 
   async getIngressList(opts: { namespace: string }) {
-    const namespace = opts.namespace || 'default';
+    const namespace = opts.namespace || "default";
     const client = this.kubeconfig.makeApiClient(NetworkingV1Api);
     const res = await client.listNamespacedIngress(namespace);
-    this.logger.info('ingress list get:', res.body);
+    this.logger.info("ingress list get:", res.body);
     return res.body;
   }
 
@@ -122,17 +137,17 @@ export class K8sClient {
   // }
 
   async patchIngress(opts: { namespace: string; ingressName: string; body: V1Ingress }) {
-    const namespace = opts.namespace || 'default';
+    const namespace = opts.namespace || "default";
     const ingressName = opts.ingressName;
     if (!ingressName) {
-      throw new Error('ingressName 不能为空');
+      throw new Error("ingressName 不能为空");
     }
-    this.logger.info('patch ingress:', ingressName, namespace);
+    this.logger.info("patch ingress:", ingressName, namespace);
     const client = this.kubeconfig.makeApiClient(NetworkingV1Api);
     const oldIngress = await client.readNamespacedIngress(ingressName, namespace);
     const newIngress = _.merge(oldIngress.body, opts.body);
     const res = await client.replaceNamespacedIngress(ingressName, namespace, newIngress);
-    this.logger.info('ingress patched', opts.body);
+    this.logger.info("ingress patched", opts.body);
     return res;
   }
 }

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.36.11](https://github.com/certd/certd/compare/v1.36.10...v1.36.11) (2025-07-22)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.36.10](https://github.com/certd/certd/compare/v1.36.9...v1.36.10) (2025-07-18)
+
+**Note:** Version bump only for package @certd/lib-server
+
 ## [1.36.9](https://github.com/certd/certd/compare/v1.36.7...v1.36.9) (2025-07-15)
 
 **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.36.9",
+  "version": "1.36.11",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -27,10 +27,10 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.36.9",
-    "@certd/basic": "^1.36.9",
-    "@certd/pipeline": "^1.36.9",
-    "@certd/plus-core": "^1.36.9",
+    "@certd/acme-client": "^1.36.11",
+    "@certd/basic": "^1.36.11",
+    "@certd/pipeline": "^1.36.11",
+    "@certd/plus-core": "^1.36.11",
     "@midwayjs/cache": "~3.14.0",
     "@midwayjs/core": "~3.20.3",
     "@midwayjs/i18n": "~3.20.3",
@@ -61,5 +61,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "e0408f30ba604c4dbe7cb415d1eac8cb588fbc45"
+  "gitHead": "7f9c4e52ac5c3837b251d3b2508457ce802e11cb"
 }

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.36.11](https://github.com/certd/certd/compare/v1.36.10...v1.36.11) (2025-07-22)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.36.10](https://github.com/certd/certd/compare/v1.36.9...v1.36.10) (2025-07-18)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
 ## [1.36.9](https://github.com/certd/certd/compare/v1.36.7...v1.36.9) (2025-07-15)
 
 **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.36.9",
+  "version": "1.36.11",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -46,5 +46,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "e0408f30ba604c4dbe7cb415d1eac8cb588fbc45"
+  "gitHead": "7f9c4e52ac5c3837b251d3b2508457ce802e11cb"
 }

packages/plugins/plugin-cert/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.36.11](https://github.com/certd/certd/compare/v1.36.10...v1.36.11) (2025-07-22)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.36.10](https://github.com/certd/certd/compare/v1.36.9...v1.36.10) (2025-07-18)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
 ## [1.36.9](https://github.com/certd/certd/compare/v1.36.7...v1.36.9) (2025-07-15)
 
 **Note:** Version bump only for package @certd/plugin-cert

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.36.9",
+  "version": "1.36.11",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -16,10 +16,10 @@
     "pub": "npm publish"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.36.9",
-    "@certd/basic": "^1.36.9",
-    "@certd/pipeline": "^1.36.9",
-    "@certd/plugin-lib": "^1.36.9",
+    "@certd/acme-client": "^1.36.11",
+    "@certd/basic": "^1.36.11",
+    "@certd/pipeline": "^1.36.11",
+    "@certd/plugin-lib": "^1.36.11",
     "@google-cloud/publicca": "^1.3.0",
     "dayjs": "^1.11.7",
     "jszip": "^3.10.1",
@@ -43,5 +43,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "e0408f30ba604c4dbe7cb415d1eac8cb588fbc45"
+  "gitHead": "7f9c4e52ac5c3837b251d3b2508457ce802e11cb"
 }

packages/plugins/plugin-lib/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.36.11](https://github.com/certd/certd/compare/v1.36.10...v1.36.11) (2025-07-22)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
+## [1.36.10](https://github.com/certd/certd/compare/v1.36.9...v1.36.10) (2025-07-18)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
 ## [1.36.9](https://github.com/certd/certd/compare/v1.36.7...v1.36.9) (2025-07-15)
 
 ### Bug Fixes

packages/plugins/plugin-lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-lib",
   "private": false,
-  "version": "1.36.9",
+  "version": "1.36.11",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -21,8 +21,8 @@
     "@alicloud/pop-core": "^1.7.10",
     "@alicloud/tea-util": "^1.4.10",
     "@aws-sdk/client-s3": "^3.787.0",
-    "@certd/basic": "^1.36.9",
-    "@certd/pipeline": "^1.36.9",
+    "@certd/basic": "^1.36.11",
+    "@certd/pipeline": "^1.36.11",
     "@kubernetes/client-node": "0.21.0",
     "ali-oss": "^6.22.0",
     "basic-ftp": "^5.0.5",
@@ -53,5 +53,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "e0408f30ba604c4dbe7cb415d1eac8cb588fbc45"
+  "gitHead": "7f9c4e52ac5c3837b251d3b2508457ce802e11cb"
 }

packages/ui/certd-client/.gitignore

@@ -9,3 +9,4 @@ yarn.lock
 /.idea/
 yarn-error.log
 vite-profile.cpuprofile
+!build

packages/ui/certd-client/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.36.11](https://github.com/certd/certd/compare/v1.36.10...v1.36.11) (2025-07-22)
+
+**Note:** Version bump only for package @certd/ui-client
+
+## [1.36.10](https://github.com/certd/certd/compare/v1.36.9...v1.36.10) (2025-07-18)
+
+### Performance Improvements
+
+* 优化子域名托管的说明 ([b15f514](https://github.com/certd/certd/commit/b15f514018b728acb0922ee3f93c1f302eb5d471))
+* 账号即将过期通知 ([e403450](https://github.com/certd/certd/commit/e40345095f31e2fb8e2333a6647466659133fa0c))
+* 子域名托管重复域名不允许添加 ([ffc0c7b](https://github.com/certd/certd/commit/ffc0c7bb7b16d9904fd2d905d1c4e1d4854e92a9))
+
 ## [1.36.9](https://github.com/certd/certd/compare/v1.36.7...v1.36.9) (2025-07-15)
 
 **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.36.9",
+  "version": "1.36.11",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -103,8 +103,8 @@
     "zod-defaults": "^0.1.3"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.36.9",
-    "@certd/pipeline": "^1.36.9",
+    "@certd/lib-iframe": "^1.36.11",
+    "@certd/pipeline": "^1.36.11",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

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

@@ -280,6 +280,10 @@ function openUpgrade() {
     },
   };
 
+  const productListUrl = computed(() => {
+    return `http://localhost:1017/subject/#/product/list?appKey=${settingStore.installInfo.appKey}&subjectId=${settingStore.installInfo.siteId}`;
+  });
+
   const modalRef = modal.confirm({
     title,
     async onOk() {

packages/ui/certd-client/src/locales/langs/en-US/certd.ts

@@ -78,6 +78,7 @@ export default {
     runCount: "Run Count",
     expiringCerts: "Soon-to-Expire Certificates",
     supportedTasks: "Overview of Supported Deployment Tasks",
+    changeLog: "Change Log",
   },
   steps: {
     createPipeline: "Create Certificate Pipeline",
@@ -449,7 +450,7 @@ export default {
   batchDeleteConfirm: "Are you sure to batch delete these {count} records?",
   selectRecordFirst: "Please select records first",
   subdomainHosted: "Hosted Subdomain",
-  subdomainHelpText: "If you don't understand what subdomain hosting is, please refer to the documentation ",
+  subdomainHelpText: "If you don't understand what subdomain hosting is,Do not set it randomly, as it may result in the inability to apply for the certificate. please refer to the documentation ",
   subdomainManagement: "Subdomain Management",
   isDisabled: "Is Disabled",
   enabled: "Enabled",

packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts

@@ -84,6 +84,7 @@ export default {
     runCount: "运行次数",
     expiringCerts: "最快到期证书",
     supportedTasks: "已支持的部署任务总览",
+    changeLog: "更新日志",
   },
   steps: {
     createPipeline: "创建证书流水线",
@@ -415,7 +416,7 @@ export default {
   is_present_no: "否",
   basicInfo: "基础信息",
   titlea: "名称",
-  disabled: "是否禁用",
+  disabled: "禁用",
   ordera: "排序",
   supportBuy: "支持购买",
   intro: "介绍",
@@ -455,7 +456,7 @@ export default {
   batchDeleteConfirm: "确定要批量删除这{count}条记录吗",
   selectRecordFirst: "请先勾选记录",
   subdomainHosted: "托管的子域名",
-  subdomainHelpText: "如果您不理解什么是子域托管，可以参考文档",
+  subdomainHelpText: "如果您不理解什么是子域托管，请不要随意设置，可能导致证书无法申请，可以参考文档",
   subdomainManagement: "子域管理",
   isDisabled: "是否禁用",
   enabled: "启用",

packages/ui/certd-client/src/vben/menu-ui/components/normal-menu/normal-menu.vue

@@ -112,7 +112,8 @@ function menuIcon(menu: MenuRecordRaw) {
 
       .vben-normal-menu__name,
       .vben-normal-menu__icon {
-        @apply text-primary-foreground font-semibold;
+        //@apply text-primary-foreground font-semibold;
+        @apply font-semibold;
       }
     }
 

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

@@ -26,43 +26,45 @@
         </template>
         <div class="flex-col h-100 w-100 overflow-hidden">
           <a-tabs v-model:active-key="pluginGroupActive" tab-position="left" class="flex-1 overflow-hidden">
-            <a-tab-pane v-for="group of computedPluginGroups" :key="group.key" class="scroll-y">
-              <template #tab>
-                <div class="cd-step-form-tab-label">
-                  <fs-icon :icon="group.icon" class="mr-2" />
-                  <div>{{ group.title }}</div>
-                </div>
-              </template>
-              <a-row v-if="!group.plugins || group.plugins.length === 0" :gutter="10">
-                <a-col class="flex-o">
-                  <div class="flex-o m-10">没有找到插件</div>
-                </a-col>
-              </a-row>
-              <a-row v-else :gutter="10">
-                <a-col v-for="item of group.plugins" :key="item.key" class="step-plugin w-full md:w-[50%]">
-                  <a-card
-                    hoverable
-                    :class="{ current: item.name === currentStep.type }"
-                    @click="stepTypeSelected(item)"
-                    @dblclick="
-                      stepTypeSelected(item);
-                      stepTypeSave();
-                    "
-                  >
-                    <a-card-meta>
-                      <template #title>
-                        <fs-icon class="plugin-icon" :icon="item.icon || 'clarity:plugin-line'"></fs-icon>
-                        <span class="title" :title="item.title">{{ item.title }}</span>
-                        <vip-button v-if="item.needPlus" mode="icon" />
-                      </template>
-                      <template #description>
-                        <span :title="item.desc" v-html="transformDesc(item.desc)"></span>
-                      </template>
-                    </a-card-meta>
-                  </a-card>
-                </a-col>
-              </a-row>
-            </a-tab-pane>
+            <template v-for="group of computedPluginGroups" :key="group.key">
+              <a-tab-pane v-if="(group.key === 'admin' && userStore.isAdmin) || group.key !== 'admin'" :key="group.key" class="scroll-y">
+                <template #tab>
+                  <div class="cd-step-form-tab-label">
+                    <fs-icon :icon="group.icon" class="mr-2" />
+                    <div>{{ group.title }}</div>
+                  </div>
+                </template>
+                <a-row v-if="!group.plugins || group.plugins.length === 0" :gutter="10">
+                  <a-col class="flex-o">
+                    <div class="flex-o m-10">没有找到插件</div>
+                  </a-col>
+                </a-row>
+                <a-row v-else :gutter="10">
+                  <a-col v-for="item of group.plugins" :key="item.key" class="step-plugin w-full md:w-[50%]">
+                    <a-card
+                      hoverable
+                      :class="{ current: item.name === currentStep.type }"
+                      @click="stepTypeSelected(item)"
+                      @dblclick="
+                        stepTypeSelected(item);
+                        stepTypeSave();
+                      "
+                    >
+                      <a-card-meta>
+                        <template #title>
+                          <fs-icon class="plugin-icon" :icon="item.icon || 'clarity:plugin-line'"></fs-icon>
+                          <span class="title" :title="item.title">{{ item.title }}</span>
+                          <vip-button v-if="item.needPlus" mode="icon" />
+                        </template>
+                        <template #description>
+                          <span :title="item.desc" v-html="transformDesc(item.desc)"></span>
+                        </template>
+                      </a-card-meta>
+                    </a-card>
+                  </a-col>
+                </a-row>
+              </a-tab-pane>
+            </template>
           </a-tabs>
         </div>
         <template #footer>
@@ -124,6 +126,7 @@ import { useReference } from "/@/use/use-refrence";
 import { useSettingStore } from "/@/store/settings";
 import { mitter } from "/@/utils/util.mitt";
 import { utils } from "/@/utils";
+import { useUserStore } from "/@/store/user";
 
 defineOptions({
   name: "PiStepForm",
@@ -138,7 +141,7 @@ const props = defineProps({
 const emit = defineEmits(["update"]);
 
 const pluginStore = usePluginStore();
-
+const userStore = useUserStore();
 function transformDesc(desc: string = "") {
   return utils.transformLink(desc);
 }

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

@@ -3,7 +3,12 @@
     <template #header>
       <div class="title">
         {{ t("certd.subdomainHosting") }}
-        <span class="sub">{{ t("certd.subdomainHostingHint") }}</span>
+        <span class="sub">
+          {{ t("certd.subdomainHostingHint") }}； {{ t("certd.subdomainHelpText") }}
+          <a href="https://help.aliyun.com/zh/dns/subdomain-management" target="_blank">
+            {{ t("certd.subdomainManagement") }}
+          </a>
+        </span>
       </div>
     </template>
     <fs-crud ref="crudRef" v-bind="crudBinding">

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

@@ -29,6 +29,10 @@
                   </a-tag>
                 </a-badge>
                 <a-divider type="vertical" />
+                <a-tag color="blue" class="flex-inline pointer mr-0" @click="openChangeLogUrl()">
+                  {{ t("certd.dashboard.changeLog") }}
+                </a-tag>
+                <a-divider type="vertical" />
                 <vip-button mode="nav" style="font-size: 12px"></vip-button>
               </template>
               <template v-if="settingsStore.isComm">
@@ -255,6 +259,9 @@ onMounted(async () => {
 function openUpgradeUrl() {
   window.open("https://certd.docmirror.cn/guide/install/upgrade.html");
 }
+function openChangeLogUrl() {
+  window.open("https://certd.docmirror.cn/guide/changelogs/CHANGELOG.html");
+}
 </script>
 
 <style lang="less">

packages/ui/certd-client/src/views/sys/authority/user/crud.tsx

@@ -1,10 +1,11 @@
 import * as api from "./api";
-import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { useUserStore } from "/@/store/user";
 import { Modal, notification } from "ant-design-vue";
 import dayjs from "dayjs";
 import { useSettingStore } from "/@/store/settings";
 import { useI18n } from "/src/locales";
+import { computed } from "vue";
 
 export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -26,7 +27,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
   const userStore = useUserStore();
 
   const settingStore = useSettingStore();
-  const userValidTimeEnabled = compute(() => {
+  const userValidTimeEnabled = computed(() => {
     return settingStore.sysPublic.userValidTimeEnabled === true;
   });
   return {
@@ -226,7 +227,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
           column: {
             align: "center",
             sorter: true,
-            width: 100,
+            width: 160,
             show: userValidTimeEnabled,
             cellRender({ value }) {
               if (value == null || value === 0) {

packages/ui/certd-server/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.11](https://github.com/certd/certd/compare/v1.36.10...v1.36.11) (2025-07-22)
+
+### Bug Fixes
+
+* 安全更新，备份数据库插件仅限管理员运行 ([13dfca1](https://github.com/certd/certd/commit/13dfca1749275526c82465a17c482b607c820fdd))
+
+## [1.36.10](https://github.com/certd/certd/compare/v1.36.9...v1.36.10) (2025-07-18)
+
+### Bug Fixes
+
+* 企业微信通知改成text类型，因为markdown类型不支持@用户 ([747d266](https://github.com/certd/certd/commit/747d26674248082e678a3fd5ecc94712641a2716))
+* api接口获取不到证书的bug ([05a33a0](https://github.com/certd/certd/commit/05a33a0ec9999e2802f6c7b23cc1c61a2b9e963d))
+
+### Performance Improvements
+
+* 部署到阿里云oss插件支持选择上传到阿里云cas中的证书 ([2ea2c8c](https://github.com/certd/certd/commit/2ea2c8c05fc40f79595f1bbde67c1413558bf684))
+* 账号即将过期通知 ([e403450](https://github.com/certd/certd/commit/e40345095f31e2fb8e2333a6647466659133fa0c))
+* 子域名托管重复域名不允许添加 ([ffc0c7b](https://github.com/certd/certd/commit/ffc0c7bb7b16d9904fd2d905d1c4e1d4854e92a9))
+
 ## [1.36.9](https://github.com/certd/certd/compare/v1.36.7...v1.36.9) (2025-07-15)
 
 **Note:** Version bump only for package @certd/ui-server

packages/ui/certd-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-server",
-  "version": "1.36.9",
+  "version": "1.36.11",
   "description": "fast-server base midway",
   "private": true,
   "type": "module",
@@ -42,20 +42,20 @@
     "@aws-sdk/client-cloudfront": "^3.699.0",
     "@aws-sdk/client-iam": "^3.699.0",
     "@aws-sdk/client-s3": "^3.705.0",
-    "@certd/acme-client": "^1.36.9",
-    "@certd/basic": "^1.36.9",
-    "@certd/commercial-core": "^1.36.9",
+    "@certd/acme-client": "^1.36.11",
+    "@certd/basic": "^1.36.11",
+    "@certd/commercial-core": "^1.36.11",
     "@certd/cv4pve-api-javascript": "^8.4.1",
-    "@certd/jdcloud": "^1.36.9",
-    "@certd/lib-huawei": "^1.36.9",
-    "@certd/lib-k8s": "^1.36.9",
-    "@certd/lib-server": "^1.36.9",
-    "@certd/midway-flyway-js": "^1.36.9",
-    "@certd/pipeline": "^1.36.9",
-    "@certd/plugin-cert": "^1.36.9",
-    "@certd/plugin-lib": "^1.36.9",
-    "@certd/plugin-plus": "^1.36.9",
-    "@certd/plus-core": "^1.36.9",
+    "@certd/jdcloud": "^1.36.11",
+    "@certd/lib-huawei": "^1.36.11",
+    "@certd/lib-k8s": "^1.36.11",
+    "@certd/lib-server": "^1.36.11",
+    "@certd/midway-flyway-js": "^1.36.11",
+    "@certd/pipeline": "^1.36.11",
+    "@certd/plugin-cert": "^1.36.11",
+    "@certd/plugin-lib": "^1.36.11",
+    "@certd/plugin-plus": "^1.36.11",
+    "@certd/plus-core": "^1.36.11",
     "@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120",
     "@huaweicloud/huaweicloud-sdk-core": "^3.1.120",
     "@koa/cors": "^5.0.0",

packages/ui/certd-server/src/modules/auto/auto-c-register-cron.ts

@@ -1,15 +1,16 @@
-import { Autoload, Config, Init, Inject, Scope, ScopeEnum } from '@midwayjs/core';
-import { PipelineService } from '../pipeline/service/pipeline-service.js';
-import { logger } from '@certd/basic';
+import {Autoload, Config, Init, Inject, Scope, ScopeEnum} from '@midwayjs/core';
+import {PipelineService} from '../pipeline/service/pipeline-service.js';
+import {logger} from '@certd/basic';
 import {SysSettingsService, SysSiteInfo} from '@certd/lib-server';
-import { SiteInfoService } from '../monitor/index.js';
-import { Cron } from '../cron/cron.js';
+import {SiteInfoService} from '../monitor/index.js';
+import {Cron} from '../cron/cron.js';
 import {UserSettingsService} from "../mine/service/user-settings-service.js";
 import {UserSiteMonitorSetting} from "../mine/service/models.js";
 import {getPlusInfo} from "@certd/plus-core";
 import dayjs from "dayjs";
 import {NotificationService} from "../pipeline/service/notification-service.js";
 import {UserService} from "../sys/authority/service/user-service.js";
+import {Between} from "typeorm";
 
 @Autoload()
 @Scope(ScopeEnum.Request, { allowDowngrade: true })
@@ -58,6 +59,8 @@ export class AutoCRegisterCron {
 
 
     await this.registerPlusExpireCheckCron();
+
+    await this.registerUserExpireCheckCron()
   }
 
   async registerSiteMonitorCron() {
@@ -137,4 +140,61 @@ export class AutoCRegisterCron {
       }
     })
   }
+
+
+  registerUserExpireCheckCron() {
+    // 添加plus即将到期检查任务
+    this.cron.register({
+      name: 'user-expire-check',
+      cron: `0 20 9 * * *`, // 一天只能检查一次，否则会重复发送通知
+      job: async () => {
+
+        const getExpiresDaysUsers = async (days: number) => {
+          const targetDate = dayjs().add(days, 'day')
+          const startTime = targetDate.startOf('day').valueOf()
+          const endTime = targetDate.endOf('day').valueOf()
+          return await this.userService.find({
+            where: {
+              validTime: Between(startTime, endTime),
+              status: 1
+            }
+          })
+        }
+
+        const notifyExpiresDaysUsers = async (days: number) => {
+          const list = await getExpiresDaysUsers(days)
+          if (list.length === 0) {
+            return
+          }
+          let title = `账号即将到期`
+          let content = `您的账号剩余${days}天到期，请及时续期，以免影响业务`
+          if (days <= 0) {
+            title = `账号已过期`
+            content = `您的账号已过期${Math.abs(days)}天，请尽快续期，以免影响业务`
+          }
+          const url = await this.notificationService.getBindUrl("");
+          for (const user of list) {
+            logger.info(`发送到期通知给用户：${user.username}`)
+            await this.notificationService.send({
+              useDefault: true,
+              logger: logger,
+              body: {
+                title,
+                content,
+                errorMessage: title,
+                url
+              }
+            }, user.id)
+          }
+        }
+
+        await notifyExpiresDaysUsers(7)
+        await notifyExpiresDaysUsers(3)
+        await notifyExpiresDaysUsers(1)
+        await notifyExpiresDaysUsers(0)
+        await notifyExpiresDaysUsers(-1)
+        await notifyExpiresDaysUsers(-3)
+      }
+    })
+  }
 }

packages/ui/certd-server/src/modules/monitor/facade/cert-info-facade.ts

@@ -32,6 +32,12 @@ export class CertInfoFacade  {
     if (certId) {
       return await this.certInfoService.getCertInfoById({ id: certId, userId });
     }
+    if (!domains) {
+      throw new CodeException({
+        ...Constants.res.openParamError,
+        message: "参数错误，certId和domains必须传一个",
+      });
+    }
     const domainArr = domains.split(',');
 
     const matchedList = await this.certInfoService.getMatchCertList({domains:domainArr,userId})
@@ -42,12 +48,15 @@ export class CertInfoFacade  {
         const pipeline:PipelineEntity = await this.createAutoPipeline({domains:domainArr,userId})
         await this.triggerApplyPipeline({pipelineId:pipeline.id})
       }else{
-        throw new CodeException(Constants.res.openCertNotFound);
+        throw new CodeException({
+          ...Constants.res.openCertNotFound,
+          message:"在证书仓库中没有找到匹配域名的证书，请先创建证书流水线，或传入autoApply参数，自动创建"
+        });
       }
     }
     matched = null;
     for (const item of matchedList) {
-      if (item.expiresTime>0 && item.expiresTime < new Date().getTime()) {
+      if (item.expiresTime>0 && item.expiresTime > new Date().getTime()) {
         matched = item;
         break
       }
@@ -59,7 +68,10 @@ export class CertInfoFacade  {
         await this.triggerApplyPipeline({pipelineId:first.pipelineId})
         return
       }else{
-        throw new CodeException(Constants.res.openCertNotFound);
+        throw new CodeException({
+          ...Constants.res.openCertNotFound,
+          message:"证书已过期，请触发流水线申请，或者传入autoApply参数，自动触发"
+        });
       }
     }
 
@@ -109,10 +121,12 @@ export class CertInfoFacade  {
       await this.pipelineService.trigger(req.pipelineId)
       await utils.sleep(1000)
     }
+    const certInfo = await this.certInfoService.getByPipelineId(req.pipelineId)
     throw new CodeException({
       ...Constants.res.openCertApplying,
       data:{
-        pipelineId:req.pipelineId
+        pipelineId:req.pipelineId,
+        certId:certInfo?.id
       }
     });
   }

packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts

@@ -86,7 +86,10 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
   async getMatchCertList(params: { domains: string[]; userId: number }) {
     const { domains, userId } = params;
     if (!domains) {
-      throw new CodeException(Constants.res.openCertNotFound);
+      throw new CodeException({
+        ...Constants.res.openCertNotFound,
+        message:"域名不能为空"
+      });
     }
 
     const list = await this.find({
@@ -99,6 +102,9 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
       where: {
         userId,
       },
+      order: {
+        id: 'DESC',
+      },
     });
     //遍历查找
     return list.filter(item => {
@@ -161,4 +167,12 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
     return bean;
   }
 
+  async getByPipelineId(pipelineId: number) {
+    return await this.repository.findOne({
+      where: {
+        pipelineId,
+      },
+    });
+
+  }
 }

packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts

@@ -93,7 +93,7 @@ export class SiteIpService extends BaseService<SiteIpEntity> {
     if (oldIps.length === ips.length ){
       //检查是否有变化
         const oldIpList = oldIps.map(ip=>ip.ipAddress).sort().join(",")
-        const newIpList = ips.filter(ip=>!oldIpList.includes(ip)).sort().join(",")
+        const newIpList = ips.sort().join(",")
         if(oldIpList === newIpList){
           //无变化
           hasChanged = false

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

@@ -36,4 +36,25 @@ export class SubDomainService extends BaseService<SubDomainEntity> {
     return list.map(item=>item.domain);
   }
 
+  async add(bean: SubDomainEntity) {
+    const {domain, userId} = bean;
+    if (!domain) {
+      throw new Error('域名不能为空');
+    }
+    if (!userId) {
+      throw new Error('用户ID不能为空');
+    }
+    const exist = await this.repository.findOne({
+      where: {
+        domain,
+        userId,
+      },
+    });
+   if (exist) {
+     throw new Error('域名已存在');
+   }
+   return await super.add(bean)
+
+  }
+
 }

packages/ui/certd-server/src/plugins/index.ts

@@ -30,3 +30,4 @@ export * from './plugin-github/index.js'
 export * from './plugin-namesilo/index.js'
 export * from './plugin-proxmox/index.js'
 export * from './plugin-wangsu/index.js'
+export * from './plugin-admin/index.js'

packages/ui/certd-server/src/plugins/plugin-admin/index.ts

@@ -0,0 +1,3 @@
+export * from './plugin-restart.js';
+export * from './plugin-script.js';
+export * from './plugin-db-backup.js';

packages/ui/certd-server/src/plugins/plugin-admin/plugin-db-backup.ts

@@ -14,14 +14,15 @@ const defaultFilePrefix = 'db_backup';
   name: 'DBBackupPlugin',
   title: '数据库备份',
   icon: 'lucide:database-backup',
-  desc: '仅支持备份SQLite数据库',
-  group: pluginGroups.other.key,
+  desc: '【仅管理员可用】仅支持备份SQLite数据库',
+  group: pluginGroups.admin.key,
   showRunStrategy: true,
   default: {
     strategy: {
       runStrategy: RunStrategy.AlwaysRun,
     },
   },
+  onlyAdmin:true,
   needPlus: true,
 })
 export class DBBackupPlugin extends AbstractPlusTaskPlugin {
@@ -157,6 +158,11 @@ export class DBBackupPlugin extends AbstractPlusTaskPlugin {
   }
 
   async execute(): Promise<void> {
+
+    if (!this.isAdmin()) {
+      throw new Error('只有管理员才能运行此任务');
+    }
+
     this.logger.info('开始备份数据库');
 
     let dbPath = process.env.certd_typeorm_dataSource_default_database;

packages/ui/certd-server/src/plugins/plugin-admin/plugin-restart.ts

@@ -1,12 +1,13 @@
 import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy } from '@certd/pipeline';
-import { httpsServer } from '../../../modules/auto/https/server.js';
+import { httpsServer } from '../../modules/auto/https/server.js';
 
 @IsTaskPlugin({
   name: 'RestartCertd',
   title: '重启 Certd',
   icon: 'mdi:restart',
   desc: '【仅管理员可用】 重启 certd的https服务，用于更新 Certd 的 ssl 证书',
-  group: pluginGroups.other.key,
+  group: pluginGroups.admin.key,
+  onlyAdmin:true,
   default: {
     strategy: {
       runStrategy: RunStrategy.SkipWhenSucceed,

packages/ui/certd-server/src/plugins/plugin-admin/plugin-script.ts

@@ -11,8 +11,9 @@ export type CustomScriptContext = {
   title: '自定义js脚本',
   icon: 'ri:javascript-line',
   desc: '【仅管理员】运行自定义js脚本执行',
-  group: pluginGroups.other.key,
+  group: pluginGroups.admin.key,
   showRunStrategy: true,
+  onlyAdmin: true,
   default: {
     strategy: {
       runStrategy: RunStrategy.SkipWhenSucceed,

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

@@ -1,6 +1,6 @@
 import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
-import { AliyunAccess } from '@certd/plugin-lib';
-import { CertInfo } from '@certd/plugin-cert';
+import {AliyunAccess, AliyunSslClient} from '@certd/plugin-lib';
+import {CertInfo, CertReader} from '@certd/plugin-cert';
 import { CertApplyPluginNames} from '@certd/plugin-cert';
 @IsTaskPlugin({
   name: 'DeployCertToAliyunOSS',
@@ -82,11 +82,27 @@ export class DeployCertToAliyunOSS extends AbstractTaskPlugin {
     helper: '请选择前置任务输出的域名证书',
     component: {
       name: 'output-selector',
-      from: [...CertApplyPluginNames],
+      from: [...CertApplyPluginNames,"uploadCertToAliyun"],
     },
     required: true,
   })
-  cert!: CertInfo;
+  cert!: CertInfo | string;
+
+  @TaskInput({
+    title: '证书服务接入点',
+    helper: '不会选就按默认',
+    value: 'cas.aliyuncs.com',
+    component: {
+      name: 'a-select',
+      options: [
+        { value: 'cn-hangzhou', label: '中国大陆' },
+        { value: 'southeast-1', label: '新加坡' },
+        { value: 'eu-central-1', label: '德国（法兰克福）' },
+      ],
+    },
+    required: true,
+  })
+  casRegion!: string;
 
   @TaskInput({
     title: 'Access授权',
@@ -103,12 +119,42 @@ export class DeployCertToAliyunOSS extends AbstractTaskPlugin {
   async execute(): Promise<void> {
     this.logger.info('开始部署证书到阿里云OSS');
     const access = (await this.getAccess(this.accessId)) as AliyunAccess;
+
+    await this.getAliyunCertId(access)
     this.logger.info(`bucket: ${this.bucket}, region: ${this.region}, domainName: ${this.domainName}`);
     const client = await this.getClient(access);
     await this.doRequest(client, {});
     this.logger.info('部署完成');
   }
 
+  async getAliyunCertId(access: AliyunAccess) {
+    let certId: any = this.cert;
+    let certName: any = this.appendTimeSuffix("certd");
+    if (typeof this.cert === "object") {
+      let endpoint = `cas.${this.casRegion}.aliyuncs.com`;
+      if (this.casRegion === "cn-hangzhou"){
+        endpoint = "cas.aliyuncs.com";
+      }
+      const sslClient = new AliyunSslClient({
+        access,
+        logger: this.logger,
+        endpoint: endpoint
+      });
+
+      certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt));
+
+      certId = await sslClient.uploadCert({
+        name: certName,
+        cert: this.cert
+      });
+      this.logger.info("上传证书成功", certId, certName);
+    }
+    return {
+      certId,
+      certName
+    };
+  }
+
   async getClient(access: AliyunAccess) {
     // @ts-ignore
     const OSS = await import('ali-oss');
@@ -129,13 +175,24 @@ export class DeployCertToAliyunOSS extends AbstractTaskPlugin {
       cname: '',
       comp: 'add',
     });
+
+    let certStr =  ""
+    if (typeof this.cert === "object" ){
+      certStr = `
+      <PrivateKey>${this.cert.key}</PrivateKey>
+      <Certificate>${this.cert.crt}</Certificate>
+`
+    }else{
+      certStr = `<CertId>${this.cert}-${this.casRegion}</CertId>`
+    }
+
     const xml = `
  <BucketCnameConfiguration>
   <Cname>
     <Domain>${this.domainName}</Domain>
     <CertificateConfiguration>
-      <PrivateKey>${this.cert.key}</PrivateKey>
-      <Certificate>${this.cert.crt}</Certificate>
+      ${certStr}
+      <Force>true</Force>
     </CertificateConfiguration>
   </Cname>
 </BucketCnameConfiguration>`;

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

@@ -23,7 +23,7 @@ const regionDict = [
 
 @IsTaskPlugin({
   name: 'uploadCertToAliyun',
-  title: '阿里云-上传证书到阿里云',
+  title: '阿里云-上传证书到阿里云CAS',
   icon: 'svg:icon-aliyun',
   group: pluginGroups.aliyun.key,
   desc: '上传证书到阿里云数字证书管理服务（CAS），注意：不会部署到任何应用上；如果不想在阿里云上同一份证书上传多次，可以把此任务作为前置任务，其他阿里云任务证书那一项选择此任务的输出',

packages/ui/certd-server/src/plugins/plugin-notification/qywx/index.ts

@@ -47,26 +47,35 @@ export class QywxNotification extends BaseNotification {
     if (!this.webhook) {
       throw new Error('webhook地址不能为空');
     }
-    /**
-     *
-     *      "msgtype": "text",
-     *      "text": {
-     *          "content": "hello world"
-     *      }
-     *    }
-     */
-    const color = body.errorMessage?'red':'green';
+
     await this.http.request({
       url: this.webhook,
       method: 'POST',
       data: {
-        msgtype: 'markdown',
-        markdown: {
-          content: `<font color='${color}'>${body.title}</font>\n\n\n${body.content}\n\n[查看详情](${body.url})`,
+        msgtype: 'text',
+        text: {
+          content: `${body.title}\n${body.content}\n查看详情: ${body.url}`,
           mentioned_list: this.mentionedList,
           mentioned_mobile_list: this.mentionedMobileList,
         },
       },
     });
+
+
+    //Markdown 模式不支持@
+
+    // const color = body.errorMessage?'red':'green';
+    // await this.http.request({
+    //   url: this.webhook,
+    //   method: 'POST',
+    //   data: {
+    //     msgtype: 'markdown',
+    //     markdown: {
+    //       content: `<font color='${color}'>${body.title}</font>\n\n\n${body.content}\n\n[查看详情](${body.url})`,
+    //       mentioned_list: this.mentionedList,
+    //       mentioned_mobile_list: this.mentionedMobileList,
+    //     },
+    //   },
+    // });
   }
 }

packages/ui/certd-server/src/plugins/plugin-other/plugins/index.ts

@@ -1,5 +1,2 @@
-export * from './plugin-restart.js';
-export * from './plugin-script.js';
 export * from './plugin-wait.js';
-export * from './plugin-db-backup.js';
 export * from './plugin-deploy-to-mail.js';

packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts

@@ -136,6 +136,18 @@ export class DeployCertToTencentTKEIngressPlugin extends AbstractTaskPlugin {
   ingressName!: string | string[];
 
 
+  @TaskInput({
+    title: "忽略证书校验",
+    required: false,
+    helper: "是否忽略证书校验",
+    component: {
+      name: "a-switch",
+      vModel: "checked",
+    }
+  })
+  skipTLSVerify!:boolean
+
+
   // @TaskInput({ title: "集群内网ip", helper: "如果开启了外网的话，无需设置" })
   // clusterIp!: string;
 
@@ -163,7 +175,8 @@ export class DeployCertToTencentTKEIngressPlugin extends AbstractTaskPlugin {
     this.logger.info("kubeconfig已成功获取");
     const k8sClient = new this.K8sClient({
       kubeConfigStr,
-      logger: this.logger
+      logger: this.logger,
+      skipTLSVerify: this.skipTLSVerify,
     });
     // if (this.clusterIp != null) {
     //   if (!this.clusterDomain) {