v1.30.1

CHANGELOG.md

@@ -3,6 +3,55 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.30.1](https://github.com/certd/certd/compare/v1.30.0...v1.30.1) (2025-01-20)
+
+### Bug Fixes
+
+* 修复部署到阿里云ALB、NLB插件加载混乱的bug ([6ab83b6](https://github.com/certd/certd/commit/6ab83b662a2c5e715b9cb7eb1244de2ebb7f47b0))
+* 修复腾讯clb重复执行会报错的bug ([e95d29f](https://github.com/certd/certd/commit/e95d29f446d06eced315a3087fc9e105a30b20bd))
+* 修复tg消息内容中存在.和*就会发送失败的bug ([ae5dfc3](https://github.com/certd/certd/commit/ae5dfc3bee950267123ae2fbd1c11e7ce36626ea))
+
+### Performance Improvements
+
+* 创建流水线时，默认成功时也发送通知 ([52ae690](https://github.com/certd/certd/commit/52ae6902d203ca56e0312692b50c55cb6ddd3e39))
+* http方式校验，选择sftp时，支持修改文件访问权限比如777 ([15d6eaf](https://github.com/certd/certd/commit/15d6eaf5532ed25acd4f8d58c429353a2f44206c))
+
+# [1.30.0](https://github.com/certd/certd/compare/v1.29.5...v1.30.0) (2025-01-19)
+
+### Bug Fixes
+
+* 修复查看任务日志偶发性无法自动滚动底部的bug ([7e482f7](https://github.com/certd/certd/commit/7e482f798c0142bce1866f84676cb40210f9638a))
+* 修复namesilo ttl太短的问题 ([865f26d](https://github.com/certd/certd/commit/865f26d75c0d3dd4dc8b41448f8830068e45957c))
+
+### Features
+
+* 支持open api接口，根据域名获取证书 ([52a4fd3](https://github.com/certd/certd/commit/52a4fd33180e9b3f71b8dc9f7671d7cd8e448c3b))
+
+### Performance Improvements
+
+* 证书仓库 ([91e7f45](https://github.com/certd/certd/commit/91e7f45a1c5ea1e0ec0aa3236b80028f03a6d0aa))
+* 支持部署到阿里云ALB ([653940a](https://github.com/certd/certd/commit/653940a0ca64fc380178c1b0b58ae0af64dfaf07))
+* 支持部署到阿里云NLB、SLB ([c085bac](https://github.com/certd/certd/commit/c085bac5d877c4250a8a79e17eb8673b8e4fc89c))
+* 支持部署到腾讯云直播 ([417d37b](https://github.com/certd/certd/commit/417d37b199b79a42f790f9edab8f178eedf8fbf7))
+* 支持部署证书到proxmox ([d10795e](https://github.com/certd/certd/commit/d10795ecd97eb8cf2ffa46aabfdbfc6812636396))
+
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+### Bug Fixes
+
+* 修复复制到本机插件，pfx格式复制时报错的bug ([f57116d](https://github.com/certd/certd/commit/f57116d2bebf33e47ad93e0b39c4efe8e4aea25c))
+* 修复授权管理，点击了查看原文按钮后，无法修改值的bug ([85c99f7](https://github.com/certd/certd/commit/85c99f7f80761ac6efaf3255c03b933442db1686))
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+### Bug Fixes
+
+* 修复站点监控域名校验无法通过的bug ([1cb4a53](https://github.com/certd/certd/commit/1cb4a539cc523721ffd4b22d40d0e3d2d68cd915))
+
+### Performance Improvements
+
+* 优化腾讯云CLB插件，支持非sni情况，sni情况支持填写多个域名 ([635b042](https://github.com/certd/certd/commit/635b042690637bff85e97e07c7aac4b87a8a124b))
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 ### Bug Fixes

build.trigger

@@ -1 +1 @@
-01:55
+00:38

docs/.vitepress/config.ts

@@ -57,6 +57,7 @@ export default defineConfig({
     nav: [
       { text: "首页", link: "/" },
       { text: "指南", link: "/guide/" },
+      { text: "商业版", link: "/comm/" },
       { text: "Demo体验", link: "https://certd.handfree.work" }
     ],
     sidebar: {
@@ -116,8 +117,20 @@ export default defineConfig({
 
           ]
         }
+      ],
+      "/comm/": [
+        {
+          text: "商业版",
+          items: [
+            { text: "支付宝配置", link: "/comm/payments/alipay.md" },
+            { text: "微信支付配置", link: "/comm/payments/wxpay.md" },
+            { text: "彩虹易支付配置", link: "/comm/payments/yizhifu.md" },
+          ]
+        }
       ]
+      ,
     },
+
     socialLinks: [
       { icon: "github", link: "https://github.com/certd/certd" }
     ],

docs/comm/index.md

@@ -0,0 +1,9 @@
+# 商业版文档
+
+![](./images/index.png)
+
+## 支付方式配置
+
+* [支付宝支付配置](./payments/alipay.md)
+* [微信支付配置](./payments/wxpay.md)
+* [彩虹易支付配置](./payments/yizhifu.md)

docs/comm/payments/alipay.md

@@ -0,0 +1,21 @@
+# 支付宝配置
+
+## 配置步骤
+
+1. 创建应用，获取APPID
+   * 登录支付宝开放平台，进入开发者中心，创建网页应用，获取应用的AppId（左上角复制）
+   * 开发者中心：https://open.alipay.com/develop/manage
+
+
+2. 进入应用详情，选择开发设置，配置接口加签方式 （选择密钥类型）
+
+   * 参考文档：https://opendocs.alipay.com/common/02kdnc?pathHash=fb0c752a
+   * 此步骤完成后，可以获取应用的私钥、支付宝公钥。     
+   * 注意：支付宝不会保存应用的私钥，你需要自己保管好私钥。
+
+
+3. 在Certd后台配置支付宝 
+
+   * 进入“系统”->"设置"->“支付设置”
+   * 启用支付宝，选择“支付宝配置”，点击添加
+   * 填写支付宝AppId、应用私钥、支付宝公钥等信息即可。

docs/comm/payments/wxpay.md

@@ -0,0 +1,27 @@
+# 微信支付配置
+
+## 配置步骤
+
+1. 开通Native支付
+   * 登录微信支付平台
+   * 进入产品中心： https://pay.weixin.qq.com/index.php/extend/product/lists?tid=3
+   * 选择开通Native支付
+
+2. 申请证书
+
+   * 进入“账户中心”->“API安全”->“商户API证书”->“管理证书”
+   * 根据指引生成证书
+   * 得到私钥和公钥
+
+
+3. 填写APIv3密钥
+
+   * 进入“账户中心”->“API安全”->“解密回调”
+   * 填写APIv3密钥 
+   * 参考文档 https://kf.qq.com/faq/180830E36vyQ180830AZFZvu.html
+
+
+4. 在Certd后台配置微信支付
+   * 进入“系统”->"设置"->“支付设置”
+   * 启用微信支付，选择“微信支付配置”，点击添加
+   * 填写微信支付商户号、证书私钥、证书公钥、APIv3密钥即可。

docs/comm/payments/yizhifu.md

@@ -0,0 +1,19 @@
+# 彩虹易支付配置
+
+彩虹易支付是一款非常流行的php聚合支付系统。
+
+## 配置步骤
+
+1. 获取商户ID、商户密钥
+
+   * 登录彩虹易支付平台
+   * 进入用户中心：https://xxxxxx.com/user/userinfo.php?mod=api
+   * 点击API信息
+   * 可以复制：接口地址、商户ID、商户密钥（key）
+   * 点击查看文档，了解支持的签名类型，一般为MD5
+
+2. 进入Certd后台配置彩虹易支付
+
+   * 进入“系统”->"设置"->“支付设置”
+   * 启用彩虹易支付，选择“彩虹易支付配置”，点击添加
+   * 填写接口地址、商户ID、商户密钥、签名方式等信息即可。

docs/guide/changelogs/CHANGELOG.md

@@ -3,6 +3,55 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.30.0](https://github.com/certd/certd/compare/v1.29.5...v1.30.0) (2025-01-19)
+
+### Bug Fixes
+
+* 修复查看任务日志偶发性无法自动滚动底部的bug ([7e482f7](https://github.com/certd/certd/commit/7e482f798c0142bce1866f84676cb40210f9638a))
+* 修复namesilo ttl太短的问题 ([865f26d](https://github.com/certd/certd/commit/865f26d75c0d3dd4dc8b41448f8830068e45957c))
+
+### Features
+
+* 支持open api接口，根据域名获取证书 ([52a4fd3](https://github.com/certd/certd/commit/52a4fd33180e9b3f71b8dc9f7671d7cd8e448c3b))
+
+### Performance Improvements
+
+* 证书仓库 ([91e7f45](https://github.com/certd/certd/commit/91e7f45a1c5ea1e0ec0aa3236b80028f03a6d0aa))
+* 支持部署到阿里云ALB ([653940a](https://github.com/certd/certd/commit/653940a0ca64fc380178c1b0b58ae0af64dfaf07))
+* 支持部署到阿里云NLB、SLB ([c085bac](https://github.com/certd/certd/commit/c085bac5d877c4250a8a79e17eb8673b8e4fc89c))
+* 支持部署到腾讯云直播 ([417d37b](https://github.com/certd/certd/commit/417d37b199b79a42f790f9edab8f178eedf8fbf7))
+* 支持部署证书到proxmox ([d10795e](https://github.com/certd/certd/commit/d10795ecd97eb8cf2ffa46aabfdbfc6812636396))
+
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+### Bug Fixes
+
+* 修复复制到本机插件，pfx格式复制时报错的bug ([f57116d](https://github.com/certd/certd/commit/f57116d2bebf33e47ad93e0b39c4efe8e4aea25c))
+* 修复授权管理，点击了查看原文按钮后，无法修改值的bug ([85c99f7](https://github.com/certd/certd/commit/85c99f7f80761ac6efaf3255c03b933442db1686))
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+### Bug Fixes
+
+* 修复站点监控域名校验无法通过的bug ([1cb4a53](https://github.com/certd/certd/commit/1cb4a539cc523721ffd4b22d40d0e3d2d68cd915))
+
+### Performance Improvements
+
+* 优化腾讯云CLB插件，支持非sni情况，sni情况支持填写多个域名 ([635b042](https://github.com/certd/certd/commit/635b042690637bff85e97e07c7aac4b87a8a124b))
+
+## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
+
+### Bug Fixes
+
+* 修复系统级授权无法查看密钥的bug ([8644348](https://github.com/certd/certd/commit/8644348fc41ae2e1672f946ca37e5d3a674e0218))
+
+### Performance Improvements
+
+* 优化站点证书检查页面，检查增加3次重试 ([e6dd7cd](https://github.com/certd/certd/commit/e6dd7cd54a3e23897031b5df6e0c3cdc0545d35a))
+* 优化acme sdk ([54db744](https://github.com/certd/certd/commit/54db74428259de64d12230c2ab7353ae11197bbc))
+* 支持http校验方式申请证书 ([405591c](https://github.com/certd/certd/commit/405591c5d08fa1a3b228ee3980199e7731cfec4a))
+* http校验方式，支持七牛云oss、阿里云oss、腾讯云cos ([3f74d4d](https://github.com/certd/certd/commit/3f74d4d9e5f5d0e629b44cff1895b3f7a8fbcafc))
+
 ## [1.29.2](https://github.com/certd/certd/compare/v1.29.1...v1.29.2) (2024-12-25)
 
 ### Bug Fixes

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.29.3"
+  "version": "1.30.1"
 }

packages/core/acme-client/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.30.1](https://github.com/publishlab/node-acme-client/compare/v1.30.0...v1.30.1) (2025-01-20)
+
+**Note:** Version bump only for package @certd/acme-client
+
+# [1.30.0](https://github.com/publishlab/node-acme-client/compare/v1.29.5...v1.30.0) (2025-01-19)
+
+### Bug Fixes
+
+* 修复查看任务日志偶发性无法自动滚动底部的bug ([7e482f7](https://github.com/publishlab/node-acme-client/commit/7e482f798c0142bce1866f84676cb40210f9638a))
+
+## [1.29.5](https://github.com/publishlab/node-acme-client/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.29.4](https://github.com/publishlab/node-acme-client/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.29.3](https://github.com/publishlab/node-acme-client/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 ### Performance Improvements

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.29.3",
+    "version": "1.30.1",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.29.3",
+        "@certd/basic": "^1.30.1",
         "@peculiar/x509": "^1.11.0",
         "asn1js": "^3.0.5",
         "axios": "^1.7.2",
@@ -65,5 +65,5 @@
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
     },
-    "gitHead": "ed5634ff83405ad0eb13a8456f59270ed4218734"
+    "gitHead": "9a78dad57619e02d1390cf5a013695a2aaf20e64"
 }

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

@@ -126,6 +126,7 @@ instance.interceptors.response.use(null, async (error) => {
 
             /* Wait and retry the request */
             await new Promise((resolve) => { setTimeout(resolve, (retryAfter * 1000)); });
+            log(`Retrying request to URL ${config.url}`);
             return instance(config);
         }
     }

packages/core/basic/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.30.1](https://github.com/certd/certd/compare/v1.30.0...v1.30.1) (2025-01-20)
+
+**Note:** Version bump only for package @certd/basic
+
+# [1.30.0](https://github.com/certd/certd/compare/v1.29.5...v1.30.0) (2025-01-19)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/basic
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 **Note:** Version bump only for package @certd/basic

packages/core/basic/build.md

@@ -1 +1 @@
-01:09
+23:35

packages/core/basic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.29.3",
+  "version": "1.30.1",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -44,5 +44,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ed5634ff83405ad0eb13a8456f59270ed4218734"
+  "gitHead": "9a78dad57619e02d1390cf5a013695a2aaf20e64"
 }

packages/core/pipeline/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.30.1](https://github.com/certd/certd/compare/v1.30.0...v1.30.1) (2025-01-20)
+
+### Bug Fixes
+
+* 修复tg消息内容中存在.和*就会发送失败的bug ([ae5dfc3](https://github.com/certd/certd/commit/ae5dfc3bee950267123ae2fbd1c11e7ce36626ea))
+
+# [1.30.0](https://github.com/certd/certd/compare/v1.29.5...v1.30.0) (2025-01-19)
+
+### Performance Improvements
+
+* 证书仓库 ([91e7f45](https://github.com/certd/certd/commit/91e7f45a1c5ea1e0ec0aa3236b80028f03a6d0aa))
+
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/pipeline
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 ### Performance Improvements

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.29.3",
+  "version": "1.30.1",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -16,8 +16,8 @@
     "test": "mocha   --loader=ts-node/esm"
   },
   "dependencies": {
-    "@certd/basic": "^1.29.3",
+    "@certd/basic": "^1.30.1",
-    "@certd/plus-core": "^1.29.3",
+    "@certd/plus-core": "^1.30.1",
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",
     "reflect-metadata": "^0.1.13"
@@ -43,5 +43,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ed5634ff83405ad0eb13a8456f59270ed4218734"
+  "gitHead": "9a78dad57619e02d1390cf5a013695a2aaf20e64"
 }

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

@@ -11,6 +11,7 @@ import { ICnameProxyService, IEmailService, IPluginConfigService, IUrlService }
 import { FileStore } from "./file-store.js";
 import { cloneDeep, forEach, merge } from "lodash-es";
 import { INotificationService } from "../notification/index.js";
+import { taskEmitterCreate } from "../service/emit.js";
 
 export type SysInfo = {
   //系统标题
@@ -342,6 +343,10 @@ export class Executor {
       signal: this.abort.signal,
       utils,
       user: this.options.user,
+      emitter: taskEmitterCreate({
+        step,
+        pipeline: this.pipeline,
+      }),
     };
     instance.setCtx(taskCtx);
 
@@ -430,7 +435,7 @@ export class Executor {
               content,
               userId: this.pipeline.userId,
               pipeline: this.pipeline,
-              result: this.lastRuntime.pipeline.status,
+              result: this.lastRuntime?.pipeline?.status,
               pipelineId: this.pipeline.id,
               historyId: this.runtime.id,
               errorMessage,

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

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

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

@@ -7,9 +7,10 @@ import { CancelError, IContext, RunHistory, RunnableCollection } from "../core/i
 import { HttpRequestConfig, ILogger, logger, utils } from "@certd/basic";
 import { HttpClient } from "@certd/basic";
 import dayjs from "dayjs";
-import { IPluginConfigService } from "../service/config";
+import { IPluginConfigService } from "../service/config.js";
 import { upperFirst } from "lodash-es";
-import { INotificationService } from "../notification";
+import { INotificationService } from "../notification/index.js";
+import { TaskEmitter } from "../service/emit.js";
 
 export type PluginRequestHandleReq<T = any> = {
   typeName: string;
@@ -111,6 +112,8 @@ export type TaskInstanceContext = {
   utils: typeof utils;
   //用户信息
   user: UserInfo;
+
+  emitter: TaskEmitter;
 };
 
 export abstract class AbstractTaskPlugin implements ITaskPlugin {

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

@@ -0,0 +1,68 @@
+import { logger } from "@certd/basic";
+import { Pipeline, Runnable } from "../dt";
+
+export type PipelineEventListener = (...args: any[]) => Promise<void>;
+export type PipelineEvent<T> = {
+  pipeline: Pipeline;
+  step: Runnable;
+  event: T;
+};
+export class PipelineEmitter {
+  events: Record<string, PipelineEventListener[]>;
+  constructor() {
+    this.events = {};
+  }
+  on(event: string, listener: PipelineEventListener) {
+    if (!this.events[event]) {
+      this.events[event] = [];
+    }
+    this.events[event].push(listener);
+  }
+  async emit<T>(name: string, event: PipelineEvent<T>) {
+    const listeners = this.events[name];
+    if (listeners) {
+      for (const listener of listeners) {
+        try {
+          await listener(event);
+        } catch (e) {
+          logger.error(`事件<${name}>监听器执行失败:`, e);
+        }
+      }
+    }
+  }
+  off(event: string, listener: PipelineEventListener) {
+    if (this.events[event]) {
+      this.events[event] = this.events[event].filter((l) => l !== listener);
+    }
+  }
+  once(event: string, listener: PipelineEventListener) {
+    const onceListener = async (...args: any[]) => {
+      this.off(event, onceListener);
+      await listener(...args);
+    };
+    this.on(event, onceListener);
+  }
+}
+
+export const pipelineEmitter = new PipelineEmitter();
+
+export type TaskEmitterCreateReq = {
+  step: Runnable;
+  pipeline: Pipeline;
+};
+
+export type TaskEmitter = {
+  emit: <T>(name: string, event: T) => Promise<void>;
+};
+
+export function taskEmitterCreate(req: TaskEmitterCreateReq) {
+  return {
+    emit: async <T>(name: string, event: T) => {
+      await pipelineEmitter.emit(name, {
+        pipeline: req.pipeline,
+        step: req.step,
+        event,
+      });
+    },
+  } as TaskEmitter;
+}

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

@@ -2,3 +2,4 @@ export * from "./email.js";
 export * from "./cname.js";
 export * from "./config.js";
 export * from "./url.js";
+export * from "./emit.js";

packages/libs/lib-huawei/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.30.1](https://github.com/certd/certd/compare/v1.30.0...v1.30.1) (2025-01-20)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+# [1.30.0](https://github.com/certd/certd/compare/v1.29.5...v1.30.0) (2025-01-19)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 **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.29.3",
+  "version": "1.30.1",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
   "types": "./dist/d/index.d.ts",
@@ -21,5 +21,5 @@
     "prettier": "^2.8.8",
     "tslib": "^2.8.1"
   },
-  "gitHead": "ed5634ff83405ad0eb13a8456f59270ed4218734"
+  "gitHead": "9a78dad57619e02d1390cf5a013695a2aaf20e64"
 }

packages/libs/lib-iframe/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.30.1](https://github.com/certd/certd/compare/v1.30.0...v1.30.1) (2025-01-20)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+# [1.30.0](https://github.com/certd/certd/compare/v1.29.5...v1.30.0) (2025-01-19)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 **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.29.3",
+  "version": "1.30.1",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -30,5 +30,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ed5634ff83405ad0eb13a8456f59270ed4218734"
+  "gitHead": "9a78dad57619e02d1390cf5a013695a2aaf20e64"
 }

packages/libs/lib-k8s/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.30.1](https://github.com/certd/certd/compare/v1.30.0...v1.30.1) (2025-01-20)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+# [1.30.0](https://github.com/certd/certd/compare/v1.29.5...v1.30.0) (2025-01-19)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 **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.29.3",
+  "version": "1.30.1",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -16,7 +16,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/basic": "^1.29.3",
+    "@certd/basic": "^1.30.1",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
@@ -31,5 +31,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ed5634ff83405ad0eb13a8456f59270ed4218734"
+  "gitHead": "9a78dad57619e02d1390cf5a013695a2aaf20e64"
 }

packages/libs/lib-server/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.30.1](https://github.com/certd/certd/compare/v1.30.0...v1.30.1) (2025-01-20)
+
+**Note:** Version bump only for package @certd/lib-server
+
+# [1.30.0](https://github.com/certd/certd/compare/v1.29.5...v1.30.0) (2025-01-19)
+
+### Features
+
+* 支持open api接口，根据域名获取证书 ([52a4fd3](https://github.com/certd/certd/commit/52a4fd33180e9b3f71b8dc9f7671d7cd8e448c3b))
+
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/lib-server
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 ### Bug Fixes

packages/libs/lib-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/lib-server",
-  "version": "1.29.3",
+  "version": "1.30.1",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -27,10 +27,10 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.29.3",
+    "@certd/acme-client": "^1.30.1",
-    "@certd/basic": "^1.29.3",
+    "@certd/basic": "^1.30.1",
-    "@certd/pipeline": "^1.29.3",
+    "@certd/pipeline": "^1.30.1",
-    "@certd/plus-core": "^1.29.3",
+    "@certd/plus-core": "^1.30.1",
     "@midwayjs/cache": "~3.14.0",
     "@midwayjs/core": "~3.17.1",
     "@midwayjs/i18n": "~3.17.3",
@@ -61,5 +61,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ed5634ff83405ad0eb13a8456f59270ed4218734"
+  "gitHead": "9a78dad57619e02d1390cf5a013695a2aaf20e64"
 }

packages/libs/lib-server/src/basic/constants.ts

@@ -12,6 +12,8 @@ export const Constants = {
     authOnly: '_authOnly_',
     //仅需要登录
     loginOnly: '_authOnly_',
+
+    open: '_open_',
   },
   res: {
     serverError(message: string) {
@@ -68,5 +70,33 @@ export const Constants = {
       code: 10001,
       message: '对不起，预览环境不允许修改此数据',
     },
+    openKeyError: {
+      code: 20000,
+      message: 'ApiToken错误',
+    },
+    openKeySignError: {
+      code: 20001,
+      message: 'ApiToken签名错误',
+    },
+    openKeyExpiresError: {
+      code: 20002,
+      message: 'ApiToken时间戳错误',
+    },
+    openKeySignTypeError: {
+      code: 20003,
+      message: 'ApiToken签名类型不支持',
+    },
+    openParamError: {
+      code: 20010,
+      message: '请求参数错误',
+    },
+    openCertNotFound: {
+      code: 20011,
+      message: '证书不存在',
+    },
+    openCertNotReady: {
+      code: 20012,
+      message: '证书还未生成',
+    },
   },
 };

packages/libs/lib-server/src/basic/exception/auth-exception.ts

@@ -5,10 +5,6 @@ import { BaseException } from './base-exception.js';
  */
 export class AuthException extends BaseException {
   constructor(message) {
-    super(
+    super('AuthException', Constants.res.auth.code, message ? message : Constants.res.auth.message);
-      'AuthException',
-      Constants.res.auth.code,
-      message ? message : Constants.res.auth.message
-    );
   }
 }

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

@@ -2,10 +2,10 @@
  * 异常基类
  */
 export class BaseException extends Error {
-  status: number;
+  code: number;
   constructor(name, code, message) {
     super(message);
     this.name = name;
-    this.status = code;
+    this.code = code;
   }
 }

packages/libs/lib-server/src/basic/exception/common-exception.ts

@@ -8,3 +8,9 @@ export class CommonException extends BaseException {
     super('CommonException', Constants.res.error.code, message ? message : Constants.res.error.message);
   }
 }
+
+export class CodeException extends BaseException {
+  constructor(res: { code: number; message: string }) {
+    super('CodeException', res.code, res.message);
+  }
+}

packages/libs/lib-server/src/basic/result.ts

@@ -9,7 +9,7 @@ export class Result<T> {
   }
 
   static error(code = 1, msg) {
-    return new Result(code, msg, null);
+    return new Result(code, msg);
   }
 
   static success(msg, data?) {

packages/libs/lib-server/src/system/basic/index.ts

@@ -1,2 +1,3 @@
 export * from './service/plus-service.js';
 export * from './service/file-service.js';
+export * from './service/encryptor.js';

packages/libs/lib-server/src/system/basic/service/encryptor.ts

@@ -0,0 +1,29 @@
+import crypto from 'crypto';
+
+export class Encryptor {
+  secretKey: Buffer;
+  constructor(encryptSecret: string, encoding: BufferEncoding = 'base64') {
+    this.secretKey = Buffer.from(encryptSecret, encoding);
+  }
+  // 加密函数
+  encrypt(text: string) {
+    const iv = crypto.randomBytes(16); // 初始化向量
+    // const secretKey = crypto.randomBytes(32);
+    // const key = Buffer.from(secretKey);
+    const cipher = crypto.createCipheriv('aes-256-cbc', this.secretKey, iv);
+    let encrypted = cipher.update(text);
+    encrypted = Buffer.concat([encrypted, cipher.final()]);
+    return iv.toString('hex') + ':' + encrypted.toString('hex');
+  }
+
+  // 解密函数
+  decrypt(encryptedText: string) {
+    const textParts = encryptedText.split(':');
+    const iv = Buffer.from(textParts.shift(), 'hex');
+    const encrypted = Buffer.from(textParts.join(':'), 'hex');
+    const decipher = crypto.createDecipheriv('aes-256-cbc', Buffer.from(this.secretKey), iv);
+    let decrypted = decipher.update(encrypted);
+    decrypted = Buffer.concat([decrypted, decipher.final()]);
+    return decrypted.toString();
+  }
+}

packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts

@@ -91,7 +91,7 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
       entity.setting = JSON.stringify(bean);
       entity.access = type.__access__;
 
-      if (key === SysSecretBackup.__key__ || key === SysSecret.__key__) {
+      if (key === SysSecretBackup.__key__) {
         //备份密钥不允许更新
         return;
       }

packages/libs/lib-server/src/user/access/service/encrypt-service.ts

@@ -1,6 +1,5 @@
 import { Init, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
-import crypto from 'crypto';
+import { Encryptor, SysSecret, SysSettingsService } from '../../../system/index.js';
-import { SysSecret, SysSettingsService } from '../../../system/index.js';
 
 /**
  * 授权
@@ -8,7 +7,7 @@ import { SysSecret, SysSettingsService } from '../../../system/index.js';
 @Provide()
 @Scope(ScopeEnum.Singleton)
 export class EncryptService {
-  secretKey: Buffer;
+  encryptor: Encryptor;
 
   @Inject()
   sysSettingService: SysSettingsService;
@@ -16,28 +15,16 @@ export class EncryptService {
   @Init()
   async init() {
     const secret: SysSecret = await this.sysSettingService.getSecret();
-    this.secretKey = Buffer.from(secret.encryptSecret, 'base64');
+    this.encryptor = new Encryptor(secret.encryptSecret);
   }
 
   // 加密函数
   encrypt(text: string) {
-    const iv = crypto.randomBytes(16); // 初始化向量
+    return this.encryptor.encrypt(text);
-    // const secretKey = crypto.randomBytes(32);
-    // const key = Buffer.from(secretKey);
-    const cipher = crypto.createCipheriv('aes-256-cbc', this.secretKey, iv);
-    let encrypted = cipher.update(text);
-    encrypted = Buffer.concat([encrypted, cipher.final()]);
-    return iv.toString('hex') + ':' + encrypted.toString('hex');
   }
 
   // 解密函数
   decrypt(encryptedText: string) {
-    const textParts = encryptedText.split(':');
+    return this.encryptor.decrypt(encryptedText);
-    const iv = Buffer.from(textParts.shift(), 'hex');
-    const encrypted = Buffer.from(textParts.join(':'), 'hex');
-    const decipher = crypto.createDecipheriv('aes-256-cbc', Buffer.from(this.secretKey), iv);
-    let decrypted = decipher.update(encrypted);
-    decrypted = Buffer.concat([decrypted, decipher.final()]);
-    return decrypted.toString();
   }
 }

packages/libs/midway-flyway-js/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.30.1](https://github.com/certd/certd/compare/v1.30.0...v1.30.1) (2025-01-20)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+# [1.30.0](https://github.com/certd/certd/compare/v1.29.5...v1.30.0) (2025-01-19)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 **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.29.3",
+  "version": "1.30.1",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -46,5 +46,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ed5634ff83405ad0eb13a8456f59270ed4218734"
+  "gitHead": "9a78dad57619e02d1390cf5a013695a2aaf20e64"
 }

packages/plugins/plugin-cert/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.30.1](https://github.com/certd/certd/compare/v1.30.0...v1.30.1) (2025-01-20)
+
+### Performance Improvements
+
+* http方式校验，选择sftp时，支持修改文件访问权限比如777 ([15d6eaf](https://github.com/certd/certd/commit/15d6eaf5532ed25acd4f8d58c429353a2f44206c))
+
+# [1.30.0](https://github.com/certd/certd/compare/v1.29.5...v1.30.0) (2025-01-19)
+
+### Bug Fixes
+
+* 修复namesilo ttl太短的问题 ([865f26d](https://github.com/certd/certd/commit/865f26d75c0d3dd4dc8b41448f8830068e45957c))
+
+### Performance Improvements
+
+* 证书仓库 ([91e7f45](https://github.com/certd/certd/commit/91e7f45a1c5ea1e0ec0aa3236b80028f03a6d0aa))
+
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+### Bug Fixes
+
+* 修复复制到本机插件，pfx格式复制时报错的bug ([f57116d](https://github.com/certd/certd/commit/f57116d2bebf33e47ad93e0b39c4efe8e4aea25c))
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 ### Performance Improvements

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.29.3",
+  "version": "1.30.1",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -15,10 +15,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.29.3",
+    "@certd/acme-client": "^1.30.1",
-    "@certd/basic": "^1.29.3",
+    "@certd/basic": "^1.30.1",
-    "@certd/pipeline": "^1.29.3",
+    "@certd/pipeline": "^1.30.1",
-    "@certd/plugin-lib": "^1.29.3",
+    "@certd/plugin-lib": "^1.30.1",
     "@google-cloud/publicca": "^1.3.0",
     "dayjs": "^1.11.7",
     "jszip": "^3.10.1",
@@ -41,5 +41,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ed5634ff83405ad0eb13a8456f59270ed4218734"
+  "gitHead": "9a78dad57619e02d1390cf5a013695a2aaf20e64"
 }

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

@@ -1,4 +1,4 @@
-import { AbstractTaskPlugin, IContext, NotificationBody, Step, TaskInput, TaskOutput } from "@certd/pipeline";
+import { AbstractTaskPlugin, IContext, NotificationBody, Step, TaskEmitter, TaskInput, TaskOutput } from "@certd/pipeline";
 import dayjs from "dayjs";
 import type { CertInfo } from "./acme.js";
 import { CertReader } from "./cert-reader.js";
@@ -6,8 +6,11 @@ import JSZip from "jszip";
 import { CertConverter } from "./convert.js";
 import { pick } from "lodash-es";
 
-export { CertReader };
+export const EVENT_CERT_APPLY_SUCCESS = "CertApply.success";
-export type { CertInfo };
+
+export async function emitCertApplySuccess(emitter: TaskEmitter, cert: CertReader) {
+  await emitter.emit(EVENT_CERT_APPLY_SUCCESS, cert);
+}
 
 export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
   @TaskInput({
@@ -55,7 +58,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
     },
     required: false,
     order: 100,
-    helper: "PFX、jks格式证书是否加密；jks必须设置密码，不传则默认123456",
+    helper: "PFX、jks格式证书是否加密\njks必须设置密码，不传则默认123456",
   })
   pfxPassword!: string;
 
@@ -63,12 +66,17 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
     title: "PFX证书转换参数",
     value: "-macalg SHA1 -keypbe PBE-SHA1-3DES -certpbe PBE-SHA1-3DES",
     component: {
-      name: "a-input",
+      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: "兼容Server 2016，如果导入证书失败，请删除此参数",
+    helper: "兼容Windows Server各个版本",
   })
   pfxArgs = "-macalg SHA1 -keypbe PBE-SHA1-3DES -certpbe PBE-SHA1-3DES";
 
@@ -119,7 +127,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
 
   abstract onInit(): Promise<void>;
 
-  abstract doCertApply(): Promise<any>;
+  abstract doCertApply(): Promise<CertReader>;
 
   async execute(): Promise<string | void> {
     const oldCert = await this.condition();
@@ -130,6 +138,8 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
     const cert = await this.doCertApply();
     if (cert != null) {
       await this.output(cert, true);
+
+      await emitCertApplySuccess(this.ctx.emitter, cert);
       //清空后续任务的状态，让后续任务能够重新执行
       this.clearLastStatus();
 
@@ -234,28 +244,10 @@ cert.jks：jks格式证书文件，java服务器使用
     //   return null;
     // }
 
-    let inputChanged = false;
-    //判断域名有没有变更
-    /**
-     *                      "renewDays": 35,
-     *                     "certApplyPlugin": "CertApply",
-     *                     "sslProvider": "letsencrypt",
-     *                     "privateKeyType": "rsa_2048_pkcs1",
-     *                     "dnsProviderType": "aliyun",
-     *                     "domains": [
-     *                       "*.handsfree.work"
-     *                     ],
-     *                     "email": "xiaojunnuo@qq.com",
-     *                     "dnsProviderAccess": 3,
-     *                     "useProxy": false,
-     *                     "skipLocalVerify": false,
-     *                     "successNotify": true,
-     *                     "pfxPassword": "123456"
-     */
     const checkInputChanges = ["domains", "sslProvider", "privateKeyType", "dnsProviderType", "pfxPassword"];
     const oldInput = JSON.stringify(pick(this.lastStatus?.input, checkInputChanges));
     const thisInput = JSON.stringify(pick(this, checkInputChanges));
-    inputChanged = oldInput !== thisInput;
+    const inputChanged = oldInput !== thisInput;
 
     this.logger.info(`旧参数：${oldInput}`);
     this.logger.info(`新参数：${thisInput}`);

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

@@ -2,7 +2,7 @@ import { CertInfo } from "./acme.js";
 import fs from "fs";
 import os from "os";
 import path from "path";
-import { crypto } from "@certd/acme-client";
+import { CertificateInfo, crypto } from "@certd/acme-client";
 import { ILogger } from "@certd/basic";
 import dayjs from "dayjs";
 
@@ -21,37 +21,22 @@ export type CertReaderHandle = (ctx: CertReaderHandleContext) => Promise<void>;
 export type HandleOpts = { logger: ILogger; handle: CertReaderHandle };
 export class CertReader {
   cert: CertInfo;
-  oc: string; //仅证书，非fullchain证书
-  crt: string;
-  key: string;
-  csr: string;
-  ic: string; //中间证书
-  one: string; //crt + key 合成一个pem文件
 
-  detail: any;
+  detail: CertificateInfo;
   expires: number;
   constructor(certInfo: CertInfo) {
     this.cert = certInfo;
-    this.crt = certInfo.crt;
-    this.key = certInfo.key;
-    this.csr = certInfo.csr;
 
-    this.ic = certInfo.ic;
+    if (!certInfo.ic) {
-    if (!this.ic) {
+      this.cert.ic = this.getIc();
-      this.ic = this.getIc();
-      this.cert.ic = this.ic;
     }
 
-    this.oc = certInfo.oc;
+    if (!certInfo.oc) {
-    if (!this.oc) {
+      this.cert.oc = this.getOc();
-      this.oc = this.getOc();
-      this.cert.oc = this.oc;
     }
 
-    this.one = certInfo.one;
+    if (!certInfo.one) {
-    if (!this.one) {
+      this.cert.one = this.cert.crt + "\n" + this.cert.key;
-      this.one = this.crt + "\n" + this.key;
-      this.cert.one = this.one;
     }
 
     const { detail, expires } = this.getCrtDetail(this.cert.crt);
@@ -62,20 +47,23 @@ export class CertReader {
   getIc() {
     //中间证书ic， 就是crt的第一个 -----END CERTIFICATE----- 之后的内容
     const endStr = "-----END CERTIFICATE-----";
-    const firstBlockEndIndex = this.crt.indexOf(endStr);
+    const firstBlockEndIndex = this.cert.crt.indexOf(endStr);
 
     const start = firstBlockEndIndex + endStr.length + 1;
-    if (this.crt.length <= start) {
+    if (this.cert.crt.length <= start) {
       return "";
     }
-    const ic = this.crt.substring(start);
+    const ic = this.cert.crt.substring(start);
-    return ic.trim();
+    if (ic == null) {
+      return "";
+    }
+    return ic?.trim();
   }
 
   getOc() {
     //原始证书 就是crt的第一个 -----END CERTIFICATE----- 之前的内容
     const endStr = "-----END CERTIFICATE-----";
-    const arr = this.crt.split(endStr);
+    const arr = this.cert.crt.split(endStr);
     return arr[0] + endStr;
   }
 
@@ -168,7 +156,7 @@ export class CertReader {
     }
   }
 
-  buildCertFileName(suffix: string, applyTime: number, prefix = "cert") {
+  buildCertFileName(suffix: string, applyTime: any, prefix = "cert") {
     const detail = this.getCrtDetail();
     let domain = detail.detail.domains.commonName;
     domain = domain.replace(".", "_").replace("*", "_");

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

@@ -10,7 +10,7 @@ import { CertApplyBasePlugin } from "./base.js";
 import { GoogleClient } from "../../libs/google.js";
 import { EabAccess } from "../../access";
 import { httpChallengeUploaderFactory } from "./uploads/factory.js";
-
+export * from "./base.js";
 export type { CertInfo };
 export * from "./cert-reader.js";
 export type CnameRecordInput = {
@@ -232,7 +232,7 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
         // { value: "ec_521", label: "EC 521" },
       ],
     },
-    helper: "如无特殊需求，默认即可",
+    helper: "如无特殊需求，默认即可\n选择RSA 2048 pkcs1可以获得旧版RSA证书",
     required: true,
   })
   privateKeyType!: PrivateKeyType;

packages/plugins/plugin-cert/src/plugin/cert-plugin/uploads/factory.ts

@@ -8,6 +8,9 @@ export class HttpChallengeUploaderFactory {
     } else if (type === "ssh") {
       const module = await import("./impls/ssh.js");
       return module.SshHttpChallengeUploader;
+    } else if (type === "sftp") {
+      const module = await import("./impls/sftp.js");
+      return module.SftpHttpChallengeUploader;
     } else if (type === "ftp") {
       const module = await import("./impls/ftp.js");
       return module.FtpHttpChallengeUploader;

packages/plugins/plugin-cert/src/plugin/cert-plugin/uploads/impls/sftp.ts

@@ -0,0 +1,51 @@
+import { BaseHttpChallengeUploader } from "../api.js";
+import { SshAccess, SshClient } from "@certd/plugin-lib";
+import path from "path";
+import os from "os";
+import fs from "fs";
+import { SftpAccess } from "@certd/plugin-lib";
+
+export class SftpHttpChallengeUploader extends BaseHttpChallengeUploader<SftpAccess> {
+  async upload(filePath: string, fileContent: Buffer) {
+    const tmpFilePath = path.join(os.tmpdir(), "cert", "http", filePath);
+
+    // Write file to temp path
+    const dir = path.dirname(tmpFilePath);
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+    fs.writeFileSync(tmpFilePath, fileContent);
+
+    const access = await this.ctx.accessService.getById<SshAccess>(this.access.sshAccess);
+    const key = this.rootDir + filePath;
+    try {
+      const client = new SshClient(this.logger);
+      await client.uploadFiles({
+        connectConf: access,
+        mkdirs: true,
+        transports: [
+          {
+            localPath: tmpFilePath,
+            remotePath: key,
+          },
+        ],
+        opts: {
+          mode: this.access?.fileMode ?? undefined,
+        },
+      });
+    } finally {
+      // Remove temp file
+      fs.unlinkSync(tmpFilePath);
+    }
+  }
+
+  async remove(filePath: string) {
+    const access = await this.ctx.accessService.getById<SshAccess>(this.access.sshAccess);
+    const client = new SshClient(this.logger);
+    const key = this.rootDir + filePath;
+    await client.removeFiles({
+      connectConf: access,
+      files: [key],
+    });
+  }
+}

packages/plugins/plugin-lib/CHANGELOG.md

@@ -3,6 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.30.1](https://github.com/certd/certd/compare/v1.30.0...v1.30.1) (2025-01-20)
+
+### Performance Improvements
+
+* http方式校验，选择sftp时，支持修改文件访问权限比如777 ([15d6eaf](https://github.com/certd/certd/commit/15d6eaf5532ed25acd4f8d58c429353a2f44206c))
+
+# [1.30.0](https://github.com/certd/certd/compare/v1.29.5...v1.30.0) (2025-01-19)
+
+### Bug Fixes
+
+* 修复查看任务日志偶发性无法自动滚动底部的bug ([7e482f7](https://github.com/certd/certd/commit/7e482f798c0142bce1866f84676cb40210f9638a))
+
+### Performance Improvements
+
+* 支持部署到阿里云ALB ([653940a](https://github.com/certd/certd/commit/653940a0ca64fc380178c1b0b58ae0af64dfaf07))
+* 支持部署到阿里云NLB、SLB ([c085bac](https://github.com/certd/certd/commit/c085bac5d877c4250a8a79e17eb8673b8e4fc89c))
+
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 ### Performance Improvements

packages/plugins/plugin-lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-lib",
   "private": false,
-  "version": "1.29.3",
+  "version": "1.30.1",
   "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.29.3",
+    "@certd/basic": "^1.30.1",
-    "@certd/pipeline": "^1.29.3",
+    "@certd/pipeline": "^1.30.1",
     "@kubernetes/client-node": "0.21.0",
     "ali-oss": "^6.21.0",
     "basic-ftp": "^5.0.5",
@@ -48,5 +48,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ed5634ff83405ad0eb13a8456f59270ed4218734"
+  "gitHead": "9a78dad57619e02d1390cf5a013695a2aaf20e64"
 }

packages/plugins/plugin-lib/src/aliyun/lib/base-client.ts

@@ -35,7 +35,7 @@ export class AliyunClient {
   }
 
   checkRet(ret: any) {
-    if (ret.code != null) {
+    if (ret.Code != null) {
       throw new Error("执行失败：" + ret.Message);
     }
   }

packages/plugins/plugin-lib/src/aliyun/lib/oss-client.ts

@@ -47,7 +47,7 @@ export class AliossClient {
   }
 
   checkRet(ret: any) {
-    if (ret.code != null) {
+    if (ret.Code != null) {
       throw new Error("执行失败：" + ret.Message);
     }
   }

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

@@ -29,6 +29,8 @@ export type AliyunSslUploadCertReq = {
   cert: AliyunCertInfo;
 };
 
+export type CasCertInfo = { certId: number; certName: string; certIdentifier: string };
+
 export class AliyunSslClient {
   opts: AliyunSslClientOpts;
   constructor(opts: AliyunSslClientOpts) {
@@ -36,7 +38,7 @@ export class AliyunSslClient {
   }
 
   checkRet(ret: any) {
-    if (ret.code != null) {
+    if (ret.Code != null) {
       throw new Error("执行失败：" + ret.Message);
     }
   }
@@ -53,6 +55,22 @@ export class AliyunSslClient {
     return client;
   }
 
+  async getCertInfo(certId: number): Promise<CasCertInfo> {
+    const client = await this.getClient();
+    const params = {
+      CertId: certId,
+    };
+
+    const res = await client.request("GetUserCertificateDetail", params);
+    this.checkRet(res);
+
+    return {
+      certId: certId,
+      certName: res.Name,
+      certIdentifier: res.CertIdentifier,
+    };
+  }
+
   async uploadCert(req: AliyunSslUploadCertReq) {
     const client = await this.getClient();
     const params = {

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

@@ -46,7 +46,13 @@ export function createRemoteSelectInputDefine(opts?: {
   const type = opts?.type || "plugin";
   const watches = opts?.watches || [];
   const helper = opts?.helper || "请选择";
-  const mode = opts?.mode || "tags";
+  let mode = "tags";
+  if (opts.multi === false) {
+    mode = undefined;
+  } else {
+    mode = opts?.mode ?? "tags";
+  }
+
   const item = {
     title,
     component: {

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

@@ -1,2 +1,3 @@
 export * from "./ssh.js";
 export * from "./ssh-access.js";
+export * from "./sftp-access.js";

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

@@ -0,0 +1,34 @@
+import { AccessInput, BaseAccess, IsAccess } from "@certd/pipeline";
+
+@IsAccess({
+  name: "sftp",
+  title: "SFTP授权",
+  desc: "",
+  icon: "clarity:host-line",
+  input: {},
+})
+export class SftpAccess extends BaseAccess {
+  @AccessInput({
+    title: "SSH授权",
+    component: {
+      name: "access-selector",
+      type: "ssh",
+      vModel: "modelValue",
+    },
+    helper: "请选择一个SSH授权",
+    required: true,
+  })
+  sshAccess!: string;
+  @AccessInput({
+    title: "文件权限",
+    component: {
+      name: "a-input",
+      vModel: "value",
+      placeholder: "777",
+    },
+    helper: "文件上传后是否修改文件权限",
+  })
+  fileMode!: string;
+}
+
+new SftpAccess();

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

@@ -80,11 +80,11 @@ export class AsyncSsh2Client {
     });
   }
 
-  async fastPut(options: { sftp: any; localPath: string; remotePath: string }) {
+  async fastPut(options: { sftp: any; localPath: string; remotePath: string; opts?: { mode?: string } }) {
-    const { sftp, localPath, remotePath } = options;
+    const { sftp, localPath, remotePath, opts } = options;
     return new Promise((resolve, reject) => {
       this.logger.info(`开始上传：${localPath} => ${remotePath}`);
-      sftp.fastPut(localPath, remotePath, (err: Error) => {
+      sftp.fastPut(localPath, remotePath, { ...(opts ?? {}) }, (err: Error) => {
         if (err) {
           reject(err);
           this.logger.error("请确认路径是否包含文件名，路径本身不能是目录，路径不能有*?之类的特殊符号，要有写入权限");
@@ -255,8 +255,8 @@ export class SshClient {
          }
    * @param options
    */
-  async uploadFiles(options: { connectConf: SshAccess; transports: TransportItem[]; mkdirs: boolean }) {
+  async uploadFiles(options: { connectConf: SshAccess; transports: TransportItem[]; mkdirs: boolean; opts?: { mode?: string } }) {
-    const { connectConf, transports, mkdirs } = options;
+    const { connectConf, transports, mkdirs, opts } = options;
     await this._call({
       connectConf,
       callable: async (conn: AsyncSsh2Client) => {
@@ -281,7 +281,7 @@ export class SshClient {
             }
             await conn.exec(mkdirCmd);
           }
-          await conn.fastPut({ sftp, ...transport });
+          await conn.fastPut({ sftp, ...transport, opts });
         }
         this.logger.info("文件全部上传成功");
       },

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,35 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.30.1](https://github.com/certd/certd/compare/v1.30.0...v1.30.1) (2025-01-20)
+
+### Performance Improvements
+
+* 创建流水线时，默认成功时也发送通知 ([52ae690](https://github.com/certd/certd/commit/52ae6902d203ca56e0312692b50c55cb6ddd3e39))
+* http方式校验，选择sftp时，支持修改文件访问权限比如777 ([15d6eaf](https://github.com/certd/certd/commit/15d6eaf5532ed25acd4f8d58c429353a2f44206c))
+
+# [1.30.0](https://github.com/certd/certd/compare/v1.29.5...v1.30.0) (2025-01-19)
+
+### Bug Fixes
+
+* 修复查看任务日志偶发性无法自动滚动底部的bug ([7e482f7](https://github.com/certd/certd/commit/7e482f798c0142bce1866f84676cb40210f9638a))
+
+### Performance Improvements
+
+* 证书仓库 ([91e7f45](https://github.com/certd/certd/commit/91e7f45a1c5ea1e0ec0aa3236b80028f03a6d0aa))
+
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+### Bug Fixes
+
+* 修复授权管理，点击了查看原文按钮后，无法修改值的bug ([85c99f7](https://github.com/certd/certd/commit/85c99f7f80761ac6efaf3255c03b933442db1686))
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+### Bug Fixes
+
+* 修复站点监控域名校验无法通过的bug ([1cb4a53](https://github.com/certd/certd/commit/1cb4a539cc523721ffd4b22d40d0e3d2d68cd915))
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 ### Performance Improvements

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.29.3",
+  "version": "1.30.1",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -26,10 +26,10 @@
   "dependencies": {
     "@ant-design/colors": "^7.0.2",
     "@ant-design/icons-vue": "^6.1.0",
-    "@fast-crud/fast-crud": "^1.23.4",
+    "@fast-crud/fast-crud": "^1.25.0",
-    "@fast-crud/fast-extends": "^1.23.4",
+    "@fast-crud/fast-extends": "^1.25.0",
-    "@fast-crud/ui-antdv4": "^1.23.4",
+    "@fast-crud/ui-antdv4": "^1.25.0",
-    "@fast-crud/ui-interface": "^1.23.4",
+    "@fast-crud/ui-interface": "^1.25.0",
     "@iconify/vue": "^4.1.1",
     "@soerenmartius/vue3-clipboard": "^0.1.2",
     "@vue-js-cron/light": "^4.0.5",
@@ -66,8 +66,8 @@
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.29.3",
+    "@certd/lib-iframe": "^1.30.1",
-    "@certd/pipeline": "^1.29.3",
+    "@certd/pipeline": "^1.30.1",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/http-verify-plan.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script lang="ts" setup>
-import { Ref, ref, watch } from "vue";
+import { Ref, ref, watch, nextTick } from "vue";
 import { HttpRecord } from "/@/components/plugins/cert/domains-verify-plan-editor/type";
 import { dict } from "@fast-crud/fast-crud";
 
@@ -62,18 +62,20 @@ watch(
   }
 );
 
-function onRecordChange() {
+async function onRecordChange() {
+  await nextTick();
   emit("update:modelValue", records.value);
   emit("change", records.value);
 }
 
 const uploaderTypeDict = dict({
   data: [
-    { label: "SFTP/SSH", value: "ssh" },
+    { label: "SFTP", value: "sftp" },
     { label: "FTP", value: "ftp" },
     { label: "阿里云OSS", value: "alioss" },
     { label: "腾讯云COS", value: "tencentcos" },
-    { label: "七牛OSS", value: "qiniuoss" }
+    { label: "七牛OSS", value: "qiniuoss" },
+    { label: "SSH(已废弃，请选择SFTP方式)", value: "ssh", disabled: true }
   ]
 });
 </script>

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

@@ -40,6 +40,17 @@ export const certdResources = [
           cache: true
         }
       },
+      {
+        title: "证书仓库",
+        name: "CertStore",
+        path: "/certd/monitor/cert",
+        component: "/certd/monitor/cert/index.vue",
+        meta: {
+          icon: "ion:shield-checkmark-outline",
+          auth: true,
+          isMenu: true
+        }
+      },
       {
         title: "站点证书监控",
         name: "SiteCertMonitor",
@@ -80,21 +91,6 @@ export const certdResources = [
               auth: true
             }
           },
-          {
-            title: "证书仓库",
-            name: "CertStore",
-            path: "/certd/monitor/cert",
-            component: "/certd/monitor/cert/index.vue",
-            meta: {
-              show: () => {
-                const settingStore = useSettingStore();
-                return settingStore.isPlus;
-              },
-              icon: "ion:shield-checkmark-outline",
-              auth: true,
-              isMenu: false
-            }
-          },
           {
             title: "授权管理",
             name: "AccessManager",
@@ -106,6 +102,17 @@ export const certdResources = [
               cache: true
             }
           },
+          {
+            title: "OpenKey",
+            name: "OpenKey",
+            path: "/certd/open/openkey",
+            component: "/certd/open/openkey/index.vue",
+            meta: {
+              icon: "hugeicons:api",
+              auth: true,
+              cache: true
+            }
+          },
           {
             title: "通知设置",
             name: "NotificationManager",

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

@@ -49,7 +49,7 @@ export const sysResources = [
         }
       },
       {
-        title: "邮箱设置",
+        title: "邮件服务器设置",
         name: "EmailSetting",
         path: "/sys/settings/email",
         component: "/sys/settings/email/index.vue",

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

@@ -2,6 +2,7 @@
   display: inline-flex;
   justify-content: center;
   align-items: center;
+  font-size:16px;
 
 }
 
@@ -9,6 +10,10 @@
   display: inline-flex;
   justify-content: center;
   align-items: center;
+  .fs-iconify{
+
+    margin-right: 5px;
+  }
 }
 
 .cd-icon-button {

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

@@ -41,7 +41,11 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
         column.suffixRender = (scope: { form: any; key: string }) => {
           const { form, key } = scope;
           const inputKey = scope.key.replace("access.", "");
-          return <SecretPlainGetter accessId={form.id} inputKey={inputKey} v-model={form[key]} />;
+          const onChange = (val: any) => {
+            set(form, key, val);
+          };
+          const value = get(form, key);
+          return <SecretPlainGetter accessId={form.id} inputKey={inputKey} modalValue={value} onUpdate:modelValue={onChange} />;
         };
       }
       //eval

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

@@ -2,6 +2,7 @@
 import { useI18n } from "vue-i18n";
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { pipelineGroupApi } from "./api";
+import dayjs from "dayjs";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -78,37 +79,38 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             show: false
           }
         },
-        domain: {
+        // domain: {
-          title: "主域名",
+        //   title: "主域名",
-          search: {
+        //   search: {
-            show: true
+        //     show: true
-          },
+        //   },
-          type: "text",
+        //   type: "text",
-          form: {
+        //   form: {
-            show: false
+        //     show: false
-          },
+        //   },
-          column: {
+        //   column: {
-            width: 180,
+        //     width: 180,
-            sorter: true,
+        //     sorter: true,
-            component: {
+        //     component: {
-              name: "fs-values-format"
+        //       name: "fs-values-format"
-            }
+        //     }
-          }
+        //   }
-        },
+        // },
         domains: {
           title: "全部域名",
           search: {
-            show: false
+            show: true
           },
           type: "text",
           form: {
             rules: [{ required: true, message: "请输入域名" }]
           },
           column: {
-            width: 350,
+            width: 450,
             sorter: true,
             component: {
-              name: "fs-values-format"
+              name: "fs-values-format",
+              color: "auto"
             }
           }
         },
@@ -124,17 +126,40 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             show: false
           }
         },
-        "pipeline.title": {
+        expiresTime: {
-          title: "已关联流水线",
+          title: "过期时间",
-          search: { show: false },
+          search: {
-          type: "link",
+            show: false
+          },
+          type: "date",
           form: {
             show: false
           },
           column: {
-            width: 250,
             sorter: true,
-            component: {}
+            cellRender({ value }) {
+              if (!value) {
+                return "-";
+              }
+              const expireDate = dayjs(value).format("YYYY-MM-DD");
+              const leftDays = dayjs(value).diff(dayjs(), "day");
+              const color = leftDays < 20 ? "red" : "#389e0d";
+              const percent = (leftDays / 90) * 100;
+              return <a-progress title={expireDate + "过期"} percent={percent} strokeColor={color} format={(percent: number) => `${leftDays}天`} />;
+            }
+          }
+        },
+        certProvider: {
+          title: "证书颁发机构",
+          search: {
+            show: false
+          },
+          type: "text",
+          form: {
+            show: false
+          },
+          column: {
+            width: 200
           }
         },
         applyTime: {
@@ -150,42 +175,17 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             sorter: true
           }
         },
-        expiresTime: {
+        "pipeline.title": {
-          title: "过期时间",
+          title: "已关联流水线",
-          search: {
+          search: { show: false },
-            show: true
+          type: "link",
-          },
-          type: "date",
           form: {
             show: false
           },
           column: {
-            sorter: true
+            width: 350,
-          }
+            sorter: true,
-        },
+            component: {}
-        fromType: {
-          title: "来源",
-          search: {
-            show: true
-          },
-          type: "text",
-          form: { show: false },
-          column: {
-            width: 100,
-            sorter: true
-          }
-        },
-        certProvider: {
-          title: "证书颁发机构",
-          search: {
-            show: true
-          },
-          type: "text",
-          form: {
-            show: false
-          },
-          column: {
-            width: 400
           }
         }
       }

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>

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

@@ -145,7 +145,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           search: {
             show: true
           },
-          type: "copyable",
+          type: "text",
           form: {
             rules: [
               { required: true, message: "请输入域名" },

packages/ui/certd-client/src/views/certd/open/openkey/api.ts

@@ -0,0 +1,53 @@
+import { request } from "/src/api/service";
+
+export const OPEN_API_DOC = "https://apifox.com/apidoc/shared-2e76f8c4-7c58-413b-a32d-a1316529af44/254949529e0";
+
+const apiPrefix = "/open/key";
+export const openkeyApi = {
+  async GetList(query: any) {
+    return await request({
+      url: apiPrefix + "/page",
+      method: "post",
+      data: query
+    });
+  },
+
+  async AddObj(obj: any) {
+    return await request({
+      url: apiPrefix + "/add",
+      method: "post",
+      data: obj
+    });
+  },
+
+  async UpdateObj(obj: any) {
+    return await request({
+      url: apiPrefix + "/update",
+      method: "post",
+      data: obj
+    });
+  },
+
+  async DelObj(id: number) {
+    return await request({
+      url: apiPrefix + "/delete",
+      method: "post",
+      params: { id }
+    });
+  },
+
+  async GetObj(id: number) {
+    return await request({
+      url: apiPrefix + "/info",
+      method: "post",
+      params: { id }
+    });
+  },
+  async GetApiToken(id: number) {
+    return await request({
+      url: apiPrefix + "/getApiToken",
+      method: "post",
+      data: { id }
+    });
+  }
+};

packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx

@@ -0,0 +1,185 @@
+// @ts-ignore
+import { useI18n } from "vue-i18n";
+import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { OPEN_API_DOC, openkeyApi } from "./api";
+import { useModal } from "/@/use/use-modal";
+
+export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+  const { t } = useI18n();
+  const api = openkeyApi;
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetList(query);
+  };
+  const editRequest = async (req: EditReq) => {
+    const { form, row } = req;
+    form.id = row.id;
+    const res = await api.UpdateObj(form);
+    return res;
+  };
+  const delRequest = async (req: DelReq) => {
+    const { row } = req;
+    return await api.DelObj(row.id);
+  };
+
+  const addRequest = async (req: AddReq) => {
+    const { form } = req;
+    const res = await api.AddObj(form);
+    return res;
+  };
+  const model = useModal();
+  return {
+    crudOptions: {
+      request: {
+        pageRequest,
+        addRequest,
+        editRequest,
+        delRequest
+      },
+      search: {
+        show: false
+      },
+      form: {
+        labelCol: {
+          //固定label宽度
+          span: null,
+          style: {
+            width: "100px"
+          }
+        },
+        col: {
+          span: 22
+        },
+        wrapper: {
+          width: 600
+        }
+      },
+      actionbar: {
+        buttons: {
+          add: {
+            text: "生成新的Key"
+          }
+        }
+      },
+      rowHandle: {
+        width: 300,
+        fixed: "right",
+        buttons: {
+          view: { show: true },
+          copy: { show: false },
+          edit: { show: false },
+          remove: { show: true },
+          gen: {
+            text: "接口测试",
+            size: "mini",
+            icon: "devicon-plain:vitest",
+            type: "primary",
+            async click({ row }) {
+              const apiToken = await api.GetApiToken(row.id);
+
+              model.success({
+                title: "x-certd-token",
+                maskClosable: true,
+                okText: "确定",
+                width: 600,
+                content: () => {
+                  return (
+                    <div>
+                      <div class={"m-10 p-10"}>
+                        测试x-certd-token如下，您可以在3分钟内使用它进行
+                        <a href={OPEN_API_DOC} target={"_blank"}>
+                          开放接口
+                        </a>
+                        请求测试
+                      </div>
+                      <div class={"m-10 p-10"} style={{ border: "1px solid #333" }}>
+                        <fs-copyable model-value={apiToken}></fs-copyable>
+                      </div>
+                    </div>
+                  );
+                }
+              });
+            }
+          }
+        }
+      },
+      columns: {
+        id: {
+          title: "ID",
+          key: "id",
+          type: "number",
+          search: {
+            show: false
+          },
+          column: {
+            width: 100,
+            editable: {
+              disabled: true
+            }
+          },
+          form: {
+            show: false
+          }
+        },
+        keyId: {
+          title: "KeyId",
+          type: ["text", "copyable"],
+          search: {
+            show: true
+          },
+          form: {
+            show: false
+          },
+          column: {
+            width: 250,
+            sorter: true
+          }
+        },
+        keySecret: {
+          title: "KeySecret",
+          type: ["text", "copyable"],
+          form: {
+            show: false
+          },
+          column: {
+            width: 580,
+            sorter: true
+          }
+        },
+        scope: {
+          title: "权限范围",
+          type: "dict-radio",
+          dict: dict({
+            data: [
+              { label: "仅开放接口", value: "open", color: "blue" },
+              { label: "账户所有权限", value: "user", color: "red" }
+            ]
+          }),
+          form: {
+            value: "open",
+            show: true,
+            rules: [{ required: true, message: "此项必填" }],
+            helper: "仅开放接口只可以访问开放接口，账户所有权限可以访问所有接口",
+            component: {
+              vModel: "value"
+            }
+          },
+          column: {
+            width: 120,
+            align: "center",
+            sorter: true
+          }
+        },
+        createTime: {
+          title: "创建时间",
+          type: "datetime",
+          search: {
+            show: false
+          },
+          form: {
+            show: false
+          }
+        }
+      }
+    }
+  };
+}

packages/ui/certd-client/src/views/certd/open/openkey/index.vue

@@ -0,0 +1,31 @@
+<template>
+  <fs-page>
+    <template #header>
+      <div class="title">开放接口密钥管理</div>
+      <div class="more">
+        <a :href="OPEN_API_DOC" target="_blank">开放接口文档</a>
+      </div>
+    </template>
+    <fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
+  </fs-page>
+</template>
+
+<script lang="ts" setup>
+import { onActivated, onMounted } from "vue";
+import { useFs } from "@fast-crud/fast-crud";
+import createCrudOptions from "./crud";
+import { OPEN_API_DOC } from "/@/views/certd/open/openkey/api";
+
+defineOptions({
+  name: "OpenKey"
+});
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: {} });
+
+// 页面打开后获取列表数据
+onMounted(() => {
+  crudExpose.doRefresh();
+});
+onActivated(() => {
+  crudExpose.doRefresh();
+});
+</script>

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

@@ -122,7 +122,7 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
       if (form.notification != null) {
         notifications.push({
           type: "custom",
-          when: ["error", "turnToSuccess"],
+          when: ["error", "turnToSuccess", "success"],
           notificationId: form.notification,
           title: form.notificationTarget?.name || "自定义通知"
         });

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

@@ -89,7 +89,11 @@ export default {
                 return;
               }
               //判断当前是否在底部
-              const isBottom = el ? el.scrollHeight - el.scrollTop === el.clientHeight : true;
+              let isBottom = true;
+              if (el) {
+                isBottom = el.scrollHeight - el.scrollTop - el.clientHeight < 5;
+                console.log("isBottom", isBottom, el.scrollHeight, el.scrollTop, el.clientHeight);
+              }
               await nextTick();
               el = document.querySelector(`.pi-task-view-logs.id-${node.node.id}`);
               //如果在底部则滚动到底部

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

@@ -98,14 +98,16 @@
                                     {{ index + 1 }}. {{ item.title }}
                                   </span>
                                   <pi-status-show v-if="!editMode" :status="item.status?.result"></pi-status-show>
-                                  <fs-icon
+                                  <a-tooltip title="强制重新执行此步骤">
-                                    v-if="!editMode"
+                                    <fs-icon
-                                    class="pointer color-blue ml-2"
+                                      v-if="!editMode"
-                                    style="font-size: 16px"
+                                      class="pointer color-blue ml-2"
-                                    title="强制重新执行此步骤"
+                                      style="font-size: 16px"
-                                    icon="icon-park-outline:replay-music"
+                                      title="强制重新执行此步骤"
-                                    @click="run(item.id)"
+                                      icon="icon-park-outline:replay-music"
-                                  ></fs-icon>
+                                      @click="run(item.id)"
+                                    ></fs-icon>
+                                  </a-tooltip>
                                 </div>
                               </template>
                               <span class="flex-o w-100">

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

@@ -63,6 +63,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         width: 240,
         fixed: "right",
         buttons: {
+          view: { show: false },
           edit: { show: false },
           copy: { show: false },
           syncStatus: {

packages/ui/certd-client/src/views/sys/settings/email/api.email.ts

@@ -1,5 +1,5 @@
 import { request } from "/src/api/service";
-const apiPrefix = "/basic/email";
+const apiPrefix = "/mine/email";
 
 export async function TestSend(receiver: string) {
   await request({

packages/ui/certd-client/src/views/sys/settings/email/index.vue

@@ -2,7 +2,7 @@
   <fs-page class="page-setting-email">
     <template #header>
       <div class="title">
-        邮件设置
+        邮件服务器设置
         <span class="sub">设置邮件发送服务器</span>
       </div>
     </template>

packages/ui/certd-client/src/views/sys/settings/header-menus/crud.tsx

@@ -153,7 +153,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         },
         icon: {
           title: "图标",
-          type: "text",
+          type: "icon",
           column: {
             width: 300,
             cellRender: ({ row }) => {
@@ -163,18 +163,6 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           form: {
             component: {
               placeholder: "ion:add-circle"
-            },
-            helper: {
-              render: () => {
-                return (
-                  <span>
-                    <a href="https://icon-sets.iconify.design/" target="_blank">
-                      图标库
-                    </a>
-                    <span>--搜索--选择图标--复制名称--填到这里</span>
-                  </span>
-                );
-              }
             }
           }
         },

packages/ui/certd-client/src/views/sys/settings/tabs/payment.vue

@@ -2,11 +2,14 @@
   <div class="sys-settings-form sys-settings-payment">
     <a-form ref="formRef" :model="formState" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off">
       <div>支付方式</div>
-      <a-form-item label="易支付" :name="['yizhifu', 'enabled']" :required="true">
+      <a-form-item label="彩虹易支付" :name="['yizhifu', 'enabled']" :required="true">
         <a-switch v-model:checked="formState.yizhifu.enabled" />
       </a-form-item>
       <a-form-item v-if="formState.yizhifu.enabled" label="易支付配置" :name="['yizhifu', 'accessId']" :required="true">
         <access-selector v-model="formState.yizhifu.accessId" type="yizhifu" from="sys" />
+        <div class="helper">
+          <a href="https://certd.docmirror.cn/comm/payments/yizhifu.html">彩虹易支付配置帮助文档</a>
+        </div>
       </a-form-item>
 
       <a-form-item label="支付宝" :name="['alipay', 'enabled']" :required="true">
@@ -14,7 +17,7 @@
       </a-form-item>
       <a-form-item v-if="formState.alipay.enabled" label="支付宝配置" :name="['alipay', 'accessId']" :required="true">
         <access-selector v-model="formState.alipay.accessId" type="alipay" from="sys" />
-        <div class="helper">需要开通电脑网站支付</div>
+        <div class="helper">需要开通电脑网站支付， <a href="https://certd.docmirror.cn/comm/payments/alipay.html">支付宝配置帮助文档</a></div>
       </a-form-item>
 
       <a-form-item label="微信支付" :name="['wxpay', 'enabled']" :required="true">
@@ -22,7 +25,7 @@
       </a-form-item>
       <a-form-item v-if="formState.wxpay.enabled" label="微信支付配置" :name="['wxpay', 'accessId']" :required="true">
         <access-selector v-model="formState.wxpay.accessId" type="wxpay" from="sys" />
-        <div class="helper">需要开通Native支付</div>
+        <div class="helper">需要开通Native支付， <a href="https://certd.docmirror.cn/comm/payments/wxpay.html">微信配置帮助文档</a></div>
       </a-form-item>
 
       <a-form-item :wrapper-col="{ offset: 8, span: 16 }">

packages/ui/certd-client/src/views/sys/suite/trade/crud.tsx

@@ -70,6 +70,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         width: 320,
         fixed: "right",
         buttons: {
+          view: {
+            show: false
+          },
           copy: {
             show: false
           },

packages/ui/certd-server/CHANGELOG.md

@@ -3,6 +3,48 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.30.1](https://github.com/certd/certd/compare/v1.30.0...v1.30.1) (2025-01-20)
+
+### Bug Fixes
+
+* 修复部署到阿里云ALB、NLB插件加载混乱的bug ([6ab83b6](https://github.com/certd/certd/commit/6ab83b662a2c5e715b9cb7eb1244de2ebb7f47b0))
+* 修复腾讯clb重复执行会报错的bug ([e95d29f](https://github.com/certd/certd/commit/e95d29f446d06eced315a3087fc9e105a30b20bd))
+* 修复tg消息内容中存在.和*就会发送失败的bug ([ae5dfc3](https://github.com/certd/certd/commit/ae5dfc3bee950267123ae2fbd1c11e7ce36626ea))
+
+### Performance Improvements
+
+* http方式校验，选择sftp时，支持修改文件访问权限比如777 ([15d6eaf](https://github.com/certd/certd/commit/15d6eaf5532ed25acd4f8d58c429353a2f44206c))
+
+# [1.30.0](https://github.com/certd/certd/compare/v1.29.5...v1.30.0) (2025-01-19)
+
+### Bug Fixes
+
+* 修复namesilo ttl太短的问题 ([865f26d](https://github.com/certd/certd/commit/865f26d75c0d3dd4dc8b41448f8830068e45957c))
+
+### Features
+
+* 支持open api接口，根据域名获取证书 ([52a4fd3](https://github.com/certd/certd/commit/52a4fd33180e9b3f71b8dc9f7671d7cd8e448c3b))
+
+### Performance Improvements
+
+* 证书仓库 ([91e7f45](https://github.com/certd/certd/commit/91e7f45a1c5ea1e0ec0aa3236b80028f03a6d0aa))
+* 支持部署到阿里云ALB ([653940a](https://github.com/certd/certd/commit/653940a0ca64fc380178c1b0b58ae0af64dfaf07))
+* 支持部署到阿里云NLB、SLB ([c085bac](https://github.com/certd/certd/commit/c085bac5d877c4250a8a79e17eb8673b8e4fc89c))
+* 支持部署到腾讯云直播 ([417d37b](https://github.com/certd/certd/commit/417d37b199b79a42f790f9edab8f178eedf8fbf7))
+* 支持部署证书到proxmox ([d10795e](https://github.com/certd/certd/commit/d10795ecd97eb8cf2ffa46aabfdbfc6812636396))
+
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+### Bug Fixes
+
+* 修复复制到本机插件，pfx格式复制时报错的bug ([f57116d](https://github.com/certd/certd/commit/f57116d2bebf33e47ad93e0b39c4efe8e4aea25c))
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+### Performance Improvements
+
+* 优化腾讯云CLB插件，支持非sni情况，sni情况支持填写多个域名 ([635b042](https://github.com/certd/certd/commit/635b042690637bff85e97e07c7aac4b87a8a124b))
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 ### Bug Fixes

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

@@ -0,0 +1,16 @@
+CREATE TABLE `cd_open_key`
+(
+  `id`          bigint PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `user_id`     bigint,
+  `key_id`      varchar(50),
+  `key_secret`  varchar(100),
+  `scope`       varchar(50),
+  `disabled`    boolean  NOT NULL DEFAULT false,
+  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+
+
+CREATE INDEX `index_open_key_user_id` ON `cd_open_key` (`user_id`);
+CREATE INDEX `index_open_key_key_id` ON `cd_open_key` (`key_id`);

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

@@ -0,0 +1,16 @@
+CREATE TABLE "cd_open_key"
+(
+  "id"          bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+  "user_id"     bigint,
+  "key_id"      varchar(50),
+  "key_secret"  varchar(100),
+  "scope"       varchar(50),
+  "disabled"    boolean  NOT NULL DEFAULT (false),
+  "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+
+
+
+CREATE INDEX "index_open_key_user_id" ON "cd_open_key" ("user_id");
+CREATE INDEX "index_open_key_key_id" ON "cd_open_key" ("key_id");

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

@@ -0,0 +1,16 @@
+CREATE TABLE "cd_open_key"
+(
+  "id"          integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+  "user_id"     integer,
+  "key_id"      varchar(50),
+  "key_secret"  varchar(100),
+  "scope"       varchar(50),
+  "disabled"    boolean  NOT NULL DEFAULT (false),
+  "create_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+
+
+
+CREATE INDEX "index_open_key_user_id" ON "cd_open_key" ("user_id");
+CREATE INDEX "index_open_key_key_id" ON "cd_open_key" ("key_id");

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

@@ -67,7 +67,8 @@ function transformMysql() {
     pgSql = pgSql.replaceAll(/DEFAULT \(([^)]*)\)/g, 'DEFAULT $1');
     pgSql = pgSql.replaceAll(/integer/g, 'bigint');
     pgSql = pgSql.replaceAll(/last_insert_rowid\(\)/g, 'LAST_INSERT_ID()');
-
+    //text 改成longtext
+    pgSql = pgSql.replaceAll(/text/g, 'longtext');
     //双引号 替换成反引号
     pgSql = pgSql.replaceAll(/"/g, '`');
 

packages/ui/certd-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-server",
-  "version": "1.29.3",
+  "version": "1.30.1",
   "description": "fast-server base midway",
   "private": true,
   "type": "module",
@@ -34,18 +34,19 @@
     "@aws-sdk/client-acm": "^3.699.0",
     "@aws-sdk/client-cloudfront": "^3.699.0",
     "@aws-sdk/client-s3": "^3.705.0",
-    "@certd/acme-client": "^1.29.3",
+    "@certd/acme-client": "^1.30.1",
-    "@certd/basic": "^1.29.3",
+    "@certd/basic": "^1.30.1",
-    "@certd/commercial-core": "^1.29.3",
+    "@certd/commercial-core": "^1.30.1",
-    "@certd/lib-huawei": "^1.29.3",
+    "@certd/lib-huawei": "^1.30.1",
-    "@certd/lib-k8s": "^1.29.3",
+    "@certd/lib-k8s": "^1.30.1",
-    "@certd/lib-server": "^1.29.3",
+    "@certd/lib-server": "^1.30.1",
-    "@certd/midway-flyway-js": "^1.29.3",
+    "@certd/midway-flyway-js": "^1.30.1",
-    "@certd/pipeline": "^1.29.3",
+    "@certd/pipeline": "^1.30.1",
-    "@certd/plugin-cert": "^1.29.3",
+    "@certd/plugin-cert": "^1.30.1",
-    "@certd/plugin-lib": "^1.29.3",
+    "@certd/plugin-lib": "^1.30.1",
-    "@certd/plugin-plus": "^1.29.3",
+    "@certd/plugin-plus": "^1.30.1",
-    "@certd/plus-core": "^1.29.3",
+    "@certd/plus-core": "^1.30.1",
+    "@corsinvest/cv4pve-api-javascript": "^8.3.0",
     "@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120",
     "@huaweicloud/huaweicloud-sdk-core": "^3.1.120",
     "@koa/cors": "^5.0.0",

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

@@ -19,7 +19,6 @@ import * as libServer from '@certd/lib-server';
 import * as commercial from '@certd/commercial-core';
 import * as upload from '@midwayjs/upload';
 import { setLogger } from '@certd/acme-client';
-
 process.on('uncaughtException', error => {
   console.error('未捕获的异常：', error);
   // 在这里可以添加日志记录、发送错误通知等操作

packages/ui/certd-server/src/controller/openapi/base-open-controller.ts

@@ -0,0 +1,15 @@
+import { BaseController, Encryptor } from '@certd/lib-server';
+import { OpenKey } from '../../modules/open/service/open-key-service.js';
+
+export class BaseOpenController extends BaseController {
+  ok(res: any) {
+    const openKey: OpenKey = this.ctx.openKey;
+    if (openKey.encrypt) {
+      const data = JSON.stringify(res);
+      const encryptor = new Encryptor(openKey.keySecret, 'hex');
+      const encrypted = encryptor.encrypt(data);
+      return this.ok(encrypted);
+    }
+    return super.ok(res);
+  }
+}

packages/ui/certd-server/src/controller/openapi/v1/cert-controller.ts

@@ -0,0 +1,39 @@
+import { ALL, Body, Controller, Get, Inject, Post, Provide, Query } from '@midwayjs/core';
+import { CodeException, Constants, EncryptService } from '@certd/lib-server';
+import { CertInfoService } from '../../../modules/monitor/service/cert-info-service.js';
+import { CertInfo } from '@certd/plugin-cert';
+import { OpenKey } from '../../../modules/open/service/open-key-service.js';
+import { BaseOpenController } from '../base-open-controller.js';
+
+export type CertGetReq = {
+  domains?: string;
+  certId: number;
+};
+
+/**
+ */
+@Provide()
+@Controller('/api/v1/cert')
+export class OpenCertController extends BaseOpenController {
+  @Inject()
+  certInfoService: CertInfoService;
+  @Inject()
+  encryptService: EncryptService;
+
+  @Get('/get', { summary: Constants.per.open })
+  @Post('/get', { summary: Constants.per.open })
+  async get(@Body(ALL) bean: CertGetReq, @Query(ALL) query: CertGetReq) {
+    const openKey: OpenKey = this.ctx.openKey;
+    const userId = openKey.userId;
+    if (!userId) {
+      throw new CodeException(Constants.res.openKeyError);
+    }
+
+    const res: CertInfo = await this.certInfoService.getCertInfo({
+      userId,
+      domains: bean.domains || query.domains,
+      certId: bean.certId || query.certId,
+    });
+    return this.ok(res);
+  }
+}

packages/ui/certd-server/src/controller/sys/access/access-controller.ts

@@ -1,6 +1,6 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { AccessService, Constants } from '@certd/lib-server';
-import { AccessController } from '../../pipeline/access-controller.js';
+import { AccessController } from '../../user/pipeline/access-controller.js';
 import { checkComm } from '@certd/plus-core';
 
 /**

packages/ui/certd-server/src/controller/user/cname/cname-provider-controller.ts

@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { BaseController, Constants } from '@certd/lib-server';
-import { CnameRecordService } from '../../modules/cname/service/cname-record-service.js';
+import { CnameRecordService } from '../../../modules/cname/service/cname-record-service.js';
-import { CnameProviderService } from '../../modules/cname/service/cname-provider-service.js';
+import { CnameProviderService } from '../../../modules/cname/service/cname-provider-service.js';
 
 /**
  * 授权

packages/ui/certd-server/src/controller/user/cname/cname-record-controller.ts

@@ -1,6 +1,6 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { Constants, CrudController } from '@certd/lib-server';
-import { CnameRecordService } from '../../modules/cname/service/cname-record-service.js';
+import { CnameRecordService } from '../../../modules/cname/service/cname-record-service.js';
 
 /**
  * 授权

packages/ui/certd-server/src/controller/user/dashboard/statistic-controller.ts

@@ -1,9 +1,9 @@
 import { Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { BaseController, Constants } from '@certd/lib-server';
-import { UserService } from '../../modules/sys/authority/service/user-service.js';
+import { UserService } from '../../../modules/sys/authority/service/user-service.js';
-import { RoleService } from '../../modules/sys/authority/service/role-service.js';
+import { RoleService } from '../../../modules/sys/authority/service/role-service.js';
-import { PipelineService } from '../../modules/pipeline/service/pipeline-service.js';
+import { PipelineService } from '../../../modules/pipeline/service/pipeline-service.js';
-import { HistoryService } from '../../modules/pipeline/service/history-service.js';
+import { HistoryService } from '../../../modules/pipeline/service/history-service.js';
 
 export type ChartItem = {
   name: string;

packages/ui/certd-server/src/controller/user/login/login-controller.ts

@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
-import { LoginService } from '../../modules/login/service/login-service.js';
+import { LoginService } from '../../../modules/login/service/login-service.js';
 import { BaseController, Constants, SysPublicSettings, SysSettingsService } from '@certd/lib-server';
-import { CodeService } from '../../modules/basic/service/code-service.js';
+import { CodeService } from '../../../modules/basic/service/code-service.js';
 import { checkComm } from '@certd/plus-core';
 
 /**

packages/ui/certd-server/src/controller/user/login/register-controller.ts

@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { BaseController, Constants, SysSettingsService } from '@certd/lib-server';
-import { RegisterType, UserService } from '../../modules/sys/authority/service/user-service.js';
+import { RegisterType, UserService } from '../../../modules/sys/authority/service/user-service.js';
-import { CodeService } from '../../modules/basic/service/code-service.js';
+import { CodeService } from '../../../modules/basic/service/code-service.js';
 import { checkComm, checkPlus } from '@certd/plus-core';
 
 export type RegisterReq = {

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

@@ -1,12 +1,12 @@
 import { Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { BaseController } from '@certd/lib-server';
-import { EmailService } from '../../modules/basic/service/email-service.js';
 import { Constants } from '@certd/lib-server';
+import { EmailService } from '../../../modules/basic/service/email-service.js';
 
 /**
  */
 @Provide()
-@Controller('/api/basic/email')
+@Controller('/api/mine/email')
 export class EmailController extends BaseController {
   @Inject()
   emailService: EmailService;

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

@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { BaseController, Constants } from '@certd/lib-server';
-import { UserService } from '../../modules/sys/authority/service/user-service.js';
+import { UserService } from '../../../modules/sys/authority/service/user-service.js';
-import { RoleService } from '../../modules/sys/authority/service/role-service.js';
+import { RoleService } from '../../../modules/sys/authority/service/role-service.js';
 
 /**
  */

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

@@ -1,8 +1,8 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { CrudController } from '@certd/lib-server';
 import { Constants } from '@certd/lib-server';
-import { UserSettingsService } from '../../modules/mine/service/user-settings-service.js';
+import { UserSettingsService } from '../../../modules/mine/service/user-settings-service.js';
-import { UserSettingsEntity } from '../../modules/mine/entity/user-settings.js';
+import { UserSettingsEntity } from '../../../modules/mine/entity/user-settings.js';
 
 /**
  */

packages/ui/certd-server/src/controller/user/monitor/cert-info-controller.ts

@@ -1,8 +1,8 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { Constants, CrudController } from '@certd/lib-server';
-import { AuthService } from '../../modules/sys/authority/service/auth-service.js';
+import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
-import { CertInfoService } from '../../modules/monitor/index.js';
+import { CertInfoService } from '../../../modules/monitor/index.js';
-import { PipelineService } from '../../modules/pipeline/service/pipeline-service.js';
+import { PipelineService } from '../../../modules/pipeline/service/pipeline-service.js';
 
 /**
  */

packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts

@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { Constants, CrudController } from '@certd/lib-server';
-import { AuthService } from '../../modules/sys/authority/service/auth-service.js';
+import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
-import { SiteInfoService } from '../../modules/monitor/index.js';
+import { SiteInfoService } from '../../../modules/monitor/service/site-info-service.js';
 
 /**
  */