v1.29.4

CHANGELOG.md

@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

README.md

@@ -10,6 +10,7 @@ Certd 是一个免费全自动申请和自动部署更新SSL证书的管理系
 
 * 全自动申请证书（支持所有注册商注册的域名）
 * 全自动部署更新证书（目前支持部署到主机、阿里云、腾讯云等，目前已支持40+部署插件）
+* 支持DNS-01、HTTP-01、CNAME代理等多种域名验证方式
 * 支持通配符域名/泛域名，支持多个域名打到一个证书上，支持pem、pfx、der、jks等多种证书格式
 * 邮件通知、webhook通知
 * 私有化部署，数据保存本地，授权信息加密存储，镜像由Github Actions构建，过程公开透明
@@ -20,6 +21,11 @@ Certd 是一个免费全自动申请和自动部署更新SSL证书的管理系
 > 流水线数量现已调整为无限制，欢迎大家使用
 >
 
+> 关于证书续期：
+ >* 实际上没有办法不改变证书文件本身情况下直接续期或者续签。
+ >* 我们所说的续期，其实就是按照全套流程重新申请一份新证书，然后重新部署上去。
+
+ 
 ## 二、在线体验
 
 官方Demo地址，自助注册后体验    
@@ -88,11 +94,13 @@ https://certd.handfree.work/
 
 
 ## 五、 升级
-如果使用固定版本号
+
+### docker-compose方式部署
+#### 1. 如果使用固定版本号
 1. 修改`docker-compose.yaml`中的镜像版本号
 2. 运行`docker compose up -d` 即可
 
-如果需要使用最新版本
+#### 2. 如果需要使用最新版本
 ```shell
 #重新拉取镜像
 docker pull registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest
@@ -100,7 +108,9 @@ docker pull registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest
 docker compose down
 docker compose up -d
 ```
-关于自动升级(仅限尝鲜建议非生产使用)
+> 数据默认存在`/data/certd`目录下，不用担心数据丢失
+
+### 自动升级(仅限尝鲜建议非生产使用)
 ```yaml
 version: '3.3'
 services:
@@ -113,16 +123,8 @@ services:
     ports:
       - "7001:7001"
       - "7002:7002"
-    # 如果需要修改系统配置，可以通过环境变量传递；初次运行请保持默认配置
     environment:
       - certd_system_resetAdminPasswd=false
-    # 如果需要切换数据库类型，可以在此处设置为mysql或postgres
-    # - certd_typeorm_dataSource_default_type=mysql
-    # - certd_typeorm_dataSource_default_host=localhost
-    # - certd_typeorm_dataSource_default_port=3306
-    # - certd_typeorm_dataSource_default_username=root
-    # - certd_typeorm_dataSource_default_password=123456
-    # - certd_typeorm_dataSource_default_database=certd
     labels:
       com.centurylinklabs.watchtower.enable: "true"
 
@@ -139,27 +141,21 @@ services:
       - WATCHTOWER_LABEL_ENABLE=true       # 根据容器标签进行更新
       - WATCHTOWER_POLL_INTERVAL=300       # 每 5 分钟检查一次更新
 
-# 如果需要支持 IPv6，请取消以下注释
-# networks:
-#   ip6net:
-#     enable_ipv6: true
-#     ipam:
-#       config:
-#         - subnet: 2001:db8::/64
-
 ```
-> 数据默认存在`/data/certd`目录下，不用担心数据丢失   
+
+### 其他部署方式升级方法
+请参考 https://certd.docmirror.cn/guide/install/upgrade.html
 
 
-更新日志： [CHANGELOG](./CHANGELOG.md)
+
+###  更新日志：
+
+[CHANGELOG](./CHANGELOG.md)
 
 
 ## 六、一些说明
 * 本项目ssl证书提供商为letencrypt/Google/ZeroSSL
 * 申请过程遵循acme协议
-* 需要验证域名所有权，一般有两种方式（目前本项目仅支持dns-01）
-  * http-01： 在网站根目录下放置一份txt文件
-  * dns-01： 需要给域名添加txt解析记录，通配符域名只能用这种方式
 * 证书续期：
   * 实际上没有办法不改变证书文件本身情况下直接续期或者续签。
   * 我们所说的续期，其实就是按照全套流程重新申请一份新证书，然后重新部署上去。

build.trigger

@@ -1 +1 @@
-01:43
+01:13

docker/run/docker-compose.yaml

@@ -26,13 +26,18 @@ services:
 #    extra_hosts:
 #        # ↓↓↓↓ -------------------------------------------------------- 这里可以配置自定义hosts，外网域名可以指向本地局域网ip地址
 #      - "localdomain.com:192.168.1.3"
-
+    labels:
+      com.centurylinklabs.watchtower.enable: "true"
+#    ↓↓↓↓ -------------------------------------------------------------- 启用ipv6网络，还需要把下面networks的注释放开
+#    networks:
+#      - ip6net
     environment:
 #     设置环境变量即可自定义certd配置
 #     配置项见： packages/ui/certd-server/src/config/config.default.ts
 #     配置规则： certd_ + 配置项, 点号用_代替
 #                                    #↓↓↓↓ ----------------------------- 如果忘记管理员密码，可以设置为true，重启之后，管理员密码将改成123456，然后请及时修改回false
       - certd_system_resetAdminPasswd=false
+
 #     默认使用sqlite文件数据库，如果需要使用其他数据库，请设置以下环境变量
 #     注意： 选定使用一种数据库之后，不支持更换数据库。
 #     数据库迁移方法：1、使用新数据库重新部署一套，然后将旧数据同步过去，注意flyway_history表的数据不要同步
@@ -54,13 +59,22 @@ services:
 #      - certd_typeorm_dataSource_default_password=yourpasswd            # 密码
 #      - certd_typeorm_dataSource_default_database=certd                 # 数据库名
 
