v1.29.5

CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+### Bug Fixes
+
+* 修复复制到本机插件，pfx格式复制时报错的bug ([f57116d](https://github.com/certd/certd/commit/f57116d2bebf33e47ad93e0b39c4efe8e4aea25c))
+* 修复授权管理，点击了查看原文按钮后，无法修改值的bug ([85c99f7](https://github.com/certd/certd/commit/85c99f7f80761ac6efaf3255c03b933442db1686))
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+### Bug Fixes
+
+* 修复站点监控域名校验无法通过的bug ([1cb4a53](https://github.com/certd/certd/commit/1cb4a539cc523721ffd4b22d40d0e3d2d68cd915))
+
+### Performance Improvements
+
+* 优化腾讯云CLB插件，支持非sni情况，sni情况支持填写多个域名 ([635b042](https://github.com/certd/certd/commit/635b042690637bff85e97e07c7aac4b87a8a124b))
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 ### Bug Fixes

build.trigger

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

docs/.vitepress/config.ts

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

docs/comm/index.md

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

docs/comm/payments/alipay.md

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

docs/comm/payments/wxpay.md

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

docs/comm/payments/yizhifu.md

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

docs/guide/changelogs/CHANGELOG.md

@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+### Bug Fixes
+
+* 修复站点监控域名校验无法通过的bug ([1cb4a53](https://github.com/certd/certd/commit/1cb4a539cc523721ffd4b22d40d0e3d2d68cd915))
+
+### Performance Improvements
+
+* 优化腾讯云CLB插件，支持非sni情况，sni情况支持填写多个域名 ([635b042](https://github.com/certd/certd/commit/635b042690637bff85e97e07c7aac4b87a8a124b))
+
+## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
+
+### Bug Fixes
+
+* 修复系统级授权无法查看密钥的bug ([8644348](https://github.com/certd/certd/commit/8644348fc41ae2e1672f946ca37e5d3a674e0218))
+
+### Performance Improvements
+
+* 优化站点证书检查页面，检查增加3次重试 ([e6dd7cd](https://github.com/certd/certd/commit/e6dd7cd54a3e23897031b5df6e0c3cdc0545d35a))
+* 优化acme sdk ([54db744](https://github.com/certd/certd/commit/54db74428259de64d12230c2ab7353ae11197bbc))
+* 支持http校验方式申请证书 ([405591c](https://github.com/certd/certd/commit/405591c5d08fa1a3b228ee3980199e7731cfec4a))
+* http校验方式，支持七牛云oss、阿里云oss、腾讯云cos ([3f74d4d](https://github.com/certd/certd/commit/3f74d4d9e5f5d0e629b44cff1895b3f7a8fbcafc))
+
 ## [1.29.2](https://github.com/certd/certd/compare/v1.29.1...v1.29.2) (2024-12-25)
 
 ### Bug Fixes

lerna.json

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

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.29.5](https://github.com/publishlab/node-acme-client/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.29.4](https://github.com/publishlab/node-acme-client/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.29.3](https://github.com/publishlab/node-acme-client/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 ### Performance Improvements

packages/core/acme-client/package.json

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

packages/core/basic/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/basic
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 **Note:** Version bump only for package @certd/basic

packages/core/basic/build.md

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

packages/core/basic/package.json

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

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/pipeline
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 ### Performance Improvements

packages/core/pipeline/package.json

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

packages/libs/lib-huawei/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 **Note:** Version bump only for package @certd/lib-huawei

packages/libs/lib-huawei/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-huawei",
   "private": false,
-  "version": "1.29.3",
+  "version": "1.29.5",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
   "types": "./dist/d/index.d.ts",
@@ -21,5 +21,5 @@
     "prettier": "^2.8.8",
     "tslib": "^2.8.1"
   },
-  "gitHead": "ed5634ff83405ad0eb13a8456f59270ed4218734"
+  "gitHead": "94509c64b954e17e4842b02c5c9fa0649bce13d4"
 }

packages/libs/lib-iframe/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 **Note:** Version bump only for package @certd/lib-iframe

packages/libs/lib-iframe/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-iframe",
   "private": false,
-  "version": "1.29.3",
+  "version": "1.29.5",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -30,5 +30,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ed5634ff83405ad0eb13a8456f59270ed4218734"
+  "gitHead": "94509c64b954e17e4842b02c5c9fa0649bce13d4"
 }

packages/libs/lib-k8s/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 **Note:** Version bump only for package @certd/lib-k8s

packages/libs/lib-k8s/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-k8s",
   "private": false,
-  "version": "1.29.3",
+  "version": "1.29.5",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -16,7 +16,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/basic": "^1.29.3",
+    "@certd/basic": "^1.29.5",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
@@ -31,5 +31,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ed5634ff83405ad0eb13a8456f59270ed4218734"
+  "gitHead": "94509c64b954e17e4842b02c5c9fa0649bce13d4"
 }

packages/libs/lib-server/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/lib-server
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 ### Bug Fixes

packages/libs/lib-server/package.json

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

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

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

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

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 **Note:** Version bump only for package @certd/midway-flyway-js

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

@@ -1,6 +1,6 @@
 {
   "name": "@certd/midway-flyway-js",
-  "version": "1.29.3",
+  "version": "1.29.5",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -46,5 +46,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ed5634ff83405ad0eb13a8456f59270ed4218734"
+  "gitHead": "94509c64b954e17e4842b02c5c9fa0649bce13d4"
 }

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+### Bug Fixes
+
+* 修复复制到本机插件，pfx格式复制时报错的bug ([f57116d](https://github.com/certd/certd/commit/f57116d2bebf33e47ad93e0b39c4efe8e4aea25c))
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 ### Performance Improvements

packages/plugins/plugin-cert/package.json

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

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

@@ -69,6 +69,9 @@ export class CertReader {
       return "";
     }
     const ic = this.crt.substring(start);
+    if (ic == null) {
+      return "";
+    }
     return ic.trim();
   }
 

packages/plugins/plugin-lib/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 ### Performance Improvements

packages/plugins/plugin-lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-lib",
   "private": false,
-  "version": "1.29.3",
+  "version": "1.29.5",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -16,8 +16,8 @@
   },
   "dependencies": {
     "@alicloud/pop-core": "^1.7.10",
-    "@certd/basic": "^1.29.3",
-    "@certd/pipeline": "^1.29.3",
+    "@certd/basic": "^1.29.5",
+    "@certd/pipeline": "^1.29.5",
     "@kubernetes/client-node": "0.21.0",
     "ali-oss": "^6.21.0",
     "basic-ftp": "^5.0.5",
@@ -48,5 +48,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ed5634ff83405ad0eb13a8456f59270ed4218734"
+  "gitHead": "94509c64b954e17e4842b02c5c9fa0649bce13d4"
 }

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+### Bug Fixes
+
+* 修复授权管理，点击了查看原文按钮后，无法修改值的bug ([85c99f7](https://github.com/certd/certd/commit/85c99f7f80761ac6efaf3255c03b933442db1686))
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+### Bug Fixes
+
+* 修复站点监控域名校验无法通过的bug ([1cb4a53](https://github.com/certd/certd/commit/1cb4a539cc523721ffd4b22d40d0e3d2d68cd915))
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 ### Performance Improvements

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.29.3",
+  "version": "1.29.5",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -66,8 +66,8 @@
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.29.3",
-    "@certd/pipeline": "^1.29.3",
+    "@certd/lib-iframe": "^1.29.5",
+    "@certd/pipeline": "^1.29.5",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

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

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

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

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

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

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

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

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

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

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

packages/ui/certd-server/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.29.5](https://github.com/certd/certd/compare/v1.29.4...v1.29.5) (2025-01-07)
+
+### Bug Fixes
+
+* 修复复制到本机插件，pfx格式复制时报错的bug ([f57116d](https://github.com/certd/certd/commit/f57116d2bebf33e47ad93e0b39c4efe8e4aea25c))
+
+## [1.29.4](https://github.com/certd/certd/compare/v1.29.3...v1.29.4) (2025-01-06)
+
+### Performance Improvements
+
+* 优化腾讯云CLB插件，支持非sni情况，sni情况支持填写多个域名 ([635b042](https://github.com/certd/certd/commit/635b042690637bff85e97e07c7aac4b87a8a124b))
+
 ## [1.29.3](https://github.com/certd/certd/compare/v1.29.2...v1.29.3) (2025-01-04)
 
 ### Bug Fixes

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

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

packages/ui/certd-server/package.json

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

packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts

@@ -226,7 +226,7 @@ export class CopyCertToLocalPlugin extends AbstractTaskPlugin {
         this.hostIcPath = icPath;
       }
       if (pfxPath) {
-        pfxPath = icPath.trim();
+        pfxPath = pfxPath.trim();
         pfxPath = pfxPath.startsWith('/') ? pfxPath : path.join(Constants.dataDir, pfxPath);
         this.copyFile(tmpPfxPath, pfxPath);
         this.hostPfxPath = pfxPath;

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

@@ -6,7 +6,7 @@ import { TencentAccess } from '@certd/plugin-lib';
   title: '腾讯云-部署到CLB',
   icon: 'svg:icon-tencentcloud',
   group: pluginGroups.tencent.key,
-  desc: '暂时只支持单向认证证书，暂时只支持通用负载均衡，必须开启sni',
+  desc: '暂时只支持单向认证证书，暂时只支持通用负载均衡',
   default: {
     strategy: {
       runStrategy: RunStrategy.SkipWhenSucceed,
@@ -59,16 +59,22 @@ export class DeployCertToTencentCLB extends AbstractTaskPlugin {
 
   @TaskInput({
     title: '监听器ID',
-    helper: '如果没有配置，则根据域名或负载均衡id匹配监听器',
+    required: true,
   })
   listenerId!: string;
 
   @TaskInput({
     title: '域名',
-    required: true,
-    helper: '要更新的支持https的负载均衡的域名',
+    required: false,
+    component: {
+      name: 'a-select',
+      vModel: 'value',
+      open: false,
+      mode: 'tags',
+    },
+    helper: '如果开启了sni，则此项必须填写，未开启，则不要填写',
   })
-  domain!: string;
+  domain!: string | string[];
 
   @TaskInput({
     title: '域名证书',
@@ -122,33 +128,48 @@ export class DeployCertToTencentCLB extends AbstractTaskPlugin {
 
   async execute(): Promise<void> {
     const client = this.client;
-    const lastCertId = await this.getCertIdFromProps(client);
-    if (!this.domain) {
+
+    if (!this.domain || this.domain.length === 0) {
       await this.updateListener(client);
     } else {
-      await this.updateByDomainAttr(client);
+      const domains = Array.isArray(this.domain) ? this.domain : [this.domain];
+      for (const domain of domains) {
+        this.logger.info(`开始更新域名证书:${domain},请确保已经开启了sni`);
+        const lastCertId = await this.getCertIdFromProps(client, domain);
+
+        await this.updateByDomainAttr(client, domain);
+
+        const checkDeployed = async (wait = 5) => {
+          await this.ctx.utils.sleep(wait * 1000);
+          this.logger.info(`等待${wait}秒`);
+          const newCertId = await this.getCertIdFromProps(client, domain);
+          this.logger.info(`oldCertId:${lastCertId} , newCertId:${newCertId}`);
+          if ((lastCertId && newCertId === lastCertId) || (!lastCertId && !newCertId)) {
+            return false;
+          }
+          this.logger.info('腾讯云证书ID:', newCertId);
+          return true;
+        };
+        let count = 0;
+        while (true) {
+          count++;
+          const res = await checkDeployed(5);
+          if (res) {
+            break;
+          }
+          if (count > 6) {
+            throw new Error('部署可能失败，请确认是否已开启sni');
+          }
+        }
+      }
     }
 
-    try {
-      await this.ctx.utils.sleep(2000);
-      let newCertId = await this.getCertIdFromProps(client);
-      if ((lastCertId && newCertId === lastCertId) || (!lastCertId && !newCertId)) {
-        await this.ctx.utils.sleep(2000);
-        newCertId = await this.getCertIdFromProps(client);
-      }
-      if (newCertId === lastCertId) {
-        return;
-      }
-      this.logger.info('腾讯云证书ID:', newCertId);
-    } catch (e) {
-      this.logger.warn('查询腾讯云证书失败', e);
-    }
     return;
   }
 
-  async getCertIdFromProps(client: any) {
-    const listenerRet = await this.getListenerList(client, this.loadBalancerId, [this.listenerId]);
-    return this.getCertIdFromListener(listenerRet[0], this.domain);
+  async getCertIdFromProps(client: any, domain: string) {
+    const listenerRet = await this.getListenerList(client, this.loadBalancerId, this.listenerId ? [this.listenerId] : null);
+    return this.getCertIdFromListener(listenerRet[0], domain);
   }
 
   getCertIdFromListener(listener: any, domain: string) {
@@ -178,21 +199,13 @@ export class DeployCertToTencentCLB extends AbstractTaskPlugin {
     return ret;
   }
 
-  async updateByDomainAttr(client: any) {
+  async updateByDomainAttr(client: any, domain) {
     const params: any = this.buildProps();
-    params.Domain = this.domain;
+
+    params.Domain = domain;
     const ret = await client.ModifyDomainAttributes(params);
     this.checkRet(ret);
-    this.logger.info(
-      '设置腾讯云CLB证书(sni)成功:',
-      ret.RequestId,
-      '->loadBalancerId:',
-      this.loadBalancerId,
-      'listenerId',
-      this.listenerId,
-      'domain:',
-      this.domain
-    );
+    this.logger.info('设置腾讯云CLB证书(sni)成功:', ret.RequestId, '->loadBalancerId:', this.loadBalancerId, 'listenerId', this.listenerId, 'domain:', domain);
     return ret;
   }
   appendTimeSuffix(name: string) {