Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev

build: release
build: publish
2026-07-26 22:09:04 +08:00 · 2025-12-16 10:02:31 +08:00 · 2025-12-16 07:43:49 +08:00 · 2025-12-16 01:47:46 +08:00 · 2025-12-16 01:47:35 +08:00 · 2025-12-16 01:46:13 +08:00
108 changed files with 1394 additions and 303 deletions
@@ -9,5 +9,6 @@
    "[typescript]": {
        "editor.defaultFormatter": "vscode.typescript-language-features"
    },
-    "editor.tabSize": 2
+    "editor.tabSize": 2,
+    "explorer.autoReveal": false
 }
@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.16](https://github.com/certd/certd/compare/v1.37.15...v1.37.16) (2025-12-15)
+
+### Bug Fixes
+
+* 修复ipv6作为证书域名申请证书校验失败的bug ([e4e16bc](https://github.com/certd/certd/commit/e4e16bc6a65bb082c18ca0590226f0987a47d477))
+* 优化西部数据 500 already exists 的问题 ([2bfad9f](https://github.com/certd/certd/commit/2bfad9fc651da208b610abd921fbfb2fbc04203f))
+
+### Performance Improvements
+
+* 批量设置定时，支持清除定时 ([63d8bcf](https://github.com/certd/certd/commit/63d8bcf8823f713365042d3c7aee3cf31d44b044))
+* 新增数据库迁移doc说明文档，优化datetime字段平滑迁移 ([45fbce0](https://github.com/certd/certd/commit/45fbce0c2af5fb3ead6d3dd12a42f8cc1714262f))
+* 支持彩虹聚合登录 ([6f18693](https://github.com/certd/certd/commit/6f186932ccad4becfdc0087c0539f7b2d0069844))
+* 支持邮件模版设置 ([a6c0d2c](https://github.com/certd/certd/commit/a6c0d2c6f1fd6b60e6d7af290487c94564fd91ea))
+* oidc支持使用第三方昵称或账号作为certd用户的用户名 ([b6fea0c](https://github.com/certd/certd/commit/b6fea0c8562abf912daa7d72958ceb2e93575d31))
+
 ## [1.37.15](https://github.com/certd/certd/compare/v1.37.14...v1.37.15) (2025-12-06)

 ### Bug Fixes
@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.16](https://github.com/certd/certd/compare/v1.37.15...v1.37.16) (2025-12-15)
+
+### Bug Fixes
+
+* 修复ipv6作为证书域名申请证书校验失败的bug ([e4e16bc](https://github.com/certd/certd/commit/e4e16bc6a65bb082c18ca0590226f0987a47d477))
+* 优化西部数据 500 already exists 的问题 ([2bfad9f](https://github.com/certd/certd/commit/2bfad9fc651da208b610abd921fbfb2fbc04203f))
+
+### Performance Improvements
+
+* 批量设置定时，支持清除定时 ([63d8bcf](https://github.com/certd/certd/commit/63d8bcf8823f713365042d3c7aee3cf31d44b044))
+* 新增数据库迁移doc说明文档，优化datetime字段平滑迁移 ([45fbce0](https://github.com/certd/certd/commit/45fbce0c2af5fb3ead6d3dd12a42f8cc1714262f))
+* 支持彩虹聚合登录 ([6f18693](https://github.com/certd/certd/commit/6f186932ccad4becfdc0087c0539f7b2d0069844))
+* 支持邮件模版设置 ([a6c0d2c](https://github.com/certd/certd/commit/a6c0d2c6f1fd6b60e6d7af290487c94564fd91ea))
+* oidc支持使用第三方昵称或账号作为certd用户的用户名 ([b6fea0c](https://github.com/certd/certd/commit/b6fea0c8562abf912daa7d72958ceb2e93575d31))
+
+## [1.37.15](https://github.com/certd/certd/compare/v1.37.14...v1.37.15) (2025-12-06)
+
+### Bug Fixes
+
+* oidc 支持nonce ([a5ca411](https://github.com/certd/certd/commit/a5ca41131b308b36b17ca359d9709ea8e9b7cee1))
+
+### Performance Improvements
+
+* 第三方登录支持gitee ([5cee7d4](https://github.com/certd/certd/commit/5cee7d44f17bd36972f477bc1f270999da558d05))
+* 邮件模版安全优化 ([adca151](https://github.com/certd/certd/commit/adca151e4f07a4c6a2a753bfa48ee0d4d6469fd2))
+* 支持部署到中国移动CDN ([4351304](https://github.com/certd/certd/commit/43513049beff407558d2a234415521464165cebc))
+* 支持k8s apply ([d55954a](https://github.com/certd/certd/commit/d55954a36391ebe6a9397ff7dcfb710193ac5e34))
+
 ## [1.37.14](https://github.com/certd/certd/compare/v1.37.13...v1.37.14) (2025-12-02)

 ### Bug Fixes
@@ -7,7 +7,36 @@ https://1panel.cn/docs/installation/online_installation/

 ## 二、部署certd

+有两种安装方式

+### 1. 应用商店方式安装【推荐】
+
+#### 1.1 安装
+打开`1Panel->应用商店`，更新远程应用，搜索`certd`，点击安装
+
+   ![](./images/store-1.png)
+
+
+   ![](./images/store-2.png)
+
+#### 1.2 访问测试：
+http://ip:7001   
+https://ip:7002   
+默认账号密码      
+admin/123456     
+登录后请及时修改密码 
+
+#### 1.3 备份
+   ![](./images/store-3.png)
+
+#### 1.4 恢复
+ 安装新Certd后，点击导入备份按钮，选择上面备份的文件即可
+
+
+
+### 2. docker-compose方式安装
+
+#### 2.1 安装
 1. 打开`docker-compose.yaml`，整个内容复制下来    
   https://gitee.com/certd/certd/raw/v2/docker/run/docker-compose.yaml

@@ -22,7 +51,7 @@ https://1panel.cn/docs/installation/online_installation/
 > 默认使用sqlite数据库，数据保存在`/data/certd`目录下，您可以手动备份该目录   
 > certd还支持`mysql`和`postgresql`数据库，[点我了解如何切换其他数据库](../database)

-3. 访问测试
+#### 2.2 访问测试

 http://ip:7001   
 https://ip:7002   
@@ -30,7 +59,7 @@ https://ip:7002
 admin/123456     
 登录后请及时修改密码  

-## 三、升级
+#### 2.3 升级

 1. 找到容器，点击更多->升级
   ![](./images/upgrade-1.png)
@@ -39,11 +68,11 @@ admin/123456
 ![img.png](./images/upgrade-2.png)


-## 四、数据备份
+#### 2.4 备份

 > 默认数据保存在`/data/certd`目录下，可以手动备份    
 > 建议配置一条 [数据库备份流水线](../../use/backup/)，自动备份

-## 五、备份恢复
+#### 2.5 恢复

 将备份的`db.sqlite`及同目录下的其他文件一起覆盖到原来的位置，重启certd即可
@@ -65,9 +65,54 @@ docker-compose up -d

 ## 二、从旧版的sqlite切换数据库

-1. 先将`旧certd`升级到最新版 （`建议：备份sqlite数据库` ）
-2. 按照上面全新安装方式部署一套`新的certd` （`注意：新旧版本的certd要一致`）
-3. 使用数据库工具将数据从sqlite导入到mysql或postgresql （`注意：flyway_history数据表不要导入`）
-4. 重启新certd
-5. 确认没有问题之后，删除旧版certd
+从旧版`sqlite`迁移到`mysql`或`postgresql`数据库

+下面以 `SQLite` 转 `MySQL` 为例进行演示
+
+![db-0.png](images/db-0.png)
+
+#### 0.前提条件： 
+1. SQLite版Certd站点已经`升级到最新版` （`建议：备份sqlite数据库` ）
+2. `全新安装`MySQL版本Certd（`确保是全新的，因为里面的数据会被清空覆盖`）
+3. 两套Certd站点版本一致
+
+#### 1. 安装DBeaver工具
+
+[https://dbeaver.io/download/](https://dbeaver.io/download/)
+
+![db-1.png](images/db-1.png)
+
+#### 2. 连接到sqlite数据库
+
+![db-2.png](images/db-sqlite-1.png)
+
+![db-3.png](images/db-sqlite-2.png)
+
+#### 3. 连接到mysql或postgresql数据库
+
+![db-4.png](images/db-mysql-1.png)
+
+![db-5.png](images/db-mysql-2.png)
+
+
+#### 4. 开始同步数据
+
+选择mysql数据库，选择所有的表（`flyway_history除外`），右键导入数据
+
+> 切记flyway_history数据表不要导入
+
+![db-6.png](images/db-sync-1.jpg)
+![db-7.png](images/db-sync-2.png)
+![db-8.png](images/db-sync-3.png)
+下一步、下一步，直到数据加载设置，勾选`在加载前截断目标表`（此选项很重要，并且会清空mysql certd数据库中的数据）
+![db-7.png](images/db-sync-4.png)
+
+#### 5. 导入完成
+
+![db-9.png](images/db-success.png)
+
+#### 6. 重启MySQL版本Certd
+
+访问MySQL版本测试，数据已成功迁移     
+
+确认没有问题之后，删除旧版certd
@@ -40,31 +40,33 @@
 | 36.| **括彩云cdn授权** | 括彩云CDN，每月免费30G，[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) | 
 | 37.| **uniCloud** | unicloud授权 | 
 | 38.| **猫云授权** |  | 
-| 39.| **西部数码授权** |  | 
-| 40.| **多吉云** |  | 
-| 41.| **我爱云授权** | 我爱云CDN | 
-| 42.| **CacheFly** | CacheFly | 
-| 43.| **Gcore** | Gcore | 
-| 44.| **亚马逊云aws授权** |  | 
-| 45.| **亚马逊云科技（国区）授权** |  | 
-| 46.| **dns.la授权** |  | 
-| 47.| **又拍云** |  | 
-| 48.| **51dns授权** |  | 
-| 49.| **FlexCDN授权** |  | 
-| 50.| **farcdn授权** |  | 
-| 51.| **cloudflare授权** |  | 
-| 52.| **Github授权** |  | 
-| 53.| **namesilo授权** |  | 
-| 54.| **proxmox** |  | 
-| 55.| **网宿授权** |  | 
-| 56.| **金山云授权** |  | 
-| 57.| **APISIX授权** |  | 
-| 58.| **Dokploy授权** |  | 
-| 59.| **godaddy授权** |  | 
-| 60.| **新网授权** |  | 
-| 61.| **新网授权（代理方式）** |  | 
-| 62.| **新网互联授权** | 仅支持代理账号，ip需要加入白名单 | 
-| 63.| **雨云授权** | https://app.rainyun.com/ | 
+| 39.| **授权插件示例** |  | 
+| 40.| **西部数码授权** |  | 
+| 41.| **多吉云** |  | 
+| 42.| **我爱云授权** | 我爱云CDN | 
+| 43.| **CacheFly** | CacheFly | 
+| 44.| **Gcore** | Gcore | 
+| 45.| **亚马逊云aws授权** |  | 
+| 46.| **亚马逊云科技（国区）授权** |  | 
+| 47.| **dns.la授权** |  | 
+| 48.| **又拍云** |  | 
+| 49.| **51dns授权** |  | 
+| 50.| **FlexCDN授权** |  | 
+| 51.| **farcdn授权** |  | 
+| 52.| **cloudflare授权** |  | 
+| 53.| **Github授权** |  | 
+| 54.| **namesilo授权** |  | 
+| 55.| **proxmox** |  | 
+| 56.| **网宿授权** |  | 
+| 57.| **金山云授权** |  | 
+| 58.| **APISIX授权** |  | 
+| 59.| **Dokploy授权** |  | 
+| 60.| **godaddy授权** |  | 
+| 61.| **新网授权** |  | 
+| 62.| **新网授权（代理方式）** |  | 
+| 63.| **新网互联授权** | 仅支持代理账号，ip需要加入白名单 | 
+| 64.| **中国移动CND授权** |  | 
+| 65.| **雨云授权** | https://app.rainyun.com/ | 

 <style module>
 table th:first-of-type {
@@ -1,5 +1,5 @@
 # 任务插件
-共 `103` 款任务插件    
+共 `105` 款任务插件    
 ## 1. 证书申请

 | 序号 | 名称 | 说明 |
@@ -42,6 +42,7 @@
 | 19.| **网宿-更新证书** | 网宿证书自动更新 | 
 | 20.| **金山云-更新CDN证书** | 金山云自动更新CDN证书 | 
 | 21.| **APISIX-更新证书** | 自动更新APISIX证书 | 
+| 22.| **中国移动-部署证书到CDN** | 中国移动自动部署证书到CDN | 
 ## 4. 面板

 | 序号 | 名称 | 说明 |
@@ -54,15 +55,16 @@
 | 6.| **群晖-部署证书到群晖面板** | Synology，支持6.x以上版本 | 
 | 7.| **K8S-部署证书到Secret** | 部署证书到k8s的secret | 
 | 8.| **K8S-Ingress 证书部署** | 部署证书到k8s的Ingress | 
-| 9.| **1Panel-部署证书到1Panel** | 更新1Panel的证书 | 
-| 10.| **Plesk-部署Plesk网站证书** |  | 
-| 11.| **雷池-更新证书** | 更新长亭雷池WAF的证书 | 
-| 12.| **lucky-更新Lucky证书** |  | 
-| 13.| **uniCloud-部署到服务空间** | 部署到服务空间 | 
-| 14.| **威联通-部署证书到威联通** | 部署证书到qnap | 
-| 15.| **飞牛NAS-部署证书** |  | 
-| 16.| **Proxmox-上传证书到Proxmox** |  | 
-| 17.| **Dokploy-部署server证书** | 自动更新Dokploy server证书 | 
+| 9.| **K8S-Apply自定义yaml** | apply自定义yaml到k8s | 
+| 10.| **1Panel-部署证书到1Panel** | 更新1Panel的证书 | 
+| 11.| **Plesk-部署Plesk网站证书** |  | 
+| 12.| **雷池-更新证书** | 更新长亭雷池WAF的证书 | 
+| 13.| **lucky-更新Lucky证书** |  | 
+| 14.| **uniCloud-部署到服务空间** | 部署到服务空间 | 
+| 15.| **威联通-部署证书到威联通** | 部署证书到qnap | 
+| 16.| **飞牛NAS-部署证书** |  | 
+| 17.| **Proxmox-上传证书到Proxmox** |  | 
+| 18.| **Dokploy-部署server证书** | 自动更新Dokploy server证书 | 
 ## 5. 阿里云

 | 序号 | 名称 | 说明 |
@@ -17,8 +17,9 @@
 | 13.| **cloudflare** | cloudflare dns provider | 
 | 14.| **namesilo** | namesilo dns provider | 
 | 15.| **godaddy** | GoDaddy | 
-| 16.| **51dns** | 51DNS | 
-| 17.| **新网互联** | 新网互联 | 
+| 16.| **Dns提供商Demo** | dns provider示例 | 
+| 17.| **51dns** | 51DNS | 
+| 18.| **新网互联** | 新网互联 | 

 <style module>
 table th:first-of-type {
@@ -9,5 +9,5 @@
    }
  },
  "npmClient": "pnpm",
-  "version": "1.37.15"
+  "version": "1.37.16"
 }
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.16](https://github.com/publishlab/node-acme-client/compare/v1.37.15...v1.37.16) (2025-12-15)
+
+### Bug Fixes
+
+* 修复ipv6作为证书域名申请证书校验失败的bug ([e4e16bc](https://github.com/publishlab/node-acme-client/commit/e4e16bc6a65bb082c18ca0590226f0987a47d477))
+
 ## [1.37.15](https://github.com/publishlab/node-acme-client/compare/v1.37.14...v1.37.15) (2025-12-06)

 **Note:** Version bump only for package @certd/acme-client
@@ -3,7 +3,7 @@
    "description": "Simple and unopinionated ACME client",
    "private": false,
    "author": "nmorsman",
-    "version": "1.37.15",
+    "version": "1.37.16",
    "type": "module",
    "module": "scr/index.js",
    "main": "src/index.js",
@@ -18,7 +18,7 @@
        "types"
    ],
    "dependencies": {
-        "@certd/basic": "^1.37.15",
+        "@certd/basic": "^1.37.16",
        "@peculiar/x509": "^1.11.0",
        "asn1js": "^3.0.5",
        "axios": "^1.7.2",
@@ -70,5 +70,5 @@
    "bugs": {
        "url": "https://github.com/publishlab/node-acme-client/issues"
    },
-    "gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
+    "gitHead": "fa14f6219810ddbfcf1dde7b69963ee8a36c80c4"
 }
@@ -8,7 +8,7 @@ import {log as defaultLog} from './logger.js'
 import axios from './axios.js'
 import * as util from './util.js'
 import {isAlpnCertificateAuthorizationValid} from './crypto/index.js'
-
+import {utils} from '@certd/basic'

 const dns = dnsSdk.promises

@@ -60,11 +60,15 @@ async function verifyHttpChallenge(authz, challenge, keyAuthorization, suffix =
    }

    const httpPort = axios.defaults.acmeSettings.httpChallengePort || 80;
-    const challengeUrl = `http://${authz.identifier.value}:${httpPort}${suffix}`;
+    let host = authz.identifier.value;
+    if(utils.domain.isIpv6(host)){
+        host = `[${host}]`;
+    }
+    const challengeUrl = `http://${host}:${httpPort}${suffix}`;

    if (!await doQuery(challengeUrl)) {
        const httpsPort = axios.defaults.acmeSettings.httpsChallengePort || 443;
-        const httpsChallengeUrl = `https://${authz.identifier.value}:${httpsPort}${suffix}`;
+        const httpsChallengeUrl = `https://${host}:${httpsPort}${suffix}`;
        const res = await doQuery(httpsChallengeUrl)
        if (!res) {
            throw new Error(`[error] 验证失败，请检查以上测试url是否可以正常访问`);
@@ -26,3 +26,4 @@ dist-ssr
 test/user.secret.*
 test/**/*.js
 src/**/*.spec.ts
+test.mjs
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.16](https://github.com/certd/certd/compare/v1.37.15...v1.37.16) (2025-12-15)
+
+### Bug Fixes
+
+* 修复ipv6作为证书域名申请证书校验失败的bug ([e4e16bc](https://github.com/certd/certd/commit/e4e16bc6a65bb082c18ca0590226f0987a47d477))
+
 ## [1.37.15](https://github.com/certd/certd/compare/v1.37.14...v1.37.15) (2025-12-06)

 **Note:** Version bump only for package @certd/basic
@@ -1 +1 @@
-00:56
+01:44
@@ -1,7 +1,7 @@
 {
  "name": "@certd/basic",
  "private": false,
-  "version": "1.37.15",
+  "version": "1.37.16",
  "type": "module",
  "main": "./dist/index.js",
  "module": "./dist/index.js",
@@ -47,5 +47,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
+  "gitHead": "fa14f6219810ddbfcf1dde7b69963ee8a36c80c4"
 }
@@ -58,7 +58,7 @@ function isIpv6(d: string) {
  if (!d) {
    return false;
  }
-  const isIPv6Regex = /^([\da-f]{1,4}:){2,7}[\da-f]{1,4}$/i;
+  const isIPv6Regex = /^([0-9A-Fa-f]{0,4}:){2,7}([0-9A-Fa-f]{1,4}$|((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.|$)){4})$/gm;
  return isIPv6Regex.test(d);
 }

@@ -1,4 +1,4 @@
 export function isDev() {
-  const nodeEnv = process.env.NODE_ENV || '';
+  const nodeEnv = process.env.NODE_ENV || 'dev';
  return nodeEnv === 'development' || nodeEnv.includes('local') || nodeEnv.startsWith('dev');
 }
@@ -1,14 +1,18 @@
-import { random } from "lodash-es";
-import { locker } from "./dist/utils/util.lock.js";
+// import { random } from "lodash-es";
+// import { locker } from "./dist/utils/util.lock.js";

-async function testLocker() {
-  for (let i = 0; i < 10; i++) {
-    await locker.execute("test", async () => {
-      console.log("test", i);
-      await new Promise(resolve => setTimeout(resolve, Math.random() * 1000));
-      throw new Error("test error");
-    });
-  }
-}
+// async function testLocker() {
+//   for (let i = 0; i < 10; i++) {
+//     await locker.execute("test", async () => {
+//       console.log("test", i);
+//       await new Promise(resolve => setTimeout(resolve, Math.random() * 1000));
+//       throw new Error("test error");
+//     });
+//   }
+// }

-await testLocker();
+// await testLocker();
+
+import { domainUtils } from "./dist/utils/util.domain.js";
+
+console.log(domainUtils.isIpv6("::0:0:0:FFFF:129.144.52.38"));
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.16](https://github.com/certd/certd/compare/v1.37.15...v1.37.16) (2025-12-15)
+
+### Performance Improvements
+
+* 支持邮件模版设置 ([a6c0d2c](https://github.com/certd/certd/commit/a6c0d2c6f1fd6b60e6d7af290487c94564fd91ea))
+
 ## [1.37.15](https://github.com/certd/certd/compare/v1.37.14...v1.37.15) (2025-12-06)

 **Note:** Version bump only for package @certd/pipeline
@@ -1,7 +1,7 @@
 {
  "name": "@certd/pipeline",
  "private": false,
-  "version": "1.37.15",
+  "version": "1.37.16",
  "type": "module",
  "main": "./dist/index.js",
  "module": "./dist/index.js",
@@ -18,8 +18,8 @@
    "compile": "tsc --skipLibCheck --watch"
  },
  "dependencies": {
-    "@certd/basic": "^1.37.15",
-    "@certd/plus-core": "^1.37.15",
+    "@certd/basic": "^1.37.16",
+    "@certd/plus-core": "^1.37.16",
    "dayjs": "^1.11.7",
    "lodash-es": "^4.17.21",
    "reflect-metadata": "^0.1.13"
@@ -45,5 +45,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
+  "gitHead": "fa14f6219810ddbfcf1dde7b69963ee8a36c80c4"
 }
@@ -423,31 +423,46 @@ export class Executor {
    let subject = "";
    let content = "";
    const errorMessage = error?.message;
+    const templateData: any = {
+      pipelineId: this.pipeline.id,
+      historyId: this.runtime.id,
+      pipelineTitle: this.pipeline.title,
+    };
+    let pipelineResult = "";
+    let errors = "";
    if (when === "start") {
-      subject = `开始执行，${this.pipeline.title}【${this.pipeline.id}】`;
+      pipelineResult = "开始执行";
+      subject = `${pipelineResult}，${this.pipeline.title}【${this.pipeline.id}】`;
      content = `流水线ID:${this.pipeline.id}，运行ID:${this.runtime.id}`;
    } else if (when === "success") {
-      subject = `执行成功，${this.pipeline.title}【${this.pipeline.id}】`;
+      pipelineResult = "执行成功";
+      subject = `${pipelineResult}，${this.pipeline.title}【${this.pipeline.id}】`;
      content = `流水线ID:${this.pipeline.id}，运行ID:${this.runtime.id}`;
    } else if (when === "turnToSuccess") {
-      subject = `执行成功（失败转成功），${this.pipeline.title}【${this.pipeline.id}】`;
+      pipelineResult = "执行成功（失败转成功）";
+      subject = `${pipelineResult}，${this.pipeline.title}【${this.pipeline.id}】`;
      content = `流水线ID:${this.pipeline.id}，运行ID:${this.runtime.id}`;
    } else if (when === "error") {
-      subject = `执行失败，${this.pipeline.title}【${this.pipeline.id}】`;
-
+      pipelineResult = "执行失败";
+      subject = `${pipelineResult}，${this.pipeline.title}【${this.pipeline.id}】`;
      if (error instanceof RunnableError) {
        const runnableError = error as RunnableError;
        content = `流水线ID:${this.pipeline.id}，运行ID:${this.runtime.id}\n\n`;
        for (const re of runnableError.errors) {
-          content += ` - ${re.runnable.title} 执行失败，错误详情：${re.e?.message || re.e?.error?.message}\n\n`;
+          errors += ` - ${re.runnable.title} 执行失败，错误详情：${re.e?.message || re.e?.error?.message}\n\n`;
        }
+        content += errors;
      } else {
+        errors = error.message;
        content = `流水线ID:${this.pipeline.id}，运行ID:${this.runtime.id}\n\n${this.currentStatusMap?.currentStep?.title} 执行失败\n\n错误详情:${error.message}`;
      }
    } else {
      return;
    }

+    templateData.errors = errors;
+    templateData.pipelineResult = pipelineResult;
+
    for (const notification of this.pipeline.notifications) {
      if (!notification.when.includes(when)) {
        continue;
@@ -455,10 +470,12 @@ export class Executor {

      if (notification.type === "email" && notification.options?.receivers) {
        try {
-          await this.options.emailService?.send({
-            subject,
-            content,
-            receivers: notification.options?.receivers,
+          await this.options.emailService?.sendByTemplate({
+            type: "pipelineResult",
+            data: templateData,
+            email: {
+              receivers: notification.options?.receivers,
+            },
          });
        } catch (e) {
          logger.error("send email error", e);
@@ -472,15 +489,15 @@ export class Executor {
            useEmail: false,
            logger: this.logger,
            body: {
+              notificationType: "pipelineResult",
              title: subject,
              content,
              userId: this.pipeline.userId,
              pipeline: this.pipeline,
              result: this.lastRuntime?.pipeline?.status,
-              pipelineId: this.pipeline.id,
-              historyId: this.runtime.id,
              errorMessage,
              url,
+              ...templateData,
            },
          });
        } catch (e) {
@@ -15,6 +15,11 @@ export type NotificationBody = {
  historyId?: number;
  errorMessage?: string;
  url?: string;
+  notificationType?: string;
+  attachments?: any[];
+  pipelineResult?: string;
+  pipelineTitle?: string;
+  errors?: string;
 };

 export type NotificationRequestHandleReqInput<T = any> = {
@@ -6,6 +6,13 @@ export type EmailSend = {
  html?: string;
 };

+export type EmailSendByTemplateReq = {
+  type: string;
+  data: any;
+  email: { receivers: string[]; attachments?: any[] };
+};
+
 export interface IEmailService {
  send(email: EmailSend): Promise<void>;
+  sendByTemplate(req: EmailSendByTemplateReq): Promise<void>;
 }
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.16](https://github.com/certd/certd/compare/v1.37.15...v1.37.16) (2025-12-15)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.37.15](https://github.com/certd/certd/compare/v1.37.14...v1.37.15) (2025-12-06)

 **Note:** Version bump only for package @certd/lib-huawei
@@ -1,7 +1,7 @@
 {
  "name": "@certd/lib-huawei",
  "private": false,
-  "version": "1.37.15",
+  "version": "1.37.16",
  "main": "./dist/bundle.js",
  "module": "./dist/bundle.js",
  "types": "./dist/d/index.d.ts",
@@ -24,5 +24,5 @@
    "prettier": "^2.8.8",
    "tslib": "^2.8.1"
  },
-  "gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
+  "gitHead": "fa14f6219810ddbfcf1dde7b69963ee8a36c80c4"
 }
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.16](https://github.com/certd/certd/compare/v1.37.15...v1.37.16) (2025-12-15)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
 ## [1.37.15](https://github.com/certd/certd/compare/v1.37.14...v1.37.15) (2025-12-06)

 **Note:** Version bump only for package @certd/lib-iframe
@@ -1,7 +1,7 @@
 {
  "name": "@certd/lib-iframe",
  "private": false,
-  "version": "1.37.15",
+  "version": "1.37.16",
  "type": "module",
  "main": "./dist/index.js",
  "module": "./dist/index.js",
@@ -31,5 +31,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
+  "gitHead": "fa14f6219810ddbfcf1dde7b69963ee8a36c80c4"
 }
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.16](https://github.com/certd/certd/compare/v1.37.15...v1.37.16) (2025-12-15)
+
+**Note:** Version bump only for package @certd/jdcloud
+
 ## [1.37.15](https://github.com/certd/certd/compare/v1.37.14...v1.37.15) (2025-12-06)

 **Note:** Version bump only for package @certd/jdcloud
@@ -1,6 +1,6 @@
 {
  "name": "@certd/jdcloud",
-  "version": "1.37.15",
+  "version": "1.37.16",
  "description": "jdcloud openApi sdk",
  "main": "./dist/bundle.js",
  "module": "./dist/bundle.js",
@@ -56,5 +56,5 @@
      "fetch"
    ]
  },
-  "gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
+  "gitHead": "fa14f6219810ddbfcf1dde7b69963ee8a36c80c4"
 }
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.16](https://github.com/certd/certd/compare/v1.37.15...v1.37.16) (2025-12-15)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 ## [1.37.15](https://github.com/certd/certd/compare/v1.37.14...v1.37.15) (2025-12-06)

 ### Performance Improvements
@@ -1,7 +1,7 @@
 {
  "name": "@certd/lib-k8s",
  "private": false,
-  "version": "1.37.15",
+  "version": "1.37.16",
  "type": "module",
  "main": "./dist/index.js",
  "module": "./dist/index.js",
@@ -17,7 +17,7 @@
    "pub": "npm publish"
  },
  "dependencies": {
-    "@certd/basic": "^1.37.15",
+    "@certd/basic": "^1.37.16",
    "@kubernetes/client-node": "0.21.0"
  },
  "devDependencies": {
@@ -32,5 +32,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
+  "gitHead": "fa14f6219810ddbfcf1dde7b69963ee8a36c80c4"
 }
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.16](https://github.com/certd/certd/compare/v1.37.15...v1.37.16) (2025-12-15)
+
+### Bug Fixes
+
+* 修复ipv6作为证书域名申请证书校验失败的bug ([e4e16bc](https://github.com/certd/certd/commit/e4e16bc6a65bb082c18ca0590226f0987a47d477))
+
+### Performance Improvements
+
+* 支持邮件模版设置 ([a6c0d2c](https://github.com/certd/certd/commit/a6c0d2c6f1fd6b60e6d7af290487c94564fd91ea))
+
 ## [1.37.15](https://github.com/certd/certd/compare/v1.37.14...v1.37.15) (2025-12-06)

 **Note:** Version bump only for package @certd/lib-server
@@ -1,6 +1,6 @@
 {
  "name": "@certd/lib-server",
-  "version": "1.37.15",
+  "version": "1.37.16",
  "description": "midway with flyway, sql upgrade way ",
  "private": false,
  "type": "module",
@@ -28,11 +28,11 @@
  ],
  "license": "AGPL",
  "dependencies": {
-    "@certd/acme-client": "^1.37.15",
-    "@certd/basic": "^1.37.15",
-    "@certd/pipeline": "^1.37.15",
-    "@certd/plugin-lib": "^1.37.15",
-    "@certd/plus-core": "^1.37.15",
+    "@certd/acme-client": "^1.37.16",
+    "@certd/basic": "^1.37.16",
+    "@certd/pipeline": "^1.37.16",
+    "@certd/plugin-lib": "^1.37.16",
+    "@certd/plus-core": "^1.37.16",
    "@midwayjs/cache": "3.14.0",
    "@midwayjs/core": "3.20.11",
    "@midwayjs/i18n": "3.20.13",
@@ -64,5 +64,5 @@
    "typeorm": "^0.3.11",
    "typescript": "^5.4.2"
  },
-  "gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
+  "gitHead": "fa14f6219810ddbfcf1dde7b69963ee8a36c80c4"
 }
@@ -108,6 +108,11 @@ export class SysLicenseInfo extends BaseSettings {
  license?: string;
 }

+
+export type EmailTemplate = {
+  addonId?: number;
+}
+
 export class SysEmailConf extends BaseSettings {
  static __title__ = '邮箱配置';
  static __key__ = 'sys.email';
@@ -126,6 +131,13 @@ export class SysEmailConf extends BaseSettings {
  };
  sender: string;
  usePlus?: boolean;
+
+  templates:{
+    registerCode?: EmailTemplate,
+    forgotPassword?: EmailTemplate,
+    pipelineResult?: EmailTemplate,
+    common?: EmailTemplate,
+  }
 }

 export class SysSiteInfo extends BaseSettings {
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.16](https://github.com/certd/certd/compare/v1.37.15...v1.37.16) (2025-12-15)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
 ## [1.37.15](https://github.com/certd/certd/compare/v1.37.14...v1.37.15) (2025-12-06)

 **Note:** Version bump only for package @certd/midway-flyway-js
@@ -1,6 +1,6 @@
 {
  "name": "@certd/midway-flyway-js",
-  "version": "1.37.15",
+  "version": "1.37.16",
  "description": "midway with flyway, sql upgrade way ",
  "private": false,
  "type": "module",
@@ -46,5 +46,5 @@
    "typeorm": "^0.3.11",
    "typescript": "^5.4.2"
  },
-  "gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
+  "gitHead": "fa14f6219810ddbfcf1dde7b69963ee8a36c80c4"
 }
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.16](https://github.com/certd/certd/compare/v1.37.15...v1.37.16) (2025-12-15)
+
+### Bug Fixes
+
+* 修复ipv6作为证书域名申请证书校验失败的bug ([e4e16bc](https://github.com/certd/certd/commit/e4e16bc6a65bb082c18ca0590226f0987a47d477))
+
+### Performance Improvements
+
+* 支持邮件模版设置 ([a6c0d2c](https://github.com/certd/certd/commit/a6c0d2c6f1fd6b60e6d7af290487c94564fd91ea))
+
 ## [1.37.15](https://github.com/certd/certd/compare/v1.37.14...v1.37.15) (2025-12-06)

 **Note:** Version bump only for package @certd/plugin-cert
@@ -1,7 +1,7 @@
 {
  "name": "@certd/plugin-cert",
  "private": false,
-  "version": "1.37.15",
+  "version": "1.37.16",
  "type": "module",
  "main": "./dist/index.js",
  "types": "./dist/index.d.ts",
@@ -17,10 +17,10 @@
    "compile": "tsc --skipLibCheck --watch"
  },
  "dependencies": {
-    "@certd/acme-client": "^1.37.15",
-    "@certd/basic": "^1.37.15",
-    "@certd/pipeline": "^1.37.15",
-    "@certd/plugin-lib": "^1.37.15",
+    "@certd/acme-client": "^1.37.16",
+    "@certd/basic": "^1.37.16",
+    "@certd/pipeline": "^1.37.16",
+    "@certd/plugin-lib": "^1.37.16",
    "@google-cloud/publicca": "^1.3.0",
    "dayjs": "^1.11.7",
    "jszip": "^3.10.1",
@@ -43,5 +43,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
+  "gitHead": "fa14f6219810ddbfcf1dde7b69963ee8a36c80c4"
 }
@@ -21,6 +21,11 @@ export class DomainParser implements IDomainParser {
  }

  async parse(fullDomain: string) {
+    //如果是ip
+    if (utils.domain.isIp(fullDomain)) {
+      return fullDomain;
+    }
+
    this.logger.info(`查找主域名:${fullDomain}`);
    const cacheKey = `domain_parse:${fullDomain}`;
    const value = utils.cache.get(cacheKey);
@@ -154,6 +154,7 @@ export abstract class CertApplyBasePlugin extends CertApplyBaseConvertPlugin {
      title: `证书申请成功【${this.pipeline.title}】`,
      content: `域名：${this.domains.join(",")}`,
      url: url,
+      notificationType: "certApplySuccess",
    };
    try {
      await this.ctx.notificationService.send({
@@ -220,7 +220,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
          if(form.challengeType === 'cname' ){
              return '请按照上面的提示，给要申请证书的域名添加CNAME记录，添加后，点击验证，验证成功后不要删除记录，申请和续期证书会一直用它'
          }else if (form.challengeType === 'http'){
-              return '请按照上面的提示，给每个域名设置文件上传配置，证书申请过程中会上传校验文件到网站根目录下'
+              return '请按照上面的提示，给每个域名设置文件上传配置，证书申请过程中会上传校验文件到网站根目录的.well-known/acme-challenge/目录下'
          }else if (form.challengeType === 'http'){
              return '给每个域名单独配置dns提供商'
          }
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.16](https://github.com/certd/certd/compare/v1.37.15...v1.37.16) (2025-12-15)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
 ## [1.37.15](https://github.com/certd/certd/compare/v1.37.14...v1.37.15) (2025-12-06)

 **Note:** Version bump only for package @certd/plugin-lib
@@ -1,7 +1,7 @@
 {
  "name": "@certd/plugin-lib",
  "private": false,
-  "version": "1.37.15",
+  "version": "1.37.16",
  "type": "module",
  "main": "./dist/index.js",
  "types": "./dist/index.d.ts",
@@ -22,8 +22,8 @@
    "@alicloud/pop-core": "^1.7.10",
    "@alicloud/tea-util": "^1.4.10",
    "@aws-sdk/client-s3": "^3.787.0",
-    "@certd/basic": "^1.37.15",
-    "@certd/pipeline": "^1.37.15",
+    "@certd/basic": "^1.37.16",
+    "@certd/pipeline": "^1.37.16",
    "@kubernetes/client-node": "0.21.0",
    "ali-oss": "^6.22.0",
    "basic-ftp": "^5.0.5",
@@ -53,5 +53,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
+  "gitHead": "fa14f6219810ddbfcf1dde7b69963ee8a36c80c4"
 }
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.16](https://github.com/certd/certd/compare/v1.37.15...v1.37.16) (2025-12-15)
+
+### Bug Fixes
+
+* 修复ipv6作为证书域名申请证书校验失败的bug ([e4e16bc](https://github.com/certd/certd/commit/e4e16bc6a65bb082c18ca0590226f0987a47d477))
+
+### Performance Improvements
+
+* 批量设置定时，支持清除定时 ([63d8bcf](https://github.com/certd/certd/commit/63d8bcf8823f713365042d3c7aee3cf31d44b044))
+* 支持彩虹聚合登录 ([6f18693](https://github.com/certd/certd/commit/6f186932ccad4becfdc0087c0539f7b2d0069844))
+* 支持邮件模版设置 ([a6c0d2c](https://github.com/certd/certd/commit/a6c0d2c6f1fd6b60e6d7af290487c94564fd91ea))
+
 ## [1.37.15](https://github.com/certd/certd/compare/v1.37.14...v1.37.15) (2025-12-06)

 ### Performance Improvements
@@ -1,6 +1,6 @@
 {
  "name": "@certd/ui-client",
-  "version": "1.37.15",
+  "version": "1.37.16",
  "private": true,
  "scripts": {
    "dev": "vite --open",
@@ -106,8 +106,8 @@
    "zod-defaults": "^0.1.3"
  },
  "devDependencies": {
-    "@certd/lib-iframe": "^1.37.15",
-    "@certd/pipeline": "^1.37.15",
+    "@certd/lib-iframe": "^1.37.16",
+    "@certd/pipeline": "^1.37.16",
    "@rollup/plugin-commonjs": "^25.0.7",
    "@rollup/plugin-node-resolve": "^15.2.3",
    "@types/chai": "^4.3.12",
@@ -0,0 +1,33 @@
+<template>
+  <div class="params-show">
+    <a-tag type="primary" color="green" v-for="item of params" :key="item.value" class="item">
+      <span class="label">{{ item.label }}=</span>
+      <fs-copyable :modelValue="`\$\{${item.value}\}`" :button="{show:false}" :inline="true"></fs-copyable>
+    </a-tag>
+  </div>
+</template>
+<script setup lang="ts">
+defineOptions({
+  name: "ParamsShow",
+});
+
+const props = defineProps<{
+  params: { value: string; label: string }[];
+}>();
+</script>
+
+<style lang="less">
+.params-show {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  min-height: 32px;
+
+  .item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 2px;
+    margin-top: 2px;
+  }
+}
+</style>
@@ -11,6 +11,7 @@ import AccessSelector from "/@/views/certd/access/access-selector/index.vue";
 import InputPassword from "./common/input-password.vue";
 import CertInfoUpdater from "/@/views/certd/pipeline/cert-upload/index.vue";
 import ApiTest from "./common/api-test.vue";
+import ParamsShow from "./common/params-show.vue";
 export * from "./cert/index.js";
 export default {
  install(app: any) {
@@ -29,5 +30,6 @@ export default {
    app.component("RemoteInput", RemoteInput);
    app.component("CertDomainsGetter", CertDomainsGetter);
    app.component("InputPassword", InputPassword);
+    app.component("ParamsShow", ParamsShow);
  },
 };
@@ -631,7 +631,7 @@ export default {
  autoHideTime: "Auto Hide Time",
  autoHideTimeHelper: "Minutes without requests before auto hiding",
  hideOpenApi: "Hide Open API",
-  hideOpenApiHelper: "Whether to hide open APIs; whether to expose /api/v1 prefixed endpoints",
+  hideOpenApiHelper: "Whether to hide open APIs; whether to hide /api/v1 prefixed endpoints",
  hideSiteImmediately: "Hide Site Immediately",
  hideImmediately: "Hide Immediately",
  confirmHideSiteTitle: "Are you sure to hide the site immediately?",
@@ -780,6 +780,18 @@ export default {
      oauthAutoRedirectHelper: "Whether to auto redirect to OAuth2 login when login (using the first enabled OAuth2 login type)",
      oauthOnly: "OAuth2 Login Only",
      oauthOnlyHelper: "Whether to only allow OAuth2 login, disable password login",
+
+      email: {
+        templates: "Email Templates",
+        templateType: "Template Type",
+        templateProvider: "Template Config",
+
+        templateSetting: "Email Template Setting",
+        serverSetting: "Email Server Setting",
+        sendTest: "Send Test",
+
+        templateProviderSelectorPlaceholder: "Not Configured",
+      },
    },
  },
  modal: {
@@ -635,7 +635,7 @@ export default {
  autoHideTime: "自动隐藏时间",
  autoHideTimeHelper: "多少分钟内无请求自动隐藏",
  hideOpenApi: "隐藏开放接口",
-  hideOpenApiHelper: "是否隐藏开放接口，是否放开/api/v1开头的接口",
+  hideOpenApiHelper: "是否隐藏开放接口，是否同时隐藏/api/v1开头的接口",
  hideSiteImmediately: "立即隐藏站点",
  hideImmediately: "立即隐藏",
  confirmHideSiteTitle: "确定要立即隐藏站点吗？",
@@ -780,6 +780,18 @@ export default {
      oauthAutoRedirectHelper: "是否自动跳转第三方登录（使用第一个已启用的第三方登录类型）",
      oauthOnly: "仅使用第三方登录",
      oauthOnlyHelper: "是否仅使用第三方登录，关闭密码登录（注意：请务必在测试第三方登录功能正常后再开启）",
+
+      email: {
+        templates: "邮件模板",
+        templateType: "模板类型",
+        templateProvider: "模板配置",
+
+        templateSetting: "邮件模板设置",
+        serverSetting: "邮件服务器设置",
+        sendTest: "发送测试",
+
+        templateProviderSelectorPlaceholder: "未配置",
+      },
    },
  },
  modal: {
@@ -1,4 +1,26 @@
 import Validator from "async-validator";
+
+function isIpv6(d: string) {
+  if (!d) {
+    return false;
+  }
+  const isIPv6Regex = /^([0-9A-Fa-f]{0,4}:){2,7}([0-9A-Fa-f]{1,4}$|((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.|$)){4})$/gm;
+  return isIPv6Regex.test(d);
+}
+function isIpv4(d: string) {
+  if (!d) {
+    return false;
+  }
+  const isIPv4Regex = /^(\d{1,3}\.){3}\d{1,3}$/;
+  return isIPv4Regex.test(d);
+}
+function isIp(d: string) {
+  if (!d) {
+    return false;
+  }
+  return isIpv4(d) || isIpv6(d);
+}
+
 // 自定义验证器函数
 export function isDomain(rule: any, value: any) {
  if (value == null || value == "") {
@@ -14,7 +36,9 @@ export function isDomain(rule: any, value: any) {
  const compiled = new RegExp(exp);
  for (const domain of domains) {
    //域名可以是泛域名，中文域名，数字域名，英文域名，域名中可以包含-和. ,可以_开头
-
+    if (isIp(domain)) {
+      continue;
+    }
    if (!compiled.test(domain)) {
      throw new Error(`域名有误：${domain}，请输入正确的域名`);
    }
@@ -21,6 +21,7 @@
            },
          },
        }"
+        :disabled="disabled"
        :show-current="false"
        :show-select="false"
        :dialog="{ width: 960 }"
@@ -147,6 +148,7 @@ async function refreshTarget(value: any) {
      type: "",
    };
  }
+  debugger
 }

 watch(
@@ -3,10 +3,11 @@
 </template>

 <script setup lang="ts">
-import { useFormWrapper } from "@fast-crud/fast-crud";
+import { compute, dict, useFormWrapper } from "@fast-crud/fast-crud";
 import * as api from "../api";
 import { useSettingStore } from "/@/store/settings";
 import { useI18n } from "/src/locales";
+import { computed } from "vue";
 const { t } = useI18n();

 const props = defineProps<{
@@ -20,7 +21,7 @@ async function batchUpdateRequest(form: any) {
  await api.BatchUpdateTrigger(props.selectedRowKeys, {
    title: "定时触发",
    type: "timer",
-    props: form.props,
+    props: form.clear ? false : form.props,
  });
  emit("change");
 }
@@ -33,6 +34,28 @@ async function openFormDialog() {
  settingStore.checkPlus();
  const crudOptions: any = {
    columns: {
+      clear: {
+        title: "设置/清空",
+        form: {
+          value: false,
+          component: {
+            name: "fs-dict-switch",
+            vModel: "checked",
+            dict: dict({
+              data: [
+                {
+                  label: "设置定时",
+                  value: false,
+                },
+                {
+                  label: "清空定时",
+                  value: true,
+                },
+              ],
+            }),
+          },
+        },
+      },
      "props.cron": {
        title: t("certd.schedule"),
        form: {
@@ -40,12 +63,18 @@ async function openFormDialog() {
            name: "cron-editor",
            vModel: "modelValue",
          },
+          show: compute(({ form }) => {
+            return form.clear !== true;
+          }),
          rules: [{ required: true, message: t("certd.selectCron") }],
        },
      },
    },
    form: {
      mode: "edit",
+      initialForm: {
+        clear: false,
+      },
      //@ts-ignore
      async doSubmit({ form }) {
        await batchUpdateRequest(form);
@@ -1,5 +1,6 @@
 import { request } from "/src/api/service";
 const apiPrefix = "/mine/email";
+const apiSettingPrefix = "/sys/settings";

 export async function TestSend(receiver: string) {
  await request({
@@ -10,3 +11,10 @@ export async function TestSend(receiver: string) {
    },
  });
 }
+
+export async function GetEmailTemplates() {
+  return await request({
+    url: apiSettingPrefix + "/getEmailTemplates",
+    method: "post",
+  });
+}
@@ -7,53 +7,104 @@
      </div>
    </template>

-    <div class="flex-o">
-      <a-form :model="formState" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off" class="email-form-box" @finish="onFinish" @finish-failed="onFinishFailed">
-        <div v-if="!formState.usePlus" class="email-form">
-          <a-form-item :label="t('certd.useCustomEmailServer')"> </a-form-item>
-          <a-form-item :label="t('certd.smtpDomain')" name="host" :rules="[{ required: true, message: t('certd.pleaseEnterSmtpDomain') }]">
-            <a-input v-model:value="formState.host" />
-          </a-form-item>
+    <div class="email-form">
+      <a-form :model="formState" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off" class="" @finish="onFinish">
+        <h2>{{ t("certd.sys.setting.email.serverSetting") }}</h2>
+        <a-tabs v-model:active-key="activeKey" @change="onChangeActiveKey">
+          <a-tab-pane key="custom" :tab="t('certd.useCustomEmailServer')">
+            <div>
+              <a-form-item :label="t('certd.smtpDomain')" name="host" :rules="[{ required: true, message: t('certd.pleaseEnterSmtpDomain') }]">
+                <a-input v-model:value="formState.host" />
+              </a-form-item>

-          <a-form-item :label="t('certd.smtpPort')" name="port" :rules="[{ required: true, message: t('certd.pleaseEnterSmtpPort') }]">
-            <a-input v-model:value="formState.port" />
-          </a-form-item>
+              <a-form-item :label="t('certd.smtpPort')" name="port" :rules="[{ required: true, message: t('certd.pleaseEnterSmtpPort') }]">
+                <a-input v-model:value="formState.port" />
+              </a-form-item>

-          <a-form-item :label="t('certd.username')" :name="['auth', 'user']" :rules="[{ required: true, message: t('certd.pleaseEnterUsername') }]">
-            <a-input v-model:value="formState.auth.user" />
-          </a-form-item>
-          <a-form-item :label="t('certd.password')" :name="['auth', 'pass']" :rules="[{ required: true, message: t('certd.pleaseEnterPassword') }]">
-            <a-input-password v-model:value="formState.auth.pass" />
-            <div class="helper">{{ t("certd.qqEmailAuthCodeHelper") }}</div>
-          </a-form-item>
-          <a-form-item :label="t('certd.senderEmail')" name="sender" :rules="[{ required: true, message: t('certd.pleaseEnterSenderEmail') }]">
-            <a-input v-model:value="formState.sender" />
-          </a-form-item>
-          <a-form-item :label="t('certd.useSsl')" name="secure">
-            <a-switch v-model:checked="formState.secure" />
-            <div class="helper">{{ t("certd.sslPortNote") }}</div>
-          </a-form-item>
-          <a-form-item :label="t('certd.ignoreCertValidation')" :name="['tls', 'rejectUnauthorized']">
-            <a-switch v-model:checked="formState.tls.rejectUnauthorized" />
-          </a-form-item>
-
-          <a-form-item :wrapper-col="{ offset: 8, span: 16 }">
-            <a-button type="primary" html-type="submit">{{ t("certd.save") }}</a-button>
-          </a-form-item>
-        </div>
-        <div class="email-form">
-          <a-form-item :label="t('certd.useOfficialEmailServer')" name="usePlus">
-            <div class="flex-o">
-              <a-switch v-model:checked="formState.usePlus" :disabled="!settingStore.isPlus" @change="onUsePlusChanged" />
-              <vip-button class="ml-5" mode="button"></vip-button>
+              <a-form-item :label="t('certd.username')" :name="['auth', 'user']" :rules="[{ required: true, message: t('certd.pleaseEnterUsername') }]">
+                <a-input v-model:value="formState.auth.user" />
+              </a-form-item>
+              <a-form-item :label="t('certd.password')" :name="['auth', 'pass']" :rules="[{ required: true, message: t('certd.pleaseEnterPassword') }]">
+                <a-input-password v-model:value="formState.auth.pass" />
+                <div class="helper">{{ t("certd.qqEmailAuthCodeHelper") }}</div>
+              </a-form-item>
+              <a-form-item :label="t('certd.senderEmail')" name="sender" :rules="[{ required: true, message: t('certd.pleaseEnterSenderEmail') }]">
+                <a-input v-model:value="formState.sender" />
+              </a-form-item>
+              <a-form-item :label="t('certd.useSsl')" name="secure">
+                <a-switch v-model:checked="formState.secure" />
+                <div class="helper">{{ t("certd.sslPortNote") }}</div>
+              </a-form-item>
+              <a-form-item :label="t('certd.ignoreCertValidation')" :name="['tls', 'rejectUnauthorized']">
+                <a-switch v-model:checked="formState.tls.rejectUnauthorized" />
+              </a-form-item>
            </div>
-            <div class="helper">{{ t("certd.useOfficialEmailServerHelper") }}</div>
-          </a-form-item>
+          </a-tab-pane>
+          <a-tab-pane key="plus" class="plus" :disabled="!settingStore.isPlus">
+            <template #tab>
+              <span class="flex items-center">
+                {{ t("certd.useOfficialEmailServer") }}
+                <vip-button class="ml-5" mode="button"></vip-button>
+              </span>
+            </template>
+            <a-form-item :label="t('certd.useOfficialEmailServer')" name="usePlus">
+              <div class="flex-o">
+                <a-switch v-model:checked="formState.usePlus" :disabled="!settingStore.isPlus" @change="onUsePlusChanged" />
+              </div>
+              <div class="helper">{{ t("certd.useOfficialEmailServerHelper") }}</div>
+            </a-form-item>
+          </a-tab-pane>
+        </a-tabs>
+        <a-form-item :wrapper-col="{ offset: 8, span: 16 }">
+          <a-button type="primary" html-type="submit">{{ t("certd.save") }}</a-button>
+        </a-form-item>
+
+        <div class="flex items-center">
+          <h2>{{ t("certd.sys.setting.email.templateSetting") }}</h2>
+          <vip-button class="ml-10" mode="button"></vip-button>
        </div>
+
+        <a-form-item :label="t('certd.sys.setting.email.templates')" :name="['templates']">
+          <div class="flex flex-wrap">
+            <table class="w-full table-auto border-collapse border border-gray-400">
+              <thead>
+                <tr>
+                  <th class="border border-gray-300 px-4 py-2 w-1/3">{{ t("certd.sys.setting.email.templateType") }}</th>
+                  <th class="border border-gray-300 px-4 py-2 w-1/3">{{ t("certd.sys.setting.email.templateProvider") }}</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr v-for="(item, key) of emailTemplates" :key="key">
+                  <td class="border border-gray-300 px-4 py-2">
+                    <div class="flex items-center" :title="item.desc">
+                      <fs-icon :icon="item.icon" class="mr-2 text-blue-600" />
+                      {{ item.title }}
+                    </div>
+                  </td>
+                  <td class="border border-gray-300 px-4 py-2">
+                    <AddonSelector
+                      v-model:model-value="item.addonId"
+                      :disabled="!settingStore.isPlus"
+                      addon-type="emailTemplate"
+                      from="sys"
+                      :type="item.name"
+                      :placeholder="t('certd.sys.setting.email.templateProviderSelectorPlaceholder')"
+                    />
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </a-form-item>
+
+        <a-form-item :wrapper-col="{ offset: 8, span: 16 }">
+          <a-button type="primary" html-type="submit">{{ t("certd.save") }}</a-button>
+        </a-form-item>
      </a-form>
    </div>
    <div class="email-form">
      <a-form :model="testFormState" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off" @finish="onTestSend">
+        <h2>{{ t("certd.sys.setting.email.sendTest") }}</h2>
        <a-form-item :label="t('certd.testReceiverEmail')" name="receiver" :rules="[{ required: true, message: t('certd.pleaseEnterTestReceiverEmail') }]">
          <a-input v-model:value="testFormState.receiver" />
          <div class="helper">{{ t("certd.saveBeforeTest") }}</div>
@@ -71,14 +122,14 @@
 </template>

 <script setup lang="ts">
-import { reactive } from "vue";
+import { onMounted, reactive, ref } from "vue";
 import * as api from "../api";
 import * as emailApi from "./api.email";
 import { notification } from "ant-design-vue";
 import { useSettingStore } from "/src/store/settings";
 import * as _ from "lodash-es";
 import { useI18n } from "/src/locales";
-
+import AddonSelector from "../../../certd/addon/addon-selector/index.vue";
 const { t } = useI18n();
 defineOptions({
  name: "EmailSetting",
@@ -98,8 +149,14 @@ interface FormState {
  };
  sender: string;
  usePlus: boolean;
+  templates: {
+    pipelineResult: any;
+    registerCode: any;
+    forgotPassword: any;
+  };
 }

+const activeKey = ref("custom");
 const formState = reactive<Partial<FormState>>({
  auth: {
    user: "",
@@ -109,27 +166,65 @@ const formState = reactive<Partial<FormState>>({
  usePlus: false,
 });

+const emailTemplates = ref([]);
+async function loadEmailTemplates() {
+  emailTemplates.value = await emailApi.GetEmailTemplates();
+}
+
+function fillEmailTemplates(form: any) {
+  const providers: any = {};
+  for (const item of emailTemplates.value) {
+    const type = item.name;
+    providers[type] = {
+      type: type,
+      title: item.title,
+      icon: item.icon,
+      addonId: item.addonId || null,
+    };
+  }
+  form.templates = providers;
+  return providers;
+}
+
 async function load() {
  const data: any = await api.EmailSettingsGet();
  _.merge(formState, data);
 }

-load();
+onMounted(async () => {
+  await load();
+  refreshActiveKeyByUsePlus();
+  await loadEmailTemplates();
+});

 const onFinish = async (form: any) => {
-  console.log("Success:", form);
+  fillEmailTemplates(form);
  await api.EmailSettingsSave(form);
  notification.success({
    message: t("certd.saveSuccess"),
  });
 };

-const onFinishFailed = (errorInfo: any) => {
-  // console.log("Failed:", errorInfo);
-};
-
 async function onUsePlusChanged() {
-  await api.EmailSettingsSave(formState);
+  refreshActiveKeyByUsePlus();
+  await onFinish(formState);
+}
+
+async function refreshActiveKeyByUsePlus() {
+  if (formState.usePlus) {
+    activeKey.value = "plus";
+  } else {
+    activeKey.value = "custom";
+  }
+}
+async function onChangeActiveKey(key: string) {
+  activeKey.value = key;
+  if (key === "plus") {
+    formState.usePlus = true;
+  } else {
+    formState.usePlus = false;
+  }
+  await onFinish(formState);
 }

 interface TestFormState {
@@ -157,12 +252,21 @@ const settingStore = useSettingStore();

 <style lang="less">
 .page-setting-email {
+  .ant-tabs-nav {
+    margin-left: 80px;
+  }
  .email-form-box {
    display: flex;
  }

+  h2 {
+    margin: 20px 0px;
+    font-weight: 600;
+  }
+
  .email-form {
-    width: 500px;
+    width: 700px;
+    max-width: 100%;
    margin: 20px;
  }

@@ -172,5 +276,10 @@ const settingStore = useSettingStore();
    color: #999;
    font-size: 10px;
  }
+  .addon-selector {
+    .inner {
+      justify-content: space-between;
+    }
+  }
 }
 </style>
@@ -7,7 +7,7 @@
          <vip-button class="ml-5" mode="button"></vip-button>
        </div>
      </a-form-item>
-      <a-form-item v-if="formState.public.oauthEnabled" :label="t('certd.sys.setting.oauthProviders')" :name="['public', 'oauthProviders']">
+      <a-form-item :label="t('certd.sys.setting.oauthProviders')" :name="['public', 'oauthProviders']">
        <div class="flex flex-wrap">
          <table class="w-full table-auto border-collapse border border-gray-400">
            <thead>
@@ -31,7 +31,14 @@
                  </fs-copyable>
                </td>
                <td class="border border-gray-300 px-4 py-2">
-                  <AddonSelector v-model:model-value="item.addonId" addon-type="oauth" from="sys" :type="item.name" :placeholder="t('certd.sys.setting.oauthProviderSelectorPlaceholder')" />
+                  <AddonSelector
+                    v-model:model-value="item.addonId"
+                    :disabled="!formState.public.oauthEnabled"
+                    addon-type="oauth"
+                    from="sys"
+                    :type="item.name"
+                    :placeholder="t('certd.sys.setting.oauthProviderSelectorPlaceholder')"
+                  />
                </td>
              </tr>
            </tbody>
@@ -22,3 +22,4 @@ run/
 tools/lego/*
 !tools/lego/readme.md
 test.mjs
+isolate-*.log
@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.16](https://github.com/certd/certd/compare/v1.37.15...v1.37.16) (2025-12-15)
+
+### Bug Fixes
+
+* 优化西部数据 500 already exists 的问题 ([2bfad9f](https://github.com/certd/certd/commit/2bfad9fc651da208b610abd921fbfb2fbc04203f))
+
+### Performance Improvements
+
+* 批量设置定时，支持清除定时 ([63d8bcf](https://github.com/certd/certd/commit/63d8bcf8823f713365042d3c7aee3cf31d44b044))
+* 新增数据库迁移doc说明文档，优化datetime字段平滑迁移 ([45fbce0](https://github.com/certd/certd/commit/45fbce0c2af5fb3ead6d3dd12a42f8cc1714262f))
+* 支持彩虹聚合登录 ([6f18693](https://github.com/certd/certd/commit/6f186932ccad4becfdc0087c0539f7b2d0069844))
+* 支持邮件模版设置 ([a6c0d2c](https://github.com/certd/certd/commit/a6c0d2c6f1fd6b60e6d7af290487c94564fd91ea))
+* oidc支持使用第三方昵称或账号作为certd用户的用户名 ([b6fea0c](https://github.com/certd/certd/commit/b6fea0c8562abf912daa7d72958ceb2e93575d31))
+
 ## [1.37.15](https://github.com/certd/certd/compare/v1.37.14...v1.37.15) (2025-12-06)

 ### Bug Fixes
@@ -0,0 +1,2 @@
+ALTER TABLE `sys_settings` MODIFY COLUMN `setting` longtext  NULL;
+ALTER TABLE `user_settings` MODIFY COLUMN `setting` longtext  NULL;
@@ -0,0 +1,20 @@
+update cd_access set create_time = '2024-08-08 00:00:00.000'  where create_time < '999999999999999999999';
+update cd_access set update_time = '2024-08-08 00:00:00.000'  where update_time < '999999999999999999999';
+
+update pi_history set create_time = '2024-08-08 00:00:00.000'  where create_time < '999999999999999999999';
+update pi_history set update_time = '2024-08-08 00:00:00.000'  where update_time < '999999999999999999999';
+
+update pi_history_log set create_time = '2024-08-08 00:00:00.000'  where create_time < '999999999999999999999';
+update pi_history_log set update_time = '2024-08-08 00:00:00.000'  where update_time < '999999999999999999999';
+
+update pi_pipeline set create_time = '2024-08-08 00:00:00.000'  where create_time < '999999999999999999999';
+update pi_pipeline set update_time = '2024-08-08 00:00:00.000'  where update_time < '999999999999999999999';
+
+update sys_permission set create_time = '2024-08-08 00:00:00.000'  where create_time < '999999999999999999999';
+update sys_permission set update_time = '2024-08-08 00:00:00.000'  where update_time < '999999999999999999999';
+
+update sys_role set create_time = '2024-08-08 00:00:00.000'  where create_time < '999999999999999999999';
+update sys_role set update_time = '2024-08-08 00:00:00.000'  where update_time < '999999999999999999999';
+
+update sys_user set create_time = '2024-08-08 00:00:00.000'  where create_time < '999999999999999999999';
+update sys_user set update_time = '2024-08-08 00:00:00.000'  where update_time < '999999999999999999999';
@@ -1,12 +1,12 @@
 {
  "name": "@certd/ui-server",
-  "version": "1.37.15",
+  "version": "1.37.16",
  "description": "fast-server base midway",
  "private": true,
  "type": "module",
  "scripts": {
-    "start": "cross-env NODE_ENV=production node ./bootstrap.js",
-    "dev-start": "mwtsc --watch --run @midwayjs/mock/app",
+    "start": "cross-env NODE_ENV=production node --optimize-for-size ./bootstrap.js",
+    "dev-start": "cross-env NODE_ENV=dev & mwtsc --watch --run @midwayjs/mock/app",
    "dc": "cd ../../../ && pnpm run dev",
    "dev": "cross-env NODE_ENV=local & pnpm run dev-start",
    "dev-commlocal": "cross-env NODE_ENV=dev-commlocal mwtsc --watch --run @midwayjs/mock/app",
@@ -23,13 +23,13 @@
    "lint": "mwts check",
    "lint:fix": "mwts fix",
    "ci": "npm run cov",
-    "build": "mwtsc --cleanOutDir --skipLibCheck",
+    "build": "cross-env NODE_ENV=production mwtsc --cleanOutDir --skipLibCheck",
    "export-metadata": "node export-plugin-yaml.js",
    "export-md": "node export-plugin-md.js",
    "dev-build": "echo 1",
    "build-on-docker": "node ./before-build.js && npm run build",
    "up-mw-deps": "npx midway-version -u -w",
-    "heap": "cross-env NODE_ENV=local clinic heapprofiler    --  node ./bootstrap.js",
+    "heap": "cross-env NODE_ENV=production clinic heapprofiler    --  node  --optimize-for-size --inspect ./bootstrap.js",
    "flame": "clinic flame   -- node ./bootstrap.js",
    "tsc": "tsc --skipLibCheck",
    "slimming": "node ./slimming.js",
@@ -45,20 +45,20 @@
    "@aws-sdk/client-cloudfront": "^3.699.0",
    "@aws-sdk/client-iam": "^3.699.0",
    "@aws-sdk/client-s3": "^3.705.0",
-    "@certd/acme-client": "^1.37.15",
-    "@certd/basic": "^1.37.15",
-    "@certd/commercial-core": "^1.37.15",
+    "@certd/acme-client": "^1.37.16",
+    "@certd/basic": "^1.37.16",
+    "@certd/commercial-core": "^1.37.16",
    "@certd/cv4pve-api-javascript": "^8.4.2",
-    "@certd/jdcloud": "^1.37.15",
-    "@certd/lib-huawei": "^1.37.15",
-    "@certd/lib-k8s": "^1.37.15",
-    "@certd/lib-server": "^1.37.15",
-    "@certd/midway-flyway-js": "^1.37.15",
-    "@certd/pipeline": "^1.37.15",
-    "@certd/plugin-cert": "^1.37.15",
-    "@certd/plugin-lib": "^1.37.15",
-    "@certd/plugin-plus": "^1.37.15",
-    "@certd/plus-core": "^1.37.15",
+    "@certd/jdcloud": "^1.37.16",
+    "@certd/lib-huawei": "^1.37.16",
+    "@certd/lib-k8s": "^1.37.16",
+    "@certd/lib-server": "^1.37.16",
+    "@certd/midway-flyway-js": "^1.37.16",
+    "@certd/pipeline": "^1.37.16",
+    "@certd/plugin-cert": "^1.37.16",
+    "@certd/plugin-lib": "^1.37.16",
+    "@certd/plugin-plus": "^1.37.16",
+    "@certd/plus-core": "^1.37.16",
    "@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120",
    "@huaweicloud/huaweicloud-sdk-core": "^3.1.120",
    "@koa/cors": "^5.0.0",
@@ -21,6 +21,8 @@ import * as upload from '@midwayjs/upload';
 import { setLogger } from '@certd/acme-client';
 import {HiddenMiddleware} from "./middleware/hidden.js";

+//@ts-ignore
+// process.env.UV_THREADPOOL_SIZE = 2
 process.on('uncaughtException', error => {
  console.error('未捕获的异常：', error);
  // 在这里可以添加日志记录、发送错误通知等操作
@@ -1,9 +1,10 @@
-import { Rule, RuleType } from "@midwayjs/validate";
-import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
 import { BaseController, Constants, SysSettingsService } from "@certd/lib-server";
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
+import { Rule, RuleType } from "@midwayjs/validate";
+import { CaptchaService } from "../../modules/basic/service/captcha-service.js";
 import { CodeService } from "../../modules/basic/service/code-service.js";
 import { EmailService } from "../../modules/basic/service/email-service.js";
-import { CaptchaService } from "../../modules/basic/service/captcha-service.js";
+import { AddonGetterService } from "../../modules/pipeline/service/addon-getter-service.js";

 export class SmsCodeReq {
  @Rule(RuleType.string().required())
@@ -49,6 +50,9 @@ export class BasicController extends BaseController {
  @Inject()
  captchaService: CaptchaService;

+  @Inject()
+  addonGetterService: AddonGetterService;
+
  @Post('/captcha/get', { summary: Constants.per.guest })
  async getCaptcha(@Query("captchaAddonId") captchaAddonId:number) {
      const form = await this.captchaService.getCaptcha(captchaAddonId)
@@ -83,17 +87,18 @@ export class BasicController extends BaseController {
    const opts = {
      verificationType: body.verificationType,
      verificationCodeLength: undefined,
-      title: undefined,
-      content: undefined,
      duration: undefined,
    };
+    
    if(body?.verificationType === 'forgotPassword') {
-      opts.title = '找回密码';
-      opts.content = '验证码：${code}。您正在找回密码，请输入验证码并完成操作。如非本人操作请忽略';
      opts.duration = FORGOT_PASSWORD_CODE_DURATION;
      opts.verificationCodeLength = 6;
+    }else{
+      opts.duration = 10;
+      opts.verificationCodeLength = 6;
    }

+
    await this.codeService.checkCaptcha(body.captcha);
    await this.codeService.sendEmailCode(body.email, opts);
    // 设置缓存内容
@@ -169,9 +169,10 @@ export class ConnectController extends BaseController {
    const userInfo = validationValue.userInfo;
    const oauthType = validationValue.type;
    let newUser = new UserEntity()
-    newUser.username = `${oauthType}_${userInfo.nickName}_${simpleNanoId(6)}`;
+    newUser.username = `${userInfo.nickName}_${simpleNanoId(6)}_${oauthType}`;
    newUser.avatar = userInfo.avatar;
    newUser.nickName = userInfo.nickName || simpleNanoId(6);
+    newUser.email = userInfo.email || "";

    newUser = await this.userService.register("username", newUser, async (txManager) => {
      const oauthBound: OauthBoundEntity = new OauthBoundEntity()
@@ -1,6 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
 import {
  addonRegistry,
+  AddonService,
  CrudController,
  SysPrivateSettings,
  SysPublicSettings,
@@ -30,6 +31,8 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
  pipelineService: PipelineService;
  @Inject()
  codeService: CodeService;
+ @Inject()
+  addonService: AddonService;

  getService() {
    return this.service;
@@ -86,6 +89,25 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
    return this.ok(conf);
  }

+   @Post('/getEmailTemplates', { summary: 'sys:settings:view' })
+  async getEmailTemplates(@Body(ALL) body) {
+    const conf = await getEmailSettings(this.service, this.userSettingsService);
+    const templates = conf.templates ||  {}
+
+    const emailTemplateProviders = await this.addonService.getDefineList("emailTemplate")
+
+    const proviers = []
+    for (const item of emailTemplateProviders) {
+      const templateConf = templates[item.name] || {}
+      proviers.push({
+        name: item.name,
+        title: item.title,
+        addonId : templateConf.addonId,
+      })
+    }
+    return this.ok(proviers);
+  }
+
  @Post('/saveEmailSettings', { summary: 'sys:settings:edit' })
  async saveEmailSettings(@Body(ALL) body) {
    const conf = await getEmailSettings(this.service, this.userSettingsService);
@@ -130,7 +130,8 @@ export class AutoCRegisterCron {
                title,
                content,
                errorMessage:title,
-                url
+                url,
+                notificationType: "vipExpireRemind",
              }
            },adminUser.id)
          }
@@ -182,7 +183,8 @@ export class AutoCRegisterCron {
                title,
                content,
                errorMessage: title,
-                url
+                url,
+                notificationType: "userExpireRemind",
              }
            }, user.id)
          }
@@ -26,6 +26,7 @@ export class AutoZPrint {
  async init() {
    //监听https
    this.startHttpsServer();
+    logger.info("ENV:", process.env.NODE_ENV);
    if (isDev()) {
      this.startHeapLog();
    }
@@ -49,7 +50,7 @@ export class AutoZPrint {
    setInterval(() => {
      const mu = process.memoryUsage();
      logger.info(`rss:${format(mu.rss)},heapUsed: ${format(mu.heapUsed)},heapTotal: ${format(mu.heapTotal)},external: ${format(mu.external)}`);
-    }, 60000);
+    }, 20000);
  }

  startHttpsServer() {
@@ -1,14 +1,10 @@
-import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { cache, isDev, randomNumber, simpleNanoId } from '@certd/basic';
-import { SysSettingsService, SysSiteInfo } from '@certd/lib-server';
-import { SmsServiceFactory } from '../sms/factory.js';
+import { AccessService, AccessSysGetter, CodeErrorException, SysSettingsService } from '@certd/lib-server';
+import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { ISmsService } from '../sms/api.js';
-import { CodeErrorException } from '@certd/lib-server';
-import { EmailService } from './email-service.js';
-import { AccessService } from '@certd/lib-server';
-import { AccessSysGetter } from '@certd/lib-server';
-import { isComm } from '@certd/plus-core';
+import { SmsServiceFactory } from '../sms/factory.js';
 import { CaptchaService } from "./captcha-service.js";
+import { EmailService } from './email-service.js';

 // {data: '<svg.../svg>', text: 'abcd'}
 /**
@@ -84,8 +80,6 @@ export class CodeService {
  async sendEmailCode(
    email: string,
    opts?: {
-      title?: string,
-      content?: string,
      duration?: number,
      verificationType?: string,
      verificationCodeLength?: number,
@@ -96,26 +90,27 @@ export class CodeService {
    }


-    let siteTitle = 'Certd';
-    if (isComm()) {
-      const siteInfo = await this.sysSettingsService.getSetting<SysSiteInfo>(SysSiteInfo);
-      if (siteInfo) {
-        siteTitle = siteInfo.title || siteTitle;
-      }
-    }
-
    const verificationCodeLength =  Math.floor(Math.max(Math.min(opts?.verificationCodeLength || 4, 8), 4));
    const duration = Math.floor(Math.max(Math.min(opts?.duration || 5, 15), 1));

    const code = randomNumber(verificationCodeLength);
-
-    const title = `【${siteTitle}】${!!opts?.title ? opts.title : '验证码'}`;
-    const content = !!opts.content ? this.compile(opts.content)({code, duration}) : `您的验证码是${code}，请勿泄露`;
-
-    await this.emailService.send({
-      subject: title,
-      content: content,
-      receivers: [email],
+   
+    const templateData = {
+      code, duration, 
+      title: "验证码",
+      content:`您的验证码是${code}，请勿泄露`,
+       notificationType: "registerCode"
+    }
+    if (opts?.verificationType === 'forgotPassword') {
+       templateData.title = '找回密码';
+      templateData.notificationType = "forgotPassword"
+    }
+    await this.emailService.sendByTemplate({
+        type: templateData.notificationType,
+        data: templateData,
+        email:{
+          receivers: [email],
+        },
    });

    const key = this.buildEmailCodeKey(email,opts?.verificationType);
@@ -1,5 +1,5 @@
 import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
-import type { EmailSend } from '@certd/pipeline';
+import type { EmailSend, EmailSendByTemplateReq } from '@certd/pipeline';
 import { IEmailService } from '@certd/pipeline';

 import { logger } from '@certd/basic';
@@ -8,9 +8,11 @@ import { isComm, isPlus } from '@certd/plus-core';
 import nodemailer from 'nodemailer';
 import { SendMailOptions } from 'nodemailer';
 import { UserSettingsService } from '../../mine/service/user-settings-service.js';
-import { PlusService, SysSettingsService, SysSiteInfo } from '@certd/lib-server';
+import { AddonService, PlusService, SysEmailConf, SysSettingsService, SysSiteInfo } from '@certd/lib-server';
 import { getEmailSettings } from '../../sys/settings/fix.js';
 import { UserEmailSetting } from "../../mine/service/models.js";
+import { AddonGetterService } from '../../pipeline/service/addon-getter-service.js';
+import { EmailContent, ITemplateProvider } from '../../../plugins/plugin-template/api.js';

 export type EmailConfig = {
  host: string;
@@ -38,6 +40,12 @@ export class EmailService implements IEmailService {
  @Inject()
  plusService: PlusService;

+  @Inject()
+  addonGetterService: AddonGetterService;
+  @Inject()
+  addonService: AddonService
+
+
  async sendByPlus(email: EmailSend) {
    if (!isPlus()) {
      throw new Error('plus not enabled');
@@ -49,7 +57,6 @@ export class EmailService implements IEmailService {
     *   content: string;
     *   receivers: string[];
     */
-
    await this.plusService.sendEmail(email);
  }

@@ -62,26 +69,6 @@ export class EmailService implements IEmailService {
      throw new Error('收件人不能为空');
    }

-    const emailConf = await getEmailSettings(this.sysSettingsService, this.settingsService);
-
-    if (!emailConf.host && emailConf.usePlus == null) {
-      if (isPlus()) {
-        //自动使用plus发邮件
-        return await this.sendByPlus(email);
-      }
-      throw new Error('邮件服务器还未设置');
-    }
-
-    if (emailConf.usePlus && isPlus()) {
-      return await this.sendByPlus(email);
-    }
-    await this.sendByCustom(emailConf, email);
-    logger.info('sendEmail complete: ', email);
-  }
-
-  private async sendByCustom(emailConfig: EmailConfig, email: EmailSend) {
-    const transporter = nodemailer.createTransport(emailConfig);
-
    let sysTitle = 'Certd';
    if (isComm()) {
      const siteInfo = await this.sysSettingsService.getSetting<SysSiteInfo>(SysSiteInfo);
@@ -93,10 +80,34 @@ export class EmailService implements IEmailService {
    if (!subject.includes(`【${sysTitle}】`)) {
      subject = `【${sysTitle}】${subject}`;
    }
+    email.subject = subject;
+
+    const emailConf = await getEmailSettings(this.sysSettingsService, this.settingsService);
+
+    if (!emailConf.host && emailConf.usePlus == null) {
+      if (isPlus()) {
+        //自动使用plus发邮件
+        return await this.sendByPlus(email);
+      }
+      throw new Error('邮件服务器还未设置');
+    }
+
+
+
+    if (emailConf.usePlus && isPlus()) {
+      return await this.sendByPlus(email);
+    }
+    await this.sendByCustom(emailConf, email, sysTitle);
+    logger.info('sendEmail complete: ', email);
+  }
+
+  private async sendByCustom(emailConfig: EmailConfig, email: EmailSend, sysTitle: string) {
+    const transporter = nodemailer.createTransport(emailConfig);
+
    const mailOptions = {
      from: `${sysTitle} <${emailConfig.sender}>`,
      to: email.receivers.join(', '), // list of receivers
-      subject: subject,
+      subject: email.subject,
      text: email.content,
      html: email.html,
      attachments: email.attachments,
@@ -105,30 +116,78 @@ export class EmailService implements IEmailService {
  }

  async test(userId: number, receiver: string) {
-    await this.send({
-      receivers: [receiver],
-      subject: '测试邮件,from certd',
-      content: '测试邮件,from certd',
+    await this.sendByTemplate({
+      type: "common",
+      data: {
+        title: '测试邮件,from certd',
+        content: '测试邮件,from certd',
+        url:"https://certd.handfree.work",
+      },
+      email: {
+        receivers: [receiver],
+      },
    });
  }

  async list(userId: any) {
-      const userEmailSetting = await  this.settingsService.getSetting<UserEmailSetting>(userId,UserEmailSetting)
-      return userEmailSetting.list;
+    const userEmailSetting = await this.settingsService.getSetting<UserEmailSetting>(userId, UserEmailSetting)
+    return userEmailSetting.list;
  }

  async delete(userId: any, email: string) {
-    const userEmailSetting = await  this.settingsService.getSetting<UserEmailSetting>(userId,UserEmailSetting)
-    userEmailSetting.list = userEmailSetting.list.filter(item=>item !== email);
-    await this.settingsService.saveSetting(userId,userEmailSetting)
+    const userEmailSetting = await this.settingsService.getSetting<UserEmailSetting>(userId, UserEmailSetting)
+    userEmailSetting.list = userEmailSetting.list.filter(item => item !== email);
+    await this.settingsService.saveSetting(userId, userEmailSetting)
  }
  async add(userId: any, email: string) {
-    const userEmailSetting = await  this.settingsService.getSetting<UserEmailSetting>(userId,UserEmailSetting)
+    const userEmailSetting = await this.settingsService.getSetting<UserEmailSetting>(userId, UserEmailSetting)
    //如果已存在
-    if(userEmailSetting.list.includes(email)){
+    if (userEmailSetting.list.includes(email)) {
      return
    }
    userEmailSetting.list.unshift(email)
-    await this.settingsService.saveSetting(userId,userEmailSetting)
+    await this.settingsService.saveSetting(userId, userEmailSetting)
+  }
+
+
+  async sendByTemplate(req: EmailSendByTemplateReq) {
+    let content = null
+    if (isPlus()) {
+      const emailConf = await this.sysSettingsService.getSetting<SysEmailConf>(SysEmailConf);
+      const template = emailConf?.templates?.[req.type]
+      if (template && template.addonId) {
+        const addon: ITemplateProvider<EmailContent> = await this.addonGetterService.getAddonById(template.addonId, true, 0)
+        if (addon) {
+          content = await addon.buildContent({ data: req.data })
+        }
+      }
+      if (!content) {
+        //看看有没有通用模版
+        if (emailConf?.templates?.common && emailConf?.templates?.common.addonId) {
+          const addon: ITemplateProvider<EmailContent> = await this.addonGetterService.getAddonById(emailConf.templates.common.addonId, true, 0)
+          if (addon) {
+            content = await addon.buildContent({ data: req.data })
+          }
+        }
+      }
+      // 没有找到模版，使用默认模版
+      if (!content) {
+        try {
+          const addon: ITemplateProvider<EmailContent> = await this.addonGetterService.getBlank("emailTemplate", req.type)
+          content = await addon.buildDefaultContent({ data: req.data })
+        } catch (e) {
+          // 对应的通知类型模版可能没有注册或者开发
+        }
+      }
+    }
+
+    if (!content) {
+      const addon: ITemplateProvider<EmailContent> = await this.addonGetterService.getBlank("emailTemplate", "common")
+      content = await addon.buildDefaultContent({ data: req.data })
+    }
+    return await this.send({
+      ...req.email,
+      ...content
+    })
  }
 }
@@ -1,5 +1,5 @@
 import parser from 'cron-parser';
-import { ILogger } from '@certd/basic';
+import { ILogger, logger } from '@certd/basic';

 export type CronTaskReq = {
  /**
@@ -52,7 +52,7 @@ export class Cron {

  queue: CronTask[] = [];
  constructor(opts: any) {
-    this.logger = opts.logger;
+    this.logger = opts.logger || logger;
    this.immediateTriggerOnce = opts.immediateTriggerOnce;
  }

@@ -268,7 +268,8 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
          url,
          title: `站点证书${fromIpCheck ? "(IP)" : ""}检查出错<${site.name}>`,
          content: `站点名称： ${site.name} \n站点域名： ${site.domain} \n错误信息：${site.error}`,
-          errorMessage: site.error
+          errorMessage: site.error,
+          notificationType: "siteCheckError",
        }
      },
      site.userId
@@ -295,7 +296,8 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
            title: `站点证书即将过期，剩余${validDays}天，<${site.name}>`,
            content,
            url,
-            errorMessage: "站点证书即将过期"
+            errorMessage: "站点证书即将过期",
+            notificationType: "siteCertExpireRemind",
          }
        },
        site.userId
@@ -311,7 +313,8 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
            title: `站点证书已过期${-validDays}天<${site.name}>`,
            content,
            url,
-            errorMessage: "站点证书已过期"
+            errorMessage: "站点证书已过期",
+            notificationType: "siteCertExpireRemind",
          }
        },
        site.userId
@@ -62,4 +62,11 @@ export class AddonGetterService  {
    return await this.getAddonById(id, true, userId);
  }

+
+  async getBlank(addonType:string,subType:string){
+    return await this.getAddonById(null,false,0,{
+      type: addonType, name:subType
+    })
+  }
+
 }
@@ -128,7 +128,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
      }
      const pipeline = JSON.parse(item.content);
      let stepCount = 0;
-      if(pipeline.stages){
+      if (pipeline.stages) {
        RunnableCollection.each(pipeline.stages, (runnable: any) => {
          stepCount++;
        });
@@ -237,7 +237,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
    let fromType = "pipeline";
    if (bean.type === "cert_upload") {
      fromType = "upload";
-    }else if (bean.type === "cert_auto") {
+    } else if (bean.type === "cert_auto") {
      fromType = "auto";
    }
    await this.certInfoService.updateDomains(pipeline.id, pipeline.userId || bean.userId, domains, fromType);
@@ -376,17 +376,17 @@ export class PipelineService extends BaseService<PipelineEntity> {
    }

    if (immediateTriggerOnce) {
-      try{
+      try {
        await this.trigger(pipeline.id);
        await sleep(200);
-      }catch(e){
+      } catch (e) {
        logger.error(e);
      }
-     
+
    }
  }

-  async trigger(id: any, stepId?: string , doCheck = false) {
+  async trigger(id: any, stepId?: string, doCheck = false) {
    const entity: PipelineEntity = await this.info(id);
    if (doCheck) {
      await this.beforeCheck(entity);
@@ -441,6 +441,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
      pipeline = await this.info(id);
    } else {
      pipeline = id;
+      id = pipeline.id;
    }
    if (!pipeline) {
      return;
@@ -456,6 +457,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
  removeCron(pipelineId, trigger) {
    const name = this.buildCronKey(pipelineId, trigger.id);
    this.cron.remove(name);
+    logger.info("当前定时器数量：", this.cron.getTaskSize());
  }

  registerCron(pipelineId, trigger) {
@@ -500,8 +502,8 @@ export class PipelineService extends BaseService<PipelineEntity> {

  async isPipelineValidTimeEnabled(entity: PipelineEntity) {
    const settings = await this.sysSettingsService.getPublicSettings();
-    if (isPlus() && settings.pipelineValidTimeEnabled){
-      if (entity.validTime > 0 && entity.validTime < Date.now()){
+    if (isPlus() && settings.pipelineValidTimeEnabled) {
+      if (entity.validTime > 0 && entity.validTime < Date.now()) {
        return false
      }
    }
@@ -524,7 +526,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
    if (!validTimeEnabled) {
      throw new Error(`流水线${entity.id}已过期，不予执行`);
    }
-   
+
    let suite: UserSuiteEntity = null;
    if (isComm()) {
      suite = await this.checkHasDeployCount(entity.id, entity.userId);
@@ -538,8 +540,8 @@ export class PipelineService extends BaseService<PipelineEntity> {

  async doRun(entity: PipelineEntity, triggerId: string, stepId?: string) {

-    let suite:any = null
-    try{
+    let suite: any = null
+    try {
      const res = await this.beforeCheck(entity);
      suite = res.suite
    } catch (e) {
@@ -803,11 +805,17 @@ export class PipelineService extends BaseService<PipelineEntity> {

    for (const item of list) {
      const pipeline = JSON.parse(item.content);
-      pipeline.triggers = [{
-        id: nanoid(),
-        title: "定时触发",
-        ...trigger
-      }];
+      if (trigger.props === false) {
+        //清除trigger
+        pipeline.triggers = []
+      } else {
+        pipeline.triggers = [{
+          id: nanoid(),
+          title: "定时触发",
+          ...trigger
+        }];
+      }
+
      await this.doUpdatePipelineJson(item, pipeline);
    }

@@ -919,20 +927,20 @@ export class PipelineService extends BaseService<PipelineEntity> {
    }
  }

-  async createAutoPipeline(req: { domains: string[]; email: string; userId: number ,from:string}) {
+  async createAutoPipeline(req: { domains: string[]; email: string; userId: number, from: string }) {

    const randomHour = Math.floor(Math.random() * 6);
    const randomMin = Math.floor(Math.random() * 60);
    const randomCron = `0 ${randomMin} ${randomHour} * * *`;

    let pipeline: any = {
-      title: req.domains[0] + `证书自动申请【${req.from??"OpenAPI"}】`,
+      title: req.domains[0] + `证书自动申请【${req.from ?? "OpenAPI"}】`,
      runnableType: "pipeline",
      triggers: [
        {
          id: nanoid(),
          title: "定时触发",
-          props:{
+          props: {
            cron: randomCron,
          },
          type: "timer"
@@ -39,4 +39,5 @@ export * from './plugin-captcha/index.js'
 export * from './plugin-xinnet/index.js'
 export * from './plugin-xinnetconnet/index.js'
 export * from './plugin-oauth/index.js'
-export * from './plugin-cmcc/index.js'
+export * from './plugin-cmcc/index.js'
+export * from './plugin-template/index.js'
@@ -132,6 +132,7 @@ nohup sh -c '$RESTART_CERT' >/dev/null  2>&1 & echo '10秒后重启' && exit
            title: `${this.repoName} 新版本 ${this.lastVersion} 发布`,
            content: `${body}\n\n > [Certd](https://certd.docmirror.cn)，不止证书自动化，插件解锁无限可能！\n\n`,
            url: `https://github.com/${this.repoName}/releases/tag/${this.lastVersion}`,
+            notificationType: "githubReleaseCheck",
          }
        })
      }
@@ -21,10 +21,26 @@ export class EmailNotification extends BaseNotification {
  receivers!: string[];

  async send(body: NotificationBody) {
-    await this.ctx.emailService.send({
-      subject: body.title,
-      content: body.content + '\n\n[查看详情](' + body.url + ')',
+
+    const templateData = {
+      ...body,
+    }
+    const emailSend:any = {
      receivers: this.receivers,
-    });
+    }
+    if (body.attachments && body.attachments.length > 0) {
+      emailSend.attachments = body.attachments;
+    }
+    await this.ctx.emailService.sendByTemplate({
+      type: body.notificationType,
+      data: templateData,
+      email: emailSend
+    })
+
+    // await this.ctx.emailService.send({
+    //   subject: body.title,
+    //   content: body.content + '\n\n[查看详情](' + body.url + ')',
+    //   receivers: this.receivers,
+    // });
  }
 }
@@ -60,7 +60,9 @@ export class TelegramNotification extends BaseNotification {

  replaceText(text: string) {
    // .*()<> 等都需要用\\进行替换
-    return text.replace(/[\\.*()<>]/g, '\\$&');
+    return text.replace(/[_*[\]()~`>#\+\-=|{}.!]/g, '\\$&'); 
+    // .replace(/([\\_*`|!.[\](){}>+#=~-])/gm, '\\$1')
+    // return text.replace(/[\\.*()<>]/g, '\\$&');
  }
  async send(body: NotificationBody) {
    if (!this.botToken || !this.chatId) {
@@ -1,4 +1,5 @@
 export * from './api.js'
 export * from './oidc/plugin-oidc.js'
 export * from './wx/plugin-wx.js'
-export * from './oauth2/plugin-gitee.js'
+export * from './oauth2/plugin-gitee.js'
+export * from './oauth2/plugin-clogin.js'
@@ -0,0 +1,142 @@
+import { AddonInput, BaseAddon, IsAddon } from "@certd/lib-server";
+import { BuildLoginUrlReq, BuildLogoutUrlReq, IOauthProvider, OnCallbackReq } from "../api.js";
+
+@IsAddon({
+  addonType: "oauth",
+  name: 'clogin',
+  title: '彩虹聚合登录',
+  desc: '彩虹聚合登录',
+  icon: "emojione:rainbow",
+  showTest: false,
+})
+export class CloginOauthProvider extends BaseAddon implements IOauthProvider {
+  @AddonInput({
+    title: "系统地址",
+    helper: "http://clogin.xxxx.com/",
+    required: true,
+    col:{span:24},
+  })
+  endpoint = "";
+
+  @AddonInput({
+    title: "登录类型",
+    component: {
+      name: "a-auto-complete",
+      options: [
+        { label: "QQ", value: "qq" },
+        { label: "微信", value: "wx" },
+        { label: "支付宝", value: "alipay" },
+        { label: "微博", value: "sina" },
+        { label: "百度", value: "baidu" },
+        { label: "华为", value: "huawei" },
+        { label: "小米", value: "xiaomi" },
+        { label: "谷歌", value: "google" },
+        { label: "微软", value: "microsoft" },
+        { label: "Facebook", value: "facebook" },
+        { label: "Twitter", value: "twitter" },
+        { label: "钉钉", value: "dingtalk" },
+        { label: "Gitee", value: "gitee" },
+        { label: "Github", value: "github" },
+      ]
+    },
+    required: true,
+  })
+  loginType = "";
+
+  @AddonInput({
+    title: "自定义图标",
+    component: {
+      name:"fs-icon-selector",
+      vModel:"modelValue"
+    },
+    required: false,
+  })
+  icon = "";
+
+  @AddonInput({
+    title: "AppId",
+    helper: "彩虹聚合登录->应用列表->创建应用 获取",
+    required: true,
+  })
+  appId = "";
+
+  @AddonInput({
+    title: "AppKey",
+    component: {
+      placeholder: "AppKey",
+    },
+    required: true,
+  })
+  appKey = "";
+
+
+  async buildLoginUrl(params: BuildLoginUrlReq) {
+
+    let redirectUri = params.redirectUri || ""
+    if(redirectUri.indexOf("localhost:3008")>=0){
+      redirectUri = redirectUri.replace("localhost:3008", "certd.handfree.work")
+    }
+    const res = await this.ctx.http.request({
+      url: `${this.endpoint}/connect.php?act=login&appid=${this.appId}&appkey=${this.appKey}&type=${this.loginType}&redirect_uri=${redirectUri}`
+    })
+
+    this.checkRes(res)
+
+    return {
+      loginUrl: res.url,
+      ticketValue: {
+        state: "",
+      },
+    };
+  }
+
+  checkRes(res: any) {
+    if (res.code !== 0) {
+      throw new Error(res.msg || "请求接口失败")
+    }
+  }
+
+  async onCallback(req: OnCallbackReq) {
+
+    //校验state
+
+    const code = req.code || ""
+
+    const tokenEndpoint = `http://clogin.yfy.docmirror.cn/connect.php?act=callback&appid=${this.appId}&appkey=${this.appKey}&type=${this.loginType}&code=${code}`
+    const res = await this.ctx.utils.http.request({
+      url: tokenEndpoint,
+      method: "post",
+    })
+    this.checkRes(res)
+
+    /**
+     *  "access_token": "89DC9691E274D6B596FFCB8D43368234",
+     * "social_uid": "AD3F5033279C8187CBCBB29235D5F827",
+  "faceimg": "https://thirdqq.qlogo.cn/g?b=oidb&k=3WrWp3peBxlW4MFxDgDJEQ&s=100&t=1596856919",
+  "nickname": "大白",
+  "location": "XXXXX市",
+  "gender": "男",
+  "ip": "1.12.3.40"
+     */
+
+    const { access_token, faceimg, nickname, social_uid } = res
+
+
+    return {
+      token: {
+        accessToken: access_token,
+        expiresIn: 7200,
+        refreshToken: "",
+      },
+      userInfo: {
+        openId: social_uid,
+        nickName: nickname || "",
+        avatar: faceimg || "",
+      },
+    }
+  };
+
+  async buildLogoutUrl(params: BuildLogoutUrlReq) {
+    return {};
+  }
+}
@@ -127,8 +127,9 @@ export class OidcOauthProvider extends BaseAddon implements IOauthProvider {
      },
      userInfo: {
        openId: claims.sub,
-        nickName: claims.nickname || claims.preferred_username || "",
+        nickName: claims.nickname || claims.name || claims.username || claims.preferred_username || "",
        avatar: claims.picture,
+        email: claims.email || "",
      },
    }
  };
@@ -0,0 +1,18 @@
+
+export type BuildContentReq = {
+    data: any;
+}
+
+
+export interface ITemplateProvider<T=any> {
+    buildContent: (params: BuildContentReq) => Promise<T>;
+
+    buildDefaultContent:(params: BuildContentReq) => Promise<T>;
+}
+
+
+export type EmailContent = {
+    subject:string,
+    content?:string,
+    html?:string
+};
@@ -0,0 +1,4 @@
+export * from './plugin-common.js'
+export * from './plugin-register-code.js'
+export * from './plugin-forgot-password.js'
+export * from './plugin-pipeline-result.js'
@@ -0,0 +1,104 @@
+import { AddonInput, BaseAddon } from "@certd/lib-server";
+import { BuildContentReq, EmailContent, ITemplateProvider } from "../api.js";
+
+export class BaseEmailTemplateProvider extends BaseAddon implements ITemplateProvider<EmailContent> {
+  @AddonInput({
+    title: "配置说明",
+    component: {
+      name: "a-alert",
+      props: {
+        type: "info",
+        message: "在标题和内容模版中，通过${name}引用参数，例如： 感谢注册，您的注册验证码为：${code}",
+      }
+    },
+    order: -9,
+    col: { span: 24 },
+  })
+  useIntro = "";
+
+
+  @AddonInput({
+    title: "邮件格式",
+    component: {
+      name: "a-select",
+      props: {
+        options: [
+          { label: "HTML", value: "html" },
+          { label: "TEXT", value: "text" },
+        ]
+      }
+    },
+    order: 9,
+    col: { span: 24 },
+  })
+  formatType = "";
+
+  @AddonInput({
+    title: "邮件标题模版",
+    required: true,
+    order: 10,
+    component: {
+      name: "a-input",
+      props: {
+        placeholder: "邮件标题模版",
+      }
+    },
+    col: { span: 24 },
+  })
+  titleTemplate = "";
+
+  @AddonInput({
+    title: "邮件内容模版",
+    component: {
+      name: "a-textarea",
+      rows: 6,
+    },
+    order: 20,
+    col: { span: 24 },
+    required: true,
+  })
+  contentTemplate = "";
+
+
+  async buildContent(params: BuildContentReq): Promise<EmailContent> {
+    const data = {
+      title:"",
+      content:"",
+      url:"",
+      ...params.data,
+    }
+    const title = this.compile(this.titleTemplate)(data)
+    const content = this.compile(this.contentTemplate)(data)
+
+    const body: any = {
+      subject: title,
+    }
+    if (this.formatType === "html") {
+      body.html = content
+    } else {
+      body.content = content
+    }
+    return body
+  };
+
+  async buildDefaultContent(params: BuildContentReq): Promise<EmailContent> {
+    throw new Error("请实现 buildDefaultContent 方法")
+  }
+
+  // compile(templateString: string) {
+  //   return function (data: any): string {
+  //     return templateString.replace(/\${(.*?)}/g, (match, key) => {
+  //       const value = get(data, key?.trim(), '');
+  //       return String(value);
+  //     });
+  //   };
+  // }
+
+  compile(templateString:string) {
+    return new Function('data', `    with(data || {}) {
+        return \`${templateString}\`;
+      }
+    `);
+  }
+
+}
@@ -0,0 +1,38 @@
+import { AddonInput, IsAddon } from "@certd/lib-server";
+import { BuildContentReq, EmailContent, ITemplateProvider } from "../api.js";
+import { BaseEmailTemplateProvider } from "./plugin-base.js";
+
+@IsAddon({
+  addonType: "emailTemplate",
+  name: 'common',
+  title: '通用邮件模版',
+  desc: '使用通用的邮件标题和内容，内容外部可以自定义html进行美化',
+  icon: "simple-icons:email:blue",
+  showTest: false,
+})
+export class CommonEmailTemplateProvider extends BaseEmailTemplateProvider implements ITemplateProvider<EmailContent> {
+  @AddonInput({
+    title: "可用参数",
+    component: {
+      name: "ParamsShow",
+      params:[
+        {label:"标题",value:"title"},
+        {label:"内容",value:"content"},
+        {label:"URL",value:"url"}
+      ]
+    },
+    col: { span: 24 },
+  })
+  paramIntro = "";
+
+
+  async buildDefaultContent(req:BuildContentReq) {
+    const defaultTemplate = new CommonEmailTemplateProvider()
+    defaultTemplate.titleTemplate = "${title}"
+    defaultTemplate.contentTemplate = "${content} \n\n 查看详情：${url}"
+    defaultTemplate.formatType = "text"
+    return await defaultTemplate.buildContent(req)
+  }
+
+
+}
@@ -0,0 +1,35 @@
+import { AddonInput, IsAddon } from "@certd/lib-server";
+import { BuildContentReq, EmailContent, ITemplateProvider } from "../api.js";
+import { BaseEmailTemplateProvider } from "./plugin-base.js";
+
+@IsAddon({
+  addonType: "emailTemplate",
+  name: 'forgotPassword',
+  title: '忘记密码邮件模版',
+  desc: '您正在重置密码，您的验证码为xxxx，请勿泄露',
+  icon: "simple-icons:email:blue",
+  showTest: false,
+})
+export class ForgotPasswordEmailTemplateProvider extends BaseEmailTemplateProvider implements ITemplateProvider<EmailContent> {
+  @AddonInput({
+    title: "可用参数",
+    component: {
+      name: "ParamsShow",
+      params:[
+        {label:"验证码",value:"code"}
+      ]
+    },
+    col: { span: 24 },
+  })
+  paramIntro = "";
+
+
+  async buildDefaultContent(req:BuildContentReq) {
+    const defaultTemplate = new ForgotPasswordEmailTemplateProvider()
+    defaultTemplate.titleTemplate = "忘记密码"
+    defaultTemplate.contentTemplate = "您的验证码是:${code}，请勿泄露"
+    defaultTemplate.formatType = "text"
+    return await defaultTemplate.buildContent(req)
+  }
+
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
xiaojunnuo	4c6dcddf11	Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev	2025-12-16 10:02:31 +08:00
xiaojunnuo	b314e500cd	build: release	2025-12-16 07:43:49 +08:00
xiaojunnuo	b83e6ad13f	build: publish	2025-12-16 01:47:46 +08:00
xiaojunnuo	fee401cfdf	build: trigger build image	2025-12-16 01:47:35 +08:00
xiaojunnuo	fa14f62198	v1.37.16	2025-12-16 01:46:13 +08:00
xiaojunnuo	5526665494	build: prepare to build	2025-12-16 01:44:10 +08:00
xiaojunnuo	6249af996a	build: prepare to build	2025-12-16 01:41:26 +08:00
xiaojunnuo	e51a1b365e	build: prepare to build	2025-12-16 01:30:58 +08:00
xiaojunnuo	f53f00d126	chore: 1	2025-12-16 00:39:21 +08:00
xiaojunnuo	ab8fbaf21d	chore: 修复清除定时任务未生效的bug	2025-12-16 00:34:32 +08:00
xiaojunnuo	63d8bcf882	perf: 批量设置定时，支持清除定时	2025-12-16 00:21:31 +08:00
xiaojunnuo	e4e16bc6a6	fix: 修复ipv6作为证书域名申请证书校验失败的bug	2025-12-15 23:34:47 +08:00
xiaojunnuo	e4c21c4d5c	chore: 模版发邮件 plus	2025-12-15 22:32:25 +08:00
xiaojunnuo	d9e6dbf889	chore: 优化telegram更多保留字符	2025-12-15 22:21:43 +08:00
xiaojunnuo	5f4469e306	fix: telegram 修复消息内存在横杠无法发出的bug	2025-12-15 15:12:07 +08:00
xiaojunnuo	16f6365b18	chore: oidc自动注册时增加邮箱	2025-12-15 00:23:35 +08:00
xiaojunnuo	cdab54bf51	chore: 1	2025-12-15 00:21:42 +08:00
xiaojunnuo	b6fea0c856	perf: oidc支持使用第三方昵称或账号作为certd用户的用户名	2025-12-15 00:19:55 +08:00
xiaojunnuo	6f186932cc	perf: 支持彩虹聚合登录	2025-12-15 00:12:27 +08:00
xiaojunnuo	de544ec725	chore: email template优化	2025-12-14 23:19:32 +08:00
xiaojunnuo	a6c0d2c6f1	perf: 支持邮件模版设置	2025-12-14 01:36:20 +08:00
xiaojunnuo	437d956cad	chore: email template	2025-12-12 23:39:09 +08:00
xiaojunnuo	43ba0b9da6	docs: 1panel增加应用商店部署方式	2025-12-11 18:14:15 +08:00
xiaojunnuo	fe1e2c3b62	Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev	2025-12-10 14:17:20 +08:00
xiaojunnuo	bbe7e5f96d	chore: 1	2025-12-10 14:15:39 +08:00
xiaojunnuo	2bfad9fc65	fix: 优化西部数据 500 already exists 的问题	2025-12-09 23:33:11 +08:00
xiaojunnuo	9f24c18f7f	chore: 优化数据库脚本	2025-12-09 23:28:29 +08:00
xiaojunnuo	a2d1e5ea03	chore: 修复sqlite语句双引号改单引号	2025-12-09 23:11:19 +08:00
xiaojunnuo	b082e4e988	chore: 1	2025-12-09 00:47:08 +08:00
xiaojunnuo	45fbce0c2a	perf: 新增数据库迁移doc说明文档，优化datetime字段平滑迁移	2025-12-09 00:45:10 +08:00
xiaojunnuo	ff7006e232	build: release	2025-12-07 01:17:22 +08:00
xiaojunnuo	c68fdef0e4	build: publish	2025-12-07 00:59:50 +08:00
xiaojunnuo	4c60e4edc1	build: trigger build image	2025-12-07 00:59:39 +08:00
@@ -1 +1 @@
 :56
 :44