Compare commits
91 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c8e193e70d | |||
| 35859ffc3f | |||
| 0d81ada5a8 | |||
| b68cf0fb45 | |||
| 9ed2078e92 | |||
| 1f002159e2 | |||
| 5bc690fcd9 | |||
| bab9adce24 | |||
| e47eddaa85 | |||
| 8ef1f2e395 | |||
| 7626eecbf6 | |||
| 49afa75929 | |||
| 5c5265ede2 | |||
| 42d61d8089 | |||
| 01eb50078e | |||
| eef021f472 | |||
| 6f3fd785e7 | |||
| 7cd8a645a8 | |||
| 9671348dc1 | |||
| 7a3e68d656 | |||
| 42c7ec2f75 | |||
| 32c3ce5c98 | |||
| e55a3a82fc | |||
| 305da86f97 | |||
| c23d1d11b5 | |||
| a3cabd5f36 | |||
| 66ac4716f2 | |||
| 3cd1aaeb03 | |||
| 4eb940ffe7 | |||
| 61800b23e2 | |||
| 0283662931 | |||
| 8387fe0d5b | |||
| b91548eef4 | |||
| 1195417b97 | |||
| 8c2dfa9140 | |||
| a3fbfe0bff | |||
| e7e54bc19e | |||
| 9fb980599f | |||
| 9642df2d9d | |||
| 8919a3937a | |||
| 5032030f8d | |||
| b30cb5d7dc | |||
| 7113c4622b | |||
| bd8caff0b7 | |||
| 519bf3184a | |||
| 79c77ce3a3 | |||
| 2f40f795ee | |||
| 02f89a9c9d | |||
| d286c040a5 | |||
| 99f5b8ebc1 | |||
| 9ac33f9b9b | |||
| 6ab1fcaf89 | |||
| 8d57063e9d | |||
| 104d646c7c | |||
| 9ddbf79d9e | |||
| a9ec4c5c28 | |||
| 914d860197 | |||
| 23b3e5c731 | |||
| cdf04c2402 | |||
| 3535e44337 | |||
| 0b245d3885 | |||
| 4fda6cbcde | |||
| 2bbba897ec | |||
| 0cfb94b0ba | |||
| 3f7ac93932 | |||
| 96c36b4f6a | |||
| febd6d32cf | |||
| cbd8699801 | |||
| 74400aacc6 | |||
| 9f55c3605a | |||
| 8d61e8179f | |||
| f250889c3e | |||
| 00f67d86d6 | |||
| 5b580d2a17 | |||
| 083dd7d1a3 | |||
| 03bd4755ce | |||
| 29d37075dd | |||
| f311bac580 | |||
| beb7a4c992 | |||
| 4d86fb319b | |||
| 5ea4f46de7 | |||
| 1d8d5251ae | |||
| 54c8217808 | |||
| ba623903e0 | |||
| 907af3ae18 | |||
| 24ae8a6b66 | |||
| 1646a5cdd2 | |||
| 814f17d10b | |||
| 40fe105903 | |||
| 42a347d8b1 | |||
| 5450e5dac4 |
@@ -31,3 +31,4 @@ test/**/*.js
|
|||||||
/packages/pro/
|
/packages/pro/
|
||||||
test.js
|
test.js
|
||||||
.history
|
.history
|
||||||
|
/logs
|
||||||
@@ -3,6 +3,79 @@
|
|||||||
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.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复1panel2.1.0新版本测试失败的问题 ([8ef1f2e](https://github.com/certd/certd/commit/8ef1f2e395ea5969a95f55535e6c16a65e2b463b))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化登陆页面的黑暗模式 ([e47edda](https://github.com/certd/certd/commit/e47eddaa858f8fffe7a40dfbd14e8cda1dcba4ac))
|
||||||
|
* 支持自定义发件人名称,格式:名称<邮箱> ([bab9adc](https://github.com/certd/certd/commit/bab9adce240108d4291eedc67e04abc4a01019e0))
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复1panel 请求失败的bug ([0283662](https://github.com/certd/certd/commit/0283662931ff47d6b5d49f91a30c4a002fe1d108))
|
||||||
|
* 修复阿里云dcdn使用上传到cas的id引用错误的bug ([61800b2](https://github.com/certd/certd/commit/61800b23e2be324169990810d1176c18decabb23))
|
||||||
|
* 修复保存站点监控dns设置,偶尔无法保存成功的bug ([8387fe0](https://github.com/certd/certd/commit/8387fe0d5b2e77b8c2788a10791e5389d97a3e41))
|
||||||
|
* 修复任务步骤标题过长导致错位的问题 ([9fb9805](https://github.com/certd/certd/commit/9fb980599f96ccbf61bd46019411db2f13c70e57))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 421 支持3次重试 ([b91548e](https://github.com/certd/certd/commit/b91548eef4c24faa822d3a40f1f6a77b41d274e4))
|
||||||
|
* 备份支持scp上传 ([66ac471](https://github.com/certd/certd/commit/66ac4716f2565d7ee827461b625397ae21599451))
|
||||||
|
* 监控设置支持逗号分割 ([c23d1d1](https://github.com/certd/certd/commit/c23d1d11b58a6cdfe431a7e8abbd5d955146c38d))
|
||||||
|
* 列表中支持下次执行时间显示 ([a3cabd5](https://github.com/certd/certd/commit/a3cabd5f36ed41225ad418098596e9b2c44e31a1))
|
||||||
|
* 模版编辑页面,hover反色过亮问题优化 ([e55a3a8](https://github.com/certd/certd/commit/e55a3a82fc6939b940f0c3be4529d74a625f6f4e))
|
||||||
|
* 群晖支持刷新登录有效期 ([42c7ec2](https://github.com/certd/certd/commit/42c7ec2f75947e2b8298d6605d4dbcd441aacd51))
|
||||||
|
* 所有授权增加测试按钮 ([7a3e68d](https://github.com/certd/certd/commit/7a3e68d656c1dcdcd814b69891bd2c2c6fe3098a))
|
||||||
|
* 新网互联支持查询域名列表 ([e7e54bc](https://github.com/certd/certd/commit/e7e54bc19e3a734913a93a94e25db3bb06d2ab0f))
|
||||||
|
* 优化京东云报错详情显示 ([1195417](https://github.com/certd/certd/commit/1195417b9714d2fcb540e43c0a20809b7ee2052b))
|
||||||
|
* 优化网络测试页面,夜间模式显示效果 ([305da86](https://github.com/certd/certd/commit/305da86f97d918374819ecd6c50685f09b94ea59))
|
||||||
|
* 增加部署证书到certd本身插件 ([3cd1aae](https://github.com/certd/certd/commit/3cd1aaeb035f8af79714030889b2b4dc259b700e))
|
||||||
|
* 支持next-terminal ([6f3fd78](https://github.com/certd/certd/commit/6f3fd785e77a33c72bdf4115dc5d498e677d1863))
|
||||||
|
* 主题默认跟随系统颜色(自动切换深色浅色模式) ([32c3ce5](https://github.com/certd/certd/commit/32c3ce5c9868569523901a9a939ca5b535ec3277))
|
||||||
|
* http校验方式支持scp上传 ([4eb940f](https://github.com/certd/certd/commit/4eb940ffe765a0330331bc6af8396315e36d4e4a))
|
||||||
|
|
||||||
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复部署到openwrt错误的bug ([9ac33f9](https://github.com/certd/certd/commit/9ac33f9b9ba7727fcbbd320dd866bc048cbb3d72))
|
||||||
|
* 修复新版本上传到阿里云cas后,其他依赖任务无法部署的bug ([99f5b8e](https://github.com/certd/certd/commit/99f5b8ebc1c64798ceb42042ad71cf71e967beb0))
|
||||||
|
* esxi部署失败的bug ([6ab1fca](https://github.com/certd/certd/commit/6ab1fcaf894f7ce343af4b5bf4b0d67438df6618))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 修改sql升级语句,兼容mysql5.7 ([02f89a9](https://github.com/certd/certd/commit/02f89a9c9d77850437285844670aed441e5953c3))
|
||||||
|
* 已登录状态访问登录页面自动跳转到首页 ([bd8caff](https://github.com/certd/certd/commit/bd8caff0b754cb13530cf0f1644b33e29fde5d01))
|
||||||
|
* 优化access授权支持remote-auto-complete ([2f40f79](https://github.com/certd/certd/commit/2f40f795ee6131132d3fab2601f92a567bbdc4b7))
|
||||||
|
* access 插件支持remote-select等配置 ([d286c04](https://github.com/certd/certd/commit/d286c040a5232dcca829945734affead3ee08b3c))
|
||||||
|
|
||||||
|
## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 双重验证显示secret ([febd6d3](https://github.com/certd/certd/commit/febd6d32cfe6d89ccecf26bf15141df7c456e5c6))
|
||||||
|
* 优化申请证书最大超时时长 ([00f67d8](https://github.com/certd/certd/commit/00f67d86d68f4f83cfafe2fbfeb4af0d86f9d20e))
|
||||||
|
* 支持设置默认的证书申请地址的反向代理 ([0cfb94b](https://github.com/certd/certd/commit/0cfb94b0ba6a6dc3bb0d0a81a1912068a4e6b6b6))
|
||||||
|
* 子域名托管域名支持配置通配符 ([3f7ac93](https://github.com/certd/certd/commit/3f7ac939326b0c7ec013a7534b6c0e58fb3e8cb4))
|
||||||
|
|
||||||
|
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复有域名记录时,域名输入框无法关闭的bug ([54c8217](https://github.com/certd/certd/commit/54c8217808453b121abf646b004596f28932509f))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* eab从更多参数中挪到外面 ([5ea4f46](https://github.com/certd/certd/commit/5ea4f46de7ae403a7a16e9488dc1d9c7523d019a))
|
||||||
|
* 第三方登录支持Microsoft ([beb7a4c](https://github.com/certd/certd/commit/beb7a4c99277262bb9681c5594cfcd3e36c52074))
|
||||||
|
* 优化zerossl申请证书稳定性 ([4d86fb3](https://github.com/certd/certd/commit/4d86fb319b81dbf6fa6485982105725b1b066593))
|
||||||
|
|
||||||
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -41,9 +41,7 @@ Certd® 是一个免费的全自动证书管理系统,让你的网站证书永
|
|||||||
* **多语言支持**: 中英双语切换
|
* **多语言支持**: 中英双语切换
|
||||||
* **无忧升级**: 版本向下兼容
|
* **无忧升级**: 版本向下兼容
|
||||||
|
|
||||||
|

|
||||||

|
|
||||||
|
|
||||||
|
|
||||||
## 二、在线体验
|
## 二、在线体验
|
||||||
|
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ services:
|
|||||||
# - certd_typeorm_dataSource_default_password=yourpasswd # 密码
|
# - certd_typeorm_dataSource_default_password=yourpasswd # 密码
|
||||||
# - certd_typeorm_dataSource_default_database=certd # 数据库名
|
# - certd_typeorm_dataSource_default_database=certd # 数据库名
|
||||||
|
|
||||||
# #↓↓↓↓ ----------------------------- 使用mysql数据库,需要提前创建数据库 charset=utf8mb4, collation=utf8mb4_bin
|
# #↓↓↓↓ ----------------------------- 使用mysql8数据库,需要提前创建数据库 charset=utf8mb4, collation=utf8mb4_bin
|
||||||
# - certd_flyway_scriptDir=./db/migration-mysql # 升级脚本目录
|
# - certd_flyway_scriptDir=./db/migration-mysql # 升级脚本目录
|
||||||
# - certd_typeorm_dataSource_default_type=mysql # 数据库类型, 或者 mariadb
|
# - certd_typeorm_dataSource_default_type=mysql # 数据库类型, 或者 mariadb
|
||||||
# - certd_typeorm_dataSource_default_host=localhost # 数据库地址
|
# - certd_typeorm_dataSource_default_host=localhost # 数据库地址
|
||||||
|
|||||||
@@ -3,6 +3,91 @@
|
|||||||
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.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复1panel2.1.0新版本测试失败的问题 ([8ef1f2e](https://github.com/certd/certd/commit/8ef1f2e395ea5969a95f55535e6c16a65e2b463b))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化登陆页面的黑暗模式 ([e47edda](https://github.com/certd/certd/commit/e47eddaa858f8fffe7a40dfbd14e8cda1dcba4ac))
|
||||||
|
* 支持自定义发件人名称,格式:名称<邮箱> ([bab9adc](https://github.com/certd/certd/commit/bab9adce240108d4291eedc67e04abc4a01019e0))
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复1panel 请求失败的bug ([0283662](https://github.com/certd/certd/commit/0283662931ff47d6b5d49f91a30c4a002fe1d108))
|
||||||
|
* 修复阿里云dcdn使用上传到cas的id引用错误的bug ([61800b2](https://github.com/certd/certd/commit/61800b23e2be324169990810d1176c18decabb23))
|
||||||
|
* 修复保存站点监控dns设置,偶尔无法保存成功的bug ([8387fe0](https://github.com/certd/certd/commit/8387fe0d5b2e77b8c2788a10791e5389d97a3e41))
|
||||||
|
* 修复任务步骤标题过长导致错位的问题 ([9fb9805](https://github.com/certd/certd/commit/9fb980599f96ccbf61bd46019411db2f13c70e57))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 421 支持3次重试 ([b91548e](https://github.com/certd/certd/commit/b91548eef4c24faa822d3a40f1f6a77b41d274e4))
|
||||||
|
* 备份支持scp上传 ([66ac471](https://github.com/certd/certd/commit/66ac4716f2565d7ee827461b625397ae21599451))
|
||||||
|
* 监控设置支持逗号分割 ([c23d1d1](https://github.com/certd/certd/commit/c23d1d11b58a6cdfe431a7e8abbd5d955146c38d))
|
||||||
|
* 列表中支持下次执行时间显示 ([a3cabd5](https://github.com/certd/certd/commit/a3cabd5f36ed41225ad418098596e9b2c44e31a1))
|
||||||
|
* 模版编辑页面,hover反色过亮问题优化 ([e55a3a8](https://github.com/certd/certd/commit/e55a3a82fc6939b940f0c3be4529d74a625f6f4e))
|
||||||
|
* 群晖支持刷新登录有效期 ([42c7ec2](https://github.com/certd/certd/commit/42c7ec2f75947e2b8298d6605d4dbcd441aacd51))
|
||||||
|
* 所有授权增加测试按钮 ([7a3e68d](https://github.com/certd/certd/commit/7a3e68d656c1dcdcd814b69891bd2c2c6fe3098a))
|
||||||
|
* 新网互联支持查询域名列表 ([e7e54bc](https://github.com/certd/certd/commit/e7e54bc19e3a734913a93a94e25db3bb06d2ab0f))
|
||||||
|
* 优化京东云报错详情显示 ([1195417](https://github.com/certd/certd/commit/1195417b9714d2fcb540e43c0a20809b7ee2052b))
|
||||||
|
* 优化网络测试页面,夜间模式显示效果 ([305da86](https://github.com/certd/certd/commit/305da86f97d918374819ecd6c50685f09b94ea59))
|
||||||
|
* 增加部署证书到certd本身插件 ([3cd1aae](https://github.com/certd/certd/commit/3cd1aaeb035f8af79714030889b2b4dc259b700e))
|
||||||
|
* 支持next-terminal ([6f3fd78](https://github.com/certd/certd/commit/6f3fd785e77a33c72bdf4115dc5d498e677d1863))
|
||||||
|
* 主题默认跟随系统颜色(自动切换深色浅色模式) ([32c3ce5](https://github.com/certd/certd/commit/32c3ce5c9868569523901a9a939ca5b535ec3277))
|
||||||
|
* http校验方式支持scp上传 ([4eb940f](https://github.com/certd/certd/commit/4eb940ffe765a0330331bc6af8396315e36d4e4a))
|
||||||
|
|
||||||
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复部署到openwrt错误的bug ([9ac33f9](https://github.com/certd/certd/commit/9ac33f9b9ba7727fcbbd320dd866bc048cbb3d72))
|
||||||
|
* 修复新版本上传到阿里云cas后,其他依赖任务无法部署的bug ([99f5b8e](https://github.com/certd/certd/commit/99f5b8ebc1c64798ceb42042ad71cf71e967beb0))
|
||||||
|
* esxi部署失败的bug ([6ab1fca](https://github.com/certd/certd/commit/6ab1fcaf894f7ce343af4b5bf4b0d67438df6618))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 修改sql升级语句,兼容mysql5.7 ([02f89a9](https://github.com/certd/certd/commit/02f89a9c9d77850437285844670aed441e5953c3))
|
||||||
|
* 已登录状态访问登录页面自动跳转到首页 ([bd8caff](https://github.com/certd/certd/commit/bd8caff0b754cb13530cf0f1644b33e29fde5d01))
|
||||||
|
* 优化access授权支持remote-auto-complete ([2f40f79](https://github.com/certd/certd/commit/2f40f795ee6131132d3fab2601f92a567bbdc4b7))
|
||||||
|
* access 插件支持remote-select等配置 ([d286c04](https://github.com/certd/certd/commit/d286c040a5232dcca829945734affead3ee08b3c))
|
||||||
|
|
||||||
|
## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 双重验证显示secret ([febd6d3](https://github.com/certd/certd/commit/febd6d32cfe6d89ccecf26bf15141df7c456e5c6))
|
||||||
|
* 优化申请证书最大超时时长 ([00f67d8](https://github.com/certd/certd/commit/00f67d86d68f4f83cfafe2fbfeb4af0d86f9d20e))
|
||||||
|
* 支持设置默认的证书申请地址的反向代理 ([0cfb94b](https://github.com/certd/certd/commit/0cfb94b0ba6a6dc3bb0d0a81a1912068a4e6b6b6))
|
||||||
|
* 子域名托管域名支持配置通配符 ([3f7ac93](https://github.com/certd/certd/commit/3f7ac939326b0c7ec013a7534b6c0e58fb3e8cb4))
|
||||||
|
|
||||||
|
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复有域名记录时,域名输入框无法关闭的bug ([54c8217](https://github.com/certd/certd/commit/54c8217808453b121abf646b004596f28932509f))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* eab从更多参数中挪到外面 ([5ea4f46](https://github.com/certd/certd/commit/5ea4f46de7ae403a7a16e9488dc1d9c7523d019a))
|
||||||
|
* 第三方登录支持Microsoft ([beb7a4c](https://github.com/certd/certd/commit/beb7a4c99277262bb9681c5594cfcd3e36c52074))
|
||||||
|
* 优化zerossl申请证书稳定性 ([4d86fb3](https://github.com/certd/certd/commit/4d86fb319b81dbf6fa6485982105725b1b066593))
|
||||||
|
|
||||||
|
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复新网找错域名的bug ([bd511f9](https://github.com/certd/certd/commit/bd511f97cb7fbdcaeff7ac899f0460a5c7b41826))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 当域名管理中没有域名时,创建流水线时不展开域名选择框 ([9166a57](https://github.com/certd/certd/commit/9166a579301a60750f0b72b6a42b0c8d730695fd))
|
||||||
|
* count tip ([e19743f](https://github.com/certd/certd/commit/e19743f70553700f1f91bff76f87370f749dd247))
|
||||||
|
* oauth支持github 和google, 修复头像显示问题 ([693a4a6](https://github.com/certd/certd/commit/693a4a663385ced3176286bf4b5f3566da83d90e))
|
||||||
|
|
||||||
## [1.38.5](https://github.com/certd/certd/compare/v1.38.4...v1.38.5) (2026-02-02)
|
## [1.38.5](https://github.com/certd/certd/compare/v1.38.4...v1.38.5) (2026-02-02)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -40,37 +40,38 @@
|
|||||||
| 36.| **腾讯云COS授权** | 腾讯云对象存储授权,包含地域和存储桶 |
|
| 36.| **腾讯云COS授权** | 腾讯云对象存储授权,包含地域和存储桶 |
|
||||||
| 37.| **s3/minio授权** | S3/minio oss授权 |
|
| 37.| **s3/minio授权** | S3/minio oss授权 |
|
||||||
| 38.| **namesilo授权** | |
|
| 38.| **namesilo授权** | |
|
||||||
| 39.| **1panel授权** | 账号和密码 |
|
| 39.| **Next Terminal 授权** | 用于访问 Next Terminal API 的授权配置 |
|
||||||
| 40.| **支付宝** | |
|
| 40.| **1panel授权** | 账号和密码 |
|
||||||
| 41.| **白山云授权** | |
|
| 41.| **支付宝** | |
|
||||||
| 42.| **宝塔云WAF授权** | 用于连接和管理宝塔云WAF服务的授权配置 |
|
| 42.| **白山云授权** | |
|
||||||
| 43.| **cdnfly授权** | |
|
| 43.| **宝塔云WAF授权** | 用于连接和管理宝塔云WAF服务的授权配置 |
|
||||||
| 44.| **k8s授权** | |
|
| 44.| **cdnfly授权** | |
|
||||||
| 45.| **括彩云cdn授权** | 括彩云CDN,每月免费30G,[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) |
|
| 45.| **k8s授权** | |
|
||||||
| 46.| **LeCDN授权** | |
|
| 46.| **括彩云cdn授权** | 括彩云CDN,每月免费30G,[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) |
|
||||||
| 47.| **lucky** | |
|
| 47.| **LeCDN授权** | |
|
||||||
| 48.| **猫云授权** | |
|
| 48.| **lucky** | |
|
||||||
| 49.| **plesk授权** | |
|
| 49.| **猫云授权** | |
|
||||||
| 50.| **长亭雷池授权** | |
|
| 50.| **plesk授权** | |
|
||||||
| 51.| **群晖登录授权** | |
|
| 51.| **长亭雷池授权** | |
|
||||||
| 52.| **uniCloud** | unicloud授权 |
|
| 52.| **群晖登录授权** | |
|
||||||
| 53.| **微信支付** | |
|
| 53.| **uniCloud** | unicloud授权 |
|
||||||
| 54.| **易盾rcdn授权** | 易盾CDN,每月免费30G,[注册即领](https://rhcdn.yiduncdn.com/register?code=8mn536rrzfbf8) |
|
| 54.| **微信支付** | |
|
||||||
| 55.| **易发云短信** | sms.yfyidc.cn/ |
|
| 55.| **易盾rcdn授权** | 易盾CDN,每月免费30G,[注册即领](https://rhcdn.yiduncdn.com/register?code=8mn536rrzfbf8) |
|
||||||
| 56.| **易盾DCDN授权** | https://user.yiduncdn.com |
|
| 56.| **易发云短信** | sms.yfyidc.cn/ |
|
||||||
| 57.| **易支付** | |
|
| 57.| **易盾DCDN授权** | https://user.yiduncdn.com |
|
||||||
| 58.| **proxmox** | |
|
| 58.| **易支付** | |
|
||||||
| 59.| **UCloud授权** | 优刻得授权 |
|
| 59.| **proxmox** | |
|
||||||
| 60.| **又拍云** | |
|
| 60.| **UCloud授权** | 优刻得授权 |
|
||||||
| 61.| **网宿授权** | |
|
| 61.| **又拍云** | |
|
||||||
| 62.| **西部数码授权** | |
|
| 62.| **网宿授权** | |
|
||||||
| 63.| **我爱云授权** | 我爱云CDN |
|
| 63.| **西部数码授权** | |
|
||||||
| 64.| **新网授权(代理方式)** | |
|
| 64.| **我爱云授权** | 我爱云CDN |
|
||||||
| 65.| **新网授权** | |
|
| 65.| **新网授权(代理方式)** | |
|
||||||
| 66.| **新网互联授权** | 仅支持代理账号,ip需要加入白名单 |
|
| 66.| **新网授权** | |
|
||||||
| 67.| **Zenlayer授权** | Zenlayer授权 |
|
| 67.| **新网互联授权** | 仅支持代理账号,ip需要加入白名单 |
|
||||||
| 68.| **GoEdge授权** | |
|
| 68.| **Zenlayer授权** | Zenlayer授权 |
|
||||||
| 69.| **雨云授权** | https://app.rainyun.com/ |
|
| 69.| **GoEdge授权** | |
|
||||||
|
| 70.| **雨云授权** | https://app.rainyun.com/ |
|
||||||
|
|
||||||
<style module>
|
<style module>
|
||||||
table th:first-of-type {
|
table th:first-of-type {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# 任务插件
|
# 任务插件
|
||||||
共 `122` 款任务插件
|
共 `125` 款任务插件
|
||||||
## 1. 证书申请
|
## 1. 证书申请
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
@@ -57,24 +57,26 @@
|
|||||||
| 2.| **AcePanel-面板证书** | 部署AcePanel面板证书 |
|
| 2.| **AcePanel-面板证书** | 部署AcePanel面板证书 |
|
||||||
| 3.| **Dokploy-部署server证书** | 自动更新Dokploy server证书 |
|
| 3.| **Dokploy-部署server证书** | 自动更新Dokploy server证书 |
|
||||||
| 4.| **飞牛NAS-部署证书** | |
|
| 4.| **飞牛NAS-部署证书** | |
|
||||||
| 5.| **1Panel-部署面板证书** | 更新1Panel的面板证书 |
|
| 5.| **NextTerminal-更新证书** | 更新 Next Terminal 证书 |
|
||||||
| 6.| **1Panel-更新证书** | 更新1Panel的证书,包括面板证书和站点证书 |
|
| 6.| **1Panel-部署面板证书** | 更新1Panel的面板证书 |
|
||||||
| 7.| **宝塔-删除过期证书** | 删除证书夹中过期证书 |
|
| 7.| **1Panel-更新站点证书** | 更新1Panel的站点证书 |
|
||||||
| 8.| **宝塔-WAF证书部署** | 部署宝塔云WAF/aaWAF |
|
| 8.| **宝塔-删除过期证书** | 删除证书夹中过期证书 |
|
||||||
| 9.| **宝塔-面板证书部署** | 部署宝塔面板本身的ssl证书 |
|
| 9.| **宝塔-WAF证书部署** | 部署宝塔云WAF/aaWAF |
|
||||||
| 10.| **宝塔win-网站证书部署** | 部署到Windows版宝塔管理的站点的ssl证书 |
|
| 10.| **宝塔-面板证书部署** | 部署宝塔面板本身的ssl证书 |
|
||||||
| 11.| **宝塔-网站证书部署** | 部署宝塔管理的站点的ssl证书,目前支持宝塔网站站点、docker站点等。本插件也支持aaPanel。 |
|
| 11.| **宝塔win-网站证书部署** | 部署到Windows版宝塔管理的站点的ssl证书 |
|
||||||
| 12.| **K8S-Apply自定义yaml** | apply自定义yaml到k8s |
|
| 12.| **宝塔-网站证书部署** | 部署宝塔管理的站点的ssl证书,目前支持宝塔网站站点、docker站点等。本插件也支持aaPanel。 |
|
||||||
| 13.| **K8S-Ingress 证书部署** | 部署证书到k8s的Ingress |
|
| 13.| **K8S-Apply自定义yaml** | apply自定义yaml到k8s |
|
||||||
| 14.| **K8S-部署证书到Secret** | 部署证书到k8s的secret |
|
| 14.| **K8S-Ingress 证书部署** | 部署证书到k8s的Ingress |
|
||||||
| 15.| **lucky-更新Lucky证书** | |
|
| 15.| **K8S-部署证书到Secret** | 部署证书到k8s的secret |
|
||||||
| 16.| **Plesk-部署Plesk网站证书** | |
|
| 16.| **lucky-更新Lucky证书** | |
|
||||||
| 17.| **Plesk-更新证书** | 不会创建新证书记录,直接更新旧的证书 |
|
| 17.| **Plesk-部署Plesk网站证书** | |
|
||||||
| 18.| **雷池-更新证书** | 更新长亭雷池WAF的证书 |
|
| 18.| **Plesk-更新证书** | 不会创建新证书记录,直接更新旧的证书 |
|
||||||
| 19.| **群晖-部署证书到群晖面板** | Synology,支持6.x以上版本 |
|
| 19.| **雷池-更新证书(支持控制台和防护应用)** | 更新长亭雷池WAF的证书,支持更新控制台和防护应用的证书。 |
|
||||||
| 20.| **uniCloud-部署到服务空间** | 部署到服务空间 |
|
| 20.| **群晖-部署证书到群晖面板** | Synology,支持6.x以上版本 |
|
||||||
| 21.| **Proxmox-上传证书到Proxmox** | |
|
| 21.| **群晖-刷新OTP登录有效期** | 群晖登录状态可能30天失效,需要在失效之前登录一次,刷新有效期,您可以将其放在“部署到群晖面板”任务之后 |
|
||||||
| 22.| **威联通-部署证书到威联通** | 部署证书到qnap |
|
| 22.| **uniCloud-部署到服务空间** | 部署到服务空间 |
|
||||||
|
| 23.| **Proxmox-上传证书到Proxmox** | |
|
||||||
|
| 24.| **威联通-部署证书到威联通** | 部署证书到qnap |
|
||||||
## 5. 阿里云
|
## 5. 阿里云
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
@@ -182,7 +184,8 @@
|
|||||||
|-----|-----|-----|
|
|-----|-----|-----|
|
||||||
| 1.| **数据库备份** | 【仅管理员可用】仅支持备份SQLite数据库 |
|
| 1.| **数据库备份** | 【仅管理员可用】仅支持备份SQLite数据库 |
|
||||||
| 2.| **重启 Certd** | 【仅管理员可用】 重启 certd的https服务,用于更新 Certd 的 ssl 证书 |
|
| 2.| **重启 Certd** | 【仅管理员可用】 重启 certd的https服务,用于更新 Certd 的 ssl 证书 |
|
||||||
| 3.| **自定义js脚本** | 【仅管理员】运行自定义js脚本执行 |
|
| 3.| **部署证书到Certd本身** | 【仅管理员可用】 部署证书到 certd的https服务,用于更新 Certd 的 ssl 证书,建议将此任务放在流水线的最后一步 |
|
||||||
|
| 4.| **自定义js脚本** | 【仅管理员】运行自定义js脚本执行 |
|
||||||
|
|
||||||
<style module>
|
<style module>
|
||||||
table th:first-of-type {
|
table th:first-of-type {
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 51 KiB |
|
Before Width: | Height: | Size: 33 KiB |
|
After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 28 KiB |
@@ -16,21 +16,11 @@ CERTD_HTTPS_port=7002
|
|||||||
|
|
||||||
参考Certd顶部的创建证书流水线教程
|
参考Certd顶部的创建证书流水线教程
|
||||||
|
|
||||||
### 2、配置复制到本机任务
|
### 2、配置部署证书到certd任务
|
||||||
将证书复制到certd的证书安装位置
|
|
||||||
证书路径:`ssl/cert.crt`
|
|
||||||
私钥路径:`ssl/cert.key`
|
|
||||||
|
|
||||||

|

|
||||||

|
|
||||||
|
|
||||||
### 3、配置重启Certd任务
|
### 3、配置定时任务
|
||||||
重启certd的https server,让证书生效
|
|
||||||

|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
### 4、配置定时任务
|
|
||||||
每天定时执行,最终效果如下
|
每天定时执行,最终效果如下
|
||||||
|
|
||||||

|

|
||||||
|
|||||||
@@ -9,5 +9,5 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"npmClient": "pnpm",
|
"npmClient": "pnpm",
|
||||||
"version": "1.38.6"
|
"version": "1.38.11"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,31 @@
|
|||||||
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.38.11](https://github.com/publishlab/node-acme-client/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/publishlab/node-acme-client/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.38.9](https://github.com/publishlab/node-acme-client/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.38.8](https://github.com/publishlab/node-acme-client/compare/v1.38.7...v1.38.8) (2026-02-06)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化申请证书最大超时时长 ([00f67d8](https://github.com/publishlab/node-acme-client/commit/00f67d86d68f4f83cfafe2fbfeb4af0d86f9d20e))
|
||||||
|
* 支持设置默认的证书申请地址的反向代理 ([0cfb94b](https://github.com/publishlab/node-acme-client/commit/0cfb94b0ba6a6dc3bb0d0a81a1912068a4e6b6b6))
|
||||||
|
|
||||||
|
## [1.38.7](https://github.com/publishlab/node-acme-client/compare/v1.38.6...v1.38.7) (2026-02-05)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化zerossl申请证书稳定性 ([4d86fb3](https://github.com/publishlab/node-acme-client/commit/4d86fb319b81dbf6fa6485982105725b1b066593))
|
||||||
|
|
||||||
## [1.38.6](https://github.com/publishlab/node-acme-client/compare/v1.38.5...v1.38.6) (2026-02-04)
|
## [1.38.6](https://github.com/publishlab/node-acme-client/compare/v1.38.5...v1.38.6) (2026-02-04)
|
||||||
|
|
||||||
**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.38.6",
|
"version": "1.38.11",
|
||||||
"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.38.6",
|
"@certd/basic": "^1.38.11",
|
||||||
"@peculiar/x509": "^1.11.0",
|
"@peculiar/x509": "^1.11.0",
|
||||||
"asn1js": "^3.0.5",
|
"asn1js": "^3.0.5",
|
||||||
"axios": "^1.9.0",
|
"axios": "^1.9.0",
|
||||||
@@ -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": "eeb1f27fa47ddc616451f3e5a8fb8d1de345d252"
|
"gitHead": "1f002159e2a3c73fb5e00341a344effa07d6f653"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -600,8 +600,11 @@ class AcmeClient {
|
|||||||
throw new Error(`[${d}] Unexpected item status: ${resp.data.status}`);
|
throw new Error(`[${d}] Unexpected item status: ${resp.data.status}`);
|
||||||
};
|
};
|
||||||
|
|
||||||
this.log(`[${d}] Waiting for valid status (等待valid状态): ${item.url}`, this.backoffOpts);
|
this.log(`[${d}] Waiting for valid status (等待valid状态): ${item.url}`, JSON.stringify(this.backoffOpts));
|
||||||
return util.retry(verifyFn, this.backoffOpts);
|
const log = (...args)=>{
|
||||||
|
this.logger.info(...args)
|
||||||
|
}
|
||||||
|
return util.retry(verifyFn, this.backoffOpts,log);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -74,8 +74,9 @@ class HttpClient {
|
|||||||
if (this.urlMapping && this.urlMapping.enabled && this.urlMapping.mappings) {
|
if (this.urlMapping && this.urlMapping.enabled && this.urlMapping.mappings) {
|
||||||
// eslint-disable-next-line no-restricted-syntax
|
// eslint-disable-next-line no-restricted-syntax
|
||||||
for (const key in this.urlMapping.mappings) {
|
for (const key in this.urlMapping.mappings) {
|
||||||
|
const value = this.urlMapping.mappings[key];
|
||||||
if (url.includes(key)) {
|
if (url.includes(key)) {
|
||||||
const newUrl = url.replace(key, this.urlMapping.mappings[key]);
|
const newUrl = url.replace(key, value);
|
||||||
this.log(`use reverse proxy: ${newUrl}`);
|
this.log(`use reverse proxy: ${newUrl}`);
|
||||||
url = newUrl;
|
url = newUrl;
|
||||||
}
|
}
|
||||||
@@ -193,7 +194,7 @@ class HttpClient {
|
|||||||
const dir = await this.getDirectory();
|
const dir = await this.getDirectory();
|
||||||
|
|
||||||
if (!dir[resource]) {
|
if (!dir[resource]) {
|
||||||
throw new Error(`Unable to locate API resource URL in ACME directory: "${resource}"`);
|
throw new Error(`Unable to locate API resource URL in ACME directory: "${resource}",获取ACME接口地址信息失败,可能网络不稳定或该证书颁发机构服务器崩溃,目录地址:${this.directoryUrl},请测试地址是否可以正常访问并显示json格式的URL地址列表`);
|
||||||
}
|
}
|
||||||
|
|
||||||
return dir[resource];
|
return dir[resource];
|
||||||
|
|||||||
@@ -57,6 +57,32 @@ export function getDirectoryUrl(opts) {
|
|||||||
return list.production
|
return list.production
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export function getAllSslProviderDomains() {
|
||||||
|
const list = Object.values(directory).map((item) => {
|
||||||
|
let url = item.production.replace('https://', '')
|
||||||
|
url = url.substring(0, url.indexOf('/'))
|
||||||
|
return url
|
||||||
|
})
|
||||||
|
return list
|
||||||
|
}
|
||||||
|
|
||||||
|
let sslProviderReverseProxies = {}
|
||||||
|
|
||||||
|
function initSslProviderReverseProxies() {
|
||||||
|
for (const sslProvider of getAllSslProviderDomains()) {
|
||||||
|
sslProviderReverseProxies[sslProvider] = ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
initSslProviderReverseProxies()
|
||||||
|
|
||||||
|
export function getSslProviderReverseProxies() {
|
||||||
|
return sslProviderReverseProxies
|
||||||
|
}
|
||||||
|
export function setSslProviderReverseProxies(reverseProxies) {
|
||||||
|
Object.assign(sslProviderReverseProxies, reverseProxies)
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Crypto
|
* Crypto
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -52,11 +52,17 @@ async function retryPromise(fn, attempts, backoff, logger = log) {
|
|||||||
let aborted = false;
|
let aborted = false;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const data = await fn(() => { aborted = true; });
|
const setAbort = () => { aborted = true; }
|
||||||
|
const data = await fn(setAbort);
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
catch (e) {
|
catch (e) {
|
||||||
if (aborted || ((backoff.attempts + 1) >= attempts)) {
|
if (aborted){
|
||||||
|
logger(`用户取消重试`);
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
if ( ((backoff.attempts + 1) >= attempts)) {
|
||||||
|
logger(`重试次数超过${attempts}次`);
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -118,6 +118,9 @@ export const directory: {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export function getDirectoryUrl(opts:{sslProvider:string, pkType: string}): string;
|
export function getDirectoryUrl(opts:{sslProvider:string, pkType: string}): string;
|
||||||
|
export function getAllSslProviderDomains(): string[];
|
||||||
|
export function getSslProviderReverseProxies(): Record<string, string>;
|
||||||
|
export function setSslProviderReverseProxies(reverseProxies: Record<string, string>): void;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Crypto
|
* Crypto
|
||||||
|
|||||||
@@ -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.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 421 支持3次重试 ([b91548e](https://github.com/certd/certd/commit/b91548eef4c24faa822d3a40f1f6a77b41d274e4))
|
||||||
|
|
||||||
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* esxi部署失败的bug ([6ab1fca](https://github.com/certd/certd/commit/6ab1fcaf894f7ce343af4b5bf4b0d67438df6618))
|
||||||
|
|
||||||
|
## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/basic
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
01:13
|
23:40
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/basic",
|
"name": "@certd/basic",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.38.6",
|
"version": "1.38.11",
|
||||||
"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": "eeb1f27fa47ddc616451f3e5a8fb8d1de345d252"
|
"gitHead": "1f002159e2a3c73fb5e00341a344effa07d6f653"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ export function resetLogConfigure() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
resetLogConfigure();
|
resetLogConfigure();
|
||||||
export const logger = log4js.getLogger("default");
|
export const logger: ILogger = log4js.getLogger("default") as any;
|
||||||
|
|
||||||
export function resetLogFilePath(filePath: string) {
|
export function resetLogFilePath(filePath: string) {
|
||||||
logFilePath = filePath;
|
logFilePath = filePath;
|
||||||
@@ -77,6 +77,8 @@ export type ILogger = {
|
|||||||
fatal(message: any, ...args: any[]): void;
|
fatal(message: any, ...args: any[]): void;
|
||||||
|
|
||||||
mark(message: any, ...args: any[]): void;
|
mark(message: any, ...args: any[]): void;
|
||||||
|
|
||||||
|
addSecret(secret: string): void;
|
||||||
};
|
};
|
||||||
|
|
||||||
const locale = Intl.DateTimeFormat().resolvedOptions().locale;
|
const locale = Intl.DateTimeFormat().resolvedOptions().locale;
|
||||||
@@ -106,10 +108,14 @@ export class PipelineLogger implements ILogger {
|
|||||||
|
|
||||||
constructor(name: string, write: (text: string) => void) {
|
constructor(name: string, write: (text: string) => void) {
|
||||||
this.customWriter = write;
|
this.customWriter = write;
|
||||||
|
//@ts-ignore
|
||||||
this.logger = log4js.getLogger(name);
|
this.logger = log4js.getLogger(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
addSecret(secret: string) {
|
addSecret(secret: string) {
|
||||||
|
if (!secret) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
this._secrets.push(secret);
|
this._secrets.push(secret);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import * as _ from 'lodash-es';
|
import * as _ from "lodash-es";
|
||||||
function isUnMergeable(srcValue: any) {
|
function isUnMergeable(srcValue: any) {
|
||||||
return srcValue != null && srcValue instanceof UnMergeable;
|
return srcValue != null && srcValue instanceof UnMergeable;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import * as https from "node:https";
|
|||||||
import { merge } from "lodash-es";
|
import { merge } from "lodash-es";
|
||||||
import { safePromise } from "./util.promise.js";
|
import { safePromise } from "./util.promise.js";
|
||||||
import fs from "fs";
|
import fs from "fs";
|
||||||
|
import sleep from "./util.sleep.js";
|
||||||
const errorMap: Record<string, string> = {
|
const errorMap: Record<string, string> = {
|
||||||
"ssl3_get_record:wrong version number": "http协议错误,服务端要求http协议,请检查是否使用了https请求",
|
"ssl3_get_record:wrong version number": "http协议错误,服务端要求http协议,请检查是否使用了https请求",
|
||||||
"getaddrinfo EAI_AGAIN": "无法解析域名,请检查网络连接或dns配置,更换docker-compose.yaml中dns配置",
|
"getaddrinfo EAI_AGAIN": "无法解析域名,请检查网络连接或dns配置,更换docker-compose.yaml中dns配置",
|
||||||
@@ -148,6 +148,16 @@ export function createAxiosService({ logger }: { logger: ILogger }) {
|
|||||||
// });
|
// });
|
||||||
// config.httpsAgent = agent;
|
// config.httpsAgent = agent;
|
||||||
config.proxy = false; //必须 否则还会走一层代理,
|
config.proxy = false; //必须 否则还会走一层代理,
|
||||||
|
|
||||||
|
config.retry = merge(
|
||||||
|
{
|
||||||
|
status: [421],
|
||||||
|
count: 0,
|
||||||
|
max: 3,
|
||||||
|
delay: 1000,
|
||||||
|
},
|
||||||
|
config.retry
|
||||||
|
);
|
||||||
return config;
|
return config;
|
||||||
},
|
},
|
||||||
(error: Error) => {
|
(error: Error) => {
|
||||||
@@ -175,7 +185,7 @@ export function createAxiosService({ logger }: { logger: ILogger }) {
|
|||||||
}
|
}
|
||||||
return response.data;
|
return response.data;
|
||||||
},
|
},
|
||||||
(error: any) => {
|
async (error: any) => {
|
||||||
const status = error.response?.status;
|
const status = error.response?.status;
|
||||||
let message = "";
|
let message = "";
|
||||||
switch (status) {
|
switch (status) {
|
||||||
@@ -215,6 +225,9 @@ export function createAxiosService({ logger }: { logger: ILogger }) {
|
|||||||
case 302:
|
case 302:
|
||||||
//重定向
|
//重定向
|
||||||
return Promise.resolve(error.response);
|
return Promise.resolve(error.response);
|
||||||
|
case 421:
|
||||||
|
message = "源站请求超时";
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -256,6 +269,22 @@ export function createAxiosService({ logger }: { logger: ILogger }) {
|
|||||||
if (error instanceof AggregateError) {
|
if (error instanceof AggregateError) {
|
||||||
logger.error("AggregateError", error);
|
logger.error("AggregateError", error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const originalRequest = error.config || {};
|
||||||
|
logger.info(`config`, originalRequest);
|
||||||
|
const retry = originalRequest.retry || {};
|
||||||
|
if (retry.status && retry.status.includes(status)) {
|
||||||
|
if (retry.max > 0 && retry.count < retry.max) {
|
||||||
|
// 重试次数增加
|
||||||
|
retry.count++;
|
||||||
|
const delay = retry.delay * retry.count;
|
||||||
|
logger.error(`status=${status},重试次数${retry.count},将在${delay}ms后重试,请求地址:${originalRequest.url}`);
|
||||||
|
await sleep(delay);
|
||||||
|
return service.request(originalRequest); // 重试请求
|
||||||
|
}
|
||||||
|
logger.error(`重试超过最大次数${retry.max},请求失败:${originalRequest.url}`);
|
||||||
|
}
|
||||||
|
|
||||||
const err = new HttpError(error);
|
const err = new HttpError(error);
|
||||||
if (error.response?.config?.logParams === false) {
|
if (error.response?.config?.logParams === false) {
|
||||||
delete err.request?.params;
|
delete err.request?.params;
|
||||||
|
|||||||
@@ -13,6 +13,19 @@
|
|||||||
|
|
||||||
// await testLocker();
|
// await testLocker();
|
||||||
|
|
||||||
import { domainUtils } from "./dist/utils/util.domain.js";
|
// import { domainUtils } from "./dist/utils/util.domain.js";
|
||||||
|
|
||||||
console.log(domainUtils.isIpv6("::0:0:0:FFFF:129.144.52.38"));
|
// console.log(domainUtils.isIpv6("::0:0:0:FFFF:129.144.52.38"));
|
||||||
|
|
||||||
|
// import { http } from "./dist/utils/util.request.js";
|
||||||
|
|
||||||
|
// http
|
||||||
|
// .request({
|
||||||
|
// url: "https://www.baidu.com/234234/3333",
|
||||||
|
// retry: {
|
||||||
|
// status: [404],
|
||||||
|
// },
|
||||||
|
// })
|
||||||
|
// .then(res => {
|
||||||
|
// console.log(res.data);
|
||||||
|
// });
|
||||||
|
|||||||
@@ -3,6 +3,32 @@
|
|||||||
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.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复1panel 请求失败的bug ([0283662](https://github.com/certd/certd/commit/0283662931ff47d6b5d49f91a30c4a002fe1d108))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 所有授权增加测试按钮 ([7a3e68d](https://github.com/certd/certd/commit/7a3e68d656c1dcdcd814b69891bd2c2c6fe3098a))
|
||||||
|
|
||||||
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
||||||
|
|
||||||
**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.38.6",
|
"version": "1.38.11",
|
||||||
"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.38.6",
|
"@certd/basic": "^1.38.11",
|
||||||
"@certd/plus-core": "^1.38.6",
|
"@certd/plus-core": "^1.38.11",
|
||||||
"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": "eeb1f27fa47ddc616451f3e5a8fb8d1de345d252"
|
"gitHead": "1f002159e2a3c73fb5e00341a344effa07d6f653"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,13 +4,13 @@ import { HttpClient, ILogger, utils } from "@certd/basic";
|
|||||||
import * as _ from "lodash-es";
|
import * as _ from "lodash-es";
|
||||||
import { PluginRequestHandleReq } from "../plugin/index.js";
|
import { PluginRequestHandleReq } from "../plugin/index.js";
|
||||||
|
|
||||||
export type AccessRequestHandleReqInput<T = any> = {
|
// export type AccessRequestHandleReqInput<T = any> = {
|
||||||
id?: number;
|
// id?: number;
|
||||||
title?: string;
|
// title?: string;
|
||||||
access: T;
|
// access: T;
|
||||||
};
|
// };
|
||||||
|
|
||||||
export type AccessRequestHandleReq<T = any> = PluginRequestHandleReq<AccessRequestHandleReqInput<T>>;
|
export type AccessRequestHandleReq<T = any> = PluginRequestHandleReq<T>;
|
||||||
|
|
||||||
export type AccessInputDefine = FormItemProps & {
|
export type AccessInputDefine = FormItemProps & {
|
||||||
title: string;
|
title: string;
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ export type PluginRequestHandleReq<T = any> = {
|
|||||||
action: string;
|
action: string;
|
||||||
input: T;
|
input: T;
|
||||||
data: any;
|
data: any;
|
||||||
|
record: { id: number; type: string; title: string };
|
||||||
};
|
};
|
||||||
|
|
||||||
export type UserInfo = {
|
export type UserInfo = {
|
||||||
@@ -298,6 +299,14 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
|
|||||||
buildDomainGroupOptions(options: any[], domains: string[]) {
|
buildDomainGroupOptions(options: any[], domains: string[]) {
|
||||||
return utils.options.buildGroupOptions(options, domains);
|
return utils.options.buildGroupOptions(options, domains);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getLastStatus(): Runnable {
|
||||||
|
return this.ctx.lastStatus || ({} as any);
|
||||||
|
}
|
||||||
|
|
||||||
|
getLastOutput(key: string) {
|
||||||
|
return this.getLastStatus().status?.output?.[key];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export type OutputVO = {
|
export type OutputVO = {
|
||||||
|
|||||||
@@ -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.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
||||||
|
|
||||||
**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.38.6",
|
"version": "1.38.11",
|
||||||
"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": "eeb1f27fa47ddc616451f3e5a8fb8d1de345d252"
|
"gitHead": "1f002159e2a3c73fb5e00341a344effa07d6f653"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
||||||
|
|
||||||
**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.38.6",
|
"version": "1.38.11",
|
||||||
"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": "eeb1f27fa47ddc616451f3e5a8fb8d1de345d252"
|
"gitHead": "1f002159e2a3c73fb5e00341a344effa07d6f653"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
||||||
|
|
||||||
**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.38.6",
|
"version": "1.38.11",
|
||||||
"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": "eeb1f27fa47ddc616451f3e5a8fb8d1de345d252"
|
"gitHead": "1f002159e2a3c73fb5e00341a344effa07d6f653"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
||||||
|
|
||||||
**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.38.6",
|
"version": "1.38.11",
|
||||||
"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.38.6",
|
"@certd/basic": "^1.38.11",
|
||||||
"@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": "eeb1f27fa47ddc616451f3e5a8fb8d1de345d252"
|
"gitHead": "1f002159e2a3c73fb5e00341a344effa07d6f653"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持设置默认的证书申请地址的反向代理 ([0cfb94b](https://github.com/certd/certd/commit/0cfb94b0ba6a6dc3bb0d0a81a1912068a4e6b6b6))
|
||||||
|
|
||||||
|
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
||||||
|
|
||||||
**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.38.6",
|
"version": "1.38.11",
|
||||||
"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.38.6",
|
"@certd/acme-client": "^1.38.11",
|
||||||
"@certd/basic": "^1.38.6",
|
"@certd/basic": "^1.38.11",
|
||||||
"@certd/pipeline": "^1.38.6",
|
"@certd/pipeline": "^1.38.11",
|
||||||
"@certd/plugin-lib": "^1.38.6",
|
"@certd/plugin-lib": "^1.38.11",
|
||||||
"@certd/plus-core": "^1.38.6",
|
"@certd/plus-core": "^1.38.11",
|
||||||
"@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": "eeb1f27fa47ddc616451f3e5a8fb8d1de345d252"
|
"gitHead": "1f002159e2a3c73fb5e00341a344effa07d6f653"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -76,6 +76,9 @@ export class SysPrivateSettings extends BaseSettings {
|
|||||||
|
|
||||||
httpsProxy? = '';
|
httpsProxy? = '';
|
||||||
httpProxy? = '';
|
httpProxy? = '';
|
||||||
|
|
||||||
|
reverseProxies?: Record<string, string> = {};
|
||||||
|
|
||||||
dnsResultOrder? = '';
|
dnsResultOrder? = '';
|
||||||
commonCnameEnabled?: boolean = true;
|
commonCnameEnabled?: boolean = true;
|
||||||
|
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ import { Repository } from 'typeorm';
|
|||||||
import { SysSettingsEntity } from '../entity/sys-settings.js';
|
import { SysSettingsEntity } from '../entity/sys-settings.js';
|
||||||
import { BaseSettings, SysInstallInfo, SysPrivateSettings, SysPublicSettings, SysSecret, SysSecretBackup } from './models.js';
|
import { BaseSettings, SysInstallInfo, SysPrivateSettings, SysPublicSettings, SysSecret, SysSecretBackup } from './models.js';
|
||||||
|
|
||||||
import { BaseService } from '../../../basic/index.js';
|
import { getAllSslProviderDomains, setSslProviderReverseProxies } from '@certd/acme-client';
|
||||||
import { cache, logger, setGlobalProxy } from '@certd/basic';
|
import { cache, logger, mergeUtils, setGlobalProxy } from '@certd/basic';
|
||||||
import * as dns from 'node:dns';
|
import * as dns from 'node:dns';
|
||||||
import {mergeUtils} from "@certd/basic";
|
import { BaseService } from '../../../basic/index.js';
|
||||||
import { executorQueue } from '../../basic/service/executor-queue.js';
|
import { executorQueue } from '../../basic/service/executor-queue.js';
|
||||||
const {merge} = mergeUtils;
|
const {merge} = mergeUtils;
|
||||||
/**
|
/**
|
||||||
@@ -120,7 +120,14 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async getPrivateSettings(): Promise<SysPrivateSettings> {
|
async getPrivateSettings(): Promise<SysPrivateSettings> {
|
||||||
return await this.getSetting(SysPrivateSettings);
|
const res = await this.getSetting<SysPrivateSettings>(SysPrivateSettings);
|
||||||
|
const sslProviderDomains = getAllSslProviderDomains();
|
||||||
|
for (const domain of sslProviderDomains) {
|
||||||
|
if (!res.reverseProxies[domain]) {
|
||||||
|
res.reverseProxies[domain] = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
async savePrivateSettings(bean: SysPrivateSettings) {
|
async savePrivateSettings(bean: SysPrivateSettings) {
|
||||||
@@ -145,6 +152,8 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
|
|||||||
if (bean.pipelineMaxRunningCount){
|
if (bean.pipelineMaxRunningCount){
|
||||||
executorQueue.setMaxRunningCount(bean.pipelineMaxRunningCount);
|
executorQueue.setMaxRunningCount(bean.pipelineMaxRunningCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setSslProviderReverseProxies(bean.reverseProxies);
|
||||||
}
|
}
|
||||||
|
|
||||||
async updateByKey(key: string, setting: any) {
|
async updateByKey(key: string, setting: any) {
|
||||||
|
|||||||
@@ -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.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 修改sql升级语句,兼容mysql5.7 ([02f89a9](https://github.com/certd/certd/commit/02f89a9c9d77850437285844670aed441e5953c3))
|
||||||
|
|
||||||
|
## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
||||||
|
|
||||||
**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.38.6",
|
"version": "1.38.11",
|
||||||
"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": "eeb1f27fa47ddc616451f3e5a8fb8d1de345d252"
|
"gitHead": "1f002159e2a3c73fb5e00341a344effa07d6f653"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,6 +31,12 @@ const DefaultLogger = {
|
|||||||
console.error(args);
|
console.error(args);
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let customLogger:any = null;
|
||||||
|
export function setFlywayLogger (logger: any) {
|
||||||
|
customLogger = logger;
|
||||||
|
};
|
||||||
|
|
||||||
export class Flyway {
|
export class Flyway {
|
||||||
scriptDir;
|
scriptDir;
|
||||||
flywayTableName;
|
flywayTableName;
|
||||||
@@ -43,7 +49,7 @@ export class Flyway {
|
|||||||
this.flywayTableName = opts.flywayTableName ?? 'flyway_history';
|
this.flywayTableName = opts.flywayTableName ?? 'flyway_history';
|
||||||
this.baseline = opts.baseline ?? false;
|
this.baseline = opts.baseline ?? false;
|
||||||
this.allowHashNotMatch = opts.allowHashNotMatch ?? false;
|
this.allowHashNotMatch = opts.allowHashNotMatch ?? false;
|
||||||
this.logger = opts.logger || DefaultLogger;
|
this.logger = customLogger || opts.logger || DefaultLogger;
|
||||||
this.connection = opts.connection;
|
this.connection = opts.connection;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
// src/index.ts
|
|
||||||
export { FlywayConfiguration as Configuration } from './configuration.js';
|
export { FlywayConfiguration as Configuration } from './configuration.js';
|
||||||
// eslint-disable-next-line node/no-unpublished-import
|
export { Flyway, setFlywayLogger } from './flyway.js';
|
||||||
export { Flyway } from './flyway.js';
|
|
||||||
// eslint-disable-next-line node/no-unpublished-import
|
|
||||||
export { FlywayHistory } from './entity.js';
|
export { FlywayHistory } from './entity.js';
|
||||||
|
|||||||
@@ -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.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* eab从更多参数中挪到外面 ([5ea4f46](https://github.com/certd/certd/commit/5ea4f46de7ae403a7a16e9488dc1d9c7523d019a))
|
||||||
|
|
||||||
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/plugin-cert
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/plugin-cert",
|
"name": "@certd/plugin-cert",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.38.6",
|
"version": "1.38.11",
|
||||||
"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.38.6",
|
"@certd/acme-client": "^1.38.11",
|
||||||
"@certd/basic": "^1.38.6",
|
"@certd/basic": "^1.38.11",
|
||||||
"@certd/pipeline": "^1.38.6",
|
"@certd/pipeline": "^1.38.11",
|
||||||
"@certd/plugin-lib": "^1.38.6",
|
"@certd/plugin-lib": "^1.38.11",
|
||||||
"psl": "^1.9.0",
|
"psl": "^1.9.0",
|
||||||
"punycode.js": "^2.3.1"
|
"punycode.js": "^2.3.1"
|
||||||
},
|
},
|
||||||
@@ -38,5 +38,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "eeb1f27fa47ddc616451f3e5a8fb8d1de345d252"
|
"gitHead": "1f002159e2a3c73fb5e00341a344effa07d6f653"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
||||||
|
|
||||||
**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.38.6",
|
"version": "1.38.11",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
@@ -22,10 +22,10 @@
|
|||||||
"@alicloud/pop-core": "^1.7.10",
|
"@alicloud/pop-core": "^1.7.10",
|
||||||
"@alicloud/tea-util": "^1.4.11",
|
"@alicloud/tea-util": "^1.4.11",
|
||||||
"@aws-sdk/client-s3": "^3.964.0",
|
"@aws-sdk/client-s3": "^3.964.0",
|
||||||
"@certd/acme-client": "^1.38.6",
|
"@certd/acme-client": "^1.38.11",
|
||||||
"@certd/basic": "^1.38.6",
|
"@certd/basic": "^1.38.11",
|
||||||
"@certd/pipeline": "^1.38.6",
|
"@certd/pipeline": "^1.38.11",
|
||||||
"@certd/plus-core": "^1.38.6",
|
"@certd/plus-core": "^1.38.11",
|
||||||
"@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",
|
||||||
@@ -57,5 +57,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "eeb1f27fa47ddc616451f3e5a8fb8d1de345d252"
|
"gitHead": "1f002159e2a3c73fb5e00341a344effa07d6f653"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,58 @@
|
|||||||
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.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化登陆页面的黑暗模式 ([e47edda](https://github.com/certd/certd/commit/e47eddaa858f8fffe7a40dfbd14e8cda1dcba4ac))
|
||||||
|
* 支持自定义发件人名称,格式:名称<邮箱> ([bab9adc](https://github.com/certd/certd/commit/bab9adce240108d4291eedc67e04abc4a01019e0))
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复1panel 请求失败的bug ([0283662](https://github.com/certd/certd/commit/0283662931ff47d6b5d49f91a30c4a002fe1d108))
|
||||||
|
* 修复保存站点监控dns设置,偶尔无法保存成功的bug ([8387fe0](https://github.com/certd/certd/commit/8387fe0d5b2e77b8c2788a10791e5389d97a3e41))
|
||||||
|
* 修复任务步骤标题过长导致错位的问题 ([9fb9805](https://github.com/certd/certd/commit/9fb980599f96ccbf61bd46019411db2f13c70e57))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 监控设置支持逗号分割 ([c23d1d1](https://github.com/certd/certd/commit/c23d1d11b58a6cdfe431a7e8abbd5d955146c38d))
|
||||||
|
* 列表中支持下次执行时间显示 ([a3cabd5](https://github.com/certd/certd/commit/a3cabd5f36ed41225ad418098596e9b2c44e31a1))
|
||||||
|
* 模版编辑页面,hover反色过亮问题优化 ([e55a3a8](https://github.com/certd/certd/commit/e55a3a82fc6939b940f0c3be4529d74a625f6f4e))
|
||||||
|
* 所有授权增加测试按钮 ([7a3e68d](https://github.com/certd/certd/commit/7a3e68d656c1dcdcd814b69891bd2c2c6fe3098a))
|
||||||
|
* 优化网络测试页面,夜间模式显示效果 ([305da86](https://github.com/certd/certd/commit/305da86f97d918374819ecd6c50685f09b94ea59))
|
||||||
|
* 支持next-terminal ([6f3fd78](https://github.com/certd/certd/commit/6f3fd785e77a33c72bdf4115dc5d498e677d1863))
|
||||||
|
* 主题默认跟随系统颜色(自动切换深色浅色模式) ([32c3ce5](https://github.com/certd/certd/commit/32c3ce5c9868569523901a9a939ca5b535ec3277))
|
||||||
|
* http校验方式支持scp上传 ([4eb940f](https://github.com/certd/certd/commit/4eb940ffe765a0330331bc6af8396315e36d4e4a))
|
||||||
|
|
||||||
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 已登录状态访问登录页面自动跳转到首页 ([bd8caff](https://github.com/certd/certd/commit/bd8caff0b754cb13530cf0f1644b33e29fde5d01))
|
||||||
|
* 优化access授权支持remote-auto-complete ([2f40f79](https://github.com/certd/certd/commit/2f40f795ee6131132d3fab2601f92a567bbdc4b7))
|
||||||
|
* access 插件支持remote-select等配置 ([d286c04](https://github.com/certd/certd/commit/d286c040a5232dcca829945734affead3ee08b3c))
|
||||||
|
|
||||||
|
## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 双重验证显示secret ([febd6d3](https://github.com/certd/certd/commit/febd6d32cfe6d89ccecf26bf15141df7c456e5c6))
|
||||||
|
* 支持设置默认的证书申请地址的反向代理 ([0cfb94b](https://github.com/certd/certd/commit/0cfb94b0ba6a6dc3bb0d0a81a1912068a4e6b6b6))
|
||||||
|
* 子域名托管域名支持配置通配符 ([3f7ac93](https://github.com/certd/certd/commit/3f7ac939326b0c7ec013a7534b6c0e58fb3e8cb4))
|
||||||
|
|
||||||
|
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复有域名记录时,域名输入框无法关闭的bug ([54c8217](https://github.com/certd/certd/commit/54c8217808453b121abf646b004596f28932509f))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* eab从更多参数中挪到外面 ([5ea4f46](https://github.com/certd/certd/commit/5ea4f46de7ae403a7a16e9488dc1d9c7523d019a))
|
||||||
|
|
||||||
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
|
||||||
|
|
||||||
### Performance Improvements
|
### Performance Improvements
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/ui-client",
|
"name": "@certd/ui-client",
|
||||||
"version": "1.38.6",
|
"version": "1.38.11",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite --open",
|
"dev": "vite --open",
|
||||||
@@ -106,8 +106,8 @@
|
|||||||
"zod-defaults": "^0.1.3"
|
"zod-defaults": "^0.1.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@certd/lib-iframe": "^1.38.6",
|
"@certd/lib-iframe": "^1.38.11",
|
||||||
"@certd/pipeline": "^1.38.6",
|
"@certd/pipeline": "^1.38.11",
|
||||||
"@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",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
|
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
|
||||||
width="500" height="500" viewBox="0 0 500.000000 500.000000"
|
width="500" height="500" viewBox="0 0 500.000000 500.000000"
|
||||||
>
|
>
|
||||||
<path d="M28.34 56.68h28.34V36.12H28.34a7.79 7.79 0 1 1 0-15.58h19.84v9.05h8.5V12H28.34a16.29 16.29 0 0 0 0 32.58h19.84v3.56H28.34a19.84 19.84 0 0 1 0-39.68h28.34V0H28.34a28.34 28.34 0 0 0 0 56.68z"
|
<path fill="#333" d="M28.34 56.68h28.34V36.12H28.34a7.79 7.79 0 1 1 0-15.58h19.84v9.05h8.5V12H28.34a16.29 16.29 0 0 0 0 32.58h19.84v3.56H28.34a19.84 19.84 0 0 1 0-39.68h28.34V0H28.34a28.34 28.34 0 0 0 0 56.68z"
|
||||||
transform="translate(70, 76) scale(6,6)"
|
transform="translate(70, 76) scale(6,6)"
|
||||||
></path>
|
></path>
|
||||||
</svg>
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 397 B After Width: | Height: | Size: 409 B |
|
After Width: | Height: | Size: 5.4 KiB |
@@ -13,6 +13,7 @@
|
|||||||
import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
|
import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
|
||||||
import { ref, inject } from "vue";
|
import { ref, inject } from "vue";
|
||||||
import { Form } from "ant-design-vue";
|
import { Form } from "ant-design-vue";
|
||||||
|
import { getInputFromForm } from "./utils";
|
||||||
|
|
||||||
defineOptions({
|
defineOptions({
|
||||||
name: "ApiTest",
|
name: "ApiTest",
|
||||||
@@ -45,13 +46,15 @@ const doTest = async () => {
|
|||||||
message.value = "";
|
message.value = "";
|
||||||
hasError.value = false;
|
hasError.value = false;
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
|
const { input, record } = getInputFromForm(form, pluginType);
|
||||||
try {
|
try {
|
||||||
const res = await doRequest(
|
const res = await doRequest(
|
||||||
{
|
{
|
||||||
type: pluginType,
|
type: pluginType,
|
||||||
typeName: form.type,
|
typeName: form.type,
|
||||||
action: props.action,
|
action: props.action,
|
||||||
input: pluginType === "plugin" ? form.input : form,
|
input,
|
||||||
|
record,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
onError(err: any) {
|
onError(err: any) {
|
||||||
|
|||||||
@@ -3,13 +3,13 @@
|
|||||||
<div class="flex flex-row">
|
<div class="flex flex-row">
|
||||||
<a-select
|
<a-select
|
||||||
class="domain-select-input"
|
class="domain-select-input"
|
||||||
|
:popup-class-name="popupClassName"
|
||||||
:dropdown-style="dropdownStyle"
|
:dropdown-style="dropdownStyle"
|
||||||
show-search
|
show-search
|
||||||
:filter-option="filterOption"
|
:filter-option="filterOption"
|
||||||
:options="optionsRef"
|
:options="optionsRef"
|
||||||
:value="value"
|
:value="value"
|
||||||
v-bind="attrs"
|
v-bind="attrs"
|
||||||
:open="openProp"
|
|
||||||
@click="onClick"
|
@click="onClick"
|
||||||
@update:value="emit('update:value', $event)"
|
@update:value="emit('update:value', $event)"
|
||||||
>
|
>
|
||||||
@@ -56,7 +56,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, defineComponent, ref, Ref, useAttrs } from "vue";
|
import { computed, defineComponent, onMounted, ref, Ref, useAttrs } from "vue";
|
||||||
import { useRouter } from "vue-router";
|
import { useRouter } from "vue-router";
|
||||||
import { Dicts } from "../lib/dicts";
|
import { Dicts } from "../lib/dicts";
|
||||||
import { request } from "/@/api/service";
|
import { request } from "/@/api/service";
|
||||||
@@ -83,7 +83,6 @@ const props = defineProps<{
|
|||||||
search?: boolean;
|
search?: boolean;
|
||||||
pager?: boolean;
|
pager?: boolean;
|
||||||
value?: any[];
|
value?: any[];
|
||||||
open?: boolean;
|
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
@@ -94,11 +93,11 @@ const attrs = useAttrs();
|
|||||||
|
|
||||||
const hasOptions: Ref = ref(null);
|
const hasOptions: Ref = ref(null);
|
||||||
|
|
||||||
const openProp = computed(() => {
|
const popupClassName = computed(() => {
|
||||||
if (hasOptions.value == null) {
|
if (!hasOptions.value) {
|
||||||
return false;
|
return "hidden-important";
|
||||||
}
|
}
|
||||||
return hasOptions.value;
|
return "";
|
||||||
});
|
});
|
||||||
|
|
||||||
const searchKeyRef = ref("");
|
const searchKeyRef = ref("");
|
||||||
@@ -155,6 +154,7 @@ const getOptions = async () => {
|
|||||||
|
|
||||||
optionsRef.value = options;
|
optionsRef.value = options;
|
||||||
if (hasOptions.value == null) {
|
if (hasOptions.value == null) {
|
||||||
|
//初始设置一次
|
||||||
if (options.length > 0) {
|
if (options.length > 0) {
|
||||||
hasOptions.value = true;
|
hasOptions.value = true;
|
||||||
} else {
|
} else {
|
||||||
@@ -223,6 +223,10 @@ function openDomainImportDialog() {
|
|||||||
const dropdownStyle = ref({
|
const dropdownStyle = ref({
|
||||||
zIndex: 2000,
|
zIndex: 2000,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
refreshOptions();
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="less"></style>
|
<style lang="less"></style>
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="params-show">
|
<div class="params-show">
|
||||||
<a-tag type="primary" color="green" v-for="item of params" :key="item.value" class="item">
|
<a-tag v-for="item of params" :key="item.value" type="primary" color="green" class="item">
|
||||||
<span class="label">{{ item.label }}=</span>
|
<span class="label">{{ item.label }}=</span>
|
||||||
<fs-copyable :modelValue="`\$\{${item.value}\}`" :button="{show:false}" :inline="true"></fs-copyable>
|
<fs-copyable :model-value="`\$\{${item.value}\}`" :button="{ show: false }" :inline="true"></fs-copyable>
|
||||||
</a-tag>
|
</a-tag>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
|
import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
|
||||||
import { defineComponent, inject, ref, useAttrs, watch, Ref } from "vue";
|
import { defineComponent, inject, ref, useAttrs, watch, Ref } from "vue";
|
||||||
import { PluginDefine } from "@certd/pipeline";
|
import { PluginDefine } from "@certd/pipeline";
|
||||||
|
import { getInputFromForm } from "./utils";
|
||||||
|
|
||||||
defineOptions({
|
defineOptions({
|
||||||
name: "RemoteAutoComplete",
|
name: "RemoteAutoComplete",
|
||||||
@@ -23,7 +24,7 @@ defineOptions({
|
|||||||
|
|
||||||
const props = defineProps<
|
const props = defineProps<
|
||||||
{
|
{
|
||||||
watches: string[];
|
watches?: string[];
|
||||||
} & ComponentPropsType
|
} & ComponentPropsType
|
||||||
>();
|
>();
|
||||||
|
|
||||||
@@ -63,15 +64,14 @@ const getOptions = async () => {
|
|||||||
}
|
}
|
||||||
const pluginType = getPluginType();
|
const pluginType = getPluginType();
|
||||||
const { form } = getScope();
|
const { form } = getScope();
|
||||||
const input = (pluginType === "plugin" ? form?.input : form) || {};
|
const { input, record } = getInputFromForm(form, pluginType);
|
||||||
|
|
||||||
for (let key in define.input) {
|
for (let key in define.input) {
|
||||||
const inWatches = props.watches?.includes(key);
|
const inWatches = props.watches?.includes(key);
|
||||||
const inputDefine = define.input[key];
|
const inputDefine = define.input[key];
|
||||||
if (inWatches && inputDefine.required) {
|
if (inWatches && inputDefine.required) {
|
||||||
const value = input[key];
|
const value = input[key];
|
||||||
if (value == null || value === "") {
|
if (value == null || value === "") {
|
||||||
console.log("remote-select required", key);
|
console.log("remote-auto-complete required", key);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -88,6 +88,7 @@ const getOptions = async () => {
|
|||||||
action: props.action,
|
action: props.action,
|
||||||
input,
|
input,
|
||||||
data: {},
|
data: {},
|
||||||
|
record,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
onError(err: any) {
|
onError(err: any) {
|
||||||
@@ -129,12 +130,14 @@ watch(
|
|||||||
() => {
|
() => {
|
||||||
const pluginType = getPluginType();
|
const pluginType = getPluginType();
|
||||||
const { form, key } = getScope();
|
const { form, key } = getScope();
|
||||||
const input = (pluginType === "plugin" ? form?.input : form) || {};
|
const { input, record } = getInputFromForm(form, pluginType);
|
||||||
const watches = {};
|
const watches: any = {};
|
||||||
for (const key of props.watches) {
|
if (props.watches && props.watches.length > 0) {
|
||||||
//@ts-ignore
|
for (const key of props.watches) {
|
||||||
watches[key] = input[key];
|
watches[key] = input[key];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
form: watches,
|
form: watches,
|
||||||
key,
|
key,
|
||||||
@@ -144,6 +147,9 @@ watch(
|
|||||||
const { form } = value;
|
const { form } = value;
|
||||||
const oldForm: any = oldValue?.form;
|
const oldForm: any = oldValue?.form;
|
||||||
let changed = oldForm == null || optionsRef.value.length == 0;
|
let changed = oldForm == null || optionsRef.value.length == 0;
|
||||||
|
if (!props.watches || props.watches.length === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
for (const key of props.watches) {
|
for (const key of props.watches) {
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
if (oldForm && form[key] != oldForm[key]) {
|
if (oldForm && form[key] != oldForm[key]) {
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import { doRequest } from "/@/components/plugins/lib";
|
|||||||
import { inject, ref, useAttrs } from "vue";
|
import { inject, ref, useAttrs } from "vue";
|
||||||
import { useFormWrapper } from "@fast-crud/fast-crud";
|
import { useFormWrapper } from "@fast-crud/fast-crud";
|
||||||
import { notification } from "ant-design-vue";
|
import { notification } from "ant-design-vue";
|
||||||
|
import { getInputFromForm } from "./utils";
|
||||||
|
|
||||||
defineOptions({
|
defineOptions({
|
||||||
name: "RemoteInput",
|
name: "RemoteInput",
|
||||||
@@ -71,15 +72,18 @@ const doPluginFormSubmit = async (data: any) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const pluginType = getPluginType();
|
const pluginType = getPluginType();
|
||||||
const { form } = getScope();
|
const { form } = getScope();
|
||||||
|
const { input, record } = getInputFromForm(form, pluginType);
|
||||||
const res = await doRequest({
|
const res = await doRequest({
|
||||||
type: pluginType,
|
type: pluginType,
|
||||||
typeName: form.type,
|
typeName: form.type,
|
||||||
action: props.action,
|
action: props.action,
|
||||||
input: pluginType === "plugin" ? form.input : form,
|
input,
|
||||||
data: data,
|
data: data,
|
||||||
|
record,
|
||||||
});
|
});
|
||||||
//获取返回值 填入到input中
|
//获取返回值 填入到input中
|
||||||
emit("update:modelValue", res);
|
emit("update:modelValue", res);
|
||||||
|
|||||||
@@ -38,6 +38,7 @@
|
|||||||
import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
|
import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
|
||||||
import { defineComponent, inject, ref, useAttrs, watch, Ref } from "vue";
|
import { defineComponent, inject, ref, useAttrs, watch, Ref } from "vue";
|
||||||
import { PluginDefine } from "@certd/pipeline";
|
import { PluginDefine } from "@certd/pipeline";
|
||||||
|
import { getInputFromForm } from "./utils";
|
||||||
|
|
||||||
defineOptions({
|
defineOptions({
|
||||||
name: "RemoteSelect",
|
name: "RemoteSelect",
|
||||||
@@ -57,7 +58,7 @@ const VNodes = defineComponent({
|
|||||||
|
|
||||||
const props = defineProps<
|
const props = defineProps<
|
||||||
{
|
{
|
||||||
watches: string[];
|
watches?: string[];
|
||||||
search?: boolean;
|
search?: boolean;
|
||||||
pager?: boolean;
|
pager?: boolean;
|
||||||
} & ComponentPropsType
|
} & ComponentPropsType
|
||||||
@@ -104,7 +105,7 @@ const getOptions = async () => {
|
|||||||
}
|
}
|
||||||
const pluginType = getPluginType();
|
const pluginType = getPluginType();
|
||||||
const { form } = getScope();
|
const { form } = getScope();
|
||||||
const input = (pluginType === "plugin" ? form?.input : form) || {};
|
const { input, record } = getInputFromForm(form, pluginType);
|
||||||
|
|
||||||
for (let key in define.input) {
|
for (let key in define.input) {
|
||||||
const inWatches = props.watches?.includes(key);
|
const inWatches = props.watches?.includes(key);
|
||||||
@@ -130,6 +131,7 @@ const getOptions = async () => {
|
|||||||
typeName: form.type,
|
typeName: form.type,
|
||||||
action: props.action,
|
action: props.action,
|
||||||
input,
|
input,
|
||||||
|
record,
|
||||||
data: {
|
data: {
|
||||||
searchKey: props.search ? searchKeyRef.value : "",
|
searchKey: props.search ? searchKeyRef.value : "",
|
||||||
pageNo,
|
pageNo,
|
||||||
@@ -200,12 +202,14 @@ watch(
|
|||||||
() => {
|
() => {
|
||||||
const pluginType = getPluginType();
|
const pluginType = getPluginType();
|
||||||
const { form, key } = getScope();
|
const { form, key } = getScope();
|
||||||
const input = (pluginType === "plugin" ? form?.input : form) || {};
|
const { input, record } = getInputFromForm(form, pluginType);
|
||||||
const watches = {};
|
const watches: any = {};
|
||||||
for (const key of props.watches) {
|
if (props.watches && props.watches.length > 0) {
|
||||||
//@ts-ignore
|
for (const key of props.watches) {
|
||||||
watches[key] = input[key];
|
watches[key] = input[key];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
form: watches,
|
form: watches,
|
||||||
key,
|
key,
|
||||||
@@ -215,11 +219,12 @@ watch(
|
|||||||
const { form } = value;
|
const { form } = value;
|
||||||
const oldForm: any = oldValue?.form;
|
const oldForm: any = oldValue?.form;
|
||||||
let changed = oldForm == null || optionsRef.value.length == 0;
|
let changed = oldForm == null || optionsRef.value.length == 0;
|
||||||
for (const key of props.watches) {
|
if (props.watches && props.watches.length > 0) {
|
||||||
//@ts-ignore
|
for (const key of props.watches) {
|
||||||
if (oldForm && form[key] != oldForm[key]) {
|
if (oldForm && form[key] != oldForm[key]) {
|
||||||
changed = true;
|
changed = true;
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (changed) {
|
if (changed) {
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
|
import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
|
||||||
import { defineComponent, inject, ref, useAttrs, watch, Ref } from "vue";
|
import { defineComponent, inject, ref, useAttrs, watch, Ref } from "vue";
|
||||||
import { PluginDefine } from "@certd/pipeline";
|
import { PluginDefine } from "@certd/pipeline";
|
||||||
|
import { getInputFromForm } from "./utils";
|
||||||
|
|
||||||
defineOptions({
|
defineOptions({
|
||||||
name: "RemoteTreeSelect",
|
name: "RemoteTreeSelect",
|
||||||
@@ -67,7 +68,7 @@ const getOptions = async () => {
|
|||||||
}
|
}
|
||||||
const pluginType = getPluginType();
|
const pluginType = getPluginType();
|
||||||
const { form } = getScope();
|
const { form } = getScope();
|
||||||
const input = (pluginType === "plugin" ? form?.input : form) || {};
|
const { input, record } = getInputFromForm(form, pluginType);
|
||||||
|
|
||||||
for (let key in define.input) {
|
for (let key in define.input) {
|
||||||
const inWatches = props.watches?.includes(key);
|
const inWatches = props.watches?.includes(key);
|
||||||
@@ -98,6 +99,7 @@ const getOptions = async () => {
|
|||||||
pageNo,
|
pageNo,
|
||||||
pageSize,
|
pageSize,
|
||||||
},
|
},
|
||||||
|
record,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
onError(err: any) {
|
onError(err: any) {
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import { cloneDeep } from "lodash-es";
|
||||||
|
|
||||||
|
export function getInputFromForm(form: any, pluginType: string) {
|
||||||
|
form = cloneDeep(form);
|
||||||
|
let input: any = {};
|
||||||
|
const record: any = form;
|
||||||
|
if (pluginType === "plugin") {
|
||||||
|
input = form?.input || {};
|
||||||
|
delete form.input;
|
||||||
|
} else if (pluginType === "access") {
|
||||||
|
input = form?.access || {};
|
||||||
|
delete form.access;
|
||||||
|
} else if (pluginType === "notification") {
|
||||||
|
input = form?.body || {};
|
||||||
|
delete form.body;
|
||||||
|
} else if (pluginType === "addon") {
|
||||||
|
input = form?.body || {};
|
||||||
|
delete form.body;
|
||||||
|
} else {
|
||||||
|
throw new Error(`pluginType ${pluginType} not support`);
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
input,
|
||||||
|
record,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -20,6 +20,7 @@ export const Dicts = {
|
|||||||
uploaderTypeDict: dict({
|
uploaderTypeDict: dict({
|
||||||
data: [
|
data: [
|
||||||
{ label: "SFTP", value: "sftp" },
|
{ label: "SFTP", value: "sftp" },
|
||||||
|
{ label: "SCP", value: "scp" },
|
||||||
{ label: "FTP", value: "ftp" },
|
{ label: "FTP", value: "ftp" },
|
||||||
{ label: "阿里云OSS", value: "alioss" },
|
{ label: "阿里云OSS", value: "alioss" },
|
||||||
{ label: "腾讯云COS", value: "tencentcos" },
|
{ label: "腾讯云COS", value: "tencentcos" },
|
||||||
|
|||||||
@@ -12,11 +12,12 @@ export type RequestHandleReq<T = any> = {
|
|||||||
action: string;
|
action: string;
|
||||||
data?: any;
|
data?: any;
|
||||||
input: T;
|
input: T;
|
||||||
|
record?: any;
|
||||||
};
|
};
|
||||||
|
|
||||||
export async function doRequest(req: RequestHandleReq, opts: any = {}) {
|
export async function doRequest(req: RequestHandleReq, opts: any = {}) {
|
||||||
const url = `/pi/handle/${req.type}`;
|
const url = `/pi/handle/${req.type}`;
|
||||||
const { typeName, action, data, input } = req;
|
const { typeName, action, data, input, record } = req;
|
||||||
const res = await request({
|
const res = await request({
|
||||||
url,
|
url,
|
||||||
method: "post",
|
method: "post",
|
||||||
@@ -25,6 +26,7 @@ export async function doRequest(req: RequestHandleReq, opts: any = {}) {
|
|||||||
action,
|
action,
|
||||||
data,
|
data,
|
||||||
input,
|
input,
|
||||||
|
record,
|
||||||
},
|
},
|
||||||
...opts,
|
...opts,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -161,27 +161,30 @@ function openStarModal(vipType: string) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Modal.destroyAll();
|
Modal.destroyAll();
|
||||||
const goGithub = () => {
|
|
||||||
window.open("https://github.com/certd/certd/");
|
|
||||||
};
|
|
||||||
|
|
||||||
modal.confirm({
|
openTrialModal(vipType);
|
||||||
title: t("vip.get_7_day_pro_trial"),
|
|
||||||
okText: t("vip.star_now"),
|
// const goGithub = () => {
|
||||||
onOk() {
|
// window.open("https://github.com/certd/certd/");
|
||||||
goGithub();
|
// };
|
||||||
openTrialModal(vipType);
|
|
||||||
},
|
// modal.confirm({
|
||||||
width: 600,
|
// title: t("vip.get_7_day_pro_trial"),
|
||||||
content: () => {
|
// okText: t("vip.star_now"),
|
||||||
return (
|
// onOk() {
|
||||||
<div class="flex mt-10 mb-10">
|
// goGithub();
|
||||||
<div>{t("vip.please_help_star")}</div>
|
// openTrialModal(vipType);
|
||||||
<img class="ml-5" src="https://img.shields.io/github/stars/certd/certd?logo=github" />
|
// },
|
||||||
</div>
|
// width: 600,
|
||||||
);
|
// content: () => {
|
||||||
},
|
// return (
|
||||||
});
|
// <div class="flex mt-10 mb-10">
|
||||||
|
// <div>{t("vip.please_help_star")}</div>
|
||||||
|
// <img class="ml-5" src="https://img.shields.io/github/stars/certd/certd?logo=github" />
|
||||||
|
// </div>
|
||||||
|
// );
|
||||||
|
// },
|
||||||
|
// });
|
||||||
}
|
}
|
||||||
|
|
||||||
function openUpgrade() {
|
function openUpgrade() {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div id="userLayout" :class="['user-layout-wrapper']">
|
<div id="userLayout" :class="['user-layout-wrapper']">
|
||||||
<div class="login-container flex justify-start">
|
<div class="login-container flex justify-start dark:background-[#141414]">
|
||||||
<div class="user-layout-content flex-col justify-start">
|
<div class="user-layout-content flex-col justify-start">
|
||||||
<div class="top flex flex-col items-center justify-start">
|
<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">
|
||||||
@@ -59,6 +59,14 @@ const sysPublic: Ref<SysPublicSetting> = computed(() => {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="less">
|
<style lang="less">
|
||||||
|
.dark {
|
||||||
|
.login-container {
|
||||||
|
background: #141414 !important;
|
||||||
|
.desc {
|
||||||
|
color: rgba(227, 227, 227, 0.45) !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
#userLayout.user-layout-wrapper {
|
#userLayout.user-layout-wrapper {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
|
||||||
|
|||||||
@@ -160,6 +160,7 @@ export default {
|
|||||||
updateTime: "Update Time",
|
updateTime: "Update Time",
|
||||||
triggerType: "Trigger Type",
|
triggerType: "Trigger Type",
|
||||||
pipelineId: "Pipeline Id",
|
pipelineId: "Pipeline Id",
|
||||||
|
nextRunTime: "Next Run Time",
|
||||||
},
|
},
|
||||||
|
|
||||||
pi: {
|
pi: {
|
||||||
@@ -511,6 +512,7 @@ export default {
|
|||||||
selectRecordFirst: "Please select records first",
|
selectRecordFirst: "Please select records first",
|
||||||
subdomainHosted: "Hosted Subdomain",
|
subdomainHosted: "Hosted Subdomain",
|
||||||
subdomainHelpText: "If you don't understand what subdomain hosting is,Do not set it randomly, as it may result in the inability to apply for the certificate. please refer to the documentation ",
|
subdomainHelpText: "If you don't understand what subdomain hosting is,Do not set it randomly, as it may result in the inability to apply for the certificate. please refer to the documentation ",
|
||||||
|
subdomainHelpSupportStart: "Supports * wildcard, indicating that all subdomains of the domain are hosted (free subdomains)",
|
||||||
subdomainManagement: "Subdomain Management",
|
subdomainManagement: "Subdomain Management",
|
||||||
isDisabled: "Is Disabled",
|
isDisabled: "Is Disabled",
|
||||||
enabled: "Enabled",
|
enabled: "Enabled",
|
||||||
@@ -688,6 +690,7 @@ export default {
|
|||||||
password: "Password",
|
password: "Password",
|
||||||
pleaseEnterPassword: "Please enter password",
|
pleaseEnterPassword: "Please enter password",
|
||||||
qqEmailAuthCodeHelper: "If using QQ email, get an authorization code in QQ email settings as the password",
|
qqEmailAuthCodeHelper: "If using QQ email, get an authorization code in QQ email settings as the password",
|
||||||
|
senderEmailHelper: "You can use the format: Name<Email> to set the sender name, e.g.: autossl<certd@example.com>",
|
||||||
senderEmail: "Sender Email",
|
senderEmail: "Sender Email",
|
||||||
pleaseEnterSenderEmail: "Please enter sender email",
|
pleaseEnterSenderEmail: "Please enter sender email",
|
||||||
useSsl: "Use SSL",
|
useSsl: "Use SSL",
|
||||||
@@ -784,6 +787,7 @@ export default {
|
|||||||
captchaSetting: "Captcha Setting",
|
captchaSetting: "Captcha Setting",
|
||||||
pipelineSetting: "Pipeline Settings",
|
pipelineSetting: "Pipeline Settings",
|
||||||
oauthSetting: "OAuth2 Settings",
|
oauthSetting: "OAuth2 Settings",
|
||||||
|
networkSetting: "Network 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",
|
||||||
@@ -835,6 +839,11 @@ export default {
|
|||||||
notice: "System Notice",
|
notice: "System Notice",
|
||||||
noticeHelper: "System notice, will be displayed on the login page",
|
noticeHelper: "System notice, will be displayed on the login page",
|
||||||
noticePlaceholder: "System notice",
|
noticePlaceholder: "System notice",
|
||||||
|
|
||||||
|
reverseProxy: "Reverse Proxy List",
|
||||||
|
reverseProxyHelper: "Reverse proxy for ACME address, used when applying for certificate",
|
||||||
|
reverseProxyPlaceholder: "http://le.px.handfree.work",
|
||||||
|
reverseProxyEmpty: "No reverse proxy list configured",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
modal: {
|
modal: {
|
||||||
|
|||||||
@@ -167,6 +167,7 @@ export default {
|
|||||||
updateTime: "更新时间",
|
updateTime: "更新时间",
|
||||||
triggerType: "触发类型",
|
triggerType: "触发类型",
|
||||||
pipelineId: "流水线Id",
|
pipelineId: "流水线Id",
|
||||||
|
nextRunTime: "下次运行时间",
|
||||||
},
|
},
|
||||||
pi: {
|
pi: {
|
||||||
validTime: "流水线有效期",
|
validTime: "流水线有效期",
|
||||||
@@ -521,6 +522,7 @@ export default {
|
|||||||
selectRecordFirst: "请先勾选记录",
|
selectRecordFirst: "请先勾选记录",
|
||||||
subdomainHosted: "托管的子域名",
|
subdomainHosted: "托管的子域名",
|
||||||
subdomainHelpText: "如果您不理解什么是子域托管,请不要随意设置(可能导致证书无法申请,以前设置过的cname记录也需要重新配置),可以参考文档",
|
subdomainHelpText: "如果您不理解什么是子域托管,请不要随意设置(可能导致证书无法申请,以前设置过的cname记录也需要重新配置),可以参考文档",
|
||||||
|
subdomainHelpSupportStart: "支持*号通配符,表示该域名下的子域名都是托管的(免费子域名)",
|
||||||
subdomainManagement: "子域管理",
|
subdomainManagement: "子域管理",
|
||||||
isDisabled: "是否禁用",
|
isDisabled: "是否禁用",
|
||||||
enabled: "启用",
|
enabled: "启用",
|
||||||
@@ -699,6 +701,7 @@ export default {
|
|||||||
password: "密码",
|
password: "密码",
|
||||||
pleaseEnterPassword: "请输入密码",
|
pleaseEnterPassword: "请输入密码",
|
||||||
qqEmailAuthCodeHelper: "如果是qq邮箱,需要到qq邮箱的设置里面申请授权码作为密码",
|
qqEmailAuthCodeHelper: "如果是qq邮箱,需要到qq邮箱的设置里面申请授权码作为密码",
|
||||||
|
senderEmailHelper: "您可以使用 名称<邮箱> 的格式,来修改发件人名称,例如: autossl<certd@example.com>",
|
||||||
senderEmail: "发件邮箱",
|
senderEmail: "发件邮箱",
|
||||||
pleaseEnterSenderEmail: "请输入发件邮箱",
|
pleaseEnterSenderEmail: "请输入发件邮箱",
|
||||||
useSsl: "是否ssl",
|
useSsl: "是否ssl",
|
||||||
@@ -791,6 +794,7 @@ export default {
|
|||||||
captchaSetting: "验证码设置",
|
captchaSetting: "验证码设置",
|
||||||
pipelineSetting: "流水线设置",
|
pipelineSetting: "流水线设置",
|
||||||
oauthSetting: "第三方登录",
|
oauthSetting: "第三方登录",
|
||||||
|
networkSetting: "网络设置",
|
||||||
|
|
||||||
showRunStrategy: "显示运行策略选择",
|
showRunStrategy: "显示运行策略选择",
|
||||||
showRunStrategyHelper: "任务设置中是否允许选择运行策略",
|
showRunStrategyHelper: "任务设置中是否允许选择运行策略",
|
||||||
@@ -850,6 +854,11 @@ export default {
|
|||||||
notice: "系统公告",
|
notice: "系统公告",
|
||||||
noticeHelper: "系统公告,将在首页显示",
|
noticeHelper: "系统公告,将在首页显示",
|
||||||
noticePlaceholder: "系统公告",
|
noticePlaceholder: "系统公告",
|
||||||
|
|
||||||
|
reverseProxy: "反向代理列表",
|
||||||
|
reverseProxyHelper: "证书颁发机构ACME地址的反向代理,在申请证书时自动使用",
|
||||||
|
reverseProxyPlaceholder: "http://le.px.handfree.work",
|
||||||
|
reverseProxyEmpty: "未配置反向代理",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
modal: {
|
modal: {
|
||||||
|
|||||||
@@ -101,6 +101,14 @@ function setupAccessGuard(router: Router) {
|
|||||||
return r.meta?.auth || r.meta?.permission;
|
return r.meta?.auth || r.meta?.permission;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (to.path === LOGIN_PATH && accessStore.accessToken) {
|
||||||
|
return {
|
||||||
|
path: DEFAULT_HOME_PATH,
|
||||||
|
// 携带当前跳转的页面,登录后重新跳转该页面
|
||||||
|
replace: true,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
if (!needAuth) {
|
if (!needAuth) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -93,6 +93,7 @@ export type SuiteSetting = {
|
|||||||
export type SysPrivateSetting = {
|
export type SysPrivateSetting = {
|
||||||
httpProxy?: string;
|
httpProxy?: string;
|
||||||
httpsProxy?: string;
|
httpsProxy?: string;
|
||||||
|
reverseProxies?: any;
|
||||||
dnsResultOrder?: string;
|
dnsResultOrder?: string;
|
||||||
commonCnameEnabled?: boolean;
|
commonCnameEnabled?: boolean;
|
||||||
// 同一个用户同时最大运行流水线数量
|
// 同一个用户同时最大运行流水线数量
|
||||||
|
|||||||
@@ -117,3 +117,4 @@ span.fs-icon-svg {
|
|||||||
margin: 0 !important;
|
margin: 0 !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
@import "./fix-windicss.less";
|
@import "./fix-windicss.less";
|
||||||
@import "./antdv4.less";
|
@import "./antdv4.less";
|
||||||
@import "./certd.less";
|
@import "./certd.less";
|
||||||
|
@import "./dark.less";
|
||||||
|
|
||||||
html,
|
html,
|
||||||
body {
|
body {
|
||||||
@@ -372,6 +373,13 @@ h6 {
|
|||||||
border-spacing: 0;
|
border-spacing: 0;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|
||||||
|
&.cd-table-none-border {
|
||||||
|
border: 0 !important;
|
||||||
|
td, th {
|
||||||
|
border: 0 !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.fs-loading {
|
.fs-loading {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 0;
|
left: 0;
|
||||||
@@ -477,3 +485,9 @@ h6 {
|
|||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.hidden-important {
|
||||||
|
display: none !important;
|
||||||
|
visibility: hidden !important;
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
.dark{
|
||||||
|
.fs-page-header{
|
||||||
|
.title {
|
||||||
|
color: #d5d5d5 !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,8 +18,8 @@
|
|||||||
-webkit-border-radius: 4em;
|
-webkit-border-radius: 4em;
|
||||||
-moz-border-radius: 4em;
|
-moz-border-radius: 4em;
|
||||||
border-radius: 4em;
|
border-radius: 4em;
|
||||||
background-color: #b3b3b3;
|
background-color: #757575;
|
||||||
box-shadow: 0px 1px 1px #eee inset;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
::-webkit-scrollbar-thumb:hover {
|
::-webkit-scrollbar-thumb:hover {
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ const defaultPreferences: Preferences = {
|
|||||||
colorPrimary: "hsl(212 100% 45%)",
|
colorPrimary: "hsl(212 100% 45%)",
|
||||||
colorSuccess: "hsl(144 57% 58%)",
|
colorSuccess: "hsl(144 57% 58%)",
|
||||||
colorWarning: "hsl(42 84% 61%)",
|
colorWarning: "hsl(42 84% 61%)",
|
||||||
mode: "light",
|
mode: "auto",
|
||||||
radius: "0.5",
|
radius: "0.5",
|
||||||
semiDarkHeader: false,
|
semiDarkHeader: false,
|
||||||
semiDarkSidebar: false,
|
semiDarkSidebar: false,
|
||||||
|
|||||||
@@ -10,6 +10,9 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
|
|||||||
provide("get:plugin:type", () => {
|
provide("get:plugin:type", () => {
|
||||||
return "access";
|
return "access";
|
||||||
});
|
});
|
||||||
|
provide("getCurrentPluginDefine", () => {
|
||||||
|
return currentDefine;
|
||||||
|
});
|
||||||
const AccessTypeDictRef = dict({
|
const AccessTypeDictRef = dict({
|
||||||
url: "/pi/access/accessTypeDict",
|
url: "/pi/access/accessTypeDict",
|
||||||
});
|
});
|
||||||
@@ -64,7 +67,10 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
|
|||||||
set(form, key, column.value);
|
set(form, key, column.value);
|
||||||
}
|
}
|
||||||
//字段配置赋值
|
//字段配置赋值
|
||||||
columnsRef.value[key] = column;
|
if (columnsRef.value) {
|
||||||
|
columnsRef.value[key] = column;
|
||||||
|
}
|
||||||
|
|
||||||
console.log("form", columnsRef.value);
|
console.log("form", columnsRef.value);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
import { ColumnCompositionProps, compute, dict } from "@fast-crud/fast-crud";
|
import { ColumnCompositionProps, compute, dict } from "@fast-crud/fast-crud";
|
||||||
|
import { Modal } from "ant-design-vue";
|
||||||
|
import { forEach, get, merge, set } from "lodash-es";
|
||||||
import { computed, provide, ref, toRef } from "vue";
|
import { computed, provide, ref, toRef } from "vue";
|
||||||
import { useReference } from "/@/use/use-refrence";
|
import { useReference } from "/@/use/use-refrence";
|
||||||
import { forEach, get, merge, set } from "lodash-es";
|
|
||||||
import { Modal } from "ant-design-vue";
|
|
||||||
import { mitter } from "/@/utils/util.mitt";
|
import { mitter } from "/@/utils/util.mitt";
|
||||||
import { useI18n } from "/src/locales";
|
|
||||||
import * as pipelineApi from "/@/views/certd/pipeline/api";
|
|
||||||
import { getAddonTypeDefine } from "/@/views/certd/addon/api";
|
import { getAddonTypeDefine } from "/@/views/certd/addon/api";
|
||||||
|
import { useI18n } from "/src/locales";
|
||||||
|
|
||||||
export function addonProvide(api: any) {
|
export function addonProvide(api: any) {
|
||||||
provide("addonApi", api);
|
provide("addonApi", api);
|
||||||
@@ -30,6 +29,10 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any, a
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
provide("getCurrentPluginDefine", () => {
|
||||||
|
return currentDefine;
|
||||||
|
});
|
||||||
|
|
||||||
function buildDefineFields(define: any, form: any, mode: string) {
|
function buildDefineFields(define: any, form: any, mode: string) {
|
||||||
const formWrapperRef = crudExpose.getFormWrapperRef();
|
const formWrapperRef = crudExpose.getFormWrapperRef();
|
||||||
const columnsRef = toRef(formWrapperRef.formOptions, "columns");
|
const columnsRef = toRef(formWrapperRef.formOptions, "columns");
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ export async function TwoFactorAuthenticatorGet() {
|
|||||||
url: apiPrefix + "/twoFactor/authenticator/qrcode",
|
url: apiPrefix + "/twoFactor/authenticator/qrcode",
|
||||||
method: "post",
|
method: "post",
|
||||||
});
|
});
|
||||||
return res as string; //base64
|
return res as { qrcode: string; link: string; secret: string }; //base64
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function TwoFactorAuthenticatorSave(req: AuthenticatorSaveReq) {
|
export async function TwoFactorAuthenticatorSave(req: AuthenticatorSaveReq) {
|
||||||
|
|||||||
@@ -57,6 +57,17 @@
|
|||||||
<div class="ml-20">
|
<div class="ml-20">
|
||||||
<img class="full-w" :src="authenticatorForm.qrcodeSrc" />
|
<img class="full-w" :src="authenticatorForm.qrcodeSrc" />
|
||||||
</div>
|
</div>
|
||||||
|
<div class="ml-20 mt-5">
|
||||||
|
<div>您也可以手动添加:</div>
|
||||||
|
<div class="flex mt-5">
|
||||||
|
<a-tag type="primary" color="green" class="mr-2">Secret:</a-tag>
|
||||||
|
<fs-copyable :model-value="authenticatorForm.secret" />
|
||||||
|
</div>
|
||||||
|
<div class="flex mt-5">
|
||||||
|
<a-tag type="primary" color="green" class="mr-2">Link:</a-tag>
|
||||||
|
<fs-copyable :model-value="authenticatorForm.link" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<h3 class="font-bold m-10">{{ t("certd.step3") }}</h3>
|
<h3 class="font-bold m-10">{{ t("certd.step3") }}</h3>
|
||||||
<div class="ml-20">
|
<div class="ml-20">
|
||||||
@@ -97,6 +108,8 @@ const formState = reactive<Partial<UserTwoFactorSetting>>({
|
|||||||
const authenticatorForm = reactive({
|
const authenticatorForm = reactive({
|
||||||
qrcodeSrc: "",
|
qrcodeSrc: "",
|
||||||
verifyCode: "",
|
verifyCode: "",
|
||||||
|
link: "",
|
||||||
|
secret: "",
|
||||||
open: false,
|
open: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -110,9 +123,14 @@ watch(
|
|||||||
async open => {
|
async open => {
|
||||||
if (open) {
|
if (open) {
|
||||||
//base64 转图片
|
//base64 转图片
|
||||||
authenticatorForm.qrcodeSrc = await api.TwoFactorAuthenticatorGet();
|
const { qrcode, link, secret } = await api.TwoFactorAuthenticatorGet();
|
||||||
|
authenticatorForm.qrcodeSrc = qrcode;
|
||||||
|
authenticatorForm.link = link;
|
||||||
|
authenticatorForm.secret = secret;
|
||||||
} else {
|
} else {
|
||||||
authenticatorForm.qrcodeSrc = "";
|
authenticatorForm.qrcodeSrc = "";
|
||||||
|
authenticatorForm.link = "";
|
||||||
|
authenticatorForm.secret = "";
|
||||||
authenticatorForm.verifyCode = "";
|
authenticatorForm.verifyCode = "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
</a-form-item>
|
</a-form-item>
|
||||||
<a-form-item :label="t('certd.monitor.setting.dnsServer')" :name="['dnsServer']">
|
<a-form-item :label="t('certd.monitor.setting.dnsServer')" :name="['dnsServer']">
|
||||||
<div class="flex">
|
<div class="flex">
|
||||||
<a-select v-model:value="formState.dnsServer" mode="tags" :open="false" />
|
<a-select v-model:value="formState.dnsServer" :token-separators="[' ', ',', ',', '、', '|']" mode="tags" :open="false" />
|
||||||
</div>
|
</div>
|
||||||
<div class="helper">{{ t("certd.monitor.setting.dnsServerHelper") }}</div>
|
<div class="helper">{{ t("certd.monitor.setting.dnsServerHelper") }}</div>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
@@ -45,15 +45,16 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="tsx">
|
<script setup lang="tsx">
|
||||||
|
import { notification } from "ant-design-vue";
|
||||||
|
import { merge } from "lodash-es";
|
||||||
import { reactive } from "vue";
|
import { reactive } from "vue";
|
||||||
import * as api from "./api";
|
import * as api from "./api";
|
||||||
import { UserSiteMonitorSetting } from "./api";
|
import { UserSiteMonitorSetting } from "./api";
|
||||||
import { notification } from "ant-design-vue";
|
|
||||||
import { merge } from "lodash-es";
|
|
||||||
import { useSettingStore } from "/src/store/settings";
|
|
||||||
import NotificationSelector from "/@/views/certd/notification/notification-selector/index.vue";
|
|
||||||
import { useUserStore } from "/@/store/user";
|
import { useUserStore } from "/@/store/user";
|
||||||
|
import { utils } from "/@/utils";
|
||||||
|
import NotificationSelector from "/@/views/certd/notification/notification-selector/index.vue";
|
||||||
import { useI18n } from "/src/locales";
|
import { useI18n } from "/src/locales";
|
||||||
|
import { useSettingStore } from "/src/store/settings";
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
@@ -74,6 +75,7 @@ async function loadUserSettings() {
|
|||||||
|
|
||||||
loadUserSettings();
|
loadUserSettings();
|
||||||
const doSave = async (form: any) => {
|
const doSave = async (form: any) => {
|
||||||
|
await utils.sleep(300);
|
||||||
await api.SiteMonitorSettingsSave({
|
await api.SiteMonitorSettingsSave({
|
||||||
...formState,
|
...formState,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -26,6 +26,10 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
provide("getCurrentPluginDefine", () => {
|
||||||
|
return currentDefine;
|
||||||
|
});
|
||||||
|
|
||||||
function buildDefineFields(define: any, form: any, mode: string) {
|
function buildDefineFields(define: any, form: any, mode: string) {
|
||||||
const formWrapperRef = crudExpose.getFormWrapperRef();
|
const formWrapperRef = crudExpose.getFormWrapperRef();
|
||||||
const columnsRef = toRef(formWrapperRef.formOptions, "columns");
|
const columnsRef = toRef(formWrapperRef.formOptions, "columns");
|
||||||
|
|||||||
@@ -352,6 +352,7 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
|
|||||||
column: {
|
column: {
|
||||||
align: "center",
|
align: "center",
|
||||||
width: 120,
|
width: 120,
|
||||||
|
show: false,
|
||||||
sorter: true,
|
sorter: true,
|
||||||
},
|
},
|
||||||
form: {
|
form: {
|
||||||
@@ -464,6 +465,18 @@ export default function ({ crudExpose, context: { selectedRowKeys, openCertApply
|
|||||||
align: "center",
|
align: "center",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
nextRunTime: {
|
||||||
|
title: t("certd.fields.nextRunTime"),
|
||||||
|
type: "datetime",
|
||||||
|
form: {
|
||||||
|
show: false,
|
||||||
|
},
|
||||||
|
column: {
|
||||||
|
sorter: true,
|
||||||
|
width: 150,
|
||||||
|
align: "center",
|
||||||
|
},
|
||||||
|
},
|
||||||
disabled: {
|
disabled: {
|
||||||
title: t("certd.fields.enabled"),
|
title: t("certd.fields.enabled"),
|
||||||
type: "dict-switch",
|
type: "dict-switch",
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
<div class="step-row">
|
<div class="step-row">
|
||||||
<div class="text">
|
<div class="text">
|
||||||
<fs-icon icon="ion:flash"></fs-icon>
|
<fs-icon icon="ion:flash"></fs-icon>
|
||||||
<h4 class="title" :class="{ disabled: element.disabled, deleted: element.disabled }">{{ element.title }}</h4>
|
<h4 class="title" :class="{ disabled: element.disabled, deleted: element.disabled }" :title="element.title">{{ element.title }}</h4>
|
||||||
</div>
|
</div>
|
||||||
<div class="action">
|
<div class="action">
|
||||||
<a key="edit" @click="stepEdit(currentTask, element, index)">编辑</a>
|
<a key="edit" @click="stepEdit(currentTask, element, index)">编辑</a>
|
||||||
@@ -306,6 +306,9 @@ export default {
|
|||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
.text {
|
.text {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
> * {
|
> * {
|
||||||
margin: 0px;
|
margin: 0px;
|
||||||
margin-right: 15px;
|
margin-right: 15px;
|
||||||
@@ -314,9 +317,16 @@ export default {
|
|||||||
.action {
|
.action {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
word-wrap: nowrap;
|
||||||
|
margin-left: 10px;
|
||||||
> * {
|
> * {
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -885,6 +885,7 @@ export default defineComponent({
|
|||||||
saveLoading.value = false;
|
saveLoading.value = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const edit = () => {
|
const edit = () => {
|
||||||
pipeline.value = cloneDeep(currentPipeline.value);
|
pipeline.value = cloneDeep(currentPipeline.value);
|
||||||
currentHistory.value = null;
|
currentHistory.value = null;
|
||||||
@@ -1065,7 +1066,7 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
|
|
||||||
.layout-right {
|
.layout-right {
|
||||||
width: 364px;
|
width: 368px;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
max-width: 90vw;
|
max-width: 90vw;
|
||||||
}
|
}
|
||||||
@@ -1292,7 +1293,7 @@ export default defineComponent({
|
|||||||
.layout-right {
|
.layout-right {
|
||||||
position: relative;
|
position: relative;
|
||||||
&.collapsed {
|
&.collapsed {
|
||||||
margin-right: max(-364px, -90vw);
|
margin-right: max(-368px, -90vw);
|
||||||
}
|
}
|
||||||
|
|
||||||
.collapse-toggle {
|
.collapse-toggle {
|
||||||
|
|||||||
@@ -80,10 +80,13 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
|
|||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
{t("certd.subdomainHelpText")}
|
<div>
|
||||||
<a href={"https://help.aliyun.com/zh/dns/subdomain-management"} target={"_blank"}>
|
1. {t("certd.subdomainHelpText")}
|
||||||
{t("certd.subdomainManagement")}
|
<a href={"https://help.aliyun.com/zh/dns/subdomain-management"} target={"_blank"}>
|
||||||
</a>
|
{t("certd.subdomainManagement")}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
<div>2. {t("certd.subdomainHelpSupportStart")}</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -36,7 +36,7 @@
|
|||||||
<a-collapse v-if="detail?.template?.pipelineId > 0" v-model:active-key="activeKey">
|
<a-collapse v-if="detail?.template?.pipelineId > 0" v-model:active-key="activeKey">
|
||||||
<a-collapse-panel v-for="(step, stepId) in steps" :key="stepId" class="step-item" :header="step.title">
|
<a-collapse-panel v-for="(step, stepId) in steps" :key="stepId" class="step-item" :header="step.title">
|
||||||
<div class="step-inputs flex flex-wrap">
|
<div class="step-inputs flex flex-wrap">
|
||||||
<div v-for="(input, key) of step.input" :key="key" class="hover:bg-gray-100 p-5 w-full xl:w-[50%]">
|
<div v-for="(input, key) of step.input" :key="key" class="hover:bg-gray-100 dark:hover:bg-[#2d2d2d] p-5 w-full xl:w-[50%]">
|
||||||
<div class="flex flex-between" :title="input.define.helper">
|
<div class="flex flex-between" :title="input.define.helper">
|
||||||
<div class="flex flex-1 overflow-hidden mr-5">
|
<div class="flex flex-1 overflow-hidden mr-5">
|
||||||
<span style="min-width: 140px" class="bas">
|
<span style="min-width: 140px" class="bas">
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { get, set } from "lodash-es";
|
import { get, set } from "lodash-es";
|
||||||
import { computed, reactive, ref, defineProps } from "vue";
|
import { computed, reactive, ref } from "vue";
|
||||||
import { useStepHelper } from "./utils";
|
import { useStepHelper } from "./utils";
|
||||||
import { usePluginStore } from "/@/store/plugin";
|
import { usePluginStore } from "/@/store/plugin";
|
||||||
|
|
||||||
|
|||||||
@@ -74,6 +74,13 @@ function goDetail(link: any) {
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style lang="less">
|
<style lang="less">
|
||||||
|
.dark {
|
||||||
|
.data-item {
|
||||||
|
.header {
|
||||||
|
color: rgba(242, 242, 242, 0.85) !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
.statistic-card {
|
.statistic-card {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
.icon-text {
|
.icon-text {
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ import SmsCode from "/@/views/framework/login/sms-code.vue";
|
|||||||
import { useI18n } from "/@/locales";
|
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, useRouter } from "vue-router";
|
||||||
import OauthFooter from "/@/views/framework/oauth/oauth-footer.vue";
|
import OauthFooter from "/@/views/framework/oauth/oauth-footer.vue";
|
||||||
import * as oauthApi from "../oauth/api";
|
import * as oauthApi from "../oauth/api";
|
||||||
import { notification } from "ant-design-vue";
|
import { notification } from "ant-design-vue";
|
||||||
@@ -113,6 +113,7 @@ export default defineComponent({
|
|||||||
setup() {
|
setup() {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
const userStore = useUserStore();
|
||||||
|
|
||||||
const queryBindCode = ref(route.query.bindCode as string | undefined);
|
const queryBindCode = ref(route.query.bindCode as string | undefined);
|
||||||
|
|
||||||
@@ -120,7 +121,7 @@ export default defineComponent({
|
|||||||
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);
|
||||||
const userStore = useUserStore();
|
|
||||||
const settingStore = useSettingStore();
|
const settingStore = useSettingStore();
|
||||||
const formRef = ref();
|
const formRef = ref();
|
||||||
let defaultLoginType = settingStore.sysPublic.defaultLoginType || "password";
|
let defaultLoginType = settingStore.sysPublic.defaultLoginType || "password";
|
||||||
@@ -250,6 +251,7 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
return sysPublicSettings.oauthOnly && settingStore.isPlus && sysPublicSettings.oauthEnabled;
|
return sysPublicSettings.oauthOnly && settingStore.isPlus && sysPublicSettings.oauthEnabled;
|
||||||
});
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
t,
|
t,
|
||||||
loading,
|
loading,
|
||||||
@@ -309,6 +311,7 @@ export default defineComponent({
|
|||||||
.input-right {
|
.input-right {
|
||||||
width: 160px;
|
width: 160px;
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
|
background: #cfcfcf !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.forge-password {
|
.forge-password {
|
||||||
|
|||||||
@@ -221,14 +221,12 @@ onMounted(() => {
|
|||||||
border: 1px solid #e8e8e8;
|
border: 1px solid #e8e8e8;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
background-color: #fff;
|
|
||||||
|
|
||||||
.card-header {
|
.card-header {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 12px 16px;
|
padding: 12px 16px;
|
||||||
background-color: #fafafa;
|
|
||||||
border-bottom: 1px solid #e8e8e8;
|
border-bottom: 1px solid #e8e8e8;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -245,13 +243,11 @@ onMounted(() => {
|
|||||||
.input-form {
|
.input-form {
|
||||||
margin-bottom: 12px;
|
margin-bottom: 12px;
|
||||||
padding: 12px;
|
padding: 12px;
|
||||||
background-color: #fafafa;
|
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.domain-info {
|
.domain-info {
|
||||||
padding: 5.5px 12px;
|
padding: 5.5px 12px;
|
||||||
background-color: #f0f0f0;
|
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 16px;
|
gap: 16px;
|
||||||
@@ -272,7 +268,6 @@ onMounted(() => {
|
|||||||
.summary {
|
.summary {
|
||||||
margin-top: 16px;
|
margin-top: 16px;
|
||||||
padding: 12px;
|
padding: 12px;
|
||||||
background-color: #f8f9fa;
|
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
.summary-text {
|
.summary-text {
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -110,7 +110,6 @@ onMounted(() => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.info-item {
|
.info-item {
|
||||||
background-color: #fafafa;
|
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
padding: 12px;
|
padding: 12px;
|
||||||
|
|
||||||
|
|||||||
@@ -138,7 +138,6 @@ const resultError = computed(() => {
|
|||||||
.port-info {
|
.port-info {
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
color: #999;
|
color: #999;
|
||||||
background-color: #f0f0f0;
|
|
||||||
padding: 2px 6px;
|
padding: 2px 6px;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
@@ -154,7 +153,6 @@ const resultError = computed(() => {
|
|||||||
.error-message,
|
.error-message,
|
||||||
.object-result,
|
.object-result,
|
||||||
.text-result {
|
.text-result {
|
||||||
background-color: #f8f8f8;
|
|
||||||
padding: 8px 10px;
|
padding: 8px 10px;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
overflow-x: auto;
|
overflow-x: auto;
|
||||||
@@ -170,7 +168,6 @@ const resultError = computed(() => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.test-log {
|
.test-log {
|
||||||
background-color: #f8f8f8;
|
|
||||||
padding: 8px 10px;
|
padding: 8px 10px;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
overflow-x: auto;
|
overflow-x: auto;
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ import ServerInfoCard from "./ServerInfoCard.vue";
|
|||||||
.page-sys-nettest {
|
.page-sys-nettest {
|
||||||
.nettest-container {
|
.nettest-container {
|
||||||
padding: 16px;
|
padding: 16px;
|
||||||
background-color: #fff;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.test-areas {
|
.test-areas {
|
||||||
|
|||||||
@@ -30,6 +30,7 @@
|
|||||||
</a-form-item>
|
</a-form-item>
|
||||||
<a-form-item :label="t('certd.senderEmail')" name="sender" :rules="[{ required: true, message: t('certd.pleaseEnterSenderEmail') }]">
|
<a-form-item :label="t('certd.senderEmail')" name="sender" :rules="[{ required: true, message: t('certd.pleaseEnterSenderEmail') }]">
|
||||||
<a-input v-model:value="formState.sender" />
|
<a-input v-model:value="formState.sender" />
|
||||||
|
<div class="helper">{{ t("certd.senderEmailHelper") }}</div>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
<a-form-item :label="t('certd.useSsl')" name="secure">
|
<a-form-item :label="t('certd.useSsl')" name="secure">
|
||||||
<a-switch v-model:checked="formState.secure" />
|
<a-switch v-model:checked="formState.secure" />
|
||||||
|
|||||||
@@ -26,6 +26,9 @@
|
|||||||
<a-tab-pane key="pipeline" :tab="t('certd.sys.setting.pipelineSetting')">
|
<a-tab-pane key="pipeline" :tab="t('certd.sys.setting.pipelineSetting')">
|
||||||
<SettingPipeline v-if="activeKey === 'pipeline'" />
|
<SettingPipeline v-if="activeKey === 'pipeline'" />
|
||||||
</a-tab-pane>
|
</a-tab-pane>
|
||||||
|
<a-tab-pane key="network" :tab="t('certd.sys.setting.networkSetting')">
|
||||||
|
<SettingNetwork v-if="activeKey === 'network'" />
|
||||||
|
</a-tab-pane>
|
||||||
</a-tabs>
|
</a-tabs>
|
||||||
</div>
|
</div>
|
||||||
</fs-page>
|
</fs-page>
|
||||||
@@ -39,6 +42,7 @@ 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 SettingOauth from "/@/views/sys/settings/tabs/oauth.vue";
|
||||||
|
import SettingNetwork from "/@/views/sys/settings/tabs/network.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";
|
||||||
|
|||||||
@@ -15,33 +15,6 @@
|
|||||||
<a-switch v-model:checked="formState.public.robots" />
|
<a-switch v-model:checked="formState.public.robots" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
|
||||||
<a-form-item :label="t('certd.httpProxy')" :name="['private', 'httpProxy']" :rules="urlRules">
|
|
||||||
<a-input v-model:value="formState.private.httpProxy" :placeholder="t('certd.httpProxyPlaceholder')" />
|
|
||||||
<div class="helper">{{ t("certd.httpProxyHelper") }}</div>
|
|
||||||
</a-form-item>
|
|
||||||
|
|
||||||
<a-form-item :label="t('certd.httpsProxy')" :name="['private', 'httpsProxy']" :rules="urlRules">
|
|
||||||
<div class="flex">
|
|
||||||
<a-input v-model:value="formState.private.httpsProxy" :placeholder="t('certd.httpsProxyPlaceholder')" />
|
|
||||||
<a-button class="ml-5" type="primary" :loading="testProxyLoading" :title="t('certd.saveThenTestTitle')" @click="testProxy">{{ t("certd.testButton") }}</a-button>
|
|
||||||
</div>
|
|
||||||
<div class="helper">{{ t("certd.httpsProxyHelper") }}</div>
|
|
||||||
</a-form-item>
|
|
||||||
|
|
||||||
<a-form-item :label="t('certd.dualStackNetwork')" :name="['private', 'dnsResultOrder']">
|
|
||||||
<a-select v-model:value="formState.private.dnsResultOrder">
|
|
||||||
<a-select-option value="verbatim">{{ t("certd.default") }}</a-select-option>
|
|
||||||
<a-select-option value="ipv4first">{{ t("certd.ipv4Priority") }}</a-select-option>
|
|
||||||
<a-select-option value="ipv6first">{{ t("certd.ipv6Priority") }}</a-select-option>
|
|
||||||
</a-select>
|
|
||||||
<div class="helper">{{ t("certd.dualStackNetworkHelper") }}, <a href="https://certd.docmirror.cn/guide/use/setting/ipv6.html" target="_blank">{{ t("certd.helpDocLink") }}</a></div>
|
|
||||||
</a-form-item>
|
|
||||||
|
|
||||||
<a-form-item :label="t('certd.sys.setting.showRunStrategy')" :name="['public', 'showRunStrategy']">
|
|
||||||
<a-switch v-model:checked="formState.public.showRunStrategy" />
|
|
||||||
<div class="helper">{{ t("certd.sys.setting.showRunStrategyHelper") }}</div>
|
|
||||||
</a-form-item>
|
|
||||||
|
|
||||||
<a-form-item :label="t('certd.enableCommonCnameService')" :name="['private', 'commonCnameEnabled']">
|
<a-form-item :label="t('certd.enableCommonCnameService')" :name="['private', 'commonCnameEnabled']">
|
||||||
<a-switch v-model:checked="formState.private.commonCnameEnabled" />
|
<a-switch v-model:checked="formState.private.commonCnameEnabled" />
|
||||||
<div class="helper" v-html="t('certd.commonCnameHelper')"></div>
|
<div class="helper" v-html="t('certd.commonCnameHelper')"></div>
|
||||||
@@ -60,16 +33,14 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="tsx">
|
<script setup lang="tsx">
|
||||||
import { reactive, ref } from "vue";
|
|
||||||
import { 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 { util } from "/@/utils";
|
import { merge } from "lodash-es";
|
||||||
|
import { reactive, 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";
|
||||||
import AddonSelector from "../../../certd/addon/addon-selector/index.vue";
|
|
||||||
import CaptchaInput from "/@/components/captcha/captcha-input.vue";
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
defineOptions({
|
defineOptions({
|
||||||
@@ -84,11 +55,6 @@ const formState = reactive<Partial<SysSettings>>({
|
|||||||
private: {},
|
private: {},
|
||||||
});
|
});
|
||||||
|
|
||||||
const urlRules = ref({
|
|
||||||
type: "url",
|
|
||||||
message: "请输入正确的URL",
|
|
||||||
});
|
|
||||||
|
|
||||||
async function loadSysSettings() {
|
async function loadSysSettings() {
|
||||||
const data: any = await api.SysSettingsGet();
|
const data: any = await api.SysSettingsGet();
|
||||||
merge(formState, data);
|
merge(formState, data);
|
||||||
@@ -110,43 +76,6 @@ const onFinish = async (form: any) => {
|
|||||||
saveLoading.value = false;
|
saveLoading.value = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const testProxyLoading = ref(false);
|
|
||||||
async function testProxy() {
|
|
||||||
testProxyLoading.value = true;
|
|
||||||
try {
|
|
||||||
const res = await api.TestProxy();
|
|
||||||
let success = true;
|
|
||||||
if (res.google !== true || res.baidu !== true) {
|
|
||||||
success = false;
|
|
||||||
}
|
|
||||||
const content = () => {
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<div>
|
|
||||||
{t("certd.google")}: {res.google === true ? t("certd.success") : util.maxLength(res.google)}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
{t("certd.baidu")}: {res.baidu === true ? t("certd.success") : util.maxLength(res.baidu)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
if (!success) {
|
|
||||||
notification.error({
|
|
||||||
message: t("certd.testFailed"),
|
|
||||||
description: content,
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
notification.success({
|
|
||||||
message: t("certd.testCompleted"),
|
|
||||||
description: content,
|
|
||||||
});
|
|
||||||
} finally {
|
|
||||||
testProxyLoading.value = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
<style lang="less">
|
<style lang="less">
|
||||||
.sys-settings-base {
|
.sys-settings-base {
|
||||||
|
|||||||
@@ -0,0 +1,127 @@
|
|||||||
|
<template>
|
||||||
|
<div class="sys-settings-form sys-settings-network">
|
||||||
|
<a-form :model="formState" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off" @finish="onFinish">
|
||||||
|
<a-form-item :label="t('certd.httpProxy')" :name="['private', 'httpProxy']" :rules="urlRules">
|
||||||
|
<a-input v-model:value="formState.private.httpProxy" :placeholder="t('certd.httpProxyPlaceholder')" />
|
||||||
|
<div class="helper">{{ t("certd.httpProxyHelper") }}</div>
|
||||||
|
</a-form-item>
|
||||||
|
|
||||||
|
<a-form-item :label="t('certd.httpsProxy')" :name="['private', 'httpsProxy']" :rules="urlRules">
|
||||||
|
<div class="flex">
|
||||||
|
<a-input v-model:value="formState.private.httpsProxy" :placeholder="t('certd.httpsProxyPlaceholder')" />
|
||||||
|
<a-button class="ml-5" type="primary" :loading="testProxyLoading" :title="t('certd.saveThenTestTitle')" @click="testProxy">{{ t("certd.testButton") }}</a-button>
|
||||||
|
</div>
|
||||||
|
<div class="helper">{{ t("certd.httpsProxyHelper") }}</div>
|
||||||
|
</a-form-item>
|
||||||
|
|
||||||
|
<a-form-item :label="t('certd.dualStackNetwork')" :name="['private', 'dnsResultOrder']">
|
||||||
|
<a-select v-model:value="formState.private.dnsResultOrder">
|
||||||
|
<a-select-option value="verbatim">{{ t("certd.default") }}</a-select-option>
|
||||||
|
<a-select-option value="ipv4first">{{ t("certd.ipv4Priority") }}</a-select-option>
|
||||||
|
<a-select-option value="ipv6first">{{ t("certd.ipv6Priority") }}</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
<div class="helper">
|
||||||
|
{{ t("certd.dualStackNetworkHelper") }}, <a href="https://certd.docmirror.cn/guide/use/setting/ipv6.html" target="_blank">{{ t("certd.helpDocLink") }}</a>
|
||||||
|
</div>
|
||||||
|
</a-form-item>
|
||||||
|
<a-form-item :label="t('certd.sys.setting.reverseProxy')" :name="['private', 'reverseProxy']">
|
||||||
|
<div class="mt-5">
|
||||||
|
<div v-for="(value, key) in formState.private.reverseProxies" :key="key" class="flex items-center p-2 border-b border-gray-300">
|
||||||
|
<span class="flex-1">{{ key }}</span>
|
||||||
|
<span class="flex-1 ml-5"><a-input v-model:value="formState.private.reverseProxies[key]" placeholder="proxy.xxxx.com" allow-clear /></span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="helper">{{ t("certd.sys.setting.reverseProxyHelper") }}</div>
|
||||||
|
</a-form-item>
|
||||||
|
|
||||||
|
<a-form-item label=" " :colon="false" :wrapper-col="{ span: 8 }">
|
||||||
|
<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 { proxyRefs, reactive, ref } from "vue";
|
||||||
|
import { 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 { message, notification } from "ant-design-vue";
|
||||||
|
import { useI18n } from "/src/locales";
|
||||||
|
const { t } = useI18n();
|
||||||
|
import { util } from "/@/utils";
|
||||||
|
defineOptions({
|
||||||
|
name: "SettingNetwork",
|
||||||
|
});
|
||||||
|
|
||||||
|
const formState = reactive<Partial<SysSettings>>({
|
||||||
|
public: {},
|
||||||
|
private: {},
|
||||||
|
});
|
||||||
|
|
||||||
|
const urlRules = ref({
|
||||||
|
type: "url",
|
||||||
|
message: "请输入正确的URL",
|
||||||
|
});
|
||||||
|
|
||||||
|
async function loadSysSettings() {
|
||||||
|
const data: any = await api.SysSettingsGet();
|
||||||
|
merge(formState, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
const saveLoading = ref(false);
|
||||||
|
loadSysSettings();
|
||||||
|
const settingsStore = useSettingStore();
|
||||||
|
const onFinish = async (form: any) => {
|
||||||
|
try {
|
||||||
|
saveLoading.value = true;
|
||||||
|
form.private.reverseProxies = formState.private.reverseProxies;
|
||||||
|
await api.SysSettingsSave(form);
|
||||||
|
await settingsStore.loadSysSettings();
|
||||||
|
notification.success({
|
||||||
|
message: t("certd.saveSuccess"),
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
saveLoading.value = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const testProxyLoading = ref(false);
|
||||||
|
async function testProxy() {
|
||||||
|
testProxyLoading.value = true;
|
||||||
|
try {
|
||||||
|
const res = await api.TestProxy();
|
||||||
|
let success = true;
|
||||||
|
if (res.google !== true || res.baidu !== true) {
|
||||||
|
success = false;
|
||||||
|
}
|
||||||
|
const content = () => {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<div>
|
||||||
|
{t("certd.google")}: {res.google === true ? t("certd.success") : util.maxLength(res.google)}
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
{t("certd.baidu")}: {res.baidu === true ? t("certd.success") : util.maxLength(res.baidu)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
if (!success) {
|
||||||
|
notification.error({
|
||||||
|
message: t("certd.testFailed"),
|
||||||
|
description: content,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
notification.success({
|
||||||
|
message: t("certd.testCompleted"),
|
||||||
|
description: content,
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
testProxyLoading.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<style lang="less"></style>
|
||||||
@@ -8,6 +8,10 @@
|
|||||||
<a-input-number v-model:value="formState.public.limitUserPipelineCount" />
|
<a-input-number v-model:value="formState.public.limitUserPipelineCount" />
|
||||||
<div class="helper">{{ t("certd.limitUserPipelineCountHelper") }}</div>
|
<div class="helper">{{ t("certd.limitUserPipelineCountHelper") }}</div>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
<a-form-item :label="t('certd.sys.setting.showRunStrategy')" :name="['public', 'showRunStrategy']">
|
||||||
|
<a-switch v-model:checked="formState.public.showRunStrategy" />
|
||||||
|
<div class="helper">{{ t("certd.sys.setting.showRunStrategyHelper") }}</div>
|
||||||
|
</a-form-item>
|
||||||
<a-form-item :label="t('certd.sys.setting.pipelineValidTimeEnabled')" :name="['public', 'pipelineValidTimeEnabled']">
|
<a-form-item :label="t('certd.sys.setting.pipelineValidTimeEnabled')" :name="['public', 'pipelineValidTimeEnabled']">
|
||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
<a-switch v-model:checked="formState.public.pipelineValidTimeEnabled" :disabled="!settingsStore.isPlus" />
|
<a-switch v-model:checked="formState.public.pipelineValidTimeEnabled" :disabled="!settingsStore.isPlus" />
|
||||||
|
|||||||