v1.33.4

fix: 修复腾讯云部署到任意资源插件，无法使用之前已上传的腾讯云证书问题

.github/workflows/build-image-for-test.yml

@@ -10,6 +10,7 @@ on:
 #    - cron: '17 19 * * *'
 permissions:
   contents: read
+  packages: write
 
 jobs:
   build-certd-image:
@@ -43,7 +44,7 @@ jobs:
 #          cache: 'npm'
 #        working-directory: ./packages/ui/certd-client
       - run: |
-          npm install -g pnpm@8.15.7
+          npm install -g pnpm
           pnpm install
           npm run build
         working-directory: ./packages/ui/certd-client
@@ -61,19 +62,38 @@ jobs:
           username: ${{ secrets.aliyun_cs_username }}
           password: ${{ secrets.aliyun_cs_password }}
 
+      - name: Login to GitHub Packages
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.dockerhub_username }}
           password: ${{ secrets.dockerhub_password }}
 
-      - name: Build default platforms
+#      - name: Build default platforms
+#        uses: docker/build-push-action@v6
+#        with:
+#          platforms: linux/amd64,linux/arm64
+#          push: true
+#          context: ./packages/ui/
+#          tags: |
+#            registry.cn-shenzhen.aliyuncs.com/handsfree/certd-dev:latest
+#            greper/certd-dev:latest
+#            ghcr.io/${{ github.repository }}:dev-latest
+
+      - name: Build armv7
         uses: docker/build-push-action@v6
         with:
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/arm/v7
           push: true
           context: ./packages/ui/
           tags: |
-            registry.cn-shenzhen.aliyuncs.com/handsfree/certd-dev:latest
-            greper/certd-dev:latest
-
+            registry.cn-shenzhen.aliyuncs.com/handsfree/certd:armv7
+            registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}}-armv7
+            greper/certd:armv7
+            greper/certd:${{steps.get_certd_version.outputs.result}}-armv7

.github/workflows/build-image.yml

@@ -10,6 +10,7 @@ on:
 #    - cron: '17 19 * * *'
 permissions:
   contents: read
+  packages: write
 
 jobs:
   build-certd-image:
@@ -43,7 +44,7 @@ jobs:
 #          cache: 'npm'
 #        working-directory: ./packages/ui/certd-client
       - run: |
-          npm install -g pnpm@8.15.7
+          npm install -g pnpm
           pnpm install
           npm run build
         working-directory: ./packages/ui/certd-client
@@ -61,6 +62,13 @@ jobs:
           username: ${{ secrets.aliyun_cs_username }}
           password: ${{ secrets.aliyun_cs_password }}
 
+      - name: Login to GitHub Packages
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+  
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -78,18 +86,21 @@ jobs:
             registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}}
             greper/certd:latest
             greper/certd:${{steps.get_certd_version.outputs.result}}
-
-#      - name: Build armv7
-#        uses: docker/build-push-action@v6
-#        with:
-#          platforms: linux/arm/v7
-#          push: true
-#          context: ./packages/ui/
-#          tags: |
-#            registry.cn-shenzhen.aliyuncs.com/handsfree/certd:armv7
-#            registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}}-armv7
-#            greper/certd:armv7
-#            greper/certd:${{steps.get_certd_version.outputs.result}}-armv7
+            ghcr.io/${{ github.repository }}:latest
+            ghcr.io/${{ github.repository }}:${{steps.get_certd_version.outputs.result}}
+      - name: Build armv7
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/arm/v7
+          push: true
+          context: ./packages/ui/
+          tags: |
+            registry.cn-shenzhen.aliyuncs.com/handsfree/certd:armv7
+            registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}}-armv7
+            greper/certd:armv7
+            greper/certd:${{steps.get_certd_version.outputs.result}}-armv7
+            ghcr.io/${{ github.repository }}:armv7
+            ghcr.io/${{ github.repository }}:${{steps.get_certd_version.outputs.result}}-armv7
 
 #      - name: Build agent
 #        uses: docker/build-push-action@v6

CHANGELOG.md

