v1.33.7

- 新增 VolcengineDeployToLive 插件，用于将证书部署到火山引擎视频直播
- 新增 VolcengineDeployToVOD 插件，用于将证书部署到火山引擎视频点播
- 更新 ve-client.ts，增加对 Live 和 VOD 服务的支持

CHANGELOG.md

@@ -3,6 +3,59 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+### Performance Improvements
+
+* 添加部署证书至火山 Live ([abea80e](https://github.com/certd/certd/commit/abea80e3ab9b1672aebe1c5d5e856693b29931a8))
+* 优化首页插件列表展示 ([9b8f60b](https://github.com/certd/certd/commit/9b8f60b64b5f9a3db7dfa9b3dcbd9201984358d0))
+* 证书申请支持51dns ([8638fc9](https://github.com/certd/certd/commit/8638fc91ff34fccaf12ff9874fd3fa9d2a8c18b7))
+* 支持51dns ([96a0900](https://github.com/certd/certd/commit/96a0900edc95dcfd9acccf9d13592f12f5a09b3d))
+* ssh PTY模式登录设置 ([8385bcc](https://github.com/certd/certd/commit/8385bcc2d7f2411a07748bb5c53f9eaf4d38d7cc))
+* ssh伪终端模式优化，windows下不开启 ([42dfe93](https://github.com/certd/certd/commit/42dfe936b773b7bdd82ca3378363252ffffd7b71))
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+### Bug Fixes
+
+* 上传商用证书，直接粘贴文本报错的问题；修复无法上传ec加密证书的bug ([5750bb7](https://github.com/certd/certd/commit/5750bb706779da274d8e7a87e71416cb64d2df79))
+* 修复下载证书时提示token已过期的问题 ([0e07ae6](https://github.com/certd/certd/commit/0e07ae6ce84dcb9279d3c44060d621566afa593c))
+
+### Performance Improvements
+
+* 更新license时同时绑定url ([78367af](https://github.com/certd/certd/commit/78367af8307f801e778c76d49f0918c21ffe032f))
+* 切换到不同的分组后再打开创建对话框，会自动选择分组 ([893dcd4](https://github.com/certd/certd/commit/893dcd4f2487891199ed3e5a3d47a79a75efc942))
+* 新增部署到火山引擎ALB/CLB、上传到证书中心 ([c9a3e3d](https://github.com/certd/certd/commit/c9a3e3d9d26f964c7af7b56667936f1414fbf42a))
+* 优化/api缓存为0 ([dc05cd4](https://github.com/certd/certd/commit/dc05cd481f186b13375192be965000e6b4b429a5))
+* 优化华为cdn插件引用ccm证书 ([b565b4b](https://github.com/certd/certd/commit/b565b4b3b919b71b98ea2517670bc1ef00e00dc9))
+* 优化证书流水线创建，支持选择分组 ([d613aa8](https://github.com/certd/certd/commit/d613aa8f3e85d8dc475ef1b62d49394ce7fd7d24))
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+### Performance Improvements
+
+* 登录支持双重认证 ([48aef25](https://github.com/certd/certd/commit/48aef25b3f6499d674ca4e4ef16f4c62399fb735))
+* 多重认证登录 ([0f82cf4](https://github.com/certd/certd/commit/0f82cf409bc60706ab07e4ca4f272b9a1ca7eecb))
+* 优化部署到华为云CDN，支持先上传到ccm，再使用证书id部署，修复offline状态下导致部署报错的bug ([79df39a](https://github.com/certd/certd/commit/79df39acabab10ae7e1864dadcdc186bb007a3c5))
+
+## [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

README.md

@@ -9,13 +9,16 @@ Certd 是一个免费全自动申请和自动部署更新SSL证书的管理系
 本项目不仅支持证书申请过程自动化，还可以自动化部署更新证书，让你的证书永不过期。     
 
 * 全自动申请证书（支持所有注册商注册的域名）
-* 全自动部署更新证书（目前支持部署到主机、阿里云、腾讯云等，目前已支持60+部署插件）
+* 全自动部署更新证书（目前支持部署到主机、阿里云、腾讯云等70+部署插件）
 * 支持DNS-01、HTTP-01、CNAME代理等多种域名验证方式
 * 支持通配符域名/泛域名，支持多个域名打到一个证书上，支持pem、pfx、der、jks等多种证书格式
 * 邮件通知、webhook通知
 * 私有化部署，数据保存本地，授权信息加密存储，镜像由Github Actions构建，过程公开透明
 * 支持SQLite，PostgreSQL、MySQL数据库
 
+
+  ![](./docs/images/intro/intro.svg)
+
 >
 > 流水线数量现已调整为无限制，欢迎大家使用
 >
@@ -23,7 +26,7 @@ Certd 是一个免费全自动申请和自动部署更新SSL证书的管理系
 > 关于证书续期：
  >* 实际上没有办法不改变证书文件本身情况下直接续期或者续签。
  >* 我们所说的续期，其实就是按照全套流程重新申请一份新证书，然后重新部署上去。
-
+ >* 免费证书过期时间90天，以后可能还会缩短，所以自动化部署必不可少
  
 ## 二、在线体验
 
@@ -62,7 +65,7 @@ https://certd.handfree.work/
 -------> [点我查看详细使用步骤演示](./step.md)   <--------      
 ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑     
 
-更多教程请访问文档网站 [certd.docmirror.cn](https://certd.docmirror.cn/)
+更多教程请访问官方文档 [certd.docmirror.cn](https://certd.docmirror.cn/guide/)
 
 
 
@@ -72,10 +75,10 @@ https://certd.handfree.work/
 
 您可以根据实际情况从如下方式中选择一种方式进行私有化部署：
 
-1. [宝塔面板方式部署](https://certd.docmirror.cn/guide/install/docker/)
-2. [1Panel面板方式部署](https://certd.docmirror.cn/guide/install/1panel/)
-3. [Docker方式部署](https://certd.docmirror.cn/guide/install/docker/)
-4. [源码方式部署](https://certd.docmirror.cn/guide/install/source/)
+1. [宝塔面板方式部署 推荐](https://certd.docmirror.cn/guide/install/docker/)
+2. [1Panel面板方式部署 推荐](https://certd.docmirror.cn/guide/install/1panel/)
+3. [Docker方式部署 推荐](https://certd.docmirror.cn/guide/install/docker/)
+4. [源码方式部署 不建议](https://certd.docmirror.cn/guide/install/source/)
 
 #### Docker镜像说明：
 * 国内镜像地址:
@@ -94,87 +97,27 @@ https://certd.handfree.work/
 
 ![](./docs/images/action/action-build.jpg)
 
-
-## 五、 升级
-
-### docker-compose方式部署
-#### 1. 如果使用固定版本号
-1. 修改`docker-compose.yaml`中的镜像版本号
-2. 运行`docker compose up -d` 即可
-
-#### 2. 如果需要使用最新版本
-```shell
-#重新拉取镜像
-docker pull registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest
-# 重新启动容器
-docker compose down
-docker compose up -d
-```
-> 数据默认存在`/data/certd`目录下，不用担心数据丢失
-
-### 自动升级(仅限尝鲜建议非生产使用)
-```yaml
-version: '3.3'
-services:
-  certd:
-    image: registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest
-    container_name: certd
-    restart: unless-stopped
-    volumes:
-      - /data/certd:/app/data
-    ports:
-      - "7001:7001"
-      - "7002:7002"
-    environment:
-      - certd_system_resetAdminPasswd=false
-    labels:
-      com.centurylinklabs.watchtower.enable: "true"
-
-  certd-updater:  # 添加 Watchtower 服务
-    image: containrrr/watchtower:latest
-    container_name: certd-updater
-    restart: unless-stopped
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    # 配置 自动更新
-    environment:
-      - WATCHTOWER_CLEANUP=true            # 自动清理旧版本容器
-      - WATCHTOWER_INCLUDE_STOPPED=false   # 不更新已停止的容器
-      - WATCHTOWER_LABEL_ENABLE=true       # 根据容器标签进行更新
-      - WATCHTOWER_POLL_INTERVAL=300       # 每 5 分钟检查一次更新
-
-```
-
-### 其他部署方式升级方法
-请参考 https://certd.docmirror.cn/guide/install/upgrade.html
+> 注意：
+> * 本应用存储的证书、授权信息等属于高度敏感数据，请做好安全防护
+> * 请务必使用HTTPS协议访问本应用，避免被中间人攻击
+> * 请务必使用web应用防火墙防护本应用，防止XSS、SQL注入等攻击
+> * 请务必做好服务器本身的安全防护，防止数据库泄露
+> * 请务必做好数据备份，避免数据丢失
 
 
 
-###  更新日志：
 
-[CHANGELOG](./CHANGELOG.md)
+## 五、更多帮助
+请访问官方文档：[https://certd.docmirror.cn/](https://certd.docmirror.cn/guide/)
+
+* 升级方法：[升级方法](https://certd.docmirror.cn/guide/install/upgrade/)
+* 常见问题：[忘记密码](https://certd.docmirror.cn/guide/use/forgotpasswd/)
+* 多数据库：[多数据库配置](https://certd.docmirror.cn/guide/install/database/)
+* 站点安全：[站点安全特性](https://certd.docmirror.cn/guide/feature/safe/)
+* 更新日志：[CHANGELOG](./CHANGELOG.md)
 
 
-## 六、一些说明
-* 本项目ssl证书提供商为letencrypt/Google/ZeroSSL
-* 申请过程遵循acme协议
-* 证书续期：
-  * 实际上没有办法不改变证书文件本身情况下直接续期或者续签。
-  * 我们所说的续期，其实就是按照全套流程重新申请一份新证书，然后重新部署上去。
-* 免费证书过期时间90天，以后可能还会缩短，所以自动化部署必不可少
-* 设置每天自动运行，当证书过期前35天，会自动重新申请证书并部署
-
-
-## 七、不同平台的设置说明
-
-* 已迁移到新的文档网站，请到常见问题章节查看
-* [最新文档站链接 https://certd.docmirror.cn](https://certd.docmirror.cn/)
-
-## 八、问题处理
-### 7.1 忘记管理员密码   
-[重置管理员密码方法](https://certd.docmirror.cn/guide/use/forgotpasswd/)
-
-## 九、联系作者
+## 六、联系作者
 如有疑问，欢迎加入群聊（请备注certd）
 
 | 加群 | 微信群 | QQ群 |
@@ -188,7 +131,7 @@ services:
 | 二维码 | <img height="230" src="./docs/guide/contact/images/me.png"> |
 
 
-## 十、捐赠
+## 七、捐赠
 ************************
 支持开源，为爱发电，我已入驻爱发电   
 https://afdian.com/a/greper
@@ -197,8 +140,6 @@ https://afdian.com/a/greper
 1. 可加入发电专属群，可以获得作者一对一技术支持
 2. 您的需求我们将优先实现，并且将作为专业版功能提供
 3. 一年期专业版激活码
-4. 赠送国外免费服务器部署方案（0成本使用Certd，可能需要翻墙，不过现在性能越来越差了）
-
 
 专业版特权对比
 
@@ -214,33 +155,26 @@ https://afdian.com/a/greper
 
 ************************
 
-## 十一、贡献代码
+## 八、贡献代码
 
-1. 本地开发 [贡献插件](https://certd.docmirror.cn/guide/development/)
+1. 本地开发请参考 [贡献插件向导](https://certd.docmirror.cn/guide/development/)
 2. 作为贡献者，代表您同意您贡献的代码如下许可：
    1. 可以调整开源协议以使其更严格或更宽松。
    2. 可以用于商业用途。
 
 
 
-## 十二、 开源许可
+## 九、 开源许可
 * 本项目遵循 GNU Affero General Public License（AGPL）开源协议。   
 * 允许个人和公司内部自由使用、复制、修改和分发本项目，未获得商业授权情况下禁止任何形式的商业用途 
 * 未获得商业授权情况下，禁止任何对logo、版权信息及授权许可相关代码的修改。
 * 如需商业授权，请联系作者。
 
-## 十三、我的其他项目（求Star）
+
+## 十、我的其他项目（求Star）
 
 | 项目名称                                                    | stars                                                                                                 | 项目描述                              | 
 |---------------------------------------------------------|-------------------------------------------------------------------------------------------------------|-----------------------------------|
 | [袖手AI](https://ai.handsfree.work/)                    |                                                                                                       | 袖手GPT，国内可用，无需FQ，每日免费额度            | 
 | [fast-crud](https://gitee.com/fast-crud/fast-crud/)     | <img alt="GitHub stars" src="https://img.shields.io/github/stars/fast-crud/fast-crud?logo=github"/>   | 基于vue3的crud快速开发框架                 |  
 | [dev-sidecar](https://github.com/docmirror/dev-sidecar/) | <img alt="GitHub stars" src="https://img.shields.io/github/stars/docmirror/dev-sidecar?logo=github"/> | 直连访问github工具，无需FQ，解决github无法访问的问题 |                       
-
-
-
-## 十四、更新日志
-
-更新日志：[CHANGELOG](./CHANGELOG.md)
-
-

build.trigger

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

docs/.vitepress/config.ts

@@ -1,158 +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: "/deploy/" },
-      { 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: "插件说明", 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" },
-          ]
-        }
-      ]
-      ,
-    },
+                    ]
+                },
+                {
+                    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/guide/changelogs/CHANGELOG.md

@@ -3,6 +3,58 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+### Bug Fixes
+
+* 上传商用证书，直接粘贴文本报错的问题；修复无法上传ec加密证书的bug ([5750bb7](https://github.com/certd/certd/commit/5750bb706779da274d8e7a87e71416cb64d2df79))
+* 修复下载证书时提示token已过期的问题 ([0e07ae6](https://github.com/certd/certd/commit/0e07ae6ce84dcb9279d3c44060d621566afa593c))
+
+### Performance Improvements
+
+* 更新license时同时绑定url ([78367af](https://github.com/certd/certd/commit/78367af8307f801e778c76d49f0918c21ffe032f))
+* 切换到不同的分组后再打开创建对话框，会自动选择分组 ([893dcd4](https://github.com/certd/certd/commit/893dcd4f2487891199ed3e5a3d47a79a75efc942))
+* 新增部署到火山引擎ALB/CLB、上传到证书中心 ([c9a3e3d](https://github.com/certd/certd/commit/c9a3e3d9d26f964c7af7b56667936f1414fbf42a))
+* 优化/api缓存为0 ([dc05cd4](https://github.com/certd/certd/commit/dc05cd481f186b13375192be965000e6b4b429a5))
+* 优化华为cdn插件引用ccm证书 ([b565b4b](https://github.com/certd/certd/commit/b565b4b3b919b71b98ea2517670bc1ef00e00dc9))
+* 优化证书流水线创建，支持选择分组 ([d613aa8](https://github.com/certd/certd/commit/d613aa8f3e85d8dc475ef1b62d49394ce7fd7d24))
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+### Performance Improvements
+
+* 登录支持双重认证 ([48aef25](https://github.com/certd/certd/commit/48aef25b3f6499d674ca4e4ef16f4c62399fb735))
+* 多重认证登录 ([0f82cf4](https://github.com/certd/certd/commit/0f82cf409bc60706ab07e4ca4f272b9a1ca7eecb))
+* 优化部署到华为云CDN，支持先上传到ccm，再使用证书id部署，修复offline状态下导致部署报错的bug ([79df39a](https://github.com/certd/certd/commit/79df39acabab10ae7e1864dadcdc186bb007a3c5))
+
+## [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

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

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

docs/guide/install/baota/index.md

@@ -13,7 +13,7 @@
 
 #### 2.1 应用商店一键部署【推荐】
 
-* 在应用商店中找到`certd`（要先点右上角更新应用）
+* 在宝塔Docker应用商店中找到`certd`（要先点右上角更新应用）
 * 点击安装，配置域名等基本信息即可完成安装
 
 > 需要宝塔9.2.0及以上版本才支持
@@ -70,3 +70,12 @@ admin/123456
 ## 五、备份恢复
 
 将备份的`db.sqlite`及同目录下的其他文件一起覆盖到原来的位置，重启certd即可
+
+
+## 六、宝塔部署相关问题排查
+
+### 1. 无法访问Certd
+1. 确认服务器的安全规则，是否放开了对应端口
+2. 确认宝塔防火墙是否放开对应端口
+3. 尝试将Certd容器加入宝塔的`bridge`网络 
+![](./images/network.png)

docs/guide/use/backup/index.md

@@ -1,5 +1,6 @@
-# 数据库自动备份
-
+# 数据库备份
+* 两种备份方法：  1、手动备份  2、自动备份
+* 本文仅限sqlite数据库。
 ## 一、手动备份
 数据库文件根据不同的部署方式保存的位置不一样，您可以手动复制出来进行备份
 

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.33.2"
+  "version": "1.33.7"
 }

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.7](https://github.com/publishlab/node-acme-client/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.33.6](https://github.com/publishlab/node-acme-client/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.33.5](https://github.com/publishlab/node-acme-client/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [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

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.33.2",
+    "version": "1.33.7",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.33.2",
+        "@certd/basic": "^1.33.7",
         "@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": "64244af2cce396be5e2831937e5e3024a22899ed"
+    "gitHead": "8abe62886ab50634b4b05abedd2981ec8ee0422e"
 }

packages/core/basic/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.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+### Performance Improvements
+
+* 支持51dns ([96a0900](https://github.com/certd/certd/commit/96a0900edc95dcfd9acccf9d13592f12f5a09b3d))
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+### Performance Improvements
+
+* 多重认证登录 ([0f82cf4](https://github.com/certd/certd/commit/0f82cf409bc60706ab07e4ca4f272b9a1ca7eecb))
+
+## [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

packages/core/basic/build.md

@@ -1 +1 @@
-01:29
+22:12

packages/core/basic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.33.2",
+  "version": "1.33.7",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -44,5 +44,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "64244af2cce396be5e2831937e5e3024a22899ed"
+  "gitHead": "8abe62886ab50634b4b05abedd2981ec8ee0422e"
 }

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.id.ts

@@ -1,4 +1,4 @@
 import { customAlphabet } from "nanoid";
 
 export const randomNumber = customAlphabet("1234567890", 4);
-export const simpleNanoId = customAlphabet("1234567890abcdefghijklmopqrstuvwxyz", 12);
+export const simpleNanoId = customAlphabet("1234567890abcdefghijklmopqrstuvwxyzABCDEFGHIJKLMOPQRSTUVWXYZ", 12);

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

@@ -1,13 +1,13 @@
-import axios, { AxiosHeaders, AxiosRequestConfig } from 'axios';
-import { ILogger, logger } from './util.log.js';
-import { Logger } from 'log4js';
-import { HttpProxyAgent } from 'http-proxy-agent';
-import { HttpsProxyAgent } from 'https-proxy-agent';
-import nodeHttp from 'http';
-import * as https from 'node:https';
-import { merge } from 'lodash-es';
-import { safePromise } from './util.promise.js';
-import fs from 'fs';
+import axios, { AxiosHeaders, AxiosRequestConfig } from "axios";
+import { ILogger, logger } from "./util.log.js";
+import { Logger } from "log4js";
+import { HttpProxyAgent } from "http-proxy-agent";
+import { HttpsProxyAgent } from "https-proxy-agent";
+import nodeHttp from "http";
+import * as https from "node:https";
+import { merge } from "lodash-es";
+import { safePromise } from "./util.promise.js";
+import fs from "fs";
 export class HttpError extends Error {
   status?: number;
   statusText?: string;
@@ -22,10 +22,10 @@ export class HttpError extends Error {
     super(error.message || error.response?.statusText);
 
     const message = error?.message;
-    if (message && typeof message === 'string') {
-      if (message.indexOf && message.indexOf('ssl3_get_record:wrong version number') >= 0) {
+    if (message && typeof message === "string") {
+      if (message.indexOf && message.indexOf("ssl3_get_record:wrong version number") >= 0) {
         this.message = `${message}(http协议错误，服务端要求http协议，请检查是否使用了https请求)`;
-      } else if (message.indexOf('getaddrinfo EAI_AGAIN') >= 0) {
+      } else if (message.indexOf("getaddrinfo EAI_AGAIN") >= 0) {
         this.message = `${message}(无法解析域名，请检查网络连接或dns配置，更换docker-compose.yaml中dns配置)`;
       }
     }
@@ -47,7 +47,7 @@ export class HttpError extends Error {
     };
     let url = error.config?.url;
     if (error.config?.baseURL) {
-      url = (error.config?.baseURL || '') + url;
+      url = (error.config?.baseURL || "") + url;
     }
     if (url) {
       this.message = `${this.message} 【${url}】`;
@@ -73,7 +73,7 @@ export const HttpCommonError = HttpError;
 let defaultAgents = createAgent();
 
 export function setGlobalProxy(opts: { httpProxy?: string; httpsProxy?: string }) {
-  logger.info('setGlobalProxy:', opts);
+  logger.info("setGlobalProxy:", opts);
   defaultAgents = createAgent(opts);
 }
 
@@ -102,12 +102,12 @@ export function createAxiosService({ logger }: { logger: Logger }) {
       if (config.skipSslVerify || config.httpProxy) {
         let rejectUnauthorized = true;
         if (config.skipSslVerify) {
-          logger.info('跳过SSL验证');
+          logger.info("跳过SSL验证");
           rejectUnauthorized = false;
         }
         const proxy: any = {};
         if (config.httpProxy) {
-          logger.info('使用自定义http代理:', config.httpProxy);
+          logger.info("使用自定义http代理:", config.httpProxy);
           proxy.httpProxy = config.httpProxy;
           proxy.httpsProxy = config.httpProxy;
         }
@@ -128,7 +128,7 @@ export function createAxiosService({ logger }: { logger: Logger }) {
     },
     (error: Error) => {
       // 发送失败
-      logger.error('接口请求失败：', error);
+      logger.error("接口请求失败：", error);
       return Promise.reject(error);
     }
   );
@@ -143,7 +143,7 @@ export function createAxiosService({ logger }: { logger: Logger }) {
 
         logger.info(`http response : status=${response?.status},data=${resData}`);
       } else {
-        logger.info('http response status:', response?.status);
+        logger.info("http response status:", response?.status);
       }
       if (response?.config?.returnResponse) {
         return response;
@@ -154,53 +154,51 @@ export function createAxiosService({ logger }: { logger: Logger }) {
       const status = error.response?.status;
       switch (status) {
         case 400:
-          error.message = '请求错误';
+          error.message = "请求错误";
           break;
         case 401:
-          error.message = '认证/登录失败';
+          error.message = "认证/登录失败";
           break;
         case 403:
-          error.message = '拒绝访问';
+          error.message = "拒绝访问";
           break;
         case 404:
           error.message = `请求地址出错`;
           break;
         case 408:
-          error.message = '请求超时';
+          error.message = "请求超时";
           break;
         case 500:
-          error.message = '服务器内部错误';
+          error.message = "服务器内部错误";
           break;
         case 501:
-          error.message = '服务未实现';
+          error.message = "服务未实现";
           break;
         case 502:
-          error.message = '网关错误';
+          error.message = "网关错误";
           break;
         case 503:
-          error.message = '服务不可用';
+          error.message = "服务不可用";
           break;
         case 504:
-          error.message = '网关超时';
+          error.message = "网关超时";
           break;
         case 505:
-          error.message = 'HTTP版本不受支持';
+          error.message = "HTTP版本不受支持";
           break;
         default:
           break;
       }
-      logger.error(
-        `请求出错：status:${error.response?.status},statusText:${error.response?.statusText},url:${error.config?.url},method:${error.config?.method}。`
-      );
-      logger.error('返回数据:', JSON.stringify(error.response?.data));
+      logger.error(`请求出错：status:${error.response?.status},statusText:${error.response?.statusText},url:${error.config?.url},method:${error.config?.method}。`);
+      logger.error("返回数据:", JSON.stringify(error.response?.data));
       if (error.response?.data) {
         const message = error.response.data.message || error.response.data.msg || error.response.data.error;
-        if (typeof message === 'string') {
+        if (typeof message === "string") {
           error.message = message;
         }
       }
       if (error instanceof AggregateError) {
-        logger.error('AggregateError', error);
+        logger.error("AggregateError", error);
       }
       const err = new HttpError(error);
       return Promise.reject(err);
@@ -244,24 +242,24 @@ export function createAgent(opts: CreateAgentOptions = {}) {
   if (httpProxy) {
     process.env.HTTP_PROXY = httpProxy;
     process.env.http_proxy = httpProxy;
-    logger.info('use httpProxy:', httpProxy);
+    logger.info("use httpProxy:", httpProxy);
     httpAgent = new HttpProxyAgent(httpProxy, opts as any);
     merge(httpAgent.options, opts);
   } else {
-    process.env.HTTP_PROXY = '';
-    process.env.http_proxy = '';
+    process.env.HTTP_PROXY = "";
+    process.env.http_proxy = "";
     httpAgent = new nodeHttp.Agent(opts);
   }
   const httpsProxy = opts.httpsProxy;
   if (httpsProxy) {
     process.env.HTTPS_PROXY = httpsProxy;
     process.env.https_proxy = httpsProxy;
-    logger.info('use httpsProxy:', httpsProxy);
+    logger.info("use httpsProxy:", httpsProxy);
     httpsAgent = new HttpsProxyAgent(httpsProxy, opts as any);
     merge(httpsAgent.options, opts);
   } else {
-    process.env.HTTPS_PROXY = '';
-    process.env.https_proxy = '';
+    process.env.HTTPS_PROXY = "";
+    process.env.https_proxy = "";
     httpsAgent = new https.Agent(opts);
   }
   return {
@@ -276,27 +274,27 @@ export async function download(req: { http: HttpClient; config: HttpRequestConfi
     http
       .request({
         logRes: false,
-        responseType: 'stream',
+        responseType: "stream",
         ...config,
       })
       .then(res => {
         const writer = fs.createWriteStream(savePath);
         res.pipe(writer);
-        writer.on('close', () => {
-          logger.info('文件下载成功');
+        writer.on("close", () => {
+          logger.info("文件下载成功");
           resolve(true);
         });
         //error
-        writer.on('error', err => {
-          logger.error('下载失败', err);
+        writer.on("error", err => {
+          logger.error("下载失败", err);
           reject(err);
         });
         //进度条打印
-        const totalLength = res.headers['content-length'];
+        const totalLength = res.headers["content-length"];
         let currentLength = 0;
         // 每5%打印一次
         const step = (totalLength / 100) * 5;
-        res.on('data', (chunk: any) => {
+        res.on("data", (chunk: any) => {
           currentLength += chunk.length;
           if (currentLength % step < chunk.length) {
             const percent = ((currentLength / totalLength) * 100).toFixed(2);
@@ -305,19 +303,19 @@ export async function download(req: { http: HttpClient; config: HttpRequestConfi
         });
       })
       .catch(err => {
-        logger.info('下载失败', err);
+        logger.info("下载失败", err);
         reject(err);
       });
   });
 }
 
 export function getCookie(response: any, name: string) {
-  const cookies = response.headers['set-cookie'];
+  const cookies = response.headers["set-cookie"];
   //根据name 返回对应的cookie
   const found = cookies.find((cookie: any) => cookie.includes(name));
   if (!found) {
     return null;
   }
-  const cookie = found.split(';')[0];
-  return cookie.substring(cookie.indexOf('=') + 1);
+  const cookie = found.split(";")[0];
+  return cookie.substring(cookie.indexOf("=") + 1);
 }

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [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

packages/core/pipeline/package.json

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

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.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [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

packages/libs/lib-huawei/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-huawei",
   "private": false,
-  "version": "1.33.2",
+  "version": "1.33.7",
   "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": "64244af2cce396be5e2831937e5e3024a22899ed"
+  "gitHead": "8abe62886ab50634b4b05abedd2981ec8ee0422e"
 }

packages/libs/lib-iframe/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.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+### Performance Improvements
+
+* 更新license时同时绑定url ([78367af](https://github.com/certd/certd/commit/78367af8307f801e778c76d49f0918c21ffe032f))
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [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

packages/libs/lib-iframe/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-iframe",
   "private": false,
-  "version": "1.33.2",
+  "version": "1.33.7",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -30,5 +30,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "64244af2cce396be5e2831937e5e3024a22899ed"
+  "gitHead": "8abe62886ab50634b4b05abedd2981ec8ee0422e"
 }

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

@@ -65,7 +65,7 @@ export class IframeClient {
     return window.self !== window.top;
   }
 
-  register<T = any>(action: string, handler: (data: IframeMessageData<T>) => Promise<void>) {
+  register<T = any>(action: string, handler: (data: IframeMessageData<T>) => Promise<any>) {
     this.handlers[action] = handler;
   }
 

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.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [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

packages/libs/lib-jdcloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/jdcloud",
-  "version": "1.33.2",
+  "version": "1.33.7",
   "description": "jdcloud openApi sdk",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
@@ -60,5 +60,5 @@
       "fetch"
     ]
   },
-  "gitHead": "64244af2cce396be5e2831937e5e3024a22899ed"
+  "gitHead": "8abe62886ab50634b4b05abedd2981ec8ee0422e"
 }

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.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [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

packages/libs/lib-k8s/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-k8s",
   "private": false,
-  "version": "1.33.2",
+  "version": "1.33.7",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -16,7 +16,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/basic": "^1.33.2",
+    "@certd/basic": "^1.33.7",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
@@ -31,5 +31,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "64244af2cce396be5e2831937e5e3024a22899ed"
+  "gitHead": "8abe62886ab50634b4b05abedd2981ec8ee0422e"
 }

packages/libs/lib-server/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.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+### Performance Improvements
+
+* 登录支持双重认证 ([48aef25](https://github.com/certd/certd/commit/48aef25b3f6499d674ca4e4ef16f4c62399fb735))
+
+## [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

packages/libs/lib-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/lib-server",
-  "version": "1.33.2",
+  "version": "1.33.7",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -27,10 +27,10 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.33.2",
-    "@certd/basic": "^1.33.2",
-    "@certd/pipeline": "^1.33.2",
-    "@certd/plus-core": "^1.33.2",
+    "@certd/acme-client": "^1.33.7",
+    "@certd/basic": "^1.33.7",
+    "@certd/pipeline": "^1.33.7",
+    "@certd/plus-core": "^1.33.7",
     "@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": "64244af2cce396be5e2831937e5e3024a22899ed"
+  "gitHead": "8abe62886ab50634b4b05abedd2981ec8ee0422e"
 }

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

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

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

@@ -1,10 +1,19 @@
 import { Constants } from '../constants.js';
 import { BaseException } from './base-exception.js';
+import { TextException } from "./common-exception.js";
 /**
  * 授权异常
  */
 export class AuthException extends BaseException {
-  constructor(message) {
+  constructor(message?:string) {
     super('AuthException', Constants.res.auth.code, message ? message : Constants.res.auth.message);
   }
 }
+
+
+export class Need2FAException extends TextException {
+  constructor(message:string,data:any) {
+    super('Need2FAException', Constants.res.need2fa.code, message ? message : Constants.res.need2fa.message,data);
+  }
+}
+

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

@@ -3,9 +3,11 @@
  */
 export class BaseException extends Error {
   code: number;
-  constructor(name, code, message) {
+  data?:any
+  constructor(name, code, message,data?:any) {
     super(message);
     this.name = name;
     this.code = code;
+    this.data = data;
   }
 }

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

@@ -1,16 +1,23 @@
-import { Constants } from '../constants.js';
-import { BaseException } from './base-exception.js';
+import { Constants } from "../constants.js";
+import { BaseException } from "./base-exception.js";
+
 /**
  * 通用异常
  */
 export class CommonException extends BaseException {
   constructor(message) {
-    super('CommonException', Constants.res.error.code, message ? message : Constants.res.error.message);
+    super("CommonException", Constants.res.error.code, message ? message : Constants.res.error.message);
   }
 }
 
 export class CodeException extends BaseException {
   constructor(res: { code: number; message: string }) {
-    super('CodeException', res.code, res.message);
+    super("CodeException", res.code, res.message);
+  }
+}
+
+export class TextException extends BaseException {
+  constructor(name, code,message, data?) {
+    super(name, code, message, data);
   }
 }

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/basic/result.ts

@@ -2,14 +2,15 @@ export class Result<T> {
   code: number;
   msg: string;
   data: T;
+
   constructor(code, msg, data?) {
     this.code = code;
     this.msg = msg;
     this.data = data;
   }
 
-  static error(code = 1, msg) {
-    return new Result(code, msg);
+  static error(code = 1, msg, data?: any) {
+    return new Result(code, msg, data);
   }
 
   static success(msg, data?) {

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/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.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [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

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

@@ -1,6 +1,6 @@
 {
   "name": "@certd/midway-flyway-js",
-  "version": "1.33.2",
+  "version": "1.33.7",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -46,5 +46,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "64244af2cce396be5e2831937e5e3024a22899ed"
+  "gitHead": "8abe62886ab50634b4b05abedd2981ec8ee0422e"
 }

packages/plugins/plugin-cert/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.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [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

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.33.2",
+  "version": "1.33.7",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -15,10 +15,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.33.2",
-    "@certd/basic": "^1.33.2",
-    "@certd/pipeline": "^1.33.2",
-    "@certd/plugin-lib": "^1.33.2",
+    "@certd/acme-client": "^1.33.7",
+    "@certd/basic": "^1.33.7",
+    "@certd/pipeline": "^1.33.7",
+    "@certd/plugin-lib": "^1.33.7",
     "@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": "64244af2cce396be5e2831937e5e3024a22899ed"
+  "gitHead": "8abe62886ab50634b4b05abedd2981ec8ee0422e"
 }

packages/plugins/plugin-lib/CHANGELOG.md

@@ -3,6 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+### Performance Improvements
+
+* ssh PTY模式登录设置 ([8385bcc](https://github.com/certd/certd/commit/8385bcc2d7f2411a07748bb5c53f9eaf4d38d7cc))
+* ssh伪终端模式优化，windows下不开启 ([42dfe93](https://github.com/certd/certd/commit/42dfe936b773b7bdd82ca3378363252ffffd7b71))
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
+## [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

packages/plugins/plugin-lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-lib",
   "private": false,
-  "version": "1.33.2",
+  "version": "1.33.7",
   "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.33.2",
-    "@certd/pipeline": "^1.33.2",
+    "@certd/basic": "^1.33.7",
+    "@certd/pipeline": "^1.33.7",
     "@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": "64244af2cce396be5e2831937e5e3024a22899ed"
+  "gitHead": "8abe62886ab50634b4b05abedd2981ec8ee0422e"
 }

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: {
@@ -66,6 +63,16 @@ export class SshAccess extends BaseAccess implements ConnectConfig {
   })
   passphrase!: string;
 
+  @AccessInput({
+    title: "伪终端",
+    helper: "如果登录报错：all authentication methods failed，可以尝试开启伪终端模式进行keyboard-interactive方式登录\n开启后对日志输出有一定的影响",
+    component: {
+      name: "a-switch",
+      vModel: "checked",
+    },
+  })
+  pty!: boolean;
+
   @AccessInput({
     title: "socks代理",
     helper: "socks代理配置，格式：socks5://user:password@host:port",
@@ -125,6 +132,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);
@@ -154,7 +170,10 @@ export class AsyncSsh2Client {
     // }
     return new Promise((resolve, reject) => {
       this.logger.info(`执行命令：[${this.connConf.host}][exec]: \n` + script);
-      this.conn.exec(script, { pty: true, env: opts.env }, (err: Error, stream: any) => {
+      // pty 伪终端，window下的输出会带上conhost.exe之类的多余的字符串，影响返回结果判断
+      // linux下 当使用keyboard-interactive 登录时，需要pty
+      const pty = this.connConf.pty; //linux下开启伪终端，windows下不开启
+      this.conn.exec(script, { pty, env: opts.env }, (err: Error, stream: any) => {
         if (err) {
           reject(err);
           return;
@@ -197,6 +216,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) => {
@@ -449,7 +470,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);
           }
@@ -457,7 +478,7 @@ export class SshClient {
             script = envScripts.join(newLine) + newLine + script;
           }
         }
-        return await conn.exec(script as string, { env: options.env });
+        return await conn.exec(script as string, {});
       },
     });
   }
@@ -465,7 +486,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/certd-client/CHANGELOG.md

@@ -3,6 +3,43 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+### Performance Improvements
+
+* 优化首页插件列表展示 ([9b8f60b](https://github.com/certd/certd/commit/9b8f60b64b5f9a3db7dfa9b3dcbd9201984358d0))
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+### Bug Fixes
+
+* 上传商用证书，直接粘贴文本报错的问题；修复无法上传ec加密证书的bug ([5750bb7](https://github.com/certd/certd/commit/5750bb706779da274d8e7a87e71416cb64d2df79))
+* 修复下载证书时提示token已过期的问题 ([0e07ae6](https://github.com/certd/certd/commit/0e07ae6ce84dcb9279d3c44060d621566afa593c))
+
+### Performance Improvements
+
+* 更新license时同时绑定url ([78367af](https://github.com/certd/certd/commit/78367af8307f801e778c76d49f0918c21ffe032f))
+* 切换到不同的分组后再打开创建对话框，会自动选择分组 ([893dcd4](https://github.com/certd/certd/commit/893dcd4f2487891199ed3e5a3d47a79a75efc942))
+* 优化/api缓存为0 ([dc05cd4](https://github.com/certd/certd/commit/dc05cd481f186b13375192be965000e6b4b429a5))
+* 优化证书流水线创建，支持选择分组 ([d613aa8](https://github.com/certd/certd/commit/d613aa8f3e85d8dc475ef1b62d49394ce7fd7d24))
+
+## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
+
+### Performance Improvements
+
+* 登录支持双重认证 ([48aef25](https://github.com/certd/certd/commit/48aef25b3f6499d674ca4e4ef16f4c62399fb735))
+* 多重认证登录 ([0f82cf4](https://github.com/certd/certd/commit/0f82cf409bc60706ab07e4ca4f272b9a1ca7eecb))
+
+## [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

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.33.2",
+  "version": "1.33.7",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -84,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",
@@ -100,8 +101,8 @@
     "zod-defaults": "^0.1.3"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.33.2",
-    "@certd/pipeline": "^1.33.2",
+    "@certd/lib-iframe": "^1.33.7",
+    "@certd/pipeline": "^1.33.7",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

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

@@ -3,6 +3,17 @@ import { get } from "lodash-es";
 import { errorLog, errorCreate } from "./tools";
 import { env } from "/src/utils/util.env";
 import { useUserStore } from "/@/store/user";
+
+export class CodeError extends Error {
+  code: number;
+  data?: any;
+  constructor(message: string, code: number, data?: any) {
+    super(message);
+    this.code = code;
+    this.data = data;
+  }
+}
+
 /**
  * @description 创建请求实例
  */
@@ -38,32 +49,32 @@ function createService() {
       }
 
       // 这个状态码是和后端约定的
-      const { code } = dataAxios;
-      // 根据 code 进行判断
-      if (code === undefined) {
+      if (dataAxios?.code === undefined) {
         // 如果没有 code 代表这不是项目后端开发的接口
         errorCreate(`非标准返回：${dataAxios}， ${response.config.url}`);
         return dataAxios;
-      } else {
-        // 有 code 代表这是一个后端接口 可以进行进一步的判断
-        switch (code) {
-          case 0:
-            // [ 示例 ] code === 0 代表没有错误
+      }
+      const { code } = dataAxios;
+      // 有 code 代表这是一个后端接口 可以进行进一步的判断
+      switch (code) {
+        case 0:
+          // [ 示例 ] code === 0 代表没有错误
+          // @ts-ignore
+          return dataAxios?.data;
+        default:
+          // 不是正确的 code
+          const errorMessage = dataAxios.msg || dataAxios.message || "未知错误";
+          // @ts-ignore
+          if (response?.config?.onError) {
+            const err = new CodeError(errorMessage, dataAxios.code, dataAxios.data);
             // @ts-ignore
-            return dataAxios.data;
-          default:
-            // 不是正确的 code
-            const errorMessage = dataAxios.msg || dataAxios.message || "未知错误";
-            // @ts-ignore
-            if (response?.config?.onError) {
-              // @ts-ignore
-              response.config.onError(new Error(errorMessage));
-            }
-            //@ts-ignore
-            const showErrorNotify = response?.config?.showErrorNotify;
-            errorCreate(`${errorMessage}: ${response.config.url}`, showErrorNotify);
-            return dataAxios;
-        }
+            response.config.onError(err);
+            return;
+          }
+          //@ts-ignore
+          const showErrorNotify = response?.config?.showErrorNotify;
+          errorCreate(`${errorMessage}: ${response.config.url}`, showErrorNotify, dataAxios);
+          return dataAxios;
       }
     },
     error => {

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

@@ -4,6 +4,7 @@
  * @param {String} defaultValue 默认值
  */
 import { uiContext } from "@fast-crud/fast-crud";
+import { CodeError } from "/@/api/service";
 
 export function parse(jsonString = "{}", defaultValue = {}) {
   let result = defaultValue;
@@ -68,8 +69,8 @@ export function errorLog(error: any, notify = true) {
  * @description 创建一个错误
  * @param {String} msg 错误信息
  */
-export function errorCreate(msg: string, notify = true) {
-  const err = new Error(msg);
+export function errorCreate(msg: string, notify = true, data?: any) {
+  const err = new CodeError(msg, data.code, data.data);
   console.error("errorCreate", err);
   if (notify) {
     uiContext.get().notification.error({ message: err.message });

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

@@ -1,7 +1,7 @@
 <template>
   <div class="pem-input">
     <FileInput v-bind="fileInput" class="mb-5" type="primary" text="选择文件" @change="onChange" />
-    <a-textarea v-bind="textarea" v-model:value="textRef"></a-textarea>
+    <a-textarea v-bind="textarea" :value="modelValue" @update:value="emitValue"></a-textarea>
   </div>
 </template>
 
@@ -17,7 +17,6 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits(["update:modelValue"]);
-const textRef = ref();
 
 function emitValue(value: string) {
   emit("update:modelValue", value);
@@ -39,16 +38,6 @@ function onChange(e: any) {
   };
   fileReader.readAsText(file); // 以文本形式读取文件
 }
-
-watch(
-  () => props.modelValue,
-  value => {
-    textRef.value = value;
-  },
-  {
-    immediate: true,
-  }
-);
 </script>
 
 <style lang="less">

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/i18n/locale/zh_CN.ts

@@ -3,12 +3,12 @@ export default {
     crud: { i18n: { name: "姓名", city: "城市", status: "状态" } },
     login: {
       logoutTip: "确认",
-      logoutMessage: "确定要注销登录吗？"
-    }
+      logoutMessage: "确定要注销登录吗？",
+    },
   },
   fs: {
     rowHandle: {
-      title: "操作列"
-    }
-  }
+      title: "操作列",
+    },
+  },
 };

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

@@ -20,7 +20,7 @@ import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
 
 defineOptions({
-  name: "FsUserInfo"
+  name: "FsUserInfo",
 });
 const userStore = useUserStore();
 const { t } = useI18n();
@@ -38,7 +38,7 @@ function doLogout() {
     content: t("app.login.logoutMessage"),
     onOk: async () => {
       await userStore.logout(true);
-    }
+    },
   });
 }
 </script>

packages/ui/certd-client/src/layout/layout-basic.vue

@@ -30,7 +30,7 @@ const avatar = computed(() => {
 });
 
 async function handleLogout() {
-  userStore.logout(true);
+  await userStore.logout(true);
 }
 
 const settingStore = useSettingStore();

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

@@ -143,6 +143,17 @@ export const certdResources = [
               keepAlive: true,
             },
           },
+          {
+            title: "认证安全设置",
+            name: "UserSecurity",
+            path: "/certd/mine/security",
+            component: "/certd/mine/security/index.vue",
+            meta: {
+              icon: "fluent:shield-keyhole-16-regular",
+              auth: true,
+              isMenu: true,
+            },
+          },
           {
             title: "账号信息",
             name: "UserProfile",

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

@@ -10,6 +10,7 @@ import { updatePreferences } from "/@/vben/preferences";
 import { useTitle } from "@vueuse/core";
 import { utils } from "/@/utils";
 import { cloneDeep } from "lodash-es";
+
 export interface SettingState {
   sysPublic?: SysPublicSetting;
   installInfo?: {
@@ -184,6 +185,17 @@ export const useSettingStore = defineStore({
         useTitle(this.siteInfo.title);
       }
     },
+    getBaseUrl() {
+      let url = window.location.href;
+      //只要hash前面的部分
+      url = url.split("#")[0];
+      return url;
+    },
+    async doBindUrl() {
+      const url = this.getBaseUrl();
+      await basicApi.bindUrl({ url });
+      await this.loadSysSettings();
+    },
     async checkUrlBound() {
       const userStore = useUserStore();
       const settingStore = useSettingStore();
@@ -193,22 +205,9 @@ export const useSettingStore = defineStore({
 
       const bindUrl = this.installInfo.bindUrl;
 
-      function getBaseUrl() {
-        let url = window.location.href;
-        //只要hash前面的部分
-        url = url.split("#")[0];
-        return url;
-      }
-
-      const doBindUrl = async (url: string) => {
-        await basicApi.bindUrl({ url });
-        await this.loadSysSettings();
-      };
-
-      const baseUrl = getBaseUrl();
       if (!bindUrl) {
         //绑定url
-        await doBindUrl(baseUrl);
+        await this.doBindUrl();
       } else {
         //检查当前url 是否与绑定的url一致
         const url = window.location.href;
@@ -217,7 +216,7 @@ export const useSettingStore = defineStore({
             title: "URL地址有变化",
             content: "以后都用这个新地址访问本系统吗？",
             onOk: async () => {
-              await doBindUrl(baseUrl);
+              await this.doBindUrl();
             },
             okText: "是的，继续",
             cancelText: "不是，回到原来的地址",

packages/ui/certd-client/src/store/user/api.user.ts

@@ -41,6 +41,12 @@ export async function register(user: RegisterReq): Promise<UserInfoRes> {
     data: user,
   });
 }
+export async function logout() {
+  return await request({
+    url: "/logout",
+    method: "post",
+  });
+}
 
 export async function login(data: LoginReq): Promise<LoginRes> {
   //如果开启了登录与权限模块，则真实登录
@@ -66,3 +72,11 @@ export async function mine(): Promise<UserInfoRes> {
     method: "post",
   });
 }
+
+export async function loginByTwoFactor(data: any) {
+  return await request({
+    url: "/loginByTwoFactor",
+    method: "post",
+    data,
+  });
+}

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

@@ -51,7 +51,7 @@ export const useUserStore = defineStore({
     setUserInfo(info: UserInfoRes) {
       this.userInfo = info;
       const userStore = vbenUserStore();
-      userStore.setUserInfo(info);
+      userStore.setUserInfo(info as any);
       LocalStorage.set(USER_INFO_KEY, info);
     },
     resetState() {
@@ -71,23 +71,18 @@ export const useUserStore = defineStore({
      * @description: login
      */
     async login(loginType: string, params: LoginReq | SmsLoginReq): Promise<any> {
-      try {
-        let loginRes: any = null;
-        if (loginType === "sms") {
-          loginRes = await UserApi.loginBySms(params as SmsLoginReq);
-        } else {
-          loginRes = await UserApi.login(params as LoginReq);
-        }
-
-        const { token, expire } = loginRes;
-        // save token
-        this.setToken(token, expire);
-        // get user info
-        return await this.onLoginSuccess(loginRes);
-      } catch (error) {
-        console.error(error);
-        return null;
+      let loginRes: any = null;
+      if (loginType === "sms") {
+        loginRes = await UserApi.loginBySms(params as SmsLoginReq);
+      } else {
+        loginRes = await UserApi.login(params as LoginReq);
       }
+      return await this.onLoginSuccess(loginRes);
+    },
+
+    async loginByTwoFactor(form: any) {
+      const loginRes = await UserApi.loginByTwoFactor(form);
+      return await this.onLoginSuccess(loginRes);
     },
     async getUserInfoAction(): Promise<UserInfoRes> {
       const userInfo = await UserApi.mine();
@@ -100,18 +95,23 @@ export const useUserStore = defineStore({
     },
 
     async onLoginSuccess(loginData: any) {
+      const { token, expire } = loginData;
+      // save token
+      this.setToken(token, expire);
+      // get user info
       // await this.getUserInfoAction();
       // const userInfo = await this.getUserInfoAction();
-      mitter.emit("app.login", { token: loginData });
+      mitter.emit("app.login", { ...loginData });
       await router.replace("/");
     },
 
     /**
      * @description: logout
      */
-    logout(goLogin = true) {
+    async logout(goLogin = true) {
       this.resetState();
       resetAllStores();
+      await UserApi.logout(); //主要是清空cookie
       goLogin && router.push("/login");
       mitter.emit("app.logout");
     },

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

@@ -99,4 +99,25 @@ span.fs-icon-svg{
 
 .ant-btn .fs-icon:last-child{
   margin-right:0px
+}
+
+.fs-iconify fs-icon{
+  svg{
+    vertical-align:0 !important;
+  }
+}
+
+.fs-button{
+  span{
+    &:first-child{
+      margin-right: 5px;
+    }
+    &:last-child{
+      margin-left: 5px;
+    }
+  }
+  .fs-icon,.fs-button-icon{
+    margin: 0 !important;
+
+  }
 }

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

@@ -7,6 +7,7 @@ import { routerUtils } from "./util.router";
 import { treeUtils } from "./util.tree";
 import { hashUtils } from "./util.hash";
 import { amountUtils } from "./util.amount";
+import { cache } from "./util.cache";
 export const util = {
   ...envs,
   ...sites,
@@ -16,6 +17,7 @@ export const util = {
   router: routerUtils,
   tree: treeUtils,
   hash: hashUtils,
-  amount: amountUtils
+  amount: amountUtils,
+  cache,
 };
 export const utils = util;

packages/ui/certd-client/src/utils/util.amount.ts

@@ -5,5 +5,5 @@ export const amountUtils = {
 
   toYuan(amount: number): number {
     return parseFloat((amount / 100).toFixed(2));
-  }
+  },
 };

packages/ui/certd-client/src/utils/util.cache.ts

@@ -0,0 +1,17 @@
+export class Cache {
+  bucket: Record<string, any> = {};
+
+  async get(key: string) {
+    return this.bucket[key];
+  }
+
+  async set(key: string, value: any, ttl?: number) {
+    this.bucket[key] = value;
+  }
+
+  async del(key: string) {
+    delete this.bucket[key];
+  }
+}
+
+export const cache = new Cache();

packages/ui/certd-client/src/utils/util.common.ts

@@ -47,4 +47,13 @@ export default {
     }
     return desc.replace(/\[(.*)\]\((.*)\)/g, '<a href="$2" target="_blank">$1</a>');
   },
+
+  randomString(length: number) {
+    const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+    let result = "";
+    for (let i = 0; i < length; i++) {
+      result += chars.charAt(Math.floor(Math.random() * chars.length));
+    }
+    return result;
+  },
 };

packages/ui/certd-client/src/utils/util.hash.ts

@@ -1,5 +1,5 @@
 export const hashUtils = {
   md5(data: string) {
     throw new Error("Not implemented");
-  }
+  },
 };

packages/ui/certd-client/src/utils/util.site.ts

@@ -7,5 +7,5 @@ export const site = {
   title: function (titleText: string, baseTitle?: string) {
     const processTitle = baseTitle || env.TITLE || "Certd";
     window.document.title = `${processTitle}${titleText ? ` | ${titleText}` : ""}`;
-  }
+  },
 };

packages/ui/certd-client/src/utils/util.storage.ts

@@ -46,7 +46,7 @@ export class WebStorage {
     const stringData = JSON.stringify({
       value,
       time: Date.now(),
-      expire: expire != null ? new Date().getTime() + expire * 1000 : null
+      expire: expire != null ? new Date().getTime() + expire * 1000 : null,
     });
     this.storage.setItem(this.getKey(key), stringData);
   }

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

@@ -0,0 +1,47 @@
+// @ts-ignore
+import { request } from "/@/api/service";
+const apiPrefix = "/user/settings";
+export type UserTwoFactorSetting = {
+  authenticator: {
+    enabled: boolean;
+    verified: boolean;
+  };
+};
+
+export type AuthenticatorSaveReq = {
+  verifyCode?: string;
+};
+
+export async function TwoFactorSettingsGet() {
+  const res = await request({
+    url: apiPrefix + "/twoFactor/get",
+    method: "post",
+  });
+  if (!res) {
+    return {};
+  }
+  return res as UserTwoFactorSetting;
+}
+
+export async function TwoFactorAuthenticatorGet() {
+  const res = await request({
+    url: apiPrefix + "/twoFactor/authenticator/qrcode",
+    method: "post",
+  });
+  return res as string; //base64
+}
+
+export async function TwoFactorAuthenticatorSave(req: AuthenticatorSaveReq) {
+  return await request({
+    url: apiPrefix + "/twoFactor/authenticator/save",
+    method: "post",
+    data: req,
+  });
+}
+
+export async function TwoFactorAuthenticatorOff() {
+  return await request({
+    url: apiPrefix + "/twoFactor/authenticator/off",
+    method: "post",
+  });
+}

packages/ui/certd-client/src/views/certd/mine/security/index.vue

@@ -0,0 +1,162 @@
+<template>
+  <fs-page class="page-user-settings page-two-factor">
+    <template #header>
+      <div class="title">认证安全设置</div>
+    </template>
+    <div class="user-settings-form settings-form">
+      <a-form :model="formState" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off">
+        <a-form-item label="2FA多重验证登录" :name="['authenticator', 'enabled']">
+          <div class="flex mt-5">
+            <a-switch v-model:checked="formState.authenticator.enabled" :disabled="!settingsStore.isPlus" @change="onAuthenticatorEnabledChanged" />
+
+            <a-button
+              v-if="formState.authenticator.enabled && formState.authenticator.verified"
+              :disabled="authenticatorOpenRef || !settingsStore.isPlus"
+              size="small"
+              class="ml-5"
+              type="primary"
+              @click="authenticatorForm.open = true"
+            >
+              重新绑定
+            </a-button>
+
+            <vip-button class="ml-5" mode="button"></vip-button>
+          </div>
+
+          <div class="helper">是否开启多重验证登录</div>
+        </a-form-item>
+        <a-form-item v-if="authenticatorOpenRef" label="绑定设备" class="authenticator-config">
+          <h3 class="font-bold m-5">1. 安装任意一款支持Authenticator的验证APP，比如：</h3>
+          <div class="ml-20">
+            <ul>
+              <li>
+                <a-tooltip title="如果报没有找到谷歌服务的错误，您可以安装KK谷歌助手">
+                  <a href="https://appgallery.huawei.com/app/C100262999" target="_blank"> Microsoft Authenticator</a>
+                </a-tooltip>
+              </li>
+              <li>
+                <a href="https://sj.qq.com/appdetail/com.tencent.authenticator" target="_blank">腾讯身份验证器</a>
+              </li>
+              <li>
+                <a href="https://www.synology.cn/zh-cn/dsm/feature/authentication" target="_blank">群晖身份验证器</a>
+              </li>
+              <li>
+                <a-tooltip title="如果报没有找到谷歌服务的错误，您可以安装KK谷歌助手">
+                  <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Google Authenticator</a>
+                </a-tooltip>
+              </li>
+              <li>
+                <a href="https://play.google.com/store/apps/details?id=com.authy.authy" target="_blank">Authy</a>
+              </li>
+            </ul>
+          </div>
+          <h3 class="font-bold m-10">2. 扫描二维码添加账号</h3>
+          <div v-if="authenticatorForm.qrcodeSrc" class="qrcode">
+            <div class="ml-20">
+              <img class="full-w" :src="authenticatorForm.qrcodeSrc" />
+            </div>
+          </div>
+          <h3 class="font-bold m-10">3. 输入验证码</h3>
+          <div class="ml-20">
+            <a-input v-model:value="authenticatorForm.verifyCode" placeholder="请输入验证码" />
+          </div>
+          <div class="ml-20 flex mt-10">
+            <loading-button type="primary" html-type="button" :click="doAuthenticatorSave">确认</loading-button>
+            <a-button class="ml-1" @click="authenticatorForm.open = false">取消</a-button>
+          </div>
+        </a-form-item>
+      </a-form>
+    </div>
+  </fs-page>
+</template>
+
+<script setup lang="tsx">
+import { computed, reactive, watch } from "vue";
+import * as api from "./api";
+import { UserTwoFactorSetting } from "./api";
+import { Modal, notification } from "ant-design-vue";
+import { merge } from "lodash-es";
+import { useSettingStore } from "/@/store/settings";
+const settingsStore = useSettingStore();
+defineOptions({
+  name: "UserSecurity",
+});
+
+const formState = reactive<Partial<UserTwoFactorSetting>>({
+  authenticator: {
+    enabled: false,
+    verified: false,
+  },
+});
+
+const authenticatorForm = reactive({
+  qrcodeSrc: "",
+  verifyCode: "",
+  open: false,
+});
+
+const authenticatorOpenRef = computed(() => {
+  return formState.authenticator.enabled && (authenticatorForm.open || !formState.authenticator.verified);
+});
+watch(
+  () => {
+    return authenticatorOpenRef.value;
+  },
+  async open => {
+    if (open) {
+      //base64 转图片
+      authenticatorForm.qrcodeSrc = await api.TwoFactorAuthenticatorGet();
+    } else {
+      authenticatorForm.qrcodeSrc = "";
+      authenticatorForm.verifyCode = "";
+    }
+  }
+);
+
+async function loadUserSettings() {
+  const data: any = await api.TwoFactorSettingsGet();
+  merge(formState, data);
+}
+
+loadUserSettings();
+const doAuthenticatorSave = async (form: any) => {
+  await api.TwoFactorAuthenticatorSave({
+    verifyCode: authenticatorForm.verifyCode,
+  });
+  notification.success({
+    message: "保存成功",
+  });
+  authenticatorForm.open = false;
+};
+
+function onAuthenticatorEnabledChanged(value: any) {
+  if (!value) {
+    //要关闭
+    if (formState.authenticator.verified) {
+      Modal.confirm({
+        title: "确认",
+        content: `确定要关闭多重验证登录吗？`,
+        async onOk() {
+          await api.TwoFactorAuthenticatorOff();
+          notification.success({
+            message: "关闭成功",
+          });
+          loadUserSettings();
+        },
+        onCancel() {
+          formState.authenticator.enabled = true;
+        },
+      });
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.page-user-settings {
+  .user-settings-form {
+    width: 600px;
+    margin: 20px;
+  }
+}
+</style>

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

@@ -7,7 +7,7 @@ export function createNotificationApi() {
       return await request({
         url: apiPrefix + "/page",
         method: "post",
-        data: query
+        data: query,
       });
     },
 
@@ -15,7 +15,7 @@ export function createNotificationApi() {
       return await request({
         url: apiPrefix + "/add",
         method: "post",
-        data: obj
+        data: obj,
       });
     },
 
@@ -23,7 +23,7 @@ export function createNotificationApi() {
       return await request({
         url: apiPrefix + "/update",
         method: "post",
-        data: obj
+        data: obj,
       });
     },
 
@@ -31,7 +31,7 @@ export function createNotificationApi() {
       return await request({
         url: apiPrefix + "/delete",
         method: "post",
-        params: { id }
+        params: { id },
       });
     },
 
@@ -39,14 +39,14 @@ export function createNotificationApi() {
       return await request({
         url: apiPrefix + "/info",
         method: "post",
-        params: { id }
+        params: { id },
       });
     },
 
     async GetOptions(id: number) {
       return await request({
         url: apiPrefix + "/options",
-        method: "post"
+        method: "post",
       });
     },
 
@@ -54,14 +54,14 @@ export function createNotificationApi() {
       return await request({
         url: apiPrefix + "/setDefault",
         method: "post",
-        params: { id }
+        params: { id },
       });
     },
 
     async GetDefaultId() {
       return await request({
         url: apiPrefix + "/getDefaultId",
-        method: "post"
+        method: "post",
       });
     },
 
@@ -69,14 +69,14 @@ export function createNotificationApi() {
       return await request({
         url: apiPrefix + "/simpleInfo",
         method: "post",
-        params: { id }
+        params: { id },
       });
     },
 
     async GetDefineTypes() {
       return await request({
         url: apiPrefix + "/getTypeDict",
-        method: "post"
+        method: "post",
       });
     },
 
@@ -84,7 +84,7 @@ export function createNotificationApi() {
       return await request({
         url: apiPrefix + "/define",
         method: "post",
-        params: { type }
+        params: { type },
       });
     },
 
@@ -92,15 +92,15 @@ export function createNotificationApi() {
       return await request({
         url: apiPrefix + "/defineByType",
         method: "post",
-        params: { type }
+        params: { type },
       });
     },
     async GetOrCreateDefault(param: { email: any }) {
       return await request({
         url: apiPrefix + "/getOrCreateDefault",
         method: "post",
-        data: param
+        data: param,
       });
-    }
+    },
   };
 }

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

@@ -122,3 +122,11 @@ export async function GetCert(pipelineId: number): Promise<CertInfo> {
     params: { id: pipelineId },
   });
 }
+
+export async function ReadCertDetail(crt: string): Promise<any> {
+  return await request({
+    url: certApiPrefix + "/readCertDetail",
+    method: "post",
+    data: { crt },
+  });
+}

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

@@ -8,7 +8,7 @@
 </template>
 
 <script lang="tsx" setup>
-import { computed, inject } from "vue";
+import { computed, inject, watch, ref } from "vue";
 import { useCertUpload } from "./use";
 import { getAllDomainsFromCrt } from "/@/views/certd/pipeline/utils";
 
@@ -27,19 +27,36 @@ const emit = defineEmits(["updated", "update:modelValue"]);
 
 const { openUpdateCertDialog } = useCertUpload();
 
-const domain = computed(() => {
-  if (!props.modelValue?.crt) {
-    return "";
-  }
-  const domains = getAllDomainsFromCrt(props.modelValue?.crt);
+const domainsRef = ref([]);
 
-  return domains[0];
+watch(
+  () => {
+    return props.modelValue?.crt;
+  },
+  async crt => {
+    if (crt) {
+      domainsRef.value = await getAllDomainsFromCrt(crt);
+    } else {
+      domainsRef.value = [];
+    }
+
+    emit("updated", { domains: domainsRef.value });
+  },
+  {
+    immediate: true,
+  }
+);
+
+const domain = computed(() => {
+  if (domainsRef.value && domainsRef.value.length > 0) {
+    return domainsRef.value[0];
+  }
+
+  return "";
 });
 
-function onUpdated(res: { uploadCert: any }) {
+async function onUpdated(res: { uploadCert: any }) {
   emit("update:modelValue", res.uploadCert);
-  const domains = getAllDomainsFromCrt(res.uploadCert.crt);
-  emit("updated", { domains });
 }
 
 const pipeline: any = inject("pipeline");

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

@@ -1,4 +1,4 @@
-import { compute, useFormWrapper } from "@fast-crud/fast-crud";
+import { compute, dict, useFormWrapper } from "@fast-crud/fast-crud";
 import NotificationSelector from "/@/views/certd/notification/notification-selector/index.vue";
 import { cloneDeep, omit } from "lodash-es";
 import { useReference } from "/@/use/use-refrence";
@@ -8,6 +8,7 @@ import { checkPipelineLimit, getAllDomainsFromCrt } from "/@/views/certd/pipelin
 import { useRouter } from "vue-router";
 import { nanoid } from "nanoid";
 import { usePluginStore } from "/@/store/plugin";
+import GroupSelector from "/@/views/certd/pipeline/group/group-selector.vue";
 
 export function useCertUpload() {
   const { openCrudFormDialog } = useFormWrapper();
@@ -90,7 +91,7 @@ export function useCertUpload() {
     return inputs;
   }
 
-  async function openUploadCreateDialog() {
+  async function openUploadCreateDialog(req: { defaultGroupId?: number }) {
     //检查是否流水线数量超出限制
     await checkPipelineLimit();
 
@@ -102,7 +103,11 @@ export function useCertUpload() {
       return wrapperRef.value.getFormData();
     }
     const inputs = await buildUploadCertPluginInputs(getFormData);
-
+    const groupDictRef = dict({
+      url: "/pi/pipeline/group/all",
+      value: "id",
+      label: "name",
+    });
     function createCrudOptions() {
       return {
         crudOptions: {
@@ -127,6 +132,19 @@ export function useCertUpload() {
                 helper: "任务执行失败实时提醒",
               },
             },
+            groupId: {
+              title: "流水线分组",
+              type: "dict-select",
+              dict: groupDictRef,
+              form: {
+                component: {
+                  name: GroupSelector,
+                  vModel: "modelValue",
+                },
+                value: req.defaultGroupId || undefined,
+                order: 9999,
+              },
+            },
           },
           form: {
             wrapper: {
@@ -135,7 +153,7 @@ export function useCertUpload() {
             },
             async doSubmit({ form }: any) {
               const cert = form.uploadCert;
-              const domains = getAllDomainsFromCrt(cert.crt);
+              const domains = await getAllDomainsFromCrt(cert.crt);
 
               const notifications = [];
               if (form.notification != null) {
@@ -191,6 +209,7 @@ export function useCertUpload() {
                 content: JSON.stringify(pipeline),
                 keepHistoryCount: 30,
                 type: "cert_upload",
+                groupId: form.groupId,
               });
               router.push({
                 path: "/certd/pipeline/detail",

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

@@ -1,143 +0,0 @@
-import { compute, CreateCrudOptionsRet, dict } from "@fast-crud/fast-crud";
-import { useReference } from "/@/use/use-refrence";
-import { merge, cloneDeep } from "lodash-es";
-import NotificationSelector from "/@/views/certd/notification/notification-selector/index.vue";
-import { usePluginStore } from "/@/store/plugin";
-
-export default function (certPlugins: any[], formWrapperRef: any): CreateCrudOptionsRet {
-  const inputs: any = {};
-  const moreParams = [];
-  for (const plugin of certPlugins) {
-    for (const inputKey in plugin.input) {
-      if (inputs[inputKey]) {
-        //如果两个插件有的字段，直接显示
-        inputs[inputKey].form.show = true;
-        continue;
-      }
-      const inputDefine = cloneDeep(plugin.input[inputKey]);
-      if (!inputDefine.required && !inputDefine.maybeNeed) {
-        moreParams.push(inputKey);
-        // continue;
-      }
-      useReference(inputDefine);
-      inputs[inputKey] = {
-        title: inputDefine.title,
-        form: {
-          ...inputDefine,
-          show: compute(ctx => {
-            const form = formWrapperRef.value.getFormData();
-            if (!form) {
-              return false;
-            }
-
-            let inputDefineShow = true;
-            if (inputDefine.show != null) {
-              const computeShow = inputDefine.show as any;
-              if (computeShow === false) {
-                inputDefineShow = false;
-              } else if (computeShow && computeShow.computeFn) {
-                inputDefineShow = computeShow.computeFn({ form });
-              }
-            }
-            return form?.certApplyPlugin === plugin.name && inputDefineShow;
-          }),
-        },
-      };
-    }
-  }
-
-  const pluginStore = usePluginStore();
-  const randomHour = Math.floor(Math.random() * 6);
-  const randomMin = Math.floor(Math.random() * 60);
-  return {
-    crudOptions: {
-      form: {
-        wrapper: {
-          width: 1350,
-          saveRemind: false,
-          title: "创建证书流水线",
-        },
-        group: {
-          groups: {
-            more: {
-              header: "更多参数",
-              columns: moreParams,
-              collapsed: true,
-            },
-          },
-        },
-      },
-      columns: {
-        certApplyPlugin: {
-          title: "证书申请插件",
-          type: "dict-select",
-          dict: dict({
-            data: [
-              { value: "CertApply", label: "JS-ACME" },
-              { value: "CertApplyLego", label: "Lego-ACME" },
-            ],
-          }),
-          form: {
-            order: 0,
-            value: "CertApply",
-            helper: {
-              render: () => {
-                return (
-                  <ul>
-                    <li>JS-ACME：使用简单方便，功能强大【推荐】</li>
-                    <li>Lego-ACME：基于Lego实现，支持海量DNS提供商，熟悉LEGO的用户可以使用</li>
-                  </ul>
-                );
-              },
-            },
-            valueChange: {
-              handle: async ({ form, value }) => {
-                const config = await pluginStore.getPluginConfig({
-                  name: value,
-                  type: "builtIn",
-                });
-                if (config.sysSetting?.input) {
-                  merge(form, config.sysSetting.input);
-                }
-              },
-              immediate: true,
-            },
-          },
-        },
-        ...inputs,
-        triggerCron: {
-          title: "定时触发",
-          type: "text",
-          form: {
-            value: `0 ${randomMin} ${randomHour} * * *`,
-            component: {
-              name: "cron-editor",
-              vModel: "modelValue",
-              placeholder: "0 0 4 * * *",
-            },
-            helper: "点击上面的按钮，选择每天几点定时执行。\n建议设置为每天触发一次，证书未到期之前任务会跳过，不会重复执行",
-            order: 100,
-          },
-        },
-        notification: {
-          title: "失败通知",
-          type: "text",
-          form: {
-            value: 0,
-            component: {
-              name: NotificationSelector,
-              vModel: "modelValue",
-              on: {
-                selectedChange({ $event, form }) {
-                  form.notificationTarget = $event;
-                },
-              },
-            },
-            order: 101,
-            helper: "任务执行失败实时提醒",
-          },
-        },
-      },
-    },
-  };
-}

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

@@ -1,67 +0,0 @@
-<template>
-  <fs-form-wrapper v-if="formWrapperOptions" ref="formWrapperRef" />
-</template>
-
-<script lang="ts" setup>
-import { useColumns } from "@fast-crud/fast-crud";
-import createCrudOptions from "./crud.jsx";
-import { ref } from "vue";
-import { merge } from "lodash-es";
-import { PluginGroup, usePluginStore } from "/@/store/plugin";
-import { createNotificationApi } from "/@/views/certd/notification/api";
-
-defineOptions({
-  name: "PiCertdForm",
-});
-
-const formWrapperRef = ref();
-const formWrapperOptions = ref();
-const doSubmitRef = ref();
-const pluginStore = usePluginStore();
-async function buildFormOptions() {
-  const pluginGroup = await pluginStore.getGroups();
-  const pluginGroups: { [key: string]: PluginGroup } = pluginGroup.groups;
-  const certPluginGroup = pluginGroups.cert;
-
-  const certPlugins = [];
-  for (const plugin of certPluginGroup.plugins) {
-    const detail: any = await pluginStore.getPluginDefine(plugin.name);
-    certPlugins.push(detail);
-  }
-
-  // 自定义表单配置
-  const { buildFormOptions } = useColumns();
-  //使用crudOptions结构来构建自定义表单配置
-  let { crudOptions } = createCrudOptions(certPlugins, formWrapperRef);
-
-  const formOptions = buildFormOptions(
-    merge(crudOptions, {
-      form: {
-        async doSubmit({ form }: any) {
-          // 创建certd 的pipeline
-          await doSubmitRef.value({ form });
-
-          if (form.email) {
-            //创建一个默认的邮件通知
-            const notificationApi = createNotificationApi();
-            await notificationApi.GetOrCreateDefault({ email: form.email });
-          }
-        },
-      },
-    }) as any
-  );
-
-  formWrapperOptions.value = formOptions;
-}
-buildFormOptions();
-function open(doSubmit: any) {
-  doSubmitRef.value = doSubmit;
-  formWrapperRef.value.open(formWrapperOptions.value);
-}
-
-defineExpose({
-  open,
-});
-</script>
-
-<style scoped></style>

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

@@ -1,126 +0,0 @@
-import { checkPipelineLimit, readCertDetail } from "/@/views/certd/pipeline/utils";
-import { omit } from "lodash-es";
-import * as api from "/@/views/certd/pipeline/api";
-import { message } from "ant-design-vue";
-import { nanoid } from "nanoid";
-import { useRouter } from "vue-router";
-
-export function setRunnableIds(pipeline: any) {
-  const idMap: any = {};
-  function createId(oldId: any) {
-    if (oldId == null) {
-      return nanoid();
-    }
-    const newId = nanoid();
-    idMap[oldId] = newId;
-    return newId;
-  }
-  if (pipeline.stages) {
-    for (const stage of pipeline.stages) {
-      stage.id = createId(stage.id);
-      if (stage.tasks) {
-        for (const task of stage.tasks) {
-          task.id = createId(task.id);
-          if (task.steps) {
-            for (const step of task.steps) {
-              step.id = createId(step.id);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  for (const trigger of pipeline.triggers) {
-    trigger.id = nanoid();
-  }
-  for (const notification of pipeline.notifications) {
-    notification.id = nanoid();
-  }
-
-  let content = JSON.stringify(pipeline);
-  for (const key in idMap) {
-    content = content.replaceAll(key, idMap[key]);
-  }
-  return JSON.parse(content);
-}
-
-export function useCertd(certdFormRef: any) {
-  const router = useRouter();
-  async function openAddCertdPipelineDialog() {
-    //检查是否流水线数量超出限制
-    await checkPipelineLimit();
-
-    certdFormRef.value.open(async ({ form }: any) => {
-      // const certDetail = readCertDetail(form.cert.crt);
-      // 添加certd pipeline
-      const triggers = [];
-      if (form.triggerCron) {
-        triggers.push({ title: "定时触发", type: "timer", props: { cron: form.triggerCron } });
-      }
-      const notifications = [];
-      if (form.notification != null) {
-        notifications.push({
-          type: "custom",
-          when: ["error", "turnToSuccess", "success"],
-          notificationId: form.notification,
-          title: form.notificationTarget?.name || "自定义通知",
-        });
-      }
-      const pluginInput = omit(form, ["triggerCron", "notification", "notificationTarget", "certApplyPlugin"]);
-      let pipeline = {
-        title: form.domains[0] + "证书自动化",
-        runnableType: "pipeline",
-        stages: [
-          {
-            title: "证书申请阶段",
-            maxTaskCount: 1,
-            runnableType: "stage",
-            tasks: [
-              {
-                title: "证书申请任务",
-                runnableType: "task",
-                steps: [
-                  {
-                    title: "申请证书",
-                    runnableType: "step",
-                    input: {
-                      renewDays: 35,
-                      ...pluginInput,
-                    },
-                    strategy: {
-                      runStrategy: 0, // 正常执行
-                    },
-                    type: form.certApplyPlugin,
-                  },
-                ],
-              },
-            ],
-          },
-        ],
-        triggers,
-        notifications,
-      };
-      pipeline = setRunnableIds(pipeline);
-
-      /**
-       *  // cert: 证书; backup: 备份; custom:自定义;
-       *   type: string;
-       *   // custom: 自定义; monitor: 监控;
-       *   from: string;
-       */
-      const id = await api.Save({
-        title: pipeline.title,
-        content: JSON.stringify(pipeline),
-        keepHistoryCount: 30,
-        type: "cert",
-      });
-      message.success("创建成功,请添加证书部署任务");
-      router.push({ path: "/certd/pipeline/detail", query: { id, editMode: "true" } });
-    });
-  }
-
-  return {
-    openAddCertdPipelineDialog,
-  };
-}

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

@@ -0,0 +1,333 @@
+import { checkPipelineLimit } from "/@/views/certd/pipeline/utils";
+import { cloneDeep, merge, omit } from "lodash-es";
+import { message } from "ant-design-vue";
+import { nanoid } from "nanoid";
+import { useRouter } from "vue-router";
+import { compute, CreateCrudOptionsRet, dict, useFormWrapper } from "@fast-crud/fast-crud";
+import NotificationSelector from "/@/views/certd/notification/notification-selector/index.vue";
+import { useReference } from "/@/use/use-refrence";
+import { ref } from "vue";
+import * as api from "../api";
+import { PluginGroup, usePluginStore } from "/@/store/plugin";
+import { createNotificationApi } from "/@/views/certd/notification/api";
+import GroupSelector from "../group/group-selector.vue";
+
+export function setRunnableIds(pipeline: any) {
+  const idMap: any = {};
+  function createId(oldId: any) {
+    if (oldId == null) {
+      return nanoid();
+    }
+    const newId = nanoid();
+    idMap[oldId] = newId;
+    return newId;
+  }
+  if (pipeline.stages) {
+    for (const stage of pipeline.stages) {
+      stage.id = createId(stage.id);
+      if (stage.tasks) {
+        for (const task of stage.tasks) {
+          task.id = createId(task.id);
+          if (task.steps) {
+            for (const step of task.steps) {
+              step.id = createId(step.id);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  for (const trigger of pipeline.triggers) {
+    trigger.id = nanoid();
+  }
+  for (const notification of pipeline.notifications) {
+    notification.id = nanoid();
+  }
+
+  let content = JSON.stringify(pipeline);
+  for (const key in idMap) {
+    content = content.replaceAll(key, idMap[key]);
+  }
+  return JSON.parse(content);
+}
+
+export function useCertPipelineCreator() {
+  const { openCrudFormDialog } = useFormWrapper();
+
+  const pluginStore = usePluginStore();
+  const router = useRouter();
+
+  function createCrudOptions(certPlugins: any[], getFormData: any, doSubmit: any): CreateCrudOptionsRet {
+    const inputs: any = {};
+    const moreParams = [];
+    for (const plugin of certPlugins) {
+      for (const inputKey in plugin.input) {
+        if (inputs[inputKey]) {
+          //如果两个插件有的字段，直接显示
+          inputs[inputKey].form.show = true;
+          continue;
+        }
+        const inputDefine = cloneDeep(plugin.input[inputKey]);
+        if (!inputDefine.required && !inputDefine.maybeNeed) {
+          moreParams.push(inputKey);
+          // continue;
+        }
+        useReference(inputDefine);
+        inputs[inputKey] = {
+          title: inputDefine.title,
+          form: {
+            ...inputDefine,
+            show: compute(ctx => {
+              const form = getFormData();
+              if (!form) {
+                return false;
+              }
+
+              let inputDefineShow = true;
+              if (inputDefine.show != null) {
+                const computeShow = inputDefine.show as any;
+                if (computeShow === false) {
+                  inputDefineShow = false;
+                } else if (computeShow && computeShow.computeFn) {
+                  inputDefineShow = computeShow.computeFn({ form });
+                }
+              }
+              return form?.certApplyPlugin === plugin.name && inputDefineShow;
+            }),
+          },
+        };
+      }
+    }
+
+    const pluginStore = usePluginStore();
+    const randomHour = Math.floor(Math.random() * 6);
+    const randomMin = Math.floor(Math.random() * 60);
+
+    const groupDictRef = dict({
+      url: "/pi/pipeline/group/all",
+      value: "id",
+      label: "name",
+    });
+
+    return {
+      crudOptions: {
+        form: {
+          doSubmit,
+          wrapper: {
+            width: 1350,
+            saveRemind: false,
+            title: "创建证书流水线",
+          },
+          group: {
+            groups: {
+              more: {
+                header: "更多参数",
+                columns: moreParams,
+                collapsed: true,
+              },
+            },
+          },
+        },
+        columns: {
+          certApplyPlugin: {
+            title: "证书申请插件",
+            type: "dict-select",
+            dict: dict({
+              data: [
+                { value: "CertApply", label: "JS-ACME" },
+                { value: "CertApplyLego", label: "Lego-ACME" },
+              ],
+            }),
+            form: {
+              order: 0,
+              value: "CertApply",
+              helper: {
+                render: () => {
+                  return (
+                    <ul>
+                      <li>JS-ACME：使用简单方便，功能强大【推荐】</li>
+                      <li>Lego-ACME：基于Lego实现，支持海量DNS提供商，熟悉LEGO的用户可以使用</li>
+                    </ul>
+                  );
+                },
+              },
+              valueChange: {
+                handle: async ({ form, value }) => {
+                  const config = await pluginStore.getPluginConfig({
+                    name: value,
+                    type: "builtIn",
+                  });
+                  if (config.sysSetting?.input) {
+                    merge(form, config.sysSetting.input);
+                  }
+                },
+                immediate: true,
+              },
+            },
+          },
+          ...inputs,
+          triggerCron: {
+            title: "定时触发",
+            type: "text",
+            form: {
+              value: `0 ${randomMin} ${randomHour} * * *`,
+              component: {
+                name: "cron-editor",
+                vModel: "modelValue",
+                placeholder: "0 0 4 * * *",
+              },
+              helper: "点击上面的按钮，选择每天几点定时执行。\n建议设置为每天触发一次，证书未到期之前任务会跳过，不会重复执行",
+              order: 100,
+            },
+          },
+          notification: {
+            title: "失败通知",
+            type: "text",
+            form: {
+              value: 0,
+              component: {
+                name: NotificationSelector,
+                vModel: "modelValue",
+                on: {
+                  selectedChange({ $event, form }) {
+                    form.notificationTarget = $event;
+                  },
+                },
+              },
+              order: 101,
+              helper: "任务执行失败实时提醒",
+            },
+          },
+          groupId: {
+            title: "流水线分组",
+            type: "dict-select",
+            dict: groupDictRef,
+            form: {
+              component: {
+                name: GroupSelector,
+                vModel: "modelValue",
+              },
+              order: 9999,
+            },
+          },
+        },
+      },
+    };
+  }
+
+  async function getCertPlugins() {
+    const pluginGroup = await pluginStore.getGroups();
+    const pluginGroups: { [key: string]: PluginGroup } = pluginGroup.groups;
+    const certPluginGroup = pluginGroups.cert;
+
+    const certPlugins = [];
+    for (const plugin of certPluginGroup.plugins) {
+      const detail: any = await pluginStore.getPluginDefine(plugin.name);
+      certPlugins.push(detail);
+    }
+    return certPlugins;
+  }
+
+  async function openAddCertdPipelineDialog(req: { defaultGroupId?: number }) {
+    //检查是否流水线数量超出限制
+    await checkPipelineLimit();
+
+    const wrapperRef = ref();
+    function getFormData() {
+      if (!wrapperRef.value) {
+        return null;
+      }
+      return wrapperRef.value.getFormData();
+    }
+
+    async function doSubmit({ form }: any) {
+      // const certDetail = readCertDetail(form.cert.crt);
+      // 添加certd pipeline
+      const triggers = [];
+      if (form.triggerCron) {
+        triggers.push({ title: "定时触发", type: "timer", props: { cron: form.triggerCron } });
+      }
+      const notifications = [];
+      if (form.notification != null) {
+        notifications.push({
+          type: "custom",
+          when: ["error", "turnToSuccess", "success"],
+          notificationId: form.notification,
+          title: form.notificationTarget?.name || "自定义通知",
+        });
+      }
+      const pluginInput = omit(form, ["triggerCron", "notification", "notificationTarget", "certApplyPlugin", "groupId"]);
+      let pipeline = {
+        title: form.domains[0] + "证书自动化",
+        runnableType: "pipeline",
+        stages: [
+          {
+            title: "证书申请阶段",
+            maxTaskCount: 1,
+            runnableType: "stage",
+            tasks: [
+              {
+                title: "证书申请任务",
+                runnableType: "task",
+                steps: [
+                  {
+                    title: "申请证书",
+                    runnableType: "step",
+                    input: {
+                      renewDays: 35,
+                      ...pluginInput,
+                    },
+                    strategy: {
+                      runStrategy: 0, // 正常执行
+                    },
+                    type: form.certApplyPlugin,
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+        triggers,
+        notifications,
+      };
+      pipeline = setRunnableIds(pipeline);
+
+      /**
+       *  // cert: 证书; backup: 备份; custom:自定义;
+       *   type: string;
+       *   // custom: 自定义; monitor: 监控;
+       *   from: string;
+       */
+      const groupId = form.groupId;
+      const id = await api.Save({
+        title: pipeline.title,
+        content: JSON.stringify(pipeline),
+        keepHistoryCount: 30,
+        type: "cert",
+        groupId,
+      });
+      if (form.email) {
+        try {
+          //创建一个默认的邮件通知
+          const notificationApi = createNotificationApi();
+          await notificationApi.GetOrCreateDefault({ email: form.email });
+        } catch (e) {
+          console.error(e);
+        }
+      }
+      message.success("创建成功,请添加证书部署任务");
+      router.push({ path: "/certd/pipeline/detail", query: { id, editMode: "true" } });
+    }
+    const certPlugins = await getCertPlugins();
+    const { crudOptions } = createCrudOptions(certPlugins, getFormData, doSubmit);
+    //@ts-ignore
+    crudOptions.columns.groupId.form.value = req.defaultGroupId || undefined;
+    const wrapper = await openCrudFormDialog({ crudOptions });
+    wrapperRef.value = wrapper;
+  }
+
+  return {
+    openAddCertdPipelineDialog,
+  };
+}

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

@@ -13,15 +13,16 @@ import { cloneDeep } from "lodash-es";
 import { useModal } from "/@/use/use-modal";
 import CertView from "./cert-view.vue";
 import { eachStages } from "./utils";
-import { setRunnableIds, useCertd } from "/@/views/certd/pipeline/certd-form/use";
+import { setRunnableIds, useCertPipelineCreator } from "/@/views/certd/pipeline/certd-form/use";
 import { useCertUpload } from "/@/views/certd/pipeline/cert-upload/use";
+import GroupSelector from "/@/views/certd/pipeline/group/group-selector.vue";
 
-export default function ({ crudExpose, context: { certdFormRef, groupDictRef, selectedRowKeys } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
   const { t } = useI18n();
   const lastResRef = ref();
 
-  const { openAddCertdPipelineDialog } = useCertd(certdFormRef);
+  const { openAddCertdPipelineDialog } = useCertPipelineCreator();
   const { openUploadCreateDialog } = useCertUpload();
 
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
@@ -116,6 +117,13 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
   const userStore = useUserStore();
   const settingStore = useSettingStore();
 
+  function onDialogOpen(opt: any) {
+    const searchForm = crudExpose.getSearchValidatedFormData();
+    opt.initialForm = {
+      groupId: searchForm.groupId,
+    };
+  }
+
   return {
     crudOptions: {
       request: {
@@ -157,7 +165,9 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
             type: "primary",
             icon: "ion:ios-add-circle-outline",
             click() {
-              openAddCertdPipelineDialog();
+              const searchForm = crudExpose.getSearchValidatedFormData();
+              const defaultGroupId = searchForm.groupId;
+              openAddCertdPipelineDialog({ defaultGroupId });
             },
           },
           uploadCert: {
@@ -179,7 +189,8 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
             },
             icon: "ion:cloud-upload-outline",
             click() {
-              openUploadCreateDialog();
+              const searchForm = crudExpose.getSearchValidatedFormData();
+              openUploadCreateDialog({ defaultGroupId: searchForm.groupId });
             },
           },
         },
@@ -190,6 +201,9 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
             router.push({ path: "/certd/pipeline/detail", query: { id: res.id, editMode: "true" } });
           }
         },
+        wrapper: {
+          onOpen: onDialogOpen,
+        },
       },
       table: {
         scroll: { x: 1500 },
@@ -418,7 +432,7 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
             show: false,
           },
           column: {
-            sorter: true,
+            sorter: false,
             width: 150,
             align: "center",
           },
@@ -489,6 +503,12 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
             show: true,
           },
           dict: groupDictRef,
+          form: {
+            component: {
+              name: GroupSelector,
+              vModel: "modelValue",
+            },
+          },
           column: {
             width: 130,
             align: "center",

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

@@ -5,7 +5,6 @@ import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, Edi
 import { pipelineGroupApi } from "./api";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
-  const { t } = useI18n();
   const api = pipelineGroupApi;
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
     return await api.GetList(query);
@@ -34,32 +33,32 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           mobile: {
             props: {
               rowHandle: {
-                width: 160
-              }
-            }
-          }
-        }
+                width: 160,
+              },
+            },
+          },
+        },
       },
       request: {
         pageRequest,
         addRequest,
         editRequest,
-        delRequest
+        delRequest,
       },
       form: {
         labelCol: {
           //固定label宽度
           span: null,
           style: {
-            width: "100px"
-          }
+            width: "100px",
+          },
         },
         col: {
-          span: 22
+          span: 22,
         },
         wrapper: {
-          width: 600
-        }
+          width: 600,
+        },
       },
       rowHandle: {
         width: 200,
@@ -72,12 +71,12 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
               click({ row, index }) {
                 crudExpose.openEdit({
                   index,
-                  row
+                  row,
                 });
-              }
-            }
-          }
-        }
+              },
+            },
+          },
+        },
       },
       table: {
         editable: {
@@ -90,8 +89,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             const { row, key, value } = opts;
             //如果是添加，需要返回{[rowKey]:xxx},比如:{id:2}
             return await api.UpdateObj({ id: row.id, [key]: value });
-          }
-        }
+          },
+        },
       },
       columns: {
         id: {
@@ -99,37 +98,37 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           key: "id",
           type: "number",
           search: {
-            show: true
+            show: true,
           },
           column: {
             width: 100,
             editable: {
-              disabled: true
-            }
+              disabled: true,
+            },
           },
           form: {
-            show: false
-          }
+            show: false,
+          },
         },
         name: {
           title: "分组名称",
           search: {
-            show: true
+            show: true,
           },
           type: "text",
           form: {
             rules: [
               {
                 required: true,
-                message: "请输入分组名称"
-              }
-            ]
+                message: "请输入分组名称",
+              },
+            ],
           },
           column: {
-            width: 400
-          }
-        }
-      }
-    }
+            width: 400,
+          },
+        },
+      },
+    },
   };
 }

packages/ui/certd-client/src/views/certd/pipeline/group/group-selector.vue

@@ -0,0 +1,60 @@
+<template>
+  <div class="pi-group-selector flex full-w">
+    <div class="flex-1">
+      <fs-dict-select :value="modelValue" :dict="groupDictRef" @update:value="doUpdate"></fs-dict-select>
+    </div>
+
+    <fs-table-select
+      class="flex-0"
+      :create-crud-options="createCrudOptions"
+      :crud-options-override="{
+        search: { show: false },
+        table: {
+          scroll: {
+            x: 540,
+          },
+        },
+      }"
+      :model-value="modelValue"
+      :dict="groupDictRef"
+      :show-current="false"
+      :show-select="false"
+      :dialog="{ width: 960 }"
+      :destroy-on-close="false"
+      height="400px"
+      @update:model-value="doUpdate"
+      @dialog-closed="doRefresh"
+    >
+      <template #default="scope">
+        <fs-button class="ml-5" type="primary" icon="ant-design:edit-outlined" @click="scope.open"></fs-button>
+      </template>
+    </fs-table-select>
+  </div>
+</template>
+
+<script setup lang="ts">
+import createCrudOptions from "./crud";
+import { dict, FsDictSelect } from "@fast-crud/fast-crud";
+
+const props = defineProps<{
+  modelValue?: number;
+}>();
+
+defineOptions({
+  name: "GroupSelector",
+});
+const groupDictRef = dict({
+  url: "/pi/pipeline/group/all",
+  value: "id",
+  label: "name",
+});
+const emit = defineEmits(["refresh", "update:modelValue"]);
+function doRefresh() {
+  emit("refresh");
+  groupDictRef.reloadDict();
+}
+
+function doUpdate(value: any) {
+  emit("update:modelValue", value);
+}
+</script>

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

@@ -15,7 +15,6 @@
       <template #form-bottom>
         <div>申请证书</div>
       </template>
-      <pi-certd-form ref="certdFormRef"></pi-certd-form>
     </fs-crud>
   </fs-page>
 </template>
@@ -33,7 +32,6 @@ defineOptions({
   name: "PipelineManager",
 });
 
-const certdFormRef = ref();
 const groupDictRef = dict({
   url: "/pi/pipeline/group/all",
   value: "id",
@@ -41,7 +39,6 @@ const groupDictRef = dict({
 });
 const selectedRowKeys = ref([]);
 const context: any = {
-  certdFormRef,
   groupDictRef,
   selectedRowKeys,
 };

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

@@ -4,10 +4,14 @@
       <a-tab-pane v-for="item of detail.nodes" :key="item.node.id">
         <template #tab>
           <div class="tab-title flex-between" :title="item.node.title">
-            <span class="tab-title-text flex items-center md:w-40">
+            <span class="tab-title-text flex items-center md:w-48">
               <pi-status-show class="mr-1" :status="item.node.status?.result" type="icon"></pi-status-show>
               <!--              <fs-icon icon="ion:chevron-forward-circle" class="text-md mr-1"></fs-icon>-->
-              {{ item.node.title }}
+              <span class="flex-1 ellipsis">{{ item.node.title }}</span>
+
+              <a-tooltip title="强制重新执行此步骤">
+                <fs-icon class="pointer color-blue ml-1" style="font-size: 16px" title="强制重新执行此步骤" icon="icon-park-outline:replay-music" @click="triggerRun(item.node.id)"></fs-icon>
+              </a-tooltip>
             </span>
           </div>
         </template>
@@ -31,13 +35,14 @@ export default {
   name: "PiTaskView",
   components: { PiStatusShow },
   props: {},
+  emits: ["run"],
   setup(props: any, ctx: any) {
     const taskModal = ref({
       open: false,
       onOk() {
         taskViewClose();
       },
-      cancelText: "关闭"
+      cancelText: "关闭",
     });
     const { isMobile } = usePreferences();
     const tabPosition = computed(() => {
@@ -65,7 +70,7 @@ export default {
           node: step,
           type: "步骤",
           tab: 2,
-          logs: []
+          logs: [],
         });
       }
       for (let node of nodes) {
@@ -82,7 +87,7 @@ export default {
                 list.push({
                   time,
                   content,
-                  color
+                  color,
                 });
               }
               return list;
@@ -111,12 +116,12 @@ export default {
               if (isBottom && el) {
                 el?.scrollTo({
                   top: el.scrollHeight,
-                  behavior: "smooth"
+                  behavior: "smooth",
                 });
               }
             },
             {
-              immediate: true
+              immediate: true,
             }
           );
         }
@@ -135,15 +140,21 @@ export default {
       taskModal.value.open = false;
     };
 
+    function triggerRun(id: string) {
+      ctx.emit("run", id);
+      taskModal.value.open = false;
+    }
+
     return {
       detail,
       taskModal,
       activeKey,
       taskViewOpen,
       taskViewClose,
-      tabPosition
+      tabPosition,
+      triggerRun,
     };
-  }
+  },
 };
 </script>
 
@@ -154,7 +165,7 @@ export default {
 
     .tab-title-text {
       display: flex;
-      max-width: 180px;
+      //max-width: 180px;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;

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

@@ -249,7 +249,7 @@
 
     <pi-task-form ref="taskFormRef" :edit-mode="editMode"></pi-task-form>
     <pi-trigger-form ref="triggerFormRef" :edit-mode="editMode"></pi-trigger-form>
-    <pi-task-view ref="taskViewRef"></pi-task-view>
+    <pi-task-view ref="taskViewRef" @run="run"></pi-task-view>
     <PiNotificationForm ref="notificationFormRef" :edit-mode="editMode"></PiNotificationForm>
   </fs-page>
 </template>

packages/ui/certd-client/src/views/certd/pipeline/utils.ts

@@ -2,8 +2,8 @@ import { forEach } from "lodash-es";
 import { mySuiteApi } from "/@/views/certd/suite/mine/api";
 import { notification } from "ant-design-vue";
 import { useSettingStore } from "/@/store/settings";
-//@ts-ignore
-import forge from "node-forge";
+import { ReadCertDetail } from "./api";
+import { util } from "/@/utils";
 export function eachStages(list: any[], exec: (item: any, runnableType: string) => void, runnableType: string = "stage") {
   if (!list || list.length <= 0) {
     return;
@@ -70,33 +70,22 @@ export async function checkPipelineLimit() {
   }
 }
 
-export function readCertDetail(crt: string) {
-  const detail = forge.pki.certificateFromPem(crt);
-  const expires = detail.notAfter;
-  return { detail, expires };
+export async function readCertDetail(crt: string) {
+  const cached = await util.cache.get(crt);
+  if (cached) {
+    return cached;
+  }
+  const res = await ReadCertDetail(crt);
+  await util.cache.set(crt, res);
+  return res;
 }
 
-export function getAllDomainsFromCrt(crt: string) {
-  const { detail } = readCertDetail(crt);
-  const domains = [];
-
-  // 1. 提取SAN中的DNS名称
-  const sanExtension = detail.extensions.find((ext: any) => ext.name === "subjectAltName");
-  if (sanExtension) {
-    sanExtension.altNames.forEach((altName: any) => {
-      if (altName.type === 2) {
-        // type=2 表示DNS名称
-        domains.push(altName.value);
-      }
-    });
+export async function getAllDomainsFromCrt(crt: string) {
+  const { detail } = await readCertDetail(crt);
+  const altNames = detail.domains.altNames;
+  const commonName = detail.domains.commonName;
+  if (altNames.includes(commonName)) {
+    return altNames;
   }
-
-  // 2. 如果没有SAN，回退到CN（通用名称）
-  if (domains.length === 0) {
-    const cnAttr = detail.subject.attributes.find((attr: any) => attr.name === "commonName");
-    if (cnAttr) {
-      domains.push(cnAttr.value);
-    }
-  }
-  return domains;
+  return [commonName, ...altNames];
 }

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

@@ -1,26 +0,0 @@
-// @ts-ignore
-import { request } from "/@/api/service";
-const apiPrefix = "/user/settings";
-export type UserSettings = {
-  defaultNotification?: number;
-  defaultCron?: string;
-};
-
-export async function UserSettingsGet() {
-  const res = await request({
-    url: apiPrefix + "/getDefault",
-    method: "post",
-  });
-  if (!res) {
-    return {};
-  }
-  return res;
-}
-
-export async function UserSettingsSave(setting: any) {
-  return await request({
-    url: apiPrefix + "/saveDefault",
-    method: "post",
-    data: setting,
-  });
-}

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

@@ -1,74 +0,0 @@
-<template>
-  <fs-page class="page-user-settings">
-    <template #header>
-      <div class="title">设置</div>
-    </template>
-    <div class="user-settings-form settings-form">
-      <a-form
-        :model="formState"
-        name="basic"
-        :label-col="{ span: 8 }"
-        :wrapper-col="{ span: 16 }"
-        autocomplete="off"
-        @finish="onFinish"
-        @finish-failed="onFinishFailed"
-      >
-        <a-form-item label="默认定时设置" name="defaultCron">
-          <notification-selector v-model="formState.defaultCron" />
-          <div class="helper">创建流水线时默认使用此定时时间</div>
-        </a-form-item>
-
-        <a-form-item :wrapper-col="{ offset: 8, span: 16 }">
-          <a-button :loading="saveLoading" type="primary" html-type="submit">保存</a-button>
-        </a-form-item>
-      </a-form>
-    </div>
-  </fs-page>
-</template>
-
-<script setup lang="tsx">
-import { reactive, ref } from "vue";
-import * as api from "./api";
-import { UserSettings } from "./api";
-import { notification } from "ant-design-vue";
-import { merge } from "lodash-es";
-import NotificationSelector from "/@/views/certd/notification/notification-selector/index.vue";
-
-defineOptions({
-  name: "UserSettings"
-});
-
-const formState = reactive<Partial<UserSettings>>({});
-
-async function loadUserSettings() {
-  const data: any = await api.UserSettingsGet();
-  merge(formState, data);
-}
-
-const saveLoading = ref(false);
-loadUserSettings();
-const onFinish = async (form: any) => {
-  try {
-    saveLoading.value = true;
-    await api.UserSettingsSave(form);
-    notification.success({
-      message: "保存成功"
-    });
-  } finally {
-    saveLoading.value = false;
-  }
-};
-
-const onFinishFailed = (errorInfo: any) => {
-  // console.log("Failed:", errorInfo);
-};
-</script>
-
-<style lang="less">
-.page-user-settings {
-  .user-settings-form {
-    width: 500px;
-    margin: 20px;
-  }
-}
-</style>

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

@@ -103,16 +103,20 @@
         <a-row :gutter="10">
           <a-col v-for="item of pluginGroups.groups.all.plugins" :key="item.name" class="plugin-item-col" :xl="4" :md="6" :xs="24">
             <a-card>
-              <a-tooltip :title="item.desc" class="flex-between overflow-hidden">
+              <a-tooltip class="flex-between overflow-hidden">
+                <template #title>
+                  <div>{{ item.title }}</div>
+                  <div>{{ item.desc }}</div>
+                </template>
                 <div class="plugin-item pointer">
                   <div class="icon">
                     <fs-icon :icon="item.icon" class="font-size-16 color-blue" />
                   </div>
-                  <div class="text">
+                  <div class="text flex-1 ellipsis">
                     <div class="title">{{ item.title }}</div>
                   </div>
                 </div>
-                <div class="flex-o"><vip-button v-if="item.needPlus" mode="icon" class="" /></div>
+                <div class="flex-o ml-1"><vip-button v-if="item.needPlus" mode="icon" class="" /></div>
               </a-tooltip>
             </a-card>
           </a-col>
@@ -288,12 +292,17 @@ function openUpgradeUrl() {
   .plugin-list {
     margin: 0 20px;
 
+    .ant-card .ant-card-body {
+      padding: 16px;
+    }
     .plugin-item-col {
       margin-bottom: 10px;
       .plugin-item {
         display: flex;
         justify-items: center;
         line-height: 20px;
+        overflow: hidden;
+        flex: 1;
         .icon {
           display: flex;
           justify-items: center;

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

@@ -1,14 +1,6 @@
 <template>
   <div class="main login-page">
-    <a-form
-      ref="formRef"
-      class="user-layout-login"
-      name="custom-validation"
-      :model="formState"
-      v-bind="layout"
-      @finish="handleFinish"
-      @finish-failed="handleFinishFailed"
-    >
+    <a-form v-if="!twoFactor.loginId" ref="formRef" class="user-layout-login" name="custom-validation" :model="formState" v-bind="layout" @finish="handleFinish" @finish-failed="handleFinishFailed">
       <!--      <div class="login-title">登录</div>-->
       <a-tabs v-model:active-key="formState.loginType" :tab-bar-style="{ textAlign: 'center', borderBottom: 'unset' }">
         <a-tab-pane key="password" tab="密码登录" :disabled="sysPublicSettings.passwordLoginEnabled !== true">
@@ -44,13 +36,7 @@
             </a-form-item>
 
             <a-form-item name="smsCode" :rules="rules.smsCode">
-              <sms-code
-                v-model:value="formState.smsCode"
-                :img-code="formState.imgCode"
-                :mobile="formState.mobile"
-                :phone-code="formState.phoneCode"
-                :random-str="formState.randomStr"
-              />
+              <sms-code v-model:value="formState.smsCode" :img-code="formState.imgCode" :mobile="formState.mobile" :phone-code="formState.phoneCode" :random-str="formState.randomStr" />
             </a-form-item>
           </template>
         </a-tab-pane>
@@ -63,6 +49,23 @@
         <router-link v-if="hasRegisterTypeEnabled()" class="register" :to="{ name: 'register' }"> 注册 </router-link>
       </a-form-item>
     </a-form>
+    <a-form v-else ref="twoFactorFormRef" class="user-layout-login" :model="twoFactor" v-bind="layout">
+      <div class="mb-10 flex flex-center">请打开您的Authenticator APP，获取动态验证码。</div>
+      <a-form-item name="verifyCode">
+        <a-input v-model:value="twoFactor.verifyCode" placeholder="请输入动态验证码" allow-clear>
+          <template #prefix>
+            <fs-icon icon="ion:lock-closed-outline"></fs-icon>
+          </template>
+        </a-input>
+      </a-form-item>
+      <a-form-item>
+        <loading-button type="primary" size="large" html-type="button" class="login-button" :click="handleTwoFactorSubmit">OTP验证登录</loading-button>
+      </a-form-item>
+
+      <a-form-item class="user-login-other">
+        <a class="register" @click="twoFactor.loginId = null"> 返回 </a>
+      </a-form-item>
+    </a-form>
   </div>
 </template>
 <script lang="ts">
@@ -89,42 +92,51 @@ export default defineComponent({
       loginType: "password", //password
       imgCode: "",
       smsCode: "",
-      randomStr: ""
+      randomStr: "",
     });
 
     const rules = {
       mobile: [
         {
           required: true,
-          message: "请输入手机号"
-        }
+          message: "请输入手机号",
+        },
       ],
       username: [
         {
           required: true,
-          message: "请输入用户名"
-        }
+          message: "请输入用户名",
+        },
       ],
       password: [
         {
           required: true,
-          message: "请输入登录密码"
-        }
+          message: "请输入登录密码",
+        },
       ],
       smsCode: [
         {
           required: true,
-          message: "请输入短信验证码"
-        }
-      ]
+          message: "请输入短信验证码",
+        },
+      ],
     };
     const layout = {
       labelCol: {
-        span: 0
+        span: 0,
       },
       wrapperCol: {
-        span: 24
-      }
+        span: 24,
+      },
+    };
+
+    const twoFactor = reactive({
+      loginId: "",
+      verifyCode: "",
+    });
+
+    const handleTwoFactorSubmit = async () => {
+      await userStore.loginByTwoFactor(twoFactor);
     };
 
     const handleFinish = async (values: any) => {
@@ -132,6 +144,14 @@ export default defineComponent({
       try {
         const loginType = formState.loginType;
         await userStore.login(loginType, toRaw(formState));
+      } catch (e: any) {
+        //@ts-ignore
+        if (e.code === 10020) {
+          //@ts-ignore
+          twoFactor.loginId = e.data;
+        } else {
+          throw e;
+        }
       } finally {
         loading.value = false;
       }
@@ -163,9 +183,11 @@ export default defineComponent({
       resetForm,
       isLoginError,
       sysPublicSettings,
-      hasRegisterTypeEnabled
+      hasRegisterTypeEnabled,
+      twoFactor,
+      handleTwoFactorSubmit,
     };
-  }
+  },
 });
 </script>
 

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

@@ -76,6 +76,7 @@ onMounted(() => {
   iframeClient.register("updateLicense", async req => {
     await api.UpdateLicense(req.data);
     await settingStore.init();
+    await settingStore.doBindUrl();
     notification.success({
       message: "更新成功",
       description: "专业版/商业版已激活",