Compare commits
59 Commits
5a148aa3b9
...
v1.37.15
| Author | SHA1 | Date | |
|---|---|---|---|
| f2e4e59f8d | |||
| 898205b5b1 | |||
| 8ec6862861 | |||
| c3ba6322d8 | |||
| e589828425 | |||
| c909aa161b | |||
| 5cee7d44f1 | |||
| 973b323a99 | |||
| d55954a363 | |||
| adca151e4f | |||
| 43513049be | |||
| a5ca41131b | |||
| 2ea3810980 | |||
| c9cb54e8b2 | |||
| 23dd3db50b | |||
| 179c46914d | |||
| ddb18e6c21 | |||
| d2e147ba51 | |||
| b63033f846 | |||
| 677e1101e6 | |||
| 3abc2ccfbb | |||
| 827d28f1cd | |||
| 59d12a1bbe | |||
| 8134172301 | |||
| 8d983aa561 | |||
| bb3085ef84 | |||
| 78b1650bdb | |||
| 5edc72d475 | |||
| 1df32c9dfa | |||
| bedb1ff7f9 | |||
| fbf12f16b5 | |||
| 22a5f34e1f | |||
| e1a8b08619 | |||
| 466d30fb74 | |||
| 7a1c6d2918 | |||
| 9fcc0dc8e7 | |||
| 286f244caf | |||
| 52ebeab90b | |||
| 6be7591332 | |||
| 73325aaefb | |||
| 0adcc6a8d1 | |||
| 93fb6acd1d | |||
| 77d52b323d | |||
| ca8e8bf6ef | |||
| 9acac86ed5 | |||
| ba5007219d | |||
| ec046fd599 | |||
| 5452ff1153 | |||
| d03b1e0608 | |||
| 53c88ad5af | |||
| 21585ca565 | |||
| 2fabee647a | |||
| cf4632045c | |||
| ec75afbc44 | |||
| c7b298c46f | |||
| 3406bb5a4a | |||
| e9427b4694 | |||
| 517a1f1835 | |||
| 6e735bbd1e |
@@ -44,7 +44,8 @@ jobs:
|
|||||||
- name: deploy-certd-demo
|
- name: deploy-certd-demo
|
||||||
uses: tyrrrz/action-http-request@master
|
uses: tyrrrz/action-http-request@master
|
||||||
with:
|
with:
|
||||||
url: http://flow-openapi.aliyun.com/pipeline/webhook/lzCzlGrLCOHQaTMMt0mG
|
# 通过webhook 触发 certd-demo来部署
|
||||||
|
url: ${{ secrets.WEBHOOK_CERTD_DEMO }}
|
||||||
method: POST
|
method: POST
|
||||||
headers: |
|
headers: |
|
||||||
Content-Type: application/json
|
Content-Type: application/json
|
||||||
|
|||||||
@@ -121,10 +121,12 @@ jobs:
|
|||||||
- name: deploy-certd-doc
|
- name: deploy-certd-doc
|
||||||
uses: tyrrrz/action-http-request@master
|
uses: tyrrrz/action-http-request@master
|
||||||
with:
|
with:
|
||||||
url: http://flow-openapi.aliyun.com/pipeline/webhook/IiSxLDp9aOhgDUxJPytv
|
url: ${{ secrets.WEBHOOK_CERTD_DOC }}
|
||||||
method: POST
|
method: POST
|
||||||
body: |
|
body: |
|
||||||
{}
|
{
|
||||||
|
"CERTD_VERSION": "1.0.0"
|
||||||
|
}
|
||||||
headers: |
|
headers: |
|
||||||
Content-Type: application/json
|
Content-Type: application/json
|
||||||
retry-count: 3
|
retry-count: 3
|
||||||
|
|||||||
@@ -8,5 +8,6 @@
|
|||||||
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
|
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
|
||||||
"[typescript]": {
|
"[typescript]": {
|
||||||
"editor.defaultFormatter": "vscode.typescript-language-features"
|
"editor.defaultFormatter": "vscode.typescript-language-features"
|
||||||
}
|
},
|
||||||
|
"editor.tabSize": 2
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,65 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [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
|
||||||
|
|
||||||
|
* 修复注销登录时,第三方登录注销请求失败的报错 ([677e110](https://github.com/certd/certd/commit/677e1101e6cf4451abd8a876cc1d0ddd26a10b88))
|
||||||
|
|
||||||
|
## [1.37.13](https://github.com/certd/certd/compare/v1.37.12...v1.37.13) (2025-12-02)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复西部数据返回信息乱码问题 ([78b1650](https://github.com/certd/certd/commit/78b1650bdb071c858b3f90d53a700d11ee6de328))
|
||||||
|
* 修复西部数码使用域名级别的key申请证书失败的问题 ([5edc72d](https://github.com/certd/certd/commit/5edc72d47550b8e3364dabda70a41cce75d87956))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 第三方登录允许选择logo ([bb3085e](https://github.com/certd/certd/commit/bb3085ef84201ccd2dc632ba8c5097cb00258be4))
|
||||||
|
* 支持OIDC单点登录 ([fbf12f1](https://github.com/certd/certd/commit/fbf12f16b5eaa7676fd41923587bf6bd2595adba))
|
||||||
|
|
||||||
|
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复waf tls版本号小写 ([0adcc6a](https://github.com/certd/certd/commit/0adcc6a8d194469be0c26940ed4837fb34929b68))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持微信扫码登录 ([73325aa](https://github.com/certd/certd/commit/73325aaefb0e750a22aaac40929e7bf3f5864996))
|
||||||
|
* 支持证书颁发机构 LiteSSL ([6be7591](https://github.com/certd/certd/commit/6be75913324e2828d9016eb307ff2d0abbbb2191))
|
||||||
|
|
||||||
|
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复阿里云 waf tlsVersion参数缺失导致部署失败的问题 ([2fabee6](https://github.com/certd/certd/commit/2fabee647acf64afe689f5bea3603028cd0ba4a2))
|
||||||
|
* 修复备注撑开表格行高的bug ([c7b298c](https://github.com/certd/certd/commit/c7b298c46f0d52b43bd2bb17b374e7970a446446))
|
||||||
|
* 修复域名管理无法创建tencent-eo dns授权的bug ([3406bb5](https://github.com/certd/certd/commit/3406bb5a4a56bb310cddc1a1f410c70909fd129b))
|
||||||
|
* openapi 成功后失败都返回msg ([6e735bb](https://github.com/certd/certd/commit/6e735bbd1e29712e939f775a4db974db70e3b4b0))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* ssh支持ppk格式私钥 ([575ae16](https://github.com/certd/certd/commit/575ae164c863d0b1f9fa0890549a2ee7472fb469))
|
||||||
|
* 优化宝塔网站证书在并发部署时导致nginx配置文件错乱的问题 ([51cc084](https://github.com/certd/certd/commit/51cc08411fd2dbab66d769b495dc1b0bf2f2578c))
|
||||||
|
* 优化天翼云cdn 等待5秒部署完成 ([53c88ad](https://github.com/certd/certd/commit/53c88ad5afe66a3f7c38b9b759747918913a4edc))
|
||||||
|
* 支持oidc单点登录 ([ec75afb](https://github.com/certd/certd/commit/ec75afbc44139dbe9da534d8a8c08a5b91f86d3c))
|
||||||
|
* ssl.com支持ecc ([b5ec047](https://github.com/certd/certd/commit/b5ec04723db48422f71041f4043002e7f5b450b1))
|
||||||
|
|
||||||
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
||||||
|
|
||||||
### Performance Improvements
|
### Performance Improvements
|
||||||
|
|||||||
@@ -17,12 +17,6 @@ Certd® 是一个免费的全自动证书管理系统,让你的网站证书永
|
|||||||
> 流水线数量现已调整为无限制,欢迎大家使用
|
> 流水线数量现已调整为无限制,欢迎大家使用
|
||||||
|
|
||||||
|
|
||||||
**************************************************************************************************
|
|
||||||
🔥🔥🔥永久专业版上线,双11活动火热进行中🔥🔥🔥
|
|
||||||
赶快升级到最新版点击右上角金色VIP按钮,点击立即赞助,看看你的优惠券金额是多少?
|
|
||||||
**************************************************************************************************
|
|
||||||
|
|
||||||
|
|
||||||
## 一、特性
|
## 一、特性
|
||||||
本项目不仅支持证书申请过程自动化,还可以自动化部署更新证书,让你的证书永不过期。
|
本项目不仅支持证书申请过程自动化,还可以自动化部署更新证书,让你的证书永不过期。
|
||||||
|
|
||||||
@@ -158,9 +152,9 @@ https://certd.handfree.work/
|
|||||||
|
|
||||||
|
|
||||||
## 八、捐赠
|
## 八、捐赠
|
||||||
************************
|
|
||||||
开源为什么要做专业版收费?
|
开源为什么要做专业版收费?
|
||||||
1. 纯靠为爱发电不可持续(比如:我的dev-sidecar项目即便是拥有20K+star,也差点凉凉,幸亏有另外大佬接手用爱发电)
|
1. 纯靠为爱发电不可持续(比如:我的dev-sidecar项目即便是拥有20K+star,也差点凉凉,幸亏有另外大佬接手用爱发电)
|
||||||
2. 没有赞助的项目,作者会比较任性,不会用心倾听用户的心声,不顾用户体验(比如:下意识拒绝需求、频繁破坏性变更升级、全盘推倒重来之类的)
|
2. 没有赞助的项目,作者会比较任性,不会用心倾听用户的心声,不顾用户体验(比如:下意识拒绝需求、频繁破坏性变更升级、全盘推倒重来之类的)
|
||||||
3. 没有赞助的项目,交流群的戾气有时候比较重,容易起冲突
|
3. 没有赞助的项目,交流群的戾气有时候比较重,容易起冲突
|
||||||
|
|
||||||
@@ -171,16 +165,16 @@ https://certd.handfree.work/
|
|||||||
|
|
||||||
专业版特权对比
|
专业版特权对比
|
||||||
|
|
||||||
| 功能 | 免费版 | 专业版 |
|
| 功能 | 免费版 | 专业版 |
|
||||||
|---------|---------------------------------------|--------------------------------|
|
|---------|---------------------------------------|--------------------------------|
|
||||||
| 免费证书申请 | 免费无限制 | 免费无限制 |
|
| 免费证书申请 | 免费无限制 | 免费无限制 |
|
||||||
| 域名数量 | 无限制 | 无限制 |
|
| 域名数量 | 无限制 | 无限制 |
|
||||||
| 证书流水线条数 | 无限制 | 无限制 |
|
| 证书流水线条数 | 无限制 | 无限制 |
|
||||||
| 站点证书监控 | 限制1条 | 无限制 |
|
| 站点证书监控 | 限制1条 | 无限制 |
|
||||||
| 自动部署插件 | 阿里云CDN、腾讯云、七牛CDN、主机部署、宝塔、1Panel等大部分插件 | 群晖 |
|
| 自动部署插件 | 阿里云CDN、腾讯云、七牛CDN、主机部署、宝塔、1Panel等大部分插件 | 群晖、威联通、proxmox等 |
|
||||||
| 通知 | 邮件通知、自定义webhook | 邮件免配置、企微、钉钉、飞书、anpush、server酱等 |
|
| 通知 | 邮件通知、自定义webhook | 邮件免配置、企微、钉钉、飞书、anpush、server酱等 |
|
||||||
| VIP群 | 无 | 可加,一对一技术支持,必要时远程协助 |
|
| 批量操作 | 无 | 流水线模版,流水线复制,批量运行,批量设置通知、定时等 |
|
||||||
************************
|
| VIP群 | 无 | 可加,一对一技术支持,必要时可申请远程协助 |
|
||||||
|
|
||||||
|
|
||||||
## 九、贡献代码
|
## 九、贡献代码
|
||||||
|
|||||||
@@ -121,6 +121,7 @@ export default defineConfig({
|
|||||||
{text: "ESXi", link: "/guide/use/ESXi/index.md"},
|
{text: "ESXi", link: "/guide/use/ESXi/index.md"},
|
||||||
{text: "宝塔动态IP白名单", link: "/guide/use/baota/white_list.md"},
|
{text: "宝塔动态IP白名单", link: "/guide/use/baota/white_list.md"},
|
||||||
{text: "子域名托管", link: "/guide/use/cert/subdomain.md"},
|
{text: "子域名托管", link: "/guide/use/cert/subdomain.md"},
|
||||||
|
{text: "流水线有效期", link: "/guide/use/pipeline/valid.md"},
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3,6 +3,52 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.14](https://github.com/certd/certd/compare/v1.37.13...v1.37.14) (2025-12-02)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复注销登录时,第三方登录注销请求失败的报错 ([677e110](https://github.com/certd/certd/commit/677e1101e6cf4451abd8a876cc1d0ddd26a10b88))
|
||||||
|
|
||||||
|
## [1.37.13](https://github.com/certd/certd/compare/v1.37.12...v1.37.13) (2025-12-02)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复西部数据返回信息乱码问题 ([78b1650](https://github.com/certd/certd/commit/78b1650bdb071c858b3f90d53a700d11ee6de328))
|
||||||
|
* 修复西部数码使用域名级别的key申请证书失败的问题 ([5edc72d](https://github.com/certd/certd/commit/5edc72d47550b8e3364dabda70a41cce75d87956))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 第三方登录允许选择logo ([bb3085e](https://github.com/certd/certd/commit/bb3085ef84201ccd2dc632ba8c5097cb00258be4))
|
||||||
|
* 支持OIDC单点登录 ([fbf12f1](https://github.com/certd/certd/commit/fbf12f16b5eaa7676fd41923587bf6bd2595adba))
|
||||||
|
|
||||||
|
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复waf tls版本号小写 ([0adcc6a](https://github.com/certd/certd/commit/0adcc6a8d194469be0c26940ed4837fb34929b68))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持微信扫码登录 ([73325aa](https://github.com/certd/certd/commit/73325aaefb0e750a22aaac40929e7bf3f5864996))
|
||||||
|
* 支持证书颁发机构 LiteSSL ([6be7591](https://github.com/certd/certd/commit/6be75913324e2828d9016eb307ff2d0abbbb2191))
|
||||||
|
|
||||||
|
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复阿里云 waf tlsVersion参数缺失导致部署失败的问题 ([2fabee6](https://github.com/certd/certd/commit/2fabee647acf64afe689f5bea3603028cd0ba4a2))
|
||||||
|
* 修复备注撑开表格行高的bug ([c7b298c](https://github.com/certd/certd/commit/c7b298c46f0d52b43bd2bb17b374e7970a446446))
|
||||||
|
* 修复域名管理无法创建tencent-eo dns授权的bug ([3406bb5](https://github.com/certd/certd/commit/3406bb5a4a56bb310cddc1a1f410c70909fd129b))
|
||||||
|
* openapi 成功后失败都返回msg ([6e735bb](https://github.com/certd/certd/commit/6e735bbd1e29712e939f775a4db974db70e3b4b0))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* ssh支持ppk格式私钥 ([575ae16](https://github.com/certd/certd/commit/575ae164c863d0b1f9fa0890549a2ee7472fb469))
|
||||||
|
* 优化宝塔网站证书在并发部署时导致nginx配置文件错乱的问题 ([51cc084](https://github.com/certd/certd/commit/51cc08411fd2dbab66d769b495dc1b0bf2f2578c))
|
||||||
|
* 优化天翼云cdn 等待5秒部署完成 ([53c88ad](https://github.com/certd/certd/commit/53c88ad5afe66a3f7c38b9b759747918913a4edc))
|
||||||
|
* 支持oidc单点登录 ([ec75afb](https://github.com/certd/certd/commit/ec75afbc44139dbe9da534d8a8c08a5b91f86d3c))
|
||||||
|
* ssl.com支持ecc ([b5ec047](https://github.com/certd/certd/commit/b5ec04723db48422f71041f4043002e7f5b450b1))
|
||||||
|
|
||||||
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
||||||
|
|
||||||
### Performance Improvements
|
### Performance Improvements
|
||||||
|
|||||||
@@ -72,7 +72,7 @@
|
|||||||
| 3.| **阿里云-部署证书至CDN** | 自动部署域名证书至阿里云CDN |
|
| 3.| **阿里云-部署证书至CDN** | 自动部署域名证书至阿里云CDN |
|
||||||
| 4.| **阿里云-部署证书至DCDN** | 依赖证书申请前置任务,自动部署域名证书至阿里云DCDN |
|
| 4.| **阿里云-部署证书至DCDN** | 依赖证书申请前置任务,自动部署域名证书至阿里云DCDN |
|
||||||
| 5.| **阿里云-部署证书至OSS** | 部署域名证书至阿里云OSS自定义域名,不是上传到阿里云oss |
|
| 5.| **阿里云-部署证书至OSS** | 部署域名证书至阿里云OSS自定义域名,不是上传到阿里云oss |
|
||||||
| 6.| **阿里云-上传证书到阿里云CAS** | 上传证书到阿里云数字证书管理服务(CAS),注意:不会部署到任何应用上;如果不想在阿里云上同一份证书上传多次,可以把此任务作为前置任务,其他阿里云任务证书那一项选择此任务的输出 |
|
| 6.| **阿里云-上传证书到CAS** | 上传证书到阿里云证书管理服务(CAS),如果不想在阿里云上同一份证书上传多次,可以把此任务作为前置任务,其他阿里云任务证书那一项选择此任务的输出 |
|
||||||
| 7.| **阿里云-部署至阿里云WAF** | 部署证书到阿里云WAF |
|
| 7.| **阿里云-部署至阿里云WAF** | 部署证书到阿里云WAF |
|
||||||
| 8.| **阿里云-部署至ALB(应用负载均衡)** | ALB,更新监听器的默认证书 |
|
| 8.| **阿里云-部署至ALB(应用负载均衡)** | ALB,更新监听器的默认证书 |
|
||||||
| 9.| **阿里云-部署至NLB(网络负载均衡)** | NLB,网络负载均衡,更新监听器的默认证书 |
|
| 9.| **阿里云-部署至NLB(网络负载均衡)** | NLB,网络负载均衡,更新监听器的默认证书 |
|
||||||
|
|||||||
@@ -5,8 +5,10 @@
|
|||||||
|
|
||||||
配置环境变量
|
配置环境变量
|
||||||
```shell
|
```shell
|
||||||
ALIYUN_CLIENT_CONNECT_TIMEOUT=10000 # 连接超时,单位毫秒
|
# docker-compose.yaml
|
||||||
ALIYUN_CLIENT_READ_TIMEOUT=10000 #读取数据超时,单位毫秒
|
environment:
|
||||||
|
- ALIYUN_CLIENT_CONNECT_TIMEOUT=16000 # 连接超时,单位毫秒
|
||||||
|
- ALIYUN_CLIENT_READ_TIMEOUT=16000 #读取数据超时,单位毫秒
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
|
After Width: | Height: | Size: 65 KiB |
|
After Width: | Height: | Size: 34 KiB |
|
After Width: | Height: | Size: 55 KiB |
|
After Width: | Height: | Size: 55 KiB |
@@ -0,0 +1,17 @@
|
|||||||
|
# 流水线有效期功能
|
||||||
|
|
||||||
|
可以为流水线设置有效期,超过有效期后,流水线将停止运行
|
||||||
|
|
||||||
|
## 1. 打开有效期开关
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
## 2. 设置有效期
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
## 3. 设置完成
|
||||||
|
该流水线将在有效期结束后停止运行
|
||||||
|

|
||||||
@@ -9,5 +9,5 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"npmClient": "pnpm",
|
"npmClient": "pnpm",
|
||||||
"version": "1.37.10"
|
"version": "1.37.15"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,8 +17,8 @@
|
|||||||
"start:server": "cd ./packages/ui/certd-server && npm start",
|
"start:server": "cd ./packages/ui/certd-server && npm start",
|
||||||
"devb": "lerna run dev-build",
|
"devb": "lerna run dev-build",
|
||||||
"i-all": "lerna link && lerna exec npm install ",
|
"i-all": "lerna link && lerna exec npm install ",
|
||||||
"publish": "npm run prepublishOnly2 && lerna publish --force-publish=pro/plus-core --conventional-commits --create-release github && npm run afterpublishOnly && npm run commitAll",
|
"publish": "npm run prepublishOnly2 && lerna publish --force-publish=pro/plus-core --conventional-commits --create-release github && npm run afterpublishOnly ",
|
||||||
"afterpublishOnly": "npm run plugin-doc-gen && npm run copylogs && time /t >trigger/build.trigger && git add ./trigger/build.trigger && git commit -m \"build: trigger build image\" && TIMEOUT /T 10 && git push",
|
"afterpublishOnly": "npm run plugin-doc-gen && npm run copylogs && time /t >trigger/build.trigger && git add ./trigger/build.trigger && git commit -m \"build: trigger build image\" && TIMEOUT /T 10 && npm run commitAll",
|
||||||
"transform-sql": "cd ./packages/ui/certd-server/db/ && node --experimental-json-modules transform.js",
|
"transform-sql": "cd ./packages/ui/certd-server/db/ && node --experimental-json-modules transform.js",
|
||||||
"plugin-doc-gen": "cd ./packages/ui/certd-server/ && npm run export-md",
|
"plugin-doc-gen": "cd ./packages/ui/certd-server/ && npm run export-md",
|
||||||
"commitAll": "git add . && git commit -m \"build: publish\" && git push && npm run commitPro",
|
"commitAll": "git add . && git commit -m \"build: publish\" && git push && npm run commitPro",
|
||||||
|
|||||||
@@ -3,6 +3,30 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [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
|
||||||
|
|
||||||
|
## [1.37.14](https://github.com/publishlab/node-acme-client/compare/v1.37.13...v1.37.14) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.37.13](https://github.com/publishlab/node-acme-client/compare/v1.37.12...v1.37.13) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.37.12](https://github.com/publishlab/node-acme-client/compare/v1.37.11...v1.37.12) (2025-11-29)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持证书颁发机构 LiteSSL ([6be7591](https://github.com/publishlab/node-acme-client/commit/6be75913324e2828d9016eb307ff2d0abbbb2191))
|
||||||
|
|
||||||
|
## [1.37.11](https://github.com/publishlab/node-acme-client/compare/v1.37.10...v1.37.11) (2025-11-28)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* ssl.com支持ecc ([b5ec047](https://github.com/publishlab/node-acme-client/commit/b5ec04723db48422f71041f4043002e7f5b450b1))
|
||||||
|
|
||||||
## [1.37.10](https://github.com/publishlab/node-acme-client/compare/v1.37.9...v1.37.10) (2025-11-19)
|
## [1.37.10](https://github.com/publishlab/node-acme-client/compare/v1.37.9...v1.37.10) (2025-11-19)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/acme-client
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"description": "Simple and unopinionated ACME client",
|
"description": "Simple and unopinionated ACME client",
|
||||||
"private": false,
|
"private": false,
|
||||||
"author": "nmorsman",
|
"author": "nmorsman",
|
||||||
"version": "1.37.10",
|
"version": "1.37.15",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"module": "scr/index.js",
|
"module": "scr/index.js",
|
||||||
"main": "src/index.js",
|
"main": "src/index.js",
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
"types"
|
"types"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/basic": "^1.37.10",
|
"@certd/basic": "^1.37.15",
|
||||||
"@peculiar/x509": "^1.11.0",
|
"@peculiar/x509": "^1.11.0",
|
||||||
"asn1js": "^3.0.5",
|
"asn1js": "^3.0.5",
|
||||||
"axios": "^1.7.2",
|
"axios": "^1.7.2",
|
||||||
@@ -70,5 +70,5 @@
|
|||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/publishlab/node-acme-client/issues"
|
"url": "https://github.com/publishlab/node-acme-client/issues"
|
||||||
},
|
},
|
||||||
"gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
|
"gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,11 @@ export const directory = {
|
|||||||
staging: 'https://acme.ssl.com/sslcom-dv-rsa',
|
staging: 'https://acme.ssl.com/sslcom-dv-rsa',
|
||||||
production: 'https://acme.ssl.com/sslcom-dv-rsa',
|
production: 'https://acme.ssl.com/sslcom-dv-rsa',
|
||||||
ec: 'https://acme.ssl.com/sslcom-dv-ecc',
|
ec: 'https://acme.ssl.com/sslcom-dv-ecc',
|
||||||
}
|
},
|
||||||
|
litessl: {
|
||||||
|
staging: 'https://acme.litessl.com/acme/v2/directory',
|
||||||
|
production: 'https://acme.litessl.com/acme/v2/directory',
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
export function getDirectoryUrl(opts) {
|
export function getDirectoryUrl(opts) {
|
||||||
|
|||||||
@@ -3,6 +3,30 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [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.37.14](https://github.com/certd/certd/compare/v1.37.13...v1.37.14) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.37.13](https://github.com/certd/certd/compare/v1.37.12...v1.37.13) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化宝塔网站证书在并发部署时导致nginx配置文件错乱的问题 ([51cc084](https://github.com/certd/certd/commit/51cc08411fd2dbab66d769b495dc1b0bf2f2578c))
|
||||||
|
* 优化天翼云cdn 等待5秒部署完成 ([53c88ad](https://github.com/certd/certd/commit/53c88ad5afe66a3f7c38b9b759747918913a4edc))
|
||||||
|
* ssl.com支持ecc ([b5ec047](https://github.com/certd/certd/commit/b5ec04723db48422f71041f4043002e7f5b450b1))
|
||||||
|
|
||||||
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/basic
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
23:49
|
00:56
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/basic",
|
"name": "@certd/basic",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.37.10",
|
"version": "1.37.15",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -47,5 +47,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
|
"gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ export class Locker {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async execute(lockStr: string, callback: any, options?: { timeout?: number }) {
|
async execute(lockStr: string, callback: any, options?: { timeout?: number }) {
|
||||||
const timeout = options?.timeout ?? 20000;
|
const timeout = options?.timeout ?? 120000;
|
||||||
return this.asyncLocker.acquire(lockStr, callback, { timeout });
|
return this.asyncLocker.acquire(lockStr, callback, { timeout });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,26 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [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.37.14](https://github.com/certd/certd/compare/v1.37.13...v1.37.14) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.37.13](https://github.com/certd/certd/compare/v1.37.12...v1.37.13) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/pipeline
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/pipeline",
|
"name": "@certd/pipeline",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.37.10",
|
"version": "1.37.15",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -18,8 +18,8 @@
|
|||||||
"compile": "tsc --skipLibCheck --watch"
|
"compile": "tsc --skipLibCheck --watch"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/basic": "^1.37.10",
|
"@certd/basic": "^1.37.15",
|
||||||
"@certd/plus-core": "^1.37.10",
|
"@certd/plus-core": "^1.37.15",
|
||||||
"dayjs": "^1.11.7",
|
"dayjs": "^1.11.7",
|
||||||
"lodash-es": "^4.17.21",
|
"lodash-es": "^4.17.21",
|
||||||
"reflect-metadata": "^0.1.13"
|
"reflect-metadata": "^0.1.13"
|
||||||
@@ -45,5 +45,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
|
"gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,26 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [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.37.14](https://github.com/certd/certd/compare/v1.37.13...v1.37.14) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.37.13](https://github.com/certd/certd/compare/v1.37.12...v1.37.13) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-huawei
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-huawei",
|
"name": "@certd/lib-huawei",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.37.10",
|
"version": "1.37.15",
|
||||||
"main": "./dist/bundle.js",
|
"main": "./dist/bundle.js",
|
||||||
"module": "./dist/bundle.js",
|
"module": "./dist/bundle.js",
|
||||||
"types": "./dist/d/index.d.ts",
|
"types": "./dist/d/index.d.ts",
|
||||||
@@ -24,5 +24,5 @@
|
|||||||
"prettier": "^2.8.8",
|
"prettier": "^2.8.8",
|
||||||
"tslib": "^2.8.1"
|
"tslib": "^2.8.1"
|
||||||
},
|
},
|
||||||
"gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
|
"gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,26 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [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.37.14](https://github.com/certd/certd/compare/v1.37.13...v1.37.14) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.37.13](https://github.com/certd/certd/compare/v1.37.12...v1.37.13) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-iframe
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-iframe",
|
"name": "@certd/lib-iframe",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.37.10",
|
"version": "1.37.15",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -31,5 +31,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
|
"gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,28 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [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.37.14](https://github.com/certd/certd/compare/v1.37.13...v1.37.14) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.37.13](https://github.com/certd/certd/compare/v1.37.12...v1.37.13) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* ssh支持ppk格式私钥 ([575ae16](https://github.com/certd/certd/commit/575ae164c863d0b1f9fa0890549a2ee7472fb469))
|
||||||
|
|
||||||
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/jdcloud
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/jdcloud",
|
"name": "@certd/jdcloud",
|
||||||
"version": "1.37.10",
|
"version": "1.37.15",
|
||||||
"description": "jdcloud openApi sdk",
|
"description": "jdcloud openApi sdk",
|
||||||
"main": "./dist/bundle.js",
|
"main": "./dist/bundle.js",
|
||||||
"module": "./dist/bundle.js",
|
"module": "./dist/bundle.js",
|
||||||
@@ -56,5 +56,5 @@
|
|||||||
"fetch"
|
"fetch"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
|
"gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,29 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.15](https://github.com/certd/certd/compare/v1.37.14...v1.37.15) (2025-12-06)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 邮件模版安全优化 ([adca151](https://github.com/certd/certd/commit/adca151e4f07a4c6a2a753bfa48ee0d4d6469fd2))
|
||||||
|
* 支持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)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.37.13](https://github.com/certd/certd/compare/v1.37.12...v1.37.13) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-k8s
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-k8s",
|
"name": "@certd/lib-k8s",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.37.10",
|
"version": "1.37.15",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
"pub": "npm publish"
|
"pub": "npm publish"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/basic": "^1.37.10",
|
"@certd/basic": "^1.37.15",
|
||||||
"@kubernetes/client-node": "0.21.0"
|
"@kubernetes/client-node": "0.21.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -32,5 +32,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
|
"gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { CoreV1Api, KubeConfig, NetworkingV1Api, V1Ingress, V1Secret } from "@kubernetes/client-node";
|
import { CoreV1Api, KubeConfig, NetworkingV1Api, V1Ingress, V1Secret, KubernetesObjectApi, loadYaml, KubernetesObject } from "@kubernetes/client-node";
|
||||||
import dns from "dns";
|
import dns from "dns";
|
||||||
import { ILogger } from "@certd/basic";
|
import { ILogger } from "@certd/basic";
|
||||||
import { merge } from "lodash-es";
|
import { merge } from "lodash-es";
|
||||||
@@ -27,6 +27,11 @@ export class K8sClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
init() {
|
init() {
|
||||||
|
const kubeconfig = this.getKubeConfig();
|
||||||
|
this.client = kubeconfig.makeApiClient(CoreV1Api);
|
||||||
|
}
|
||||||
|
|
||||||
|
getKubeConfig() {
|
||||||
const kubeconfig = new KubeConfig();
|
const kubeconfig = new KubeConfig();
|
||||||
kubeconfig.loadFromString(this.kubeConfigStr);
|
kubeconfig.loadFromString(this.kubeConfigStr);
|
||||||
this.kubeconfig = kubeconfig;
|
this.kubeconfig = kubeconfig;
|
||||||
@@ -41,16 +46,35 @@ export class K8sClient {
|
|||||||
} catch (e) {
|
} catch (e) {
|
||||||
this.logger.warn("skipTLSVerify error", e);
|
this.logger.warn("skipTLSVerify error", e);
|
||||||
}
|
}
|
||||||
|
return kubeconfig;
|
||||||
|
}
|
||||||
|
|
||||||
this.client = kubeconfig.makeApiClient(CoreV1Api);
|
getKubeClient() {
|
||||||
|
const kc = this.getKubeConfig();
|
||||||
|
const client = KubernetesObjectApi.makeApiClient(kc);
|
||||||
|
return client;
|
||||||
|
}
|
||||||
|
|
||||||
// const reqOpts = { kubeconfig, request: {} } as any;
|
async apply(manifest: string) {
|
||||||
// if (this.lookup) {
|
const yml = loadYaml<KubernetesObject>(manifest);
|
||||||
// reqOpts.request.lookup = this.lookup;
|
const client = this.getKubeClient();
|
||||||
// }
|
try {
|
||||||
//
|
await client.create(yml);
|
||||||
// const backend = new Request(reqOpts);
|
} catch (e) {
|
||||||
// this.client = new Client({ backend, version: '1.13' });
|
this.logger.error("apply error", e.response?.body);
|
||||||
|
if (e.response?.body?.reason === "AlreadyExists") {
|
||||||
|
//patch
|
||||||
|
this.logger.info("patch existing resource: ", yml.metadata?.name);
|
||||||
|
const existing = await client.read(yml as any);
|
||||||
|
if (!yml.metadata) {
|
||||||
|
yml.metadata = {};
|
||||||
|
}
|
||||||
|
yml.metadata.resourceVersion = existing.body.metadata.resourceVersion;
|
||||||
|
await client.patch(yml);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -168,6 +192,7 @@ export class K8sClient {
|
|||||||
const oldIngress = await client.readNamespacedIngress(ingressName, namespace);
|
const oldIngress = await client.readNamespacedIngress(ingressName, namespace);
|
||||||
const newIngress = merge(oldIngress.body, opts.body);
|
const newIngress = merge(oldIngress.body, opts.body);
|
||||||
const res = await client.replaceNamespacedIngress(ingressName, namespace, newIngress);
|
const res = await client.replaceNamespacedIngress(ingressName, namespace, newIngress);
|
||||||
|
|
||||||
this.logger.info("ingress patched", opts.body);
|
this.logger.info("ingress patched", opts.body);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,30 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [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.37.14](https://github.com/certd/certd/compare/v1.37.13...v1.37.14) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
## [1.37.13](https://github.com/certd/certd/compare/v1.37.12...v1.37.13) (2025-12-02)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 第三方登录允许选择logo ([bb3085e](https://github.com/certd/certd/commit/bb3085ef84201ccd2dc632ba8c5097cb00258be4))
|
||||||
|
|
||||||
|
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持oidc单点登录 ([ec75afb](https://github.com/certd/certd/commit/ec75afbc44139dbe9da534d8a8c08a5b91f86d3c))
|
||||||
|
|
||||||
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-server
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-server",
|
"name": "@certd/lib-server",
|
||||||
"version": "1.37.10",
|
"version": "1.37.15",
|
||||||
"description": "midway with flyway, sql upgrade way ",
|
"description": "midway with flyway, sql upgrade way ",
|
||||||
"private": false,
|
"private": false,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -28,11 +28,11 @@
|
|||||||
],
|
],
|
||||||
"license": "AGPL",
|
"license": "AGPL",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/acme-client": "^1.37.10",
|
"@certd/acme-client": "^1.37.15",
|
||||||
"@certd/basic": "^1.37.10",
|
"@certd/basic": "^1.37.15",
|
||||||
"@certd/pipeline": "^1.37.10",
|
"@certd/pipeline": "^1.37.15",
|
||||||
"@certd/plugin-lib": "^1.37.10",
|
"@certd/plugin-lib": "^1.37.15",
|
||||||
"@certd/plus-core": "^1.37.10",
|
"@certd/plus-core": "^1.37.15",
|
||||||
"@midwayjs/cache": "3.14.0",
|
"@midwayjs/cache": "3.14.0",
|
||||||
"@midwayjs/core": "3.20.11",
|
"@midwayjs/core": "3.20.11",
|
||||||
"@midwayjs/i18n": "3.20.13",
|
"@midwayjs/i18n": "3.20.13",
|
||||||
@@ -64,5 +64,5 @@
|
|||||||
"typeorm": "^0.3.11",
|
"typeorm": "^0.3.11",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
|
"gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { PermissionException, ValidateException } from './exception/index.js';
|
import { PermissionException, ValidateException } from './exception/index.js';
|
||||||
import { In, Repository, SelectQueryBuilder } from 'typeorm';
|
import { FindOneOptions, In, Repository, SelectQueryBuilder } from 'typeorm';
|
||||||
import { Inject } from '@midwayjs/core';
|
import { Inject } from '@midwayjs/core';
|
||||||
import { TypeORMDataSourceManager } from '@midwayjs/typeorm';
|
import { TypeORMDataSourceManager } from '@midwayjs/typeorm';
|
||||||
import { EntityManager } from 'typeorm/entity-manager/EntityManager.js';
|
import { EntityManager } from 'typeorm/entity-manager/EntityManager.js';
|
||||||
@@ -238,4 +238,8 @@ export abstract class BaseService<T> {
|
|||||||
|
|
||||||
await this.delete(ids);
|
await this.delete(ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async findOne(options: FindOneOptions<T>) {
|
||||||
|
return await this.getRepository().findOne(options);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ export class SysPublicSettings extends BaseSettings {
|
|||||||
static __access__ = 'public';
|
static __access__ = 'public';
|
||||||
|
|
||||||
registerEnabled = false;
|
registerEnabled = false;
|
||||||
userValidTimeEnabled?:boolean = false;
|
userValidTimeEnabled?: boolean = false;
|
||||||
passwordLoginEnabled = true;
|
passwordLoginEnabled = true;
|
||||||
usernameRegisterEnabled = true;
|
usernameRegisterEnabled = true;
|
||||||
mobileRegisterEnabled = false;
|
mobileRegisterEnabled = false;
|
||||||
@@ -36,7 +36,7 @@ export class SysPublicSettings extends BaseSettings {
|
|||||||
captchaEnabled = false;
|
captchaEnabled = false;
|
||||||
//验证码类型
|
//验证码类型
|
||||||
captchaType?: string;
|
captchaType?: string;
|
||||||
captchaAddonId?:number;
|
captchaAddonId?: number;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -49,6 +49,14 @@ export class SysPublicSettings extends BaseSettings {
|
|||||||
// 固定证书有效期天数,0表示不固定
|
// 固定证书有效期天数,0表示不固定
|
||||||
fixedCertExpireDays?: number;
|
fixedCertExpireDays?: number;
|
||||||
|
|
||||||
|
// 第三方OAuth配置
|
||||||
|
oauthEnabled?: boolean = false;
|
||||||
|
oauthProviders: Record<string, {
|
||||||
|
type: string;
|
||||||
|
title: string;
|
||||||
|
addonId: number;
|
||||||
|
}> = {};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export class SysPrivateSettings extends BaseSettings {
|
export class SysPrivateSettings extends BaseSettings {
|
||||||
@@ -69,9 +77,9 @@ export class SysPrivateSettings extends BaseSettings {
|
|||||||
type?: string;
|
type?: string;
|
||||||
config?: any;
|
config?: any;
|
||||||
} = {
|
} = {
|
||||||
type: 'aliyun',
|
type: 'aliyun',
|
||||||
config: {},
|
config: {},
|
||||||
};
|
};
|
||||||
|
|
||||||
removeSecret() {
|
removeSecret() {
|
||||||
const clone = cloneDeep(this);
|
const clone = cloneDeep(this);
|
||||||
@@ -196,7 +204,7 @@ export class SysSuiteSetting extends BaseSettings {
|
|||||||
static __key__ = 'sys.suite';
|
static __key__ = 'sys.suite';
|
||||||
static __access__ = 'private';
|
static __access__ = 'private';
|
||||||
|
|
||||||
enabled:boolean = false;
|
enabled: boolean = false;
|
||||||
|
|
||||||
registerGift?: {
|
registerGift?: {
|
||||||
productId: number;
|
productId: number;
|
||||||
@@ -221,11 +229,9 @@ export class SysSafeSetting extends BaseSettings {
|
|||||||
static __access__ = 'private';
|
static __access__ = 'private';
|
||||||
|
|
||||||
// 站点隐藏
|
// 站点隐藏
|
||||||
hidden:SiteHidden = {
|
hidden: SiteHidden = {
|
||||||
enabled: false,
|
enabled: false,
|
||||||
hiddenOpenApi:false,
|
hiddenOpenApi: false,
|
||||||
autoHiddenTimes: 5,
|
autoHiddenTimes: 5,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ export type AddonDefine = Registrable & {
|
|||||||
[key: string]: AddonInputDefine;
|
[key: string]: AddonInputDefine;
|
||||||
};
|
};
|
||||||
showTest?: boolean;
|
showTest?: boolean;
|
||||||
|
icon?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type AddonInstanceConfig = {
|
export type AddonInstanceConfig = {
|
||||||
@@ -64,6 +65,7 @@ export abstract class BaseAddon implements IAddon {
|
|||||||
http!: HttpClient;
|
http!: HttpClient;
|
||||||
logger!: ILogger;
|
logger!: ILogger;
|
||||||
|
|
||||||
|
title!: string;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
|
|
||||||
|
|
||||||
getDefineList(addonType: string) {
|
getDefineList(addonType: string) {
|
||||||
return addonRegistry.getDefineList();
|
return addonRegistry.getDefineList(addonType);
|
||||||
}
|
}
|
||||||
|
|
||||||
getDefineByType(type: string, prefix?: string) {
|
getDefineByType(type: string, prefix?: string) {
|
||||||
@@ -187,4 +187,14 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
});
|
});
|
||||||
return this.buildAddonInstanceConfig(res);
|
return this.buildAddonInstanceConfig(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async getOneByType(req:{addonType:string,type:string,userId:number}) {
|
||||||
|
return await this.repository.findOne({
|
||||||
|
where: {
|
||||||
|
addonType: req.addonType,
|
||||||
|
type: req.type,
|
||||||
|
userId: req.userId
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,26 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [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.37.14](https://github.com/certd/certd/compare/v1.37.13...v1.37.14) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.37.13](https://github.com/certd/certd/compare/v1.37.12...v1.37.13) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/midway-flyway-js
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/midway-flyway-js",
|
"name": "@certd/midway-flyway-js",
|
||||||
"version": "1.37.10",
|
"version": "1.37.15",
|
||||||
"description": "midway with flyway, sql upgrade way ",
|
"description": "midway with flyway, sql upgrade way ",
|
||||||
"private": false,
|
"private": false,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -46,5 +46,5 @@
|
|||||||
"typeorm": "^0.3.11",
|
"typeorm": "^0.3.11",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
|
"gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,30 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [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.37.14](https://github.com/certd/certd/compare/v1.37.13...v1.37.14) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.37.13](https://github.com/certd/certd/compare/v1.37.12...v1.37.13) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持证书颁发机构 LiteSSL ([6be7591](https://github.com/certd/certd/commit/6be75913324e2828d9016eb307ff2d0abbbb2191))
|
||||||
|
|
||||||
|
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* ssl.com支持ecc ([b5ec047](https://github.com/certd/certd/commit/b5ec04723db48422f71041f4043002e7f5b450b1))
|
||||||
|
|
||||||
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
||||||
|
|
||||||
### Performance Improvements
|
### Performance Improvements
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/plugin-cert",
|
"name": "@certd/plugin-cert",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.37.10",
|
"version": "1.37.15",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
@@ -17,10 +17,10 @@
|
|||||||
"compile": "tsc --skipLibCheck --watch"
|
"compile": "tsc --skipLibCheck --watch"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/acme-client": "^1.37.10",
|
"@certd/acme-client": "^1.37.15",
|
||||||
"@certd/basic": "^1.37.10",
|
"@certd/basic": "^1.37.15",
|
||||||
"@certd/pipeline": "^1.37.10",
|
"@certd/pipeline": "^1.37.15",
|
||||||
"@certd/plugin-lib": "^1.37.10",
|
"@certd/plugin-lib": "^1.37.15",
|
||||||
"@google-cloud/publicca": "^1.3.0",
|
"@google-cloud/publicca": "^1.3.0",
|
||||||
"dayjs": "^1.11.7",
|
"dayjs": "^1.11.7",
|
||||||
"jszip": "^3.10.1",
|
"jszip": "^3.10.1",
|
||||||
@@ -43,5 +43,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
|
"gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -136,6 +136,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
|
|||||||
{ value: "letsencrypt", label: "Let's Encrypt(免费,新手推荐)", icon: "simple-icons:letsencrypt" },
|
{ value: "letsencrypt", label: "Let's Encrypt(免费,新手推荐)", icon: "simple-icons:letsencrypt" },
|
||||||
{ value: "google", label: "Google(免费)", icon: "flat-color-icons:google" },
|
{ value: "google", label: "Google(免费)", icon: "flat-color-icons:google" },
|
||||||
{ value: "zerossl", label: "ZeroSSL(免费)", icon: "emojione:digit-zero" },
|
{ value: "zerossl", label: "ZeroSSL(免费)", icon: "emojione:digit-zero" },
|
||||||
|
{ value: "litessl", label: "litessl(免费)", icon: "roentgen:free" },
|
||||||
{ value: "sslcom", label: "SSL.com(仅主域名和www免费)", icon: "la:expeditedssl" },
|
{ value: "sslcom", label: "SSL.com(仅主域名和www免费)", icon: "la:expeditedssl" },
|
||||||
{ value: "letsencrypt_staging", label: "Let's Encrypt测试环境(IP证书)", icon: "simple-icons:letsencrypt" },
|
{ value: "letsencrypt_staging", label: "Let's Encrypt测试环境(IP证书)", icon: "simple-icons:letsencrypt" },
|
||||||
],
|
],
|
||||||
@@ -250,6 +251,13 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
|
|||||||
})
|
})
|
||||||
sslcomCommonEabAccessId!: number;
|
sslcomCommonEabAccessId!: number;
|
||||||
|
|
||||||
|
@TaskInput({
|
||||||
|
title: "litessl公共EAB授权",
|
||||||
|
isSys: true,
|
||||||
|
show: false,
|
||||||
|
})
|
||||||
|
litesslCommonEabAccessId!: number;
|
||||||
|
|
||||||
@TaskInput({
|
@TaskInput({
|
||||||
title: "EAB授权",
|
title: "EAB授权",
|
||||||
component: {
|
component: {
|
||||||
@@ -262,13 +270,15 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
|
|||||||
"需要提供EAB授权" +
|
"需要提供EAB授权" +
|
||||||
"\nZeroSSL:请前往[zerossl开发者中心](https://app.zerossl.com/developer),生成 'EAB Credentials'" +
|
"\nZeroSSL:请前往[zerossl开发者中心](https://app.zerossl.com/developer),生成 'EAB Credentials'" +
|
||||||
"\nGoogle:请查看[google获取eab帮助文档](https://certd.docmirror.cn/guide/use/google/),用过一次后会绑定邮箱,后续复用EAB要用同一个邮箱" +
|
"\nGoogle:请查看[google获取eab帮助文档](https://certd.docmirror.cn/guide/use/google/),用过一次后会绑定邮箱,后续复用EAB要用同一个邮箱" +
|
||||||
"\nSSL.com:[SSL.com账号页面](https://secure.ssl.com/account),然后点击api credentials链接,然后点击编辑按钮,查看Secret key和HMAC key",
|
"\nSSL.com:[SSL.com账号页面](https://secure.ssl.com/account),然后点击api credentials链接,然后点击编辑按钮,查看Secret key和HMAC key" +
|
||||||
|
"\nlitessl:[litesslEAB页面](https://freessl.cn/automation/eab-manager),然后点击新增EAB",
|
||||||
mergeScript: `
|
mergeScript: `
|
||||||
return {
|
return {
|
||||||
show: ctx.compute(({form})=>{
|
show: ctx.compute(({form})=>{
|
||||||
return (form.sslProvider === 'zerossl' && !form.zerosslCommonEabAccessId)
|
return (form.sslProvider === 'zerossl' && !form.zerosslCommonEabAccessId)
|
||||||
|| (form.sslProvider === 'google' && !form.googleCommonEabAccessId)
|
|| (form.sslProvider === 'google' && !form.googleCommonEabAccessId)
|
||||||
|| (form.sslProvider === 'sslcom' && !form.sslcomCommonEabAccessId)
|
|| (form.sslProvider === 'sslcom' && !form.sslcomCommonEabAccessId)
|
||||||
|
|| (form.sslProvider === 'litessl' && !form.litesslCommonEabAccessId)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
`,
|
`,
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
"@typescript-eslint/ban-ts-ignore": "off",
|
"@typescript-eslint/ban-ts-ignore": "off",
|
||||||
"@typescript-eslint/no-explicit-any": "off",
|
"@typescript-eslint/no-explicit-any": "off",
|
||||||
"@typescript-eslint/no-empty-function": "off",
|
"@typescript-eslint/no-empty-function": "off",
|
||||||
"@typescript-eslint/no-unused-vars": "off"
|
"@typescript-eslint/no-unused-vars": "off",
|
||||||
|
"max-len": [0, 160, 2, { "ignoreUrls": true }]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,29 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [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.37.14](https://github.com/certd/certd/compare/v1.37.13...v1.37.14) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.37.13](https://github.com/certd/certd/compare/v1.37.12...v1.37.13) (2025-12-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* ssh支持ppk格式私钥 ([575ae16](https://github.com/certd/certd/commit/575ae164c863d0b1f9fa0890549a2ee7472fb469))
|
||||||
|
* 优化天翼云cdn 等待5秒部署完成 ([53c88ad](https://github.com/certd/certd/commit/53c88ad5afe66a3f7c38b9b759747918913a4edc))
|
||||||
|
|
||||||
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/plugin-lib
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/plugin-lib",
|
"name": "@certd/plugin-lib",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.37.10",
|
"version": "1.37.15",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
@@ -22,8 +22,8 @@
|
|||||||
"@alicloud/pop-core": "^1.7.10",
|
"@alicloud/pop-core": "^1.7.10",
|
||||||
"@alicloud/tea-util": "^1.4.10",
|
"@alicloud/tea-util": "^1.4.10",
|
||||||
"@aws-sdk/client-s3": "^3.787.0",
|
"@aws-sdk/client-s3": "^3.787.0",
|
||||||
"@certd/basic": "^1.37.10",
|
"@certd/basic": "^1.37.15",
|
||||||
"@certd/pipeline": "^1.37.10",
|
"@certd/pipeline": "^1.37.15",
|
||||||
"@kubernetes/client-node": "0.21.0",
|
"@kubernetes/client-node": "0.21.0",
|
||||||
"ali-oss": "^6.22.0",
|
"ali-oss": "^6.22.0",
|
||||||
"basic-ftp": "^5.0.5",
|
"basic-ftp": "^5.0.5",
|
||||||
@@ -53,5 +53,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
|
"gitHead": "ddb18e6c219d0f7a7acb4a3355be5db3fd9e096e"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,4 +7,5 @@ export * from "./qiniu/index.js";
|
|||||||
export * from "./ctyun/index.js";
|
export * from "./ctyun/index.js";
|
||||||
export * from "./oss/index.js";
|
export * from "./oss/index.js";
|
||||||
export * from "./s3/index.js";
|
export * from "./s3/index.js";
|
||||||
export * from "./lib/index.js";
|
export * from "./lib/index.js";
|
||||||
|
export * from "./service/index.js";
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
export * from "./site-info.js";
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
export type SiteInfo = {
|
||||||
|
siteUrl: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export interface ISiteInfoGetter {
|
||||||
|
getSiteInfo(): Promise<SiteInfo>;
|
||||||
|
}
|
||||||
@@ -36,7 +36,7 @@ export class TencentSslClient {
|
|||||||
|
|
||||||
checkRet(ret: any) {
|
checkRet(ret: any) {
|
||||||
if (!ret || ret.Error) {
|
if (!ret || ret.Error) {
|
||||||
throw new Error("请求失败:" + ret.Error.Code + "," + ret.Error.Message);
|
throw new Error("请求失败:" + ret.Error.Code + "," + ret.Error.Message + ",requestId" + ret.RequestId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -70,43 +70,33 @@ export class TencentSslClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async deployCertificateInstance(params: any) {
|
async deployCertificateInstance(params: any) {
|
||||||
const client = await this.getSslClient();
|
return await this.doRequest("DeployCertificateInstance", params);
|
||||||
const res = await client.DeployCertificateInstance(params);
|
|
||||||
this.checkRet(res);
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async DescribeHostUploadUpdateRecordDetail(params: any) {
|
async DescribeHostUploadUpdateRecordDetail(params: any) {
|
||||||
const client = await this.getSslClient();
|
return await this.doRequest("DescribeHostUploadUpdateRecordDetail", params);
|
||||||
const res = await client.request("DescribeHostUploadUpdateRecordDetail", params);
|
|
||||||
this.checkRet(res);
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async UploadUpdateCertificateInstance(params: any) {
|
async UploadUpdateCertificateInstance(params: any) {
|
||||||
const client = await this.getSslClient();
|
return await this.doRequest("UploadUpdateCertificateInstance", params);
|
||||||
const res = await client.request("UploadUpdateCertificateInstance", params);
|
|
||||||
this.checkRet(res);
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async DescribeCertificates(params: { Limit?: number; Offset?: number; SearchKey?: string }) {
|
async DescribeCertificates(params: { Limit?: number; Offset?: number; SearchKey?: string }) {
|
||||||
const client = await this.getSslClient();
|
return await this.doRequest("DescribeCertificates", {
|
||||||
const res = await client.DescribeCertificates({
|
|
||||||
ExpirationSort: "ASC",
|
ExpirationSort: "ASC",
|
||||||
...params,
|
...params,
|
||||||
});
|
});
|
||||||
this.checkRet(res);
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async doRequest(action: string, params: any) {
|
async doRequest(action: string, params: any) {
|
||||||
const client = await this.getSslClient();
|
const client = await this.getSslClient();
|
||||||
if (!client[action]) {
|
try {
|
||||||
throw new Error(`action ${action} not found`);
|
const res = await client.request(action, params);
|
||||||
|
this.checkRet(res);
|
||||||
|
return res;
|
||||||
|
} catch (e) {
|
||||||
|
this.logger.error(`action ${action} error: ${e.message},requestId=${e.RequestId}`);
|
||||||
|
throw e;
|
||||||
}
|
}
|
||||||
const res = await client[action](params);
|
|
||||||
this.checkRet(res);
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,44 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.15](https://github.com/certd/certd/compare/v1.37.14...v1.37.15) (2025-12-06)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 第三方登录支持gitee ([5cee7d4](https://github.com/certd/certd/commit/5cee7d44f17bd36972f477bc1f270999da558d05))
|
||||||
|
|
||||||
|
## [1.37.14](https://github.com/certd/certd/compare/v1.37.13...v1.37.14) (2025-12-02)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复注销登录时,第三方登录注销请求失败的报错 ([677e110](https://github.com/certd/certd/commit/677e1101e6cf4451abd8a876cc1d0ddd26a10b88))
|
||||||
|
|
||||||
|
## [1.37.13](https://github.com/certd/certd/compare/v1.37.12...v1.37.13) (2025-12-02)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 第三方登录允许选择logo ([bb3085e](https://github.com/certd/certd/commit/bb3085ef84201ccd2dc632ba8c5097cb00258be4))
|
||||||
|
* 支持OIDC单点登录 ([fbf12f1](https://github.com/certd/certd/commit/fbf12f16b5eaa7676fd41923587bf6bd2595adba))
|
||||||
|
|
||||||
|
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持微信扫码登录 ([73325aa](https://github.com/certd/certd/commit/73325aaefb0e750a22aaac40929e7bf3f5864996))
|
||||||
|
* 支持证书颁发机构 LiteSSL ([6be7591](https://github.com/certd/certd/commit/6be75913324e2828d9016eb307ff2d0abbbb2191))
|
||||||
|
|
||||||
|
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复备注撑开表格行高的bug ([c7b298c](https://github.com/certd/certd/commit/c7b298c46f0d52b43bd2bb17b374e7970a446446))
|
||||||
|
* 修复域名管理无法创建tencent-eo dns授权的bug ([3406bb5](https://github.com/certd/certd/commit/3406bb5a4a56bb310cddc1a1f410c70909fd129b))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化天翼云cdn 等待5秒部署完成 ([53c88ad](https://github.com/certd/certd/commit/53c88ad5afe66a3f7c38b9b759747918913a4edc))
|
||||||
|
* 支持oidc单点登录 ([ec75afb](https://github.com/certd/certd/commit/ec75afbc44139dbe9da534d8a8c08a5b91f86d3c))
|
||||||
|
|
||||||
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
||||||
|
|
||||||
### Performance Improvements
|
### Performance Improvements
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/ui-client",
|
"name": "@certd/ui-client",
|
||||||
"version": "1.37.10",
|
"version": "1.37.15",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite --open",
|
"dev": "vite --open",
|
||||||
@@ -33,11 +33,11 @@
|
|||||||
"@aws-sdk/s3-request-presigner": "^3.535.0",
|
"@aws-sdk/s3-request-presigner": "^3.535.0",
|
||||||
"@certd/vue-js-cron-light": "^4.0.14",
|
"@certd/vue-js-cron-light": "^4.0.14",
|
||||||
"@ctrl/tinycolor": "^4.1.0",
|
"@ctrl/tinycolor": "^4.1.0",
|
||||||
"@fast-crud/editor-code": "^1.27.4",
|
"@fast-crud/editor-code": "^1.27.7",
|
||||||
"@fast-crud/fast-crud": "^1.27.4",
|
"@fast-crud/fast-crud": "^1.27.7",
|
||||||
"@fast-crud/fast-extends": "^1.27.4",
|
"@fast-crud/fast-extends": "^1.27.7",
|
||||||
"@fast-crud/ui-antdv4": "^1.27.4",
|
"@fast-crud/ui-antdv4": "^1.27.7",
|
||||||
"@fast-crud/ui-interface": "^1.27.4",
|
"@fast-crud/ui-interface": "^1.27.7",
|
||||||
"@iconify/tailwind": "^1.2.0",
|
"@iconify/tailwind": "^1.2.0",
|
||||||
"@iconify/vue": "^4.1.1",
|
"@iconify/vue": "^4.1.1",
|
||||||
"@manypkg/get-packages": "^2.2.2",
|
"@manypkg/get-packages": "^2.2.2",
|
||||||
@@ -106,8 +106,8 @@
|
|||||||
"zod-defaults": "^0.1.3"
|
"zod-defaults": "^0.1.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@certd/lib-iframe": "^1.37.10",
|
"@certd/lib-iframe": "^1.37.15",
|
||||||
"@certd/pipeline": "^1.37.10",
|
"@certd/pipeline": "^1.37.15",
|
||||||
"@rollup/plugin-commonjs": "^25.0.7",
|
"@rollup/plugin-commonjs": "^25.0.7",
|
||||||
"@rollup/plugin-node-resolve": "^15.2.3",
|
"@rollup/plugin-node-resolve": "^15.2.3",
|
||||||
"@types/chai": "^4.3.12",
|
"@types/chai": "^4.3.12",
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 142 KiB |
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 36 KiB |
@@ -47,11 +47,12 @@ function createService() {
|
|||||||
//如果不需要解包
|
//如果不需要解包
|
||||||
return dataAxios;
|
return dataAxios;
|
||||||
}
|
}
|
||||||
|
//@ts-ignore
|
||||||
|
const showErrorNotify = response?.config?.showErrorNotify;
|
||||||
// 这个状态码是和后端约定的
|
// 这个状态码是和后端约定的
|
||||||
if (dataAxios?.code === undefined) {
|
if (dataAxios?.code === undefined) {
|
||||||
// 如果没有 code 代表这不是项目后端开发的接口
|
// 如果没有 code 代表这不是项目后端开发的接口
|
||||||
errorCreate(`非标准返回:${dataAxios}, ${response.config.url}`);
|
errorCreate(`非标准返回:${dataAxios}, ${response.config.url}`, showErrorNotify);
|
||||||
return dataAxios;
|
return dataAxios;
|
||||||
}
|
}
|
||||||
const { code } = dataAxios;
|
const { code } = dataAxios;
|
||||||
@@ -70,8 +71,6 @@ function createService() {
|
|||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
response.config.onError(err);
|
response.config.onError(err);
|
||||||
}
|
}
|
||||||
//@ts-ignore
|
|
||||||
const showErrorNotify = response?.config?.showErrorNotify;
|
|
||||||
errorCreate(`${errorMessage}: ${response.config.url}`, showErrorNotify, dataAxios);
|
errorCreate(`${errorMessage}: ${response.config.url}`, showErrorNotify, dataAxios);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ export function errorLog(error: any, notify = true) {
|
|||||||
* @description 创建一个错误
|
* @description 创建一个错误
|
||||||
*/
|
*/
|
||||||
export function errorCreate(msg: string, notify = true, data?: any) {
|
export function errorCreate(msg: string, notify = true, data?: any) {
|
||||||
const err = new CodeError(msg, data.code, data.data);
|
const err = new CodeError(msg, data?.code || 1, data?.data);
|
||||||
console.error("errorCreate", err);
|
console.error("errorCreate", err);
|
||||||
if (notify) {
|
if (notify) {
|
||||||
uiContext.get().notification.error({ message: err.message });
|
uiContext.get().notification.error({ message: err.message });
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ const steps = ref<Step[]>([
|
|||||||
{
|
{
|
||||||
image: "/static/doc/images/15-1-email.png",
|
image: "/static/doc/images/15-1-email.png",
|
||||||
title: t("guide.scheduleAndEmailTask.setEmailNotification"),
|
title: t("guide.scheduleAndEmailTask.setEmailNotification"),
|
||||||
descriptions: [t("guide.scheduleAndEmailTask.suggestErrorAndRecoveryEmails"), t("guide.scheduleAndEmailTask.basicVersionNeedsMailServer")],
|
descriptions: [t("guide.scheduleAndEmailTask.suggestErrorAndRecoveryEmails")],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: t("guide.scheduleAndEmailTask.tutorialEndTitle"),
|
title: t("guide.scheduleAndEmailTask.tutorialEndTitle"),
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ provide("fn:ai.open", openChat);
|
|||||||
<LockScreen :avatar @to-login="handleLogout" />
|
<LockScreen :avatar @to-login="handleLogout" />
|
||||||
</template>
|
</template>
|
||||||
<template #header-right-0>
|
<template #header-right-0>
|
||||||
<div v-if="!settingStore.isComm" class="hover:bg-accent ml-1 mr-2 cursor-pointer rounded-full hidden md:block">
|
<div class="hover:bg-accent ml-1 mr-2 cursor-pointer rounded-full hidden md:block">
|
||||||
<tutorial-button class="flex-center header-btn" />
|
<tutorial-button class="flex-center header-btn" />
|
||||||
</div>
|
</div>
|
||||||
<div class="hover:bg-accent ml-1 mr-2 cursor-pointer rounded-full">
|
<div class="hover:bg-accent ml-1 mr-2 cursor-pointer rounded-full">
|
||||||
|
|||||||
@@ -75,7 +75,7 @@
|
|||||||
<div>
|
<div>
|
||||||
<span v-if="!settingStore.isComm">
|
<span v-if="!settingStore.isComm">
|
||||||
<span>Powered by</span>
|
<span>Powered by</span>
|
||||||
<a> handsfree.work </a>
|
<a> handfree.work </a>
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<template v-if="siteInfo.licenseTo">
|
<template v-if="siteInfo.licenseTo">
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<template>
|
<template>
|
||||||
<div id="userLayout" :class="['user-layout-wrapper']">
|
<div id="userLayout" :class="['user-layout-wrapper']">
|
||||||
<div class="login-container flex-center">
|
<div class="login-container flex justify-start">
|
||||||
<div class="user-layout-content flex-center flex-col">
|
<div class="user-layout-content flex-col justify-start">
|
||||||
<div class="top flex flex-col items-center justify-center">
|
<div class="top flex flex-col items-center justify-start">
|
||||||
<div class="header flex flex-row items-center">
|
<div class="header flex flex-row items-center">
|
||||||
<img :src="siteInfo.loginLogo" class="logo" alt="logo" />
|
<img :src="siteInfo.loginLogo" class="logo" alt="logo" />
|
||||||
<span class="title"></span>
|
<span class="title"></span>
|
||||||
@@ -10,8 +10,9 @@
|
|||||||
<div class="desc">{{ siteInfo.slogan }}</div>
|
<div class="desc">{{ siteInfo.slogan }}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<router-view />
|
<div class="flex-1 flex flex-col justify-start items-center">
|
||||||
|
<router-view />
|
||||||
|
</div>
|
||||||
<div class="footer">
|
<div class="footer">
|
||||||
<div class="copyright">
|
<div class="copyright">
|
||||||
<span v-if="!settingStore.isComm">
|
<span v-if="!settingStore.isComm">
|
||||||
@@ -73,6 +74,7 @@ const sysPublic: Ref<SysPublicSetting> = computed(() => {
|
|||||||
.login-container {
|
.login-container {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
overflow: auto;
|
||||||
background: #f0f2f5 url(/static/background.svg) no-repeat 50%;
|
background: #f0f2f5 url(/static/background.svg) no-repeat 50%;
|
||||||
background-size: 100%;
|
background-size: 100%;
|
||||||
//padding: 50px 0 84px;
|
//padding: 50px 0 84px;
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ export default {
|
|||||||
passwordPlaceholder: "Please enter your password",
|
passwordPlaceholder: "Please enter your password",
|
||||||
mobilePlaceholder: "Please enter your mobile number",
|
mobilePlaceholder: "Please enter your mobile number",
|
||||||
loginButton: "Log In",
|
loginButton: "Log In",
|
||||||
|
bindButton: "Bind Account",
|
||||||
forgotPassword: "Forgot password?",
|
forgotPassword: "Forgot password?",
|
||||||
forgotAdminPassword: "Forgot admin password?",
|
forgotAdminPassword: "Forgot admin password?",
|
||||||
registerLink: "Register",
|
registerLink: "Register",
|
||||||
@@ -83,4 +84,6 @@ export default {
|
|||||||
phoneNumber: "Phone Number",
|
phoneNumber: "Phone Number",
|
||||||
changePassword: "Change Password",
|
changePassword: "Change Password",
|
||||||
updateProfile: "Update Profile",
|
updateProfile: "Update Profile",
|
||||||
|
oauthLoginTitle: "Other ways of login",
|
||||||
|
oauthOnlyLoginTitle: "Login",
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -743,6 +743,8 @@ export default {
|
|||||||
paymentSetting: "Payment Settings",
|
paymentSetting: "Payment Settings",
|
||||||
captchaSetting: "Captcha Setting",
|
captchaSetting: "Captcha Setting",
|
||||||
pipelineSetting: "Pipeline Settings",
|
pipelineSetting: "Pipeline Settings",
|
||||||
|
oauthSetting: "OAuth2 Settings",
|
||||||
|
|
||||||
showRunStrategy: "Show RunStrategy",
|
showRunStrategy: "Show RunStrategy",
|
||||||
showRunStrategyHelper: "Allow modify the run strategy of the task",
|
showRunStrategyHelper: "Allow modify the run strategy of the task",
|
||||||
|
|
||||||
@@ -760,6 +762,24 @@ export default {
|
|||||||
fixedCertExpireDays: "Fixed Cert Expire Days",
|
fixedCertExpireDays: "Fixed Cert Expire Days",
|
||||||
fixedCertExpireDaysHelper: "Fixed cert expiration days, helpful for table list progress bar display",
|
fixedCertExpireDaysHelper: "Fixed cert expiration days, helpful for table list progress bar display",
|
||||||
fixedCertExpireDaysRecommend: "Recommend 90",
|
fixedCertExpireDaysRecommend: "Recommend 90",
|
||||||
|
|
||||||
|
enableOauth: "Enable OAuth2 Login",
|
||||||
|
oauthEnabledHelper: "Whether to enable OAuth2 login",
|
||||||
|
oauthProviders: "OAuth2 Login Providers",
|
||||||
|
oauthType: "OAuth2 Login Type",
|
||||||
|
oauthConfig: "OAuth2 Login Config",
|
||||||
|
oauthProviderSelectorPlaceholder: "Not Configured",
|
||||||
|
oauthCallback: "Callback URL",
|
||||||
|
oauthCallbackHelper: "Copy this URL to the callback address of the OAuth2 login provider",
|
||||||
|
oauthCallbackCopy: "Copy Callback URL",
|
||||||
|
oauthAutoRegister: "Auto Register User",
|
||||||
|
oauthAutoRegisterCheckedText: "Auto Register",
|
||||||
|
oauthAutoRegisterUnCheckedText: "User Select",
|
||||||
|
oauthAutoRegisterHelper: "Whether to auto register user when login",
|
||||||
|
oauthAutoRedirect: "Auto Redirect to OAuth2 Login",
|
||||||
|
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",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
modal: {
|
modal: {
|
||||||
|
|||||||
@@ -64,7 +64,6 @@ export default {
|
|||||||
recommendDailyRun: "Recommend configuring to run once daily; new certs requested 35 days before expiry and auto-skipped otherwise",
|
recommendDailyRun: "Recommend configuring to run once daily; new certs requested 35 days before expiry and auto-skipped otherwise",
|
||||||
setEmailNotification: "Set Email Notifications",
|
setEmailNotification: "Set Email Notifications",
|
||||||
suggestErrorAndRecoveryEmails: "Suggest listening for 'On Error' and 'Error to Success' to quickly troubleshoot failures (basic version requires mail server setup)",
|
suggestErrorAndRecoveryEmails: "Suggest listening for 'On Error' and 'Error to Success' to quickly troubleshoot failures (basic version requires mail server setup)",
|
||||||
basicVersionNeedsMailServer: "(basic version requires configuring mail server)",
|
|
||||||
tutorialEndTitle: "Tutorial End",
|
tutorialEndTitle: "Tutorial End",
|
||||||
thanksForWatching: "Thank you for watching, hope it helps you",
|
thanksForWatching: "Thank you for watching, hope it helps you",
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ export default {
|
|||||||
passwordPlaceholder: "请输入密码",
|
passwordPlaceholder: "请输入密码",
|
||||||
mobilePlaceholder: "请输入手机号",
|
mobilePlaceholder: "请输入手机号",
|
||||||
loginButton: "登录",
|
loginButton: "登录",
|
||||||
|
bindButton: "绑定账号",
|
||||||
forgotPassword: "忘记密码?",
|
forgotPassword: "忘记密码?",
|
||||||
forgotAdminPassword: "忘记管理员密码?",
|
forgotAdminPassword: "忘记管理员密码?",
|
||||||
registerLink: "注册",
|
registerLink: "注册",
|
||||||
@@ -84,4 +85,7 @@ export default {
|
|||||||
phoneNumber: "手机号",
|
phoneNumber: "手机号",
|
||||||
changePassword: "修改密码",
|
changePassword: "修改密码",
|
||||||
updateProfile: "修改个人信息",
|
updateProfile: "修改个人信息",
|
||||||
|
|
||||||
|
oauthLoginTitle: "其他登录方式",
|
||||||
|
oauthOnlyLoginTitle: "登录",
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -604,7 +604,7 @@ export default {
|
|||||||
limitUserPipelineCountHelper: "0为不限制",
|
limitUserPipelineCountHelper: "0为不限制",
|
||||||
enableSelfRegistration: "开启自助注册",
|
enableSelfRegistration: "开启自助注册",
|
||||||
enableUserValidityPeriod: "开启用户有效期",
|
enableUserValidityPeriod: "开启用户有效期",
|
||||||
userValidityPeriodHelper: "有效期内用户可正常使用,失效后流水线将被停用",
|
userValidityPeriodHelper: "有效期内用户可正常使用,失效后用户的流水线将被停用",
|
||||||
enableUsernameRegistration: "开启用户名注册",
|
enableUsernameRegistration: "开启用户名注册",
|
||||||
enableEmailRegistration: "开启邮箱注册",
|
enableEmailRegistration: "开启邮箱注册",
|
||||||
proFeature: "专业版功能",
|
proFeature: "专业版功能",
|
||||||
@@ -743,6 +743,7 @@ export default {
|
|||||||
paymentSetting: "支付设置",
|
paymentSetting: "支付设置",
|
||||||
captchaSetting: "验证码设置",
|
captchaSetting: "验证码设置",
|
||||||
pipelineSetting: "流水线设置",
|
pipelineSetting: "流水线设置",
|
||||||
|
oauthSetting: "第三方登录",
|
||||||
|
|
||||||
showRunStrategy: "显示运行策略选择",
|
showRunStrategy: "显示运行策略选择",
|
||||||
showRunStrategyHelper: "任务设置中是否允许选择运行策略",
|
showRunStrategyHelper: "任务设置中是否允许选择运行策略",
|
||||||
@@ -761,6 +762,24 @@ export default {
|
|||||||
fixedCertExpireDays: "固定证书有效期天数",
|
fixedCertExpireDays: "固定证书有效期天数",
|
||||||
fixedCertExpireDaysHelper: "固定证书有效期天数,有助于列表进度条整齐显示",
|
fixedCertExpireDaysHelper: "固定证书有效期天数,有助于列表进度条整齐显示",
|
||||||
fixedCertExpireDaysRecommend: "推荐90",
|
fixedCertExpireDaysRecommend: "推荐90",
|
||||||
|
|
||||||
|
enableOauth: "启用第三方登录",
|
||||||
|
oauthEnabledHelper: "是否启用第三方登录",
|
||||||
|
oauthProviders: "第三方登录提供商",
|
||||||
|
oauthType: "第三方登录类型",
|
||||||
|
oauthConfig: "第三方登录配置",
|
||||||
|
oauthProviderSelectorPlaceholder: "未配置",
|
||||||
|
oauthCallback: "回调地址",
|
||||||
|
oauthCallbackHelper: "复制回调地址,配置到对应提供商的回调地址中",
|
||||||
|
oauthCallbackCopy: "复制回调地址",
|
||||||
|
oauthAutoRegister: "自动注册用户",
|
||||||
|
oauthAutoRegisterHelper: "当第三方账户未绑定本站账号时,是否自动注册用户,默认由用户选择",
|
||||||
|
oauthAutoRegisterCheckedText: "自动注册",
|
||||||
|
oauthAutoRegisterUnCheckedText: "用户选择",
|
||||||
|
oauthAutoRedirect: "自动跳转第三方登录",
|
||||||
|
oauthAutoRedirectHelper: "是否自动跳转第三方登录(使用第一个已启用的第三方登录类型)",
|
||||||
|
oauthOnly: "仅使用第三方登录",
|
||||||
|
oauthOnlyHelper: "是否仅使用第三方登录,关闭密码登录(注意:请务必在测试第三方登录功能正常后再开启)",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
modal: {
|
modal: {
|
||||||
|
|||||||
@@ -61,10 +61,9 @@ export default {
|
|||||||
description: "自动运行",
|
description: "自动运行",
|
||||||
setSchedule: "设置定时执行",
|
setSchedule: "设置定时执行",
|
||||||
pipelineSuccessThenSchedule: "流水线测试成功,接下来配置定时触发,以后每天定时执行就不用管了",
|
pipelineSuccessThenSchedule: "流水线测试成功,接下来配置定时触发,以后每天定时执行就不用管了",
|
||||||
recommendDailyRun: "推荐配置每天运行一次,在到期前35天才会重新申请新证书并部署,没到期前会自动跳过,不会重复申请。",
|
recommendDailyRun: "推荐配置每天运行一次,默认到期前35天会重新申请新证书并部署,没到期前会自动跳过,不会重复申请。",
|
||||||
setEmailNotification: "设置邮件通知",
|
setEmailNotification: "设置邮件通知",
|
||||||
suggestErrorAndRecoveryEmails: "建议选择监听'错误时'和'错误转成功'两种即可,在意外失败时可以尽快去排查问题,(基础版需要配置邮件服务器)",
|
suggestErrorAndRecoveryEmails: "建议选择监听'错误时'和'错误转成功'两种即可,在意外失败时可以尽快去排查问题",
|
||||||
basicVersionNeedsMailServer: "(基础版需要配置邮件服务器)",
|
|
||||||
tutorialEndTitle: "教程结束",
|
tutorialEndTitle: "教程结束",
|
||||||
thanksForWatching: "感谢观看,希望对你有所帮助",
|
thanksForWatching: "感谢观看,希望对你有所帮助",
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -32,6 +32,14 @@ export const outsideResource = [
|
|||||||
path: "/forgotPassword",
|
path: "/forgotPassword",
|
||||||
component: "/framework/forgot-password/index.vue",
|
component: "/framework/forgot-password/index.vue",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
meta: {
|
||||||
|
title: "第三方登录回调",
|
||||||
|
},
|
||||||
|
name: "oauthCallback",
|
||||||
|
path: "/oauth/callback/:type",
|
||||||
|
component: "/framework/oauth/oauth-callback.vue",
|
||||||
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
...errorPage,
|
...errorPage,
|
||||||
|
|||||||
@@ -59,6 +59,24 @@ export type SysPublicSetting = {
|
|||||||
|
|
||||||
// 固定证书有效期天数,0表示不固定
|
// 固定证书有效期天数,0表示不固定
|
||||||
fixedCertExpireDays?: number;
|
fixedCertExpireDays?: number;
|
||||||
|
|
||||||
|
// 第三方OAuth配置
|
||||||
|
oauthEnabled?: boolean;
|
||||||
|
// 是否自动注册用户
|
||||||
|
oauthAutoRegister?: boolean;
|
||||||
|
// 是否自动跳转第三方登录
|
||||||
|
oauthAutoRedirect?: boolean;
|
||||||
|
// 是否仅允许使用第三方登录
|
||||||
|
oauthOnly?: boolean;
|
||||||
|
// 第三方OAuth登录提供者配置
|
||||||
|
oauthProviders?: Record<
|
||||||
|
string,
|
||||||
|
{
|
||||||
|
type: string;
|
||||||
|
title: string;
|
||||||
|
addonId: number;
|
||||||
|
}
|
||||||
|
>;
|
||||||
};
|
};
|
||||||
export type SuiteSetting = {
|
export type SuiteSetting = {
|
||||||
enabled?: boolean;
|
enabled?: boolean;
|
||||||
|
|||||||
@@ -100,3 +100,10 @@ export async function loginByTwoFactor(data: any) {
|
|||||||
data,
|
data,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function OauthProviders() {
|
||||||
|
return await request({
|
||||||
|
url: "/oauth/providers",
|
||||||
|
method: "post",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import { mitter } from "/src/utils/util.mitt";
|
|||||||
import { resetAllStores, useAccessStore } from "/@/vben/stores";
|
import { resetAllStores, useAccessStore } from "/@/vben/stores";
|
||||||
|
|
||||||
import { useUserStore as vbenUserStore } from "/@/vben/stores/modules/user";
|
import { useUserStore as vbenUserStore } from "/@/vben/stores/modules/user";
|
||||||
|
import { request } from "/@/api/service";
|
||||||
|
|
||||||
interface UserState {
|
interface UserState {
|
||||||
userInfo: Nullable<UserInfoRes>;
|
userInfo: Nullable<UserInfoRes>;
|
||||||
@@ -116,15 +117,39 @@ export const useUserStore = defineStore({
|
|||||||
* @description: logout
|
* @description: logout
|
||||||
*/
|
*/
|
||||||
async logout(goLogin = true, from401 = false) {
|
async logout(goLogin = true, from401 = false) {
|
||||||
|
if (!from401 && this.getToken) {
|
||||||
|
try {
|
||||||
|
await UserApi.logout(); //主要是清空cookie
|
||||||
|
} catch (e) {
|
||||||
|
console.error("注销登录请求失败:", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
this.resetState();
|
this.resetState();
|
||||||
resetAllStores();
|
resetAllStores();
|
||||||
if (!from401) {
|
// 第三方登录注销
|
||||||
await UserApi.logout(); //主要是清空cookie
|
await this.oauthLogout();
|
||||||
}
|
|
||||||
goLogin && router.push("/login");
|
goLogin && router.push("/login");
|
||||||
mitter.emit("app.logout");
|
mitter.emit("app.logout");
|
||||||
},
|
},
|
||||||
|
|
||||||
|
async oauthLogout() {
|
||||||
|
const providers = await UserApi.OauthProviders();
|
||||||
|
for (const provider of providers) {
|
||||||
|
if (provider.logoutUrl) {
|
||||||
|
try {
|
||||||
|
await request({
|
||||||
|
url: provider.logoutUrl,
|
||||||
|
method: "get",
|
||||||
|
withCredentials: true,
|
||||||
|
showErrorNotify: false,
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
console.error("注销第三方登录失败:", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
/**
|
/**
|
||||||
* @description: Confirm before logging out
|
* @description: Confirm before logging out
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="addon-selector">
|
<div class="addon-selector">
|
||||||
<div class="flex-o w-100">
|
<div class="flex-o w-100 inner">
|
||||||
<!-- <fs-dict-select class="flex-1" :value="modelValue" :dict="optionsDictRef" :disabled="disabled" :render-label="renderLabel" :slots="selectSlots" :allow-clear="true" v-bind="select" @update:value="onChange" />-->
|
<!-- <fs-dict-select class="flex-1" :value="modelValue" :dict="optionsDictRef" :disabled="disabled" :render-label="renderLabel" :slots="selectSlots" :allow-clear="true" v-bind="select" @update:value="onChange" />-->
|
||||||
<span v-if="modelValue" class="mr-5 cd-flex-inline">
|
<span v-if="modelValue" class="mr-5 cd-flex-inline">
|
||||||
<a-tag class="mr-5" color="green">{{ target?.name || modelValue }}</a-tag>
|
<a-tag class="mr-5" color="green">{{ target?.name || modelValue }}</a-tag>
|
||||||
@@ -82,6 +82,7 @@ function createCrudOptionsWithApi(opts: any) {
|
|||||||
opts.context = {
|
opts.context = {
|
||||||
api,
|
api,
|
||||||
addonType: props.addonType,
|
addonType: props.addonType,
|
||||||
|
type: props.type,
|
||||||
};
|
};
|
||||||
return createCrudOptions(opts);
|
return createCrudOptions(opts);
|
||||||
}
|
}
|
||||||
@@ -174,5 +175,9 @@ async function doRefresh() {
|
|||||||
<style lang="less">
|
<style lang="less">
|
||||||
.addon-selector {
|
.addon-selector {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
.inner {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -110,7 +110,8 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any, a
|
|||||||
type: "dict-select",
|
type: "dict-select",
|
||||||
dict: addonTypeDictRef,
|
dict: addonTypeDictRef,
|
||||||
search: {
|
search: {
|
||||||
show: false,
|
show: true,
|
||||||
|
valueChange: null,
|
||||||
},
|
},
|
||||||
column: {
|
column: {
|
||||||
width: 200,
|
width: 200,
|
||||||
@@ -120,7 +121,14 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any, a
|
|||||||
},
|
},
|
||||||
editForm: {
|
editForm: {
|
||||||
component: {
|
component: {
|
||||||
disabled: false,
|
disabled: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
addForm: {
|
||||||
|
component: {
|
||||||
|
disabled: compute(({ form }) => {
|
||||||
|
return form.type ? true : false;
|
||||||
|
}),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
form: {
|
form: {
|
||||||
|
|||||||
@@ -5,7 +5,12 @@ import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, EditReq,
|
|||||||
export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
|
export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
|
||||||
const api = context.api;
|
const api = context.api;
|
||||||
const addonType = context.addonType;
|
const addonType = context.addonType;
|
||||||
|
const type = context.type;
|
||||||
const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
|
const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
|
||||||
|
if (query.query?.body) {
|
||||||
|
delete query.query.body;
|
||||||
|
}
|
||||||
|
|
||||||
return await api.GetList(query);
|
return await api.GetList(query);
|
||||||
};
|
};
|
||||||
const editRequest = async (req: EditReq) => {
|
const editRequest = async (req: EditReq) => {
|
||||||
@@ -35,6 +40,12 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
|
|||||||
editRequest,
|
editRequest,
|
||||||
delRequest,
|
delRequest,
|
||||||
},
|
},
|
||||||
|
search: {
|
||||||
|
initialForm: {
|
||||||
|
addonType: addonType,
|
||||||
|
type: type,
|
||||||
|
},
|
||||||
|
},
|
||||||
form: {
|
form: {
|
||||||
labelCol: {
|
labelCol: {
|
||||||
//固定label宽度
|
//固定label宽度
|
||||||
@@ -44,6 +55,12 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
addForm: {
|
||||||
|
initialForm: {
|
||||||
|
addonType: addonType,
|
||||||
|
type: type,
|
||||||
|
},
|
||||||
|
},
|
||||||
rowHandle: {
|
rowHandle: {
|
||||||
width: 200,
|
width: 200,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -184,7 +184,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
|
|||||||
name: "AccessSelector",
|
name: "AccessSelector",
|
||||||
vModel: "modelValue",
|
vModel: "modelValue",
|
||||||
type: compute(({ form }) => {
|
type: compute(({ form }) => {
|
||||||
return form.dnsProviderType;
|
const type = form.dnsProviderType || "aliyun";
|
||||||
|
return dnsProviderTypeDict?.dataMap[type]?.accessType;
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
show: compute(({ form }) => {
|
show: compute(({ form }) => {
|
||||||
|
|||||||
@@ -22,3 +22,36 @@ export async function UpdateProfile(form: any) {
|
|||||||
data: form,
|
data: form,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function GetOauthBounds() {
|
||||||
|
return await request({
|
||||||
|
url: "/oauth/bounds",
|
||||||
|
method: "POST",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function GetOauthProviders() {
|
||||||
|
return await request({
|
||||||
|
url: "/oauth/providers",
|
||||||
|
method: "POST",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function UnbindOauth(type: string) {
|
||||||
|
return await request({
|
||||||
|
url: "/oauth/unbind",
|
||||||
|
method: "POST",
|
||||||
|
data: { type },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function OauthBoundUrl(type: string) {
|
||||||
|
return await request({
|
||||||
|
url: "/oauth/login",
|
||||||
|
method: "POST",
|
||||||
|
data: {
|
||||||
|
type,
|
||||||
|
forType: "bind",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|||||||
@@ -15,7 +15,16 @@
|
|||||||
</a-descriptions-item>
|
</a-descriptions-item>
|
||||||
<a-descriptions-item :label="t('authentication.email')">{{ userInfo.email }}</a-descriptions-item>
|
<a-descriptions-item :label="t('authentication.email')">{{ userInfo.email }}</a-descriptions-item>
|
||||||
<a-descriptions-item :label="t('authentication.phoneNumber')">{{ userInfo.phoneCode }}{{ userInfo.mobile }}</a-descriptions-item>
|
<a-descriptions-item :label="t('authentication.phoneNumber')">{{ userInfo.phoneCode }}{{ userInfo.mobile }}</a-descriptions-item>
|
||||||
<a-descriptions-item></a-descriptions-item>
|
<a-descriptions-item v-if="settingStore.sysPublic.oauthEnabled && settingStore.isPlus" label="第三方账号绑定">
|
||||||
|
<template v-for="item in computedOauthBounds" :key="item.name">
|
||||||
|
<div v-if="item.addonId" class="flex items-center gap-2 mb-2">
|
||||||
|
<fs-icon :icon="item.icon" class="mr-2 text-blue-500 w-5 flex justify-center items-center" />
|
||||||
|
<span class="mr-2 w-36">{{ item.title }}</span>
|
||||||
|
<a-button v-if="item.bound" type="primary" danger @click="unbind(item.name)">解绑</a-button>
|
||||||
|
<a-button v-else type="primary" @click="bind(item.name)">绑定</a-button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</a-descriptions-item>
|
||||||
<a-descriptions-item :label="t('common.handle')">
|
<a-descriptions-item :label="t('common.handle')">
|
||||||
<a-button type="primary" @click="doUpdate">{{ t("authentication.updateProfile") }}</a-button>
|
<a-button type="primary" @click="doUpdate">{{ t("authentication.updateProfile") }}</a-button>
|
||||||
<change-password-button class="ml-10" :show-button="true"> </change-password-button>
|
<change-password-button class="ml-10" :show-button="true"> </change-password-button>
|
||||||
@@ -27,10 +36,13 @@
|
|||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import * as api from "./api";
|
import * as api from "./api";
|
||||||
import { Ref, ref } from "vue";
|
import { computed, onMounted, Ref, ref } from "vue";
|
||||||
import ChangePasswordButton from "/@/views/certd/mine/change-password-button.vue";
|
import ChangePasswordButton from "/@/views/certd/mine/change-password-button.vue";
|
||||||
import { useI18n } from "/src/locales";
|
import { useI18n } from "/src/locales";
|
||||||
import { useUserProfile } from "./use";
|
import { useUserProfile } from "./use";
|
||||||
|
import { Modal } from "ant-design-vue";
|
||||||
|
import { useSettingStore } from "/@/store/settings";
|
||||||
|
import { isEmpty } from "lodash-es";
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
@@ -38,13 +50,13 @@ defineOptions({
|
|||||||
name: "UserProfile",
|
name: "UserProfile",
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const settingStore = useSettingStore();
|
||||||
|
|
||||||
const userInfo: Ref = ref({});
|
const userInfo: Ref = ref({});
|
||||||
|
|
||||||
const getUserInfo = async () => {
|
const getUserInfo = async () => {
|
||||||
userInfo.value = await api.getMineInfo();
|
userInfo.value = await api.getMineInfo();
|
||||||
};
|
};
|
||||||
getUserInfo();
|
|
||||||
|
|
||||||
const { openEditProfileDialog } = useUserProfile();
|
const { openEditProfileDialog } = useUserProfile();
|
||||||
|
|
||||||
function doUpdate() {
|
function doUpdate() {
|
||||||
@@ -54,4 +66,51 @@ function doUpdate() {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const oauthBounds = ref([]);
|
||||||
|
const oauthProviders = ref([]);
|
||||||
|
async function loadOauthBounds() {
|
||||||
|
const res = await api.GetOauthBounds();
|
||||||
|
oauthBounds.value = res;
|
||||||
|
}
|
||||||
|
async function loadOauthProviders() {
|
||||||
|
const res = await api.GetOauthProviders();
|
||||||
|
oauthProviders.value = res;
|
||||||
|
}
|
||||||
|
|
||||||
|
const computedOauthBounds = computed(() => {
|
||||||
|
const list = oauthProviders.value.map(item => {
|
||||||
|
const bound = oauthBounds.value.find(bound => bound.type === item.name);
|
||||||
|
return {
|
||||||
|
...item,
|
||||||
|
bound,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
return list;
|
||||||
|
});
|
||||||
|
|
||||||
|
async function unbind(type: string) {
|
||||||
|
Modal.confirm({
|
||||||
|
title: "确认解绑吗?",
|
||||||
|
okText: "确认",
|
||||||
|
okType: "danger",
|
||||||
|
onOk: async () => {
|
||||||
|
await api.UnbindOauth(type);
|
||||||
|
await loadOauthBounds();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function bind(type: string) {
|
||||||
|
//获取第三方登录URL
|
||||||
|
const res = await api.OauthBoundUrl(type);
|
||||||
|
const loginUrl = res.loginUrl;
|
||||||
|
window.location.href = loginUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
await getUserInfo();
|
||||||
|
await loadOauthBounds();
|
||||||
|
await loadOauthProviders();
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -559,6 +559,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
|
|||||||
column: {
|
column: {
|
||||||
width: 200,
|
width: 200,
|
||||||
sorter: true,
|
sorter: true,
|
||||||
|
ellipsis: true,
|
||||||
cellRender({ value }) {
|
cellRender({ value }) {
|
||||||
return <a-tooltip title={value}>{value}</a-tooltip>;
|
return <a-tooltip title={value}>{value}</a-tooltip>;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -350,6 +350,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
|
|||||||
show: false,
|
show: false,
|
||||||
},
|
},
|
||||||
column: {
|
column: {
|
||||||
|
ellipsis: true,
|
||||||
width: 200,
|
width: 200,
|
||||||
sorter: true,
|
sorter: true,
|
||||||
tooltip: true,
|
tooltip: true,
|
||||||
|
|||||||
@@ -15,8 +15,9 @@ import GroupSelector from "/@/views/certd/pipeline/group/group-selector.vue";
|
|||||||
import { useCertViewer } from "/@/views/certd/pipeline/use";
|
import { useCertViewer } from "/@/views/certd/pipeline/use";
|
||||||
import { useI18n } from "/src/locales";
|
import { useI18n } from "/src/locales";
|
||||||
import { GetDetail, GetObj } from "./api";
|
import { GetDetail, GetObj } from "./api";
|
||||||
|
import { groupDictRef } from "./group/dicts";
|
||||||
|
|
||||||
export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
|
export default function ({ crudExpose, context: { selectedRowKeys } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const lastResRef = ref();
|
const lastResRef = ref();
|
||||||
|
|
||||||
@@ -495,6 +496,11 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys
|
|||||||
component: {
|
component: {
|
||||||
name: GroupSelector,
|
name: GroupSelector,
|
||||||
vModel: "modelValue",
|
vModel: "modelValue",
|
||||||
|
on: {
|
||||||
|
refresh: async () => {
|
||||||
|
await groupDictRef.reloadDict();
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
column: {
|
column: {
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
import { dict } from "@fast-crud/fast-crud";
|
||||||
|
|
||||||
|
export const groupDictRef = dict({
|
||||||
|
url: "/pi/pipeline/group/all",
|
||||||
|
value: "id",
|
||||||
|
label: "name",
|
||||||
|
});
|
||||||
@@ -35,6 +35,7 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import createCrudOptions from "./crud";
|
import createCrudOptions from "./crud";
|
||||||
import { dict, FsDictSelect } from "@fast-crud/fast-crud";
|
import { dict, FsDictSelect } from "@fast-crud/fast-crud";
|
||||||
|
import { groupDictRef } from "./dicts";
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
modelValue?: number;
|
modelValue?: number;
|
||||||
@@ -43,11 +44,7 @@ const props = defineProps<{
|
|||||||
defineOptions({
|
defineOptions({
|
||||||
name: "GroupSelector",
|
name: "GroupSelector",
|
||||||
});
|
});
|
||||||
const groupDictRef = dict({
|
|
||||||
url: "/pi/pipeline/group/all",
|
|
||||||
value: "id",
|
|
||||||
label: "name",
|
|
||||||
});
|
|
||||||
const emit = defineEmits(["refresh", "update:modelValue"]);
|
const emit = defineEmits(["refresh", "update:modelValue"]);
|
||||||
function doRefresh() {
|
function doRefresh() {
|
||||||
emit("refresh");
|
emit("refresh");
|
||||||
|
|||||||
@@ -35,19 +35,14 @@ import { useI18n } from "/src/locales";
|
|||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
import ChangeNotification from "/@/views/certd/pipeline/components/change-notification.vue";
|
import ChangeNotification from "/@/views/certd/pipeline/components/change-notification.vue";
|
||||||
import { useSettingStore } from "/@/store/settings";
|
import { useSettingStore } from "/@/store/settings";
|
||||||
|
import { groupDictRef } from "./group/dicts";
|
||||||
|
|
||||||
defineOptions({
|
defineOptions({
|
||||||
name: "PipelineManager",
|
name: "PipelineManager",
|
||||||
});
|
});
|
||||||
|
|
||||||
const groupDictRef = dict({
|
|
||||||
url: "/pi/pipeline/group/all",
|
|
||||||
value: "id",
|
|
||||||
label: "name",
|
|
||||||
});
|
|
||||||
const selectedRowKeys = ref([]);
|
const selectedRowKeys = ref([]);
|
||||||
const context: any = {
|
const context: any = {
|
||||||
groupDictRef,
|
|
||||||
selectedRowKeys,
|
selectedRowKeys,
|
||||||
};
|
};
|
||||||
const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
|
const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
|
||||||
|
|||||||
@@ -2,70 +2,75 @@
|
|||||||
<div class="main login-page">
|
<div class="main login-page">
|
||||||
<a-form v-if="!twoFactor.loginId" ref="formRef" class="user-layout-login" name="custom-validation" :model="formState" v-bind="layout" @finish="handleFinish" @finish-failed="handleFinishFailed">
|
<a-form v-if="!twoFactor.loginId" ref="formRef" class="user-layout-login" name="custom-validation" :model="formState" v-bind="layout" @finish="handleFinish" @finish-failed="handleFinishFailed">
|
||||||
<!-- <div class="login-title">登录</div>-->
|
<!-- <div class="login-title">登录</div>-->
|
||||||
<a-tabs v-model:active-key="formState.loginType" :tab-bar-style="{ textAlign: 'center', borderBottom: 'unset' }">
|
<template v-if="!isOauthOnly">
|
||||||
<a-tab-pane key="password" :tab="t('authentication.passwordTab')" :disabled="sysPublicSettings.passwordLoginEnabled !== true">
|
<a-tabs v-model:active-key="formState.loginType" :tab-bar-style="{ textAlign: 'center', borderBottom: 'unset' }">
|
||||||
<template v-if="formState.loginType === 'password'">
|
<a-tab-pane key="password" :tab="t('authentication.passwordTab')" :disabled="sysPublicSettings.passwordLoginEnabled !== true">
|
||||||
<!-- <div class="login-title">登录</div>-->
|
<template v-if="formState.loginType === 'password'">
|
||||||
<a-form-item required has-feedback name="username" :rules="rules.username">
|
<!-- <div class="login-title">登录</div>-->
|
||||||
<a-input v-model:value="formState.username" :placeholder="t('authentication.usernamePlaceholder')" autocomplete="off" @keydown.enter="handleFinish">
|
<a-form-item required has-feedback name="username" :rules="rules.username">
|
||||||
<template #prefix>
|
<a-input v-model:value="formState.username" :placeholder="t('authentication.usernamePlaceholder')" autocomplete="off" @keydown.enter="handleFinish">
|
||||||
<fs-icon icon="ion:phone-portrait-outline"></fs-icon>
|
<template #prefix>
|
||||||
</template>
|
<fs-icon icon="ion:phone-portrait-outline"></fs-icon>
|
||||||
</a-input>
|
</template>
|
||||||
</a-form-item>
|
</a-input>
|
||||||
<a-form-item has-feedback name="password" :rules="rules.password">
|
</a-form-item>
|
||||||
<a-input-password v-model:value="formState.password" :placeholder="t('authentication.passwordPlaceholder')" autocomplete="off" @keyup.enter="handleFinish">
|
<a-form-item has-feedback name="password" :rules="rules.password">
|
||||||
<template #prefix>
|
<a-input-password v-model:value="formState.password" :placeholder="t('authentication.passwordPlaceholder')" autocomplete="off" @keyup.enter="handleFinish">
|
||||||
<fs-icon icon="ion:lock-closed-outline"></fs-icon>
|
<template #prefix>
|
||||||
</template>
|
<fs-icon icon="ion:lock-closed-outline"></fs-icon>
|
||||||
</a-input-password>
|
</template>
|
||||||
</a-form-item>
|
</a-input-password>
|
||||||
|
</a-form-item>
|
||||||
|
|
||||||
<a-form-item v-if="settingStore.sysPublic.captchaEnabled" has-feedback required name="captcha" :rules="rules.captcha">
|
<a-form-item v-if="settingStore.sysPublic.captchaEnabled" has-feedback required name="captcha" :rules="rules.captcha">
|
||||||
<CaptchaInput v-model:model-value="formState.captcha" @keydown.enter="handleFinish"></CaptchaInput>
|
<CaptchaInput v-model:model-value="formState.captcha" @keydown.enter="handleFinish"></CaptchaInput>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</template>
|
</template>
|
||||||
</a-tab-pane>
|
</a-tab-pane>
|
||||||
<a-tab-pane v-if="sysPublicSettings.smsLoginEnabled === true" key="sms" :tab="t('authentication.smsTab')">
|
<a-tab-pane v-if="sysPublicSettings.smsLoginEnabled === true" key="sms" :tab="t('authentication.smsTab')">
|
||||||
<template v-if="formState.loginType === 'sms'">
|
<template v-if="formState.loginType === 'sms'">
|
||||||
<a-form-item has-feedback name="mobile" :rules="rules.mobile">
|
<a-form-item has-feedback name="mobile" :rules="rules.mobile">
|
||||||
<a-input v-model:value="formState.mobile" :placeholder="t('authentication.mobilePlaceholder')" autocomplete="off">
|
<a-input v-model:value="formState.mobile" :placeholder="t('authentication.mobilePlaceholder')" autocomplete="off">
|
||||||
<template #prefix>
|
<template #prefix>
|
||||||
<fs-icon icon="ion:phone-portrait-outline"></fs-icon>
|
<fs-icon icon="ion:phone-portrait-outline"></fs-icon>
|
||||||
</template>
|
</template>
|
||||||
</a-input>
|
</a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
|
||||||
<a-form-item has-feedback name="smsCaptcha">
|
<a-form-item has-feedback name="smsCaptcha">
|
||||||
<CaptchaInput v-model:model-value="formState.smsCaptcha" @keydown.enter="handleFinish"></CaptchaInput>
|
<CaptchaInput v-model:model-value="formState.smsCaptcha" @keydown.enter="handleFinish"></CaptchaInput>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
|
||||||
<a-form-item name="smsCode" :rules="rules.smsCode">
|
<a-form-item name="smsCode" :rules="rules.smsCode">
|
||||||
<sms-code v-model:value="formState.smsCode" :captcha="formState.smsCaptcha" :mobile="formState.mobile" :phone-code="formState.phoneCode" @error="formState.smsCaptcha = null" />
|
<sms-code v-model:value="formState.smsCode" :captcha="formState.smsCaptcha" :mobile="formState.mobile" :phone-code="formState.phoneCode" @error="formState.smsCaptcha = null" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</template>
|
</template>
|
||||||
</a-tab-pane>
|
</a-tab-pane>
|
||||||
</a-tabs>
|
</a-tabs>
|
||||||
<a-form-item>
|
<a-form-item>
|
||||||
<a-button type="primary" size="large" html-type="button" :loading="loading" class="login-button" @click="handleFinish">
|
<a-button type="primary" size="large" html-type="button" :loading="loading" class="login-button" @click="handleFinish">
|
||||||
{{ t("authentication.loginButton") }}
|
{{ queryBindCode ? t("authentication.bindButton") : t("authentication.loginButton") }}
|
||||||
</a-button>
|
</a-button>
|
||||||
|
</a-form-item>
|
||||||
|
<a-form-item>
|
||||||
|
<div class="mt-2 flex justify-between items-center">
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<language-toggle class="text-blue-500"></language-toggle>
|
||||||
|
<router-link v-if="!!settingStore.sysPublic.selfServicePasswordRetrievalEnabled && !queryBindCode" :to="{ name: 'forgotPassword' }">
|
||||||
|
{{ t("authentication.forgotPassword") }}
|
||||||
|
</router-link>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div v-if="!!settingStore.sysPublic.selfServicePasswordRetrievalEnabled" class="mt-2">
|
<router-link v-if="hasRegisterTypeEnabled() && !queryBindCode" class="register" :to="{ name: 'register' }">
|
||||||
<router-link :to="{ name: 'forgotPassword' }">
|
{{ t("authentication.registerLink") }}
|
||||||
{{ t("authentication.forgotPassword") }}
|
</router-link>
|
||||||
</router-link>
|
</div>
|
||||||
</div>
|
</a-form-item>
|
||||||
</a-form-item>
|
</template>
|
||||||
|
|
||||||
<a-form-item class="user-login-other">
|
<div v-if="!queryBindCode && settingStore.sysPublic.oauthEnabled && settingStore.isPlus" class="w-full">
|
||||||
<div class="flex flex-between justify-between items-center">
|
<oauth-footer :oauth-only="isOauthOnly"></oauth-footer>
|
||||||
<language-toggle class="color-blue"></language-toggle>
|
</div>
|
||||||
<router-link v-if="hasRegisterTypeEnabled()" class="register" :to="{ name: 'register' }">
|
|
||||||
{{ t("authentication.registerLink") }}
|
|
||||||
</router-link>
|
|
||||||
</div>
|
|
||||||
</a-form-item>
|
|
||||||
</a-form>
|
</a-form>
|
||||||
<a-form v-else ref="twoFactorFormRef" class="user-layout-login" :model="twoFactor" v-bind="layout">
|
<a-form v-else ref="twoFactorFormRef" class="user-layout-login" :model="twoFactor" v-bind="layout">
|
||||||
<div class="mb-10 flex flex-center">请打开您的Authenticator APP,获取动态验证码。</div>
|
<div class="mb-10 flex flex-center">请打开您的Authenticator APP,获取动态验证码。</div>
|
||||||
@@ -80,14 +85,14 @@
|
|||||||
<loading-button type="primary" size="large" html-type="button" class="login-button" :click="handleTwoFactorSubmit">OTP验证登录</loading-button>
|
<loading-button type="primary" size="large" html-type="button" class="login-button" :click="handleTwoFactorSubmit">OTP验证登录</loading-button>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
|
||||||
<a-form-item class="user-login-other">
|
<a-form-item class="mt-10">
|
||||||
<a class="register" @click="twoFactor.loginId = null"> 返回 </a>
|
<a class="register" @click="twoFactor.loginId = null"> 返回 </a>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-form>
|
</a-form>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { defineComponent, nextTick, reactive, ref, toRaw } from "vue";
|
import { computed, defineComponent, nextTick, reactive, ref, toRaw } from "vue";
|
||||||
import { useUserStore } from "/src/store/user";
|
import { useUserStore } from "/src/store/user";
|
||||||
import { useSettingStore } from "/@/store/settings";
|
import { useSettingStore } from "/@/store/settings";
|
||||||
import { utils } from "@fast-crud/fast-crud";
|
import { utils } from "@fast-crud/fast-crud";
|
||||||
@@ -96,12 +101,19 @@ import { useI18n } from "/@/locales";
|
|||||||
import { LanguageToggle } from "/@/vben/layouts";
|
import { LanguageToggle } from "/@/vben/layouts";
|
||||||
import CaptchaInput from "/@/components/captcha/captcha-input.vue";
|
import CaptchaInput from "/@/components/captcha/captcha-input.vue";
|
||||||
import { useRoute } from "vue-router";
|
import { useRoute } from "vue-router";
|
||||||
|
import OauthFooter from "/@/views/framework/oauth/oauth-footer.vue";
|
||||||
|
import * as oauthApi from "../oauth/api";
|
||||||
|
import { notification } from "ant-design-vue";
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
name: "LoginPage",
|
name: "LoginPage",
|
||||||
components: { LanguageToggle, SmsCode, CaptchaInput },
|
components: { LanguageToggle, SmsCode, CaptchaInput, OauthFooter },
|
||||||
setup() {
|
setup() {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
|
||||||
|
const queryBindCode = ref(route.query.bindCode as string | undefined);
|
||||||
|
|
||||||
|
const queryOauthOnly = route.query.oauthOnly as string;
|
||||||
const urlLoginType = route.query.loginType as string | undefined;
|
const urlLoginType = route.query.loginType as string | undefined;
|
||||||
const verifyCodeInputRef = ref();
|
const verifyCodeInputRef = ref();
|
||||||
const loading = ref(false);
|
const loading = ref(false);
|
||||||
@@ -160,6 +172,13 @@ export default defineComponent({
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
async function afterLoginSuccess() {
|
||||||
|
if (queryBindCode.value) {
|
||||||
|
await oauthApi.BindUser(queryBindCode.value);
|
||||||
|
notification.success({ message: "绑定第三方账号成功" });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const twoFactor = reactive({
|
const twoFactor = reactive({
|
||||||
loginId: "",
|
loginId: "",
|
||||||
verifyCode: "",
|
verifyCode: "",
|
||||||
@@ -167,6 +186,7 @@ export default defineComponent({
|
|||||||
|
|
||||||
const handleTwoFactorSubmit = async () => {
|
const handleTwoFactorSubmit = async () => {
|
||||||
await userStore.loginByTwoFactor(twoFactor);
|
await userStore.loginByTwoFactor(twoFactor);
|
||||||
|
afterLoginSuccess();
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleFinish = async () => {
|
const handleFinish = async () => {
|
||||||
@@ -178,6 +198,7 @@ export default defineComponent({
|
|||||||
// }
|
// }
|
||||||
const loginType = formState.loginType;
|
const loginType = formState.loginType;
|
||||||
await userStore.login(loginType, toRaw(formState));
|
await userStore.login(loginType, toRaw(formState));
|
||||||
|
afterLoginSuccess();
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
if (e.code === 10020) {
|
if (e.code === 10020) {
|
||||||
@@ -214,6 +235,12 @@ export default defineComponent({
|
|||||||
const captchaInputRef = ref();
|
const captchaInputRef = ref();
|
||||||
const captchaInputForSmsCode = ref();
|
const captchaInputForSmsCode = ref();
|
||||||
|
|
||||||
|
const isOauthOnly = computed(() => {
|
||||||
|
if (queryOauthOnly === "false" || queryOauthOnly === "0") {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return sysPublicSettings.oauthOnly && settingStore.isPlus && sysPublicSettings.oauthEnabled;
|
||||||
|
});
|
||||||
return {
|
return {
|
||||||
t,
|
t,
|
||||||
loading,
|
loading,
|
||||||
@@ -221,6 +248,7 @@ export default defineComponent({
|
|||||||
formRef,
|
formRef,
|
||||||
rules,
|
rules,
|
||||||
layout,
|
layout,
|
||||||
|
isOauthOnly,
|
||||||
handleFinishFailed,
|
handleFinishFailed,
|
||||||
handleFinish,
|
handleFinish,
|
||||||
resetForm,
|
resetForm,
|
||||||
@@ -233,6 +261,7 @@ export default defineComponent({
|
|||||||
settingStore,
|
settingStore,
|
||||||
captchaInputRef,
|
captchaInputRef,
|
||||||
captchaInputForSmsCode,
|
captchaInputForSmsCode,
|
||||||
|
queryBindCode,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@@ -248,6 +277,11 @@ export default defineComponent({
|
|||||||
// font-size: 14px;
|
// font-size: 14px;
|
||||||
//}
|
//}
|
||||||
|
|
||||||
|
.fs-icon {
|
||||||
|
// color: rgba(0, 0, 0, 0.45);
|
||||||
|
margin-right: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.login-title {
|
.login-title {
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
@@ -301,11 +335,6 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.fs-icon {
|
|
||||||
color: rgba(0, 0, 0, 0.45);
|
|
||||||
margin-right: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ant-input-affix-wrapper {
|
.ant-input-affix-wrapper {
|
||||||
line-height: 1.8 !important;
|
line-height: 1.8 !important;
|
||||||
font-size: 14px !important;
|
font-size: 14px !important;
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
import { request } from "/src/api/service";
|
||||||
|
|
||||||
|
const apiPrefix = "/oauth";
|
||||||
|
|
||||||
|
export async function OauthLogin(type: string, forType?: string, from?: string) {
|
||||||
|
return await request({
|
||||||
|
url: apiPrefix + `/login`,
|
||||||
|
method: "post",
|
||||||
|
data: {
|
||||||
|
type,
|
||||||
|
forType: forType || "login",
|
||||||
|
from: from || "web",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function OauthToken(type: string, validationCode: string) {
|
||||||
|
return await request({
|
||||||
|
url: apiPrefix + `/token`,
|
||||||
|
method: "post",
|
||||||
|
data: {
|
||||||
|
type,
|
||||||
|
validationCode,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function AutoRegister(type: string, code: string) {
|
||||||
|
return await request({
|
||||||
|
url: apiPrefix + `/autoRegister`,
|
||||||
|
method: "post",
|
||||||
|
data: {
|
||||||
|
validationCode: code,
|
||||||
|
type,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function BindUser(code: string) {
|
||||||
|
return await request({
|
||||||
|
url: apiPrefix + `/bind`,
|
||||||
|
method: "post",
|
||||||
|
data: {
|
||||||
|
validationCode: code,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function GetOauthProviders() {
|
||||||
|
return await request({
|
||||||
|
url: apiPrefix + "/providers",
|
||||||
|
method: "post",
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,132 @@
|
|||||||
|
<template>
|
||||||
|
<div class="oauth-callback-page">
|
||||||
|
<div class="oauth-callback-content">
|
||||||
|
<div v-if="!bindRequired" class="oauth-callback-title">
|
||||||
|
<span v-if="!error">登录中...</span>
|
||||||
|
<span v-else>{{ error }}</span>
|
||||||
|
</div>
|
||||||
|
<div v-else class="oauth-callback-title mt-10">
|
||||||
|
<div>第三方({{ oauthType }})登录成功,您还未绑定账号,请选择</div>
|
||||||
|
|
||||||
|
<div class="mt-10">
|
||||||
|
<a-button class="w-full mt-10" type="primary" @click="goBindUser">绑定已有账号</a-button>
|
||||||
|
<a-button v-if="settingStore.sysPublic.registerEnabled" class="w-full mt-10" type="primary" @click="autoRegister">创建新账号</a-button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="w-full mt-10">
|
||||||
|
<router-link to="/login" class="w-full mt-10" type="primary">返回登录页</router-link>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { ref, onMounted } from "vue";
|
||||||
|
import * as api from "./api";
|
||||||
|
import { useRoute, useRouter } from "vue-router";
|
||||||
|
import { useUserStore } from "/@/store/user";
|
||||||
|
import { notification } from "ant-design-vue";
|
||||||
|
import { useSettingStore } from "/@/store/settings";
|
||||||
|
|
||||||
|
const route = useRoute();
|
||||||
|
const router = useRouter();
|
||||||
|
const settingStore = useSettingStore();
|
||||||
|
const oauthType = route.params.type as string;
|
||||||
|
const validationCode = route.query.validationCode as string;
|
||||||
|
const forType = route.query.forType as string;
|
||||||
|
const error = ref(route.query.error as string);
|
||||||
|
const userStore = useUserStore();
|
||||||
|
|
||||||
|
const bindRequired = ref(false);
|
||||||
|
const bindCode = ref("");
|
||||||
|
|
||||||
|
async function handleOauthToken() {
|
||||||
|
//处理第三方登录回调
|
||||||
|
const res = await api.OauthToken(oauthType, validationCode);
|
||||||
|
if (res.token) {
|
||||||
|
//登录成功
|
||||||
|
userStore.onLoginSuccess(res);
|
||||||
|
//跳转到首页
|
||||||
|
router.replace("/");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (res.bindRequired) {
|
||||||
|
//需要绑定
|
||||||
|
bindCode.value = res.validationCode;
|
||||||
|
//如果开启了自动注册,默认自动注册账号
|
||||||
|
if (settingStore.sysPublic.registerEnabled) {
|
||||||
|
autoRegister();
|
||||||
|
} else {
|
||||||
|
bindRequired.value = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
if (error.value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (forType === "bind") {
|
||||||
|
//从用户中心页面,进行第三方账号的绑定
|
||||||
|
await api.BindUser(validationCode);
|
||||||
|
notification.success({
|
||||||
|
message: "绑定成功",
|
||||||
|
});
|
||||||
|
//跳转到首页
|
||||||
|
router.replace("/certd/mine/user-profile");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await handleOauthToken();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function goBindUser() {
|
||||||
|
//绑定已有账号
|
||||||
|
router.replace({
|
||||||
|
path: "/login",
|
||||||
|
query: {
|
||||||
|
bindCode: bindCode.value,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function autoRegister() {
|
||||||
|
//自动注册账号
|
||||||
|
const res = await api.AutoRegister(oauthType, bindCode.value);
|
||||||
|
//登录成功
|
||||||
|
userStore.onLoginSuccess(res);
|
||||||
|
//跳转到首页
|
||||||
|
router.replace("/");
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<style lang="less">
|
||||||
|
.oauth-callback-page {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
gap: 16px;
|
||||||
|
width: 100%;
|
||||||
|
.oauth-callback-content {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
gap: 16px;
|
||||||
|
padding: 16px;
|
||||||
|
border-radius: 16px;
|
||||||
|
box-shadow: 0 0 16px rgba(0, 0, 0, 0.1);
|
||||||
|
width: 500px;
|
||||||
|
max-width: 90%;
|
||||||
|
margin: 0 auto;
|
||||||
|
margin-top: 50px;
|
||||||
|
margin-bottom: 100px;
|
||||||
|
min-height: 200px;
|
||||||
|
|
||||||
|
.oauth-callback-title {
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -0,0 +1,117 @@
|
|||||||
|
<template>
|
||||||
|
<div class="oauth-footer relative">
|
||||||
|
<div class="oauth-title">
|
||||||
|
<div class="oauth-title-text">{{ computedTitle }}</div>
|
||||||
|
</div>
|
||||||
|
<div class="flex justify-center items-center gap-4">
|
||||||
|
<template v-for="item in oauthProviderList" :key="item.type">
|
||||||
|
<div v-if="item.addonId" class="oauth-icon-button pointer" @click="goOauthLogin(item.name)">
|
||||||
|
<div><fs-icon :icon="item.icon" class="text-blue-600 text-40" /></div>
|
||||||
|
<div class="ellipsis title" :title="item.addonTitle || item.title">{{ item.addonTitle || item.title }}</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, onMounted, ref } from "vue";
|
||||||
|
import * as api from "./api";
|
||||||
|
import { useI18n } from "vue-i18n";
|
||||||
|
import { useSettingStore } from "/@/store/settings";
|
||||||
|
import { useRoute } from "vue-router";
|
||||||
|
|
||||||
|
const oauthProviderList = ref([]);
|
||||||
|
const props = defineProps<{
|
||||||
|
oauthOnly?: boolean;
|
||||||
|
}>();
|
||||||
|
|
||||||
|
const { t } = useI18n();
|
||||||
|
const computedTitle = computed(() => {
|
||||||
|
return props.oauthOnly ? t("authentication.oauthOnlyLoginTitle") : t("authentication.oauthLoginTitle");
|
||||||
|
});
|
||||||
|
|
||||||
|
const settingStore = useSettingStore();
|
||||||
|
|
||||||
|
const route = useRoute();
|
||||||
|
const queryOauthOnly = route.query.oauthOnly as string;
|
||||||
|
onMounted(async () => {
|
||||||
|
oauthProviderList.value = await api.GetOauthProviders();
|
||||||
|
//如果开启了自动跳转登录
|
||||||
|
if (settingStore.sysPublic.oauthAutoRedirect && queryOauthOnly !== "false") {
|
||||||
|
const firstOauth = oauthProviderList.value.find(item => item.addonId > 0);
|
||||||
|
if (firstOauth) {
|
||||||
|
goOauthLogin(firstOauth.name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
async function goOauthLogin(type: string) {
|
||||||
|
//获取第三方登录URL
|
||||||
|
const from = "web";
|
||||||
|
const res = await api.OauthLogin(type, from);
|
||||||
|
const loginUrl = res.loginUrl;
|
||||||
|
window.location.href = loginUrl;
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<style lang="less">
|
||||||
|
.oauth-footer {
|
||||||
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
gap: 16px;
|
||||||
|
|
||||||
|
.oauth-title {
|
||||||
|
width: 100%;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 500;
|
||||||
|
color: #8c8c8c;
|
||||||
|
position: relative;
|
||||||
|
.oauth-title-text {
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
text-align: center;
|
||||||
|
&::after {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
top: 50%;
|
||||||
|
left: 0;
|
||||||
|
width: 36%;
|
||||||
|
height: 0.5px;
|
||||||
|
background-color: #8c8c8c;
|
||||||
|
}
|
||||||
|
&::before {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
top: 50%;
|
||||||
|
right: 0;
|
||||||
|
width: 36%;
|
||||||
|
height: 0.5px;
|
||||||
|
background-color: #8c8c8c;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.oauth-icon-button {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 8px 8px;
|
||||||
|
border-radius: 100px;
|
||||||
|
width: 100px;
|
||||||
|
|
||||||
|
.title {
|
||||||
|
width: 100%;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
.fs-icon {
|
||||||
|
font-size: 36px;
|
||||||
|
color: #006be6;
|
||||||
|
margin: 0px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -93,6 +93,7 @@ export type PluginConfigBean = {
|
|||||||
export type CertApplyPluginSysInput = {
|
export type CertApplyPluginSysInput = {
|
||||||
googleCommonEabAccessId?: number;
|
googleCommonEabAccessId?: number;
|
||||||
zerosslCommonEabAccessId?: number;
|
zerosslCommonEabAccessId?: number;
|
||||||
|
litesslCommonEabAccessId?: number;
|
||||||
};
|
};
|
||||||
export type PluginSysSetting<T> = {
|
export type PluginSysSetting<T> = {
|
||||||
sysSetting: {
|
sysSetting: {
|
||||||
|
|||||||
@@ -26,6 +26,16 @@
|
|||||||
</div>
|
</div>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
|
||||||
|
<a-form-item label="公共litessl EAB授权" :name="['CertApply', 'sysSetting', 'input', 'litesslCommonEabAccessId']">
|
||||||
|
<access-selector v-model:model-value="formState.CertApply.sysSetting.input.litesslCommonEabAccessId" type="eab" from="sys"></access-selector>
|
||||||
|
<div class="helper">
|
||||||
|
<div>设置公共litessl EAB授权给用户使用,避免用户自己获取litessl EAB授权</div>
|
||||||
|
<div>
|
||||||
|
<a href="https://freessl.cn/automation/eab-manager">litessl EAB授权管理 </a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</a-form-item>
|
||||||
|
|
||||||
<a-form-item :wrapper-col="{ offset: 8, span: 16 }">
|
<a-form-item :wrapper-col="{ offset: 8, span: 16 }">
|
||||||
<a-button :loading="saveLoading" type="primary" html-type="submit">保存</a-button>
|
<a-button :loading="saveLoading" type="primary" html-type="submit">保存</a-button>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
|||||||
@@ -111,3 +111,10 @@ export async function GetSmsTypeDefine(type: string) {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function GetOauthProviders() {
|
||||||
|
return await request({
|
||||||
|
url: "/oauth/providers",
|
||||||
|
method: "post",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|||||||
@@ -11,6 +11,9 @@
|
|||||||
<a-tab-pane key="register" :tab="t('certd.sys.setting.registerSetting')">
|
<a-tab-pane key="register" :tab="t('certd.sys.setting.registerSetting')">
|
||||||
<SettingRegister v-if="activeKey === 'register'" />
|
<SettingRegister v-if="activeKey === 'register'" />
|
||||||
</a-tab-pane>
|
</a-tab-pane>
|
||||||
|
<a-tab-pane key="oauth" :tab="t('certd.sys.setting.oauthSetting')">
|
||||||
|
<SettingOauth v-if="activeKey === 'oauth'" />
|
||||||
|
</a-tab-pane>
|
||||||
<a-tab-pane v-if="settingsStore.isComm" key="payment" :tab="t('certd.sys.setting.paymentSetting')">
|
<a-tab-pane v-if="settingsStore.isComm" key="payment" :tab="t('certd.sys.setting.paymentSetting')">
|
||||||
<SettingPayment v-if="activeKey === 'payment'" />
|
<SettingPayment v-if="activeKey === 'payment'" />
|
||||||
</a-tab-pane>
|
</a-tab-pane>
|
||||||
@@ -35,6 +38,7 @@ import SettingPayment from "/@/views/sys/settings/tabs/payment.vue";
|
|||||||
import SettingSafe from "/@/views/sys/settings/tabs/safe.vue";
|
import SettingSafe from "/@/views/sys/settings/tabs/safe.vue";
|
||||||
import SettingCaptcha from "/@/views/sys/settings/tabs/captcha.vue";
|
import SettingCaptcha from "/@/views/sys/settings/tabs/captcha.vue";
|
||||||
import SettingPipeline from "/@/views/sys/settings/tabs/pipeline.vue";
|
import SettingPipeline from "/@/views/sys/settings/tabs/pipeline.vue";
|
||||||
|
import SettingOauth from "/@/views/sys/settings/tabs/oauth.vue";
|
||||||
import { useRoute, useRouter } from "vue-router";
|
import { useRoute, useRouter } from "vue-router";
|
||||||
import { ref } from "vue";
|
import { ref } from "vue";
|
||||||
import { useSettingStore } from "/@/store/settings";
|
import { useSettingStore } from "/@/store/settings";
|
||||||
@@ -47,9 +51,7 @@ const settingsStore = useSettingStore();
|
|||||||
const activeKey = ref("base");
|
const activeKey = ref("base");
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
if (route.query.tab) {
|
activeKey.value = (route.query.tab as string) || "base";
|
||||||
activeKey.value = (route.query.tab as string) || "base";
|
|
||||||
}
|
|
||||||
|
|
||||||
function onChange(value: string) {
|
function onChange(value: string) {
|
||||||
// activeKey.value = value;
|
// activeKey.value = value;
|
||||||
@@ -66,7 +68,7 @@ function onChange(value: string) {
|
|||||||
<style lang="less">
|
<style lang="less">
|
||||||
.page-sys-settings {
|
.page-sys-settings {
|
||||||
.sys-settings-form {
|
.sys-settings-form {
|
||||||
width: 800px;
|
width: 900px;
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,151 @@
|
|||||||
|
<template>
|
||||||
|
<div class="sys-settings-form sys-settings-oauth">
|
||||||
|
<a-form :model="formState" name="register" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off" @finish="onFinish">
|
||||||
|
<a-form-item :label="t('certd.sys.setting.enableOauth')" :name="['public', 'oauthEnabled']">
|
||||||
|
<div class="flex-o">
|
||||||
|
<a-switch v-model:checked="formState.public.oauthEnabled" :disabled="!settingsStore.isPlus" :title="t('certd.plusFeature')" />
|
||||||
|
<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']">
|
||||||
|
<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.oauthType") }}</th>
|
||||||
|
<th class="border border-gray-300 px-4 py-2 w-1/3">{{ t("certd.sys.setting.oauthCallback") }}</th>
|
||||||
|
<th class="border border-gray-300 px-4 py-2 w-1/3">{{ t("certd.sys.setting.oauthConfig") }}</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr v-for="(item, key) of oauthProviders" :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 overflow-ellipsis" :title="t('certd.sys.setting.oauthCallbackHelper')">
|
||||||
|
<fs-copyable :model-value="buildCallbackUrl(item.name)">
|
||||||
|
{{ t("certd.sys.setting.oauthCallbackCopy") }}
|
||||||
|
</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')" />
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</a-form-item>
|
||||||
|
<a-form-item v-if="formState.public.oauthEnabled" :label="t('certd.sys.setting.oauthOnly')" :name="['public', 'oauthOnly']">
|
||||||
|
<div class="flex-o">
|
||||||
|
<a-switch v-model:checked="formState.public.oauthOnly" :disabled="!settingsStore.isPlus" :title="t('certd.plusFeature')" />
|
||||||
|
</div>
|
||||||
|
<div class="helper">{{ t("certd.sys.setting.oauthOnlyHelper") }}</div>
|
||||||
|
</a-form-item>
|
||||||
|
<a-form-item v-if="formState.public.oauthEnabled" :label="t('certd.sys.setting.oauthAutoRedirect')" :name="['public', 'oauthAutoRedirect']">
|
||||||
|
<div class="flex-o">
|
||||||
|
<a-switch v-model:checked="formState.public.oauthAutoRedirect" :disabled="!settingsStore.isPlus" :title="t('certd.plusFeature')" />
|
||||||
|
</div>
|
||||||
|
<div class="helper">{{ t("certd.sys.setting.oauthAutoRedirectHelper") }}</div>
|
||||||
|
</a-form-item>
|
||||||
|
<a-form-item v-if="formState.public.oauthEnabled" :label="t('certd.sys.setting.oauthAutoRegister')" :name="['public', 'oauthAutoRegister']">
|
||||||
|
<div class="flex-o">
|
||||||
|
<a-switch
|
||||||
|
v-model:checked="formState.public.oauthAutoRegister"
|
||||||
|
:checked-children="t('certd.sys.setting.oauthAutoRegisterCheckedText')"
|
||||||
|
:un-checked-children="t('certd.sys.setting.oauthAutoRegisterUnCheckedText')"
|
||||||
|
:disabled="!settingsStore.isPlus"
|
||||||
|
:title="t('certd.plusFeature')"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="helper">{{ t("certd.sys.setting.oauthAutoRegisterHelper") }}</div>
|
||||||
|
</a-form-item>
|
||||||
|
<a-form-item label=" " :colon="false" :wrapper-col="{ span: 16 }">
|
||||||
|
<a-button :loading="saveLoading" type="primary" html-type="submit">{{ t("certd.saveButton") }}</a-button>
|
||||||
|
</a-form-item>
|
||||||
|
</a-form>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="tsx">
|
||||||
|
import { notification } from "ant-design-vue";
|
||||||
|
import { merge } from "lodash-es";
|
||||||
|
import { reactive, ref, Ref } from "vue";
|
||||||
|
import AddonSelector from "../../../certd/addon/addon-selector/index.vue";
|
||||||
|
import { useSettingStore } from "/@/store/settings";
|
||||||
|
import * as api from "/@/views/sys/settings/api";
|
||||||
|
import { SysSettings } from "/@/views/sys/settings/api";
|
||||||
|
import { useI18n } from "/src/locales";
|
||||||
|
const { t } = useI18n();
|
||||||
|
|
||||||
|
defineOptions({
|
||||||
|
name: "SettingOauth",
|
||||||
|
});
|
||||||
|
|
||||||
|
const formState = reactive<Partial<SysSettings>>({
|
||||||
|
public: {},
|
||||||
|
private: {},
|
||||||
|
});
|
||||||
|
|
||||||
|
const oauthProviders = ref([]);
|
||||||
|
async function loadOauthProviders() {
|
||||||
|
oauthProviders.value = await api.GetOauthProviders();
|
||||||
|
}
|
||||||
|
|
||||||
|
function fillOauthProviders(form: any) {
|
||||||
|
const providers: any = {};
|
||||||
|
for (const item of oauthProviders.value) {
|
||||||
|
const type = item.name;
|
||||||
|
providers[type] = {
|
||||||
|
type: type,
|
||||||
|
title: item.title,
|
||||||
|
icon: item.icon,
|
||||||
|
addonId: item.addonId || null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
form.public.oauthProviders = providers;
|
||||||
|
return providers;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadSysSettings() {
|
||||||
|
const data: any = await api.SysSettingsGet();
|
||||||
|
merge(formState, data);
|
||||||
|
|
||||||
|
await loadOauthProviders();
|
||||||
|
}
|
||||||
|
|
||||||
|
const saveLoading = ref(false);
|
||||||
|
loadSysSettings();
|
||||||
|
const settingsStore = useSettingStore();
|
||||||
|
const onFinish = async (form: any) => {
|
||||||
|
try {
|
||||||
|
saveLoading.value = true;
|
||||||
|
fillOauthProviders(form);
|
||||||
|
await api.SysSettingsSave(form);
|
||||||
|
await settingsStore.loadSysSettings();
|
||||||
|
notification.success({
|
||||||
|
message: t("certd.saveSuccess"),
|
||||||
|
});
|
||||||
|
await loadOauthProviders();
|
||||||
|
} finally {
|
||||||
|
saveLoading.value = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
function buildCallbackUrl(type: string) {
|
||||||
|
return `${window.location.origin}/api/oauth/callback/${type}`;
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<style lang="less">
|
||||||
|
.sys-settings-oauth {
|
||||||
|
width: 1000px !important;
|
||||||
|
|
||||||
|
.addon-selector {
|
||||||
|
.inner {
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -55,7 +55,6 @@
|
|||||||
</a-form-item>
|
</a-form-item>
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<a-form-item label=" " :colon="false" :wrapper-col="{ span: 16 }">
|
<a-form-item label=" " :colon="false" :wrapper-col="{ span: 16 }">
|
||||||
<a-button :loading="saveLoading" type="primary" html-type="submit">{{ t("certd.saveButton") }}</a-button>
|
<a-button :loading="saveLoading" type="primary" html-type="submit">{{ t("certd.saveButton") }}</a-button>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
@@ -64,14 +63,13 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="tsx">
|
<script setup lang="tsx">
|
||||||
import { reactive, ref, Ref } from "vue";
|
|
||||||
import { GetSmsTypeDefine, SysSettings } from "/@/views/sys/settings/api";
|
|
||||||
import * as api from "/@/views/sys/settings/api";
|
|
||||||
import { merge } from "lodash-es";
|
|
||||||
import { useSettingStore } from "/@/store/settings";
|
|
||||||
import { notification } from "ant-design-vue";
|
import { notification } from "ant-design-vue";
|
||||||
|
import { merge } from "lodash-es";
|
||||||
|
import { reactive, ref, Ref } from "vue";
|
||||||
|
import { useSettingStore } from "/@/store/settings";
|
||||||
|
import * as api from "/@/views/sys/settings/api";
|
||||||
|
import { SysSettings } from "/@/views/sys/settings/api";
|
||||||
import { useI18n } from "/src/locales";
|
import { useI18n } from "/src/locales";
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
defineOptions({
|
defineOptions({
|
||||||
@@ -191,6 +189,13 @@ const onFinish = async (form: any) => {
|
|||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="less">
|
<style lang="less">
|
||||||
.sys-settings-site {
|
.sys-settings-register {
|
||||||
|
width: 1000px !important;
|
||||||
|
|
||||||
|
.addon-selector {
|
||||||
|
.inner {
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -3,6 +3,57 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [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)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/ui-server
|
||||||
|
|
||||||
|
## [1.37.13](https://github.com/certd/certd/compare/v1.37.12...v1.37.13) (2025-12-02)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复西部数据返回信息乱码问题 ([78b1650](https://github.com/certd/certd/commit/78b1650bdb071c858b3f90d53a700d11ee6de328))
|
||||||
|
* 修复西部数码使用域名级别的key申请证书失败的问题 ([5edc72d](https://github.com/certd/certd/commit/5edc72d47550b8e3364dabda70a41cce75d87956))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 第三方登录允许选择logo ([bb3085e](https://github.com/certd/certd/commit/bb3085ef84201ccd2dc632ba8c5097cb00258be4))
|
||||||
|
* 支持OIDC单点登录 ([fbf12f1](https://github.com/certd/certd/commit/fbf12f16b5eaa7676fd41923587bf6bd2595adba))
|
||||||
|
|
||||||
|
## [1.37.12](https://github.com/certd/certd/compare/v1.37.11...v1.37.12) (2025-11-29)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复waf tls版本号小写 ([0adcc6a](https://github.com/certd/certd/commit/0adcc6a8d194469be0c26940ed4837fb34929b68))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持微信扫码登录 ([73325aa](https://github.com/certd/certd/commit/73325aaefb0e750a22aaac40929e7bf3f5864996))
|
||||||
|
|
||||||
|
## [1.37.11](https://github.com/certd/certd/compare/v1.37.10...v1.37.11) (2025-11-28)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复阿里云 waf tlsVersion参数缺失导致部署失败的问题 ([2fabee6](https://github.com/certd/certd/commit/2fabee647acf64afe689f5bea3603028cd0ba4a2))
|
||||||
|
* 修复域名管理无法创建tencent-eo dns授权的bug ([3406bb5](https://github.com/certd/certd/commit/3406bb5a4a56bb310cddc1a1f410c70909fd129b))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化天翼云cdn 等待5秒部署完成 ([53c88ad](https://github.com/certd/certd/commit/53c88ad5afe66a3f7c38b9b759747918913a4edc))
|
||||||
|
* 支持oidc单点登录 ([ec75afb](https://github.com/certd/certd/commit/ec75afbc44139dbe9da534d8a8c08a5b91f86d3c))
|
||||||
|
|
||||||
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
|
||||||
|
|
||||||
### Performance Improvements
|
### Performance Improvements
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
|
||||||
|
CREATE TABLE `cd_oauth_bound`
|
||||||
|
(
|
||||||
|
`id` bigint PRIMARY KEY AUTO_INCREMENT NOT NULL,
|
||||||
|
`user_id` bigint NOT NULL,
|
||||||
|
`type` varchar(512) NOT NULL,
|
||||||
|
`open_id` varchar(512) NOT NULL,
|
||||||
|
`create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
`update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
CREATE INDEX `index_oauth_bound_user_id` ON `cd_oauth_bound` (`user_id`);
|
||||||
|
CREATE INDEX `index_oauth_bound_open_id` ON `cd_oauth_bound` (`open_id`);
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
|
||||||
|
CREATE TABLE "cd_oauth_bound"
|
||||||
|
(
|
||||||
|
"id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL,
|
||||||
|
"user_id" bigint NOT NULL,
|
||||||
|
"type" varchar(512) NOT NULL,
|
||||||
|
"open_id" varchar(512) NOT NULL,
|
||||||
|
"create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP),
|
||||||
|
"update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP)
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
CREATE INDEX "index_oauth_bound_user_id" ON "cd_oauth_bound" ("user_id");
|
||||||
|
CREATE INDEX "index_oauth_bound_open_id" ON "cd_oauth_bound" ("open_id");
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
|
||||||
|
CREATE TABLE "cd_oauth_bound"
|
||||||
|
(
|
||||||
|
"id" integer PRIMARY KEY AUTOINCREMENT NOT NULL,
|
||||||
|
"user_id" integer NOT NULL,
|
||||||
|
"type" varchar(512) NOT NULL,
|
||||||
|
"open_id" varchar(512) NOT NULL,
|
||||||
|
"create_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP),
|
||||||
|
"update_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
CREATE INDEX "index_oauth_bound_user_id" ON "cd_oauth_bound" ("user_id");
|
||||||
|
CREATE INDEX "index_oauth_bound_open_id" ON "cd_oauth_bound" ("open_id");
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/ui-server",
|
"name": "@certd/ui-server",
|
||||||
"version": "1.37.10",
|
"version": "1.37.15",
|
||||||
"description": "fast-server base midway",
|
"description": "fast-server base midway",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -45,20 +45,20 @@
|
|||||||
"@aws-sdk/client-cloudfront": "^3.699.0",
|
"@aws-sdk/client-cloudfront": "^3.699.0",
|
||||||
"@aws-sdk/client-iam": "^3.699.0",
|
"@aws-sdk/client-iam": "^3.699.0",
|
||||||
"@aws-sdk/client-s3": "^3.705.0",
|
"@aws-sdk/client-s3": "^3.705.0",
|
||||||
"@certd/acme-client": "^1.37.10",
|
"@certd/acme-client": "^1.37.15",
|
||||||
"@certd/basic": "^1.37.10",
|
"@certd/basic": "^1.37.15",
|
||||||
"@certd/commercial-core": "^1.37.10",
|
"@certd/commercial-core": "^1.37.15",
|
||||||
"@certd/cv4pve-api-javascript": "^8.4.2",
|
"@certd/cv4pve-api-javascript": "^8.4.2",
|
||||||
"@certd/jdcloud": "^1.37.10",
|
"@certd/jdcloud": "^1.37.15",
|
||||||
"@certd/lib-huawei": "^1.37.10",
|
"@certd/lib-huawei": "^1.37.15",
|
||||||
"@certd/lib-k8s": "^1.37.10",
|
"@certd/lib-k8s": "^1.37.15",
|
||||||
"@certd/lib-server": "^1.37.10",
|
"@certd/lib-server": "^1.37.15",
|
||||||
"@certd/midway-flyway-js": "^1.37.10",
|
"@certd/midway-flyway-js": "^1.37.15",
|
||||||
"@certd/pipeline": "^1.37.10",
|
"@certd/pipeline": "^1.37.15",
|
||||||
"@certd/plugin-cert": "^1.37.10",
|
"@certd/plugin-cert": "^1.37.15",
|
||||||
"@certd/plugin-lib": "^1.37.10",
|
"@certd/plugin-lib": "^1.37.15",
|
||||||
"@certd/plugin-plus": "^1.37.10",
|
"@certd/plugin-plus": "^1.37.15",
|
||||||
"@certd/plus-core": "^1.37.10",
|
"@certd/plus-core": "^1.37.15",
|
||||||
"@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120",
|
"@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120",
|
||||||
"@huaweicloud/huaweicloud-sdk-core": "^3.1.120",
|
"@huaweicloud/huaweicloud-sdk-core": "^3.1.120",
|
||||||
"@koa/cors": "^5.0.0",
|
"@koa/cors": "^5.0.0",
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { LoginService } from "../../../modules/login/service/login-service.js";
|
|||||||
*/
|
*/
|
||||||
@Provide()
|
@Provide()
|
||||||
@Controller('/api')
|
@Controller('/api')
|
||||||
export class LoginController extends BaseController {
|
export class ForgotPasswordController extends BaseController {
|
||||||
@Inject()
|
@Inject()
|
||||||
loginService: LoginService;
|
loginService: LoginService;
|
||||||
@Inject()
|
@Inject()
|
||||||
|
|||||||