perf: 登录注册、找回密码都支持极验验证码和图片验证码

* Update README.md

* Update README_en.md

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.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
+
+### Bug Fixes
+
+* 前置任务输出不存在时输出警告提示 ([b59052c](https://github.com/certd/certd/commit/b59052cc43b7b070fabd8b8e914e4c2a5e0ad61c))
+* 修复批量流水线执行时日志显示错乱的问题 ([4372adc](https://github.com/certd/certd/commit/4372adc703b9a4c785664054ab2a533626d815a8))
+* 修复远程数据选择无法过滤的bug ([6cbb073](https://github.com/certd/certd/commit/6cbb0739f8428d51b0712f718fe4d236cc087cf9))
+* 修复mysql下购买套餐加量包无效的bug ([c26ad4c](https://github.com/certd/certd/commit/c26ad4c8075f0606d45b8da13915737968d6191a))
+
+### Performance Improvements
+
+* 创建证书时支持选择通知时机 ([0e96bfd](https://github.com/certd/certd/commit/0e96bfdfa377824d204e72923d1176408ae6b300))
+* 创建k8s secret 时设置type为tls ([79ebabf](https://github.com/certd/certd/commit/79ebabfcfb9e5a534049c84f5f1a642b357fc856))
+* 去掉宝塔url后面的斜杠 ([8a0c2b9](https://github.com/certd/certd/commit/8a0c2b9b13628da750c25757e0cb8ed3038775ba))
+* 商业版隐藏文档相关链接 ([4443a1c](https://github.com/certd/certd/commit/4443a1c0308fa6b95a05efd73d15d24b65d641c9))
+* 商业版隐藏文档相关链接 ([db89561](https://github.com/certd/certd/commit/db8956148083bc4f988226ccf719940d08158a27))
+* 增加健康检查探针  /health/liveliness 和 /health/readiness ([44019e1](https://github.com/certd/certd/commit/44019e104289fedd32a867db00e9c6cb71b389cc))
+* 支持根据id更新证书（证书Id不变接口），不过该接口为白名单功能，普通腾讯云账户无法使用 ([fe9c4f3](https://github.com/certd/certd/commit/fe9c4f3391ff07c01dd9a252225f69a129c39050))
+* 支持godaddy ([b7980aa](https://github.com/certd/certd/commit/b7980aad5ab50f58662eaddf5d84aa82876a98eb))
+* 支持ssl.com证书颁发机构 ([27b6dfa](https://github.com/certd/certd/commit/27b6dfa4d2ab3bddd284c3a34511a72e1a513a4c))
+* 子域名托管说明 ([39a0223](https://github.com/certd/certd/commit/39a02235cf4416bb5bd1acd3831241efeaa2f602))
+* ssh 增加超时断开连接，默认10分钟超时 ([c24a040](https://github.com/certd/certd/commit/c24a040c19cacafc79228d7a7649af93837d94a1))
+
 ## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
 
 ### Bug Fixes

README.md

@@ -1,6 +1,6 @@
 # Certd
 
-[English](./README_en.md) | [中文](./README.md)
+中文 | [English](./README_en.md)
 
 Certd® 是一个免费的全自动证书管理系统，让你的网站证书永不过期。   
 后缀d取自linux守护进程的命名风格，意为证书守护进程

README_en.md

@@ -1,6 +1,6 @@
 # Certd
 
-[English](./README_en.md) | [中文](./README.md)
+[中文](./README.md) | English
 
 Certd® is a free, fully automated certificate management system that ensures your website certificates never expire. The suffix 'd' is inspired by the naming convention of Linux daemons, representing a certificate daemon.
 

build.trigger

@@ -1 +1 @@
-23:58
+00:34

docs/.vitepress/config.ts

@@ -107,7 +107,6 @@ export default defineConfig({
                     text: "常见问题",
                     items: [
                         {text: "QA", link: "/guide/qa/use.md"},
-                        {text: "常见报错处理", link: "/guide/qa/"},
                         {text: "群晖证书部署", link: "/guide/use/synology/"},
                         {text: "腾讯云密钥获取", link: "/guide/use/tencent/"},
                         {text: "连接windows主机", link: "/guide/use/host/windows.md"},
@@ -120,6 +119,7 @@ export default defineConfig({
                         {text: "邮箱配置", link: "/guide/use/email/index.md"},
                         {text: "IPv6支持", link: "/guide/use/setting/ipv6.md"},
                         {text: "ESXi", link: "/guide/use/ESXi/index.md"},
+                        {text: "子域名托管", link: "/guide/use/cert/subdomain.md"},
                     ]
                 },
                 {

docs/guide/changelogs/CHANGELOG.md

@@ -3,6 +3,53 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
+
+### Bug Fixes
+
+* 前置任务输出不存在时输出警告提示 ([b59052c](https://github.com/certd/certd/commit/b59052cc43b7b070fabd8b8e914e4c2a5e0ad61c))
+* 修复批量流水线执行时日志显示错乱的问题 ([4372adc](https://github.com/certd/certd/commit/4372adc703b9a4c785664054ab2a533626d815a8))
+* 修复远程数据选择无法过滤的bug ([6cbb073](https://github.com/certd/certd/commit/6cbb0739f8428d51b0712f718fe4d236cc087cf9))
+* 修复mysql下购买套餐加量包无效的bug ([c26ad4c](https://github.com/certd/certd/commit/c26ad4c8075f0606d45b8da13915737968d6191a))
+
+### Performance Improvements
+
+* 创建证书时支持选择通知时机 ([0e96bfd](https://github.com/certd/certd/commit/0e96bfdfa377824d204e72923d1176408ae6b300))
+* 创建k8s secret 时设置type为tls ([79ebabf](https://github.com/certd/certd/commit/79ebabfcfb9e5a534049c84f5f1a642b357fc856))
+* 去掉宝塔url后面的斜杠 ([8a0c2b9](https://github.com/certd/certd/commit/8a0c2b9b13628da750c25757e0cb8ed3038775ba))
+* 商业版隐藏文档相关链接 ([4443a1c](https://github.com/certd/certd/commit/4443a1c0308fa6b95a05efd73d15d24b65d641c9))
+* 商业版隐藏文档相关链接 ([db89561](https://github.com/certd/certd/commit/db8956148083bc4f988226ccf719940d08158a27))
+* 增加健康检查探针  /health/liveliness 和 /health/readiness ([44019e1](https://github.com/certd/certd/commit/44019e104289fedd32a867db00e9c6cb71b389cc))
+* 支持根据id更新证书（证书Id不变接口），不过该接口为白名单功能，普通腾讯云账户无法使用 ([fe9c4f3](https://github.com/certd/certd/commit/fe9c4f3391ff07c01dd9a252225f69a129c39050))
+* 支持godaddy ([b7980aa](https://github.com/certd/certd/commit/b7980aad5ab50f58662eaddf5d84aa82876a98eb))
+* 支持ssl.com证书颁发机构 ([27b6dfa](https://github.com/certd/certd/commit/27b6dfa4d2ab3bddd284c3a34511a72e1a513a4c))
+* 子域名托管说明 ([39a0223](https://github.com/certd/certd/commit/39a02235cf4416bb5bd1acd3831241efeaa2f602))
+* ssh 增加超时断开连接，默认10分钟超时 ([c24a040](https://github.com/certd/certd/commit/c24a040c19cacafc79228d7a7649af93837d94a1))
+
+## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
+
+### Bug Fixes
+
+* 更新我爱云CDN域名地址，和部分目录结构 [@tyjsjxh](https://github.com/tyjsjxh)  ([#514](https://github.com/certd/certd/issues/514)) ([78e7a81](https://github.com/certd/certd/commit/78e7a81638c2ee779f0ab6c3ba7e5c6f6e064151))
+* 修复cron选择组件星期显示错误的bug ([eb75e52](https://github.com/certd/certd/commit/eb75e52278f94a72643f7317e6740fb42666c68a))
+* 修复proxmox某些情况下执行卡住的bug ([ebd6917](https://github.com/certd/certd/commit/ebd6917a1d40ae4d94555c32b7e3c093d0599b94))
+
+### Performance Improvements
+
+* 部署到k8s支持自动创建secret ([c09c962](https://github.com/certd/certd/commit/c09c962cb676ca261610aa9f3e5105c9dae43f43))
+* 短信验证码支持腾讯云 ([9108459](https://github.com/certd/certd/commit/9108459ae42bcd95a59acba164a64e82e5f2cfe6))
+* 商业版支持自定义插件的参数配置 ([17f23f3](https://github.com/certd/certd/commit/17f23f37516af925d5049291d67d41e4271f81f8))
+* 腾讯云插件支持国际版 ([58e82d5](https://github.com/certd/certd/commit/58e82d5dbd4ebf089ef239578ef9b68454d17b30))
+* 腾讯云EO插件支持自动获取zoneid和域名列表 ([70fcdc9](https://github.com/certd/certd/commit/70fcdc9ebbfb7c883c0c8a2138f61a0776a9491b))
+* 支持部署到阿里云云原生API网关、AI网关 ([2ca20be](https://github.com/certd/certd/commit/2ca20be197720201fceabcce9d927f4dbc1cc872))
+* 支持部署到华为云obs ([9feb9d0](https://github.com/certd/certd/commit/9feb9d04b3c56ec95c06fcf4fd071eb0e88ffc6f))
+* 支持部署到dokploy ([7dbdeae](https://github.com/certd/certd/commit/7dbdeaebe0bfee7521a863fe5e6b4a712aec5876))
+* 支持删除宝塔证书夹中的过期证书 ([3575113](https://github.com/certd/certd/commit/3575113655be751d19f88c64491e98a89042d6a2))
+* 支持p7b证书格式 ([d9f4a57](https://github.com/certd/certd/commit/d9f4a5793d68a017a5d80ad5385cbda603c4e165))
+* lecdnv2支持api token ([e448934](https://github.com/certd/certd/commit/e4489343fee7754be07bcfc3323969dc3a30e90c))
+* openapi返回证书时挑选匹配范围最小的那一个；增加format参数，增加返回值p7b格式，增加detail返回 ([2085bcc](https://github.com/certd/certd/commit/2085bcceb61c3723c9bdfec4c4cc0917631ff5e5))
+* ssh 配置sudo免密提示 ([e1e7011](https://github.com/certd/certd/commit/e1e7011853ad0c5bd7b09c3690861d5aa34b2db4))
+
 ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17)
 
 ### Bug Fixes

docs/guide/install/source/index.md

@@ -12,7 +12,7 @@ git clone https://github.com/certd/certd --depth=1
 # git checkout v1.x.x  # 当v2主干分支代码无法正常启动时，可以尝试此命令，1.x.x换成最新版本号
 cd certd
 # 启动服务
-./start.sh  
+./start.sh
 
 ```
 >如果是windows，请先安装`git for windows` ，然后右键，选择`open git bash here`打开终端，再执行`./start.sh`命令
@@ -21,9 +21,9 @@ cd certd
 
 ### 访问测试
 
-http://your_server_ip:7001  
-https://your_server_ip:7002   
-默认账号密码：admin/123456    
+http://your_server_ip:7001
+https://your_server_ip:7002
+默认账号密码：admin/123456
 记得修改密码
 
 
@@ -37,7 +37,7 @@ cp -rf ./packages/ui/certd-server/data ../certd-data-backup
 
 git pull
 # 如果提示pull失败，可以尝试强制更新
-# git checkout v2 -f && git pull 
+# git checkout v2 -f && git pull
 
 # 先停止旧的服务,7001是certd的默认端口
 kill -9 $(lsof -t -i:7001)
@@ -45,16 +45,31 @@ kill -9 $(lsof -t -i:7001)
 ./start.sh
 
 ```
-::: warning   
-升级certd版本前，切记切记先备份一下数据    
+::: warning
+升级certd版本前，切记切记先备份一下数据
 :::
 
 
 ## 三、数据备份
-> 数据默认保存在 `./packages/ui/certd-server/data` 目录下    
+> 数据默认保存在 `./packages/ui/certd-server/data` 目录下
 > 建议配置一条[数据库备份流水线](../../use/backup/)  自动备份
 
 
 ## 四、备份恢复
 
 将备份的`db.sqlite`及同目录下的其他文件覆盖到原来的位置，重启certd即可
+
+## 六、常见问题
+
+### 1. npm install better-sqlite3 时，提示node-gyp需要vscode环境编译
+
+1. 首先确保node版本为22以上
+2. 将下面两行加到  ~/.npmrc 里面
+3. 重新install
+> better_sqlite3_binary_host=https://registry.npmmirror.com/-/binary/better-sqlite3
+> better_sqlite3_binary_host_mirror=https://registry.npmmirror.com/-/binary/better-sqlite3
+
+
+
+
+

docs/guide/qa/index.md

@@ -1,81 +0,0 @@
-# 常见报错解决
-
-## 1. getaddrinfo ENOTFOUND错误
-如果出现`getaddrinfo ENOTFOUND`/`getaddrinfo EAI_AGAIN`错误，可以尝试在`docker-compose.yaml`中设置dns
-```yaml
-version: '3.3' # 兼容旧版docker-compose
-services:
-  certd:
-    #↓↓↓↓ ------------ # 如果出现getaddrinfo ENOTFOUND 或 EAI_AGAIN错误，可以尝试设置dns
-    dns:
-      - 223.5.5.5      # 阿里云公共dns
-      - 223.6.6.6
-#       # ↓↓↓↓ ------- # 如果你服务器在腾讯云，可以用这个替换上面阿里云的公共dns
-#      - 119.29.29.29  # 腾讯云公共dns
-#      - 182.254.116.116
-#       # ↓↓↓↓ ------- # 如果你服务器部署在国外，可以用这个替换上面阿里云的公共dns
-#      - 8.8.8.8       # 谷歌公共dns
-#      - 8.8.4.4
-```
-
-如果仍然有问题,按如下步骤检查是否能够ping通域名
-```shell
-docker exec -it certd /bin/sh
-ping www.baidu.com
-ping gg.px.certd.handfree.work
-ping app.handfree.work
-```
-
-如果您是宝塔部署的
-可以试试将容器网络加入brige网络，看是否解决问题
-![img.png](images/baota-net.png)
-
-如果还是不行，请联系我们
-
-
-## 2. 连接IPv6超时
-docker-compose 需要放开IPv6网络的配置
-```yaml
-services:
-  certd:
-    networks:
-      - ip6net
-#    ↓↓↓↓ -------------------------------------------------------------- 启用ipv6网络，还需要把上面networks的注释放开
-networks:
-  ip6net:
-    enable_ipv6: true
-    ipam:
-      config:
-        - subnet: 2001:db8::/64
-
-```
-
-## 3. SSL_CERT_NOT_MATCH_DOMAIN_ERROR
-部署证书任务报类似 `SSL_CERT_NOT_MATCH_DOMAIN_ERROR`错误
-这是由于当前流水线的证书域名与要部署的目标站点的域名不匹配导致的，在申请证书任务中，增加目标站点域名，重新运行流水线即可
-
-
-## 4. 没有服务器配置文件，请检查是否开启了外网映射！
-宝塔网站证书部署报错：`Error: 没有服务器配置文件，请检查是否开启了外网映射！`    
-解决方案：先手动在宝塔网站中设置一次证书    
-
-
-## 5. 如何查看容器日志
-```shell
-docker logs -f --tail 200 certd
-```
-
-## 6. 容器内走时不准，或者时区不对
-走时不准确，慢慢偏差越来越大    
-或者整个时区都不对    
-可以尝试挂载localtime文件
-```yaml
-    volumes:
-      #   ↓↓↓↓↓ -------------------- 如果走时不准，请尝试挂载localtime文件
-      - /etc/localtime:/etc/localtime
-      - /etc/timezone:/etc/timezone
-```
-
-
-
-

docs/guide/qa/use.md

@@ -1,4 +1,4 @@
-# 使用问题
+# 常见问题
 
 
 ## 1. 是否支持IP证书
@@ -7,8 +7,14 @@
 
 
 ## 2. 建议设置多长时间运行一次流水线
-建议每天运行一次，检查证书过期时间    
+建议每天运行一次，检查证书过期时间
 当证书没过期时，自动跳过部署
 当证书到期前35天（创建流水线时可以修改），将会自动重新申请证书，自动部署
 
 
+## 3. too many certificates 错误
+当出现如下报错时，说明相同的域名短时间内申请超过5次
+解决方案：可以加多一个子域名，重新执行就可以规避次错误
+```
+"detail": too many certificates (5) already issued for this exact set of idantifiers in the last 168hm0s
+```

docs/guide/use/cert/subdomain.md

@@ -0,0 +1,10 @@
+# 二级子域名托管
+如果你的域名是免费的二级域名（比如：sub.handsfree.work），托管在CF或者阿里云上
+在使用DNS方式校验时需要设置子域名托管
+
+[阿里云子域名托管说明](https://help.aliyun.com/zh/dns/pubz-subdomain-management)
+
+
+![img.png](./images/subdomain1.png)
+
+![img_1.png](./images/subdomain2.png)

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.36.18"
+  "version": "1.36.19"
 }

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.19](https://github.com/publishlab/node-acme-client/compare/v1.36.18...v1.36.19) (2025-09-05)
+
+### Performance Improvements
+
+* 支持ssl.com证书颁发机构 ([27b6dfa](https://github.com/publishlab/node-acme-client/commit/27b6dfa4d2ab3bddd284c3a34511a72e1a513a4c))
+
 ## [1.36.18](https://github.com/publishlab/node-acme-client/compare/v1.36.17...v1.36.18) (2025-08-28)
 
 **Note:** Version bump only for package @certd/acme-client

packages/core/acme-client/package.json

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

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

@@ -25,6 +25,10 @@ export const directory = {
         staging: 'https://acme.zerossl.com/v2/DV90',
         production: 'https://acme.zerossl.com/v2/DV90',
     },
+    sslcom:{
+      staging: 'https://acme.ssl.com/sslcom-dv-rsa',
+      production: 'https://acme.ssl.com/sslcom-dv-rsa',
+    }
 };
 
 /**

packages/core/basic/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
+
+### Bug Fixes
+
+* 修复批量流水线执行时日志显示错乱的问题 ([4372adc](https://github.com/certd/certd/commit/4372adc703b9a4c785664054ab2a533626d815a8))
+
+### Performance Improvements
+
+* 去掉宝塔url后面的斜杠 ([8a0c2b9](https://github.com/certd/certd/commit/8a0c2b9b13628da750c25757e0cb8ed3038775ba))
+
 ## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
 
 **Note:** Version bump only for package @certd/basic

packages/core/basic/build.md

@@ -1 +1 @@
-00:39
+00:30

packages/core/basic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.36.18",
+  "version": "1.36.19",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -45,5 +45,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93"
+  "gitHead": "6d8981479517b5de9634e242c1ebf22e70527ec4"
 }

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

@@ -1,22 +1,4 @@
-import log4js, { LoggingEvent, Logger } from "log4js";
-
-const OutputAppender = {
-  configure: (config: any, layouts: any, findAppender: any, levels: any) => {
-    let layout = layouts.basicLayout;
-    if (config.layout) {
-      layout = layouts.layout(config.layout.type, config.layout);
-    }
-    function customAppender(layout: any, timezoneOffset: any) {
-      return (loggingEvent: LoggingEvent) => {
-        if (loggingEvent.context.outputHandler?.write) {
-          const text = `${layout(loggingEvent, timezoneOffset)}\n`;
-          loggingEvent.context.outputHandler.write(text);
-        }
-      };
-    }
-    return customAppender(layout, config.timezoneOffset);
-  },
-};
+import log4js, { CallStack, Level } from "log4js";
 
 let logFilePath = "./logs/app.log";
 export function resetLogConfigure() {
@@ -24,7 +6,6 @@ export function resetLogConfigure() {
   log4js.configure({
     appenders: {
       std: { type: "stdout" },
-      output: { type: OutputAppender },
       file: {
         type: "dateFile",
         filename: logFilePath,
@@ -33,7 +14,7 @@ export function resetLogConfigure() {
         numBackups: 3,
       },
     },
-    categories: { default: { appenders: ["std", "file"], level: "info" }, pipeline: { appenders: ["std", "file", "output"], level: "info" } },
+    categories: { default: { appenders: ["std", "file"], level: "info" }, pipeline: { appenders: ["std", "file"], level: "info" } },
   });
 }
 resetLogConfigure();
@@ -44,15 +25,98 @@ export function resetLogFilePath(filePath: string) {
   resetLogConfigure();
 }
 export function buildLogger(write: (text: string) => void) {
-  const logger = log4js.getLogger("pipeline");
-  const _secrets: string[] = [];
-  //@ts-ignore
-  logger.addSecret = (secret: string) => {
-    _secrets.push(secret);
-  };
-  logger.addContext("outputHandler", {
-    write: (text: string) => {
-      for (const item of _secrets) {
+  return new PipelineLogger("pipeline", write);
+}
+
+export type ILogger = {
+  readonly category: string;
+  level: Level | string;
+  log(level: Level | string, ...args: any[]): void;
+
+  isLevelEnabled(level?: string): boolean;
+
+  isTraceEnabled(): boolean;
+  isDebugEnabled(): boolean;
+  isInfoEnabled(): boolean;
+  isWarnEnabled(): boolean;
+  isErrorEnabled(): boolean;
+  isFatalEnabled(): boolean;
+
+  _log(level: Level, data: any): void;
+
+  addContext(key: string, value: any): void;
+
+  removeContext(key: string): void;
+
+  clearContext(): void;
+
+  /**
+   * Replace the basic parse function with a new custom one
+   * - Note that linesToSkip will be based on the origin of the Error object in addition to the callStackLinesToSkip (at least 1)
+   * @param parseFunction the new parseFunction. Use `undefined` to reset to the base implementation
+   */
+  setParseCallStackFunction(parseFunction: (error: Error, linesToSkip: number) => CallStack | undefined): void;
+
+  /**
+   * Adjust the value of linesToSkip when the parseFunction is called.
+   *
+   * Cannot be less than 0.
+   */
+  callStackLinesToSkip: number;
+
+  trace(message: any, ...args: any[]): void;
+
+  debug(message: any, ...args: any[]): void;
+
+  info(message: any, ...args: any[]): void;
+
+  warn(message: any, ...args: any[]): void;
+
+  error(message: any, ...args: any[]): void;
+
+  fatal(message: any, ...args: any[]): void;
+
+  mark(message: any, ...args: any[]): void;
+};
+
+const locale = Intl.DateTimeFormat().resolvedOptions().locale;
+const formatter = new Intl.DateTimeFormat(locale, {
+  year: "numeric",
+  month: "2-digit",
+  day: "2-digit",
+  hour: "2-digit",
+  minute: "2-digit",
+  second: "2-digit",
+  hour12: false,
+});
+function formatDateIntl(date = new Date()) {
+  const milliseconds = date.getMilliseconds(); // 获取毫秒
+  const formattedMilliseconds = milliseconds.toString().padStart(3, "0");
+  return formatter.format(date) + "." + formattedMilliseconds;
+}
+
+// @ts-ignore
+export class PipelineLogger implements ILogger {
+  callStackLinesToSkip: number = 3;
+  readonly category: string = "pipeline";
+  level: Level | string = "info";
+  _secrets: string[] = [];
+  logger: ILogger;
+  customWriter!: (text: string) => void;
+
+  constructor(name: string, write: (text: string) => void) {
+    this.customWriter = write;
+    this.logger = log4js.getLogger(name);
+  }
+
+  addSecret(secret: string) {
+    this._secrets.push(secret);
+  }
+
+  _doLog(level: string, ...args: any[]) {
+    let text = args.join(" ");
+    if (this.customWriter) {
+      for (const item of this._secrets) {
         if (item == null) {
           continue;
         }
@@ -66,10 +130,88 @@ export function buildLogger(write: (text: string) => void) {
           text = text.replaceAll(item, "*".repeat(item.length));
         }
       }
-      write(text);
-    },
-  });
-  return logger;
-}
+      text = `[${formatDateIntl()}] [${level.toUpperCase()}] - ${text} \n`;
+      this.customWriter(text);
+    }
+    // @ts-ignore
+    this.logger[level](...args);
+  }
 
-export type ILogger = Logger;
+  _log(level: Level, data: any): void {}
+
+  addContext(key: string, value: any): void {}
+
+  clearContext(): void {}
+
+  debug(message: any, ...args: any[]): void {
+    if (this.isDebugEnabled()) {
+      this._doLog("debug", message, ...args);
+    }
+  }
+
+  error(message: any, ...args: any[]): void {
+    if (this.isErrorEnabled()) {
+      this._doLog("error", message, ...args);
+    }
+  }
+
+  fatal(message: any, ...args: any[]): void {
+    if (this.isFatalEnabled()) {
+      this._doLog("fatal", message, ...args);
+    }
+  }
+
+  info(message: any, ...args: any[]): void {
+    if (this.isInfoEnabled()) {
+      this._doLog("info", message, ...args);
+    }
+  }
+
+  trace(message: any, ...args: any[]): void {
+    if (this.isTraceEnabled()) {
+      this._doLog("trace", message, ...args);
+    }
+  }
+
+  warn(message: any, ...args: any[]): void {
+    if (this.isWarnEnabled()) {
+      this._doLog("warn", message, ...args);
+    }
+  }
+
+  isDebugEnabled(): boolean {
+    return logger.isDebugEnabled();
+  }
+
+  isErrorEnabled(): boolean {
+    return logger.isErrorEnabled();
+  }
+
+  isFatalEnabled(): boolean {
+    return logger.isFatalEnabled();
+  }
+
+  isInfoEnabled(): boolean {
+    return logger.isInfoEnabled();
+  }
+
+  isLevelEnabled(level?: string): boolean {
+    return logger.isLevelEnabled();
+  }
+
+  isTraceEnabled(): boolean {
+    return logger.isTraceEnabled();
+  }
+
+  isWarnEnabled(): boolean {
+    return logger.isWarnEnabled();
+  }
+
+  log(level: Level | string, ...args: any[]): void {}
+
+  mark(message: any, ...args: any[]): void {}
+
+  removeContext(key: string): void {}
+
+  setParseCallStackFunction(parseFunction: (error: Error, linesToSkip: number) => CallStack | undefined): void {}
+}

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

@@ -1,6 +1,5 @@
 import axios, { AxiosHeaders, AxiosRequestConfig } from "axios";
 import { ILogger, logger } from "./util.log.js";
-import { Logger } from "log4js";
 import { HttpProxyAgent } from "http-proxy-agent";
 import { HttpsProxyAgent } from "https-proxy-agent";
 import nodeHttp from "http";
@@ -84,7 +83,7 @@ export function getGlobalAgents() {
 /**
  * @description 创建请求实例
  */
-export function createAxiosService({ logger }: { logger: Logger }) {
+export function createAxiosService({ logger }: { logger: ILogger }) {
   // 创建一个 axios 实例
   const service = axios.create();
 

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
+
+### Bug Fixes
+
+* 前置任务输出不存在时输出警告提示 ([b59052c](https://github.com/certd/certd/commit/b59052cc43b7b070fabd8b8e914e4c2a5e0ad61c))
+
+### Performance Improvements
+
+* 支持godaddy ([b7980aa](https://github.com/certd/certd/commit/b7980aad5ab50f58662eaddf5d84aa82876a98eb))
+* 支持ssl.com证书颁发机构 ([27b6dfa](https://github.com/certd/certd/commit/27b6dfa4d2ab3bddd284c3a34511a72e1a513a4c))
+
 ## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
 
 **Note:** Version bump only for package @certd/pipeline

packages/core/pipeline/package.json

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

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

@@ -21,9 +21,9 @@ export type PageRes = {
 export class Pager {
   pageNo: number;
   pageSize: number;
-  constructor(req: PageSearch) {
-    this.pageNo = req.pageNo ?? 1;
-    this.pageSize = req.pageSize || 50;
+  constructor(req?: PageSearch) {
+    this.pageNo = req?.pageNo ?? 1;
+    this.pageSize = req?.pageSize || 50;
   }
 
   getOffset() {

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

@@ -314,7 +314,7 @@ export class Executor {
           const outputKey = arr[2];
           input[key] = this.currentStatusMap.get(id)?.status?.output[outputKey] ?? this.lastStatusMap.get(id)?.status?.output[outputKey];
           if (input[key] == null) {
-            this.logger.warn(`${item.title}的配置未找到对应的输出值，请确认对应的前置任务是否存在或者是否执行正确`);
+            currentLogger.warn(`${item.title}的配置未找到对应的输出值，请确认对应的前置任务是否存在或者是否执行正确`);
           }
         }
       }

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

@@ -253,9 +253,9 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
     return name + "_" + dayjs().format("YYYYMMDDHHmmssSSS");
   }
 
-  buildCertName(domain: string) {
+  buildCertName(domain: string, prefix = "") {
     domain = domain.replaceAll("*", "_").replaceAll(".", "_");
-    return `${domain}_${dayjs().format("YYYYMMDDHHmmssSSS")}`;
+    return `${prefix}_${domain}_${dayjs().format("YYYYMMDDHHmmssSSS")}`;
   }
 
   async onRequest(req: PluginRequestHandleReq<any>) {

packages/core/pipeline/src/registry/registry.ts

@@ -69,9 +69,15 @@ export class Registry<T = any> {
     return this.storage;
   }
 
-  getDefineList() {
+  getDefineList(prefix?: string) {
     let list = [];
+    if (prefix) {
+      prefix = prefix + ":";
+    }
     for (const key in this.storage) {
+      if (prefix && !key.startsWith(prefix)) {
+        continue;
+      }
       const define = this.getDefine(key);
       if (define) {
         if (define?.deprecated) {
@@ -90,7 +96,10 @@ export class Registry<T = any> {
     return list;
   }
 
-  getDefine(key: string) {
+  getDefine(key: string, prefix?: string) {
+    if (prefix) {
+      key = prefix + ":" + key;
+    }
     const item = this.storage[key];
     if (!item) {
       return;

packages/libs/lib-huawei/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
 
 **Note:** Version bump only for package @certd/lib-huawei

packages/libs/lib-huawei/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-huawei",
   "private": false,
-  "version": "1.36.18",
+  "version": "1.36.19",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
   "types": "./dist/d/index.d.ts",
@@ -24,5 +24,5 @@
     "prettier": "^2.8.8",
     "tslib": "^2.8.1"
   },
-  "gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93"
+  "gitHead": "6d8981479517b5de9634e242c1ebf22e70527ec4"
 }

packages/libs/lib-iframe/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
 ## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
 
 **Note:** Version bump only for package @certd/lib-iframe

packages/libs/lib-iframe/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-iframe",
   "private": false,
-  "version": "1.36.18",
+  "version": "1.36.19",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -31,5 +31,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93"
+  "gitHead": "6d8981479517b5de9634e242c1ebf22e70527ec4"
 }

packages/libs/lib-jdcloud/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
+
+**Note:** Version bump only for package @certd/jdcloud
+
 ## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
 
 **Note:** Version bump only for package @certd/jdcloud

packages/libs/lib-jdcloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/jdcloud",
-  "version": "1.36.18",
+  "version": "1.36.19",
   "description": "jdcloud openApi sdk",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
@@ -61,5 +61,5 @@
       "fetch"
     ]
   },
-  "gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93"
+  "gitHead": "6d8981479517b5de9634e242c1ebf22e70527ec4"
 }

packages/libs/lib-k8s/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
+
+### Bug Fixes
+
+* 修复远程数据选择无法过滤的bug ([6cbb073](https://github.com/certd/certd/commit/6cbb0739f8428d51b0712f718fe4d236cc087cf9))
+
+### Performance Improvements
+
+* 创建k8s secret 时设置type为tls ([79ebabf](https://github.com/certd/certd/commit/79ebabfcfb9e5a534049c84f5f1a642b357fc856))
+
 ## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
 
 ### Performance Improvements

packages/libs/lib-k8s/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-k8s",
   "private": false,
-  "version": "1.36.18",
+  "version": "1.36.19",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -17,7 +17,7 @@
     "pub": "npm publish"
   },
   "dependencies": {
-    "@certd/basic": "^1.36.18",
+    "@certd/basic": "^1.36.19",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
@@ -32,5 +32,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93"
+  "gitHead": "6d8981479517b5de9634e242c1ebf22e70527ec4"
 }

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

@@ -1,7 +1,7 @@
 import { CoreV1Api, KubeConfig, NetworkingV1Api, V1Ingress, V1Secret } from "@kubernetes/client-node";
 import dns from "dns";
 import { ILogger } from "@certd/basic";
-import _ from "lodash-es";
+import { merge } from "lodash-es";
 
 export type K8sClientOpts = {
   kubeConfigStr: string;
@@ -85,7 +85,6 @@ export class K8sClient {
   /**
    * 创建Secret
    * @param opts {namespace:default, body:yamlStr}
-   * @returns {Promise<*>}
    */
   async createSecret(opts: { namespace: string; body: V1Secret }) {
     const namespace = opts.namespace || "default";
@@ -119,7 +118,13 @@ export class K8sClient {
         this.logger.warn(`secret ${secretName} 不存在`);
         if (opts.createOnNotFound) {
           //没有找到，则创建
-          const res = await this.createSecret({ namespace, body: opts.body });
+          const body = merge(
+            {
+              type: "kubernetes.io/tls",
+            },
+            opts.body
+          );
+          const res = await this.createSecret({ namespace, body });
           this.logger.info(`secret ${secretName} 已创建`);
           return res;
         }
@@ -127,7 +132,7 @@ export class K8sClient {
       throw e;
     }
 
-    const newSecret = _.merge(oldSecret.body, opts.body);
+    const newSecret = merge(oldSecret.body, opts.body);
     const res = await this.client.replaceNamespacedSecret(secretName, namespace, newSecret);
     this.logger.info(`secret ${secretName} 已更新`);
     return res.body;
@@ -161,7 +166,7 @@ export class K8sClient {
     this.logger.info("patch ingress:", ingressName, namespace);
     const client = this.kubeconfig.makeApiClient(NetworkingV1Api);
     const oldIngress = await client.readNamespacedIngress(ingressName, namespace);
-    const newIngress = _.merge(oldIngress.body, opts.body);
+    const newIngress = merge(oldIngress.body, opts.body);
     const res = await client.replaceNamespacedIngress(ingressName, namespace, newIngress);
     this.logger.info("ingress patched", opts.body);
     return res;

packages/libs/lib-server/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
+
+**Note:** Version bump only for package @certd/lib-server
+
 ## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
 
 **Note:** Version bump only for package @certd/lib-server

packages/libs/lib-server/package.json

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

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

@@ -1,8 +1,9 @@
 import { SysSettingsEntity } from './system/index.js';
 import { AccessEntity } from './user/access/entity/access.js';
+import { AddonEntity } from "./user/index.js";
 export * from './basic/index.js';
 export * from './system/index.js';
 export * from './user/index.js';
 export { LibServerConfiguration as Configuration } from './configuration.js';
 
-export const libServerEntities = [SysSettingsEntity, AccessEntity];
+export const libServerEntities = [SysSettingsEntity, AccessEntity,AddonEntity];

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

@@ -30,6 +30,13 @@ export class SysPublicSettings extends BaseSettings {
   mpsNo?: string;
   robots?: boolean = true;
   aiChatEnabled = true;
+
+
+  //验证码是否开启
+  captchaEnabled = false;
+  //验证码类型
+  captchaType?: string;
+  captchaAddonId?:number;
 }
 
 export class SysPrivateSettings extends BaseSettings {
@@ -207,4 +214,3 @@ export class SysSafeSetting extends BaseSettings {
   };
 }
 
-

packages/libs/lib-server/src/user/addon/api/api.ts

@@ -0,0 +1,96 @@
+import { HttpClient, ILogger, utils } from "@certd/basic";
+import {upperFirst} from "lodash-es";
+import { FormItemProps, PluginRequestHandleReq, Registrable } from "@certd/pipeline";
+
+
+export type AddonRequestHandleReqInput<T = any> = {
+  id?: number;
+  title?: string;
+  addon: T;
+};
+
+export type AddonRequestHandleReq<T = any> = {
+  addonType: string;
+} &PluginRequestHandleReq<AddonRequestHandleReqInput<T>>;
+
+export type AddonInputDefine = FormItemProps & {
+  title: string;
+  required?: boolean;
+};
+export type AddonDefine = Registrable & {
+  addonType: string;
+  needPlus?: boolean;
+  input?: {
+    [key: string]: AddonInputDefine;
+  };
+};
+
+export type AddonInstanceConfig = {
+  id: number;
+  addonType: string;
+  type: string;
+  name: string;
+  userId: number;
+  setting: {
+    [key: string]: any;
+  };
+};
+
+
+
+export interface IAddon {
+  ctx: AddonContext;
+  [key: string]: any;
+}
+
+export type AddonContext = {
+  http: HttpClient;
+  logger: ILogger;
+  utils: typeof utils;
+};
+
+export abstract class BaseAddon implements IAddon {
+  define!: AddonDefine;
+  ctx!: AddonContext;
+  http!: HttpClient;
+  logger!: ILogger;
+
+
+
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  async onInstance() {}
+  setCtx(ctx: AddonContext) {
+    this.ctx = ctx;
+    this.http = ctx.http;
+    this.logger = ctx.logger;
+  }
+  setDefine = (define:AddonDefine) => {
+    this.define = define;
+  };
+
+  async onRequest(req:AddonRequestHandleReq) {
+    if (!req.action) {
+      throw new Error("action is required");
+    }
+
+    let methodName = req.action;
+    if (!req.action.startsWith("on")) {
+      methodName = `on${upperFirst(req.action)}`;
+    }
+
+    // @ts-ignore
+    const method = this[methodName];
+    if (method) {
+      // @ts-ignore
+      return await this[methodName](req.data);
+    }
+    throw new Error(`action ${req.action} not found`);
+  }
+
+}
+
+
+export interface IAddonGetter {
+  getById<T = any>(id: any): Promise<T>;
+  getCommonById<T = any>(id: any): Promise<T>;
+}

packages/libs/lib-server/src/user/addon/api/decorator.ts

@@ -0,0 +1,65 @@
+// src/decorator/memoryCache.decorator.ts
+import * as _ from "lodash-es";
+import { merge } from "lodash-es";
+import { addonRegistry } from "./registry.js";
+import { AddonContext, AddonDefine, AddonInputDefine } from "./api.js";
+import { Decorator } from "@certd/pipeline";
+
+// 提供一个唯一 key
+export const ADDON_CLASS_KEY = "pipeline:addon";
+export const ADDON_INPUT_KEY = "pipeline:addon:input";
+
+export function IsAddon(define: AddonDefine): ClassDecorator {
+  return (target: any) => {
+    target = Decorator.target(target);
+
+    const inputs: any = {};
+    const properties = Decorator.getClassProperties(target);
+    for (const property in properties) {
+      const input = Reflect.getMetadata(ADDON_INPUT_KEY, target, property);
+      if (input) {
+        inputs[property] = input;
+      }
+    }
+    _.merge(define, { input: inputs });
+    Reflect.defineMetadata(ADDON_CLASS_KEY, define, target);
+    target.define = define;
+    const key = `${define.addonType}:${define.name}`;
+    addonRegistry.register(key, {
+      define,
+      target: async () => {
+        return target;
+      },
+    });
+  };
+}
+
+export function AddonInput(input?: AddonInputDefine): PropertyDecorator {
+  return (target, propertyKey) => {
+    target = Decorator.target(target, propertyKey);
+    // const _type = Reflect.getMetadata("design:type", target, propertyKey);
+    Reflect.defineMetadata(ADDON_INPUT_KEY, input, target, propertyKey);
+  };
+}
+
+export async function newAddon(addonType:string,type: string, input: any, ctx: AddonContext) {
+ const key = `${addonType}:${type}`
+  const register = addonRegistry.get(key);
+  if (register == null) {
+    throw new Error(`${addonType} ${type} not found`);
+  }
+  // @ts-ignore
+  const pluginCls = await register.target();
+  // @ts-ignore
+  const plugin = new pluginCls();
+  merge(plugin, input);
+  if (!ctx) {
+    throw new Error("ctx is required");
+  }
+  plugin.setDefine(register.define);
+  plugin.setCtx(ctx);
+  await plugin.onInstance();
+  return plugin;
+}
+
+

packages/libs/lib-server/src/user/addon/api/index.ts

@@ -0,0 +1,3 @@
+export * from "./api.js";
+export * from "./registry.js";
+export * from "./decorator.js";

packages/libs/lib-server/src/user/addon/api/registry.ts

@@ -0,0 +1,3 @@
+import { createRegistry } from "@certd/pipeline";
+
+export const addonRegistry = createRegistry("addon");

packages/libs/lib-server/src/user/addon/entity/addon.ts

@@ -0,0 +1,44 @@
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+/**
+ */
+@Entity('cd_addon')
+export class AddonEntity {
+  @PrimaryGeneratedColumn()
+  id: number;
+  @Column({ name: 'user_id', comment: '用户id' })
+  userId: number;
+  @Column({ comment: '名称', length: 100 })
+  name: string;
+
+
+  @Column({ name: 'addon_type', comment: 'addon类型', length: 100 })
+  addonType: string;
+
+
+  @Column({ comment: '类型', length: 100 })
+  type: string;
+
+  @Column({ name: 'setting', comment: '设置', length: 10240, nullable: true })
+  setting: string;
+
+  @Column({ name: 'is_system', comment: '是否系统级别',  nullable: false, default: false })
+  isSystem: boolean;
+
+  @Column({ name: 'is_default', comment: '是否默认',  nullable: false, default: false })
+  isDefault: boolean;
+
+
+  @Column({
+    name: 'create_time',
+    comment: '创建时间',
+    default: () => 'CURRENT_TIMESTAMP',
+  })
+  createTime: Date;
+  @Column({
+    name: 'update_time',
+    comment: '修改时间',
+    default: () => 'CURRENT_TIMESTAMP',
+  })
+  updateTime: Date;
+}

packages/libs/lib-server/src/user/addon/index.ts

@@ -0,0 +1,5 @@
+export * from './api/index.js'
+export * from './entity/addon.js'
+export * from './service/addon-service.js'
+export * from './service/addon-getter.js'
+export * from './service/addon-sys-getter.js'

packages/libs/lib-server/src/user/addon/service/addon-getter.ts

@@ -0,0 +1,18 @@
+import { IAddonGetter } from "../api/index.js";
+
+export class AddonGetter implements IAddonGetter {
+  userId: number;
+  getter: <T>(id: any, userId?: number) => Promise<T>;
+  constructor(userId: number, getter: (id: any, userId: number) => Promise<any>) {
+    this.userId = userId;
+    this.getter = getter;
+  }
+
+  async getById<T = any>(id: any) {
+    return await this.getter<T>(id, this.userId);
+  }
+
+  async getCommonById<T = any>(id: any) {
+    return await this.getter<T>(id, 0);
+  }
+}

packages/libs/lib-server/src/user/addon/service/addon-service.ts

@@ -0,0 +1,231 @@
+import { Provide, Scope, ScopeEnum } from "@midwayjs/core";
+import { InjectEntityModel } from "@midwayjs/typeorm";
+import { In, Repository } from "typeorm";
+import { AddonDefine, BaseService, PageReq, PermissionException, ValidateException } from "../../../index.js";
+import { addonRegistry, newAddon } from "../api/index.js";
+import { AddonEntity } from "../entity/addon.js";
+import { http, logger, utils } from "@certd/basic";
+
+/**
+ * Addon
+ */
+@Provide()
+@Scope(ScopeEnum.Request, {allowDowngrade: true})
+export class AddonService extends BaseService<AddonEntity> {
+  @InjectEntityModel(AddonEntity)
+  repository: Repository<AddonEntity>;
+
+  //@ts-ignore
+  getRepository() {
+    return this.repository;
+  }
+
+  async page(pageReq: PageReq<AddonEntity>) {
+    const res = await super.page(pageReq);
+    res.records = res.records.map(item => {
+      return item;
+    });
+    return res;
+  }
+
+  async add(param) {
+    let oldEntity = null;
+    if (param._copyFrom){
+      oldEntity = await this.info(param._copyFrom);
+      if (oldEntity == null) {
+        throw new ValidateException('该Addon配置不存在,请确认是否已被删除');
+      }
+      if (oldEntity.userId  !== param.userId) {
+        throw new ValidateException('您无权查看该Addon配置');
+      }
+    }
+    if (!param.userId){
+      param.isSystem = true
+    }else{
+      param.isSystem = false
+    }
+    delete param._copyFrom
+    return await super.add(param);
+  }
+
+
+  /**
+   * 修改
+   * @param param 数据
+   */
+  async update(param) {
+    const oldEntity = await this.info(param.id);
+    if (oldEntity == null) {
+      throw new ValidateException('该Addon配置不存在,请确认是否已被删除');
+    }
+    return await super.update(param);
+  }
+
+  async getSimpleInfo(id: number) {
+    const entity = await this.info(id);
+    if (entity == null) {
+      throw new ValidateException('该Addon配置不存在,请确认是否已被删除');
+    }
+    return {
+      id: entity.id,
+      name: entity.name,
+      userId: entity.userId,
+      addonType: entity.addonType,
+      type: entity.type,
+    };
+  }
+
+  async getAddonById(id: any, checkUserId: boolean, userId?: number): Promise<any> {
+    const ctx = {
+      http: http,
+      logger: logger,
+      utils: utils,
+    };
+
+
+    if (!id){
+      //使用图片验证码
+      return await newAddon("captcha", "image", {},ctx);
+    }
+    const entity = await this.info(id);
+    if (entity == null) {
+      //使用图片验证码
+      return await newAddon("captcha", "image", {},ctx);
+    }
+    if (checkUserId) {
+      if (userId == null) {
+        throw new ValidateException('userId不能为空');
+      }
+      if (userId !== entity.userId) {
+        throw new PermissionException('您对该Addon无访问权限');
+      }
+    }
+
+    const setting =  JSON.parse(entity.setting ??"{}")
+    const input = {
+      id: entity.id,
+      ...setting,
+    };
+
+    return await newAddon(entity.addonType, entity.type, input,ctx);
+  }
+
+  async getById(id: any, userId: number): Promise<any> {
+    return await this.getAddonById(id, true, userId);
+  }
+
+
+  getDefineList(addonType: string) {
+    return addonRegistry.getDefineList();
+  }
+
+  getDefineByType(type: string,prefix?: string)  {
+    return addonRegistry.getDefine(type,prefix) as AddonDefine;
+  }
+
+
+  async getSimpleByIds(ids: number[], userId: any) {
+    if (ids.length === 0) {
+      return [];
+    }
+    if (!userId) {
+      return [];
+    }
+    return await this.repository.find({
+      where: {
+        id: In(ids),
+        userId,
+      },
+      select: {
+        id: true,
+        name: true,
+        addonType: true,
+        type: true,
+        userId:true,
+        isSystem: true,
+      },
+    });
+
+  }
+
+
+
+  async getDefault(userId: number,addonType: string): Promise<any> {
+    const res = await this.repository.findOne({
+      where: {
+        userId,
+        addonType
+      },
+      order: {
+        isDefault: 'DESC',
+      },
+    });
+    if (!res) {
+      return null;
+    }
+    return this.buildAddonInstanceConfig(res);
+  }
+
+  private buildAddonInstanceConfig(res: AddonEntity) {
+    const setting = JSON.parse(res.setting);
+    return {
+      id: res.id,
+      addonType: res.addonType,
+      type: res.type,
+      name: res.name,
+      userId: res.userId,
+      setting,
+    };
+  }
+
+  async setDefault(id: number, userId: number,addonType:string) {
+    if (!id) {
+      throw new ValidateException('id不能为空');
+    }
+    if (!userId) {
+      throw new ValidateException('userId不能为空');
+    }
+    await this.repository.update(
+      {
+        userId,
+        addonType
+      },
+      {
+        isDefault: false,
+      }
+    );
+    await this.repository.update(
+      {
+        id,
+        userId,
+        addonType
+      },
+      {
+        isDefault: true,
+      }
+    );
+  }
+
+  async getOrCreateDefault(opts:{addonType:string,type:string, inputs: any, userId: any}) {
+    const {addonType,type,inputs,userId} = opts;
+
+   const addonDefine =  this.getDefineByType( type,addonType)
+
+    const defaultConfig = await this.getDefault(userId,addonType);
+    if (defaultConfig) {
+      return defaultConfig;
+    }
+    const setting = {
+      ...inputs,
+    };
+    const res = await this.repository.save({
+      userId,
+      addonType,
+      type: type,
+      name: addonDefine.title,
+      setting: JSON.stringify(setting),
+      isDefault: true,
+    });
+    return this.buildAddonInstanceConfig(res);
+  }
+}

packages/libs/lib-server/src/user/addon/service/addon-sys-getter.ts

@@ -0,0 +1,17 @@
+import { IAccessService } from '@certd/pipeline';
+import { AddonService } from './addon-service.js';
+
+export class AddonSysGetter implements IAccessService {
+  addonService: AddonService;
+  constructor(addonService: AddonService) {
+    this.addonService = addonService;
+  }
+
+  async getById<T = any>(id: any) {
+    return await this.addonService.getById(id, 0);
+  }
+
+  async getCommonById<T = any>(id: any) {
+    return await this.addonService.getById(id, 0);
+  }
+}

packages/libs/lib-server/src/user/index.ts

@@ -1 +1,2 @@
 export * from './access/index.js';
+export * from './addon/index.js';

packages/libs/midway-flyway-js/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
 ## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
 
 **Note:** Version bump only for package @certd/midway-flyway-js

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

@@ -1,6 +1,6 @@
 {
   "name": "@certd/midway-flyway-js",
-  "version": "1.36.18",
+  "version": "1.36.19",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -46,5 +46,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93"
+  "gitHead": "6d8981479517b5de9634e242c1ebf22e70527ec4"
 }

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
+
+### Performance Improvements
+
+* 支持ssl.com证书颁发机构 ([27b6dfa](https://github.com/certd/certd/commit/27b6dfa4d2ab3bddd284c3a34511a72e1a513a4c))
+* 子域名托管说明 ([39a0223](https://github.com/certd/certd/commit/39a02235cf4416bb5bd1acd3831241efeaa2f602))
+
 ## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
 
 ### Performance Improvements

packages/plugins/plugin-cert/package.json

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

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

@@ -12,7 +12,7 @@ export class EabAccess extends BaseAccess {
     component: {
       placeholder: "kid / keyId",
     },
-    helper: "EAB KID， google的叫 keyId",
+    helper: "EAB KID， google的叫 keyId，ssl.com的叫Account/ACME Key",
     required: true,
     encrypt: true,
   })

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

@@ -50,7 +50,7 @@ export type CertInfo = {
   one?: string;
   p7b?: string;
 };
-export type SSLProvider = "letsencrypt" | "google" | "zerossl";
+export type SSLProvider = "letsencrypt" | "google" | "zerossl" | "sslcom";
 export type PrivateKeyType = "rsa_1024" | "rsa_2048" | "rsa_3072" | "rsa_4096" | "ec_256" | "ec_384" | "ec_521";
 type AcmeServiceOptions = {
   userContext: IContext;
@@ -329,8 +329,9 @@ export class AcmeService {
     isTest?: boolean;
     privateKeyType?: string;
     profile?: string;
+    preferredChain?: string;
   }): Promise<CertInfo> {
-    const { email, isTest, csrInfo, dnsProvider, domainsVerifyPlan, profile } = options;
+    const { email, isTest, csrInfo, dnsProvider, domainsVerifyPlan, profile, preferredChain } = options;
     const client: acme.Client = await this.getAcmeClient(email, isTest);
 
     let domains = options.domains;
@@ -373,6 +374,7 @@ export class AcmeService {
         commonName,
         ...csrInfo,
         altNames,
+        emailAddress: email,
       },
       privateKey
     );
@@ -403,6 +405,7 @@ export class AcmeService {
       },
       signal: this.options.signal,
       profile,
+      preferredChain,
     });
 
     const crtString = crt.toString();

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

@@ -28,7 +28,7 @@ export abstract class CertApplyBaseConvertPlugin extends AbstractTaskPlugin {
       "2、子域名被通配符包含的不要填写，例如：www.foo.com已经被*.foo.com包含，不要填写www.foo.com\n" +
       "3、泛域名只能通配*号那一级（*.foo.com的证书不能用于xxx.yyy.foo.com、不能用于foo.com）\n" +
       "4、输入一个，空格之后，再输入下一个 \n" +
-      "5、如果您配置了子域托管解析，请先[设置托管子域名](#/certd/pipeline/subDomain)",
+      "5、如果设置了子域托管解析（比如免费的二级域名托管在CF或者阿里云），请先[设置托管子域名](#/certd/pipeline/subDomain)",
   })
   domains!: string[];
 

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

@@ -221,10 +221,10 @@ export class CertReader {
     return `${prefix}_${domain}_${timeStr}.${suffix}`;
   }
 
-  buildCertName() {
+  buildCertName(prefix: string = "") {
     let domain = this.getMainDomain();
     domain = domain.replaceAll(".", "_").replaceAll("*", "_");
-    return `${domain}_${dayjs().format("YYYYMMDDHHmmssSSS")}`;
+    return `${prefix}_${domain}_${dayjs().format("YYYYMMDDHHmmssSSS")}`;
   }
 
   static appendTimeSuffix(name?: string) {

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

@@ -89,6 +89,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
         { value: "letsencrypt", label: "Let's Encrypt", icon: "simple-icons:letsencrypt" },
         { value: "google", label: "Google", icon: "flat-color-icons:google" },
         { value: "zerossl", label: "ZeroSSL", icon: "emojione:digit-zero" },
+        { value: "sslcom", label: "SSL.com（仅主域名和www免费）", icon: "la:expeditedssl" },
       ],
     },
     helper: "Let's Encrypt：申请最简单\nGoogle：大厂光环，兼容性好，仅首次需要翻墙获取EAB授权\nZeroSSL：需要EAB授权，无需翻墙",
@@ -104,7 +105,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
     mergeScript: `
     return {
       show: ctx.compute(({form})=>{
-          return form.challengeType === 'dns' 
+          return form.challengeType === 'dns'
       }),
       component:{
         onSelectedChange: ctx.compute(({form})=>{
@@ -137,7 +138,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
         })
       },
       show: ctx.compute(({form})=>{
-          return form.challengeType === 'dns' 
+          return form.challengeType === 'dns'
       })
     }
     `,
@@ -194,6 +195,13 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
   })
   zerosslCommonEabAccessId!: number;
 
+  @TaskInput({
+    title: "SSL.com公共EAB授权",
+    isSys: true,
+    show: false,
+  })
+  sslcomCommonEabAccessId!: number;
+
   @TaskInput({
     title: "EAB授权",
     component: {
@@ -203,11 +211,16 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
     maybeNeed: true,
     required: false,
     helper:
-      "需要提供EAB授权\nZeroSSL：请前往[zerossl开发者中心](https://app.zerossl.com/developer),生成 'EAB Credentials'\n Google:请查看[google获取eab帮助文档](https://certd.docmirror.cn/guide/use/google/)，用过一次后会绑定邮箱，后续复用EAB要用同一个邮箱",
+      "需要提供EAB授权" +
+      "\nZeroSSL：请前往[zerossl开发者中心](https://app.zerossl.com/developer),生成 'EAB Credentials'" +
+      "\nGoogle:请查看[google获取eab帮助文档](https://certd.docmirror.cn/guide/use/google/)，用过一次后会绑定邮箱，后续复用EAB要用同一个邮箱" +
+      "\nSSL.com:[SSL.com账号页面](https://secure.ssl.com/account),然后点击api credentials链接，然后点击编辑按钮，查看Secret key和HMAC key",
     mergeScript: `
     return {
         show: ctx.compute(({form})=>{
-            return (form.sslProvider === 'zerossl' && !form.zerosslCommonEabAccessId) || (form.sslProvider === 'google' && !form.googleCommonEabAccessId)
+            return (form.sslProvider === 'zerossl' && !form.zerosslCommonEabAccessId)
+            || (form.sslProvider === 'google' && !form.googleCommonEabAccessId)
+            || (form.sslProvider === 'sslcom' && !form.sslcomCommonEabAccessId)
         })
     }
     `,
@@ -279,6 +292,29 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
   })
   certProfile!: string;
 
+  @TaskInput({
+    title: "首选链",
+    value: "ISRG Root X1",
+    component: {
+      name: "a-select",
+      vModel: "value",
+      options: [
+        { value: "ISRG Root X1", label: "ISRG Root X1" },
+        { value: "ISRG Root X2", label: "ISRG Root X2" },
+      ],
+    },
+    helper: "仅 Let's Encrypt 可选，默认为 ISRG Root X1",
+    required: false,
+    mergeScript: `
+    return {
+        show: ctx.compute(({form})=>{
+            return form.sslProvider === 'letsencrypt'
+        })
+    }
+    `,
+  })
+  preferredChain!: string;
+
   @TaskInput({
     title: "使用代理",
     value: false,
@@ -339,8 +375,8 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
   async onInit() {
     let eab: EabAccess = null;
 
-    if (this.sslProvider === "google") {
-      if (this.googleAccessId) {
+    if (this.sslProvider !== "letsencrypt") {
+      if (this.sslProvider === "google" && this.googleAccessId) {
         this.logger.info("当前正在使用 google服务账号授权获取EAB");
         const googleAccess = await this.getAccess(this.googleAccessId);
         const googleClient = new GoogleClient({
@@ -348,24 +384,19 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
           logger: this.logger,
         });
         eab = await googleClient.getEab();
-      } else if (this.eabAccessId) {
-        this.logger.info("当前正在使用 google EAB授权");
-        eab = await this.getAccess(this.eabAccessId);
-      } else if (this.googleCommonEabAccessId) {
-        this.logger.info("当前正在使用 google 公共EAB授权");
-        eab = await this.getAccess(this.googleCommonEabAccessId, true);
       } else {
-        throw new Error("google需要配置EAB授权或服务账号授权");
-      }
-    } else if (this.sslProvider === "zerossl") {
-      if (this.eabAccessId) {
-        this.logger.info("当前正在使用 zerossl EAB授权");
-        eab = await this.getAccess(this.eabAccessId);
-      } else if (this.zerosslCommonEabAccessId) {
-        this.logger.info("当前正在使用 zerossl 公共EAB授权");
-        eab = await this.getAccess(this.zerosslCommonEabAccessId, true);
-      } else {
-        throw new Error("zerossl需要配置EAB授权");
+        const getEab = async (type: string) => {
+          if (this.eabAccessId) {
+            this.logger.info(`当前正在使用 ${type} EAB授权`);
+            eab = await this.getAccess(this.eabAccessId);
+          } else if (this[`${type}CommonEabAccessId`]) {
+            this.logger.info(`当前正在使用 ${type} 公共EAB授权`);
+            eab = await this.getAccess(this[`${type}CommonEabAccessId`], true);
+          } else {
+            throw new Error(`${type}需要配置EAB授权`);
+          }
+        };
+        await getEab(this.sslProvider);
       }
     }
     this.eab = eab;
@@ -397,12 +428,12 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
 
     const csrInfo = _.merge(
       {
-        country: "CN",
-        state: "GuangDong",
-        locality: "ShengZhen",
-        organization: "CertD Org.",
-        organizationUnit: "IT Department",
-        emailAddress: email,
+        // country: "CN",
+        // state: "GuangDong",
+        // locality: "ShengZhen",
+        // organization: "CertD Org.",
+        // organizationUnit: "IT Department",
+        // emailAddress: email,
       },
       this.csrInfo ? JSON.parse(this.csrInfo) : {}
     );
@@ -430,6 +461,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
         isTest: false,
         privateKeyType: this.privateKeyType,
         profile: this.certProfile,
+        preferredChain: this.preferredChain,
       });
 
       const certInfo = this.formatCerts(cert);

packages/plugins/plugin-lib/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
+
+### Performance Improvements
+
+* ssh 增加超时断开连接，默认10分钟超时 ([c24a040](https://github.com/certd/certd/commit/c24a040c19cacafc79228d7a7649af93837d94a1))
+
 ## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
 
 ### Performance Improvements

packages/plugins/plugin-lib/package.json

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

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

@@ -64,6 +64,22 @@ export class SshAccess extends BaseAccess {
   })
   passphrase!: string;
 
+  @AccessInput({
+    title: "脚本类型",
+    helper: "bash 、sh 、fish",
+    component: {
+      name: "a-select",
+      vModel: "value",
+      options: [
+        { value: "default", label: "默认" },
+        { value: "sh", label: "sh" },
+        { value: "bash", label: "bash" },
+        { value: "fish", label: "fish(不支持set -e)" },
+      ],
+    },
+  })
+  scriptType: string;
+
   @AccessInput({
     title: "伪终端",
     helper: "如果登录报错：all authentication methods failed，可以尝试开启伪终端模式进行keyboard-interactive方式登录\n开启后对日志输出有一定的影响",
@@ -86,6 +102,15 @@ export class SshAccess extends BaseAccess {
   })
   socksProxy!: string;
 
+  @AccessInput({
+    title: "超时时间",
+    helper: "执行命令的超时时间，单位秒,默认30分钟",
+    component: {
+      name: "a-input-number",
+    },
+  })
+  timeout: number;
+
   @AccessInput({
     title: "是否Windows",
     helper: "如果是Windows主机，请勾选此项\n并且需要windows[安装OpenSSH](https://certd.docmirror.cn/guide/use/host/windows.html)",
@@ -136,9 +161,10 @@ export class SshAccess extends BaseAccess {
     const { SshClient } = await import("./ssh.js");
     const client = new SshClient(this.ctx.logger);
 
+    const script = ["echo hello", "exit"];
     await client.exec({
       connectConf: this,
-      script: "echo hello",
+      script: script,
     });
     return "ok";
   }

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

@@ -469,7 +469,8 @@ export class SshClient {
 
   async isCmd(conn: AsyncSsh2Client) {
     const spec = await conn.exec("echo %COMSPEC% ");
-    if (spec.toString().trim() === "%COMSPEC%") {
+    const ret = spec.toString().trim();
+    if (ret.includes("%COMSPEC%") && !ret.includes("echo %COMSPEC%")) {
       return false;
     } else {
       return true;
@@ -542,8 +543,16 @@ export class SshClient {
           }
         }
 
-        if (isLinux && options.stopOnError !== false) {
-          script = "set -e\n" + script;
+        if (isLinux) {
+          if (options.connectConf.scriptType == "bash") {
+            script = "#!/usr/bin/env bash \n" + script;
+          } else if (options.connectConf.scriptType == "sh") {
+            script = "#!/bin/sh\n" + script;
+          }
+
+          if (options.connectConf.scriptType != "fish" && options.stopOnError !== false) {
+            script = "set -e\n" + script;
+          }
         }
 
         return await conn.exec(script as string, { throwOnStdErr });
@@ -587,10 +596,15 @@ export class SshClient {
       }
       throw e;
     }
-
+    let timeoutId = null;
     try {
+      timeoutId = setTimeout(() => {
+        this.logger.info("执行超时，断开连接");
+        conn.end();
+      }, 1000 * (connectConf.timeout || 1800));
       return await callable(conn);
     } finally {
+      clearTimeout(timeoutId);
       conn.end();
     }
   }

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

@@ -76,9 +76,26 @@ export class TencentSslClient {
     return res;
   }
 
-  async DescribeCertificates(params: any) {
+  async DescribeHostUploadUpdateRecordDetail(params: any) {
     const client = await this.getSslClient();
-    const res = await client.DescribeCertificates(params);
+    const res = await client.request("DescribeHostUploadUpdateRecordDetail", params);
+    this.checkRet(res);
+    return res;
+  }
+
+  async UploadUpdateCertificateInstance(params: any) {
+    const client = await this.getSslClient();
+    const res = await client.request("UploadUpdateCertificateInstance", params);
+    this.checkRet(res);
+    return res;
+  }
+
+  async DescribeCertificates(params: { Limit?: number; Offset?: number; SearchKey?: string }) {
+    const client = await this.getSslClient();
+    const res = await client.DescribeCertificates({
+      ExpirationSort: "ASC",
+      ...params,
+    });
     this.checkRet(res);
     return res;
   }

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
+
+### Bug Fixes
+
+* 修复批量流水线执行时日志显示错乱的问题 ([4372adc](https://github.com/certd/certd/commit/4372adc703b9a4c785664054ab2a533626d815a8))
+* 修复远程数据选择无法过滤的bug ([6cbb073](https://github.com/certd/certd/commit/6cbb0739f8428d51b0712f718fe4d236cc087cf9))
+* 修复mysql下购买套餐加量包无效的bug ([c26ad4c](https://github.com/certd/certd/commit/c26ad4c8075f0606d45b8da13915737968d6191a))
+
+### Performance Improvements
+
+* 创建证书时支持选择通知时机 ([0e96bfd](https://github.com/certd/certd/commit/0e96bfdfa377824d204e72923d1176408ae6b300))
+* 商业版隐藏文档相关链接 ([4443a1c](https://github.com/certd/certd/commit/4443a1c0308fa6b95a05efd73d15d24b65d641c9))
+* 商业版隐藏文档相关链接 ([db89561](https://github.com/certd/certd/commit/db8956148083bc4f988226ccf719940d08158a27))
+* 支持根据id更新证书（证书Id不变接口），不过该接口为白名单功能，普通腾讯云账户无法使用 ([fe9c4f3](https://github.com/certd/certd/commit/fe9c4f3391ff07c01dd9a252225f69a129c39050))
+* 子域名托管说明 ([39a0223](https://github.com/certd/certd/commit/39a02235cf4416bb5bd1acd3831241efeaa2f602))
+
 ## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
 
 ### Bug Fixes

packages/ui/certd-client/index.html

@@ -23,5 +23,6 @@
 
 </div>
 <script type="module" src="/src/main.ts"></script>
+<script src="https://static.geetest.com/v4/gt4.js"></script>
 </body>
 </html>

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.36.18",
+  "version": "1.36.19",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -103,8 +103,8 @@
     "zod-defaults": "^0.1.3"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.36.18",
-    "@certd/pipeline": "^1.36.18",
+    "@certd/lib-iframe": "^1.36.19",
+    "@certd/pipeline": "^1.36.19",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

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

@@ -0,0 +1,50 @@
+<template>
+  <component :is="captchaComponent" v-if="settingStore.inited" ref="captchaRef" class="captcha_input" :captcha-get="getCaptcha" @change="onChange" />
+</template>
+<script setup lang="ts">
+import { ref, computed, defineAsyncComponent } from "vue";
+import { useSettingStore } from "/@/store/settings";
+import { nanoid } from "nanoid";
+import { request } from "/@/api/service";
+
+const captchaRef = ref(null);
+const settingStore = useSettingStore();
+
+const emits = defineEmits(["update:modelValue", "change"]);
+const captchaImpls = import.meta.glob("./captchas/*.vue");
+
+const captchaAddonId = computed(() => {
+  return settingStore.sysPublic.captchaAddonId ?? 0;
+});
+const captchaComponent = computed(() => {
+  let type = "image";
+  if (settingStore.sysPublic.captchaAddonId && settingStore.sysPublic.captchaType) {
+    type = settingStore.sysPublic.captchaType;
+  }
+  const componentName = `${type}_captcha`;
+  return defineAsyncComponent(captchaImpls[`./captchas/${componentName}.vue`]);
+});
+
+async function getCaptcha(): Promise<any> {
+  const randomStr = nanoid(10);
+  return await request({
+    url: `/basic/code/captcha/get?randomStr=${randomStr}`,
+    method: "post",
+    data: {
+      captchaAddonId: captchaAddonId.value,
+    },
+  });
+}
+
+function onChange(data) {
+  emits("update:modelValue", data);
+  emits("change", data);
+}
+
+async function getCaptchaForm() {
+  return await captchaRef.value.getCaptchaForm();
+}
+defineExpose({
+  getCaptchaForm,
+});
+</script>

packages/ui/certd-client/src/components/captcha/captchas/geetest_captcha.vue

@@ -0,0 +1,96 @@
+<template>
+  <div ref="captchaRef" class="geetest_captcha_wrapper"></div>
+</template>
+<script setup lang="ts">
+import { onMounted, defineProps, defineEmits, ref, onUnmounted } from "vue";
+import { useSettingStore } from "/@/store/settings";
+import { request } from "/src/api/service";
+import { notification } from "ant-design-vue";
+
+defineOptions({
+  name: "GeetestCaptcha",
+});
+const emit = defineEmits(["update:modelValue", "change"]);
+const props = defineProps<{
+  captchaGet: () => Promise<any>;
+}>();
+const captchaRef = ref(null);
+// const addonApi = createAddonApi();
+const settingStore = useSettingStore();
+
+const captchaInstanceRef = ref({});
+async function init() {
+  // if (!initGeetest4) {
+  //   await import("https://static.geetest.com/v4/gt4.js");
+  // }
+
+  const { captchaId } = await props.captchaGet();
+  // @ts-ignore
+  initGeetest4(
+    {
+      captchaId: captchaId,
+    },
+    (captcha: any) => {
+      // captcha为验证码实例
+      captcha.appendTo(captchaRef.value); // 调用appendTo将验证码插入到页的某一个元素中，这个元素用户可以自定义
+      captchaInstanceRef.value.instance = captcha;
+      captchaInstanceRef.value.captchaId = captchaId;
+    }
+  );
+}
+
+function getCaptchaForm() {
+  if (!captchaInstanceRef.value?.instance) {
+    // notification.error({
+    //   message: "验证码还未初始化",
+    // });
+    return false;
+  }
+  const result = captchaInstanceRef.value.instance.getValidate();
+  if (!result) {
+    // notification.error({
+    //   message: "请先完成验证码验证",
+    // });
+    return false;
+  }
+  result.captcha_id = captchaInstanceRef.value.captchaId;
+
+  return result;
+}
+
+const valueRef = ref(null);
+const timeoutId = setInterval(() => {
+  const form = getCaptchaForm();
+  if (form && valueRef.value != form) {
+    console.log("form", form);
+    valueRef.value = form;
+    emitChange(form);
+  }
+}, 1000);
+
+onUnmounted(() => {
+  clearTimeout(timeoutId);
+});
+
+function emitChange(value: string) {
+  emit("update:modelValue", value);
+  emit("change", value);
+}
+
+defineExpose({
+  getCaptchaForm,
+});
+
+onMounted(async () => {
+  await init();
+});
+</script>
+<style lang="less">
+.geetest_captcha_wrapper {
+  .geetest_captcha {
+    .geetest_holder {
+      width: 100%;
+    }
+  }
+}
+</style>

packages/ui/certd-client/src/components/captcha/captchas/image_captcha.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="flex">
+    <a-input :value="valueRef" placeholder="请输入图片验证码" autocomplete="off" @update:value="onChange">
+      <template #prefix>
+        <fs-icon icon="ion:image-outline"></fs-icon>
+      </template>
+    </a-input>
+    <div class="input-right pointer" title="点击刷新">
+      <img class="image-code" :src="imageCodeSrc" @click="resetImageCode" />
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import { defineEmits, defineExpose, defineProps, ref } from "vue";
+import { nanoid } from "nanoid";
+
+const props = defineProps<{
+  captchaGet?: () => Promise<any>;
+}>();
+defineOptions({
+  name: "ImageCaptcha",
+});
+const emit = defineEmits(["update:modelValue", "change"]);
+
+const valueRef = ref("");
+const randomStrRef = ref();
+const imageCodeSrc = ref();
+async function resetImageCode() {
+  const res = await props.captchaGet();
+  randomStrRef.value = res.randomStr;
+  valueRef.value = "";
+  emitChange(null);
+  imageCodeSrc.value = "data:image/svg+xml," + encodeURIComponent(res.imageData);
+}
+
+function getCaptchaForm() {
+  return {
+    imageCode: valueRef.value,
+    randomStr: randomStrRef.value,
+  };
+}
+defineExpose({
+  resetImageCode,
+  getCaptchaForm,
+});
+
+resetImageCode();
+
+function onChange(value: string) {
+  valueRef.value = value;
+  const form = getCaptchaForm();
+  emitChange(form);
+}
+
+function emitChange(value) {
+  emit("update:modelValue", value);
+  emit("change", value);
+}
+</script>

packages/ui/certd-client/src/components/plugins/common/remote-auto-complete.vue

@@ -66,7 +66,7 @@ const getOptions = async () => {
   const input = (pluginType === "plugin" ? form?.input : form) || {};
 
   for (let key in define.input) {
-    const inWatches = props.watches.includes(key);
+    const inWatches = props.watches?.includes(key);
     const inputDefine = define.input[key];
     if (inWatches && inputDefine.required) {
       const value = input[key];

packages/ui/certd-client/src/components/plugins/common/remote-select.vue

@@ -105,7 +105,7 @@ const getOptions = async () => {
   const input = (pluginType === "plugin" ? form?.input : form) || {};
 
   for (let key in define.input) {
-    const inWatches = props.watches.includes(key);
+    const inWatches = props.watches?.includes(key);
     const inputDefine = define.input[key];
     if (inWatches && inputDefine.required) {
       const value = input[key];
@@ -169,7 +169,7 @@ const getOptions = async () => {
 };
 
 const filterOption = (input: string, option: any) => {
-  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 || String(option.value).toLowerCase().indexOf(input.toLowerCase());
+  return option.label.toLowerCase().includes(input.toLowerCase()) || String(option.value).toLowerCase().includes(input.toLowerCase());
 };
 
 async function onClick() {

packages/ui/certd-client/src/components/plugins/common/remote-tree-select.vue

@@ -0,0 +1,191 @@
+<template>
+  <div class="remote-select">
+    <div class="flex flex-row">
+      <a-tree-select class="remote-tree-select-input" :tree-data="optionsRef" :value="value" tree-checkable allow-clear v-bind="attrs" @click="onClick" @update:value="emit('update:value', $event)"> </a-tree-select>
+      <div class="ml-5">
+        <fs-button :loading="loading" title="刷新选项" icon="ion:refresh-outline" @click="refreshOptions"></fs-button>
+      </div>
+    </div>
+    <div class="helper" :class="{ error: hasError }">
+      {{ message }}
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
+import { defineComponent, inject, ref, useAttrs, watch, Ref } from "vue";
+import { PluginDefine } from "@certd/pipeline";
+
+defineOptions({
+  name: "RemoteTreeSelect",
+});
+
+const props = defineProps<
+  {
+    watches: string[];
+    search?: boolean;
+    pager?: boolean;
+  } & ComponentPropsType
+>();
+
+const emit = defineEmits<{
+  "update:value": any;
+}>();
+
+const attrs = useAttrs();
+
+const getCurrentPluginDefine: any = inject("getCurrentPluginDefine", () => {
+  return {};
+});
+const getScope: any = inject("get:scope", () => {
+  return {};
+});
+const getPluginType: any = inject("get:plugin:type", () => {
+  return "plugin";
+});
+
+const searchKeyRef = ref("");
+const optionsRef = ref([]);
+const message = ref("");
+const hasError = ref(false);
+const loading = ref(false);
+const pagerRef: Ref = ref({
+  current: 1,
+});
+const getOptions = async () => {
+  if (loading.value) {
+    return;
+  }
+
+  if (!getCurrentPluginDefine) {
+    return;
+  }
+
+  const define: PluginDefine = getCurrentPluginDefine()?.value;
+  if (!define) {
+    return;
+  }
+  const pluginType = getPluginType();
+  const { form } = getScope();
+  const input = (pluginType === "plugin" ? form?.input : form) || {};
+
+  for (let key in define.input) {
+    const inWatches = props.watches?.includes(key);
+    const inputDefine = define.input[key];
+    if (inWatches && inputDefine.required) {
+      const value = input[key];
+      if (value == null || value === "") {
+        console.log("remote-select required", key);
+        return;
+      }
+    }
+  }
+
+  message.value = "";
+  hasError.value = false;
+  loading.value = true;
+  const pageNo = pagerRef.value.pageNo;
+  const pageSize = pagerRef.value.pageSize;
+  try {
+    const res = await doRequest(
+      {
+        type: pluginType,
+        typeName: form.type,
+        action: props.action,
+        input,
+        data: {
+          searchKey: props.search ? searchKeyRef.value : "",
+          pageNo,
+          pageSize,
+        },
+      },
+      {
+        onError(err: any) {
+          hasError.value = true;
+          message.value = `获取选项出错：${err.message}`;
+        },
+        showErrorNotify: false,
+      }
+    );
+    const list = res?.list || res || [];
+    if (list.length > 0) {
+      message.value = "获取数据成功，请从下拉框中选择";
+    } else {
+      message.value = "获取数据成功，没有数据";
+    }
+    optionsRef.value = list;
+    pagerRef.value.total = list.length;
+    if (props.pager) {
+      if (res.pageNo != null) {
+        pagerRef.value.pageNo = res.pageNo ?? 1;
+      }
+      if (res.pageSize != null) {
+        pagerRef.value.pageSize = res.pageSize ?? 100;
+      }
+      if (res.total != null) {
+        pagerRef.value.total = res.total ?? list.length;
+      }
+    }
+
+    return res;
+  } finally {
+    loading.value = false;
+  }
+};
+
+async function onClick() {
+  if (optionsRef.value?.length === 0) {
+    await refreshOptions();
+  }
+}
+
+async function refreshOptions() {
+  await getOptions();
+}
+
+async function doSearch() {
+  pagerRef.value.pageNo = 1;
+  await refreshOptions();
+}
+
+watch(
+  () => {
+    const pluginType = getPluginType();
+    const { form, key } = getScope();
+    const input = (pluginType === "plugin" ? form?.input : form) || {};
+    const watches = {};
+    for (const key of props.watches) {
+      //@ts-ignore
+      watches[key] = input[key];
+    }
+    return {
+      form: watches,
+      key,
+    };
+  },
+  async (value, oldValue) => {
+    const { form } = value;
+    const oldForm: any = oldValue?.form;
+    let changed = oldForm == null || optionsRef.value.length == 0;
+    for (const key of props.watches) {
+      //@ts-ignore
+      if (oldForm && form[key] != oldForm[key]) {
+        changed = true;
+        break;
+      }
+    }
+    if (changed) {
+      await getOptions();
+    }
+  },
+  {
+    immediate: true,
+  }
+);
+
+async function onPageChange(current: any) {
+  await refreshOptions();
+}
+</script>
+
+<style lang="less"></style>

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

@@ -2,6 +2,7 @@ import SynologyIdDeviceGetter from "./synology/device-id-getter.vue";
 import RemoteAutoComplete from "./common/remote-auto-complete.vue";
 import RemoteSelect from "./common/remote-select.vue";
 import RemoteInput from "./common/remote-input.vue";
+import RemoteTreeSelect from "./common/remote-tree-select.vue";
 import CertDomainsGetter from "./common/cert-domains-getter.vue";
 import OutputSelector from "/@/components/plugins/common/output-selector/index.vue";
 import DnsProviderSelector from "/@/components/plugins/cert/dns-provider-selector/index.vue";
@@ -24,6 +25,7 @@ export default {
     app.component("SynologyDeviceIdGetter", SynologyIdDeviceGetter);
     app.component("RemoteAutoComplete", RemoteAutoComplete);
     app.component("RemoteSelect", RemoteSelect);
+    app.component("RemoteTreeSelect", RemoteTreeSelect);
     app.component("RemoteInput", RemoteInput);
     app.component("CertDomainsGetter", CertDomainsGetter);
     app.component("InputPassword", InputPassword);

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

@@ -21,6 +21,7 @@ export default {
     pipeline: "Pipeline",
     domain: "Domain",
     deployTimes: "Deployments",
+    monitorCount: "DomainMonitors",
     duration: "Duration",
     price: "Price",
     paymentMethod: "Payment Method",
@@ -218,6 +219,7 @@ export default {
     triggerCronHelper:
       "Click the button above to choose a daily execution time.\nIt is recommended to trigger once per day. The task will be skipped if the certificate has not expired and will not be executed repeatedly.",
     notificationTitle: "Failure Notification",
+    notificationWhen: "Notification Timing",
     notificationHelper: "Get real-time alerts when the task fails",
     groupIdTitle: "Pipeline Group",
   },
@@ -709,6 +711,10 @@ export default {
     setting: {
       showRunStrategy: "Show RunStrategy",
       showRunStrategyHelper: "Allow modify the run strategy of the task",
+
+      captchaEnabled: "Enable Login Captcha",
+      captchaHelper: "Whether to enable captcha verification for login",
+      captchaType: "Captcha Type",
     },
   },
   modal: {
@@ -729,4 +735,8 @@ export default {
     challengeSetting: "Challenge Setting",
     gotoCnameTip: "Please go to CNAME Record Page",
   },
+  addonSelector: {
+    select: "Select",
+    placeholder: "select please",
+  },
 };

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

@@ -25,6 +25,7 @@ export default {
     pipeline: "流水线",
     domain: "域名",
     deployTimes: "部署次数",
+    monitorCount: "域名监控数",
     duration: "时长",
     price: "价格",
     paymentMethod: "支付方式",
@@ -223,6 +224,7 @@ export default {
     triggerCronTitle: "定时触发",
     triggerCronHelper: "点击上面的按钮，选择每天几点定时执行。\n建议设置为每天触发一次，证书未到期之前任务会跳过，不会重复执行",
     notificationTitle: "失败通知",
+    notificationWhen: "通知时机",
     notificationHelper: "任务执行失败实时提醒",
     groupIdTitle: "流水线分组",
   },
@@ -712,6 +714,10 @@ export default {
     setting: {
       showRunStrategy: "显示运行策略选择",
       showRunStrategyHelper: "任务设置中是否允许选择运行策略",
+
+      captchaEnabled: "启用登录验证码",
+      captchaHelper: "登录时是否启用验证码",
+      captchaType: "验证码类型",
     },
   },
   modal: {
@@ -732,4 +738,8 @@ export default {
     challengeSetting: "校验配置",
     gotoCnameTip: "CNAME域名配置请前往CNAME记录页面添加",
   },
+  addonSelector: {
+    select: "选择",
+    placeholder: "请选择",
+  },
 };

packages/ui/certd-client/src/plugin/directive/comm-show.ts

@@ -0,0 +1,12 @@
+import { useSettingStore } from "/@/store/settings";
+
+export default {
+  mounted(el: any, binding: any, vnode: any) {
+    const settingStore = useSettingStore();
+    const isComm = settingStore.isComm;
+    const { value } = binding;
+    if ((value === false && isComm) || (value === true && !isComm)) {
+      el.parentNode && el.parentNode.removeChild(el);
+    }
+  },
+};

packages/ui/certd-client/src/plugin/directive/index.ts

@@ -0,0 +1,8 @@
+import comm from "./comm-show.js";
+const install = function (app: any) {
+  app.directive("comm", comm);
+};
+
+export default {
+  install,
+};

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

@@ -4,9 +4,12 @@ import FastCrud from "./fast-crud";
 import permission from "./permission";
 import { App } from "vue";
 import "./validator/index.js";
+import directives from "./directive/index";
+
 function install(app: App, options: any = {}) {
   app.use(FastCrud, options);
   app.use(permission);
+  app.use(directives);
 }
 
 export default {

packages/ui/certd-client/src/store/plugin/index.ts

@@ -167,7 +167,7 @@ export const usePluginStore = defineStore({
     },
     async clear() {
       this.group = null;
-      this.originGroup = null
+      this.originGroup = null;
     },
     async getList(): Promise<PluginDefine[]> {
       await this.init();

packages/ui/certd-client/src/store/settings/api.basic.ts

@@ -46,6 +46,10 @@ export type SysPublicSetting = {
   aiChatEnabled?: boolean;
 
   showRunStrategy?: boolean;
+
+  captchaEnabled?: boolean;
+  captchaType?: number;
+  captchaAddonId?: number;
 };
 export type SuiteSetting = {
   enabled?: boolean;

packages/ui/certd-client/src/store/settings/index.ts

@@ -12,6 +12,7 @@ import { utils } from "/@/utils";
 import { cloneDeep, merge } from "lodash-es";
 import { useI18n } from "/src/locales";
 export interface SettingState {
+  skipReset?: boolean; // 注销登录时，不清空此store的状态
   sysPublic?: SysPublicSetting;
   installInfo?: {
     siteId: string;
@@ -64,6 +65,7 @@ const defaultSiteInfo: SiteInfo = {
 export const useSettingStore = defineStore({
   id: "app.setting",
   state: (): SettingState => ({
+    skipReset: true,
     plusInfo: {
       isPlus: false,
       vipType: "free",

packages/ui/certd-client/src/vben/stores/setup.ts

@@ -38,6 +38,9 @@ export function resetAllStores() {
   }
   const allStores = (pinia as any)._s;
   for (const [_key, store] of allStores) {
+    if (store.skipReset) {
+      continue;
+    }
     store.$reset();
   }
 }

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

@@ -0,0 +1,178 @@
+<template>
+  <div class="addon-selector">
+    <div class="flex-o w-100">
+      <!--      <fs-dict-select class="flex-1" :value="modelValue" :dict="optionsDictRef" :disabled="disabled" :render-label="renderLabel" :slots="selectSlots" :allow-clear="true" v-bind="select" @update:value="onChange" />-->
+      <span v-if="modelValue" class="mr-5 cd-flex-inline">
+        <a-tag class="mr-5" color="green">{{ target?.name || modelValue }}</a-tag>
+        <fs-icon class="cd-icon-button" icon="ion:close-circle-outline" @click="clear"></fs-icon>
+      </span>
+      <span v-else class="mlr-5 text-gray">{{ placeholder || t("certd.addonSelector.placeholder") }}</span>
+      <fs-table-select
+        ref="tableSelectRef"
+        class="flex-0"
+        :model-value="modelValue"
+        :dict="optionsDictRef"
+        :create-crud-options="createCrudOptionsWithApi"
+        :crud-options-override="{
+          search: { show: false },
+          table: {
+            scroll: {
+              x: 540,
+            },
+          },
+        }"
+        :show-current="false"
+        :show-select="false"
+        :dialog="{ width: 960 }"
+        :destroy-on-close="false"
+        height="400px"
+        v-bind="tableSelect"
+        @update:model-value="onChange"
+        @dialog-closed="doRefresh"
+      >
+        <template #default="scope">
+          <fs-button class="ml-5" :disabled="disabled" :size="size" type="primary" :text="t('certd.addonSelector.select')" @click="scope.open" />
+        </template>
+      </fs-table-select>
+    </div>
+  </div>
+</template>
+
+<script lang="tsx" setup>
+import { inject, ref, Ref, watch } from "vue";
+import { createAddonApi } from "../api";
+import { message } from "ant-design-vue";
+import { dict } from "@fast-crud/fast-crud";
+import createCrudOptions from "../crud";
+import { addonProvide } from "../common";
+import { useUserStore } from "/@/store/user";
+import { useI18n } from "/src/locales";
+
+const { t } = useI18n();
+
+defineOptions({
+  name: "AddonSelector",
+});
+
+const props = defineProps<{
+  modelValue?: number | string | number[] | string[];
+  type?: string;
+  placeholder?: string;
+  size?: string;
+  disabled?: boolean;
+  select?: any;
+  tableSelect?: any;
+  addonType: string;
+  from?: string;
+}>();
+
+const onChange = async (value: number) => {
+  await emitValue(value);
+};
+
+const emit = defineEmits(["update:modelValue", "selected-change", "change"]);
+
+const api = createAddonApi({
+  from: props.from,
+  addonType: props.addonType,
+});
+addonProvide(api);
+
+function createCrudOptionsWithApi(opts: any) {
+  opts.context = {
+    api,
+    addonType: props.addonType,
+  };
+  return createCrudOptions(opts);
+}
+
+const tableSelectRef = ref();
+const optionsDictRef = dict({
+  url: `/addon/options?addonType=${props.addonType}`,
+  value: "id",
+  label: "name",
+});
+
+const renderLabel = (option: any) => {
+  return <span>{option.name}</span>;
+};
+
+async function openTableSelectDialog() {
+  selectOpened.value = false;
+  await tableSelectRef.value.open({});
+  await tableSelectRef.value.crudExpose.openAdd({});
+}
+
+const selectOpened = ref(false);
+const selectSlots = ref({
+  dropdownRender({ menuNode, props }: any) {
+    const res = [];
+    res.push(menuNode);
+    // res.push(<a-divider style="margin: 4px 0" />);
+    // res.push(<a-space style="padding: 4px 8px" />);
+    // res.push(<fs-button class="w-100" type="text" icon="plus-outlined" text="新建通知渠道" onClick={openTableSelectDialog}></fs-button>);
+    return res;
+  },
+});
+
+const target: Ref<any> = ref({});
+
+function clear() {
+  if (props.disabled) {
+    return;
+  }
+  emitValue(null);
+}
+
+const userStore = useUserStore();
+
+async function emitValue(value: any) {
+  // target.value = optionsDictRef.dataMap[value];
+  const userId = userStore.userInfo.id;
+  if (pipeline?.value && pipeline.value.userId !== userId) {
+    message.error(`对不起，您不能修改他人流水线的${props.addonType}设置`);
+    return;
+  }
+  emit("change", value);
+  emit("update:modelValue", value);
+}
+
+async function refreshTarget(value: any) {
+  if (value > 0) {
+    target.value = await api.GetSimpleInfo(value);
+  } else {
+    target.value = {
+      //captchaType会监听此字段，给个默认值
+      type: "",
+    };
+  }
+}
+
+watch(
+  () => {
+    return props.modelValue;
+  },
+  async value => {
+    // await optionsDictRef.loadDict();
+    //@ts-ignore
+    await refreshTarget(value);
+    // target.value = optionsDictRef.dataMap[value];
+    emit("selected-change", target.value);
+  },
+  {
+    immediate: true,
+  }
+);
+
+//当不在pipeline中编辑时，可能为空
+const pipeline = inject("pipeline", null);
+
+async function doRefresh() {
+  await optionsDictRef.reloadDict();
+}
+</script>
+<style lang="less">
+.addon-selector {
+  width: 100%;
+}
+</style>

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

@@ -0,0 +1,129 @@
+import { request } from "/src/api/service";
+import { RequestHandleReq } from "/@/components/plugins/lib";
+
+export function createAddonApi(opts: { from: any; addonType: string }) {
+  let apiPrefix = "/addon";
+  if (opts.from === "sys") {
+    apiPrefix = "/sys/addon";
+  }
+  return {
+    async GetList(query: any) {
+      return await request({
+        url: apiPrefix + "/page",
+        method: "post",
+        data: {
+          ...query,
+          query: {
+            addonType: opts.addonType,
+            ...query.query,
+          },
+        },
+      });
+    },
+
+    async AddObj(obj: any) {
+      return await request({
+        url: apiPrefix + "/add",
+        method: "post",
+        data: {
+          ...obj,
+          addonType: opts.addonType,
+        },
+      });
+    },
+
+    async UpdateObj(obj: any) {
+      return await request({
+        url: apiPrefix + "/update",
+        method: "post",
+        data: obj,
+      });
+    },
+
+    async DelObj(id: number) {
+      return await request({
+        url: apiPrefix + "/delete",
+        method: "post",
+        params: { id },
+      });
+    },
+
+    async GetObj(id: number) {
+      return await request({
+        url: apiPrefix + "/info",
+        method: "post",
+        params: { id },
+      });
+    },
+
+    async GetOptions(id: number) {
+      return await request({
+        url: apiPrefix + `/options?addonType=${opts.addonType}`,
+        method: "post",
+      });
+    },
+
+    async SetDefault(id: number) {
+      return await request({
+        url: apiPrefix + "/setDefault",
+        method: "post",
+        params: { id },
+      });
+    },
+
+    async GetDefaultId() {
+      return await request({
+        url: apiPrefix + "/getDefaultId",
+        method: "post",
+      });
+    },
+
+    async GetSimpleInfo(id: number) {
+      return await request({
+        url: apiPrefix + `/simpleInfo?addonType=${opts.addonType}`,
+        method: "post",
+        params: { id },
+      });
+    },
+
+    async GetDefineTypes() {
+      return await request({
+        url: apiPrefix + `/getTypeDict?addonType=${opts.addonType}`,
+        method: "post",
+      });
+    },
+
+    async GetProviderDefine(type: string) {
+      return await request({
+        url: apiPrefix + `/define?addonType=${opts.addonType}`,
+        method: "post",
+        params: { type },
+      });
+    },
+
+    async GetProviderDefineByType(type: string) {
+      return await request({
+        url: apiPrefix + `/defineByType?addonType=${opts.addonType}`,
+        method: "post",
+        params: { type },
+      });
+    },
+
+    async Handle(req: RequestHandleReq, opts: any = {}) {
+      const url = `/handle/${req.type}?addonType=${opts.addonType}`;
+      const { typeName, action, data, input } = req;
+      const res = await request({
+        url,
+        method: "post",
+        data: {
+          typeName,
+          action,
+          data,
+          input,
+        },
+        ...opts,
+      });
+      return res;
+    },
+  };
+}

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

@@ -0,0 +1,270 @@
+import { ColumnCompositionProps, compute, dict } from "@fast-crud/fast-crud";
+import { computed, provide, ref, toRef } from "vue";
+import { useReference } from "/@/use/use-refrence";
+import { forEach, get, merge, set } from "lodash-es";
+import { Modal } from "ant-design-vue";
+import { mitter } from "/@/utils/util.mitt";
+import { useI18n } from "/src/locales";
+import * as pipelineApi from "/@/views/certd/pipeline/api";
+
+export function addonProvide(api: any) {
+  provide("addonApi", api);
+  provide("get:plugin:type", () => {
+    return "addon";
+  });
+}
+
+export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any, addonType: string) {
+  const { t } = useI18n();
+  // const addonTypeTypeDictRef = dict({
+  //   data: [{ value: "captcha", label: "验证码" }],
+  // });
+  const addonTypeDictRef = dict({
+    url: `/addon/getTypeDict?addonType=${addonType}`,
+  });
+  const defaultPluginConfig = {
+    component: {
+      name: "a-input",
+      vModel: "value",
+    },
+  };
+
+  function buildDefineFields(define: any, form: any, mode: string) {
+    const formWrapperRef = crudExpose.getFormWrapperRef();
+    const columnsRef = toRef(formWrapperRef.formOptions, "columns");
+
+    for (const key in columnsRef.value) {
+      if (key.indexOf(".") >= 0) {
+        delete columnsRef.value[key];
+      }
+    }
+    console.log('crudBinding.value[mode + "Form"].columns', columnsRef.value);
+    forEach(define.input, (value: any, mapKey: any) => {
+      const key = "body." + mapKey;
+      const field = {
+        ...value,
+        key,
+      };
+      const column = merge({ title: key }, defaultPluginConfig, field);
+      //eval
+      useReference(column);
+
+      if (column.required) {
+        if (!column.rules) {
+          column.rules = [];
+        }
+        column.rules.push({ required: true, message: t("certd.requiredField") });
+      }
+
+      //设置默认值
+      if (column.value != null && get(form, key) == null) {
+        set(form, key, column.value);
+      }
+      //字段配置赋值
+      columnsRef.value[key] = column;
+    });
+  }
+
+  const currentDefine = ref();
+
+  return {
+    id: {
+      title: "ID",
+      key: "id",
+      type: "number",
+      column: {
+        width: 100,
+      },
+      form: {
+        show: false,
+      },
+    },
+    // addonType: {
+    //   title: "Addon类型",
+    //   type: "dict-select",
+    //   dict: addonTypeTypeDictRef,
+    //   search: {
+    //     show: false,
+    //   },
+    //   column: {
+    //     width: 200,
+    //     component: {
+    //       color: "auto",
+    //     },
+    //   },
+    //   form: {
+    //     onChange(ctx: { value: any }) {
+    //       addonTypeDictRef.url = `/addon/getTypeDict?addonType=${ctx.value}`;
+    //     },
+    //   },
+    //   editForm: {
+    //     component: {
+    //       disabled: false,
+    //     },
+    //   },
+    // },
+    type: {
+      title: t("certd.notificationType"),
+      type: "dict-select",
+      dict: addonTypeDictRef,
+      search: {
+        show: false,
+      },
+      column: {
+        width: 200,
+        component: {
+          color: "auto",
+        },
+      },
+      editForm: {
+        component: {
+          disabled: false,
+        },
+      },
+      form: {
+        component: {
+          disabled: false,
+          showSearch: true,
+          filterOption: (input: string, option: any) => {
+            input = input?.toLowerCase();
+            return option.value.toLowerCase().indexOf(input) >= 0 || option.label.toLowerCase().indexOf(input) >= 0;
+          },
+          renderLabel(item: any) {
+            return (
+              <span class={"flex-o flex-between"}>
+                {item.label}
+                {item.needPlus && <fs-icon icon={"mingcute:vip-1-line"} className={"color-plus"}></fs-icon>}
+              </span>
+            );
+          },
+        },
+        rules: [{ required: true, message: t("certd.selectNotificationType") }],
+        valueChange: {
+          immediate: true,
+          async handle({ value, mode, form, immediate }) {
+            if (value == null) {
+              return;
+            }
+            const lastTitle = currentDefine.value?.title;
+            const define = await api.GetProviderDefine(value);
+            currentDefine.value = define;
+            console.log("define", define);
+
+            if (!immediate) {
+              form.body = {};
+              if (define.needPlus) {
+                mitter.emit("openVipModal");
+              }
+            }
+
+            if (!form.name || form.name === lastTitle) {
+              form.name = define.title;
+            }
+            buildDefineFields(define, form, mode);
+          },
+        },
+        helper: computed(() => {
+          const define = currentDefine.value;
+          if (define == null) {
+            return "";
+          }
+          return define.desc;
+        }),
+      },
+    } as ColumnCompositionProps,
+    name: {
+      title: t("certd.notificationName"),
+      search: {
+        show: true,
+      },
+      type: ["text"],
+      form: {
+        rules: [{ required: true, message: t("certd.enterName") }],
+        helper: t("certd.helperNotificationName"),
+      },
+      column: {
+        width: 200,
+      },
+    },
+    isDefault: {
+      title: t("certd.isDefault"),
+      type: "dict-switch",
+      dict: dict({
+        data: [
+          { label: t("certd.yes"), value: true, color: "success" },
+          { label: t("certd.no"), value: false, color: "default" },
+        ],
+      }),
+      form: {
+        value: false,
+        rules: [{ required: true, message: t("certd.selectIsDefault") }],
+        order: 999,
+      },
+      column: {
+        align: "center",
+        width: 100,
+        component: {
+          name: "a-switch",
+          vModel: "checked",
+          disabled: compute(({ value }) => {
+            return value === true;
+          }),
+          on: {
+            change({ row }) {
+              Modal.confirm({
+                title: t("certd.prompt"),
+                content: t("certd.confirmSetDefaultNotification"),
+                onOk: async () => {
+                  await api.SetDefault(row.id);
+                  await crudExpose.doRefresh();
+                },
+                onCancel: async () => {
+                  await crudExpose.doRefresh();
+                },
+              });
+            },
+          },
+        },
+      },
+    } as ColumnCompositionProps,
+    test: {
+      title: t("certd.test"),
+      form: {
+        show: compute(({ form }) => {
+          return !!form.type;
+        }),
+        component: {
+          name: "api-test",
+          action: "TestRequest",
+        },
+        order: 990,
+        col: {
+          span: 24,
+        },
+      },
+      column: {
+        show: false,
+      },
+    },
+    setting: {
+      column: { show: false },
+      form: {
+        show: false,
+        valueBuilder({ value, form }) {
+          form.body = {};
+          if (!value) {
+            return;
+          }
+          const setting = JSON.parse(value);
+          for (const key in setting) {
+            form.body[key] = setting[key];
+          }
+        },
+        valueResolve({ form }) {
+          const setting = form.body;
+          form.setting = JSON.stringify(setting);
+        },
+      },
+    } as ColumnCompositionProps,
+  };
+}

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

@@ -0,0 +1,55 @@
+import { ref } from "vue";
+import { getCommonColumnDefine } from "./common";
+import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+
+export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+  const api = context.api;
+  const addonType = context.addonType;
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetList(query);
+  };
+  const editRequest = async (req: EditReq) => {
+    const { form, row } = req;
+    form.id = row.id;
+    const res = await api.UpdateObj(form);
+    return res;
+  };
+  const delRequest = async (req: DelReq) => {
+    const { row } = req;
+    return await api.DelObj(row.id);
+  };
+
+  const addRequest = async (req: AddReq) => {
+    const { form } = req;
+    const res = await api.AddObj(form);
+    return res;
+  };
+
+  const typeRef = ref();
+  const commonColumnsDefine = getCommonColumnDefine(crudExpose, typeRef, api, addonType);
+  return {
+    crudOptions: {
+      request: {
+        pageRequest,
+        addRequest,
+        editRequest,
+        delRequest,
+      },
+      form: {
+        labelCol: {
+          //固定label宽度
+          span: null,
+          style: {
+            width: "145px",
+          },
+        },
+      },
+      rowHandle: {
+        width: 200,
+      },
+      columns: {
+        ...commonColumnsDefine,
+      },
+    },
+  };
+}

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

@@ -0,0 +1,41 @@
+<template>
+  <fs-page>
+    <template #header>
+      <div class="title">
+        通知管理
+        <span class="sub">管理通知配置</span>
+      </div>
+    </template>
+    <fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
+  </fs-page>
+</template>
+
+<script lang="ts">
+import { defineComponent, onActivated, onMounted } from "vue";
+import { useFs } from "@fast-crud/fast-crud";
+import createCrudOptions from "./crud";
+import { createAddonApi } from "./api";
+import { addonProvide } from "/@/views/certd/addon/common";
+
+export default defineComponent({
+  name: "AddonManager",
+  setup() {
+    const api = createAddonApi();
+    addonProvide(api);
+    const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { api } });
+
+    // 页面打开后获取列表数据
+    onMounted(() => {
+      crudExpose.doRefresh();
+    });
+    onActivated(() => {
+      crudExpose.doRefresh();
+    });
+
+    return {
+      crudBinding,
+      crudRef,
+    };
+  },
+});
+</script>

packages/ui/certd-client/src/views/certd/cname/record/index.vue

@@ -4,7 +4,7 @@
       <div class="title">
         {{ t("certd.cnameRecord") }}
         <span class="sub">
-          <a href="https://certd.docmirror.cn/guide/feature/cname/" target="_blank">
+          <a v-comm="false" href="https://certd.docmirror.cn/guide/feature/cname/" target="_blank">
             {{ t("certd.cname_feature_guide") }}
           </a>
         </span>

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

@@ -3,7 +3,7 @@
     <template #header>
       <div class="title">开放接口密钥管理</div>
       <div class="more">
-        <a :href="OPEN_API_DOC" target="_blank">开放接口文档</a>
+        <a v-comm="false" :href="OPEN_API_DOC" target="_blank">开放接口文档</a>
       </div>
     </template>
     <fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>

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

@@ -22,7 +22,7 @@ export function fillPipelineByDefaultForm(pipeline: any, form: any) {
   if (form.notification != null) {
     notifications.push({
       type: "custom",
-      when: ["error", "turnToSuccess", "success"],
+      when: form.notificationWhen || ["error", "turnToSuccess"],
       notificationId: form.notification,
       title: form.notificationTarget?.name || "自定义通知",
     });
@@ -223,6 +223,25 @@ export function useCertPipelineCreator() {
               helper: t("certd.pipelineForm.notificationHelper"),
             },
           },
+          notificationWhen: {
+            title: t("certd.pipelineForm.notificationWhen"),
+            type: "text",
+            form: {
+              value: ["error", "turnToSuccess"],
+              component: {
+                name: "a-select",
+                vModel: "value",
+                mode: "multiple",
+                options: [
+                  { value: "start", label: t("certd.start_time") },
+                  { value: "success", label: t("certd.success_time") },
+                  { value: "turnToSuccess", label: t("certd.fail_to_success_time") },
+                  { value: "error", label: t("certd.fail_time") },
+                ],
+              },
+              order: 102,
+            },
+          },
           groupId: {
             title: t("certd.pipelineForm.groupIdTitle"),
             type: "dict-select",
@@ -268,7 +287,7 @@ export function useCertPipelineCreator() {
     async function doSubmit({ form }: any) {
       // const certDetail = readCertDetail(form.cert.crt);
       // 添加certd pipeline
-      const pluginInput = omit(form, ["triggerCron", "notification", "notificationTarget", "certApplyPlugin", "groupId"]);
+      const pluginInput = omit(form, ["triggerCron", "notification", "notificationTarget", "notificationWhen", "certApplyPlugin", "groupId"]);
       let pipeline: any = {
         title: form.domains[0] + "证书自动化",
         runnableType: "pipeline",

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

@@ -313,6 +313,8 @@ function useStepForm() {
   };
 
   const stepDelete = () => {
+    //检查输出依赖
+
     Modal.confirm({
       title: "确认",
       content: `确定要删除此步骤吗？`,

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

@@ -279,7 +279,7 @@
   </fs-page>
 </template>
 
-<script lang="ts">
+<script lang="tsx">
 import { computed, defineComponent, onMounted, onUnmounted, provide, ref, Ref, watch } from "vue";
 import { useRouter } from "vue-router";
 import PiTaskForm from "./component/task-form/index.vue";
@@ -758,9 +758,12 @@ export default defineComponent({
 
         //检查输出的stepid是否存在
         let hasError = false;
-        let errorMessage = "";
+        let errorMessages: any = [];
+        let errorIndex = 1;
         eachSteps(pp, (step: any, task: any, stage: any) => {
-          stepIds.push(step.id);
+          if (step.disabled !== true) {
+            stepIds.push(step.id);
+          }
           if (step.input) {
             for (const key in step.input) {
               const value = step.input[key];
@@ -775,21 +778,36 @@ export default defineComponent({
               const paramName = arr[2];
               if (!stepIds.includes(stepId)) {
                 hasError = true;
-                const message = `任务${step.title}的前置输出步骤${paramName}不存在，请重新修改此任务`;
+                const message = `${step.title}的前置输出步骤${paramName}不存在或已被禁用`;
+                errorIndex++;
                 addValidateError(task.id, {
                   message,
                 });
                 addValidateError(step.id, {
                   message,
                 });
-                errorMessage += message + "；";
+                errorMessages.push(message);
               }
             }
           }
         });
 
         if (hasError) {
-          notification.error({ message: errorMessage });
+          notification.error({
+            message: () => {
+              const nodes = [];
+              let i = 0;
+              for (const error of errorMessages) {
+                i++;
+                nodes.push(
+                  <div>
+                    {i}.{error}
+                  </div>
+                );
+              }
+              return nodes;
+            },
+          });
           throw new Error(errorMessage);
         }
       }

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

@@ -4,10 +4,14 @@
       <div class="title">
         {{ t("certd.subdomainHosting") }}
         <span class="sub">
-          {{ t("certd.subdomainHostingHint") }}； {{ t("certd.subdomainHelpText") }}
-          <a href="https://help.aliyun.com/zh/dns/subdomain-management" target="_blank">
-            {{ t("certd.subdomainManagement") }}
-          </a>
+          {{ t("certd.subdomainHostingHint") }}；
+
+          <span v-comm="false">
+            {{ t("certd.subdomainHelpText") }}
+            <a href="https://certd.docmirror.cn/guide/use/cert/subdomain.html" target="_blank">
+              {{ t("certd.subdomainManagement") }}
+            </a>
+          </span>
         </span>
       </div>
     </template>

packages/ui/certd-client/src/views/certd/suite/mine/api.ts

@@ -9,6 +9,8 @@ export type SuiteValue = {
 export type SuiteDetail = {
   enabled?: boolean;
   suites?: any[];
+  suiteList?: any[];
+  addonList?: any[];
   expiresTime?: number;
   pipelineCount?: SuiteValue;
   domainCount?: SuiteValue;

packages/ui/certd-client/src/views/certd/suite/order-modal.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-modal v-model:open="openRef" class="order-modal" :title="$t('certd.order.confirmTitle')" @ok="orderCreate">
+  <a-modal v-model:open="openRef" class="order-modal" :title="$t('certd.order.confirmTitle')" :width="670" @ok="orderCreate">
     <div v-if="product" class="order-box">
       <div class="flex-o mt-5">
         <span class="label">{{ $t("certd.order.package") }}：</span>{{ product.title }}
@@ -13,6 +13,7 @@
           <span class="flex-o"> {{ $t("certd.order.pipeline") }}<suite-value class="ml-5" :model-value="product.content.maxPipelineCount" :unit="$t('certd.order.unit.pieces')" />； </span>
           <span class="flex-o"> {{ $t("certd.order.domain") }}<suite-value class="ml-5" :model-value="product.content.maxDomainCount" :unit="$t('certd.order.unit.count')" />； </span>
           <span class="flex-o"> {{ $t("certd.order.deployTimes") }}<suite-value class="ml-5" :model-value="product.content.maxDeployCount" :unit="$t('certd.order.unit.times')" />； </span>
+          <span class="flex-o"> {{ $t("certd.order.monitorCount") }}<suite-value class="ml-5" :model-value="product.content.maxMonitorCount" :unit="$t('certd.order.unit.times')" />； </span>
         </span>
       </div>
 

packages/ui/certd-client/src/views/framework/forgot-password/index.vue

@@ -11,7 +11,7 @@
       @finish="handleFinish"
       @finish-failed="handleFinishFailed"
     >
-      <a-tabs v-model:active-key="forgotPasswordType" :destroyInactiveTabPane="true">
+      <a-tabs v-model:active-key="forgotPasswordType" :destroy-inactive-tab-pane="true">
         <a-tab-pane key="email" tab="邮箱找回">
           <a-form-item has-feedback name="input" label="邮箱">
             <a-input v-model:value="formState.input" placeholder="邮箱" size="large" autocomplete="off">
@@ -20,14 +20,11 @@
               </template>
             </a-input>
           </a-form-item>
+          <a-form-item has-feedback name="captchaForEmail" label="验证码">
+            <CaptchaInput v-model:model-value="formState.captchaForEmail"></CaptchaInput>
+          </a-form-item>
           <a-form-item has-feedback name="validateCode" label="邮件验证码">
-            <email-code
-              v-model:value="formState.validateCode"
-              :img-code="formState.imgCode"
-              :email="formState.input"
-              :random-str="formState.randomStr"
-              verification-type="forgotPassword"
-            />
+            <email-code v-model:value="formState.validateCode" :captcha="formState.captchaForEmail" :email="formState.input" :random-str="formState.randomStr" verification-type="forgotPassword" />
           </a-form-item>
         </a-tab-pane>
         <a-tab-pane key="mobile" tab="手机号找回">
@@ -38,23 +35,15 @@
               </template>
             </a-input>
           </a-form-item>
+          <a-form-item has-feedback name="captchaForSms" label="验证码">
+            <CaptchaInput v-model:model-value="formState.captchaForSms"></CaptchaInput>
+          </a-form-item>
           <a-form-item name="validateCode" label="手机验证码">
-            <sms-code
-              v-model:value="formState.validateCode"
-              :img-code="formState.imgCode"
-              :mobile="formState.input"
-              :phone-code="formState.phoneCode"
-              :random-str="formState.randomStr"
-              verification-type="forgotPassword"
-            />
+            <sms-code v-model:value="formState.validateCode" :captcha="formState.captchaForSms" :mobile="formState.input" :phone-code="formState.phoneCode" verification-type="forgotPassword" />
           </a-form-item>
         </a-tab-pane>
       </a-tabs>
 
-      <a-form-item has-feedback name="imgCode" label="图片验证码">
-        <image-code ref="imageCodeRef" v-model:value="formState.imgCode" v-model:random-str="formState.randomStr"></image-code>
-      </a-form-item>
-
       <a-form-item has-feedback name="password" label="新密码">
         <a-input-password v-model:value="formState.password" placeholder="新密码" size="large" autocomplete="off">
           <template #prefix>
@@ -72,8 +61,10 @@
       <a-form-item>
         <a-button type="primary" size="large" html-type="submit" class="submit-button"> 找回密码</a-button>
 
-        <div class="mt-2">
-          <a href="https://certd.docmirror.cn/guide/use/forgotpasswd/" target="_blank"> 管理员无绑定通信方式或MFA丢失找回 </a>
+        <div class="mt-2 flex-between">
+          <a v-comm="false" href="https://certd.docmirror.cn/guide/use/forgotpasswd/" target="_blank"> 管理员无绑定通信方式或MFA丢失找回 </a>
+
+          <router-link :to="{ name: 'login' }"> 返回登录 </router-link>
         </div>
       </a-form-item>
     </a-form>
@@ -87,7 +78,8 @@ import EmailCode from "/@/views/framework/register/email-code.vue";
 import SmsCode from "/@/views/framework/login/sms-code.vue";
 import { utils } from "@fast-crud/fast-crud";
 import { useUserStore } from "/@/store/user";
-
+import { useSettingStore } from "/@/store/settings";
+import CaptchaInput from "/@/components/captcha/captcha-input.vue";
 defineOptions({
   name: "ForgotPasswordPage",
 });
@@ -95,7 +87,8 @@ defineOptions({
 const rules = {
   input: [{ required: true }],
   validateCode: [{ required: true }],
-  imgCode: [{ required: true }, { min: 4, max: 4, message: "请输入4位图片验证码" }],
+  captchaForEmail: [{ required: true }],
+  captchaForSms: [{ required: true }],
   password: [
     { required: true, trigger: "change", message: "请输入密码" },
     { min: 6, message: "至少输入6位密码" },
@@ -123,16 +116,15 @@ const layout = {
 
 const forgotPasswordType = ref();
 const userStore = useUserStore();
+const settingStore = useSettingStore();
 const formRef = ref();
-const imageCodeRef = ref();
 
 const formState: any = reactive({
   input: "",
-  randomStr: "",
-  imgCode: "",
+  captchaForSms: null,
+  captchaForEmail: null,
   phoneCode: "86",
   validateCode: "",
-
   password: "",
   confirmPassword: "",
 });
@@ -146,7 +138,6 @@ onMounted(() => {
 watch(forgotPasswordType, () => {
   formState.input = "";
   formState.validateCode = "";
-  imageCodeRef.value.resetImageCode();
   formRef.value.clearValidate(Object.keys(formState).filter(key => !["password", "confirmPassword"].includes(key)));
 });
 
@@ -155,8 +146,6 @@ const handleFinish = async (values: any) => {
     toRaw({
       type: forgotPasswordType.value,
       input: formState.input,
-      randomStr: formState.randomStr,
-      imgCode: formState.imgCode,
       validateCode: formState.validateCode,
       password: formState.password,
       confirmPassword: formState.confirmPassword,

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

@@ -3,7 +3,16 @@
     <div class="flex-o flex-wrap">
       <a-popover>
         <template #content>
-          <div>
+          <div style="width: 300px">
+            <div v-if="detail.addonList.length > 0" class="flex flex-wrap">
+              <a-tag v-for="(item, index) of detail.addonList" :key="index" color="green" class="pointer flex-o m-1">
+                <span class="mr-5">
+                  {{ item.title }}
+                </span>
+                <span>(<expires-time-text :value="item.expiresTime" />)</span>
+              </a-tag>
+              <a-divider class="m-5" />
+            </div>
             <div class="flex-between mt-5">
               <div class="flex-o"><fs-icon icon="ant-design:check-outlined" class="color-green mr-5" /> 流水线条数：</div>
               <suite-value :model-value="detail.pipelineCount.max" :used="detail.pipelineCount.used" unit="条" />
@@ -30,12 +39,13 @@
         </template>
         <div class="flex-o">
           <fs-icon icon="ant-design:gift-outlined" class="color-green mr-5" />
-          <a-tag v-for="(item, index) of detail.suites" :key="index" color="green" class="pointer flex-o">
+          <a-tag v-for="(item, index) of detail.suiteList" :key="index" color="green" class="pointer flex-o">
             <span class="mr-5">
               {{ item.title }}
             </span>
             <span>(<expires-time-text :value="item.expiresTime" />)</span>
           </a-tag>
+          <a-tag v-if="detail.addonList.length > 0" color="green" class="pointer flex-o">加量包+{{ detail.addonList.length }}</a-tag>
           <div v-if="detail.suites?.length === 0" class="flex-o ml-5">暂无套餐 <a-button class="ml-5" type="primary" size="small" @click="goBuy">去购买</a-button></div>
         </div>
       </a-popover>
@@ -59,6 +69,10 @@ const detail = ref<SuiteDetail>({});
 
 async function loadSuiteDetail() {
   detail.value = await mySuiteApi.SuiteDetailGet();
+  const suites = detail.value.suites.filter(item => item.productType === "suite");
+  const addons = detail.value.suites.filter(item => item.productType === "addon");
+  detail.value.suiteList = suites;
+  detail.value.addonList = addons;
 }
 
 loadSuiteDetail();

packages/ui/certd-client/src/views/framework/login/image-code.vue

@@ -1,41 +0,0 @@
-<template>
-  <div class="flex">
-    <a-input :value="value" placeholder="请输入图片验证码" autocomplete="off" @update:value="onChange">
-      <template #prefix>
-        <fs-icon icon="ion:image-outline"></fs-icon>
-      </template>
-    </a-input>
-    <div class="input-right pointer" title="点击刷新">
-      <img class="image-code" :src="imageCodeUrl" @click="resetImageCode" />
-    </div>
-  </div>
-</template>
-<script setup lang="ts">
-import { ref, useAttrs, defineExpose } from "vue";
-import { nanoid } from "nanoid";
-
-const props = defineProps<{
-  randomStr?: string;
-  value?: string;
-}>();
-const emit = defineEmits(["update:value", "update:randomStr", "change"]);
-
-function onChange(value: string) {
-  emit("update:value", value);
-  emit("change", value);
-}
-
-const imageCodeUrl = ref();
-function resetImageCode() {
-  const randomStr = nanoid(10);
-  let url = "api/basic/code/captcha";
-  imageCodeUrl.value = url + "?randomStr=" + randomStr;
-  emit("update:randomStr", randomStr);
-}
-
-defineExpose({
-  resetImageCode,
-})
-
-resetImageCode();
-</script>

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

@@ -20,6 +20,10 @@
                 </template>
               </a-input-password>
             </a-form-item>
+
+            <a-form-item v-if="settingStore.sysPublic.captchaEnabled" has-feedback required name="captcha" :rules="rules.captcha">
+              <CaptchaInput v-model:model-value="formState.captcha"></CaptchaInput>
+            </a-form-item>
           </template>
         </a-tab-pane>
         <a-tab-pane v-if="sysPublicSettings.smsLoginEnabled === true" key="sms" :tab="t('authentication.smsTab')">
@@ -32,12 +36,12 @@
               </a-input>
             </a-form-item>
 
-            <a-form-item has-feedback name="imgCode">
-              <image-code v-model:value="formState.imgCode" v-model:random-str="formState.randomStr"></image-code>
+            <a-form-item has-feedback name="smsCaptcha">
+              <CaptchaInput v-model:model-value="formState.smsCaptcha"></CaptchaInput>
             </a-form-item>
 
             <a-form-item name="smsCode" :rules="rules.smsCode">
-              <sms-code v-model:value="formState.smsCode" :img-code="formState.imgCode" :mobile="formState.mobile" :phone-code="formState.phoneCode" :random-str="formState.randomStr" />
+              <sms-code v-model:value="formState.smsCode" :captcha="formState.smsCaptcha" :mobile="formState.mobile" :phone-code="formState.phoneCode" />
             </a-form-item>
           </template>
         </a-tab-pane>
@@ -87,14 +91,13 @@ import { defineComponent, nextTick, reactive, ref, toRaw } from "vue";
 import { useUserStore } from "/src/store/user";
 import { useSettingStore } from "/@/store/settings";
 import { utils } from "@fast-crud/fast-crud";
-import ImageCode from "/@/views/framework/login/image-code.vue";
 import SmsCode from "/@/views/framework/login/sms-code.vue";
 import { useI18n } from "/@/locales";
 import { LanguageToggle } from "/@/vben/layouts";
-
+import CaptchaInput from "/@/components/captcha/captcha-input.vue";
 export default defineComponent({
   name: "LoginPage",
-  components: { LanguageToggle, SmsCode, ImageCode },
+  components: { LanguageToggle, SmsCode, CaptchaInput },
   setup() {
     const { t } = useI18n();
     const verifyCodeInputRef = ref();
@@ -108,9 +111,9 @@ export default defineComponent({
       mobile: "",
       password: "",
       loginType: "password", //password
-      imgCode: "",
       smsCode: "",
-      randomStr: "",
+      captcha: null,
+      smsCaptcha: null,
     });
 
     const rules = {
@@ -138,6 +141,12 @@ export default defineComponent({
           message: "请输入短信验证码",
         },
       ],
+      captcha: [
+        {
+          required: true,
+          message: "请进行验证码验证",
+        },
+      ],
     };
     const layout = {
       labelCol: {
@@ -160,6 +169,10 @@ export default defineComponent({
     const handleFinish = async (values: any) => {
       loading.value = true;
       try {
+        // formState.captcha = await doCaptchaValidate();
+        // if (!formState.captcha) {
+        //   return;
+        // }
         const loginType = formState.loginType;
         await userStore.login(loginType, toRaw(formState));
       } catch (e: any) {
@@ -194,6 +207,21 @@ export default defineComponent({
       return sysPublicSettings.registerEnabled && (sysPublicSettings.usernameRegisterEnabled || sysPublicSettings.emailRegisterEnabled);
     }
 
+    const captchaInputRef = ref();
+    const captchaInputForSmsCode = ref();
+    async function doCaptchaValidate() {
+      if (!sysPublicSettings.captchaEnabled) {
+        return {};
+      }
+      const res = await captchaInputRef.value.getValidatedForm();
+      if (!res) {
+        return false;
+      }
+      return {
+        ...res,
+      };
+    }
+
     return {
       t,
       loading,
@@ -211,6 +239,8 @@ export default defineComponent({
       handleTwoFactorSubmit,
       verifyCodeInputRef,
       settingStore,
+      captchaInputRef,
+      captchaInputForSmsCode,
     };
   },
 });