@@ -3,6 +3,64 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+### Bug Fixes
+
+* 补充类型断言 ([2143dff](https://github.com/certd/certd/commit/2143dff2ae96e6a78bef9f0498e36f8cd9e6941f))
+* 修复腾讯云部署到任意资源插件，无法使用之前已上传的腾讯云证书问题 ([32c714d](https://github.com/certd/certd/commit/32c714d1b6e68c71a74a7452115040c87ac4bfdc))
+
+### Performance Improvements
+
+* 插件支持导入导出 ([cf8abb4](https://github.com/certd/certd/commit/cf8abb45282070c8ba91469f93fd379fabf1f74a))
+* 支持上传证书到华为云CCM ([cfd3b66](https://github.com/certd/certd/commit/cfd3b66be9ebf53a26693057e70ed60c3f116be9))
+
+## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
+
+### Bug Fixes
+
+* 修复登录错误次数过多阻止再次登录逻辑 ([bf4d191](https://github.com/certd/certd/commit/bf4d191c8bd2f9209eb6768f662b9c77de99e998))
+
+## [1.33.2](https://github.com/certd/certd/compare/v1.33.1...v1.33.2) (2025-04-12)
+
+### Bug Fixes
+
+* 修复某些情况下无法输出日志的bug ([70101bf](https://github.com/certd/certd/commit/70101bfa7ade65678d9202c804bbae2cb808b594))
+
+### Performance Improvements
+
+* 修复内置插件分页查询逻辑 ([a2710dd](https://github.com/certd/certd/commit/a2710ddc2525e4e637fd157f0180e6d3b801c8be))
+
+## [1.33.1](https://github.com/certd/certd/compare/v1.33.0...v1.33.1) (2025-04-12)
+
+### Bug Fixes
+
+* 修复阿里云cdn证书部署失败问题，增加certname参数传入 ([965dc2c](https://github.com/certd/certd/commit/965dc2cb476f690af716f291c6b20ba98be0c8f0))
+* 修复ssh插件报length空指针的bug ([9c4cbe1](https://github.com/certd/certd/commit/9c4cbe17a22b548611cf1fbefecc83a421788e42))
+
+### Performance Improvements
+
+* 镜像支持armv7 ([f78cbed](https://github.com/certd/certd/commit/f78cbed4d817859721fdafe7d348864848d0dfbf))
+
+# [1.33.0](https://github.com/certd/certd/compare/v1.32.0...v1.33.0) (2025-04-11)
+
+### Bug Fixes
+
+* 升级mysql驱动，支持mysql8最新版本的认证 ([2f5ed3a](https://github.com/certd/certd/commit/2f5ed3aead97641f2c80d692a50226839016df0b))
+* 修复eab授权，没有email绑定的bug ([2f1683b](https://github.com/certd/certd/commit/2f1683b26acebbfb7d6e2d751435be04a4e7cab4))
+
+### Features
+
+* 支持在线自定义插件，无需源码开发 ([d0d9d68](https://github.com/certd/certd/commit/d0d9d68fe6740f6ff49fe40b7c9917c5a2e4b442))
+* **lego:** support set key type ([f3bf4fa](https://github.com/certd/certd/commit/f3bf4faee0be5bdbfdbcf70a502849ed4c8ed4c4))
+* release image to ghcr ([9b536af](https://github.com/certd/certd/commit/9b536af9e656dc89e2a87078c129cad6f591e467))
+
+### Performance Improvements
+
+* 修复tab页缓存问题 ([64e5449](https://github.com/certd/certd/commit/64e5449ab3c6b219b0e89eddad14bfb6b71a0650))
+* 隐藏运行策略选项 ([2951df0](https://github.com/certd/certd/commit/2951df0cd94c23e2efee84ff1b843055aac56cae))
+* 增加手动上传证书功能说明 ([5d083a1](https://github.com/certd/certd/commit/5d083a153637caddbc6f44e915d9fb2d1ae87b33))
+
 # [1.32.0](https://github.com/certd/certd/compare/v1.31.11...v1.32.0) (2025-04-04)
 
 ### Bug Fixes

README.md

@@ -16,6 +16,9 @@ Certd 是一个免费全自动申请和自动部署更新SSL证书的管理系
 * 私有化部署，数据保存本地，授权信息加密存储，镜像由Github Actions构建，过程公开透明
 * 支持SQLite，PostgreSQL、MySQL数据库
 
+
+  ![](./docs/images/intro/intro.svg)
+
 >
 > 流水线数量现已调整为无限制，欢迎大家使用
 >
@@ -85,12 +88,21 @@ https://certd.handfree.work/
   * `https://hub.docker.com/r/greper/certd`
   * `greper/certd:latest`
   * `greper/certd:armv7`、`greper/certd:[version]-armv7`
+* GitHub Packages地址:
+  * `ghcr.io/certd/certd:latest`
+  * `ghcr.io/certd/certd:armv7`、`ghcr.io/certd/certd:[version]-armv7`
 
 * 镜像构建通过`Actions`自动执行，过程公开透明，请放心使用
   * [点我查看镜像构建日志](https://github.com/certd/certd/actions/workflows/build-image.yml) 
 
 ![](./docs/images/action/action-build.jpg)
 
+> 注意：
+> * 本应用存储的证书、授权信息等属于高度敏感数据，请做好安全防护
+> * 请务必使用HTTPS协议访问本应用，避免被中间人攻击
+> * 请务必使用web应用防火墙防护本应用，防止XSS、SQL注入等攻击
+> * 请务必做好服务器本身的安全防护，防止数据库泄露
+> * 请务必做好数据备份，避免数据丢失
 
 ## 五、 升级
 
@@ -194,8 +206,6 @@ https://afdian.com/a/greper
 1. 可加入发电专属群，可以获得作者一对一技术支持
 2. 您的需求我们将优先实现，并且将作为专业版功能提供
 3. 一年期专业版激活码
-4. 赠送国外免费服务器部署方案（0成本使用Certd，可能需要翻墙，不过现在性能越来越差了）
-
 
 专业版特权对比
 
@@ -226,6 +236,7 @@ https://afdian.com/a/greper
 * 未获得商业授权情况下，禁止任何对logo、版权信息及授权许可相关代码的修改。
 * 如需商业授权，请联系作者。
 
+
 ## 十三、我的其他项目（求Star）
 
 | 项目名称                                                    | stars                                                                                                 | 项目描述                              | 

build-dev.trigger

@@ -1 +1 @@
-1
+2

build.trigger

@@ -1 +1 @@
-00:33
+22:26

docs/.vitepress/config.ts

@@ -1,156 +1,166 @@
-import { defineConfig } from "vitepress";
+import {defineConfig} from "vitepress";
 // Import lightbox plugin
 import lightbox from "vitepress-plugin-lightbox";
 
 // https://vitepress.dev/reference/site-config
 export default defineConfig({
-  title: "Certd",
-  titleTemplate: "开源SSL证书管理工具，证书自动化申请部署，让你的网站证书永不过期",
-  description: "Certd帮助文档,Certd是一款开源免费的全自动SSL证书管理工具；证书自动化申请部署流水线；自动证书申请、更新、续期；通配符证书，泛域名证书申请；证书自动化部署到阿里云、腾讯云、主机、群晖、宝塔。",
-  markdown: {
-    config: (md) => {
-      // Use lightbox plugin
-      md.use(lightbox, {});
-    }
-  },
-  sitemap: {
-    hostname: 'https://certd.docmirror.cn'
-  },
-  head: [
-    // [
-    //     'meta',
-    //     {
-    //         name: 'viewport',
-    //         content:
-    //           'width=device-width,initial-scale=1,minimfast-cum-scale=1.0,maximum-scale=1.0,user-scalable=no',
-    //     },
-    // ],
-    ["meta", {
-      name: "keywords",
-      content: "证书自动申请、证书自动更新、证书自动续期、证书自动续签、证书管理工具、Certd、SSL证书自动部署、证书自动化，https证书，pfx证书，der证书，TLS证书，nginx证书自动续签自动部署,SSL平台，证书管理平台，证书流水线"
-    }],
-    // ["meta", { name: "google-site-verification",content: "V5XLTSnXoT15uQotwpxJoQolUo2d5UbSL-TacsyOsC0"}],
-      //<meta name="baidu-site-verification" content="codeva-MiWN8Y07Ua" />
-    // ["meta", {name: "baidu-site-verification",content: "codeva-MiWN8Y07Ua"}],
-    ["link", { rel: "icon", href: "/static/logo/logo.svg" }]
-  ],
-  themeConfig: {
-    logo: "/static/logo/logo.svg",
-    search: {
-      provider: "local",
-      options: {
-        detailedView: true,
-        translations: {
-          button: {
-            buttonText: "搜索文档",
-            buttonAriaLabel: "搜索文档"
-          },
-          modal: {
-            noResultsText: "无法找到相关结果",
-            resetButtonTitle: "清除查询条件",
-            footer: {
-              selectText: "选择",
-              closeText: "关闭",
-              navigateText: "切换"
+    title: "Certd",
+    titleTemplate: "开源SSL证书管理工具，证书自动化申请部署，让你的网站证书永不过期",
+    description: "Certd帮助文档,Certd是一款开源免费的全自动SSL证书管理工具；证书自动化申请部署流水线；自动证书申请、更新、续期；通配符证书，泛域名证书申请；证书自动化部署到阿里云、腾讯云、主机、群晖、宝塔。",
+    markdown: {
+        config: (md) => {
+            // Use lightbox plugin
+            md.use(lightbox, {});
+        }
+    },
+    sitemap: {
+        hostname: 'https://certd.docmirror.cn'
+    },
+    head: [
+        // [
+        //     'meta',
+        //     {
+        //         name: 'viewport',
+        //         content:
+        //           'width=device-width,initial-scale=1,minimfast-cum-scale=1.0,maximum-scale=1.0,user-scalable=no',
+        //     },
+        // ],
+        ["meta", {
+            name: "keywords",
+            content: "证书自动申请、证书自动更新、证书自动续期、证书自动续签、证书管理工具、Certd、SSL证书自动部署、证书自动化，https证书，pfx证书，der证书，TLS证书，nginx证书自动续签自动部署,SSL平台，证书管理平台，证书流水线"
+        }],
+        // ["meta", { name: "google-site-verification",content: "V5XLTSnXoT15uQotwpxJoQolUo2d5UbSL-TacsyOsC0"}],
+        //<meta name="baidu-site-verification" content="codeva-MiWN8Y07Ua" />
+        // ["meta", {name: "baidu-site-verification",content: "codeva-MiWN8Y07Ua"}],
+        ["link", {rel: "icon", href: "/static/logo/logo.svg"}]
+    ],
+    themeConfig: {
+        logo: "/static/logo/logo.svg",
+        search: {
+            provider: "local",
+            options: {
+                detailedView: true,
+                translations: {
+                    button: {
+                        buttonText: "搜索文档",
+                        buttonAriaLabel: "搜索文档"
+                    },
+                    modal: {
+                        noResultsText: "无法找到相关结果",
+                        resetButtonTitle: "清除查询条件",
+                        footer: {
+                            selectText: "选择",
+                            closeText: "关闭",
+                            navigateText: "切换"
+                        }
+                    }
+                }
             }
-          }
-        }
-      }
-    },
-    // https://vitepress.dev/reference/default-theme-config
-    nav: [
-      { text: "首页", link: "/" },
-      { text: "指南", link: "/guide/" },
-      { text: "商业版", link: "/comm/" },
-      { text: "Demo体验", link: "https://certd.handfree.work" }
-    ],
-    sidebar: {
-      "/guide/": [
-        {
-          text: "入门",
-          items: [
-            { text: "简介", link: "/guide/" },
-            { text: "快速开始", link: "/guide/start.md" },
-            {
-              text: "私有化部署",
-              items: [
-                { text: "docker部署", link: "/guide/install/docker/" },
-                { text: "宝塔面板部署", link: "/guide/install/baota/" },
-                { text: "1Panel部署", link: "/guide/install/1panel/" },
-                { text: "群晖部署", link: "/guide/use/synology/" },
-                { text: "源码部署", link: "/guide/install/source/" }
-              ]
-            },
-            { text: "演示教程", link: "/guide/tutorial.md" },
-            { text: "版本升级", link: "/guide/install/upgrade.md" }
-          ]
         },
-        {
-          text: "特性",
-          items: [
-            { text: "CNAME代理校验", link: "/guide/feature/cname/index.md" },
-            { text: "插件列表", link: "/guide/plugins.md" },
-            { text: "多数据库支持", link: "/guide/install/database.md" },
-            { text: "开放接口", link: "/guide/open/index.md" }
-          ]
-        },
-        {
-          text: "常见问题",
-          items: [
-            { text: "群晖证书部署", link: "/guide/use/synology/" },
-            { text: "腾讯云密钥获取", link: "/guide/use/tencent/" },
-            { text: "连接windows主机", link: "/guide/use/host/windows.md" },
-            { text: "Google EAB获取", link: "/guide/use/google/" },
-            { text: "阿里云相关", link: "/guide/use/aliyun/" },
-            { text: "忘记密码", link: "/guide/use/forgotpasswd/" },
-            { text: "数据备份", link: "/guide/use/backup/" },
-            { text: "Certd本身的证书更新", link: "/guide/use/https/index.md" },
-            { text: "js脚本插件使用", link: "/guide/use/custom-script/index.md" },
-            { text: "邮箱配置", link: "/guide/use/email/index.md" },
-            { text: "IPv6支持", link: "/guide/use/setting/ipv6.md" },
-          ]
-        },
-        {
-          text: "其他",
-          items: [
-            { text: "贡献代码", link: "/guide/development/index.md" },
-            { text: "更新日志", link: "/guide/changelogs/CHANGELOG.md" },
-            { text: "镜像说明", link: "/guide/image.md" },
-            { text: "联系我们", link: "/guide/contact/" },
-            { text: "捐赠", link: "/guide/donate/" },
-            { text: "开源协议", link: "/guide/license/" },
-            { text: "我的其他开源项目", link: "/guide/link/" },
+        // https://vitepress.dev/reference/default-theme-config
+        nav: [
+            {text: "首页", link: "/"},
+            {text: "指南", link: "/guide/"},
+            {text: "Demo体验", link: "https://certd.handfree.work"}
+        ],
+        sidebar: {
+            "/guide/": [
+                {
+                    text: "入门",
+                    items: [
+                        {text: "简介", link: "/guide/"},
+                        {text: "快速开始", link: "/guide/start.md"},
+                        {
+                            text: "私有化部署",
+                            items: [
+                                {text: "docker部署", link: "/guide/install/docker/"},
+                                {text: "宝塔面板部署", link: "/guide/install/baota/"},
+                                {text: "1Panel部署", link: "/guide/install/1panel/"},
+                                {text: "群晖部署", link: "/guide/use/synology/"},
+                                {text: "源码部署", link: "/guide/install/source/"}
+                            ]
+                        },
+                        {text: "演示教程", link: "/guide/tutorial.md"},
+                        {text: "版本升级", link: "/guide/install/upgrade.md"}
+                    ]
+                },
+                {
+                    text: "特性",
+                    items: [
+                        {text: "CNAME代理校验", link: "/guide/feature/cname/index.md"},
+                        {text: "插件列表", link: "/guide/plugins.md"},
+                        {text: "多数据库支持", link: "/guide/install/database.md"},
+                        {text: "开放接口", link: "/guide/open/index.md"},
+                        {
+                            text: "站点安全", items: [
+                                {text: "安全特性", link: "/guide/feature/safe"},
+                                {text: "站点隐藏", link: "/guide/feature/safe/hidden"},
+                                {text: "安全生产建议", link: "/guide/feature/safe/suggest"},
+                            ]
+                        },
 
-          ]
-        }
-      ],
-      "/deploy/":[
-        {
-          text: "部署任务",
-          items: [
-            { text: "部署到ESXi", link: "/deploy/ESXi/index.md" },
-          ]
-        }
-      ],
-      "/comm/": [
-        {
-          text: "商业版",
-          items: [
-            { text: "支付宝配置", link: "/comm/payments/alipay.md" },
-            { text: "微信支付配置", link: "/comm/payments/wxpay.md" },
-            { text: "彩虹易支付配置", link: "/comm/payments/yizhifu.md" },
-          ]
-        }
-      ]
-      ,
-    },
+                    ]
+                },
+                {
+                    text: "常见问题",
+                    items: [
+                        {text: "群晖证书部署", link: "/guide/use/synology/"},
+                        {text: "腾讯云密钥获取", link: "/guide/use/tencent/"},
+                        {text: "连接windows主机", link: "/guide/use/host/windows.md"},
+                        {text: "Google EAB获取", link: "/guide/use/google/"},
+                        {text: "阿里云相关", link: "/guide/use/aliyun/"},
+                        {text: "忘记密码", link: "/guide/use/forgotpasswd/"},
+                        {text: "数据备份", link: "/guide/use/backup/"},
+                        {text: "Certd本身的证书更新", link: "/guide/use/https/index.md"},
+                        {text: "js脚本插件使用", link: "/guide/use/custom-script/index.md"},
+                        {text: "邮箱配置", link: "/guide/use/email/index.md"},
+                        {text: "IPv6支持", link: "/guide/use/setting/ipv6.md"},
+                        {text: "其他插件使用", link: "/deploy/"},
+                        {text: "商业版说明", link: "/comm/"},
+                    ]
+                },
+                {
+                    text: "其他",
+                    items: [
+                        {text: "贡献代码", link: "/guide/development/index.md"},
+                        {text: "更新日志", link: "/guide/changelogs/CHANGELOG.md"},
+                        {text: "镜像说明", link: "/guide/image.md"},
+                        {text: "联系我们", link: "/guide/contact/"},
+                        {text: "捐赠", link: "/guide/donate/"},
+                        {text: "开源协议", link: "/guide/license/"},
+                        {text: "我的其他开源项目", link: "/guide/link/"},
 
-    socialLinks: [
-      { icon: "github", link: "https://github.com/certd/certd" }
-    ],
-    footer: {
-      message: "Certd帮助文档 |  <a href='https://beian.miit.gov.cn/' target='_blank'>粤ICP备14088435号</a> ",
-      copyright: "Copyright © 2021-present <a href='https://handfree.work/' target='_blank'>handfree.work</a> "
+                    ]
+                }
+            ],
+            "/deploy/": [
+                {
+                    text: "部署证书插件",
+                    items: [
+                        {text: "插件说明", link: "/deploy/index.md"},
+                        {text: "部署到ESXi", link: "/deploy/ESXi/index.md"},
+                    ]
+                }
+            ],
+            "/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"}
+        ],
+        footer: {
+            message: "Certd帮助文档 |  <a href='https://beian.miit.gov.cn/' target='_blank'>粤ICP备14088435号</a> ",
+            copyright: "Copyright © 2021-present <a href='https://handfree.work/' target='_blank'>handfree.work</a> "
+        }
     }
-  }
 });

docs/deploy/index.md

@@ -0,0 +1,4 @@
+# 部署插件说明
+
+## 待完善
+

docs/guide/changelogs/CHANGELOG.md

@@ -3,6 +3,69 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
+
+### Bug Fixes
+
+* 修复登录错误次数过多阻止再次登录逻辑 ([bf4d191](https://github.com/certd/certd/commit/bf4d191c8bd2f9209eb6768f662b9c77de99e998))
+
+## [1.33.2](https://github.com/certd/certd/compare/v1.33.1...v1.33.2) (2025-04-12)
+
+### Bug Fixes
+
+* 修复某些情况下无法输出日志的bug ([70101bf](https://github.com/certd/certd/commit/70101bfa7ade65678d9202c804bbae2cb808b594))
+
+### Performance Improvements
+
+* 修复内置插件分页查询逻辑 ([a2710dd](https://github.com/certd/certd/commit/a2710ddc2525e4e637fd157f0180e6d3b801c8be))
+
+## [1.33.1](https://github.com/certd/certd/compare/v1.33.0...v1.33.1) (2025-04-12)
+
+### Bug Fixes
+
+* 修复阿里云cdn证书部署失败问题，增加certname参数传入 ([965dc2c](https://github.com/certd/certd/commit/965dc2cb476f690af716f291c6b20ba98be0c8f0))
+* 修复ssh插件报length空指针的bug ([9c4cbe1](https://github.com/certd/certd/commit/9c4cbe17a22b548611cf1fbefecc83a421788e42))
+
+### Performance Improvements
+
+* 镜像支持armv7 ([f78cbed](https://github.com/certd/certd/commit/f78cbed4d817859721fdafe7d348864848d0dfbf))
+
+# [1.33.0](https://github.com/certd/certd/compare/v1.32.0...v1.33.0) (2025-04-11)
+
+### Bug Fixes
+
+* 升级mysql驱动，支持mysql8最新版本的认证 ([2f5ed3a](https://github.com/certd/certd/commit/2f5ed3aead97641f2c80d692a50226839016df0b))
+* 修复eab授权，没有email绑定的bug ([2f1683b](https://github.com/certd/certd/commit/2f1683b26acebbfb7d6e2d751435be04a4e7cab4))
+
+### Features
+
+* 支持在线自定义插件，无需源码开发 ([d0d9d68](https://github.com/certd/certd/commit/d0d9d68fe6740f6ff49fe40b7c9917c5a2e4b442))
+* **lego:** support set key type ([f3bf4fa](https://github.com/certd/certd/commit/f3bf4faee0be5bdbfdbcf70a502849ed4c8ed4c4))
+* release image to ghcr ([9b536af](https://github.com/certd/certd/commit/9b536af9e656dc89e2a87078c129cad6f591e467))
+
+### Performance Improvements
+
+* 修复tab页缓存问题 ([64e5449](https://github.com/certd/certd/commit/64e5449ab3c6b219b0e89eddad14bfb6b71a0650))
+* 隐藏运行策略选项 ([2951df0](https://github.com/certd/certd/commit/2951df0cd94c23e2efee84ff1b843055aac56cae))
+* 增加手动上传证书功能说明 ([5d083a1](https://github.com/certd/certd/commit/5d083a153637caddbc6f44e915d9fb2d1ae87b33))
+
+# [1.32.0](https://github.com/certd/certd/compare/v1.31.11...v1.32.0) (2025-04-04)
+
+### Bug Fixes
+
+* 创建cname记录移除域名两端的空格 ([903a413](https://github.com/certd/certd/commit/903a4131ab5f42c8286cd2150ed1032d486fda2f))
+* 修复从本地dns获取记录报错的bug ([c39b1bf](https://github.com/certd/certd/commit/c39b1bf823ddc6216bed2049e4c87e6107def08a))
+
+### Features
+
+* 优化证书申请速度，修复某些情况下letsencrypt 校验失败的问题 ([857589b](https://github.com/certd/certd/commit/857589b365c6f709e0ae67914d2f50ce182e6dd6))
+
+### Performance Improvements
+
+* 优化华为dns解析记录创建和删除问题 ([0948c5b](https://github.com/certd/certd/commit/0948c5bc691d2ee6eb47c72a85da1b7453361878))
+* 又拍云支持云存储 ([9339b78](https://github.com/certd/certd/commit/9339b78f801d193472c0af25749e8e7a27ffb7af))
+* 又拍云支持云存储 ([8449f85](https://github.com/certd/certd/commit/8449f8580da90c1f6b5d02d07c3236ebaf6cf161))
+
 ## [1.31.11](https://github.com/certd/certd/compare/v1.31.10...v1.31.11) (2025-04-02)
 
 ### Bug Fixes

docs/guide/feature/safe/hidden/index.md

@@ -0,0 +1,25 @@
+# 站点隐藏
+
+* 一般来说Certd设置好之后，很少需要访问。
+* 所以我们`平时`可以把`站点访问关闭`，需要的时候再打开，减少站点被攻击的风险    
+
+## 1、开启站点隐藏
+`系统管理->系统设置->安全设置->站点隐藏 `  
+
+
+![](./images/hidden1.png)
+
+:::warning  
+
+注意保存好`解除地址`和`解除密码`   
+
+::: 
+
+## 2、临时关闭站点隐藏
+
+访问上面的`解除地址`，输入`解除密码`，`临时解除`站点隐藏
+
+![](./images/hidden2.png)
+
+## 3、忘记解除地址和解除密码怎么办
+登录服务器，在数据库平级的目录下创建`.unhidden`文件即可`临时解除`站点隐藏

docs/guide/feature/safe/index.md

@@ -0,0 +1,34 @@
+# 站点安全特性
+
+Certd 存储了证书以及授权等敏感数据，所以需要严格保障安全。
+我们非常重视您的数据安全，提供了以下安全特性
+
+## 1、 授权数据加密存储【默认开启】
+* 所有的授权敏感字段会加密后存储
+* 每个用户独立维护授权数据，连管理员都无权查看
+
+![星号部分为加密数据](./images/access.png)
+星号部分为加密数据
+
+## 2、 密码防爆破【默认开启】
+* 登录失败次数过多，账号将被锁定，最高24小时(重启服务可解除锁定)
+* 用户登录密码加密hash后存储，无法计算出密码明文
+  ![](./images/login.png)
+
+## 3、站点隐藏【建议开启】
+* 一般来说Certd设置好之后，后续很少需要访问修改。
+* 所以我们平时可以把站点访问关闭，需要的时候再打开，减少站点被攻击的风险    
+* 请前往 `系统管理->系统设置->安全设置->开启站点隐藏`
+* [站点隐藏设置说明](./hidden/)
+  ![](./images/hidden.png)
+
+## 4、登录二次验证
+
+待实现
+
+## 5、数据库自动备份【建议开启】
+* [自动备份设置说明](../../use/backup/)
+
+
+## 更多安全生产建议
+[安全生产建议](./suggest.md)

docs/guide/feature/safe/suggest.md

@@ -0,0 +1,10 @@
+# 安全生产建议
+
+尽管`Cert`本身实现了很多安全特性，但`外部环境的安全`仍需要您来确保。    
+请`务必`遵循如下建议做好安全防护
+
+* 请`务必`使用`HTTPS协议`访问本应用，避免被中间人攻击
+* 请`务必`使用`web应用防火墙`防护本应用，防止XSS、SQL注入等攻击
+* 请`务必`做好`服务器本身`的安全防护，防止数据库泄露
+* 请`务必`做好[`数据备份`](../../use/backup/)，避免数据丢失
+* 建议开启[`站点隐藏`](./hidden/)功能

docs/guide/image.md

@@ -9,6 +9,10 @@
 * `greper/certd:latest`
 * `greper/certd:armv7`、`greper/certd:[version]-armv7`
 
+## GitHub Packages地址:
+* `ghcr.io/certd/certd:latest`
+* `ghcr.io/certd/certd:armv7`、`ghcr.io/certd/certd:[version]-armv7`
+* 
 ## 镜像构建公开
 镜像构建通过`Actions`自动执行，过程公开透明，请放心使用   
 * [点我查看镜像构建日志](https://github.com/certd/certd/actions/workflows/build-image.yml)

docs/guide/index.md

@@ -17,6 +17,8 @@ Certd 是一款开源、免费、全自动申请和部署更新SSL证书的工
 * 支持SQLite、Postgresql、MySQL数据库
 
 
+  ![](../images/intro/intro.svg)
+
 ## 二、一些说明
 * 本项目申请证书过程遵循acme协议
 * 需要验证域名所有权，一般有两种方式

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.32.0"
+  "version": "1.33.4"
 }

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.4](https://github.com/publishlab/node-acme-client/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.33.3](https://github.com/publishlab/node-acme-client/compare/v1.33.2...v1.33.3) (2025-04-14)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.33.2](https://github.com/publishlab/node-acme-client/compare/v1.33.1...v1.33.2) (2025-04-12)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.33.1](https://github.com/publishlab/node-acme-client/compare/v1.33.0...v1.33.1) (2025-04-12)
+
+**Note:** Version bump only for package @certd/acme-client
+
+# [1.33.0](https://github.com/publishlab/node-acme-client/compare/v1.32.0...v1.33.0) (2025-04-11)
+
+**Note:** Version bump only for package @certd/acme-client
+
 # [1.32.0](https://github.com/publishlab/node-acme-client/compare/v1.31.11...v1.32.0) (2025-04-04)
 
 ### Bug Fixes

packages/core/acme-client/package.json

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

packages/core/basic/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.33.2](https://github.com/certd/certd/compare/v1.33.1...v1.33.2) (2025-04-12)
+
+### Bug Fixes
+
+* 修复某些情况下无法输出日志的bug ([70101bf](https://github.com/certd/certd/commit/70101bfa7ade65678d9202c804bbae2cb808b594))
+
+## [1.33.1](https://github.com/certd/certd/compare/v1.33.0...v1.33.1) (2025-04-12)
+
+**Note:** Version bump only for package @certd/basic
+
+# [1.33.0](https://github.com/certd/certd/compare/v1.32.0...v1.33.0) (2025-04-11)
+
+**Note:** Version bump only for package @certd/basic
+
 # [1.32.0](https://github.com/certd/certd/compare/v1.31.11...v1.32.0) (2025-04-04)
 
 **Note:** Version bump only for package @certd/basic

packages/core/basic/build.md

@@ -1 +1 @@
-01:33
+23:45

packages/core/basic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.32.0",
+  "version": "1.33.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -44,5 +44,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "8374c3941a9d1398989b8f38fd4bfa2a2f29937b"
+  "gitHead": "0730f5ff4f176452f82489caa837b717e176fdca"
 }

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

@@ -1,18 +1,18 @@
-import crypto, { BinaryToTextEncoding } from 'crypto';
+import crypto, { BinaryToTextEncoding } from "crypto";
 
-function md5(data: string, digest: BinaryToTextEncoding = 'hex') {
-  return crypto.createHash('md5').update(data).digest(digest);
+function md5(data: string, digest: BinaryToTextEncoding = "hex") {
+  return crypto.createHash("md5").update(data).digest(digest);
 }
-function sha256(data: string, digest: BinaryToTextEncoding = 'hex') {
-  return crypto.createHash('sha256').update(data).digest(digest);
+function sha256(data: string, digest: BinaryToTextEncoding = "hex") {
+  return crypto.createHash("sha256").update(data).digest(digest);
 }
 
-function hmacSha256(data: string, digest: BinaryToTextEncoding = 'base64') {
-  return crypto.createHmac('sha256', data).update(Buffer.alloc(0)).digest(digest);
+function hmacSha256(data: string, digest: BinaryToTextEncoding = "base64") {
+  return crypto.createHmac("sha256", data).update(Buffer.alloc(0)).digest(digest);
 }
 
 function base64(data: string) {
-  return Buffer.from(data).toString('base64');
+  return Buffer.from(data).toString("base64");
 }
 export const hashUtils = {
   md5,

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

@@ -1,4 +1,4 @@
-import log4js, { LoggingEvent, Logger } from 'log4js';
+import log4js, { LoggingEvent, Logger } from "log4js";
 
 const OutputAppender = {
   configure: (config: any, layouts: any, findAppender: any, levels: any) => {
@@ -21,17 +21,31 @@ const OutputAppender = {
 export function resetLogConfigure() {
   // @ts-ignore
   log4js.configure({
-    appenders: { std: { type: 'stdout' }, output: { type: OutputAppender } },
-    categories: { default: { appenders: ['std'], level: 'info' }, pipeline: { appenders: ['std', 'output'], level: 'info' } },
+    appenders: { std: { type: "stdout" }, output: { type: OutputAppender } },
+    categories: { default: { appenders: ["std"], level: "info" }, pipeline: { appenders: ["std", "output"], level: "info" } },
   });
 }
 resetLogConfigure();
-export const logger = log4js.getLogger('default');
+export const logger = log4js.getLogger("default");
 
 export function buildLogger(write: (text: string) => void) {
-  const logger = log4js.getLogger('pipeline');
-  logger.addContext('outputHandler', {
-    write,
+  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) {
+        if (item == null) {
+          continue;
+        }
+        //换成同长度的*号， item可能有多行
+        text = text.replaceAll(item, "*".repeat(item.length));
+      }
+      write(text);
+    },
   });
   return logger;
 }

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.33.2](https://github.com/certd/certd/compare/v1.33.1...v1.33.2) (2025-04-12)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.33.1](https://github.com/certd/certd/compare/v1.33.0...v1.33.1) (2025-04-12)
+
+### Bug Fixes
+
+* 修复ssh插件报length空指针的bug ([9c4cbe1](https://github.com/certd/certd/commit/9c4cbe17a22b548611cf1fbefecc83a421788e42))
+
+# [1.33.0](https://github.com/certd/certd/compare/v1.32.0...v1.33.0) (2025-04-11)
+
+### Performance Improvements
+
+* 隐藏运行策略选项 ([2951df0](https://github.com/certd/certd/commit/2951df0cd94c23e2efee84ff1b843055aac56cae))
+
 # [1.32.0](https://github.com/certd/certd/compare/v1.31.11...v1.32.0) (2025-04-04)
 
 **Note:** Version bump only for package @certd/pipeline

packages/core/pipeline/package.json

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

packages/core/pipeline/src/access/decorator.ts

@@ -26,7 +26,9 @@ export function IsAccess(define: AccessDefine): ClassDecorator {
     target.define = define;
     accessRegistry.register(define.name, {
       define,
-      target,
+      target: async () => {
+        return target;
+      },
     });
   };
 }
@@ -39,13 +41,15 @@ export function AccessInput(input?: AccessInputDefine): PropertyDecorator {
   };
 }
 
-export function newAccess(type: string, input: any, ctx?: AccessContext) {
+export async function newAccess(type: string, input: any, ctx?: AccessContext) {
   const register = accessRegistry.get(type);
   if (register == null) {
     throw new Error(`access ${type} not found`);
   }
   // @ts-ignore
-  const access = new register.target();
+  const accessCls = await register.target();
+  // @ts-ignore
+  const access = new accessCls();
   for (const key in input) {
     access[key] = input[key];
   }
@@ -57,5 +61,6 @@ export function newAccess(type: string, input: any, ctx?: AccessContext) {
     };
   }
   access.setCtx(ctx);
+  access._type = type;
   return access;
 }

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

@@ -1,6 +1,6 @@
 import { ConcurrencyStrategy, NotificationWhen, Pipeline, ResultType, Runnable, RunStrategy, Stage, Step, Task, ResultError } from "../dt/index.js";
 import { RunHistory, RunnableCollection } from "./run-history.js";
-import { AbstractTaskPlugin, PluginDefine, pluginRegistry, TaskInstanceContext, UserInfo } from "../plugin/index.js";
+import { AbstractTaskPlugin, ITaskPlugin, PluginDefine, pluginRegistry, TaskInstanceContext, UserInfo } from "../plugin/index.js";
 import { ContextFactory, IContext } from "./context.js";
 import { IStorage } from "./storage.js";
 import { createAxiosService, hashUtils, HttpRequestConfig, ILogger, logger, utils } from "@certd/basic";
@@ -261,6 +261,7 @@ export class Executor {
     const resList: ResultType[] = [];
     for (const step of task.steps) {
       step.runnableType = "step";
+      // @ts-ignore
       const res: ResultType = await this.runWithHistory(step, "step", async () => {
         return await this.runStep(step);
       });
@@ -276,8 +277,18 @@ export class Executor {
     //执行任务
     const plugin: RegistryItem<AbstractTaskPlugin> = pluginRegistry.get(step.type);
 
-    // @ts-ignore
-    const instance: ITaskPlugin = new plugin.target();
+    //@ts-ignore
+    let instance: ITaskPlugin = null;
+    try {
+      //@ts-ignore
+      const pluginCls = await plugin.target();
+      //@ts-ignore
+      instance = new pluginCls();
+    } catch (e: any) {
+      currentLogger.error(`实例化插件失败:${e.message}`);
+      throw new Error(`实例化插件失败`, e);
+    }
+
     // @ts-ignore
     const define: PluginDefine = plugin.define;
     const pluginName = define.name;

packages/core/pipeline/src/core/run-history.ts

@@ -150,11 +150,11 @@ export class RunnableCollection {
       pipeline.stages = [];
       return;
     }
-    pipeline.stages.forEach((stage) => {
+    pipeline.stages.forEach(stage => {
       stage.runnableType = "stage";
-      stage.tasks.forEach((task) => {
+      stage.tasks.forEach(task => {
         task.runnableType = "task";
-        task.steps.forEach((step) => {
+        task.steps.forEach(step => {
           step.runnableType = "step";
         });
       });
@@ -162,7 +162,7 @@ export class RunnableCollection {
   }
 
   static each<T extends Runnable>(list: T[], exec: (item: Runnable) => void) {
-    list.forEach((item) => {
+    list.forEach(item => {
       exec(item);
       if (item.runnableType === "pipeline") {
         // @ts-ignore
@@ -179,7 +179,7 @@ export class RunnableCollection {
   public toMap(pipeline: Pipeline) {
     const map: RunnableMap = {};
 
-    RunnableCollection.each(pipeline.stages, (item) => {
+    RunnableCollection.each(pipeline.stages, item => {
       map[item.id] = item;
     });
     return map;
@@ -193,7 +193,7 @@ export class RunnableCollection {
     if (!this.pipeline) {
       return;
     }
-    RunnableCollection.each(this.pipeline.stages, (item) => {
+    RunnableCollection.each(this.pipeline.stages, item => {
       item.status = undefined;
     });
   }

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

@@ -26,7 +26,9 @@ export function IsNotification(define: NotificationDefine): ClassDecorator {
     target.define = define;
     notificationRegistry.register(define.name, {
       define,
-      target,
+      target: async () => {
+        return target;
+      },
     });
   };
 }
@@ -44,9 +46,10 @@ export async function newNotification(type: string, input: any, ctx: Notificatio
   if (register == null) {
     throw new Error(`notification ${type} not found`);
   }
-
   // @ts-ignore
-  const plugin = new register.target();
+  const pluginCls = await register.target();
+  // @ts-ignore
+  const plugin = new pluginCls();
   merge(plugin, input);
   if (!ctx) {
     throw new Error("ctx is required");

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

@@ -1,7 +1,7 @@
 import { Registrable } from "../registry/index.js";
 import { FileItem, FormItemProps, Pipeline, Runnable, Step } from "../dt/index.js";
 import { FileStore } from "../core/file-store.js";
-import { IAccessService } from "../access/index.js";
+import { accessRegistry, IAccessService } from "../access/index.js";
 import { ICnameProxyService, IEmailService, IServiceGetter, IUrlService } from "../service/index.js";
 import { CancelError, IContext, RunHistory, RunnableCollection } from "../core/index.js";
 import { HttpRequestConfig, ILogger, logger, utils } from "@certd/basic";
@@ -64,6 +64,9 @@ export type PluginDefine = Registrable & {
     };
   };
   needPlus?: boolean;
+  showRunStrategy?: boolean;
+  pluginType?: string; //类型
+  type?: string; //来源
 };
 
 export type ITaskPlugin = {
@@ -155,14 +158,35 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
     this.http = ctx.http;
   }
 
-  async getAccess<T = any>(accessId: string) {
+  async getAccess<T = any>(accessId: string | number, isCommon = false) {
     if (accessId == null) {
       throw new Error("您还没有配置授权");
     }
-    const res = await this.ctx.accessService.getById(accessId);
+    let res: any = null;
+    if (isCommon) {
+      res = await this.ctx.accessService.getCommonById(accessId);
+    } else {
+      res = await this.ctx.accessService.getById(accessId);
+    }
     if (res == null) {
       throw new Error("授权不存在，可能已被删除，请前往任务配置里面重新选择授权");
     }
+    // @ts-ignore
+    if (this.logger?.addSecret) {
+      // 隐藏加密信息，不在日志中输出
+      const type = res._type;
+      const plugin = accessRegistry.get(type);
+      const define = plugin.define;
+      // @ts-ignore
+      const input = define.input;
+      for (const key in input) {
+        if (input[key].encrypt && res[key] != null) {
+          // @ts-ignore
+          this.logger.addSecret(res[key]);
+        }
+      }
+    }
+
     return res as T;
   }
 

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

@@ -48,14 +48,26 @@ export function IsTaskPlugin(define: PluginDefine): ClassDecorator {
       inputMap[item[0]] = item[1];
     });
 
-    merge(define, { input: inputMap, autowire: autowires, output: outputs });
+    const defaultConfig = {
+      showRunStrategy: false,
+      default: {
+        strategy: {
+          runStrategy: 1, // 0:正常执行，1:成功后跳过
+        },
+      },
+    };
+
+    define = merge(defaultConfig, define, { input: inputMap, autowire: autowires, output: outputs });
 
     Reflect.defineMetadata(PLUGIN_CLASS_KEY, define, target);
 
     target.define = define;
+
     pluginRegistry.register(define.name, {
       define,
-      target,
+      target: async () => {
+        return target;
+      },
     });
   };
 }

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

@@ -3,14 +3,23 @@ import { AbstractTaskPlugin } from "./api.js";
 import { pluginGroups } from "./group.js";
 
 const onRegister = ({ key, value }: OnRegisterContext<AbstractTaskPlugin>) => {
+  //如果有相同名字的先移除
+
+  for (const group of Object.values(pluginGroups)) {
+    const index = group.plugins.findIndex(plugin => plugin.name === key);
+    if (index > -1) {
+      group.plugins.splice(index, 1);
+    }
+  }
+
   const group = value?.define?.group as string;
   if (group) {
     if (pluginGroups.hasOwnProperty(group)) {
       // @ts-ignore
       pluginGroups[group].plugins.push(value.define);
-    } else {
-      pluginGroups.other.plugins.push(value.define);
+      return;
     }
   }
+  pluginGroups.other.plugins.push(value.define);
 };
 export const pluginRegistry = createRegistry<AbstractTaskPlugin>("plugin", onRegister);

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

@@ -8,10 +8,10 @@ export type Registrable = {
   deprecated?: string;
   order?: number;
 };
-
+export type TargetGetter<T> = () => Promise<T>;
 export type RegistryItem<T> = {
   define: Registrable;
-  target: T;
+  target: TargetGetter<T>;
 };
 
 export type OnRegisterContext<T> = {

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

@@ -4,5 +4,5 @@ export * from "./config.js";
 export * from "./url.js";
 export * from "./emit.js";
 export type IServiceGetter = {
-  get: (name: string) => Promise<any>;
+  get: <T>(name: string) => Promise<T>;
 };

packages/libs/lib-huawei/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.33.2](https://github.com/certd/certd/compare/v1.33.1...v1.33.2) (2025-04-12)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.33.1](https://github.com/certd/certd/compare/v1.33.0...v1.33.1) (2025-04-12)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+# [1.33.0](https://github.com/certd/certd/compare/v1.32.0...v1.33.0) (2025-04-11)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 # [1.32.0](https://github.com/certd/certd/compare/v1.31.11...v1.32.0) (2025-04-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.32.0",
+  "version": "1.33.4",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
   "types": "./dist/d/index.d.ts",
@@ -23,5 +23,5 @@
     "prettier": "^2.8.8",
     "tslib": "^2.8.1"
   },
-  "gitHead": "8374c3941a9d1398989b8f38fd4bfa2a2f29937b"
+  "gitHead": "0730f5ff4f176452f82489caa837b717e176fdca"
 }

packages/libs/lib-iframe/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.33.2](https://github.com/certd/certd/compare/v1.33.1...v1.33.2) (2025-04-12)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.33.1](https://github.com/certd/certd/compare/v1.33.0...v1.33.1) (2025-04-12)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+# [1.33.0](https://github.com/certd/certd/compare/v1.32.0...v1.33.0) (2025-04-11)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
 # [1.32.0](https://github.com/certd/certd/compare/v1.31.11...v1.32.0) (2025-04-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.32.0",
+  "version": "1.33.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -30,5 +30,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "8374c3941a9d1398989b8f38fd4bfa2a2f29937b"
+  "gitHead": "0730f5ff4f176452f82489caa837b717e176fdca"
 }

packages/libs/lib-jdcloud/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.33.2](https://github.com/certd/certd/compare/v1.33.1...v1.33.2) (2025-04-12)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.33.1](https://github.com/certd/certd/compare/v1.33.0...v1.33.1) (2025-04-12)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+# [1.33.0](https://github.com/certd/certd/compare/v1.32.0...v1.33.0) (2025-04-11)
+
+**Note:** Version bump only for package @certd/jdcloud
+
 # [1.32.0](https://github.com/certd/certd/compare/v1.31.11...v1.32.0) (2025-04-04)
 
 **Note:** Version bump only for package @certd/jdcloud

packages/libs/lib-jdcloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/jdcloud",
-  "version": "1.32.0",
+  "version": "1.33.4",
   "description": "jdcloud openApi sdk",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
@@ -60,5 +60,5 @@
       "fetch"
     ]
   },
-  "gitHead": "8374c3941a9d1398989b8f38fd4bfa2a2f29937b"
+  "gitHead": "0730f5ff4f176452f82489caa837b717e176fdca"
 }

packages/libs/lib-k8s/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.33.2](https://github.com/certd/certd/compare/v1.33.1...v1.33.2) (2025-04-12)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.33.1](https://github.com/certd/certd/compare/v1.33.0...v1.33.1) (2025-04-12)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+# [1.33.0](https://github.com/certd/certd/compare/v1.32.0...v1.33.0) (2025-04-11)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 # [1.32.0](https://github.com/certd/certd/compare/v1.31.11...v1.32.0) (2025-04-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.32.0",
+  "version": "1.33.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -16,7 +16,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/basic": "^1.32.0",
+    "@certd/basic": "^1.33.4",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
@@ -31,5 +31,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "8374c3941a9d1398989b8f38fd4bfa2a2f29937b"
+  "gitHead": "0730f5ff4f176452f82489caa837b717e176fdca"
 }

packages/libs/lib-server/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.33.2](https://github.com/certd/certd/compare/v1.33.1...v1.33.2) (2025-04-12)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.33.1](https://github.com/certd/certd/compare/v1.33.0...v1.33.1) (2025-04-12)
+
+**Note:** Version bump only for package @certd/lib-server
+
+# [1.33.0](https://github.com/certd/certd/compare/v1.32.0...v1.33.0) (2025-04-11)
+
+**Note:** Version bump only for package @certd/lib-server
+
 # [1.32.0](https://github.com/certd/certd/compare/v1.31.11...v1.32.0) (2025-04-04)
 
 **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.32.0",
+  "version": "1.33.4",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -27,10 +27,10 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.32.0",
-    "@certd/basic": "^1.32.0",
-    "@certd/pipeline": "^1.32.0",
-    "@certd/plus-core": "^1.32.0",
+    "@certd/acme-client": "^1.33.4",
+    "@certd/basic": "^1.33.4",
+    "@certd/pipeline": "^1.33.4",
+    "@certd/plus-core": "^1.33.4",
     "@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": "8374c3941a9d1398989b8f38fd4bfa2a2f29937b"
+  "gitHead": "0730f5ff4f176452f82489caa837b717e176fdca"
 }

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

@@ -217,4 +217,20 @@ export abstract class BaseService<T> {
     }
     throw new PermissionException('权限不足');
   }
+
+  async batchDelete(ids: number[], userId: number) {
+    if(userId >0){
+      const list = await this.getRepository().find({
+        where: {
+          // @ts-ignore
+          id: In(ids),
+          userId,
+        },
+      })
+      // @ts-ignore
+      ids = list.map(item => item.id)
+    }
+
+    await this.delete(ids);
+  }
 }

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

@@ -66,10 +66,15 @@ export const Constants = {
       code: 404,
       message: '页面/文件/资源不存在',
     },
+
     preview: {
       code: 10001,
       message: '对不起，预览环境不允许修改此数据',
     },
+    siteOff:{
+      code: 10010,
+      message: '站点已关闭',
+    },
     openKeyError: {
       code: 20000,
       message: 'ApiToken错误',

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

@@ -7,3 +7,4 @@ export * from './vip-exception.js';
 export * from './common-exception.js';
 export * from './not-found-exception.js';
 export * from './param-exception.js';
+export * from './site-off-exception.js';

packages/libs/lib-server/src/basic/exception/site-off-exception.ts

@@ -0,0 +1,9 @@
+import { Constants } from '../constants.js';
+import { BaseException } from './base-exception.js';
+/**
+ */
+export class SiteOffException extends BaseException {
+  constructor(message) {
+    super('SiteOffException', Constants.res.siteOff.code, message ? message : Constants.res.siteOff.message);
+  }
+}

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

@@ -171,7 +171,7 @@ export class SysSuiteSetting extends BaseSettings {
   static __key__ = 'sys.suite';
   static __access__ = 'private';
 
-  enabled = false;
+  enabled:boolean = false;
 
   registerGift?: {
     productId: number;
@@ -180,3 +180,25 @@ export class SysSuiteSetting extends BaseSettings {
 
   intro?: string;
 }
+
+
+export type SiteHidden = {
+  enabled: boolean;
+  openPath?: string;
+  //md5 hash 两次后保存
+  openPassword?: string;
+  autoHiddenTimes?: number;
+  hiddenOpenApi?: boolean
+};
+export class SysSafeSetting extends BaseSettings {
+  static __title__ = '站点安全设置';
+  static __key__ = 'sys.safe';
+  static __access__ = 'private';
+
+  // 站点隐藏
+  hidden:SiteHidden = {
+    enabled: false,
+    hiddenOpenApi:false,
+    autoHiddenTimes: 5,
+  };
+}

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

@@ -140,7 +140,7 @@ export class AccessService extends BaseService<AccessEntity> {
       id: entity.id,
       ...setting,
     };
-    return newAccess(entity.type, input);
+    return await newAccess(entity.type, input);
   }
 
   async getById(id: any, userId: number): Promise<any> {

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

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.33.2](https://github.com/certd/certd/compare/v1.33.1...v1.33.2) (2025-04-12)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.33.1](https://github.com/certd/certd/compare/v1.33.0...v1.33.1) (2025-04-12)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+# [1.33.0](https://github.com/certd/certd/compare/v1.32.0...v1.33.0) (2025-04-11)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
 # [1.32.0](https://github.com/certd/certd/compare/v1.31.11...v1.32.0) (2025-04-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.32.0",
+  "version": "1.33.4",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -46,5 +46,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "8374c3941a9d1398989b8f38fd4bfa2a2f29937b"
+  "gitHead": "0730f5ff4f176452f82489caa837b717e176fdca"
 }

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.33.2](https://github.com/certd/certd/compare/v1.33.1...v1.33.2) (2025-04-12)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.33.1](https://github.com/certd/certd/compare/v1.33.0...v1.33.1) (2025-04-12)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+# [1.33.0](https://github.com/certd/certd/compare/v1.32.0...v1.33.0) (2025-04-11)
+
+### Bug Fixes
+
+* 修复eab授权，没有email绑定的bug ([2f1683b](https://github.com/certd/certd/commit/2f1683b26acebbfb7d6e2d751435be04a4e7cab4))
+
+### Features
+
+* **lego:** support set key type ([f3bf4fa](https://github.com/certd/certd/commit/f3bf4faee0be5bdbfdbcf70a502849ed4c8ed4c4))
+
+### Performance Improvements
+
+* 增加手动上传证书功能说明 ([5d083a1](https://github.com/certd/certd/commit/5d083a153637caddbc6f44e915d9fb2d1ae87b33))
+
 # [1.32.0](https://github.com/certd/certd/compare/v1.31.11...v1.32.0) (2025-04-04)
 
 **Note:** Version bump only for package @certd/plugin-cert

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.32.0",
+  "version": "1.33.4",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -15,10 +15,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.32.0",
-    "@certd/basic": "^1.32.0",
-    "@certd/pipeline": "^1.32.0",
-    "@certd/plugin-lib": "^1.32.0",
+    "@certd/acme-client": "^1.33.4",
+    "@certd/basic": "^1.33.4",
+    "@certd/pipeline": "^1.33.4",
+    "@certd/plugin-lib": "^1.33.4",
     "@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": "8374c3941a9d1398989b8f38fd4bfa2a2f29937b"
+  "gitHead": "0730f5ff4f176452f82489caa837b717e176fdca"
 }

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

@@ -33,7 +33,7 @@ export class EabAccess extends BaseAccess {
     component: {
       placeholder: "绑定一个邮箱",
     },
-    rules: { type: "email", message: "请输入正确的邮箱" },
+    rules: [{ type: "email", message: "请输入正确的邮箱" }],
     helper: "Google的EAB申请证书，更换邮箱会导致EAB失效，可以在此处绑定一个邮箱避免此问题",
     required: true,
   })

packages/plugins/plugin-cert/src/dns-provider/api.ts

@@ -27,6 +27,7 @@ export type DnsProviderContext = {
   logger: ILogger;
   http: HttpClient;
   utils: typeof utils;
+  domainParser: IDomainParser;
 };
 
 export interface IDnsProvider<T = any> {
@@ -35,3 +36,11 @@ export interface IDnsProvider<T = any> {
   removeRecord(options: RemoveRecordOptions<T>): Promise<void>;
   setCtx(ctx: DnsProviderContext): void;
 }
+
+export interface ISubDomainsGetter {
+  getSubDomains(): Promise<string[]>;
+}
+
+export interface IDomainParser {
+  parse(fullDomain: string): Promise<string>;
+}

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

@@ -1,6 +1,4 @@
 import { CreateRecordOptions, DnsProviderContext, DnsProviderDefine, IDnsProvider, RemoveRecordOptions } from "./api.js";
-//@ts-ignore
-import psl from "psl";
 import { dnsProviderRegistry } from "./registry.js";
 import { Decorator } from "@certd/pipeline";
 import { HttpClient, ILogger } from "@certd/basic";
@@ -16,6 +14,10 @@ export abstract class AbstractDnsProvider<T = any> implements IDnsProvider<T> {
     this.http = ctx.http;
   }
 
+  async parseDomain(fullDomain: string) {
+    return await this.ctx.domainParser.parse(fullDomain);
+  }
+
   abstract createRecord(options: CreateRecordOptions): Promise<T>;
 
   abstract onInstance(): Promise<void>;
@@ -23,14 +25,6 @@ export abstract class AbstractDnsProvider<T = any> implements IDnsProvider<T> {
   abstract removeRecord(options: RemoveRecordOptions<T>): Promise<void>;
 }
 
-export function parseDomain(fullDomain: string) {
-  const parsed = psl.parse(fullDomain) as psl.ParsedDomain;
-  if (parsed.error) {
-    throw new Error(`解析${fullDomain}域名失败:` + JSON.stringify(parsed.error));
-  }
-  return parsed.domain as string;
-}
-
 export async function createDnsProvider(opts: { dnsProviderType: string; context: DnsProviderContext }): Promise<IDnsProvider> {
   const { dnsProviderType, context } = opts;
   const dnsProviderPlugin = dnsProviderRegistry.get(dnsProviderType);

packages/plugins/plugin-cert/src/dns-provider/domain-parser.ts

@@ -0,0 +1,32 @@
+import { IDomainParser, ISubDomainsGetter } from "./api";
+//@ts-ignore
+import psl from "psl";
+
+export class DomainParser implements IDomainParser {
+  subDomainsGetter: ISubDomainsGetter;
+  constructor(subDomainsGetter: ISubDomainsGetter) {
+    this.subDomainsGetter = subDomainsGetter;
+  }
+
+  parseDomain(fullDomain: string) {
+    const parsed = psl.parse(fullDomain) as psl.ParsedDomain;
+    if (parsed.error) {
+      throw new Error(`解析${fullDomain}域名失败:` + JSON.stringify(parsed.error));
+    }
+    return parsed.domain as string;
+  }
+
+  async parse(fullDomain: string) {
+    const subDomains = await this.subDomainsGetter.getSubDomains();
+    if (subDomains && subDomains.length > 0) {
+      for (const subDomain of subDomains) {
+        if (fullDomain.endsWith(subDomain)) {
+          //找到子域名托管
+          return subDomain;
+        }
+      }
+    }
+
+    return this.parseDomain(fullDomain);
+  }
+}

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

@@ -5,8 +5,9 @@ import * as _ from "lodash-es";
 import { Challenge } from "@certd/acme-client/types/rfc8555";
 import { IContext } from "@certd/pipeline";
 import { ILogger, utils } from "@certd/basic";
-import { IDnsProvider, parseDomain } from "../../dns-provider/index.js";
+import { IDnsProvider, IDomainParser } from "../../dns-provider/index.js";
 import { HttpChallengeUploader } from "./uploads/api.js";
+
 export type CnameVerifyPlan = {
   type?: string;
   domain: string;
@@ -61,6 +62,8 @@ type AcmeServiceOptions = {
   privateKeyType?: PrivateKeyType;
   signal?: AbortSignal;
   maxCheckRetryCount?: number;
+  userId: number;
+  domainParser: IDomainParser;
 };
 
 export class AcmeService {
@@ -174,7 +177,7 @@ export class AcmeService {
     this.logger.info("Triggered challengeCreateFn()");
 
     const fullDomain = authz.identifier.value;
-    let domain = parseDomain(fullDomain);
+    let domain = await this.options.domainParser.parse(fullDomain);
     this.logger.info("主域名为：" + domain);
 
     const getChallenge = (type: string) => {
@@ -240,7 +243,7 @@ export class AcmeService {
             const cname = cnameVerifyPlan[fullDomain];
             if (cname) {
               dnsProvider = cname.dnsProvider;
-              domain = parseDomain(cname.domain);
+              domain = await this.options.domainParser.parse(cname.domain);
               fullRecord = cname.fullRecord;
             }
           } else {

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

@@ -27,7 +27,8 @@ export abstract class CertApplyBaseConvertPlugin extends AbstractTaskPlugin {
       "1、支持多个域名打到一个证书上，例如： foo.com，*.foo.com，*.bar.com\n" +
       "2、子域名被通配符包含的不要填写，例如：www.foo.com已经被*.foo.com包含，不要填写www.foo.com\n" +
       "3、泛域名只能通配*号那一级（*.foo.com的证书不能用于xxx.yyy.foo.com、不能用于foo.com）\n" +
-      "4、输入一个，空格之后，再输入下一个",
+      "4、输入一个，空格之后，再输入下一个\n" +
+      "5、如果你配置了子域托管解析，请先[设置托管子域名](#/certd/pipeline/subDomain)",
   })
   domains!: string[];
 

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

@@ -9,9 +9,9 @@ export type { CertInfo };
 @IsTaskPlugin({
   name: "CertApplyUpload",
   icon: "ph:certificate",
-  title: "证书手动上传",
+  title: "商用证书托管",
   group: pluginGroups.cert.key,
-  desc: "在证书仓库手动上传后触发部署证书",
+  desc: "手动上传自定义证书后，自动部署（每次证书有更新，都需要手动上传一次）",
   default: {
     strategy: {
       runStrategy: RunStrategy.AlwaysRun,

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

@@ -4,12 +4,13 @@ import { utils } from "@certd/basic";
 import type { CertInfo, CnameVerifyPlan, DomainsVerifyPlan, HttpVerifyPlan, PrivateKeyType, SSLProvider } from "./acme.js";
 import { AcmeService } from "./acme.js";
 import * as _ from "lodash-es";
-import { createDnsProvider, DnsProviderContext, IDnsProvider } from "../../dns-provider/index.js";
+import { createDnsProvider, DnsProviderContext, IDnsProvider, ISubDomainsGetter } from "../../dns-provider/index.js";
 import { CertReader } from "./cert-reader.js";
 import { CertApplyBasePlugin } from "./base.js";
 import { GoogleClient } from "../../libs/google.js";
 import { EabAccess } from "../../access";
 import { httpChallengeUploaderFactory } from "./uploads/factory.js";
+import { DomainParser } from "../../dns-provider/domain-parser.js";
 export * from "./base.js";
 export type { CertInfo };
 export * from "./cert-reader.js";
@@ -28,6 +29,7 @@ export type DomainVerifyPlanInput = {
   domain: string;
   type: "cname" | "dns" | "http";
   dnsProviderType?: string;
+  dnsProviderAccessType?: string;
   dnsProviderAccessId?: number;
   cnameVerifyPlan?: Record<string, CnameRecordInput>;
   httpVerifyPlan?: Record<string, HttpRecordInput>;
@@ -98,7 +100,14 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
     return {
       show: ctx.compute(({form})=>{
           return form.challengeType === 'dns' 
-      })
+      }),
+      component:{
+        on:{
+          selectedChange({form,$event}){
+            form.dnsProviderAccessType = $event.accessType
+          }
+        }
+      }
     }
     `,
     required: true,
@@ -106,6 +115,8 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
   })
   dnsProviderType!: string;
 
+  dnsProviderAccessType!: string;
+
   @TaskInput({
     title: "DNS解析授权",
     component: {
@@ -116,7 +127,7 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
     mergeScript: `return {
       component:{
         type: ctx.compute(({form})=>{
-            return form.dnsProviderType
+            return form.dnsProviderAccessType || form.dnsProviderType
         })
       },
       show: ctx.compute(({form})=>{
@@ -287,7 +298,7 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
     if (this.sslProvider === "google") {
       if (this.googleAccessId) {
         this.logger.info("当前正在使用 google服务账号授权获取EAB");
-        const googleAccess = await this.ctx.accessService.getById(this.googleAccessId);
+        const googleAccess = await this.getAccess(this.googleAccessId);
         const googleClient = new GoogleClient({
           access: googleAccess,
           logger: this.logger,
@@ -295,26 +306,29 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
         eab = await googleClient.getEab();
       } else if (this.eabAccessId) {
         this.logger.info("当前正在使用 google EAB授权");
-        eab = await this.ctx.accessService.getById(this.eabAccessId);
+        eab = await this.getAccess(this.eabAccessId);
       } else if (this.googleCommonEabAccessId) {
         this.logger.info("当前正在使用 google公共EAB授权");
-        eab = await this.ctx.accessService.getCommonById(this.googleCommonEabAccessId);
+        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.ctx.accessService.getById(this.eabAccessId);
+        eab = await this.getAccess(this.eabAccessId);
       } else if (this.zerosslCommonEabAccessId) {
         this.logger.info("当前正在使用 zerossl 公共EAB授权");
-        eab = await this.ctx.accessService.getCommonById(this.zerosslCommonEabAccessId);
+        eab = await this.getAccess(this.zerosslCommonEabAccessId, true);
       } else {
         throw new Error("zerossl需要配置EAB授权");
       }
     }
     this.eab = eab;
+    const subDomainsGetter = await this.ctx.serviceGetter.get<ISubDomainsGetter>("subDomainsGetter");
+    const domainParser = new DomainParser(subDomainsGetter);
     this.acme = new AcmeService({
+      userId: this.ctx.user.id,
       userContext: this.userContext,
       logger: this.logger,
       sslProvider: this.sslProvider,
@@ -325,8 +339,7 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
       privateKeyType: this.privateKeyType,
       signal: this.ctx.signal,
       maxCheckRetryCount: this.maxCheckRetryCount,
-      // cnameProxyService: this.ctx.cnameProxyService,
-      // dnsProviderCreator: this.createDnsProvider.bind(this),
+      domainParser,
     });
   }
 
@@ -356,7 +369,7 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
       domainsVerifyPlan = await this.createDomainsVerifyPlan();
     } else {
       const dnsProviderType = this.dnsProviderType;
-      const access = await this.ctx.accessService.getById(this.dnsProviderAccess);
+      const access = await this.getAccess(this.dnsProviderAccess);
       dnsProvider = await this.createDnsProvider(dnsProviderType, access);
     }
 
@@ -387,7 +400,8 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
   }
 
   async createDnsProvider(dnsProviderType: string, dnsProviderAccess: any): Promise<IDnsProvider> {
-    const context: DnsProviderContext = { access: dnsProviderAccess, logger: this.logger, http: this.ctx.http, utils };
+    const domainParser = this.acme.options.domainParser;
+    const context: DnsProviderContext = { access: dnsProviderAccess, logger: this.logger, http: this.ctx.http, utils, domainParser };
     return await createDnsProvider({
       dnsProviderType,
       context,
@@ -402,7 +416,7 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
       const cnameVerifyPlan: Record<string, CnameVerifyPlan> = {};
       const httpVerifyPlan: Record<string, HttpVerifyPlan> = {};
       if (domainVerifyPlan.type === "dns") {
-        const access = await this.ctx.accessService.getById(domainVerifyPlan.dnsProviderAccessId);
+        const access = await this.getAccess(domainVerifyPlan.dnsProviderAccessId);
         dnsProvider = await this.createDnsProvider(domainVerifyPlan.dnsProviderType, access);
       } else if (domainVerifyPlan.type === "cname") {
         for (const key in domainVerifyPlan.cnameVerifyPlan) {
@@ -426,7 +440,7 @@ HTTP文件验证：不支持泛域名，需要配置网站文件上传`,
         };
         for (const key in domainVerifyPlan.httpVerifyPlan) {
           const httpRecord = domainVerifyPlan.httpVerifyPlan[key];
-          const access = await this.ctx.accessService.getById(httpRecord.httpUploaderAccess);
+          const access = await this.getAccess(httpRecord.httpUploaderAccess);
           let rootDir = httpRecord.httpUploadRootDir;
           if (!rootDir.endsWith("/") && !rootDir.endsWith("\\")) {
             rootDir = rootDir + "/";

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

@@ -9,6 +9,7 @@ import JSZip from "jszip";
 
 export { CertReader };
 export type { CertInfo };
+export type PrivateKeyType = "rsa2048" | "rsa3072" | "rsa4096" | "rsa8192" | "ec256" | "ec384";
 
 @IsTaskPlugin({
   name: "CertApplyLego",
@@ -90,6 +91,28 @@ export class CertApplyLegoPlugin extends CertApplyBasePlugin {
   })
   customArgs = "";
 
+  @TaskInput({
+    title: "加密算法",
+    value: "ec256",
+    component: {
+      name: "a-select",
+      vModel: "value",
+      options: [
+        { value: "rsa2048", label: "RSA 2048" },
+        { value: "rsa3072", label: "RSA 3072" },
+        { value: "rsa4096", label: "RSA 4096" },
+        { value: "rsa8192", label: "RSA 8192" },
+        { value: "ec256", label: "EC 256" },
+        { value: "ec384", label: "EC 384" },
+        // { value: "ec_521", label: "EC 521" },
+      ],
+    },
+    helper: "如无特殊需求，默认即可",
+    required: true,
+  })
+  privateKeyType!: PrivateKeyType;
+
+
   eab?: EabAccess;
 
   async onInstance() {
@@ -120,7 +143,7 @@ export class CertApplyLegoPlugin extends CertApplyBasePlugin {
     if (this.eab) {
       eabArgs = ` --eab --kid "${this.eab.kid}" --hmac "${this.eab.hmacKey}"`;
     }
-    const keyType = "-k rsa2048";
+    const keyType = `-k ${this.privateKeyType}`;
 
     const saveDir = `./data/.lego/pipeline_${this.pipeline.id}/`;
     const savePathArgs = `--path "${saveDir}"`;

packages/plugins/plugin-lib/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+### Performance Improvements
+
+* 插件支持导入导出 ([cf8abb4](https://github.com/certd/certd/commit/cf8abb45282070c8ba91469f93fd379fabf1f74a))
+
+## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
+## [1.33.2](https://github.com/certd/certd/compare/v1.33.1...v1.33.2) (2025-04-12)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
+## [1.33.1](https://github.com/certd/certd/compare/v1.33.0...v1.33.1) (2025-04-12)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
+# [1.33.0](https://github.com/certd/certd/compare/v1.32.0...v1.33.0) (2025-04-11)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
 # [1.32.0](https://github.com/certd/certd/compare/v1.31.11...v1.32.0) (2025-04-04)
 
 **Note:** Version bump only for package @certd/plugin-lib

packages/plugins/plugin-lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-lib",
   "private": false,
-  "version": "1.32.0",
+  "version": "1.33.4",
   "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.32.0",
-    "@certd/pipeline": "^1.32.0",
+    "@certd/basic": "^1.33.4",
+    "@certd/pipeline": "^1.33.4",
     "@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": "8374c3941a9d1398989b8f38fd4bfa2a2f29937b"
+  "gitHead": "0730f5ff4f176452f82489caa837b717e176fdca"
 }

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

@@ -1,7 +1,4 @@
 import { AccessInput, BaseAccess, IsAccess } from "@certd/pipeline";
-import { ConnectConfig } from "ssh2";
-import { SshClient } from "./ssh.js";
-
 @IsAccess({
   name: "ssh",
   title: "主机登录授权",
@@ -9,7 +6,7 @@ import { SshClient } from "./ssh.js";
   icon: "clarity:host-line",
   input: {},
 })
-export class SshAccess extends BaseAccess implements ConnectConfig {
+export class SshAccess extends BaseAccess {
   @AccessInput({
     title: "主机地址",
     component: {
@@ -125,6 +122,7 @@ export class SshAccess extends BaseAccess implements ConnectConfig {
   testRequest = true;
 
   async onTestRequest() {
+    const { SshClient } = await import("./ssh.js");
     const client = new SshClient(this.ctx.logger);
 
     await client.exec({

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

@@ -1,22 +1,33 @@
 // @ts-ignore
-import ssh2, { ConnectConfig, ExecOptions } from "ssh2";
-
-import ssh2Constants from "ssh2/lib/protocol/constants.js";
 import path from "path";
-import * as _ from "lodash-es";
+import { isArray } from "lodash-es";
 import { ILogger } from "@certd/basic";
 import { SshAccess } from "./ssh-access.js";
-import stripAnsi from "strip-ansi";
-import { SocksClient } from "socks";
-import { SocksProxy, SocksProxyType } from "socks/typings/common/constants.js";
+
 import fs from "fs";
+import { SocksProxyType } from "socks/typings/common/constants";
 
 export type TransportItem = { localPath: string; remotePath: string };
+export interface SocksProxy {
+  ipaddress?: string;
+  host?: string;
+  port: number;
+  type: any;
+  userId?: string;
+  password?: string;
+  custom_auth_method?: number;
+  custom_auth_request_handler?: () => Promise<Buffer>;
+  custom_auth_response_size?: number;
+  custom_auth_response_handler?: (data: Buffer) => Promise<boolean>;
+}
+export type SshConnectConfig = {
+  sock?: any;
+};
 
 export class AsyncSsh2Client {
-  conn: ssh2.Client;
+  conn: any;
   logger: ILogger;
-  connConf: SshAccess & ssh2.ConnectConfig;
+  connConf: SshAccess & SshConnectConfig;
   windows = false;
   encoding: string;
   constructor(connConf: SshAccess, logger: ILogger) {
@@ -40,7 +51,10 @@ export class AsyncSsh2Client {
       if (typeof this.connConf.port === "string") {
         this.connConf.port = parseInt(this.connConf.port);
       }
-      const proxyOption: SocksProxy = this.parseSocksProxyFromUri(this.connConf.socksProxy);
+
+      const { SocksClient } = await import("socks");
+
+      const proxyOption = this.parseSocksProxyFromUri(this.connConf.socksProxy);
       const info = await SocksClient.createConnection({
         proxy: proxyOption,
         command: "connect",
@@ -53,10 +67,12 @@ export class AsyncSsh2Client {
       this.connConf.sock = info.socket;
     }
 
-    const { SUPPORTED_KEX, SUPPORTED_SERVER_HOST_KEY, SUPPORTED_CIPHER, SUPPORTED_MAC } = ssh2Constants;
+    const ssh2 = await import("ssh2");
+    const ssh2Constants = await import("ssh2/lib/protocol/constants.js");
+    const { SUPPORTED_KEX, SUPPORTED_SERVER_HOST_KEY, SUPPORTED_CIPHER, SUPPORTED_MAC } = ssh2Constants.default;
     return new Promise((resolve, reject) => {
       try {
-        const conn = new ssh2.Client();
+        const conn = new ssh2.default.Client();
         conn
           .on("error", (err: any) => {
             this.logger.error("连接失败", err);
@@ -139,6 +155,7 @@ export class AsyncSsh2Client {
     script: string,
     opts: {
       throwOnStdErr?: boolean;
+      env?: any;
     } = {}
   ): Promise<string> {
     if (!script) {
@@ -153,7 +170,7 @@ export class AsyncSsh2Client {
     // }
     return new Promise((resolve, reject) => {
       this.logger.info(`执行命令：[${this.connConf.host}][exec]: \n` + script);
-      this.conn.exec(script, (err: Error, stream: any) => {
+      this.conn.exec(script, { pty: true, env: opts.env }, (err: Error, stream: any) => {
         if (err) {
           reject(err);
           return;
@@ -196,6 +213,8 @@ export class AsyncSsh2Client {
   }
 
   async shell(script: string | string[]): Promise<string> {
+    const stripAnsiModule = await import("strip-ansi");
+    const stripAnsi = stripAnsiModule.default;
     return new Promise<any>((resolve, reject) => {
       this.logger.info(`执行shell脚本：[${this.connConf.host}][shell]: ` + script);
       this.conn.shell((err: Error, stream: any) => {
@@ -448,7 +467,7 @@ export class SshClient {
           script = script.join(" && ");
         } else {
           const newLine = isLinux ? "\n" : "\r\n";
-          if (_.isArray(script)) {
+          if (isArray(script)) {
             script = script as Array<string>;
             script = script.join(newLine);
           }
@@ -456,7 +475,7 @@ export class SshClient {
             script = envScripts.join(newLine) + newLine + script;
           }
         }
-        return await conn.exec(script as string);
+        return await conn.exec(script as string, { env: options.env });
       },
     });
   }
@@ -464,7 +483,7 @@ export class SshClient {
   async shell(options: { connectConf: SshAccess; script: string | Array<string> }): Promise<string> {
     let { script } = options;
     const { connectConf } = options;
-    if (_.isArray(script)) {
+    if (isArray(script)) {
       script = script as Array<string>;
       if (connectConf.windows) {
         script = script.join("\r\n");

packages/ui/Dockerfile

@@ -1,16 +1,16 @@
-FROM node:20-alpine AS builder
+FROM node:22-alpine AS builder
 WORKDIR /workspace/
 COPY . /workspace/
 # armv7 目前只能用node18， pnpm9不支持node18,所以pnpm只能用8.15.7版本
 # https://github.com/nodejs/docker-node/issues/1946
-RUN npm install -g pnpm@8.15.7
+RUN npm install -g pnpm
 
 #RUN cd /workspace/certd-client && pnpm install && npm run build
 RUN cp /workspace/certd-client/dist/* /workspace/certd-server/public/ -rf
 RUN cd /workspace/certd-server && pnpm install && npm run build-on-docker
 
 
-FROM node:20-alpine
+FROM node:22-alpine
 EXPOSE 7001
 EXPOSE 7002
 RUN apk add --no-cache openssl
@@ -18,8 +18,8 @@ RUN apk add --no-cache openjdk8
 WORKDIR /app/
 COPY --from=builder /workspace/certd-server/ /app/
 
-ENV LEGO_VERSION 4.22.2
-ENV LEGO_DOWNLOAD_DIR /app/tools/lego
+ENV LEGO_VERSION=4.22.2
+ENV LEGO_DOWNLOAD_DIR=/app/tools/lego
 RUN mkdir -p $LEGO_DOWNLOAD_DIR
 
 # 根据架构下载不同的文件
@@ -32,9 +32,9 @@ RUN ARCH=$(uname -m) && \
         echo "Unsupported architecture: $ARCH"; \
     fi
 
-ENV TZ Asia/Shanghai
-ENV NODE_ENV production
-ENV MIDWAY_SERVER_ENV production
+ENV TZ=Asia/Shanghai
+ENV NODE_ENV=production
+ENV MIDWAY_SERVER_ENV=production
 CMD ["npm", "run","start"]
 
 

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
+
+### Performance Improvements
+
+* 插件支持导入导出 ([cf8abb4](https://github.com/certd/certd/commit/cf8abb45282070c8ba91469f93fd379fabf1f74a))
+
+## [1.33.3](https://github.com/certd/certd/compare/v1.33.2...v1.33.3) (2025-04-14)
+
+**Note:** Version bump only for package @certd/ui-client
+
+## [1.33.2](https://github.com/certd/certd/compare/v1.33.1...v1.33.2) (2025-04-12)
+
+### Performance Improvements
+
+* 修复内置插件分页查询逻辑 ([a2710dd](https://github.com/certd/certd/commit/a2710ddc2525e4e637fd157f0180e6d3b801c8be))
+
+## [1.33.1](https://github.com/certd/certd/compare/v1.33.0...v1.33.1) (2025-04-12)
+
+### Performance Improvements
+
+* 镜像支持armv7 ([f78cbed](https://github.com/certd/certd/commit/f78cbed4d817859721fdafe7d348864848d0dfbf))
+
+# [1.33.0](https://github.com/certd/certd/compare/v1.32.0...v1.33.0) (2025-04-11)
+
+### Performance Improvements
+
+* 修复tab页缓存问题 ([64e5449](https://github.com/certd/certd/commit/64e5449ab3c6b219b0e89eddad14bfb6b71a0650))
+* 隐藏运行策略选项 ([2951df0](https://github.com/certd/certd/commit/2951df0cd94c23e2efee84ff1b843055aac56cae))
+* 增加手动上传证书功能说明 ([5d083a1](https://github.com/certd/certd/commit/5d083a153637caddbc6f44e915d9fb2d1ae87b33))
+
 # [1.32.0](https://github.com/certd/certd/compare/v1.31.11...v1.32.0) (2025-04-04)
 
 ### Performance Improvements

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.32.0",
+  "version": "1.33.4",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -9,7 +9,7 @@
     "debug": "vite --mode debug --open",
     "debug:pm": "vite --mode debugpm",
     "debug:force": "vite --force --mode debug",
-    "build": "vite build ",
+    "build": "cross-env NODE_OPTIONS=--max-old-space-size=32768 vite build ",
     "dev-build": "echo 1",
     "test:unit": "vitest",
     "serve": "vite preview",
@@ -29,10 +29,10 @@
     "@aws-sdk/client-s3": "^3.535.0",
     "@aws-sdk/s3-request-presigner": "^3.535.0",
     "@ctrl/tinycolor": "^4.1.0",
-    "@fast-crud/fast-crud": "^1.25.4",
-    "@fast-crud/fast-extends": "^1.25.4",
-    "@fast-crud/ui-antdv4": "^1.25.4",
-    "@fast-crud/ui-interface": "^1.25.4",
+    "@fast-crud/fast-crud": "^1.25.8",
+    "@fast-crud/fast-extends": "^1.25.8",
+    "@fast-crud/ui-antdv4": "^1.25.8",
+    "@fast-crud/ui-interface": "^1.25.8",
     "@iconify/tailwind": "^1.2.0",
     "@iconify/vue": "^4.1.1",
     "@manypkg/get-packages": "^2.2.2",
@@ -57,15 +57,19 @@
     "cos-js-sdk-v5": "^1.7.0",
     "cron-parser": "^4.9.0",
     "cropperjs": "^1.6.1",
+    "cross-env": "^7.0.3",
     "cssnano": "^7.0.6",
     "dayjs": "^1.11.7",
     "defu": "^6.1.4",
     "echarts": "^5.5.1",
     "highlight.js": "^11.9.0",
     "humanize-duration": "^3.27.3",
+    "js-yaml": "^4.1.0",
     "lodash-es": "^4.17.21",
     "lucide-vue-next": "^0.477.0",
     "mitt": "^3.0.1",
+    "monaco-editor": "^0.52.2",
+    "monaco-yaml": "^5.3.1",
     "nanoid": "^4.0.0",
     "node-forge": "^1.3.1",
     "nprogress": "^0.2.0",
@@ -80,6 +84,7 @@
     "qrcode": "^1.5.4",
     "radix-vue": "^1.9.16",
     "sortablejs": "^1.15.3",
+    "spark-md5": "^3.0.2",
     "tailwind-merge": "^3.0.2",
     "tailwindcss-animate": "^1.0.7",
     "theme-colors": "^0.1.0",
@@ -96,8 +101,8 @@
     "zod-defaults": "^0.1.3"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.32.0",
-    "@certd/pipeline": "^1.32.0",
+    "@certd/lib-iframe": "^1.33.4",
+    "@certd/pipeline": "^1.33.4",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",
@@ -155,6 +160,9 @@
       "pre-commit": "pretty-quick --staged"
     }
   },
+  "pnpm": {
+    "neverBuiltDependencies": []
+  },
   "gitHead": "9c2162697f3affea22c9a8cbc0ca74f4034ab27e",
   "vite": {
     "optimizeDeps": {

packages/ui/certd-client/src/App.vue

@@ -1,9 +1,9 @@
 <template>
   <AConfigProvider :locale="locale" :theme="tokenTheme">
-    <fs-form-provider>
+    <FsFormProvider>
       <contextHolder />
       <router-view />
-    </fs-form-provider>
+    </FsFormProvider>
   </AConfigProvider>
 </template>
 

packages/ui/certd-client/src/api/modules/api.user.mock.ts

@@ -1,31 +0,0 @@
-export default [
-  {
-    path: "/login",
-    method: "post",
-    handle() {
-      return {
-        code: 0,
-        msg: "success",
-        data: {
-          token: "faker token",
-          expire: 10000
-        }
-      };
-    }
-  },
-  {
-    path: "/sys/authority/user/mine",
-    method: "get",
-    handle() {
-      return {
-        code: 0,
-        msg: "success",
-        data: {
-          id: 1,
-          username: "username",
-          nickName: "admin"
-        }
-      };
-    }
-  }
-];

packages/ui/certd-client/src/api/service.ts

@@ -1,9 +1,8 @@
 import axios from "axios";
 import { get } from "lodash-es";
-import Adapter from "axios-mock-adapter";
-import { errorLog, errorCreate, response } from "./tools";
+import { errorLog, errorCreate } from "./tools";
 import { env } from "/src/utils/util.env";
-import { useUserStore } from "../store/modules/user";
+import { useUserStore } from "/@/store/user";
 /**
  * @description 创建请求实例
  */
@@ -12,8 +11,8 @@ function createService() {
   const service = axios.create();
   // 请求拦截
   service.interceptors.request.use(
-    (config) => config,
-    (error) => {
+    config => config,
+    error => {
       // 发送失败
       console.log(error);
       return Promise.reject(error);
@@ -21,7 +20,7 @@ function createService() {
   );
   // 响应拦截
   service.interceptors.response.use(
-    (response) => {
+    response => {
       if (response.config.responseType === "blob") {
         return response;
       }
@@ -67,7 +66,7 @@ function createService() {
         }
       }
     },
-    (error) => {
+    error => {
       const status = get(error, "response.status");
       switch (status) {
         case 400:
@@ -130,11 +129,11 @@ function createRequestFunction(service: any) {
   return function (config: any) {
     const configDefault = {
       headers: {
-        "Content-Type": get(config, "headers.Content-Type", "application/json")
+        "Content-Type": get(config, "headers.Content-Type", "application/json"),
       },
       timeout: 20000,
       baseURL: env.API,
-      data: {}
+      data: {},
     };
     const userStore = useUserStore();
     const token = userStore.getToken;
@@ -149,10 +148,3 @@ function createRequestFunction(service: any) {
 // 用于真实网络请求的实例和请求方法
 export const service = createService();
 export const request = createRequestFunction(service);
-
-// 用于模拟网络请求的实例和请求方法
-export const serviceForMock = createService();
-export const requestForMock = createRequestFunction(serviceForMock);
-
-// 网络请求数据模拟工具
-export const mock = new Adapter(serviceForMock, { delayResponse: 200 });

packages/ui/certd-client/src/components/code-editor/async-import.ts

@@ -0,0 +1,37 @@
+export async function importJsYaml() {
+  return await import("js-yaml");
+}
+
+export async function importYamlContribution() {
+  await import("monaco-editor/esm/vs/basic-languages/yaml/yaml.contribution");
+}
+
+export async function importJsonContribution() {
+  await import("monaco-editor/esm/vs/language/json/monaco.contribution");
+}
+
+export async function importJavascriptContribution() {
+  await import("monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution");
+}
+
+export async function importMonacoYaml() {
+  return await import("monaco-yaml");
+}
+
+export async function importWorks() {
+  const editorWorker = await import("monaco-editor/esm/vs/editor/editor.worker?worker");
+  const jsonWorker = await import("monaco-editor/esm/vs/language/json/json.worker?worker");
+  const cssWorker = await import("monaco-editor/esm/vs/language/css/css.worker?worker");
+  const htmlWorker = await import("monaco-editor/esm/vs/language/html/html.worker?worker");
+  const tsWorker = await import("monaco-editor/esm/vs/language/typescript/ts.worker?worker");
+  const yamlWorker = await import("./yaml.worker?worker");
+
+  return {
+    editorWorker,
+    jsonWorker,
+    cssWorker,
+    htmlWorker,
+    tsWorker,
+    yamlWorker,
+  };
+}

packages/ui/certd-client/src/components/code-editor/import-works.ts

@@ -0,0 +1,40 @@
+import editorWorker from "monaco-editor/esm/vs/editor/editor.worker?worker";
+import jsonWorker from "monaco-editor/esm/vs/language/json/json.worker?worker";
+import cssWorker from "monaco-editor/esm/vs/language/css/css.worker?worker";
+import htmlWorker from "monaco-editor/esm/vs/language/html/html.worker?worker";
+import tsWorker from "monaco-editor/esm/vs/language/typescript/ts.worker?worker";
+import yamlWorker from "./yaml.worker?worker";
+
+const WorkerBucket: any = {};
+
+/**
+ * 注册自定义worker
+ * @param name
+ * @param worker
+ */
+export function registerWorker(name: string, worker: any) {
+  WorkerBucket[name] = worker;
+}
+//@ts-ignore
+window.MonacoEnvironment = {
+  //@ts-ignore
+  getWorker(_, label) {
+    const custom = WorkerBucket[label];
+    if (custom) {
+      return new custom();
+    }
+    if (label === "json") {
+      return new jsonWorker();
+    } else if (label === "css" || label === "scss" || label === "less") {
+      return new cssWorker();
+    } else if (label === "html" || label === "handlebars" || label === "razor") {
+      return new htmlWorker();
+    } else if (label === "typescript" || label === "javascript") {
+      return new tsWorker();
+    } else if (label === "yaml" || label === "yml") {
+      //@ts-ignore
+      return new yamlWorker();
+    }
+    return new editorWorker();
+  },
+};

packages/ui/certd-client/src/components/code-editor/index.vue

@@ -0,0 +1,261 @@
+<template>
+  <div ref="monacoRef" class="fs-editor-code"></div>
+</template>
+
+<script lang="ts" setup>
+import * as monaco from "monaco-editor";
+// import * as monaco from "monaco-editor/esm/vs/editor/editor.api";
+import { onMounted, onUnmounted, ref, watch } from "vue";
+import { cloneDeep, debounce as lodashDebounce } from "lodash-es";
+import { initWorkers } from "./workers";
+import { importJavascriptContribution, importJsonContribution, importMonacoYaml, importYamlContribution } from "./async-import";
+
+/**
+ * config:
+ *   value: '', // 编辑器初始文本
+ *   language: 'javascript', // 语言
+ *   theme: 'vs', // 主题
+ *   readOnly: false, // 是否只读
+ *   minimap: { enabled: false }, // 是否启用小地图
+ *   fontSize: 14, // 字体大小
+ *   tabSize: 2, // tab缩进长度
+ *   automaticLayout: true, // 自动布局
+ *   lineNumbers: 'off', // 是否启用行号
+ *   contextmenu: true, // 是否启用上下文菜单
+ *   folding: true, // 是否启用代码折叠
+ *   foldingStrategy: 'auto', // 代码折叠策略
+ *   wordWrap: 'on', // 自动换行设置
+ *   wrappingIndent: 'indent', // 换行缩进
+ *   formatOnPaste: true, // 粘贴时是否自动格式化
+ *   formatOnType: true, // 输入时是否自动格式化
+ *   dragAndDrop: true, // 是否允许拖放
+ *   cursorStyle: 'line', // 光标样式
+ *   cursorBlinking: 'blink', // 光标闪烁方式
+ *   scrollbar: {
+ *     vertical: 'auto', // 垂直滚动条的显示方式
+ *     horizontal: 'auto', // 水平滚动条的显示方式
+ *     verticalScrollbarSize: 2, // 垂直滚动条的宽
+ *     horizontalScrollbarSize: 2, // 水平滚动条的高度
+ *   }
+ */
+const props = defineProps<{
+  language?: string;
+  modelValue?: string;
+  config?: any;
+  schema?: any;
+  debounce?: number;
+  init?: any;
+  readonly?: boolean;
+  disabled?: boolean;
+  id?: string;
+}>();
+
+export type EditorCodeCtx = {
+  // monaco对象
+  monaco: any;
+  //语言
+  language: string;
+  //配置
+  config: any;
+  //editor实例对象
+  instance?: any;
+
+  schema?: any;
+};
+
+const monacoRef = ref();
+
+let instanceRef: any = null;
+
+function disposeEditor() {
+  if (instanceRef) {
+    instanceRef.dispose(); //使用完成销毁实例
+  }
+}
+
+onUnmounted(() => {
+  disposeEditor();
+});
+
+const emits = defineEmits(["update:modelValue", "change", "ready", "save"]);
+
+const emitValue = lodashDebounce((value: any) => {
+  emits("update:modelValue", value);
+}, props.debounce || 500);
+
+async function createEditor(ctx: EditorCodeCtx) {
+  disposeEditor();
+  const instance = monaco.editor.create(monacoRef.value, {
+    automaticLayout: true,
+    value: props.modelValue,
+    language: ctx.language,
+    theme: "vs-dark",
+    minimap: { enabled: false },
+    insertSpaces: true,
+    tabSize: 2,
+    autoIndent: true, // 自动布局
+    renderWhitespace: true,
+    readOnly: props.readonly || props.disabled,
+    hover: {
+      enabled: true,
+    },
+    ...ctx.config,
+  });
+
+  // @event `change`
+  instance.onDidChangeModelContent(event => {
+    const value = instance.getValue();
+    if (props.modelValue !== value) {
+      emits("change", value);
+      emitValue(value);
+    }
+  });
+
+  instanceRef = instance;
+  ctx.instance = instance;
+  emits("ready", ctx);
+  if (props.modelValue) {
+    instanceRef.setValue(props.modelValue);
+  }
+
+  instance.addAction({
+    id: "custom_save",
+    label: "save",
+    contextMenuOrder: 1, // 菜单项的排序权重 越小，越靠前
+    contextMenuGroupId: "customCommand", // 菜单项的分组
+    keybindings: [monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyS],
+    run: async () => {
+      await instanceRef.getAction("editor.action.formatDocument").run();
+      emits("save", {
+        value: props.modelValue,
+      });
+    }, //方法
+  });
+  return instance;
+}
+
+async function initJavascript(ctx: EditorCodeCtx) {
+  await importJavascriptContribution();
+  monaco.languages.register({ id: "javascript" });
+}
+
+async function initJson(ctx: EditorCodeCtx) {
+  await importJsonContribution();
+  monaco.languages.register({ id: "json" });
+
+  const schemas = [];
+  if (ctx.schema) {
+    schemas.push({
+      uri: "http://myserver/foo-schema.json", // id of the first schema
+      fileMatch: ["*"], // associate with our model
+      schema: {
+        ...ctx.schema,
+      },
+    });
+  }
+
+  monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
+    validate: true,
+    enableSchemaRequest: false,
+    schemas,
+  });
+}
+
+async function initYaml(ctx: EditorCodeCtx) {
+  await importYamlContribution();
+  const { configureMonacoYaml } = await importMonacoYaml();
+  monaco.languages.register({ id: "yaml" });
+  const id = `fs-editor-code-${props.id || ""}.yaml`;
+  const uri = monaco.Uri.parse(id);
+  const schemas = [];
+  if (ctx.schema) {
+    schemas.push({
+      fileMatch: ["*"], // associate with our model
+      schema: {
+        ...ctx.schema,
+      },
+      uri: id,
+    });
+  }
+  configureMonacoYaml(monaco, {
+    schemas,
+    format: true,
+    hover: true,
+    completion: true,
+    validate: true,
+    isKubernetes: false,
+    enableSchemaRequest: false,
+  });
+
+  const oldModel = monaco.editor.getModel(uri);
+  if (oldModel) {
+    oldModel.dispose();
+  }
+  ctx.config.model = monaco.editor.createModel(props.modelValue, "yaml", uri);
+}
+
+async function doInit() {
+  await initWorkers();
+  const ctx: EditorCodeCtx = {
+    monaco,
+    language: props.language || "javascript",
+    config: cloneDeep(props.config || {}),
+    schema: props.schema,
+  };
+  if (ctx.language === "javascript") {
+    await initJavascript(ctx);
+  } else if (ctx.language === "yaml") {
+    await initYaml(ctx);
+  } else if (ctx.language === "json") {
+    await initJson(ctx);
+  }
+
+  await createEditor(ctx);
+}
+// watch(
+//   () => {
+//     return {
+//       language: props.language,
+//       config: props.config,
+//     };
+//   },
+//   (value: any) => {
+//     doInit();
+//   }
+// );
+
+watch(
+  () => {
+    return props.modelValue;
+  },
+  newValue => {
+    if (instanceRef) {
+      const editor = instanceRef;
+      if (newValue !== editor.getValue()) {
+        editor.setValue(newValue);
+      }
+    }
+  },
+  {
+    immediate: true,
+  }
+);
+
+onMounted(async () => {
+  await doInit();
+});
+</script>
+
+<style lang="less">
+.fs-editor-code {
+  min-height: 100px;
+  width: 100%;
+  border: 1px solid #eee;
+  border-radius: 5px;
+  position: relative;
+}
+
+.monaco-editor .hover-content {
+  z-index: 1000 !important;
+}
+</style>

packages/ui/certd-client/src/components/code-editor/validators.ts

@@ -0,0 +1,37 @@
+import { importJsYaml } from "./async-import";
+
+const jsonRule = {
+  validator: async (rule: any, value: any) => {
+    //校验value json的有效性
+    if (value) {
+      try {
+        JSON.parse(value);
+      } catch (e: any) {
+        console.error(e);
+        throw new Error("json格式错误:" + e.message);
+      }
+    }
+  },
+  message: "json格式错误",
+};
+
+const yamlRule = {
+  validator: async (rule: any, value: any) => {
+    //校验value yaml的有效性
+    if (value) {
+      try {
+        const yaml = await importJsYaml();
+        yaml.load(value, { schema: yaml.JSON_SCHEMA });
+      } catch (e: any) {
+        console.error(e);
+        throw new Error("yaml格式错误:" + e.message);
+      }
+    }
+  },
+  message: "yaml格式错误",
+};
+
+export const FsEditorCodeValidators = {
+  jsonRule,
+  yamlRule,
+};

packages/ui/certd-client/src/components/code-editor/workers.ts

@@ -0,0 +1,56 @@
+const WorkerBucket: any = {};
+
+/**
+ * 注册自定义worker
+ * @param name
+ * @param worker
+ */
+export function registerWorker(name: string, worker: any) {
+  WorkerBucket[name] = worker;
+}
+
+export async function initWorkers() {
+  if (window.MonacoEnvironment) {
+    return;
+  }
+
+  // const { editorWorker, jsonWorker, cssWorker, htmlWorker, tsWorker } = await importWorks();
+  //
+  // // const editorWorker = new Worker(new URL("monaco-editor/esm/vs/editor/editor.worker.js", import.meta.url));
+  // // const jsonWorker = new Worker(new URL("monaco-editor/esm/vs/language/json/json.worker.js", import.meta.url));
+  // // const cssWorker = new Worker(new URL("monaco-editor/esm/vs/language/css/css.worker.js", import.meta.url));
+  // // const htmlWorker = new Worker(new URL("monaco-editor/esm/vs/language/html/html.worker.js", import.meta.url));
+  // // const tsWorker = new Worker(new URL("monaco-editor/esm/vs/language/typescript/ts.worker.js", import.meta.url));
+  // // const yamlWorker = new Worker(new URL("./yaml.worker.js", import.meta.url));
+
+  const editorWorker = await import("monaco-editor/esm/vs/editor/editor.worker?worker");
+  const jsonWorker = await import("monaco-editor/esm/vs/language/json/json.worker?worker");
+  const cssWorker = await import("monaco-editor/esm/vs/language/css/css.worker?worker");
+  const htmlWorker = await import("monaco-editor/esm/vs/language/html/html.worker?worker");
+  const tsWorker = await import("monaco-editor/esm/vs/language/typescript/ts.worker?worker");
+  const yamlWorker = await import("./yaml.worker?worker");
+
+  //@ts-ignore
+  window.MonacoEnvironment = {
+    //@ts-ignore
+    getWorker(_, label) {
+      const custom = WorkerBucket[label];
+      if (custom) {
+        return new custom();
+      }
+      if (label === "json") {
+        return new jsonWorker.default();
+      } else if (label === "css" || label === "scss" || label === "less") {
+        return new cssWorker.default();
+      } else if (label === "html" || label === "handlebars" || label === "razor") {
+        return new htmlWorker.default();
+      } else if (label === "typescript" || label === "javascript") {
+        return new tsWorker.default();
+      } else if (label === "yaml" || label === "yml") {
+        //@ts-ignore
+        return new yamlWorker.default();
+      }
+      return new editorWorker.default();
+    },
+  };
+}

packages/ui/certd-client/src/components/code-editor/yaml.worker.ts

@@ -0,0 +1 @@
+export * from "monaco-yaml/yaml.worker.js";

packages/ui/certd-client/src/components/editable.vue

@@ -8,7 +8,7 @@
       </a-input>
     </div>
     <div v-else class="view" @click="edit">
-      <span> {{ modelValue }}</span>
+      <span class="ellipsis"> {{ modelValue }}</span>
       <fs-icon class="edit-icon" icon="ant-design:edit-outlined"></fs-icon>
     </div>
   </div>
@@ -22,19 +22,19 @@ export default {
   props: {
     modelValue: {
       type: String,
-      default: ""
+      default: "",
     },
     input: {
-      type: Object
+      type: Object,
     },
     disabled: {
       type: Boolean,
-      default: false
+      default: false,
     },
     hoverShow: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   emits: ["update:modelValue"],
   setup(props, ctx) {
@@ -44,7 +44,7 @@ export default {
       () => {
         return props.modelValue;
       },
-      (value) => {
+      value => {
         valueRef.value = value;
       }
     );
@@ -66,9 +66,9 @@ export default {
       isEdit,
       save,
       edit,
-      inputRef
+      inputRef,
     };
-  }
+  },
 };
 </script>
 

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

@@ -12,12 +12,18 @@ import IconSelect from "./icon-select.vue";
 import ExpiresTimeText from "./expires-time-text.vue";
 import FileInput from "./file-input.vue";
 import PemInput from "./pem-input.vue";
+import { defineAsyncComponent } from "vue";
 export default {
   install(app: any) {
+    app.component(
+      "CodeEditor",
+      defineAsyncComponent(() => import("./code-editor/index.vue"))
+    );
     app.component("PiContainer", PiContainer);
     app.component("TextEditable", TextEditable);
     app.component("FileInput", FileInput);
     app.component("PemInput", PemInput);
+    // app.component("CodeEditor", CodeEditor);
 
     app.component("CronLight", CronLight);
     app.component("CronEditor", CronEditor);

packages/ui/certd-client/src/components/plugins/cert/dns-provider-selector/api.ts

@@ -5,6 +5,6 @@ const apiPrefix = "/pi/dnsProvider";
 export async function GetList() {
   return await request({
     url: apiPrefix + "/list",
-    method: "post"
+    method: "post",
   });
 }

packages/ui/certd-client/src/components/plugins/cert/dns-provider-selector/index.vue

@@ -11,10 +11,10 @@ export default {
   props: {
     modelValue: {
       type: String,
-      default: undefined
-    }
+      default: undefined,
+    },
   },
-  emits: ["update:modelValue"],
+  emits: ["update:modelValue", "selected-change"],
   setup(props: any, ctx: any) {
     const options = ref<any[]>([]);
 
@@ -25,24 +25,36 @@ export default {
         array.push({
           value: item.name,
           label: item.title,
-          icon: item.icon
+          icon: item.icon,
+          accessType: item.accessType,
         });
       }
       options.value = array;
       // if (props.modelValue == null && options.value.length > 0) {
       //   ctx.emit("update:modelValue", options.value[0].value);
       // }
+      onSelectedChange(props.modelValue);
     }
     onCreate();
 
     function onChanged(value: any) {
       ctx.emit("update:modelValue", value);
+      onSelectedChange(value);
+    }
+    function onSelectedChange(value: any) {
+      if (value) {
+        const option = options.value.find(item => item.value == value);
+        if (option) {
+          ctx.emit("selected-change", option);
+          return;
+        }
+      }
     }
     return {
       options,
-      onChanged
+      onChanged,
     };
-  }
+  },
 };
 </script>
 

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

@@ -1,6 +1,7 @@
 import { request } from "/src/api/service";
 
 const apiPrefix = "/cname/record";
+const subDomainApiPrefix = "/pi/subDomain";
 
 export type CnameRecord = {
   id?: number;
@@ -18,7 +19,7 @@ export type DomainGroupItem = {
 export async function GetList() {
   return await request({
     url: apiPrefix + "/list",
-    method: "post"
+    method: "post",
   });
 }
 
@@ -28,8 +29,8 @@ export async function GetByDomain(domain: string) {
     method: "post",
     data: {
       domain,
-      createOnNotFound: true
-    }
+      createOnNotFound: true,
+    },
   });
 }
 
@@ -38,7 +39,17 @@ export async function DoVerify(id: number) {
     url: apiPrefix + "/verify",
     method: "post",
     data: {
-      id
-    }
+      id,
+    },
+  });
+}
+
+export async function ParseDomain(fullDomain: string) {
+  return await request({
+    url: subDomainApiPrefix + "/parseDomain",
+    method: "post",
+    data: {
+      fullDomain,
+    },
   });
 }

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

@@ -35,7 +35,7 @@ import { HttpRecord } from "/@/components/plugins/cert/domains-verify-plan-edito
 import { dict } from "@fast-crud/fast-crud";
 
 defineOptions({
-  name: "HttpVerifyPlan"
+  name: "HttpVerifyPlan",
 });
 
 const emit = defineEmits(["update:modelValue", "change"]);
@@ -53,12 +53,12 @@ watch(
   (value: any) => {
     if (value) {
       records.value = {
-        ...value
+        ...value,
       };
     }
   },
   {
-    immediate: true
+    immediate: true,
   }
 );
 
@@ -75,8 +75,8 @@ const uploaderTypeDict = dict({
     { label: "阿里云OSS", value: "alioss" },
     { label: "腾讯云COS", value: "tencentcos" },
     { label: "七牛OSS", value: "qiniuoss" },
-    { label: "SSH(已废弃，请选择SFTP方式)", value: "ssh", disabled: true }
-  ]
+    { label: "SSH(已废弃，请选择SFTP方式)", value: "ssh", disabled: true },
+  ],
 });
 </script>
 

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

@@ -38,6 +38,7 @@
                           :dict="dnsProviderTypeDict"
                           placeholder="DNS提供商"
                           @change="onPlanChanged"
+                          @selected-change="onDnsProviderChange(item, $event)"
                         ></fs-dict-select>
                       </span>
                     </div>
@@ -45,13 +46,7 @@
                     <div class="form-item">
                       <span class="label">DNS授权：</span>
                       <span class="input">
-                        <access-selector
-                          v-model="item.dnsProviderAccessId"
-                          size="small"
-                          :type="item.dnsProviderType"
-                          placeholder="请选择"
-                          @change="onPlanChanged"
-                        ></access-selector>
+                        <access-selector v-model="item.dnsProviderAccessId" size="small" :type="item.dnsProviderAccessType || item.dnsProviderType" placeholder="请选择" @change="onPlanChanged"></access-selector>
                       </span>
                     </div>
                   </div>
@@ -80,28 +75,27 @@ import { dict, FsDictSelect } from "@fast-crud/fast-crud";
 import AccessSelector from "/@/views/certd/access/access-selector/index.vue";
 import CnameVerifyPlan from "./cname-verify-plan.vue";
 import HttpVerifyPlan from "./http-verify-plan.vue";
-//@ts-ignore
-import psl from "psl";
 import { Form } from "ant-design-vue";
 import { DomainsVerifyPlanInput } from "./type";
-import { CnameRecord, DomainGroupItem } from "./api";
+import { DomainGroupItem, ParseDomain } from "./api";
+
 defineOptions({
-  name: "DomainsVerifyPlanEditor"
+  name: "DomainsVerifyPlanEditor",
 });
 
 const challengeTypeOptions = ref<any[]>([
   {
     label: "DNS验证",
-    value: "dns"
+    value: "dns",
   },
   {
     label: "CNAME验证",
-    value: "cname"
+    value: "cname",
   },
   {
     label: "HTTP验证",
-    value: "http"
-  }
+    value: "http",
+  },
 ]);
 
 const props = defineProps<{
@@ -114,6 +108,10 @@ const emit = defineEmits<{
   "update:modelValue": any;
 }>();
 
+function onDnsProviderChange(item: any, option: any) {
+  item.dnsProviderAccessType = option.accessType;
+}
+
 const fullscreen = ref(false);
 function fullscreenExit() {
   if (fullscreen.value) {
@@ -122,7 +120,7 @@ function fullscreenExit() {
 }
 const planRef = ref<DomainsVerifyPlanInput>(props.modelValue || {});
 const dnsProviderTypeDict = dict({
-  url: "pi/dnsProvider/dnsProviderTypeDict"
+  url: "pi/dnsProvider/dnsProviderTypeDict",
 });
 
 const formItemContext = Form.useInjectFormItemContext();
@@ -139,7 +137,7 @@ function showError(error: string) {
 
 type DomainGroup = Record<string, DomainGroupItem>;
 
-function onDomainsChanged(domains: string[]) {
+async function onDomainsChanged(domains: string[]) {
   if (domains == null) {
     return;
   }
@@ -147,12 +145,7 @@ function onDomainsChanged(domains: string[]) {
   const domainGroups: DomainGroup = {};
   for (let domain of domains) {
     const keyDomain = domain.replace("*.", "");
-    const parsed = psl.parse(keyDomain);
-    if (parsed.error) {
-      showError(`域名${domain}解析失败: ${JSON.stringify(parsed.error)}`);
-      continue;
-    }
-    const mainDomain = parsed.domain;
+    const mainDomain = await ParseDomain(keyDomain);
     if (mainDomain == null) {
       continue;
     }
@@ -161,7 +154,7 @@ function onDomainsChanged(domains: string[]) {
       group = {
         domain: mainDomain,
         domains: [],
-        keySubDomains: []
+        keySubDomains: [],
       } as DomainGroupItem;
       domainGroups[mainDomain] = group;
     }
@@ -180,7 +173,7 @@ function onDomainsChanged(domains: string[]) {
         //@ts-ignore
         cnameVerifyPlan: {},
         //@ts-ignore
-        httpVerifyPlan: {}
+        httpVerifyPlan: {},
       };
       planRef.value[domain] = planItem;
     }
@@ -196,7 +189,7 @@ function onDomainsChanged(domains: string[]) {
       if (!cnameOrigin[subDomain]) {
         //@ts-ignore
         planItem.cnameVerifyPlan[subDomain] = {
-          id: 0
+          id: 0,
         };
       } else {
         planItem.cnameVerifyPlan[subDomain] = cnameOrigin[subDomain];
@@ -205,14 +198,14 @@ function onDomainsChanged(domains: string[]) {
       if (!cnamePlan[subDomain]) {
         //@ts-ignore
         cnamePlan[subDomain] = {
-          id: 0
+          id: 0,
         };
       }
 
       if (!httpOrigin[subDomain]) {
         //@ts-ignore
         planItem.httpVerifyPlan[subDomain] = {
-          domain: subDomain
+          domain: subDomain,
         };
       } else {
         planItem.httpVerifyPlan[subDomain] = httpOrigin[subDomain];
@@ -221,7 +214,7 @@ function onDomainsChanged(domains: string[]) {
       if (!httpPlan[subDomain]) {
         //@ts-ignore
         httpPlan[subDomain] = {
-          domain: subDomain
+          domain: subDomain,
         };
       }
     }
@@ -255,7 +248,7 @@ watch(
   },
   {
     immediate: true,
-    deep: true
+    deep: true,
   }
 );
 </script>

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

@@ -12,6 +12,7 @@ export type DomainVerifyPlanInput = {
   domains: string[];
   type: "cname" | "dns" | "http";
   dnsProviderType?: string;
+  dnsProviderAccessType?: string;
   dnsProviderAccessId?: number;
   cnameVerifyPlan?: Record<string, CnameRecord>;
   httpVerifyPlan?: Record<string, HttpRecord>;

packages/ui/certd-client/src/components/plugins/common/cert-domains-getter.vue

@@ -9,9 +9,10 @@
 
 <script setup lang="ts">
 import { inject, ref, watch } from "vue";
+import { CertApplyPluginNames } from "/@/constants";
 
 defineOptions({
-  name: "CertDomainsGetter"
+  name: "CertDomainsGetter",
 });
 
 const props = defineProps<{
@@ -52,7 +53,8 @@ function getDomainFromPipeline(inputKey: string) {
     errorRef.value = "找不到目标步骤，请先选择域名证书";
     return;
   }
-  if (certStep.type !== "CertApply" && certStep.type !== "CertApplyLego") {
+
+  if (!CertApplyPluginNames.includes(certStep.type)) {
     targetStepId = getStepIdFromInputKey(certStep.input?.cert);
     certStep = findStepFromPipeline(targetStepId);
     if (!certStep) {
@@ -73,7 +75,7 @@ watch(
     getDomainFromPipeline(inputKey);
   },
   {
-    immediate: true
+    immediate: true,
   }
 );
 </script>

packages/ui/certd-client/src/components/tutorial/tutorial-steps.vue

@@ -54,23 +54,23 @@ const steps = ref<Step[]>([
         descriptions: ["本教程演示如何自动申请证书并部署到Nginx上", "仅需3步，全自动申请部署证书"],
         body: () => {
           return <SimpleSteps></SimpleSteps>;
-        }
+        },
       },
       {
         image: "/static/doc/images/1-add.png",
         title: "创建证书流水线",
-        descriptions: ["点击添加证书流水线，填写证书申请信息"]
+        descriptions: ["点击添加证书流水线，填写证书申请信息"],
       },
       {
         image: "/static/doc/images/3-add-success.png",
         title: "流水线创建成功",
-        descriptions: ["点击手动触发即可申请证书"]
+        descriptions: ["点击手动触发即可申请证书"],
       },
       {
         title: "接下来演示如何自动部署证书",
-        descriptions: ["如果您只需要申请证书，那么到这一步就可以了"]
-      }
-    ]
+        descriptions: ["如果您只需要申请证书，那么到这一步就可以了"],
+      },
+    ],
   },
   {
     title: "添加部署证书任务",
@@ -79,29 +79,29 @@ const steps = ref<Step[]>([
       {
         image: "/static/doc/images/5-1-add-host.png",
         title: "添加证书部署任务",
-        descriptions: ["这里演示自动部署证书到nginx", "本系统提供海量部署插件，满足您的各种部署需求"]
+        descriptions: ["这里演示自动部署证书到nginx", "本系统提供海量部署插件，满足您的各种部署需求"],
       },
       {
         image: "/static/doc/images/5-2-add-host.png",
         title: "填写任务参数",
-        descriptions: ["填写主机上证书文件的路径", "选择主机ssh登录授权"]
+        descriptions: ["填写主机上证书文件的路径", "选择主机ssh登录授权"],
       },
       {
         image: "/static/doc/images/5-3-add-host.png",
         title: "让新证书生效",
-        descriptions: ["执行重启脚本", "让证书生效"]
+        descriptions: ["执行重启脚本", "让证书生效"],
       },
       {
         image: "/static/doc/images/5-4-add-host.png",
         title: "部署任务添加成功",
-        descriptions: ["现在可以运行"]
+        descriptions: ["现在可以运行"],
       },
       {
         image: "/static/doc/images/5-5-plugin-list.png",
         title: "本系统提供茫茫多的部署插件",
-        descriptions: ["您可以根据自身需求将证书部署到各种应用和平台"]
-      }
-    ]
+        descriptions: ["您可以根据自身需求将证书部署到各种应用和平台"],
+      },
+    ],
   },
   {
     title: "运行与测试",
@@ -110,44 +110,44 @@ const steps = ref<Step[]>([
       {
         image: "/static/doc/images/9-start.png",
         title: "运行测试一下",
-        descriptions: ["点击手动触发按钮，即可测试运行"]
+        descriptions: ["点击手动触发按钮，即可测试运行"],
       },
       {
         image: "/static/doc/images/10-1-log.png",
         title: "查看日志",
-        descriptions: ["点击任务可以查看状态和日志"]
+        descriptions: ["点击任务可以查看状态和日志"],
       },
       {
         image: "/static/doc/images/11-1-error.png",
         title: "执行失败如何排查",
-        descriptions: ["查看错误日志"]
+        descriptions: ["查看错误日志"],
       },
       {
         image: "/static/doc/images/11-2-error.png",
         title: "执行失败如何排查",
-        descriptions: ["查看错误日志", "这里报的是nginx容器不存在，修改命令，改成正确的nginx容器名称即可"]
+        descriptions: ["查看错误日志", "这里报的是nginx容器不存在，修改命令，改成正确的nginx容器名称即可"],
       },
       {
         image: "/static/doc/images/12-1-log-success.png",
         title: "执行成功",
-        descriptions: ["修改正确后，重新点击手动触发，重新运行一次，执行成功"]
+        descriptions: ["修改正确后，重新点击手动触发，重新运行一次，执行成功"],
       },
       {
         image: "/static/doc/images/12-2-skip-log.png",
         title: "成功后自动跳过",
-        descriptions: ["可以看到成功过的将会自动跳过，不会重复执行，只有当参数变更或者证书更新了，才会重新运行"]
+        descriptions: ["可以看到成功过的将会自动跳过，不会重复执行，只有当参数变更或者证书更新了，才会重新运行"],
       },
       {
         image: "/static/doc/images/13-1-result.png",
         title: "查看证书部署成功",
-        descriptions: ["访问nginx上的网站，可以看到证书已经部署成功"]
+        descriptions: ["访问nginx上的网站，可以看到证书已经部署成功"],
       },
       {
         image: "/static/doc/images/13-3-download.png",
         title: "还可以下载证书，手动部署",
-        descriptions: ["如果还没有好用的部署插件，没办法自动部署，你还可以下载证书，手动部署"]
-      }
-    ]
+        descriptions: ["如果还没有好用的部署插件，没办法自动部署，你还可以下载证书，手动部署"],
+      },
+    ],
   },
   {
     title: "设置定时执行和邮件通知",
@@ -156,22 +156,19 @@ const steps = ref<Step[]>([
       {
         image: "/static/doc/images/14-timer.png",
         title: "设置定时执行",
-        descriptions: [
-          "流水线测试成功，接下来配置定时触发，以后每天定时执行就不用管了",
-          "推荐配置每天运行一次，在到期前35天才会重新申请新证书并部署，没到期前会自动跳过，不会重复申请。"
-        ]
+        descriptions: ["流水线测试成功，接下来配置定时触发，以后每天定时执行就不用管了", "推荐配置每天运行一次，在到期前35天才会重新申请新证书并部署，没到期前会自动跳过，不会重复申请。"],
       },
       {
         image: "/static/doc/images/15-1-email.png",
         title: "设置邮件通知",
-        descriptions: ["建议选择监听'错误时'和'错误转成功'两种即可，在意外失败时可以尽快去排查问题，（基础版需要配置邮件服务器）"]
+        descriptions: ["建议选择监听'错误时'和'错误转成功'两种即可，在意外失败时可以尽快去排查问题，（基础版需要配置邮件服务器）"],
       },
       {
         title: "教程结束",
-        descriptions: ["感谢观看，希望对你有所帮助"]
-      }
-    ]
-  }
+        descriptions: ["感谢观看，希望对你有所帮助"],
+      },
+    ],
+  },
 ]);
 
 const current = ref(0);

packages/ui/certd-client/src/components/vip-button/directive.ts

@@ -1,5 +1,5 @@
 import { notification } from "ant-design-vue";
-import { useSettingStore } from "/@/store/modules/settings";
+import { useSettingStore } from "/@/store/settings";
 
 export default {
   mounted(el: any, binding: any, vnode: any) {

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

@@ -16,9 +16,9 @@ import { computed, onMounted, reactive } from "vue";
 import dayjs from "dayjs";
 import { message, Modal } from "ant-design-vue";
 import * as api from "./api";
-import { useSettingStore } from "/@/store/modules/settings";
+import { useSettingStore } from "/@/store/settings";
 import { useRouter } from "vue-router";
-import { useUserStore } from "/@/store/modules/user";
+import { useUserStore } from "/@/store/user";
 import { mitter } from "/@/utils/util.mitt";
 
 const settingStore = useSettingStore();

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

@@ -0,0 +1 @@
+export const CertApplyPluginNames = ["CertApply", "CertApplyLego", "CertApplyUpload"];

packages/ui/certd-client/src/layout/components/footer/index.vue

@@ -23,7 +23,7 @@
 </template>
 <script setup lang="ts">
 import { computed, onMounted, ref } from "vue";
-import { useSettingStore } from "/@/store/modules/settings";
+import { useSettingStore } from "/@/store/settings";
 
 defineOptions({
   name: "PageFooter"

packages/ui/certd-client/src/layout/components/theme/index.vue

@@ -10,7 +10,7 @@
 <script lang="ts">
 import { ref, defineComponent } from "vue";
 import FsThemeColorPicker from "./color-picker.vue";
-import { useSettingStore } from "/@/store/modules/settings";
+import { useSettingStore } from "/@/store/settings";
 
 export default defineComponent({
   name: "FsTheme",

packages/ui/certd-client/src/layout/components/theme/mode-set.vue

@@ -13,7 +13,7 @@
 
 <script lang="ts">
 import { ref, defineComponent } from "vue";
-import { useSettingStore } from "/@/store/modules/settings";
+import { useSettingStore } from "/@/store/settings";
 
 export default defineComponent({
   name: "FsThemeModeSet",