+#         ↓↓↓↓ ---------------------------------------------------------  自动升级，上面certd的版本号要保持为latest
+#  certd-updater:  # 添加 Watchtower 服务
+#    image: containrrr/watchtower:latest
+#    container_name: certd-updater
+#    restart: unless-stopped
+#    volumes:
+#      - /var/run/docker.sock:/var/run/docker.sock
+#    # 配置 自动更新
+#    environment:
+#      - WATCHTOWER_CLEANUP=true            # 自动清理旧版本容器
+#      - WATCHTOWER_INCLUDE_STOPPED=false   # 不更新已停止的容器
+#      - WATCHTOWER_LABEL_ENABLE=true       # 根据容器标签进行更新
+#      - WATCHTOWER_POLL_INTERVAL=600       # 每 10 分钟检查一次更新
 
 
-
+#    ↓↓↓↓ -------------------------------------------------------------- 启用ipv6网络，还需要把上面networks的注释放开
-
-#    #↓↓↓↓ ------------------------------------------------------------- 启用ipv6网络
-#    networks:
-#      - ip6net
 #networks:
 #  ip6net:
 #    enable_ipv6: true

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,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
+* 修复套餐关闭状态下，仍然限制用户流水线数量的bug ([66fb9e5](https://github.com/certd/certd/commit/66fb9e5f49491f9c159363b48af14720a37673b1))
+
 ## [1.29.1](https://github.com/certd/certd/compare/v1.29.0...v1.29.1) (2024-12-25)
 
 ### Bug Fixes

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.29.2"
+  "version": "1.29.4"
 }

packages/core/acme-client/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.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
+
+* 优化acme sdk ([54db744](https://github.com/publishlab/node-acme-client/commit/54db74428259de64d12230c2ab7353ae11197bbc))
+
 ## [1.29.2](https://github.com/publishlab/node-acme-client/compare/v1.29.1...v1.29.2) (2024-12-25)
 
 **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.29.2",
+    "version": "1.29.4",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.29.2",
+        "@certd/basic": "^1.29.4",
         "@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": "f9128d4d452e344b6990c117a5d647add226437b"
+    "gitHead": "0c130f95967ba9d86faa1afb369794fb1e95f961"
 }

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

@@ -99,31 +99,14 @@ export default  async (client, userOpts) => {
             return;
         }
 
+        const keyAuthorizationGetter = async (challenge) => {
+            return await client.getChallengeKeyAuthorization(challenge);
+        }
+
         try {
-            /* Select challenge based on priority */
-            const challenge = authz.challenges.sort((a, b) => {
-                const aidx = opts.challengePriority.indexOf(a.type);
-                const bidx = opts.challengePriority.indexOf(b.type);
-
-                if (aidx === -1) return 1;
-                if (bidx === -1) return -1;
-                return aidx - bidx;
-            }).slice(0, 1)[0];
-
-            if (!challenge) {
-                throw new Error(`Unable to select challenge for ${d}, no challenge found`);
-            }
-
-            log(`[auto] [${d}] Found ${authz.challenges.length} challenges, selected type: ${challenge.type}`);
-
-            /* Trigger challengeCreateFn() */
             log(`[auto] [${d}] Trigger challengeCreateFn()`);
-            const keyAuthorization = await client.getChallengeKeyAuthorization(challenge);
-
             try {
-                const { recordReq, recordRes, dnsProvider } = await opts.challengeCreateFn(authz, challenge, keyAuthorization);
+                const { recordReq, recordRes, dnsProvider,challenge ,keyAuthorization} = await opts.challengeCreateFn(authz, keyAuthorizationGetter);
-                log(`[auto] [${d}] challengeCreateFn success`);
-                log(`[auto] [${d}] add challengeRemoveFn()`);
                 clearTasks.push(async () => {
                     /* Trigger challengeRemoveFn(), suppress errors */
                     log(`[auto] [${d}] Trigger challengeRemoveFn()`);
@@ -141,7 +124,7 @@ export default  async (client, userOpts) => {
                     await wait(60 * 1000);
                 }
                 else {
-                    log(`[auto] [${d}] Running challenge verification`);
+                    log(`[auto] [${d}] Running challenge verification, type = ${challenge.type}`);
                     try {
                         await client.verifyChallenge(authz, challenge);
                     }

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

@@ -5,3 +5,5 @@ export class CancelError extends Error {
     }
 }
 
+
+

packages/core/acme-client/types/index.d.ts

@@ -4,6 +4,8 @@
 
 import { AxiosInstance } from 'axios';
 import * as rfc8555 from './rfc8555';
+import {CancelError} from '../src/error.js'
+export * from '../src/error.js'
 
 export type PrivateKeyBuffer = Buffer;
 export type PublicKeyBuffer = Buffer;
@@ -56,7 +58,7 @@ export interface ClientExternalAccountBindingOptions {
 
 export interface ClientAutoOptions {
     csr: CsrBuffer | CsrString;
-    challengeCreateFn: (authz: Authorization, challenge: rfc8555.Challenge, keyAuthorization: string) => Promise<{recordReq:any,recordRes:any,dnsProvider:any}>;
+    challengeCreateFn: (authz: Authorization, keyAuthorization: (challenge:rfc8555.Challenge)=>Promise<string>) => Promise<{recordReq?:any,recordRes?:any,dnsProvider?:any,challenge: rfc8555.Challenge,keyAuthorization:string}>;
     challengeRemoveFn: (authz: Authorization, challenge: rfc8555.Challenge, keyAuthorization: string,recordReq:any, recordRes:any,dnsProvider:any) => Promise<any>;
     email?: string;
     termsOfServiceAgreed?: boolean;
@@ -202,4 +204,4 @@ export function setLogger(fn: (message: any, ...args: any[]) => void): void;
 
 export function walkTxtRecord(record: any): Promise<string[]>;
 
-export const CancelError: Error;
+export const CancelError: typeof CancelError;

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.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
+
 ## [1.29.2](https://github.com/certd/certd/compare/v1.29.1...v1.29.2) (2024-12-25)
 
 **Note:** Version bump only for package @certd/basic

packages/core/basic/build.md

@@ -1 +1 @@
-01:51
+23:56

packages/core/basic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.29.2",
+  "version": "1.29.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -44,5 +44,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "f9128d4d452e344b6990c117a5d647add226437b"
+  "gitHead": "0c130f95967ba9d86faa1afb369794fb1e95f961"
 }

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.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
+
+* 支持http校验方式申请证书 ([405591c](https://github.com/certd/certd/commit/405591c5d08fa1a3b228ee3980199e7731cfec4a))
+
 ## [1.29.2](https://github.com/certd/certd/compare/v1.29.1...v1.29.2) (2024-12-25)
 
 **Note:** Version bump only for package @certd/pipeline

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.29.2",
+  "version": "1.29.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -16,8 +16,8 @@
     "test": "mocha   --loader=ts-node/esm"
   },
   "dependencies": {
-    "@certd/basic": "^1.29.2",
+    "@certd/basic": "^1.29.4",
-    "@certd/plus-core": "^1.29.2",
+    "@certd/plus-core": "^1.29.4",
     "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": "f9128d4d452e344b6990c117a5d647add226437b"
+  "gitHead": "0c130f95967ba9d86faa1afb369794fb1e95f961"
 }

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

@@ -109,7 +109,13 @@ export class Executor {
     } finally {
       clearInterval(intervalFlushLogId);
       await this.onChanged(this.runtime);
-      await this.pipelineContext.setObj("lastRuntime", this.runtime);
+      //保存之前移除logs
+      const lastRuntime: any = {
+        ...this.runtime,
+      };
+      delete lastRuntime.logs;
+      delete lastRuntime._loggers;
+      await this.pipelineContext.setObj("lastRuntime", lastRuntime);
       this.logger.info(`pipeline.${this.pipeline.id}  end`);
     }
   }

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

@@ -18,6 +18,7 @@ export type CnameRecord = {
   status: string;
   commonDnsProvider?: any;
 };
+
 export type ICnameProxyService = {
   getByDomain: (domain: string) => Promise<CnameRecord>;
 };

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.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
+
 ## [1.29.2](https://github.com/certd/certd/compare/v1.29.1...v1.29.2) (2024-12-25)
 
 **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.2",
+  "version": "1.29.4",
   "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": "f9128d4d452e344b6990c117a5d647add226437b"
+  "gitHead": "0c130f95967ba9d86faa1afb369794fb1e95f961"
 }

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.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
+
 ## [1.29.2](https://github.com/certd/certd/compare/v1.29.1...v1.29.2) (2024-12-25)
 
 **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.2",
+  "version": "1.29.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -30,5 +30,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "f9128d4d452e344b6990c117a5d647add226437b"
+  "gitHead": "0c130f95967ba9d86faa1afb369794fb1e95f961"
 }

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.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
+
 ## [1.29.2](https://github.com/certd/certd/compare/v1.29.1...v1.29.2) (2024-12-25)
 
 **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.2",
+  "version": "1.29.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -16,7 +16,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/basic": "^1.29.2",
+    "@certd/basic": "^1.29.4",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
@@ -31,5 +31,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "f9128d4d452e344b6990c117a5d647add226437b"
+  "gitHead": "0c130f95967ba9d86faa1afb369794fb1e95f961"
 }

packages/libs/lib-server/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.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
+
+* 修复系统级授权无法查看密钥的bug ([8644348](https://github.com/certd/certd/commit/8644348fc41ae2e1672f946ca37e5d3a674e0218))
+
 ## [1.29.2](https://github.com/certd/certd/compare/v1.29.1...v1.29.2) (2024-12-25)
 
 **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.29.2",
+  "version": "1.29.4",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -27,10 +27,10 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.29.2",
+    "@certd/acme-client": "^1.29.4",
-    "@certd/basic": "^1.29.2",
+    "@certd/basic": "^1.29.4",
-    "@certd/pipeline": "^1.29.2",
+    "@certd/pipeline": "^1.29.4",
-    "@certd/plus-core": "^1.29.2",
+    "@certd/plus-core": "^1.29.4",
     "@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": "f9128d4d452e344b6990c117a5d647add226437b"
+  "gitHead": "0c130f95967ba9d86faa1afb369794fb1e95f961"
 }

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

@@ -112,6 +112,17 @@ export class SysSecretBackup extends BaseSettings {
   encryptSecret?: string;
 }
 
+/**
+ * 不要修改
+ */
+export class SysSecret extends BaseSettings {
+  static __title__ = '密钥信息';
+  static __key__ = 'sys.secret';
+  static __access__ = 'private';
+  siteId?: string;
+  encryptSecret?: string;
+}
+
 export class SysSiteEnv {
   agent?: {
     enabled?: boolean;

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

@@ -1,25 +1,22 @@
-import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
+import { Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { Repository } from 'typeorm';
 import { SysSettingsEntity } from '../entity/sys-settings.js';
-import { CacheManager } from '@midwayjs/cache';
+import { BaseSettings, SysInstallInfo, SysPrivateSettings, SysPublicSettings, SysSecret, SysSecretBackup } from './models.js';
-import { BaseSettings, SysInstallInfo, SysPrivateSettings, SysPublicSettings, SysSecretBackup } from './models.js';
 import * as _ from 'lodash-es';
 import { BaseService } from '../../../basic/index.js';
-import { logger, setGlobalProxy } from '@certd/basic';
+import { cache, logger, setGlobalProxy } from '@certd/basic';
 import * as dns from 'node:dns';
+
 /**
  * 设置
  */
 @Provide()
-@Scope(ScopeEnum.Request, { allowDowngrade: true })
+@Scope(ScopeEnum.Singleton)
 export class SysSettingsService extends BaseService<SysSettingsEntity> {
   @InjectEntityModel(SysSettingsEntity)
   repository: Repository<SysSettingsEntity>;
 
-  @Inject()
-  cache: CacheManager; // 依赖注入CacheManager
-
   getRepository() {
     return this.repository;
   }
@@ -72,7 +69,7 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
   async getSetting<T>(type: any): Promise<T> {
     const key = type.__key__;
     const cacheKey = type.getCacheKey();
-    const settings: T = await this.cache.get(cacheKey);
+    const settings: T = cache.get(cacheKey);
     if (settings) {
       return settings;
     }
@@ -80,7 +77,7 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
     const savedSettings = await this.getSettingByKey(key);
     newSetting = _.merge(newSetting, savedSettings);
     await this.saveSetting(newSetting);
-    await this.cache.set(cacheKey, newSetting);
+    cache.set(cacheKey, newSetting);
     return newSetting;
   }
 
@@ -93,6 +90,12 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
     if (entity) {
       entity.setting = JSON.stringify(bean);
       entity.access = type.__access__;
+
+      if (key === SysSecretBackup.__key__) {
+        //备份密钥不允许更新
+        return;
+      }
+
       await this.repository.save(entity);
     } else {
       const newEntity = new SysSettingsEntity();
@@ -103,7 +106,7 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
       await this.repository.save(newEntity);
     }
 
-    await this.cache.set(cacheKey, bean);
+    cache.set(cacheKey, bean);
   }
 
   async getPublicSettings(): Promise<SysPublicSettings> {
@@ -146,7 +149,7 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
     } else {
       throw new Error('该设置不存在');
     }
-    await this.cache.del(`settings.${key}`);
+    cache.delete(`settings.${key}`);
   }
 
   async backupSecret() {
@@ -173,4 +176,20 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
       }
     }
   }
+  async getSecret() {
+    const sysSecret = await this.getSetting<SysSecret>(SysSecret);
+    if (sysSecret.encryptSecret) {
+      return sysSecret;
+    }
+    //从备份中读取
+    const settings = await this.getSettingByKey(SysSecretBackup.__key__);
+    if (settings == null || !settings.encryptSecret) {
+      throw new Error('密钥备份不存在');
+    }
+    sysSecret.siteId = settings.siteId;
+    sysSecret.encryptSecret = settings.encryptSecret;
+    await this.saveSetting(sysSecret);
+    logger.info('密钥恢复成功');
+    return sysSecret;
+  }
 }

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

@@ -1,6 +1,6 @@
 import { Init, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import crypto from 'crypto';
-import { SysPrivateSettings, SysSettingsService } from '../../../system/index.js';
+import { SysSecret, SysSettingsService } from '../../../system/index.js';
 
 /**
  * 授权
@@ -15,8 +15,8 @@ export class EncryptService {
 
   @Init()
   async init() {
-    const privateInfo: SysPrivateSettings = await this.sysSettingService.getSetting(SysPrivateSettings);
+    const secret: SysSecret = await this.sysSettingService.getSecret();
-    this.secretKey = Buffer.from(privateInfo.encryptSecret, 'base64');
+    this.secretKey = Buffer.from(secret.encryptSecret, 'base64');
   }
 
   // 加密函数

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.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
+
 ## [1.29.2](https://github.com/certd/certd/compare/v1.29.1...v1.29.2) (2024-12-25)
 
 **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.2",
+  "version": "1.29.4",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -46,5 +46,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "f9128d4d452e344b6990c117a5d647add226437b"
+  "gitHead": "0c130f95967ba9d86faa1afb369794fb1e95f961"
 }

packages/plugins/plugin-cert/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.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
+
+* 优化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)
 
 **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.29.2",
+  "version": "1.29.4",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -15,9 +15,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.29.2",
+    "@certd/acme-client": "^1.29.4",
-    "@certd/basic": "^1.29.2",
+    "@certd/basic": "^1.29.4",
-    "@certd/pipeline": "^1.29.2",
+    "@certd/pipeline": "^1.29.4",
+    "@certd/plugin-lib": "^1.29.4",
     "@google-cloud/publicca": "^1.3.0",
     "dayjs": "^1.11.7",
     "jszip": "^3.10.1",
@@ -40,5 +41,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "f9128d4d452e344b6990c117a5d647add226437b"
+  "gitHead": "0c130f95967ba9d86faa1afb369794fb1e95f961"
 }

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

@@ -6,23 +6,37 @@ import { Challenge } from "@certd/acme-client/types/rfc8555";
 import { IContext } from "@certd/pipeline";
 import { ILogger, utils } from "@certd/basic";
 import { IDnsProvider, parseDomain } from "../../dns-provider/index.js";
-
+import { HttpChallengeUploader } from "./uploads/api.js";
 export type CnameVerifyPlan = {
+  type?: string;
   domain: string;
   fullRecord: string;
   dnsProvider: IDnsProvider;
 };
 
+export type HttpVerifyPlan = {
+  type: string;
+  domain: string;
+  httpUploader: HttpChallengeUploader;
+};
+
 export type DomainVerifyPlan = {
   domain: string;
-  type: "cname" | "dns";
+  type: "cname" | "dns" | "http";
   dnsProvider?: IDnsProvider;
   cnameVerifyPlan?: Record<string, CnameVerifyPlan>;
+  httpVerifyPlan?: Record<string, HttpVerifyPlan>;
 };
 export type DomainsVerifyPlan = {
   [key: string]: DomainVerifyPlan;
 };
 
+export type Providers = {
+  dnsProvider?: IDnsProvider;
+  domainsVerifyPlan?: DomainsVerifyPlan;
+  httpUploader?: HttpChallengeUploader;
+};
+
 export type CertInfo = {
   crt: string; //fullchain证书
   key: string; //私钥
@@ -155,58 +169,37 @@ export class AcmeService {
     return key.toString();
   }
 
-  async challengeCreateFn(authz: any, challenge: any, keyAuthorization: string, dnsProvider: IDnsProvider, domainsVerifyPlan: DomainsVerifyPlan) {
+  async challengeCreateFn(authz: any, keyAuthorizationGetter: (challenge: Challenge) => Promise<string>, providers: Providers) {
     this.logger.info("Triggered challengeCreateFn()");
 
-    /* http-01 */
     const fullDomain = authz.identifier.value;
-    if (challenge.type === "http-01") {
+    let domain = parseDomain(fullDomain);
-      const filePath = `/var/www/html/.well-known/acme-challenge/${challenge.token}`;
+    this.logger.info("主域名为：" + domain);
+
+    const getChallenge = (type: string) => {
+      return authz.challenges.find((c: any) => c.type === type);
+    };
+
+    const doHttpVerify = async (challenge: any, httpUploader: HttpChallengeUploader) => {
+      const keyAuthorization = await keyAuthorizationGetter(challenge);
+      this.logger.info("http校验");
+      const filePath = `.well-known/acme-challenge/${challenge.token}`;
       const fileContents = keyAuthorization;
+      this.logger.info(`校验 ${fullDomain} ，准备上传文件：${filePath}`);
+      await httpUploader.upload(filePath, Buffer.from(fileContents));
+      this.logger.info(`上传文件【${filePath}】成功`);
+      return {
+        challenge,
+        keyAuthorization,
+        httpUploader,
+      };
+    };
 
-      this.logger.info(`Creating challenge response for ${fullDomain} at path: ${filePath}`);
+    const doDnsVerify = async (challenge: any, fullRecord: string, dnsProvider: IDnsProvider) => {
+      this.logger.info("dns校验");
+      const keyAuthorization = await keyAuthorizationGetter(challenge);
 
-      /* Replace this */
-      this.logger.info(`Would write "${fileContents}" to path "${filePath}"`);
-      // await fs.writeFileAsync(filePath, fileContents);
-    } else if (challenge.type === "dns-01") {
-      /* dns-01 */
-      let fullRecord = `_acme-challenge.${fullDomain}`;
       const recordValue = keyAuthorization;
-
-      this.logger.info(`Creating TXT record for ${fullDomain}: ${fullRecord}`);
-      /* Replace this */
-      this.logger.info(`Would create TXT record "${fullRecord}" with value "${recordValue}"`);
-
-      let domain = parseDomain(fullDomain);
-      this.logger.info("解析到域名domain=" + domain);
-
-      if (domainsVerifyPlan) {
-        //按照计划执行
-        const domainVerifyPlan = domainsVerifyPlan[domain];
-        if (domainVerifyPlan) {
-          if (domainVerifyPlan.type === "dns") {
-            dnsProvider = domainVerifyPlan.dnsProvider;
-          } else if (domainVerifyPlan.type === "cname") {
-            const cnameVerifyPlan = domainVerifyPlan.cnameVerifyPlan;
-            if (cnameVerifyPlan) {
-              const cname = cnameVerifyPlan[fullDomain];
-              if (cname) {
-                dnsProvider = cname.dnsProvider;
-                domain = parseDomain(cname.domain);
-                fullRecord = cname.fullRecord;
-              }
-            } else {
-              this.logger.error("未找到域名Cname校验计划，使用默认的dnsProvider");
-            }
-          } else {
-            this.logger.error("不支持的校验类型", domainVerifyPlan.type);
-          }
-        } else {
-          this.logger.info("未找到域名校验计划，使用默认的dnsProvider");
-        }
-      }
-
       let hostRecord = fullRecord.replace(`${domain}`, "");
       if (hostRecord.endsWith(".")) {
         hostRecord = hostRecord.substring(0, hostRecord.length - 1);
@@ -226,8 +219,54 @@ export class AcmeService {
         recordReq,
         recordRes,
         dnsProvider,
+        challenge,
+        keyAuthorization,
       };
+    };
+
+    let dnsProvider = providers.dnsProvider;
+    let fullRecord = `_acme-challenge.${fullDomain}`;
+
+    if (providers.domainsVerifyPlan) {
+      //按照计划执行
+      const domainVerifyPlan = providers.domainsVerifyPlan[domain];
+      if (domainVerifyPlan) {
+        if (domainVerifyPlan.type === "dns") {
+          dnsProvider = domainVerifyPlan.dnsProvider;
+        } else if (domainVerifyPlan.type === "cname") {
+          const cnameVerifyPlan = domainVerifyPlan.cnameVerifyPlan;
+          if (cnameVerifyPlan) {
+            const cname = cnameVerifyPlan[fullDomain];
+            if (cname) {
+              dnsProvider = cname.dnsProvider;
+              domain = parseDomain(cname.domain);
+              fullRecord = cname.fullRecord;
+            }
+          } else {
+            this.logger.error("未找到域名Cname校验计划，使用默认的dnsProvider");
+          }
+        } else if (domainVerifyPlan.type === "http") {
+          const httpVerifyPlan = domainVerifyPlan.httpVerifyPlan;
+          if (httpVerifyPlan) {
+            const httpChallenge = getChallenge("http-01");
+            if (httpChallenge == null) {
+              throw new Error("该域名不支持http-01方式校验");
+            }
+            const plan = httpVerifyPlan[fullDomain];
+            return await doHttpVerify(httpChallenge, plan.httpUploader);
+          } else {
+            throw new Error("未找到域名【" + fullDomain + "】的http校验配置");
+          }
+        } else {
+          throw new Error("不支持的校验类型", domainVerifyPlan.type);
+        }
+      } else {
+        this.logger.info("未找到域名校验计划，使用默认的dnsProvider");
+      }
     }
+
+    const dnsChallenge = getChallenge("dns-01");
+    return await doDnsVerify(dnsChallenge, fullRecord, dnsProvider);
   }
 
   /**
@@ -239,22 +278,28 @@ export class AcmeService {
    * @param recordReq
    * @param recordRes
    * @param dnsProvider dnsProvider
+   * @param httpUploader
    * @returns {Promise}
    */
 
-  async challengeRemoveFn(authz: any, challenge: any, keyAuthorization: string, recordReq: any, recordRes: any, dnsProvider: IDnsProvider) {
+  async challengeRemoveFn(
-    this.logger.info("Triggered challengeRemoveFn()");
+    authz: any,
+    challenge: any,
+    keyAuthorization: string,
+    recordReq: any,
+    recordRes: any,
+    dnsProvider?: IDnsProvider,
+    httpUploader?: HttpChallengeUploader
+  ) {
+    this.logger.info("执行清理");
 
     /* http-01 */
     const fullDomain = authz.identifier.value;
     if (challenge.type === "http-01") {
-      const filePath = `/var/www/html/.well-known/acme-challenge/${challenge.token}`;
+      const filePath = `.well-known/acme-challenge/${challenge.token}`;
-
+      this.logger.info(`Removing challenge response for ${fullDomain} at file: ${filePath}`);
-      this.logger.info(`Removing challenge response for ${fullDomain} at path: ${filePath}`);
+      await httpUploader.remove(filePath);
-
+      this.logger.info(`删除文件【${filePath}】成功`);
-      /* Replace this */
-      this.logger.info(`Would remove file on path "${filePath}"`);
-      // await fs.unlinkAsync(filePath);
     } else if (challenge.type === "dns-01") {
       this.logger.info(`删除 TXT 解析记录:${JSON.stringify(recordReq)} ,recordRes = ${JSON.stringify(recordRes)}`);
       try {
@@ -275,11 +320,12 @@ export class AcmeService {
     domains: string | string[];
     dnsProvider?: any;
     domainsVerifyPlan?: DomainsVerifyPlan;
+    httpUploader?: any;
     csrInfo: any;
     isTest?: boolean;
     privateKeyType?: string;
   }): Promise<CertInfo> {
-    const { email, isTest, domains, csrInfo, dnsProvider, domainsVerifyPlan } = options;
+    const { email, isTest, domains, csrInfo, dnsProvider, domainsVerifyPlan, httpUploader } = options;
     const client: acme.Client = await this.getAcmeClient(email, isTest);
 
     /* Create CSR */
@@ -319,22 +365,27 @@ export class AcmeService {
       privateKey
     );
 
-    if (dnsProvider == null && domainsVerifyPlan == null) {
+    if (dnsProvider == null && domainsVerifyPlan == null && httpUploader == null) {
-      throw new Error("dnsProvider 、 domainsVerifyPlan 不能都为空");
+      throw new Error("dnsProvider 、 domainsVerifyPlan 、 httpUploader不能都为空");
     }
+
+    const providers: Providers = {
+      dnsProvider,
+      domainsVerifyPlan,
+      httpUploader,
+    };
     /* 自动申请证书 */
     const crt = await client.auto({
       csr,
       email: email,
       termsOfServiceAgreed: true,
       skipChallengeVerification: this.skipLocalVerify,
-      challengePriority: ["dns-01"],
+      challengePriority: ["dns-01", "http-01"],
       challengeCreateFn: async (
         authz: acme.Authorization,
-        challenge: Challenge,
+        keyAuthorizationGetter: (challenge: Challenge) => Promise<string>
-        keyAuthorization: string
+      ): Promise<{ recordReq?: any; recordRes?: any; dnsProvider?: any; challenge: Challenge; keyAuthorization: string }> => {
-      ): Promise<{ recordReq: any; recordRes: any; dnsProvider: any }> => {
+        return await this.challengeCreateFn(authz, keyAuthorizationGetter, providers);
-        return await this.challengeCreateFn(authz, challenge, keyAuthorization, dnsProvider, domainsVerifyPlan);
       },
       challengeRemoveFn: async (
         authz: acme.Authorization,
@@ -344,7 +395,7 @@ export class AcmeService {
         recordRes: any,
         dnsProvider: IDnsProvider
       ): Promise<any> => {
-        return await this.challengeRemoveFn(authz, challenge, keyAuthorization, recordReq, recordRes, dnsProvider);
+        return await this.challengeRemoveFn(authz, challenge, keyAuthorization, recordReq, recordRes, dnsProvider, httpUploader);
       },
       signal: this.options.signal,
     });

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

@@ -17,6 +17,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
       vModel: "value",
       mode: "tags",
       open: false,
+      placeholder: "foo.com / *.foo.com / *.bar.com",
       tokenSeparators: [",", " ", "，", "、", "|"],
     },
     rules: [{ type: "domains" }],
@@ -26,9 +27,9 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
     },
     order: -999,
     helper:
-      "1、支持通配符域名，例如： *.foo.com、foo.com、*.test.handsfree.work\n" +
+      "1、支持多个域名打到一个证书上，例如： foo.com，*.foo.com，*.bar.com\n" +
-      "2、支持多个域名、多个子域名、多个通配符域名打到一个证书上（域名必须是在同一个DNS提供商解析）\n" +
+      "2、子域名被通配符包含的不要填写，例如：www.foo.com已经被*.foo.com包含，不要填写www.foo.com\n" +
-      "3、多级子域名要分成多个域名输入（*.foo.com的证书不能用于xxx.yyy.foo.com、foo.com）\n" +
+      "3、泛域名只能通配*号那一级（*.foo.com的证书不能用于xxx.yyy.foo.com、不能用于foo.com）\n" +
       "4、输入一个，空格之后，再输入下一个",
   })
   domains!: string[];
@@ -262,11 +263,12 @@ cert.jks：jks格式证书文件，java服务器使用
       this.logger.info("输入参数变更，准备申请新证书");
       return null;
     } else {
-      this.logger.info("输入参数未变更，不需要更新证书");
+      this.logger.info("输入参数未变更，检查证书是否过期");
     }
 
     let oldCert: CertReader | undefined = undefined;
     try {
+      this.logger.info("读取上次证书");
       oldCert = await this.readLastCert();
     } catch (e) {
       this.logger.warn("读取cert失败：", e);
@@ -304,6 +306,7 @@ cert.jks：jks格式证书文件，java服务器使用
   async readLastCert(): Promise<CertReader | undefined> {
     const cert = this.lastStatus?.status?.output?.cert;
     if (cert == null) {
+      this.logger.info("没有找到上次的证书");
       return undefined;
     }
     return new CertReader(cert);
@@ -321,7 +324,7 @@ cert.jks：jks格式证书文件，java服务器使用
     // 检查有效期
     const leftDays = dayjs(expires).diff(dayjs(), "day");
     return {
-      isWillExpire: leftDays < maxDays,
+      isWillExpire: leftDays <= maxDays,
       leftDays,
     };
   }

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

@@ -147,10 +147,11 @@ export class CertReader {
         tmpOnePath,
       });
     } catch (err) {
+      logger.error("处理失败", err);
       throw err;
     } finally {
       //删除临时文件
-      logger.info("删除临时文件");
+      logger.info("清理临时文件");
       function removeFile(filepath?: string) {
         if (filepath) {
           fs.unlinkSync(filepath);

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

@@ -1,7 +1,7 @@
-import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
+import { CancelError, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
 import { utils } from "@certd/basic";
 
-import type { CertInfo, CnameVerifyPlan, DomainsVerifyPlan, PrivateKeyType, SSLProvider } from "./acme.js";
+import type { CertInfo, CnameVerifyPlan, DomainsVerifyPlan, HttpVerifyPlan, PrivateKeyType, SSLProvider } from "./acme.js";
 import { AcmeService } from "./acme.js";
 import * as _ from "lodash-es";
 import { createDnsProvider, DnsProviderContext, IDnsProvider } from "../../dns-provider/index.js";
@@ -9,7 +9,7 @@ import { CertReader } from "./cert-reader.js";
 import { CertApplyBasePlugin } from "./base.js";
 import { GoogleClient } from "../../libs/google.js";
 import { EabAccess } from "../../access";
-import { CancelError } from "@certd/pipeline";
+import { httpChallengeUploaderFactory } from "./uploads/factory.js";
 
 export type { CertInfo };
 export * from "./cert-reader.js";
@@ -17,12 +17,20 @@ export type CnameRecordInput = {
   id: number;
   status: string;
 };
+
+export type HttpRecordInput = {
+  domain: string;
+  httpUploaderType: string;
+  httpUploaderAccess: number;
+  httpUploadRootDir: string;
+};
 export type DomainVerifyPlanInput = {
   domain: string;
-  type: "cname" | "dns";
+  type: "cname" | "dns" | "http";
   dnsProviderType?: string;
   dnsProviderAccessId?: number;
   cnameVerifyPlan?: Record<string, CnameRecordInput>;
+  httpVerifyPlan?: Record<string, HttpRecordInput>;
 };
 export type DomainsVerifyPlanInput = {
   [key: string]: DomainVerifyPlanInput;
@@ -54,11 +62,13 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
       options: [
         { value: "dns", label: "DNS直接验证" },
         { value: "cname", label: "CNAME代理验证" },
+        { value: "http", label: "HTTP文件验证" },
       ],
     },
     required: true,
-    helper:
+    helper: `DNS直接验证：域名是在阿里云、腾讯云、华为云、Cloudflare、NameSilo、西数注册的，选它；
-      "DNS直接验证：域名是在阿里云、腾讯云、华为云、Cloudflare、NameSilo、西数注册的，选它。\nCNAME代理验证：支持任何注册商注册的域名，但第一次需要手动添加CNAME记录",
+CNAME代理验证：支持任何注册商注册的域名，但第一次需要手动添加CNAME记录；
+HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
   })
   challengeType!: string;
 
@@ -122,9 +132,8 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
     component: {
       name: "domains-verify-plan-editor",
     },
-    rules: [{ type: "checkCnameVerifyPlan" }],
+    rules: [{ type: "checkDomainVerifyPlan" }],
     required: true,
-    helper: "如果选择CNAME方式，请按照上面的显示，给要申请证书的域名添加CNAME记录，添加后，点击验证，验证成功后不要删除记录，申请和续期证书会一直用它",
     col: {
       span: 24,
     },
@@ -132,10 +141,20 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
       component:{
         domains: ctx.compute(({form})=>{
             return form.domains
+        }),
+        defaultType: ctx.compute(({form})=>{
+            return form.challengeType || 'cname'
         })
       },
       show: ctx.compute(({form})=>{
-          return form.challengeType === 'cname' 
+          return form.challengeType === 'cname' ||  form.challengeType === 'http'
+      }),
+      helper: ctx.compute(({form})=>{
+          if(form.challengeType === 'cname' ){
+              return '请按照上面的提示，给要申请证书的域名添加CNAME记录，添加后，点击验证，验证成功后不要删除记录，申请和续期证书会一直用它'
+          }else if (form.challengeType === 'http'){
+              return '请按照上面的提示，给每个域名设置文件上传配置，证书申请过程中会上传校验文件到网站根目录下'
+          }
       })
     }
     `,
@@ -320,9 +339,9 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
     );
     this.logger.info("开始申请证书,", email, domains);
 
-    let dnsProvider: any = null;
+    let dnsProvider: IDnsProvider = null;
     let domainsVerifyPlan: DomainsVerifyPlan = null;
-    if (this.challengeType === "cname") {
+    if (this.challengeType === "cname" || this.challengeType === "http") {
       domainsVerifyPlan = await this.createDomainsVerifyPlan();
     } else {
       const dnsProviderType = this.dnsProviderType;
@@ -370,10 +389,11 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
       const domainVerifyPlan = this.domainsVerifyPlan[domain];
       let dnsProvider = null;
       const cnameVerifyPlan: Record<string, CnameVerifyPlan> = {};
+      const httpVerifyPlan: Record<string, HttpVerifyPlan> = {};
       if (domainVerifyPlan.type === "dns") {
         const access = await this.ctx.accessService.getById(domainVerifyPlan.dnsProviderAccessId);
         dnsProvider = await this.createDnsProvider(domainVerifyPlan.dnsProviderType, access);
-      } else {
+      } else if (domainVerifyPlan.type === "cname") {
         for (const key in domainVerifyPlan.cnameVerifyPlan) {
           const cnameRecord = await this.ctx.cnameProxyService.getByDomain(key);
           let dnsProvider = cnameRecord.commonDnsProvider;
@@ -381,17 +401,44 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
             dnsProvider = await this.createDnsProvider(cnameRecord.cnameProvider.dnsProviderType, cnameRecord.cnameProvider.access);
           }
           cnameVerifyPlan[key] = {
+            type: "cname",
             domain: cnameRecord.cnameProvider.domain,
             fullRecord: cnameRecord.recordValue,
             dnsProvider,
           };
         }
+      } else if (domainVerifyPlan.type === "http") {
+        const httpUploaderContext = {
+          accessService: this.ctx.accessService,
+          logger: this.logger,
+          utils,
+        };
+        for (const key in domainVerifyPlan.httpVerifyPlan) {
+          const httpRecord = domainVerifyPlan.httpVerifyPlan[key];
+          const access = await this.ctx.accessService.getById(httpRecord.httpUploaderAccess);
+          let rootDir = httpRecord.httpUploadRootDir;
+          if (!rootDir.endsWith("/") && !rootDir.endsWith("\\")) {
+            rootDir = rootDir + "/";
+          }
+          this.logger.info("上传方式", httpRecord.httpUploaderType);
+          const httpUploader = await httpChallengeUploaderFactory.createUploaderByType(httpRecord.httpUploaderType, {
+            access,
+            rootDir: rootDir,
+            ctx: httpUploaderContext,
+          });
+          httpVerifyPlan[key] = {
+            type: "http",
+            domain: key,
+            httpUploader,
+          };
+        }
       }
       plan[domain] = {
         domain,
         type: domainVerifyPlan.type,
         dnsProvider,
         cnameVerifyPlan,
+        httpVerifyPlan,
       };
     }
     return plan;

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

@@ -0,0 +1,35 @@
+import { IAccessService } from "@certd/pipeline";
+import { ILogger, utils } from "@certd/basic";
+
+export type HttpChallengeUploader = {
+  upload: (fileName: string, fileContent: Buffer) => Promise<void>;
+  remove: (fileName: string) => Promise<void>;
+};
+
+export type HttpChallengeUploadContext = {
+  accessService: IAccessService;
+  logger: ILogger;
+  utils: typeof utils;
+};
+
+export abstract class BaseHttpChallengeUploader<A> implements HttpChallengeUploader {
+  rootDir: string;
+  access: A = null;
+  logger: ILogger;
+  utils: typeof utils;
+  ctx: HttpChallengeUploadContext;
+  protected constructor(opts: { rootDir: string; access: A }) {
+    this.rootDir = opts.rootDir;
+    this.access = opts.access;
+  }
+
+  async setCtx(ctx: any) {
+    // set context
+    this.ctx = ctx;
+    this.logger = ctx.logger;
+    this.utils = ctx.utils;
+  }
+
+  abstract remove(fileName: string): Promise<void>;
+  abstract upload(fileName: string, fileContent: Buffer): Promise<void>;
+}

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

@@ -0,0 +1,35 @@
+import { HttpChallengeUploadContext } from "./api";
+
+export class HttpChallengeUploaderFactory {
+  async getClassByType(type: string) {
+    if (type === "alioss") {
+      const module = await import("./impls/alioss.js");
+      return module.AliossHttpChallengeUploader;
+    } else if (type === "ssh") {
+      const module = await import("./impls/ssh.js");
+      return module.SshHttpChallengeUploader;
+    } else if (type === "ftp") {
+      const module = await import("./impls/ftp.js");
+      return module.FtpHttpChallengeUploader;
+    } else if (type === "tencentcos") {
+      const module = await import("./impls/tencentcos.js");
+      return module.TencentCosHttpChallengeUploader;
+    } else if (type === "qiniuoss") {
+      const module = await import("./impls/qiniuoss.js");
+      return module.QiniuOssHttpChallengeUploader;
+    } else {
+      throw new Error(`暂不支持此文件上传方式: ${type}`);
+    }
+  }
+  async createUploaderByType(type: string, opts: { rootDir: string; access: any; ctx: HttpChallengeUploadContext }) {
+    const cls = await this.getClassByType(type);
+    if (cls) {
+      // @ts-ignore
+      const instance = new cls(opts);
+      await instance.setCtx(opts.ctx);
+      return instance;
+    }
+  }
+}
+
+export const httpChallengeUploaderFactory = new HttpChallengeUploaderFactory();

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

@@ -0,0 +1,39 @@
+import { BaseHttpChallengeUploader } from "../api.js";
+import { AliossAccess, AliyunAccess } from "@certd/plugin-lib";
+import { AliossClient } from "@certd/plugin-lib";
+
+export class AliossHttpChallengeUploader extends BaseHttpChallengeUploader<AliossAccess> {
+  async upload(filePath: string, fileContent: Buffer) {
+    const aliyunAccess = await this.ctx.accessService.getById<AliyunAccess>(this.access.accessId);
+    const client = new AliossClient({
+      access: aliyunAccess,
+      bucket: this.access.bucket,
+      region: this.access.region,
+    });
+
+    const key = this.rootDir + filePath;
+    this.logger.info(`开始上传文件: ${key}`);
+    await client.uploadFile(key, fileContent);
+
+    this.logger.info(`校验文件上传成功: ${filePath}`);
+  }
+
+  async remove(filePath: string) {
+    const key = this.rootDir + filePath;
+    // remove file from alioss
+    const client = await this.getAliossClient();
+    await client.removeFile(key);
+    this.logger.info(`文件删除成功: ${key}`);
+  }
+
+  private async getAliossClient() {
+    const aliyunAccess = await this.ctx.accessService.getById<AliyunAccess>(this.access.accessId);
+    const client = new AliossClient({
+      access: aliyunAccess,
+      bucket: this.access.bucket,
+      region: this.access.region,
+    });
+    await client.init();
+    return client;
+  }
+}

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

@@ -0,0 +1,41 @@
+import { BaseHttpChallengeUploader } from "../api.js";
+import { FtpAccess, FtpClient } from "@certd/plugin-lib";
+import path from "path";
+import os from "os";
+import fs from "fs";
+
+export class FtpHttpChallengeUploader extends BaseHttpChallengeUploader<FtpAccess> {
+  async upload(filePath: string, fileContent: Buffer) {
+    const client = new FtpClient({
+      access: this.access,
+      logger: this.logger,
+    });
+    await client.connect(async (client) => {
+      const tmpFilePath = path.join(os.tmpdir(), "cert", "http", filePath);
+      const dir = path.dirname(tmpFilePath);
+      if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+      }
+      fs.writeFileSync(tmpFilePath, fileContent);
+      try {
+        // Write file to temp path
+        const path = this.rootDir + filePath;
+        await client.upload(path, tmpFilePath);
+      } finally {
+        // Remove temp file
+        fs.unlinkSync(tmpFilePath);
+      }
+    });
+  }
+
+  async remove(filePath: string) {
+    const client = new FtpClient({
+      access: this.access,
+      logger: this.logger,
+    });
+    await client.connect(async (client) => {
+      const path = this.rootDir + filePath;
+      await client.client.remove(path);
+    });
+  }
+}

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

@@ -0,0 +1,31 @@
+import { BaseHttpChallengeUploader } from "../api.js";
+import { QiniuOssAccess, QiniuClient, QiniuAccess } from "@certd/plugin-lib";
+
+export class QiniuOssHttpChallengeUploader extends BaseHttpChallengeUploader<QiniuOssAccess> {
+  async upload(filePath: string, fileContent: Buffer) {
+    const qiniuAccess = await this.ctx.accessService.getById<QiniuAccess>(this.access.accessId);
+    const client = new QiniuClient({
+      access: qiniuAccess,
+      logger: this.logger,
+      http: this.ctx.utils.http,
+    });
+    if (this.rootDir.endsWith("/")) {
+      this.rootDir = this.rootDir.slice(0, -1);
+    }
+    await client.uploadFile(this.access.bucket, this.rootDir + filePath, fileContent);
+  }
+
+  async remove(filePath: string) {
+    const qiniuAccess = await this.ctx.accessService.getById<QiniuAccess>(this.access.accessId);
+    const client = new QiniuClient({
+      access: qiniuAccess,
+      logger: this.logger,
+      http: this.ctx.utils.http,
+    });
+
+    if (this.rootDir.endsWith("/")) {
+      this.rootDir = this.rootDir.slice(0, -1);
+    }
+    await client.removeFile(this.access.bucket, this.rootDir + filePath);
+  }
+}

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

@@ -0,0 +1,45 @@
+import { BaseHttpChallengeUploader } from "../api.js";
+import { SshAccess, SshClient } from "@certd/plugin-lib";
+import path from "path";
+import os from "os";
+import fs from "fs";
+
+export class SshHttpChallengeUploader extends BaseHttpChallengeUploader<SshAccess> {
+  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 key = this.rootDir + filePath;
+    try {
+      const client = new SshClient(this.logger);
+      await client.uploadFiles({
+        connectConf: this.access,
+        mkdirs: true,
+        transports: [
+          {
+            localPath: tmpFilePath,
+            remotePath: key,
+          },
+        ],
+      });
+    } finally {
+      // Remove temp file
+      fs.unlinkSync(tmpFilePath);
+    }
+  }
+
+  async remove(filePath: string) {
+    const client = new SshClient(this.logger);
+    const key = this.rootDir + filePath;
+    await client.removeFiles({
+      connectConf: this.access,
+      files: [key],
+    });
+  }
+}

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

@@ -0,0 +1,28 @@
+import { BaseHttpChallengeUploader } from "../api.js";
+import { TencentAccess, TencentCosAccess, TencentCosClient } from "@certd/plugin-lib";
+
+export class TencentCosHttpChallengeUploader extends BaseHttpChallengeUploader<TencentCosAccess> {
+  async upload(filePath: string, fileContent: Buffer) {
+    const access = await this.ctx.accessService.getById<TencentAccess>(this.access.accessId);
+    const client = new TencentCosClient({
+      access: access,
+      logger: this.logger,
+      region: this.access.region,
+      bucket: this.access.bucket,
+    });
+    const key = this.rootDir + filePath;
+    await client.uploadFile(key, fileContent);
+  }
+
+  async remove(filePath: string) {
+    const access = await this.ctx.accessService.getById<TencentAccess>(this.access.accessId);
+    const client = new TencentCosClient({
+      access: access,
+      logger: this.logger,
+      region: this.access.region,
+      bucket: this.access.bucket,
+    });
+    const key = this.rootDir + filePath;
+    await client.removeFile(key);
+  }
+}

packages/plugins/plugin-lib/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.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
+
+* 优化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)
 
 **Note:** Version bump only for package @certd/plugin-lib

packages/plugins/plugin-lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-lib",
   "private": false,
-  "version": "1.29.2",
+  "version": "1.29.4",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -16,18 +16,22 @@
   },
   "dependencies": {
     "@alicloud/pop-core": "^1.7.10",
-    "@certd/basic": "^1.29.2",
+    "@certd/basic": "^1.29.4",
-    "@certd/pipeline": "^1.29.2",
+    "@certd/pipeline": "^1.29.4",
-    "@certd/plugin-cert": "^1.29.2",
     "@kubernetes/client-node": "0.21.0",
+    "ali-oss": "^6.21.0",
+    "basic-ftp": "^5.0.5",
+    "cos-nodejs-sdk-v5": "^2.14.6",
     "dayjs": "^1.11.7",
     "iconv-lite": "^0.6.3",
     "lodash-es": "^4.17.21",
+    "qiniu": "^7.12.0",
     "rimraf": "^5.0.5",
     "socks": "^2.8.3",
     "socks-proxy-agent": "^8.0.4",
     "ssh2": "^1.15.0",
-    "strip-ansi": "^7.1.0"
+    "strip-ansi": "^7.1.0",
+    "tencentcloud-sdk-nodejs": "^4.0.1005"
   },
   "devDependencies": {
     "@types/chai": "^4.3.3",
@@ -44,5 +48,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "f9128d4d452e344b6990c117a5d647add226437b"
+  "gitHead": "0c130f95967ba9d86faa1afb369794fb1e95f961"
 }

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

@@ -0,0 +1,71 @@
+import { AccessInput, BaseAccess, IsAccess } from "@certd/pipeline";
+
+@IsAccess({
+  name: "alioss",
+  title: "阿里云OSS授权",
+  desc: "包含地域和Bucket",
+  icon: "ant-design:aliyun-outlined",
+})
+export class AliossAccess extends BaseAccess {
+  @AccessInput({
+    title: "阿里云授权",
+    component: {
+      name: "access-selector",
+      vModel: "modelValue",
+      type: "aliyun",
+    },
+    helper: "请选择阿里云授权",
+    required: true,
+  })
+  accessId = "";
+
+  @AccessInput({
+    title: "大区",
+    component: {
+      name: "a-auto-complete",
+      vModel: "value",
+      options: [
+        { value: "oss-cn-hangzhou", label: "华东1（杭州）" },
+        { value: "oss-cn-shanghai", label: "华东2（上海）" },
+        { value: "oss-cn-nanjing", label: "华东5（南京-本地地域）" },
+        { value: "oss-cn-fuzhou", label: "华东6（福州-本地地域）" },
+        { value: "oss-cn-wuhan-lr", label: "华中1（武汉-本地地域）" },
+        { value: "oss-cn-qingdao", label: "华北1（青岛）" },
+        { value: "oss-cn-beijing", label: "华北2（北京）" },
+        { value: "oss-cn-zhangjiakou", label: "华北 3（张家口）" },
+        { value: "oss-cn-huhehaote", label: "华北5（呼和浩特）" },
+        { value: "oss-cn-wulanchabu", label: "华北6（乌兰察布）" },
+        { value: "oss-cn-shenzhen", label: "华南1（深圳）" },
+        { value: "oss-cn-heyuan", label: "华南2（河源）" },
+        { value: "oss-cn-guangzhou", label: "华南3（广州）" },
+        { value: "oss-cn-chengdu", label: "西南1（成都）" },
+        { value: "oss-cn-hongkong", label: "中国香港" },
+        { value: "oss-us-west-1", label: "美国（硅谷）①" },
+        { value: "oss-us-east-1", label: "美国（弗吉尼亚）①" },
+        { value: "oss-ap-northeast-1", label: "日本（东京）①" },
+        { value: "oss-ap-northeast-2", label: "韩国（首尔）" },
+        { value: "oss-ap-southeast-1", label: "新加坡①" },
+        { value: "oss-ap-southeast-2", label: "澳大利亚（悉尼）①" },
+        { value: "oss-ap-southeast-3", label: "马来西亚（吉隆坡）①" },
+        { value: "oss-ap-southeast-5", label: "印度尼西亚（雅加达）①" },
+        { value: "oss-ap-southeast-6", label: "菲律宾（马尼拉）" },
+        { value: "oss-ap-southeast-7", label: "泰国（曼谷）" },
+        { value: "oss-eu-central-1", label: "德国（法兰克福）①" },
+        { value: "oss-eu-west-1", label: "英国（伦敦）" },
+        { value: "oss-me-east-1", label: "阿联酋（迪拜）①" },
+        { value: "oss-rg-china-mainland", label: "无地域属性（中国内地）" },
+      ],
+    },
+    required: true,
+  })
+  region!: string;
+
+  @AccessInput({
+    title: "Bucket",
+    helper: "存储桶名称",
+    required: true,
+  })
+  bucket!: string;
+}
+
+new AliossAccess();

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

@@ -1 +1,2 @@
-export * from './aliyun-access.js';
+export * from "./aliyun-access.js";
+export * from "./alioss-access.js";

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

@@ -1,2 +1,3 @@
 export * from "./base-client.js";
 export * from "./ssl-client.js";
+export * from "./oss-client.js";

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

@@ -0,0 +1,64 @@
+import { AliyunAccess } from "../access";
+
+export class AliossClient {
+  access: AliyunAccess;
+
+  region: string;
+  bucket: string;
+  client: any;
+  constructor(opts: { access: AliyunAccess; bucket: string; region: string }) {
+    this.access = opts.access;
+    this.bucket = opts.bucket;
+    this.region = opts.region;
+  }
+
+  async init() {
+    if (this.client) {
+      return;
+    }
+    // @ts-ignore
+    const OSS = await import("ali-oss");
+    const ossClient = new OSS.default({
+      accessKeyId: this.access.accessKeyId,
+      accessKeySecret: this.access.accessKeySecret,
+      // yourRegion填写Bucket所在地域。以华东1（杭州）为例，Region填写为oss-cn-hangzhou。
+      region: this.region,
+      //@ts-ignore
+      authorizationV4: true,
+      // yourBucketName填写Bucket名称。
+      bucket: this.bucket,
+    });
+    // oss
+
+    this.client = ossClient;
+  }
+
+  async doRequest(bucket: string, xml: string, params: any) {
+    await this.init();
+    params = this.client._bucketRequestParams("POST", bucket, {
+      ...params,
+    });
+    params.content = xml;
+    params.mime = "xml";
+    params.successStatuses = [200];
+    const res = await this.client.request(params);
+    this.checkRet(res);
+    return res;
+  }
+
+  checkRet(ret: any) {
+    if (ret.code != null) {
+      throw new Error("执行失败：" + ret.Message);
+    }
+  }
+
+  async uploadFile(filePath: string, content: Buffer) {
+    await this.init();
+    return await this.client.put(filePath, content);
+  }
+
+  async removeFile(filePath: string) {
+    await this.init();
+    return await this.client.delete(filePath);
+  }
+}

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

@@ -1,8 +1,11 @@
 import { ILogger } from "@certd/basic";
 import { AliyunAccess } from "../access/index.js";
 import { AliyunClient } from "./index.js";
-import { CertInfo } from "@certd/plugin-cert";
 
+export type AliyunCertInfo = {
+  crt: string; //fullchain证书
+  key: string; //私钥
+};
 export type AliyunSslClientOpts = {
   access: AliyunAccess;
   logger: ILogger;
@@ -23,7 +26,7 @@ export type AliyunSslCreateDeploymentJobReq = {
 
 export type AliyunSslUploadCertReq = {
   name: string;
-  cert: CertInfo;
+  cert: AliyunCertInfo;
 };
 
 export class AliyunSslClient {

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

@@ -0,0 +1,77 @@
+import { IsAccess, AccessInput, BaseAccess } from "@certd/pipeline";
+
+/**
+ * 这个注解将注册一个授权配置
+ * 在certd的后台管理系统中，用户可以选择添加此类型的授权
+ */
+@IsAccess({
+  name: "ftp",
+  title: "FTP授权",
+  desc: "",
+  icon: "mdi:folder-upload-outline",
+})
+export class FtpAccess extends BaseAccess {
+  @AccessInput({
+    title: "host",
+    component: {
+      placeholder: "ip / 域名",
+      name: "a-input",
+      vModel: "value",
+    },
+    helper: "FTP地址",
+    required: true,
+  })
+  host!: string;
+
+  @AccessInput({
+    title: "host",
+    value: 21,
+    component: {
+      placeholder: "21",
+      name: "a-input-number",
+      vModel: "value",
+    },
+    helper: "FTP端口",
+    required: true,
+  })
+  port!: string;
+
+  @AccessInput({
+    title: "user",
+    component: {
+      placeholder: "用户名",
+    },
+    helper: "FTP用户名",
+    required: true,
+  })
+  user!: string;
+
+  @AccessInput({
+    title: "password",
+    component: {
+      placeholder: "密码",
+      component: {
+        name: "a-input-password",
+        vModel: "value",
+      },
+    },
+    encrypt: true,
+    helper: "FTP密码",
+    required: true,
+  })
+  password!: string;
+
+  @AccessInput({
+    title: "secure",
+    value: false,
+    component: {
+      name: "a-switch",
+      vModel: "checked",
+    },
+    helper: "是否使用SSL",
+    required: true,
+  })
+  secure?: boolean = false;
+}
+
+new FtpAccess();

packages/plugins/plugin-lib/src/ftp/client.ts

@@ -0,0 +1,47 @@
+import { FtpAccess } from "./access";
+import { ILogger } from "@certd/basic";
+import path from "node:path";
+
+export class FtpClient {
+  access: FtpAccess = null;
+  logger: ILogger = null;
+  client: any;
+  constructor(opts: { access: FtpAccess; logger: ILogger }) {
+    this.access = opts.access;
+    this.logger = opts.logger;
+  }
+
+  async connect(callback: (client: FtpClient) => Promise<void>) {
+    const ftp = await import("basic-ftp");
+    const Client = ftp.Client;
+    const client = new Client();
+    client.ftp.verbose = true;
+    this.logger.info("开始连接FTP");
+    await client.access(this.access as any);
+    this.logger.info("FTP连接成功");
+    this.client = client;
+    try {
+      await callback(this);
+    } finally {
+      if (client) {
+        client.close();
+      }
+    }
+  }
+
+  async upload(filePath: string, remotePath: string): Promise<void> {
+    if (!remotePath) {
+      return;
+    }
+    const dirname = path.dirname(remotePath);
+    this.logger.info(`确保目录存在：${dirname}`);
+    await this.client.ensureDir(dirname);
+    this.logger.info(`开始上传文件${filePath} -> ${remotePath}`);
+    await this.client.uploadFrom(filePath, remotePath);
+  }
+
+  async remove(filePath: string): Promise<void> {
+    this.logger.info(`开始删除文件${filePath}`);
+    await this.client.remove(filePath, true);
+  }
+}

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

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

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

@@ -1,3 +1,6 @@
 export * from "./ssh/index.js";
 export * from "./aliyun/index.js";
 export * from "./common/index.js";
+export * from "./ftp/index.js";
+export * from "./tencent/index.js";
+export * from "./qiniu/index.js";

packages/plugins/plugin-lib/src/qiniu/access-oss.ts

@@ -0,0 +1,31 @@
+import { AccessInput, BaseAccess, IsAccess } from "@certd/pipeline";
+
+@IsAccess({
+  name: "qiniuoss",
+  title: "七牛OSS授权",
+  desc: "",
+  icon: "svg:icon-qiniuyun",
+  input: {},
+})
+export class QiniuOssAccess extends BaseAccess {
+  @AccessInput({
+    title: "七牛云授权",
+    component: {
+      name: "access-selector",
+      vModel: "modelValue",
+      type: "qiniu",
+    },
+    helper: "请选择七牛云授权",
+    required: true,
+  })
+  accessId = "";
+
+  @AccessInput({
+    title: "Bucket",
+    helper: "存储桶名称",
+    required: true,
+  })
+  bucket = "";
+}
+
+new QiniuOssAccess();

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

@@ -0,0 +1,25 @@
+import { AccessInput, BaseAccess, IsAccess } from "@certd/pipeline";
+
+@IsAccess({
+  name: "qiniu",
+  title: "七牛云授权",
+  desc: "",
+  icon: "svg:icon-qiniuyun",
+  input: {},
+})
+export class QiniuAccess extends BaseAccess {
+  @AccessInput({
+    title: "AccessKey",
+    rules: [{ required: true, message: "此项必填" }],
+    helper: "AK，前往[密钥管理](https://portal.qiniu.com/developer/user/key)获取",
+  })
+  accessKey!: string;
+  @AccessInput({
+    title: "SecretKey",
+    encrypt: true,
+    helper: "SK",
+  })
+  secretKey!: string;
+}
+
+new QiniuAccess();

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

@@ -0,0 +1,3 @@
+export * from "./access.js";
+export * from "./access-oss.js";
+export * from "./lib/sdk.js";

packages/plugins/plugin-lib/src/qiniu/lib/sdk.ts

@@ -0,0 +1,142 @@
+import { HttpClient, ILogger } from "@certd/basic";
+import { QiniuAccess } from "../access.js";
+
+export type QiniuCertInfo = {
+  key: string;
+  crt: string;
+};
+export class QiniuClient {
+  http: HttpClient;
+  access: QiniuAccess;
+  logger: ILogger;
+  constructor(opts: { http: HttpClient; access: QiniuAccess; logger: ILogger }) {
+    this.http = opts.http;
+    this.access = opts.access;
+    this.logger = opts.logger;
+  }
+
+  async uploadCert(cert: QiniuCertInfo, certName?: string) {
+    const url = "https://api.qiniu.com/sslcert";
+
+    const body = {
+      name: certName,
+      common_name: "certd",
+      pri: cert.key,
+      ca: cert.crt,
+    };
+
+    const res = await this.doRequest(url, "post", body);
+
+    return res.certID;
+  }
+
+  async bindCert(body: { certid: string; domain: string }) {
+    const url = "https://api.qiniu.com/cert/bind";
+    return await this.doRequest(url, "post", body);
+  }
+
+  async getCertBindings() {
+    const url = "https://api.qiniu.com/cert/bindings";
+    const res = await this.doRequest(url, "get");
+    return res;
+  }
+
+  async doRequest(url: string, method: string, body?: any) {
+    const { generateAccessToken } = await import("qiniu/qiniu/util.js");
+    const token = generateAccessToken(this.access, url);
+    const res = await this.http.request({
+      url,
+      method: method,
+      headers: {
+        Authorization: token,
+      },
+      data: body,
+      logRes: false,
+    });
+    if (res && res.error) {
+      if (res.error.includes("domaintype")) {
+        throw new Error("请求失败：" + res.error + ",该域名属于CDN域名，请使用部署到七牛云CDN插件");
+      }
+      throw new Error("请求失败：" + res.error);
+    }
+    console.log("res", res);
+    return res;
+  }
+
+  async doRequestV2(opts: { url: string; method: string; body?: any; contentType: string }) {
+    const { HttpClient } = await import("qiniu/qiniu/httpc/client.js");
+    const { QiniuAuthMiddleware } = await import("qiniu/qiniu/httpc/middleware/qiniuAuth.js");
+    // X-Qiniu-Date: 20060102T150405Z
+    const auth = new QiniuAuthMiddleware({
+      mac: {
+        ...this.access,
+        options: {},
+      },
+    });
+    const http = new HttpClient({ timeout: 10000, middlewares: [auth] });
+    console.log("http", http);
+
+    return new Promise((resolve, reject) => {
+      try {
+        http.get({
+          url: opts.url,
+          headers: {
+            "Content-Type": opts.contentType,
+          },
+          callback: (nullable, res) => {
+            console.log("nullable", nullable, "res", res);
+            if (res?.error) {
+              reject(res);
+            } else {
+              resolve(res);
+            }
+          },
+        });
+      } catch (e) {
+        reject(e);
+      }
+    });
+  }
+
+  async uploadFile(bucket: string, key: string, content: Buffer) {
+    const sdk = await import("qiniu");
+    const qiniu = sdk.default;
+    const mac = new qiniu.auth.digest.Mac(this.access.accessKey, this.access.secretKey);
+    const options = {
+      scope: bucket,
+    };
+    const putPolicy = new qiniu.rs.PutPolicy(options);
+    const uploadToken = putPolicy.uploadToken(mac);
+
+    const config = new qiniu.conf.Config();
+    const formUploader = new qiniu.form_up.FormUploader(config);
+    const putExtra = new qiniu.form_up.PutExtra();
+    // 文件上传
+    const { data, resp } = await formUploader.put(uploadToken, key, content, putExtra);
+    if (resp.statusCode === 200) {
+      this.logger.info("文件上传成功：" + key);
+      return data;
+    } else {
+      console.log(resp.statusCode);
+      throw new Error("上传失败:" + JSON.stringify(resp));
+    }
+  }
+
+  async removeFile(bucket: string, key: string) {
+    const sdk = await import("qiniu");
+    const qiniu = sdk.default;
+    const mac = new qiniu.auth.digest.Mac(this.access.accessKey, this.access.secretKey);
+    const config = new qiniu.conf.Config();
+    config.useHttpsDomain = true;
+    const bucketManager = new qiniu.rs.BucketManager(mac, config);
+
+    const { resp } = await bucketManager.delete(bucket, key);
+
+    if (resp.statusCode === 200) {
+      this.logger.info("文件删除成功：" + key);
+      return;
+    } else {
+      throw new Error("删除失败:" + JSON.stringify(resp));
+    }
+  }
+}

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

@@ -7,6 +7,7 @@ import { SshAccess } from "./ssh-access.js";
 import stripAnsi from "strip-ansi";
 import { SocksClient } from "socks";
 import { SocksProxy, SocksProxyType } from "socks/typings/common/constants.js";
+export type TransportItem = { localPath: string; remotePath: string };
 
 export class AsyncSsh2Client {
   conn: ssh2.Client;
@@ -95,6 +96,21 @@ export class AsyncSsh2Client {
     });
   }
 
+  async unlink(options: { sftp: any; remotePath: string }) {
+    const { sftp, remotePath } = options;
+    return new Promise((resolve, reject) => {
+      this.logger.info(`开始删除远程文件：${remotePath}`);
+      sftp.unlink(remotePath, (err: Error) => {
+        if (err) {
+          reject(err);
+          return;
+        }
+        this.logger.info(`删除文件成功：${remotePath}`);
+        resolve({});
+      });
+    });
+  }
+
   async exec(
     script: string,
     opts: {
@@ -239,7 +255,7 @@ export class SshClient {
          }
    * @param options
    */
-  async uploadFiles(options: { connectConf: SshAccess; transports: any; mkdirs: boolean }) {
+  async uploadFiles(options: { connectConf: SshAccess; transports: TransportItem[]; mkdirs: boolean }) {
     const { connectConf, transports, mkdirs } = options;
     await this._call({
       connectConf,
@@ -272,6 +288,24 @@ export class SshClient {
     });
   }
 
+  async removeFiles(opts: { connectConf: SshAccess; files: string[] }) {
+    const { connectConf, files } = opts;
+    await this._call({
+      connectConf,
+      callable: async (conn: AsyncSsh2Client) => {
+        const sftp = await conn.getSftp();
+        this.logger.info("开始删除");
+        for (const file of files) {
+          await conn.unlink({
+            sftp,
+            remotePath: file,
+          });
+        }
+        this.logger.info("文件全部删除成功");
+      },
+    });
+  }
+
   async isCmd(conn: AsyncSsh2Client) {
     const spec = await conn.exec("echo %COMSPEC% ");
     if (spec.toString().trim() === "%COMSPEC%") {

packages/plugins/plugin-lib/src/tencent/access-cos.ts

@@ -0,0 +1,65 @@
+import { AccessInput, BaseAccess, IsAccess } from "@certd/pipeline";
+
+@IsAccess({
+  name: "tencentcos",
+  title: "腾讯云COS授权",
+  icon: "svg:icon-tencentcloud",
+  desc: "腾讯云对象存储授权，包含地域和存储桶",
+})
+export class TencentCosAccess extends BaseAccess {
+  @AccessInput({
+    title: "腾讯云授权",
+    component: {
+      name: "access-selector",
+      vModel: "modelValue",
+      type: "tencent",
+    },
+    helper: "请选择腾讯云授权",
+    required: true,
+  })
+  accessId = "";
+
+  @AccessInput({
+    title: "所在地域",
+    helper: "存储桶所在地域",
+    component: {
+      name: "a-auto-complete",
+      vModel: "value",
+      options: [
+        { value: "", label: "--------中国大陆地区-------", disabled: true },
+        { value: "ap-beijing-1", label: "北京1区" },
+        { value: "ap-beijing", label: "北京" },
+        { value: "ap-nanjing", label: "南京" },
+        { value: "ap-shanghai", label: "上海" },
+        { value: "ap-guangzhou", label: "广州" },
+        { value: "ap-chengdu", label: "成都" },
+        { value: "ap-chongqing", label: "重庆" },
+        { value: "ap-shenzhen-fsi", label: "深圳金融" },
+        { value: "ap-shanghai-fsi", label: "上海金融" },
+        { value: "ap-beijing-fsi", label: "北京金融" },
+        { value: "", label: "--------中国香港及境外-------", disabled: true },
+        { value: "ap-hongkong", label: "中国香港" },
+        { value: "ap-singapore", label: "新加坡" },
+        { value: "ap-mumbai", label: "孟买" },
+        { value: "ap-jakarta", label: "雅加达" },
+        { value: "ap-seoul", label: "首尔" },
+        { value: "ap-bangkok", label: "曼谷" },
+        { value: "ap-tokyo", label: "东京" },
+        { value: "na-siliconvalley", label: "硅谷" },
+        { value: "na-ashburn", label: "弗吉尼亚" },
+        { value: "sa-saopaulo", label: "圣保罗" },
+        { value: "eu-frankfurt", label: "法兰克福" },
+      ],
+    },
+  })
+  region!: string;
+
+  @AccessInput({
+    title: "Bucket",
+    helper: "存储桶名称",
+    required: true,
+  })
+  bucket = "";
+}
+
+new TencentCosAccess();

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

@@ -0,0 +1,28 @@
+import { IsAccess, AccessInput, BaseAccess } from "@certd/pipeline";
+
+@IsAccess({
+  name: "tencent",
+  title: "腾讯云",
+  icon: "svg:icon-tencentcloud",
+})
+export class TencentAccess extends BaseAccess {
+  @AccessInput({
+    title: "secretId",
+    helper:
+      "使用对应的插件需要有对应的权限，比如上传证书，需要证书管理权限;部署到clb需要clb相关权限\n前往[密钥管理](https://console.cloud.tencent.com/cam/capi)进行创建",
+    component: {
+      placeholder: "secretId",
+    },
+    rules: [{ required: true, message: "该项必填" }],
+  })
+  secretId = "";
+  @AccessInput({
+    title: "secretKey",
+    component: {
+      placeholder: "secretKey",
+    },
+    encrypt: true,
+    rules: [{ required: true, message: "该项必填" }],
+  })
+  secretKey = "";
+}

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

@@ -0,0 +1,3 @@
+export * from "./access.js";
+export * from "./access-cos.js";
+export * from "./lib/index.js";

packages/plugins/plugin-lib/src/tencent/lib/cos-client.ts

@@ -0,0 +1,69 @@
+import { TencentAccess } from "../access.js";
+import { ILogger } from "@certd/basic";
+
+export class TencentCosClient {
+  access: TencentAccess;
+  logger: ILogger;
+  region: string;
+  bucket: string;
+
+  constructor(opts: { access: TencentAccess; logger: ILogger; region: string; bucket: string }) {
+    this.access = opts.access;
+    this.logger = opts.logger;
+    this.bucket = opts.bucket;
+    this.region = opts.region;
+  }
+
+  async getCosClient() {
+    const sdk = await import("cos-nodejs-sdk-v5");
+    const clientConfig = {
+      SecretId: this.access.secretId,
+      SecretKey: this.access.secretKey,
+    };
+    return new sdk.default(clientConfig);
+  }
+
+  async uploadFile(key: string, file: Buffer) {
+    const cos = await this.getCosClient();
+    return new Promise((resolve, reject) => {
+      cos.putObject(
+        {
+          Bucket: this.bucket /* 必须 */,
+          Region: this.region /* 必须 */,
+          Key: key /* 必须 */,
+          Body: file, // 上传文件对象
+          onProgress: function (progressData) {
+            console.log(JSON.stringify(progressData));
+          },
+        },
+        function (err, data) {
+          if (err) {
+            reject(err);
+            return;
+          }
+          resolve(data);
+        }
+      );
+    });
+  }
+
+  async removeFile(key: string) {
+    const cos = await this.getCosClient();
+    return new Promise((resolve, reject) => {
+      cos.deleteObject(
+        {
+          Bucket: this.bucket,
+          Region: this.region,
+          Key: key,
+        },
+        function (err, data) {
+          if (err) {
+            reject(err);
+            return;
+          }
+          resolve(data);
+        }
+      );
+    });
+  }
+}

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

@@ -0,0 +1,2 @@
+export * from "./ssl-client.js";
+export * from "./cos-client.js";

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

@@ -1,6 +1,10 @@
-import { TencentAccess } from '@certd/plugin-plus';
+import { ILogger } from "@certd/basic";
-import { CertInfo } from '@certd/plugin-cert';
+import { TencentAccess } from "../access.js";
-import { ILogger } from '@certd/basic';
+
+export type TencentCertInfo = {
+  key: string;
+  crt: string;
+};
 export class TencentSslClient {
   access: TencentAccess;
   logger: ILogger;
@@ -11,7 +15,7 @@ export class TencentSslClient {
     this.region = opts.region;
   }
   async getSslClient(): Promise<any> {
-    const sdk = await import('tencentcloud-sdk-nodejs/tencentcloud/services/ssl/v20191205/index.js');
+    const sdk = await import("tencentcloud-sdk-nodejs/tencentcloud/services/ssl/v20191205/index.js");
     const SslClient = sdk.v20191205.Client;
 
     const clientConfig = {
@@ -22,7 +26,7 @@ export class TencentSslClient {
       region: this.region,
       profile: {
         httpProfile: {
-          endpoint: 'ssl.tencentcloudapi.com',
+          endpoint: "ssl.tencentcloudapi.com",
         },
       },
     };
@@ -32,11 +36,11 @@ export class TencentSslClient {
 
   checkRet(ret: any) {
     if (!ret || ret.Error) {
-      throw new Error('请求失败：' + ret.Error.Code + ',' + ret.Error.Message);
+      throw new Error("请求失败：" + ret.Error.Code + "," + ret.Error.Message);
     }
   }
 
-  async uploadToTencent(opts: { certName: string; cert: CertInfo }): Promise<string> {
+  async uploadToTencent(opts: { certName: string; cert: TencentCertInfo }): Promise<string> {
     const client = await this.getSslClient();
     const params = {
       CertificatePublicKey: opts.cert.crt,
@@ -45,7 +49,7 @@ export class TencentSslClient {
     };
     const ret = await client.UploadCertificate(params);
     this.checkRet(ret);
-    this.logger.info('证书上传成功：tencentCertId=', ret.CertificateId);
+    this.logger.info("证书上传成功：tencentCertId=", ret.CertificateId);
     return ret.CertificateId;
   }
 

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.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
+
+* 优化站点证书检查页面，检查增加3次重试 ([e6dd7cd](https://github.com/certd/certd/commit/e6dd7cd54a3e23897031b5df6e0c3cdc0545d35a))
+* 支持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)
 
 **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.29.2",
+  "version": "1.29.4",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -66,8 +66,8 @@
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.29.2",
+    "@certd/lib-iframe": "^1.29.4",
-    "@certd/pipeline": "^1.29.2",
+    "@certd/pipeline": "^1.29.4",
     "@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/api.ts

@@ -9,6 +9,12 @@ export type CnameRecord = {
   recordValue?: string;
 };
 
+export type DomainGroupItem = {
+  domain: string;
+  domains?: string[];
+  keySubDomains?: string[];
+};
+
 export async function GetList() {
   return await request({
     url: apiPrefix + "/list",

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

@@ -24,10 +24,7 @@ defineOptions({
   name: "CnameVerifyPlan"
 });
 
-const emit = defineEmits<{
+const emit = defineEmits(["update:modelValue", "change"]);
-  "update:modelValue": any;
-  change: Record<string, any>;
-}>();
 
 const props = defineProps<{
   modelValue: Record<string, any>;

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

@@ -0,0 +1,106 @@
+<template>
+  <table class="http-verify-plan">
+    <thead>
+      <tr>
+        <td style="width: 160px">网站域名</td>
+        <td style="width: 100px; text-align: center">上传方式</td>
+        <td style="width: 150px">上传授权</td>
+        <td style="width: 200px">网站根目录路径</td>
+      </tr>
+    </thead>
+    <tbody v-if="records" class="http-record-body">
+      <template v-for="(item, key) of records" :key="key">
+        <tr>
+          <td class="domain">
+            {{ item.domain }}
+          </td>
+          <td>
+            <fs-dict-select v-model:value="item.httpUploaderType" :dict="uploaderTypeDict" @change="onRecordChange"></fs-dict-select>
+          </td>
+          <td>
+            <access-selector v-model="item.httpUploaderAccess" :type="item.httpUploaderType" @change="onRecordChange"></access-selector>
+          </td>
+          <td>
+            <a-input v-model:value="item.httpUploadRootDir" placeholder="网站根目录，如：/www/wwwroot" @change="onRecordChange"></a-input>
+          </td>
+        </tr>
+      </template>
+    </tbody>
+  </table>
+</template>
+
+<script lang="ts" setup>
+import { Ref, ref, watch } from "vue";
+import { HttpRecord } from "/@/components/plugins/cert/domains-verify-plan-editor/type";
+import { dict } from "@fast-crud/fast-crud";
+
+defineOptions({
+  name: "HttpVerifyPlan"
+});
+
+const emit = defineEmits(["update:modelValue", "change"]);
+
+const props = defineProps<{
+  modelValue: Record<string, any>;
+}>();
+
+const records: Ref<Record<string, HttpRecord>> = ref({});
+
+watch(
+  () => {
+    return props.modelValue;
+  },
+  (value: any) => {
+    if (value) {
+      records.value = {
+        ...value
+      };
+    }
+  },
+  {
+    immediate: true
+  }
+);
+
+function onRecordChange() {
+  emit("update:modelValue", records.value);
+  emit("change", records.value);
+}
+
+const uploaderTypeDict = dict({
+  data: [
+    { label: "SFTP/SSH", value: "ssh" },
+    { label: "FTP", value: "ftp" },
+    { label: "阿里云OSS", value: "alioss" },
+    { label: "腾讯云COS", value: "tencentcos" },
+    { label: "七牛OSS", value: "qiniuoss" }
+  ]
+});
+</script>
+
+<style lang="less">
+.http-verify-plan {
+  width: 100%;
+  table-layout: fixed;
+  tbody tr td {
+    border-top: 1px solid #e8e8e8 !important;
+  }
+  tr {
+    td {
+      border: 0 !important;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+
+      &.center {
+        text-align: center;
+      }
+    }
+    //&:last-child {
+    //  td {
+    //    border-bottom: 0 !important;
+    //  }
+    //}
+  }
+}
+</style>

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

@@ -13,7 +13,7 @@
         <table class="plan-table">
           <thead>
             <tr>
-              <th>域名</th>
+              <th style="min-width: 100px">主域名</th>
               <th>验证方式</th>
               <th>验证计划</th>
             </tr>
@@ -58,6 +58,9 @@
                   <div v-if="item.type === 'cname'" class="plan-cname">
                     <cname-verify-plan v-model="item.cnameVerifyPlan" @change="onPlanChanged" />
                   </div>
+                  <div v-if="item.type === 'http'" class="plan-http">
+                    <http-verify-plan v-model="item.httpVerifyPlan" @change="onPlanChanged" />
+                  </div>
                 </div>
               </td>
             </tr>
@@ -76,10 +79,12 @@ import { ref, watch } from "vue";
 import { dict, FsDictSelect } from "@fast-crud/fast-crud";
 import AccessSelector from "/@/views/certd/access/access-selector/index.vue";
 import CnameVerifyPlan from "./cname-verify-plan.vue";
+import HttpVerifyPlan from "./http-verify-plan.vue";
+//@ts-ignore
 import psl from "psl";
 import { Form } from "ant-design-vue";
 import { DomainsVerifyPlanInput } from "./type";
-import { CnameRecord } from "./api";
+import { CnameRecord, DomainGroupItem } from "./api";
 defineOptions({
   name: "DomainsVerifyPlanEditor"
 });
@@ -92,12 +97,17 @@ const challengeTypeOptions = ref<any[]>([
   {
     label: "CNAME验证",
     value: "cname"
+  },
+  {
+    label: "HTTP验证",
+    value: "http"
   }
 ]);
 
 const props = defineProps<{
   modelValue?: DomainsVerifyPlanInput;
   domains?: string[];
+  defaultType?: string;
 }>();
 
 const emit = defineEmits<{
@@ -127,23 +137,17 @@ function showError(error: string) {
   errorMessageRef.value = error;
 }
 
-type DomainGroup = Record<
+type DomainGroup = Record<string, DomainGroupItem>;
-  string,
-  {
-    [key: string]: CnameRecord;
-  }
->[];
 
 function onDomainsChanged(domains: string[]) {
-  console.log("域名变化", domains);
   if (domains == null) {
     return;
   }
 
   const domainGroups: DomainGroup = {};
   for (let domain of domains) {
-    domain = domain.replace("*.", "");
+    const keyDomain = domain.replace("*.", "");
-    const parsed = psl.parse(domain);
+    const parsed = psl.parse(keyDomain);
     if (parsed.error) {
       showError(`域名${domain}解析失败: ${JSON.stringify(parsed.error)}`);
       continue;
@@ -154,39 +158,83 @@ function onDomainsChanged(domains: string[]) {
     }
     let group = domainGroups[mainDomain];
     if (!group) {
-      group = {};
+      group = {
+        domain: mainDomain,
+        domains: [],
+        keySubDomains: []
+      } as DomainGroupItem;
       domainGroups[mainDomain] = group;
     }
-    group[domain] = {
+    group.domains.push(domain);
-      id: 0
+    group.keySubDomains.push(keyDomain);
-    };
   }
 
   for (const domain in domainGroups) {
     let planItem = planRef.value[domain];
-    const subDomains = domainGroups[domain];
+    const domainGroupItem = domainGroups[domain];
     if (!planItem) {
       planItem = {
         domain,
-        type: "cname",
+        //@ts-ignore
-        cnameVerifyPlan: {
+        type: props.defaultType || "cname",
-          ...subDomains
+        //@ts-ignore
-        }
+        cnameVerifyPlan: {},
+        //@ts-ignore
+        httpVerifyPlan: {}
       };
       planRef.value[domain] = planItem;
-    } else {
+    }
-      const cnamePlan = planItem.cnameVerifyPlan;
+    planItem.domains = domainGroupItem.domains;
-      for (const subDomain in subDomains) {
+
-        if (!cnamePlan[subDomain]) {
+    const cnameOrigin = planItem.cnameVerifyPlan;
-          cnamePlan[subDomain] = {
+    const httpOrigin = planItem.httpVerifyPlan;
-            id: 0
+    planItem.cnameVerifyPlan = {};
-          };
+    planItem.httpVerifyPlan = {};
-        }
+    const cnamePlan = planItem.cnameVerifyPlan;
+    const httpPlan = planItem.httpVerifyPlan;
+    for (const subDomain of domainGroupItem.keySubDomains) {
+      if (!cnameOrigin[subDomain]) {
+        //@ts-ignore
+        planItem.cnameVerifyPlan[subDomain] = {
+          id: 0
+        };
+      } else {
+        planItem.cnameVerifyPlan[subDomain] = cnameOrigin[subDomain];
       }
-      for (const subDomain of Object.keys(cnamePlan)) {
+
-        if (!subDomains[subDomain]) {
+      if (!cnamePlan[subDomain]) {
-          delete cnamePlan[subDomain];
+        //@ts-ignore
-        }
+        cnamePlan[subDomain] = {
+          id: 0
+        };
+      }
+
+      if (!httpOrigin[subDomain]) {
+        //@ts-ignore
+        planItem.httpVerifyPlan[subDomain] = {
+          domain: subDomain
+        };
+      } else {
+        planItem.httpVerifyPlan[subDomain] = httpOrigin[subDomain];
+      }
+
+      if (!httpPlan[subDomain]) {
+        //@ts-ignore
+        httpPlan[subDomain] = {
+          domain: subDomain
+        };
+      }
+    }
+
+    for (const subDomain of Object.keys(cnamePlan)) {
+      if (!domainGroupItem.keySubDomains.includes(subDomain)) {
+        delete cnamePlan[subDomain];
+      }
+    }
+
+    for (const subDomain of Object.keys(httpPlan)) {
+      if (!domainGroupItem.keySubDomains.includes(subDomain)) {
+        delete httpPlan[subDomain];
       }
     }
   }
@@ -200,10 +248,10 @@ function onDomainsChanged(domains: string[]) {
 
 watch(
   () => {
-    return props.domains;
+    return props.domains && props.defaultType;
   },
-  (domains: string[]) => {
+  () => {
-    onDomainsChanged(domains);
+    onDomainsChanged(props.domains);
   },
   {
     immediate: true,
@@ -277,12 +325,15 @@ watch(
       padding: 10px 6px;
     }
     td {
-      border-bottom: 1px solid #e8e8e8;
+      border-bottom: 2px solid #d8d8d8;
       border-left: 1px solid #e8e8e8;
       padding: 6px 6px;
     }
 
     .plan {
+      td {
+        border-right: 1px solid #e8e8e8 !important;
+      }
       font-size: 14px;
       .ant-select {
         width: 100%;

packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/type.ts

@@ -1,11 +1,20 @@
 import { CnameRecord } from "@certd/pipeline";
 
+export type HttpRecord = {
+  domain: string;
+  httpUploaderType: string;
+  httpUploaderAccess: number;
+  httpUploadRootDir: string;
+};
+
 export type DomainVerifyPlanInput = {
   domain: string;
-  type: "cname" | "dns";
+  domains: string[];
+  type: "cname" | "dns" | "http";
   dnsProviderType?: string;
   dnsProviderAccessId?: number;
   cnameVerifyPlan?: Record<string, CnameRecord>;
+  httpVerifyPlan?: Record<string, HttpRecord>;
 };
 export type DomainsVerifyPlanInput = {
   [key: string]: DomainVerifyPlanInput;

packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/validator.ts

@@ -1,12 +1,13 @@
 import Validator from "async-validator";
 import { DomainsVerifyPlanInput } from "./type";
 
-function checkCnameVerifyPlan(rule, value: DomainsVerifyPlanInput) {
+function checkDomainVerifyPlan(rule: any, value: DomainsVerifyPlanInput) {
   if (value == null) {
     return true;
   }
   for (const domain in value) {
-    if (value[domain].type === "cname") {
+    const type = value[domain].type;
+    if (type === "cname") {
       const subDomains = Object.keys(value[domain].cnameVerifyPlan);
       if (subDomains.length > 0) {
         for (const subDomain of subDomains) {
@@ -16,8 +17,32 @@ function checkCnameVerifyPlan(rule, value: DomainsVerifyPlanInput) {
           }
         }
       }
-    } else {
+    } else if (type === "http") {
-      if (value[domain].dnsProviderType == null || value[domain].dnsProviderAccessId == null) {
+      const domains = value[domain].domains || [];
+      for (const item of domains) {
+        //如果有通配符域名则不允许使用http校验
+        if (item.startsWith("*.")) {
+          throw new Error(`域名${item}为通配符域名，不支持HTTP校验`);
+        }
+      }
+
+      const subDomains = Object.keys(value[domain].httpVerifyPlan);
+      if (subDomains.length > 0) {
+        for (const subDomain of subDomains) {
+          const plan = value[domain].httpVerifyPlan[subDomain];
+          if (!plan.httpUploaderType) {
+            throw new Error(`域名${subDomain}的上传方式必须填写`);
+          }
+          if (!plan.httpUploaderAccess) {
+            throw new Error(`域名${subDomain}的上传授权信息必须填写`);
+          }
+          if (!plan.httpUploadRootDir) {
+            throw new Error(`域名${subDomain}的网站根路径必须填写`);
+          }
+        }
+      }
+    } else if (type === "dns") {
+      if (!value[domain].dnsProviderType || !value[domain].dnsProviderAccessId) {
         throw new Error(`DNS模式下，域名${domain}的DNS类型和授权信息必须填写`);
       }
     }
@@ -25,4 +50,4 @@ function checkCnameVerifyPlan(rule, value: DomainsVerifyPlanInput) {
   return true;
 }
 // 注册自定义验证器
-Validator.register("checkCnameVerifyPlan", checkCnameVerifyPlan);
+Validator.register("checkDomainVerifyPlan", checkDomainVerifyPlan);

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

@@ -238,7 +238,7 @@ function openUpgrade() {
       title: "专业版",
       desc: "开源需要您的赞助支持",
       type: "plus",
-      privilege: ["可加VIP群，您需求将优先实现", "站点证书监控无限制", "更多通知方式", "更多强大部署插件，宝塔、群晖、1Panel等"],
+      privilege: ["可加VIP群，您的需求将优先实现", "站点证书监控无限制", "更多通知方式", "更多强大的部署插件，宝塔、群晖、1Panel等"],
       trial: {
         title: "点击获取7天试用",
         click: () => {

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

@@ -154,8 +154,15 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             ]
           },
           column: {
-            width: 160,
+            width: 200,
-            sorter: true
+            sorter: true,
+            cellRender({ value }) {
+              return (
+                <a-tooltip title={value} placement="left">
+                  <fs-copyable modelValue={value}></fs-copyable>
+                </a-tooltip>
+              );
+            }
           }
         },
         httpsPort: {
@@ -185,7 +192,14 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           column: {
             width: 200,
             sorter: true,
-            show: true
+            show: true,
+            cellRender({ value }) {
+              return (
+                <a-tooltip title={value} placement="left">
+                  {value}
+                </a-tooltip>
+              );
+            }
           }
         },
         certProvider: {
@@ -199,7 +213,10 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
           column: {
             width: 200,
-            sorter: true
+            sorter: true,
+            cellRender({ value }) {
+              return <a-tooltip title={value}>{value}</a-tooltip>;
+            }
           }
         },
         certStatus: {
@@ -256,7 +273,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             show: false
           },
           column: {
-            sorter: true
+            sorter: true,
+            width: 155
           }
         },
         checkStatus: {
@@ -268,6 +286,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           dict: dict({
             data: [
               { label: "正常", value: "ok", color: "green" },
+              { label: "检查中", value: "checking", color: "blue" },
               { label: "异常", value: "error", color: "red" }
             ]
           }),
@@ -291,7 +310,10 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
           column: {
             width: 200,
-            sorter: true
+            sorter: true,
+            cellRender({ value }) {
+              return <a-tooltip title={value}>{value}</a-tooltip>;
+            }
           }
         },
         pipelineId: {
@@ -336,7 +358,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             value: false
           },
           column: {
-            width: 100,
+            width: 90,
             sorter: true
           }
         }

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

@@ -43,6 +43,8 @@ export default function (certPlugins: any[], formWrapperRef: any): CreateCrudOpt
     }
   }
 
+  const randomHour = Math.floor(Math.random() * 6);
+  const randomMin = Math.floor(Math.random() * 60);
   return {
     crudOptions: {
       form: {
@@ -94,6 +96,7 @@ export default function (certPlugins: any[], formWrapperRef: any): CreateCrudOpt
           title: "定时触发",
           type: "text",
           form: {
+            value: `0 ${randomMin} ${randomHour} * * *`,
             component: {
               name: "cron-editor",
               vModel: "modelValue",

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

@@ -5,7 +5,7 @@ import SuiteValueEdit from "/@/views/sys/suite/product/suite-value-edit.vue";
 import SuiteValue from "/@/views/sys/suite/product/suite-value.vue";
 import DurationValue from "/@/views/sys/suite/product/duration-value.vue";
 import UserSuiteStatus from "/@/views/certd/suite/mine/user-suite-status.vue";
-
+import dayjs from "dayjs";
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
     return await api.GetList(query);
@@ -286,7 +286,10 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             component: {
               name: "expires-time-text",
               vModel: "value",
-              mode: "tag"
+              mode: "tag",
+              title: compute(({ value }) => {
+                return dayjs(value).format("YYYY-MM-DD HH:mm:ss");
+              })
             }
           }
         },

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/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,6 +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">需要开通电脑网站支付， <a href="https://certd.docmirror.cn/comm/payments/alipay.html">支付宝配置帮助文档</a></div>
       </a-form-item>
 
       <a-form-item label="微信支付" :name="['wxpay', 'enabled']" :required="true">
@@ -21,6 +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支付， <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-client/src/views/sys/suite/user-suite/crud.tsx

@@ -7,6 +7,7 @@ import DurationValue from "/@/views/sys/suite/product/duration-value.vue";
 import createCrudOptionsUser from "/@/views/sys/authority/user/crud";
 import UserSuiteStatus from "/@/views/certd/suite/mine/user-suite-status.vue";
 import SuiteDurationSelector from "../setting/suite-duration-selector.vue";
+import dayjs from "dayjs";
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const api = sysUserSuiteApi;
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
@@ -156,7 +157,6 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             ]
           },
           valueResolve({ form, value }) {
-            debugger;
             if (value && value.productId) {
               form.productId = value.productId;
               form.duration = value.duration;
@@ -345,7 +345,10 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             component: {
               name: "expires-time-text",
               vModel: "value",
-              mode: "tag"
+              mode: "tag",
+              title: compute(({ value }) => {
+                return dayjs(value).format("YYYY-MM-DD HH:mm:ss");
+              })
             }
           }
         },

packages/ui/certd-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.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
+
+* 修复系统级授权无法查看密钥的bug ([8644348](https://github.com/certd/certd/commit/8644348fc41ae2e1672f946ca37e5d3a674e0218))
+
+### Performance Improvements
+
+* 优化站点证书检查页面，检查增加3次重试 ([e6dd7cd](https://github.com/certd/certd/commit/e6dd7cd54a3e23897031b5df6e0c3cdc0545d35a))
+* 支持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

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

@@ -0,0 +1,4 @@
+
+ALTER TABLE `pi_history` MODIFY COLUMN `pipeline` longtext  NULL;
+ALTER TABLE `pi_storage` MODIFY COLUMN `value` longtext  NULL;
+ALTER TABLE `pi_history_log` MODIFY COLUMN `logs` longtext  NULL;

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.2",
+  "version": "1.29.4",
   "description": "fast-server base midway",
   "private": true,
   "type": "module",
@@ -34,18 +34,18 @@
     "@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.2",
+    "@certd/acme-client": "^1.29.4",
-    "@certd/basic": "^1.29.2",
+    "@certd/basic": "^1.29.4",
-    "@certd/commercial-core": "^1.29.2",
+    "@certd/commercial-core": "^1.29.4",
-    "@certd/lib-huawei": "^1.29.2",
+    "@certd/lib-huawei": "^1.29.4",
-    "@certd/lib-k8s": "^1.29.2",
+    "@certd/lib-k8s": "^1.29.4",
-    "@certd/lib-server": "^1.29.2",
+    "@certd/lib-server": "^1.29.4",
-    "@certd/midway-flyway-js": "^1.29.2",
+    "@certd/midway-flyway-js": "^1.29.4",
-    "@certd/pipeline": "^1.29.2",
+    "@certd/pipeline": "^1.29.4",
-    "@certd/plugin-cert": "^1.29.2",
+    "@certd/plugin-cert": "^1.29.4",
-    "@certd/plugin-lib": "^1.29.2",
+    "@certd/plugin-lib": "^1.29.4",
-    "@certd/plugin-plus": "^1.29.2",
+    "@certd/plugin-plus": "^1.29.4",
-    "@certd/plus-core": "^1.29.2",
+    "@certd/plus-core": "^1.29.4",
     "@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120",
     "@huaweicloud/huaweicloud-sdk-core": "^3.1.120",
     "@koa/cors": "^5.0.0",

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

@@ -40,7 +40,7 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
   async add(@Body(ALL) bean: any) {
     bean.userId = this.getUserId();
     const res = await this.service.add(bean);
-    await this.service.check(res.id);
+    await this.service.check(res.id, false, 0);
     return this.ok(res);
   }
 
@@ -49,7 +49,7 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
     await this.service.checkUserId(bean.id, this.getUserId());
     delete bean.userId;
     await this.service.update(bean);
-    await this.service.check(bean.id);
+    await this.service.check(bean.id, false, 0);
     return this.ok();
   }
   @Post('/info', { summary: Constants.per.authOnly })
@@ -67,14 +67,14 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
   @Post('/check', { summary: Constants.per.authOnly })
   async check(@Body('id') id: number) {
     await this.service.checkUserId(id, this.getUserId());
-    await this.service.check(id, false);
+    await this.service.check(id, false, 0);
     return this.ok();
   }
 
   @Post('/checkAll', { summary: Constants.per.authOnly })
   async checkAll() {
     const userId = this.getUserId();
-    this.service.checkAll(userId);
+    await this.service.checkAllByUsers(userId);
     return this.ok();
   }
 }

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

@@ -1,5 +1,5 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { AccessService } from '@certd/lib-server';
+import { AccessService, Constants } from '@certd/lib-server';
 import { AccessController } from '../../pipeline/access-controller.js';
 import { checkComm } from '@certd/plus-core';
 
@@ -55,6 +55,12 @@ export class SysAccessController extends AccessController {
     return await super.define(type);
   }
 
+  @Post('/getSecretPlain', { summary: Constants.per.authOnly })
+  async getSecretPlain(@Body(ALL) body: { id: number; key: string }) {
+    const value = await this.service.getById(body.id, 0);
+    return this.ok(value[body.key]);
+  }
+
   @Post('/accessTypeDict', { summary: 'sys:settings:view' })
   async getAccessTypeDict() {
     return await super.getAccessTypeDict();

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

@@ -45,6 +45,9 @@ export class AutoAInitSite {
 
     await this.sysSettingsService.backupSecret();
 
+    //加载一次密钥
+    await this.sysSettingsService.getSecret();
+
     await this.sysSettingsService.reloadPrivateSettings();
 
     // 授权许可

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

@@ -14,8 +14,6 @@ export class AutoCRegisterCron {
   @Config('cron.onlyAdminUser')
   private onlyAdminUser: boolean;
 
-  // @Inject()
-  // echoPlugin: EchoPlugin;
   @Config('cron.immediateTriggerOnce')
   private immediateTriggerOnce = false;
 
@@ -61,13 +59,7 @@ export class AutoCRegisterCron {
           break;
         }
         offset += records.length;
-        for (const record of records) {
+        await this.siteInfoService.checkList(records);
-          try {
-            await this.siteInfoService.doCheck(record, true);
-          } catch (e) {
-            logger.error(`站点${record.name}检查出错：`, e);
-          }
-        }
       }
 
       logger.info('站点证书检查完成');

packages/ui/certd-server/src/modules/auto/auto-z.ts

@@ -45,7 +45,8 @@ export class AutoZPrint {
       return (bytes / 1024 / 1024).toFixed(2) + ' MB';
     }
     setInterval(() => {
-      logger.info(`heapUsed: ${format(process.memoryUsage().heapUsed)}`);
+      const mu = process.memoryUsage();
+      logger.info(`rss:${format(mu.rss)},heapUsed: ${format(mu.heapUsed)},heapTotal: ${format(mu.heapTotal)},external: ${format(mu.external)}`);
     }, 60000);
   }
 

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

@@ -59,4 +59,13 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
 
     await this.addOrUpdate(bean);
   }
+
+  async deleteByPipelineId(id: number) {
+    if (!id) {
+      return;
+    }
+    await this.repository.delete({
+      pipelineId: id,
+    });
+  }
 }