mirror of
https://github.com/certd/certd.git
synced 2026-04-24 12:27:25 +08:00
Merge branch 'v2-dev' into v2-dev-buy
This commit is contained in:
@@ -3,7 +3,7 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches: ['v2-dev']
|
branches: ['v2-dev']
|
||||||
paths:
|
paths:
|
||||||
- "build.trigger"
|
- "trigger/build.trigger"
|
||||||
|
|
||||||
# schedule:
|
# schedule:
|
||||||
# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
|
# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
|
||||||
@@ -68,7 +68,7 @@ jobs:
|
|||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Login to Docker Hub
|
- name: Login to Docker Hub
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
@@ -82,34 +82,4 @@ jobs:
|
|||||||
push: true
|
push: true
|
||||||
context: ./packages/ui/
|
context: ./packages/ui/
|
||||||
tags: |
|
tags: |
|
||||||
registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest
|
|
||||||
registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}}
|
registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}}
|
||||||
greper/certd:latest
|
|
||||||
greper/certd:${{steps.get_certd_version.outputs.result}}
|
|
||||||
ghcr.io/${{ github.repository }}:latest
|
|
||||||
ghcr.io/${{ github.repository }}:${{steps.get_certd_version.outputs.result}}
|
|
||||||
- name: Build armv7
|
|
||||||
uses: docker/build-push-action@v6
|
|
||||||
with:
|
|
||||||
platforms: linux/arm/v7
|
|
||||||
push: true
|
|
||||||
context: ./packages/ui/
|
|
||||||
tags: |
|
|
||||||
registry.cn-shenzhen.aliyuncs.com/handsfree/certd:armv7
|
|
||||||
registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}}-armv7
|
|
||||||
greper/certd:armv7
|
|
||||||
greper/certd:${{steps.get_certd_version.outputs.result}}-armv7
|
|
||||||
ghcr.io/${{ github.repository }}:armv7
|
|
||||||
ghcr.io/${{ github.repository }}:${{steps.get_certd_version.outputs.result}}-armv7
|
|
||||||
|
|
||||||
# - name: Build agent
|
|
||||||
# uses: docker/build-push-action@v6
|
|
||||||
# with:
|
|
||||||
# platforms: linux/amd64,linux/arm64
|
|
||||||
# push: true
|
|
||||||
# context: ./packages/ui/agent/
|
|
||||||
# tags: |
|
|
||||||
# registry.cn-shenzhen.aliyuncs.com/handsfree/certd-agent:latest
|
|
||||||
# registry.cn-shenzhen.aliyuncs.com/handsfree/certd-agent:${{steps.get_certd_version.outputs.result}}
|
|
||||||
# greper/certd-agent:latest
|
|
||||||
# greper/certd-agent:${{steps.get_certd_version.outputs.result}}
|
|
||||||
|
|||||||
@@ -3,12 +3,13 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches: ['v2-dev']
|
branches: ['v2-dev']
|
||||||
paths:
|
paths:
|
||||||
- "deploy.trigger"
|
- "trigger/deploy.trigger"
|
||||||
workflow_run:
|
workflow_run:
|
||||||
workflows: [ "build-image" ]
|
workflows: [ "build-image" ]
|
||||||
types:
|
types:
|
||||||
- completed
|
- completed
|
||||||
|
|
||||||
|
|
||||||
# schedule:
|
# schedule:
|
||||||
# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
|
# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
|
||||||
# - cron: '17 19 * * *'
|
# - cron: '17 19 * * *'
|
||||||
@@ -54,14 +55,3 @@ jobs:
|
|||||||
retry-count: 3
|
retry-count: 3
|
||||||
retry-delay: 5000
|
retry-delay: 5000
|
||||||
|
|
||||||
- name: deploy-certd-doc
|
|
||||||
uses: tyrrrz/action-http-request@master
|
|
||||||
with:
|
|
||||||
url: http://flow-openapi.aliyun.com/pipeline/webhook/IiSxLDp9aOhgDUxJPytv
|
|
||||||
method: POST
|
|
||||||
body: |
|
|
||||||
{}
|
|
||||||
headers: |
|
|
||||||
Content-Type: application/json
|
|
||||||
retry-count: 3
|
|
||||||
retry-delay: 5000
|
|
||||||
|
|||||||
@@ -1,9 +1,13 @@
|
|||||||
name: build-image-for-test
|
name: build-image-for-release
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: ['v2-dev']
|
branches: ['v2-dev']
|
||||||
paths:
|
paths:
|
||||||
- "build-dev.trigger"
|
- "trigger/release.trigger"
|
||||||
|
# workflow_run:
|
||||||
|
# workflows: [ "deploy-demo" ]
|
||||||
|
# types:
|
||||||
|
# - completed
|
||||||
|
|
||||||
# schedule:
|
# schedule:
|
||||||
# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
|
# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
|
||||||
@@ -20,7 +24,7 @@ jobs:
|
|||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
ref: v2-dev
|
lfs: true
|
||||||
|
|
||||||
- name: get_certd_version
|
- name: get_certd_version
|
||||||
id: get_certd_version
|
id: get_certd_version
|
||||||
@@ -75,17 +79,19 @@ jobs:
|
|||||||
username: ${{ secrets.dockerhub_username }}
|
username: ${{ secrets.dockerhub_username }}
|
||||||
password: ${{ secrets.dockerhub_password }}
|
password: ${{ secrets.dockerhub_password }}
|
||||||
|
|
||||||
# - name: Build default platforms
|
- name: Build default platforms
|
||||||
# uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
# with:
|
with:
|
||||||
# platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
# push: true
|
push: true
|
||||||
# context: ./packages/ui/
|
context: ./packages/ui/
|
||||||
# tags: |
|
tags: |
|
||||||
# registry.cn-shenzhen.aliyuncs.com/handsfree/certd-dev:latest
|
registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest
|
||||||
# greper/certd-dev:latest
|
registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}}
|
||||||
# ghcr.io/${{ github.repository }}:dev-latest
|
greper/certd:latest
|
||||||
|
greper/certd:${{steps.get_certd_version.outputs.result}}
|
||||||
|
ghcr.io/${{ github.repository }}:latest
|
||||||
|
ghcr.io/${{ github.repository }}:${{steps.get_certd_version.outputs.result}}
|
||||||
- name: Build armv7
|
- name: Build armv7
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
@@ -96,4 +102,30 @@ jobs:
|
|||||||
registry.cn-shenzhen.aliyuncs.com/handsfree/certd:armv7
|
registry.cn-shenzhen.aliyuncs.com/handsfree/certd:armv7
|
||||||
registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}}-armv7
|
registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}}-armv7
|
||||||
greper/certd:armv7
|
greper/certd:armv7
|
||||||
greper/certd:${{steps.get_certd_version.outputs.result}}-armv7
|
greper/certd:${{steps.get_certd_version.outputs.result}}-armv7
|
||||||
|
ghcr.io/${{ github.repository }}:armv7
|
||||||
|
ghcr.io/${{ github.repository }}:${{steps.get_certd_version.outputs.result}}-armv7
|
||||||
|
|
||||||
|
# - name: Build agent
|
||||||
|
# uses: docker/build-push-action@v6
|
||||||
|
# with:
|
||||||
|
# platforms: linux/amd64,linux/arm64
|
||||||
|
# push: true
|
||||||
|
# context: ./packages/ui/agent/
|
||||||
|
# tags: |
|
||||||
|
# registry.cn-shenzhen.aliyuncs.com/handsfree/certd-agent:latest
|
||||||
|
# registry.cn-shenzhen.aliyuncs.com/handsfree/certd-agent:${{steps.get_certd_version.outputs.result}}
|
||||||
|
# greper/certd-agent:latest
|
||||||
|
# greper/certd-agent:${{steps.get_certd_version.outputs.result}}
|
||||||
|
|
||||||
|
- name: deploy-certd-doc
|
||||||
|
uses: tyrrrz/action-http-request@master
|
||||||
|
with:
|
||||||
|
url: http://flow-openapi.aliyun.com/pipeline/webhook/IiSxLDp9aOhgDUxJPytv
|
||||||
|
method: POST
|
||||||
|
body: |
|
||||||
|
{}
|
||||||
|
headers: |
|
||||||
|
Content-Type: application/json
|
||||||
|
retry-count: 3
|
||||||
|
retry-delay: 5000
|
||||||
+2
-3
@@ -1,6 +1,5 @@
|
|||||||
./packages/core/lego
|
./packages/core/lego
|
||||||
# IntelliJ project files
|
# IntelliJ project files
|
||||||
.vscode/
|
|
||||||
node_modules/
|
node_modules/
|
||||||
npm-debug.log
|
npm-debug.log
|
||||||
yarn-error.log
|
yarn-error.log
|
||||||
@@ -30,5 +29,5 @@ test/**/*.js
|
|||||||
/packages/ui/certd-server/data/db.sqlite
|
/packages/ui/certd-server/data/db.sqlite
|
||||||
/packages/ui/certd-server/data/keys.yaml
|
/packages/ui/certd-server/data/keys.yaml
|
||||||
/packages/pro/
|
/packages/pro/
|
||||||
|
test.js
|
||||||
test.js
|
.history
|
||||||
@@ -1,2 +1,6 @@
|
|||||||
link-workspace-packages=deep
|
link-workspace-packages=deep
|
||||||
prefer-workspace-packages=true
|
prefer-workspace-packages=true
|
||||||
|
better_sqlite3_binary_host=https://registry.npmmirror.com/-/binary/better-sqlite3
|
||||||
|
better_sqlite3_binary_host_mirror=https://registry.npmmirror.com/-/binary/better-sqlite3
|
||||||
|
better-sqlite3_binary_host=https://registry.npmmirror.com/-/binary/better-sqlite3
|
||||||
|
better-sqlite3_binary_host_mirror=https://registry.npmmirror.com/-/binary/better-sqlite3
|
||||||
|
|||||||
Vendored
+73
@@ -0,0 +1,73 @@
|
|||||||
|
{
|
||||||
|
// 使用 IntelliSense 了解相关属性。
|
||||||
|
// 悬停以查看现有属性的描述。
|
||||||
|
// 欲了解更多信息,请访问: https://go.microsoft.com/fwlink/?linkid=830387
|
||||||
|
"version": "0.2.0",
|
||||||
|
"configurations": [
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "client",
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"cwd": "${workspaceFolder}/packages/ui/certd-client",
|
||||||
|
"runtimeExecutable": "pnpm",
|
||||||
|
"runtimeArgs": ["dev"],
|
||||||
|
"console": "integratedTerminal",
|
||||||
|
"internalConsoleOptions": "neverOpen"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "server",
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"cwd": "${workspaceFolder}/packages/ui/certd-server",
|
||||||
|
"runtimeExecutable": "pnpm",
|
||||||
|
"runtimeArgs": ["dev"],
|
||||||
|
"console": "integratedTerminal",
|
||||||
|
"internalConsoleOptions": "neverOpen"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "server-mysql",
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"cwd": "${workspaceFolder}/packages/ui/certd-server",
|
||||||
|
"runtimeExecutable": "pnpm",
|
||||||
|
"runtimeArgs": ["dev-mysql"],
|
||||||
|
"console": "integratedTerminal",
|
||||||
|
"internalConsoleOptions": "neverOpen"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "server-pg",
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"cwd": "${workspaceFolder}/packages/ui/certd-server",
|
||||||
|
"runtimeExecutable": "pnpm",
|
||||||
|
"runtimeArgs": ["dev-pg"],
|
||||||
|
"console": "integratedTerminal",
|
||||||
|
"internalConsoleOptions": "neverOpen"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "server-common",
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"cwd": "${workspaceFolder}/packages/ui/certd-server",
|
||||||
|
"runtimeExecutable": "pnpm",
|
||||||
|
"runtimeArgs": ["dev-commpro"],
|
||||||
|
"console": "integratedTerminal",
|
||||||
|
"internalConsoleOptions": "neverOpen"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "server-local-plus",
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"cwd": "${workspaceFolder}/packages/ui/certd-server",
|
||||||
|
"runtimeExecutable": "npm",
|
||||||
|
"runtimeArgs": ["run", "dev-localplus"],
|
||||||
|
"console": "integratedTerminal",
|
||||||
|
"internalConsoleOptions": "neverOpen",
|
||||||
|
"env": {
|
||||||
|
"plus_use_prod": "false",
|
||||||
|
"PLUS_SERVER_BASE_URL": "http://127.0.0.1:11007"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
Vendored
+8
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"eslint.debug": false,
|
||||||
|
"eslint.format.enable": true,
|
||||||
|
"typescript.tsc.autoDetect": "watch",
|
||||||
|
"git.scanRepositories": [
|
||||||
|
"./packages/pro"
|
||||||
|
]
|
||||||
|
}
|
||||||
Vendored
+52
@@ -0,0 +1,52 @@
|
|||||||
|
{
|
||||||
|
"version": "2.0.0",
|
||||||
|
"tasks": [
|
||||||
|
{
|
||||||
|
"label": "启动Client",
|
||||||
|
"type": "shell",
|
||||||
|
"command": "npm",
|
||||||
|
"args": ["run", "dev"],
|
||||||
|
"options": {
|
||||||
|
"cwd": "${workspaceFolder}/packages/ui/certd-client"
|
||||||
|
},
|
||||||
|
"group": {
|
||||||
|
"kind": "build",
|
||||||
|
"isDefault": true
|
||||||
|
},
|
||||||
|
"presentation": {
|
||||||
|
"echo": true,
|
||||||
|
"reveal": "always",
|
||||||
|
"focus": false,
|
||||||
|
"panel": "shared"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "启动Server",
|
||||||
|
"type": "shell",
|
||||||
|
"command": "npm",
|
||||||
|
"args": ["run", "dev"],
|
||||||
|
"options": {
|
||||||
|
"cwd": "${workspaceFolder}/packages/ui/certd-server"
|
||||||
|
},
|
||||||
|
"group": {
|
||||||
|
"kind": "build",
|
||||||
|
"isDefault": true
|
||||||
|
},
|
||||||
|
"presentation": {
|
||||||
|
"echo": true,
|
||||||
|
"reveal": "always",
|
||||||
|
"focus": false,
|
||||||
|
"panel": "shared"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "同时启动Client和Server",
|
||||||
|
"dependsOn": ["启动Client", "启动Server"],
|
||||||
|
"group": {
|
||||||
|
"kind": "build",
|
||||||
|
"isDefault": true
|
||||||
|
},
|
||||||
|
"problemMatcher": []
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -3,6 +3,104 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复站点证书监控复制按钮无效的bug ([efa26a0](https://github.com/certd/certd/commit/efa26a067f06402f30befc016d9934cadcd5a563))
|
||||||
|
* 修复lego模式下 私钥加密类型错误的bug ([f7cf7c1](https://github.com/certd/certd/commit/f7cf7c198d7f77b222099770f81accc637bc6619))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化数据备份效率,流式写入文件 ([c38dbbb](https://github.com/certd/certd/commit/c38dbbb1d72bd00a92fe275b76aea82a791e7199))
|
||||||
|
|
||||||
|
## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复并发情况下证书申请日志混乱的bug ([bb2714f](https://github.com/certd/certd/commit/bb2714ff241f9db4a71d805b23a1b0f9f2f6413a))
|
||||||
|
* 修复网络测试,telnet的bug ([c03a70f](https://github.com/certd/certd/commit/c03a70fde23c8e840bd0fdb4fcbca8990f6c65eb))
|
||||||
|
* 修复站点证书监控,证书已经更新到最新日期了,仍然发出警告通知的bug ([1f42f93](https://github.com/certd/certd/commit/1f42f933f07860b27aa3d016e40916ff2b063eac))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 注册页面增加手机注册tab页签 ([6b2f1fc](https://github.com/certd/certd/commit/6b2f1fcd3e058061b814c3331cda8ce1b2d80d73))
|
||||||
|
* 流水线创建时支持添加到证书监控 ([59ba408](https://github.com/certd/certd/commit/59ba4080706548828ef1c0a9cd893c1c9a7d591f))
|
||||||
|
* 流水线支持有效期设置 ([911e69e](https://github.com/certd/certd/commit/911e69e3bc0cdd48b62953b5d0981d640fc1f8ac))
|
||||||
|
* 群辉增加请求超时时长设置 ([b381492](https://github.com/certd/certd/commit/b3814920bdcabc911f860a8e19b5b9b3a04709ac))
|
||||||
|
* 通知支持meow ([c77645e](https://github.com/certd/certd/commit/c77645e1733670214aaca5544cf8759d7e4adda4))
|
||||||
|
* 站点证书监控增加导出和分组功能 ([2ed12c4](https://github.com/certd/certd/commit/2ed12c429eb58274a4f9dd0ed3b66e160d283ded))
|
||||||
|
* 证书监控增加批量删除 ([e578c52](https://github.com/certd/certd/commit/e578c52fdf2f838038062aa4209b655fbae461fb))
|
||||||
|
* esa 自动删除过期证书提示 ([8bf1f82](https://github.com/certd/certd/commit/8bf1f828b9eaa9208f32e8ee7460b86420fed0c7))
|
||||||
|
* ssh 增加禁止-i参数提示 ([3a8931f](https://github.com/certd/certd/commit/3a8931feeffd7157163ff7d46b693e5e1a434b9c))
|
||||||
|
|
||||||
|
## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复飞牛证书部署后无法生效的bug ([bf156a1](https://github.com/certd/certd/commit/bf156a13bd443cdadb73c9dff79bbef7231b4401))
|
||||||
|
* aliyunoss 选择证书接入点选择新加坡无法上传的bug ([e00733a](https://github.com/certd/certd/commit/e00733a34644c23ffe926486b15dc96bf2fa4b57))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化start.sh脚本,去掉删除非ui目录的操作及提示 ([7993a7c](https://github.com/certd/certd/commit/7993a7cdb01885535950c63187e3f67d67ba2f75))
|
||||||
|
* 增加飞牛证书id选择的提示 ([5a4d812](https://github.com/certd/certd/commit/5a4d8121462b1afe921d028465687be8c9679814))
|
||||||
|
* 证书监控支持设置证书即将过期天数 ([cd35568](https://github.com/certd/certd/commit/cd35568e042e6ab928685efad51cdbed823d2d4f))
|
||||||
|
* 支持网络测试 ([2bef608](https://github.com/certd/certd/commit/2bef608e07ceb56d52007f290667e0afef401b22))
|
||||||
|
* 支持新网代理方式 ([f612509](https://github.com/certd/certd/commit/f612509cac87b859e81a7a52fe94b2eaccad22f9))
|
||||||
|
* dns支持新网互联 ([f415190](https://github.com/certd/certd/commit/f41519048326d971acd9e0a30462231f77a299a6))
|
||||||
|
* start.sh脚本支持根据当前系统判断是否使用sudo ([567cb7d](https://github.com/certd/certd/commit/567cb7d737023e26ec58403c6f28f109e212d379))
|
||||||
|
|
||||||
|
## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复版本比较bug ([109696e](https://github.com/certd/certd/commit/109696e965d68c50c8627ffd40203edd1d2daea5))
|
||||||
|
* 修复某些情况下cname申请证书报错主域名不一致的bug ([2671781](https://github.com/certd/certd/commit/2671781e1bb0838981728d85eacf0e1a25a0fa48))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* cname主域名校验提示优化,显示不一致的两方便于排查问题 ([6ebb365](https://github.com/certd/certd/commit/6ebb3659f42155e4e8da600c493fb5227cd08137))
|
||||||
|
* dns解析支持阿里esa ([9291fa6](https://github.com/certd/certd/commit/9291fa68aa7a88a05c2f888bf3048df36a8fbde3))
|
||||||
|
|
||||||
|
# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* @certd/ui-server module import报错的问题 ([0c61d4c](https://github.com/certd/certd/commit/0c61d4c9788677c83c567db5381b9e257ec90bba))
|
||||||
|
* dist打包前检查 ([8f6e5bd](https://github.com/certd/certd/commit/8f6e5bd24b3b65fbfcba36c08f532a3abad2d606))
|
||||||
|
|
||||||
|
## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 固定midwayjs版本,修复ui-server import 错误的bug ([eb4d125](https://github.com/certd/certd/commit/eb4d125eaf4a41e88c752d0c68993829589f8f27))
|
||||||
|
|
||||||
|
## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复 ui-server 加载失败问题 ([c2ccdbe](https://github.com/certd/certd/commit/c2ccdbec9dd08bca4688eeb2f34d0105eec43ba1))
|
||||||
|
* 修复 ui-server 加载失败问题 ([063f5c3](https://github.com/certd/certd/commit/063f5c3b55e47df22543a64f02e039e84f92cd14))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 重置管理员密码同时会关闭验证码,防止验证码失效之后无法登录 ([03899d4](https://github.com/certd/certd/commit/03899d4d9c76fc2077dacc53ab88e2c9ca41af7c))
|
||||||
|
|
||||||
|
## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 授权页面,id列位置不在第一列的bug ([3f1722d](https://github.com/certd/certd/commit/3f1722d54debcb4849dc14521a2da0d9b304b69f))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 动态加载验证码script ([dcc396a](https://github.com/certd/certd/commit/dcc396afb7a23aeb8af57c01014b09af5f033e61))
|
||||||
|
* 开启子域名托管之后cname记录支持重置 ([54c8d62](https://github.com/certd/certd/commit/54c8d622437761d350db0f17e07f7517f1911211))
|
||||||
|
* 手动上传证书优化,增加到期前报错提醒 ([3d42bfd](https://github.com/certd/certd/commit/3d42bfd479eaacc4a49c401224815a6e2a0204b0))
|
||||||
|
* 验证码支持测试,登录验证码需要测试通过后才能开启 ([83e6476](https://github.com/certd/certd/commit/83e6476408090b741fabb1b542fb458d9a8b4134))
|
||||||
|
* 支持腾讯云验证码 ([03f317f](https://github.com/certd/certd/commit/03f317ffdb6595ce70e8a2302b05f390c52110c8))
|
||||||
|
|
||||||
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
2
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
01:50
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
5
|
|
||||||
@@ -11,6 +11,7 @@ services:
|
|||||||
# ↓↓↓↓↓ -------------------------------------------------------- 数据库以及证书存储路径,默认存在宿主机的/data/certd/目录下,【您需要定时备份此目录,以保障数据容灾】
|
# ↓↓↓↓↓ -------------------------------------------------------- 数据库以及证书存储路径,默认存在宿主机的/data/certd/目录下,【您需要定时备份此目录,以保障数据容灾】
|
||||||
# 只要修改冒号前面的,冒号后面的/app/data不要动
|
# 只要修改冒号前面的,冒号后面的/app/data不要动
|
||||||
- /data/certd:/app/data
|
- /data/certd:/app/data
|
||||||
|
#- /volume1/docker/certd:/app/data:delegated #群晖使用这个配置
|
||||||
# ↓↓↓↓↓ -------------------------------------------------------- 如果走时不准,考虑挂载localtime文件
|
# ↓↓↓↓↓ -------------------------------------------------------- 如果走时不准,考虑挂载localtime文件
|
||||||
#- /etc/localtime:/etc/localtime
|
#- /etc/localtime:/etc/localtime
|
||||||
#- /etc/timezone:/etc/timezone
|
#- /etc/timezone:/etc/timezone
|
||||||
@@ -47,6 +48,8 @@ services:
|
|||||||
# 配置规则: certd_ + 配置项, 点号用_代替
|
# 配置规则: certd_ + 配置项, 点号用_代替
|
||||||
# #↓↓↓↓ ----------------------------- 如果忘记管理员密码,可以设置为true,docker compose up -d 重建容器之后,管理员密码将改成123456,然后请及时修改回false
|
# #↓↓↓↓ ----------------------------- 如果忘记管理员密码,可以设置为true,docker compose up -d 重建容器之后,管理员密码将改成123456,然后请及时修改回false
|
||||||
- certd_system_resetAdminPasswd=false
|
- certd_system_resetAdminPasswd=false
|
||||||
|
# ↓↓↓ 要使用ipv6,将此配置修改为::
|
||||||
|
- certd_koa_hostname=0.0.0.0
|
||||||
|
|
||||||
# 默认使用sqlite文件数据库,如果需要使用其他数据库,请设置以下环境变量
|
# 默认使用sqlite文件数据库,如果需要使用其他数据库,请设置以下环境变量
|
||||||
# 注意: 选定使用一种数据库之后,不支持更换数据库。
|
# 注意: 选定使用一种数据库之后,不支持更换数据库。
|
||||||
|
|||||||
@@ -95,10 +95,10 @@ export default defineConfig({
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: "插件列表", items: [
|
text: "插件列表", items: [
|
||||||
{text: "授权提供商", link: "/guide/plugins/access.md"},
|
|
||||||
{text: "DNS提供商", link: "/guide/plugins/dns-provider.md"},
|
{text: "DNS提供商", link: "/guide/plugins/dns-provider.md"},
|
||||||
{text: "任务插件", link: "/guide/plugins/deploy.md"},
|
{text: "任务插件", link: "/guide/plugins/deploy.md"},
|
||||||
{text: "通知插件", link: "/guide/plugins/notification.md"},
|
{text: "通知插件", link: "/guide/plugins/notification.md"},
|
||||||
|
{text: "授权提供商", link: "/guide/plugins/access.md"},
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -3,6 +3,104 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复站点证书监控复制按钮无效的bug ([efa26a0](https://github.com/certd/certd/commit/efa26a067f06402f30befc016d9934cadcd5a563))
|
||||||
|
* 修复lego模式下 私钥加密类型错误的bug ([f7cf7c1](https://github.com/certd/certd/commit/f7cf7c198d7f77b222099770f81accc637bc6619))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化数据备份效率,流式写入文件 ([c38dbbb](https://github.com/certd/certd/commit/c38dbbb1d72bd00a92fe275b76aea82a791e7199))
|
||||||
|
|
||||||
|
## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复并发情况下证书申请日志混乱的bug ([bb2714f](https://github.com/certd/certd/commit/bb2714ff241f9db4a71d805b23a1b0f9f2f6413a))
|
||||||
|
* 修复网络测试,telnet的bug ([c03a70f](https://github.com/certd/certd/commit/c03a70fde23c8e840bd0fdb4fcbca8990f6c65eb))
|
||||||
|
* 修复站点证书监控,证书已经更新到最新日期了,仍然发出警告通知的bug ([1f42f93](https://github.com/certd/certd/commit/1f42f933f07860b27aa3d016e40916ff2b063eac))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 注册页面增加手机注册tab页签 ([6b2f1fc](https://github.com/certd/certd/commit/6b2f1fcd3e058061b814c3331cda8ce1b2d80d73))
|
||||||
|
* 流水线创建时支持添加到证书监控 ([59ba408](https://github.com/certd/certd/commit/59ba4080706548828ef1c0a9cd893c1c9a7d591f))
|
||||||
|
* 流水线支持有效期设置 ([911e69e](https://github.com/certd/certd/commit/911e69e3bc0cdd48b62953b5d0981d640fc1f8ac))
|
||||||
|
* 群辉增加请求超时时长设置 ([b381492](https://github.com/certd/certd/commit/b3814920bdcabc911f860a8e19b5b9b3a04709ac))
|
||||||
|
* 通知支持meow ([c77645e](https://github.com/certd/certd/commit/c77645e1733670214aaca5544cf8759d7e4adda4))
|
||||||
|
* 站点证书监控增加导出和分组功能 ([2ed12c4](https://github.com/certd/certd/commit/2ed12c429eb58274a4f9dd0ed3b66e160d283ded))
|
||||||
|
* 证书监控增加批量删除 ([e578c52](https://github.com/certd/certd/commit/e578c52fdf2f838038062aa4209b655fbae461fb))
|
||||||
|
* esa 自动删除过期证书提示 ([8bf1f82](https://github.com/certd/certd/commit/8bf1f828b9eaa9208f32e8ee7460b86420fed0c7))
|
||||||
|
* ssh 增加禁止-i参数提示 ([3a8931f](https://github.com/certd/certd/commit/3a8931feeffd7157163ff7d46b693e5e1a434b9c))
|
||||||
|
|
||||||
|
## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复飞牛证书部署后无法生效的bug ([bf156a1](https://github.com/certd/certd/commit/bf156a13bd443cdadb73c9dff79bbef7231b4401))
|
||||||
|
* aliyunoss 选择证书接入点选择新加坡无法上传的bug ([e00733a](https://github.com/certd/certd/commit/e00733a34644c23ffe926486b15dc96bf2fa4b57))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化start.sh脚本,去掉删除非ui目录的操作及提示 ([7993a7c](https://github.com/certd/certd/commit/7993a7cdb01885535950c63187e3f67d67ba2f75))
|
||||||
|
* 增加飞牛证书id选择的提示 ([5a4d812](https://github.com/certd/certd/commit/5a4d8121462b1afe921d028465687be8c9679814))
|
||||||
|
* 证书监控支持设置证书即将过期天数 ([cd35568](https://github.com/certd/certd/commit/cd35568e042e6ab928685efad51cdbed823d2d4f))
|
||||||
|
* 支持网络测试 ([2bef608](https://github.com/certd/certd/commit/2bef608e07ceb56d52007f290667e0afef401b22))
|
||||||
|
* 支持新网代理方式 ([f612509](https://github.com/certd/certd/commit/f612509cac87b859e81a7a52fe94b2eaccad22f9))
|
||||||
|
* dns支持新网互联 ([f415190](https://github.com/certd/certd/commit/f41519048326d971acd9e0a30462231f77a299a6))
|
||||||
|
* start.sh脚本支持根据当前系统判断是否使用sudo ([567cb7d](https://github.com/certd/certd/commit/567cb7d737023e26ec58403c6f28f109e212d379))
|
||||||
|
|
||||||
|
## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复版本比较bug ([109696e](https://github.com/certd/certd/commit/109696e965d68c50c8627ffd40203edd1d2daea5))
|
||||||
|
* 修复某些情况下cname申请证书报错主域名不一致的bug ([2671781](https://github.com/certd/certd/commit/2671781e1bb0838981728d85eacf0e1a25a0fa48))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* cname主域名校验提示优化,显示不一致的两方便于排查问题 ([6ebb365](https://github.com/certd/certd/commit/6ebb3659f42155e4e8da600c493fb5227cd08137))
|
||||||
|
* dns解析支持阿里esa ([9291fa6](https://github.com/certd/certd/commit/9291fa68aa7a88a05c2f888bf3048df36a8fbde3))
|
||||||
|
|
||||||
|
# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* @certd/ui-server module import报错的问题 ([0c61d4c](https://github.com/certd/certd/commit/0c61d4c9788677c83c567db5381b9e257ec90bba))
|
||||||
|
* dist打包前检查 ([8f6e5bd](https://github.com/certd/certd/commit/8f6e5bd24b3b65fbfcba36c08f532a3abad2d606))
|
||||||
|
|
||||||
|
## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 固定midwayjs版本,修复ui-server import 错误的bug ([eb4d125](https://github.com/certd/certd/commit/eb4d125eaf4a41e88c752d0c68993829589f8f27))
|
||||||
|
|
||||||
|
## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复 ui-server 加载失败问题 ([c2ccdbe](https://github.com/certd/certd/commit/c2ccdbec9dd08bca4688eeb2f34d0105eec43ba1))
|
||||||
|
* 修复 ui-server 加载失败问题 ([063f5c3](https://github.com/certd/certd/commit/063f5c3b55e47df22543a64f02e039e84f92cd14))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 重置管理员密码同时会关闭验证码,防止验证码失效之后无法登录 ([03899d4](https://github.com/certd/certd/commit/03899d4d9c76fc2077dacc53ab88e2c9ca41af7c))
|
||||||
|
|
||||||
|
## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 授权页面,id列位置不在第一列的bug ([3f1722d](https://github.com/certd/certd/commit/3f1722d54debcb4849dc14521a2da0d9b304b69f))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 动态加载验证码script ([dcc396a](https://github.com/certd/certd/commit/dcc396afb7a23aeb8af57c01014b09af5f033e61))
|
||||||
|
* 开启子域名托管之后cname记录支持重置 ([54c8d62](https://github.com/certd/certd/commit/54c8d622437761d350db0f17e07f7517f1911211))
|
||||||
|
* 手动上传证书优化,增加到期前报错提醒 ([3d42bfd](https://github.com/certd/certd/commit/3d42bfd479eaacc4a49c401224815a6e2a0204b0))
|
||||||
|
* 验证码支持测试,登录验证码需要测试通过后才能开启 ([83e6476](https://github.com/certd/certd/commit/83e6476408090b741fabb1b542fb458d9a8b4134))
|
||||||
|
* 支持腾讯云验证码 ([03f317f](https://github.com/certd/certd/commit/03f317ffdb6595ce70e8a2302b05f390c52110c8))
|
||||||
|
|
||||||
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB |
+4
-1
@@ -5,6 +5,9 @@ Certd 是一款开源、免费、全自动申请和部署更新SSL证书的工
|
|||||||
|
|
||||||
关键字:证书自动申请、证书自动更新、证书自动续期、证书自动续签、证书管理工具
|
关键字:证书自动申请、证书自动更新、证书自动续期、证书自动续签、证书管理工具
|
||||||
|
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
## 1、关于证书续期
|
## 1、关于证书续期
|
||||||
>* 实际上没有办法不改变证书文件本身情况下直接续期或者续签。
|
>* 实际上没有办法不改变证书文件本身情况下直接续期或者续签。
|
||||||
>* 我们所说的续期,其实就是按照全套流程重新申请一份新证书,然后重新部署上去。
|
>* 我们所说的续期,其实就是按照全套流程重新申请一份新证书,然后重新部署上去。
|
||||||
@@ -15,7 +18,7 @@ Certd 是一款开源、免费、全自动申请和部署更新SSL证书的工
|
|||||||
本项目不仅支持证书申请过程自动化,还可以自动化部署更新证书,让你的证书永不过期。
|
本项目不仅支持证书申请过程自动化,还可以自动化部署更新证书,让你的证书永不过期。
|
||||||
|
|
||||||
* 全自动申请证书(支持所有注册商注册的域名,支持DNS-01、HTTP-01、CNAME代理等多种域名验证方式)
|
* 全自动申请证书(支持所有注册商注册的域名,支持DNS-01、HTTP-01、CNAME代理等多种域名验证方式)
|
||||||
* 全自动部署更新证书(目前支持部署到主机、阿里云、腾讯云等70+部署插件)
|
* 全自动部署更新证书(目前支持部署到主机、阿里云、腾讯云等100+部署插件)
|
||||||
* 支持通配符域名/泛域名,支持多个域名打到一个证书上,支持pem、pfx、der、jks等多种证书格式
|
* 支持通配符域名/泛域名,支持多个域名打到一个证书上,支持pem、pfx、der、jks等多种证书格式
|
||||||
* 邮件通知、webhook通知、企微、钉钉、飞书、anpush等多种通知方式
|
* 邮件通知、webhook通知、企微、钉钉、飞书、anpush等多种通知方式
|
||||||
* 私有化部署,数据保存本地,安装升级非常简单快捷
|
* 私有化部署,数据保存本地,安装升级非常简单快捷
|
||||||
|
|||||||
@@ -11,9 +11,12 @@
|
|||||||
git clone https://github.com/certd/certd --depth=1
|
git clone https://github.com/certd/certd --depth=1
|
||||||
# git checkout v1.x.x # 当v2主干分支代码无法正常启动时,可以尝试此命令,1.x.x换成最新版本号
|
# git checkout v1.x.x # 当v2主干分支代码无法正常启动时,可以尝试此命令,1.x.x换成最新版本号
|
||||||
cd certd
|
cd certd
|
||||||
|
|
||||||
# 启动服务
|
# 启动服务
|
||||||
./start.sh
|
./start.sh
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
```
|
```
|
||||||
>如果是windows,请先安装`git for windows` ,然后右键,选择`open git bash here`打开终端,再执行`./start.sh`命令
|
>如果是windows,请先安装`git for windows` ,然后右键,选择`open git bash here`打开终端,再执行`./start.sh`命令
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
https://apifox.com/apidoc/shared-2e76f8c4-7c58-413b-a32d-a1316529af44/254949529e0
|
https://apifox.com/apidoc/shared-2e76f8c4-7c58-413b-a32d-a1316529af44/254949529e0
|
||||||
|
|
||||||
|
|
||||||
## Token生成方法
|
## Token生成方法
|
||||||
|
|
||||||
header中传入x-certd-token即可调用开放接口
|
header中传入x-certd-token即可调用开放接口
|
||||||
@@ -17,6 +18,12 @@ header中传入x-certd-token即可调用开放接口
|
|||||||
3、将content加上keySecret进行签名: sign = md5(content + keySecret)
|
3、将content加上keySecret进行签名: sign = md5(content + keySecret)
|
||||||
4、然后将content和sign分别base64后用.号连接: x-certd-token = base64(content) +"."+base64(sign)
|
4、然后将content和sign分别base64后用.号连接: x-certd-token = base64(content) +"."+base64(sign)
|
||||||
|
|
||||||
|
|
||||||
|
## 补充说明
|
||||||
|
1.证书申请接口支持证书id和域名两种方式获取证书。
|
||||||
|
2.autoApply=true将在没有证书时自动触发申请,申请过程中会提示`正在申请中`,可轮循获取状态,直到证书申请成功。
|
||||||
|
|
||||||
|
|
||||||
## SDK
|
## SDK
|
||||||
待开发
|
待开发
|
||||||
|
|
||||||
|
|||||||
@@ -2,50 +2,69 @@
|
|||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
|-----|-----|-----|
|
|-----|-----|-----|
|
||||||
| 1.| **阿里云授权** | |
|
| 1.| **主机登录授权** | |
|
||||||
| 2.| **EAB授权** | ZeroSSL证书申请需要EAB授权 |
|
| 2.| **阿里云授权** | |
|
||||||
| 3.| **google cloud** | 谷歌云授权 |
|
| 3.| **阿里云ESA授权** | |
|
||||||
| 4.| **主机登录授权** | |
|
| 4.| **腾讯云** | |
|
||||||
| 5.| **SFTP授权** | |
|
| 5.| **华为云授权** | |
|
||||||
| 6.| **阿里云OSS授权** | 包含地域和Bucket |
|
| 6.| **火山引擎** | |
|
||||||
| 7.| **FTP授权** | |
|
| 7.| **京东云** | |
|
||||||
| 8.| **腾讯云** | |
|
| 8.| **七牛云授权** | |
|
||||||
| 9.| **腾讯云COS授权** | 腾讯云对象存储授权,包含地域和存储桶 |
|
| 9.| **天翼云授权** | |
|
||||||
| 10.| **七牛云授权** | |
|
| 10.| **baota授权** | |
|
||||||
| 11.| **七牛OSS授权** | |
|
| 11.| **百度云授权** | |
|
||||||
| 12.| **天翼云授权** | |
|
| 12.| **EAB授权** | ZeroSSL证书申请需要EAB授权 |
|
||||||
| 13.| **s3/minio授权** | S3/minio oss授权 |
|
| 13.| **google cloud** | 谷歌云授权 |
|
||||||
| 14.| **baota授权** | |
|
| 14.| **SFTP授权** | |
|
||||||
| 15.| **易盾DCDN授权** | https://user.yiduncdn.com |
|
| 15.| **阿里云OSS授权** | 包含地域和Bucket |
|
||||||
| 16.| **易盾rcdn授权** | 易盾CDN,每月免费30G,[注册即领](https://rhcdn.yiduncdn.com/register?code=8mn536rrzfbf8) |
|
| 16.| **FTP授权** | |
|
||||||
| 17.| **易发云短信** | sms.yfyidc.cn/ |
|
| 17.| **腾讯云COS授权** | 腾讯云对象存储授权,包含地域和存储桶 |
|
||||||
| 18.| **cdnfly授权** | |
|
| 18.| **七牛OSS授权** | |
|
||||||
| 19.| **群晖登录授权** | |
|
| 19.| **s3/minio授权** | S3/minio oss授权 |
|
||||||
| 20.| **k8s授权** | |
|
| 20.| **宝塔云WAF授权** | 用于连接和管理宝塔云WAF服务的授权配置 |
|
||||||
| 21.| **1panel授权** | 账号和密码 |
|
| 21.| **易盾DCDN授权** | https://user.yiduncdn.com |
|
||||||
| 22.| **百度云授权** | |
|
| 22.| **易盾rcdn授权** | 易盾CDN,每月免费30G,[注册即领](https://rhcdn.yiduncdn.com/register?code=8mn536rrzfbf8) |
|
||||||
| 23.| **LeCDN授权** | |
|
| 23.| **易发云短信** | sms.yfyidc.cn/ |
|
||||||
| 24.| **白山云授权** | |
|
| 24.| **cdnfly授权** | |
|
||||||
| 25.| **plesk授权** | |
|
| 25.| **群晖登录授权** | |
|
||||||
| 26.| **易支付** | |
|
| 26.| **k8s授权** | |
|
||||||
| 27.| **支付宝** | |
|
| 27.| **1panel授权** | 账号和密码 |
|
||||||
| 28.| **微信支付** | |
|
| 28.| **LeCDN授权** | |
|
||||||
| 29.| **长亭雷池授权** | |
|
| 29.| **白山云授权** | |
|
||||||
| 30.| **lucky** | |
|
| 30.| **plesk授权** | |
|
||||||
| 31.| **括彩云cdn授权** | 括彩云CDN,每月免费30G,[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) |
|
| 31.| **易支付** | |
|
||||||
| 32.| **uniCloud** | unicloud授权 |
|
| 32.| **支付宝** | |
|
||||||
| 33.| **华为云授权** | |
|
| 33.| **微信支付** | |
|
||||||
| 34.| **西部数码授权** | |
|
| 34.| **长亭雷池授权** | |
|
||||||
| 35.| **多吉云** | |
|
| 35.| **lucky** | |
|
||||||
| 36.| **我爱云授权** | 我爱云CDN |
|
| 36.| **括彩云cdn授权** | 括彩云CDN,每月免费30G,[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) |
|
||||||
| 37.| **CacheFly** | CacheFly |
|
| 37.| **uniCloud** | unicloud授权 |
|
||||||
| 38.| **Gcore** | Gcore |
|
| 38.| **猫云授权** | |
|
||||||
| 39.| **亚马逊云aws授权** | |
|
| 39.| **西部数码授权** | |
|
||||||
| 40.| **dns.la授权** | |
|
| 40.| **多吉云** | |
|
||||||
| 41.| **又拍云** | |
|
| 41.| **我爱云授权** | 我爱云CDN |
|
||||||
| 42.| **火山引擎** | |
|
| 42.| **CacheFly** | CacheFly |
|
||||||
| 43.| **京东云** | |
|
| 43.| **Gcore** | Gcore |
|
||||||
| 44.| **51dns授权** | |
|
| 44.| **亚马逊云aws授权** | |
|
||||||
|
| 45.| **亚马逊云科技(国区)授权** | |
|
||||||
|
| 46.| **dns.la授权** | |
|
||||||
|
| 47.| **又拍云** | |
|
||||||
|
| 48.| **51dns授权** | |
|
||||||
|
| 49.| **FlexCDN授权** | |
|
||||||
|
| 50.| **farcdn授权** | |
|
||||||
|
| 51.| **cloudflare授权** | |
|
||||||
|
| 52.| **Github授权** | |
|
||||||
|
| 53.| **namesilo授权** | |
|
||||||
|
| 54.| **proxmox** | |
|
||||||
|
| 55.| **网宿授权** | |
|
||||||
|
| 56.| **金山云授权** | |
|
||||||
|
| 57.| **APISIX授权** | |
|
||||||
|
| 58.| **Dokploy授权** | |
|
||||||
|
| 59.| **godaddy授权** | |
|
||||||
|
| 60.| **新网授权** | |
|
||||||
|
| 61.| **新网授权(代理方式)** | |
|
||||||
|
| 62.| **新网互联授权** | 仅支持代理账号,ip需要加入白名单 |
|
||||||
|
| 63.| **雨云授权** | https://app.rainyun.com/ |
|
||||||
|
|
||||||
<style module>
|
<style module>
|
||||||
table th:first-of-type {
|
table th:first-of-type {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# 任务插件
|
# 任务插件
|
||||||
共 `70` 款任务插件
|
共 `102` 款任务插件
|
||||||
## 1. 证书申请
|
## 1. 证书申请
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
@@ -15,6 +15,8 @@
|
|||||||
| 2.| **IIS-部署到IIS站点** | |
|
| 2.| **IIS-部署到IIS站点** | |
|
||||||
| 3.| **主机-执行远程主机脚本命令** | 可以执行重启nginx等操作让证书生效 |
|
| 3.| **主机-执行远程主机脚本命令** | 可以执行重启nginx等操作让证书生效 |
|
||||||
| 4.| **主机-部署证书到SSH主机** | SFTP上传证书到主机,然后SSH执行部署脚本命令 |
|
| 4.| **主机-部署证书到SSH主机** | SFTP上传证书到主机,然后SSH执行部署脚本命令 |
|
||||||
|
| 5.| **主机-复制到本机** | 【仅管理员使用】实际上是复制证书到docker容器内的某个路径,需要做目录映射到宿主机 |
|
||||||
|
| 6.| **上传证书到对象存储OSS** | 支持阿里云OSS、腾讯云COS、七牛云KODO、S3、MinIO、FTP、SFTP |
|
||||||
## 3. CDN
|
## 3. CDN
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
@@ -22,33 +24,44 @@
|
|||||||
| 1.| **易盾-部署到易盾DCDN** | 主要是防御,http://user.yiduncdn.com/ |
|
| 1.| **易盾-部署到易盾DCDN** | 主要是防御,http://user.yiduncdn.com/ |
|
||||||
| 2.| **易盾-部署到易盾RCDN** | 易盾CDN,每月免费30G,[注册即领](https://rhcdn.yiduncdn.com/register?code=8mn536rrzfbf8) |
|
| 2.| **易盾-部署到易盾RCDN** | 易盾CDN,每月免费30G,[注册即领](https://rhcdn.yiduncdn.com/register?code=8mn536rrzfbf8) |
|
||||||
| 3.| **cdnfly-部署证书到cdnfly** | cdnfly |
|
| 3.| **cdnfly-部署证书到cdnfly** | cdnfly |
|
||||||
| 4.| **百度云-部署证书到CDN** | 部署到百度云CDN |
|
| 4.| **LeCDN-更新证书** | |
|
||||||
| 5.| **LeCDN-更新证书** | |
|
| 5.| **LeCDN-更新证书V2** | 支持新版本LeCDN |
|
||||||
| 6.| **LeCDN-更新证书V2** | 支持新版本LeCDN |
|
| 6.| **白山云-更新证书** | |
|
||||||
| 7.| **白山云-更新证书** | |
|
| 7.| **天翼云-部署证书到CDN** | 部署证书到天翼云CDN和全站加速 |
|
||||||
| 8.| **天翼云-部署证书到CDN** | 部署证书到天翼云CDN和全站加速 |
|
| 8.| **括彩云-部署到括彩云CDN** | 括彩云CDN,每月免费30G,[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) |
|
||||||
| 9.| **括彩云-部署到括彩云CDN** | 括彩云CDN,每月免费30G,[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) |
|
| 9.| **多吉云-部署到多吉云CDN** | |
|
||||||
| 10.| **多吉云-部署到多吉云CDN** | |
|
| 10.| **我爱云-部署证书到我爱云CDN** | 部署证书到我爱云CDN |
|
||||||
| 11.| **我爱云-部署证书到我爱云CDN** | 部署证书到我爱云CDN |
|
| 11.| **CacheFly-部署证书到CacheFly** | 部署证书到 CacheFly |
|
||||||
| 12.| **CacheFly-部署证书到CacheFly** | 部署证书到 CacheFly |
|
| 12.| **Gcore-部署证书到Gcore** | 仅上传 并不会部署到cdn |
|
||||||
| 13.| **Gcore-部署证书到Gcore** | 仅上传 并不会部署到cdn |
|
| 13.| **Gcore-刷新Gcore证书** | 刷新现有的证书 |
|
||||||
| 14.| **Gcore-刷新Gcore证书** | 刷新现有的证书 |
|
| 14.| **又拍云-部署证书到CDN/USS** | 支持又拍云CDN,又拍云云存储USS |
|
||||||
| 15.| **又拍云-部署证书到CDN/USS** | 支持又拍云CDN,又拍云云存储USS |
|
| 15.| **FlexCDN-更新证书** | |
|
||||||
|
| 16.| **farcdn-更新证书** | www.farcdn.net |
|
||||||
|
| 17.| **雨云-更新证书** | app.rainyun.com |
|
||||||
|
| 18.| **网宿-更新证书** | 网宿证书自动更新 |
|
||||||
|
| 19.| **金山云-更新CDN证书** | 金山云自动更新CDN证书 |
|
||||||
|
| 20.| **APISIX-更新证书** | 自动更新APISIX证书 |
|
||||||
## 4. 面板
|
## 4. 面板
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
|-----|-----|-----|
|
|-----|-----|-----|
|
||||||
| 1.| **宝塔-面板证书部署** | 部署宝塔面板本身的ssl证书 |
|
| 1.| **宝塔-面板证书部署** | 部署宝塔面板本身的ssl证书 |
|
||||||
| 2.| **宝塔-网站证书部署** | 部署宝塔管理的站点的ssl证书,目前支持网站站点、docker站点等 |
|
| 2.| **宝塔-网站证书部署** | 部署宝塔管理的站点的ssl证书,目前支持宝塔网站站点、docker站点等。本插件也支持aaPanel。 |
|
||||||
| 3.| **群晖-部署证书到群晖面板** | Synology,支持6.x以上版本 |
|
| 3.| **宝塔-WAF证书部署** | 部署宝塔云WAF/aaWAF |
|
||||||
| 4.| **K8S-部署证书到Secret** | 部署证书到k8s的secret |
|
| 4.| **宝塔win-网站证书部署** | 部署到Windows版宝塔管理的站点的ssl证书 |
|
||||||
| 5.| **K8S-Ingress 证书部署** | 部署证书到k8s的Ingress |
|
| 5.| **宝塔-删除过期证书** | 删除证书夹中过期证书 |
|
||||||
| 6.| **1Panel-部署证书到1Panel** | 更新1Panel的证书 |
|
| 6.| **群晖-部署证书到群晖面板** | Synology,支持6.x以上版本 |
|
||||||
| 7.| **Plesk-部署Plesk网站证书** | |
|
| 7.| **K8S-部署证书到Secret** | 部署证书到k8s的secret |
|
||||||
| 8.| **雷池-更新证书** | 更新长亭雷池WAF的证书 |
|
| 8.| **K8S-Ingress 证书部署** | 部署证书到k8s的Ingress |
|
||||||
| 9.| **lucky-更新Lucky证书** | |
|
| 9.| **1Panel-部署证书到1Panel** | 更新1Panel的证书 |
|
||||||
| 10.| **uniCloud-部署到服务空间** | 部署到服务空间 |
|
| 10.| **Plesk-部署Plesk网站证书** | |
|
||||||
| 11.| **威联通-部署证书到威联通** | 部署证书到qnap |
|
| 11.| **雷池-更新证书** | 更新长亭雷池WAF的证书 |
|
||||||
|
| 12.| **lucky-更新Lucky证书** | |
|
||||||
|
| 13.| **uniCloud-部署到服务空间** | 部署到服务空间 |
|
||||||
|
| 14.| **威联通-部署证书到威联通** | 部署证书到qnap |
|
||||||
|
| 15.| **飞牛NAS-部署证书** | |
|
||||||
|
| 16.| **Proxmox-上传证书到Proxmox** | |
|
||||||
|
| 17.| **Dokploy-更新证书** | 自动更新Dokploy证书 |
|
||||||
## 5. 阿里云
|
## 5. 阿里云
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
@@ -57,18 +70,24 @@
|
|||||||
| 2.| **阿里云-部署至任意云资源** | 【不建议使用】需要消耗阿里云自动部署次数,支持SLB、LIVE、webHosting、VOD、CR、DCDN、DDoS、CDN、ALB、APIGateway、FC、GA、MSE、NLB、OSS、SAE、WAF等云产品 |
|
| 2.| **阿里云-部署至任意云资源** | 【不建议使用】需要消耗阿里云自动部署次数,支持SLB、LIVE、webHosting、VOD、CR、DCDN、DDoS、CDN、ALB、APIGateway、FC、GA、MSE、NLB、OSS、SAE、WAF等云产品 |
|
||||||
| 3.| **阿里云-部署证书至CDN** | 自动部署域名证书至阿里云CDN |
|
| 3.| **阿里云-部署证书至CDN** | 自动部署域名证书至阿里云CDN |
|
||||||
| 4.| **阿里云-部署证书至DCDN** | 依赖证书申请前置任务,自动部署域名证书至阿里云DCDN |
|
| 4.| **阿里云-部署证书至DCDN** | 依赖证书申请前置任务,自动部署域名证书至阿里云DCDN |
|
||||||
| 5.| **阿里云-部署证书至OSS** | 自动部署域名证书至阿里云OSS |
|
| 5.| **阿里云-部署证书至OSS** | 部署域名证书至阿里云OSS自定义域名,不是上传到阿里云oss |
|
||||||
| 6.| **阿里云-上传证书到阿里云** | 如果不想在阿里云上同一份证书上传多次,可以把此任务作为前置任务,其他阿里云任务证书那一项选择此任务的输出 |
|
| 6.| **阿里云-上传证书到阿里云CAS** | 上传证书到阿里云数字证书管理服务(CAS),注意:不会部署到任何应用上;如果不想在阿里云上同一份证书上传多次,可以把此任务作为前置任务,其他阿里云任务证书那一项选择此任务的输出 |
|
||||||
| 7.| **阿里云-部署至阿里云WAF** | 部署证书到阿里云WAF |
|
| 7.| **阿里云-部署至阿里云WAF** | 部署证书到阿里云WAF |
|
||||||
| 8.| **阿里云-部署至ALB(应用负载均衡)** | ALB,更新监听器的默认证书 |
|
| 8.| **阿里云-部署至ALB(应用负载均衡)** | ALB,更新监听器的默认证书 |
|
||||||
| 9.| **阿里云-部署至NLB(网络负载均衡)** | NLB,网络负载均衡,更新监听器的默认证书 |
|
| 9.| **阿里云-部署至NLB(网络负载均衡)** | NLB,网络负载均衡,更新监听器的默认证书 |
|
||||||
| 10.| **阿里云-部署至SLB(传统负载均衡)** | 部署证书到阿里云SLB(传统负载均衡) |
|
| 10.| **阿里云-部署至CLB(传统负载均衡)** | 部署证书到阿里云CLB(传统负载均衡) |
|
||||||
| 11.| **阿里云-部署至阿里云FC(3.0)** | 部署证书到阿里云函数计算(FC3.0),【注意】证书的加密算法必须选择【pkcs1旧版】 |
|
| 11.| **阿里云-部署至阿里云FC(3.0)** | 部署证书到阿里云函数计算(FC3.0) |
|
||||||
|
| 12.| **阿里云-部署至ESA** | 部署证书到阿里云ESA(边缘安全加速),自动删除过期证书 |
|
||||||
|
| 13.| **阿里云-部署至VOD** | 部署证书到阿里云视频点播(vod) |
|
||||||
|
| 14.| **阿里云-部署证书至API网关** | 自动部署域名证书至阿里云API网关(APIGateway) |
|
||||||
|
| 15.| **阿里云-部署至云原生API网关/AI网关** | 自动部署域名证书至云原生API网关、AI网关 |
|
||||||
## 6. 华为云
|
## 6. 华为云
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
|-----|-----|-----|
|
|-----|-----|-----|
|
||||||
| 1.| **华为云-部署证书至CDN** | |
|
| 1.| **华为云-部署证书至CDN** | |
|
||||||
|
| 2.| **华为云-上传证书至CCM** | 上传证书到华为云云证书管理(CCM) |
|
||||||
|
| 3.| **华为云-部署证书至OBS** | |
|
||||||
## 7. 腾讯云
|
## 7. 腾讯云
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
@@ -79,9 +98,15 @@
|
|||||||
| 4.| **腾讯云-部署到CDN-v2** | 推荐使用 |
|
| 4.| **腾讯云-部署到CDN-v2** | 推荐使用 |
|
||||||
| 5.| **腾讯云-上传证书到腾讯云** | 上传成功后输出:tencentCertId |
|
| 5.| **腾讯云-上传证书到腾讯云** | 上传成功后输出:tencentCertId |
|
||||||
| 6.| **腾讯云-部署证书到COS** | 部署到腾讯云COS源站域名证书【注意:很不稳定,需要重试很多次偶尔才能成功一次】 |
|
| 6.| **腾讯云-部署证书到COS** | 部署到腾讯云COS源站域名证书【注意:很不稳定,需要重试很多次偶尔才能成功一次】 |
|
||||||
| 7.| **腾讯云-部署到腾讯云EO** | 腾讯云边缘安全加速平台EO,必须配置上传证书到腾讯云任务 |
|
| 7.| **腾讯云-部署到腾讯云EO** | 腾讯云边缘安全加速平台EdgeOne(EO),必须配置上传证书到腾讯云任务 |
|
||||||
| 8.| **腾讯云-删除即将过期证书** | 仅删除未使用的证书 |
|
| 8.| **腾讯云-删除即将过期证书** | 仅删除未使用的证书 |
|
||||||
| 9.| **腾讯云-部署到TKE-ingress** | serverless集群请使用K8S部署插件;Qcloud类型需要【上传到腾讯云】作为前置任务;ApiServer未开启外网访问则需要做域名的内网IP映射 |
|
| 9.| **腾讯云-部署到TKE** | 修改TKE集群密钥配置,支持Opaque和TLS证书类型。注意:
|
||||||
|
1. serverless集群请使用K8S部署插件;
|
||||||
|
2. Opaque类型需要【上传到腾讯云】作为前置任务;
|
||||||
|
3. ApiServer需要开通公网访问(或者certd可访问),实际上底层仍然是通过KubeClient进行部署 |
|
||||||
|
| 10.| **腾讯云-部署到腾讯云直播** | https://console.cloud.tencent.com/live/ |
|
||||||
|
| 11.| **腾讯云-实例开关机** | 腾讯云实例开关机 |
|
||||||
|
| 12.| **腾讯云-更新证书(Id不变)** | 根据证书id一键更新腾讯云证书并自动部署(Id不变),注意该接口为腾讯云白名单功能,非白名单用户无法使用该功能 |
|
||||||
## 8. 火山引擎
|
## 8. 火山引擎
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
@@ -91,6 +116,8 @@
|
|||||||
| 3.| **火山引擎-上传证书至证书中心** | 上传证书至火山引擎证书中心 |
|
| 3.| **火山引擎-上传证书至证书中心** | 上传证书至火山引擎证书中心 |
|
||||||
| 4.| **火山引擎-部署证书至ALB** | 部署至火山引擎应用负载均衡 |
|
| 4.| **火山引擎-部署证书至ALB** | 部署至火山引擎应用负载均衡 |
|
||||||
| 5.| **火山引擎-部署证书至Live** | 部署至火山引擎视频直播 |
|
| 5.| **火山引擎-部署证书至Live** | 部署至火山引擎视频直播 |
|
||||||
|
| 6.| **火山引擎-部署证书至DCDN** | 部署至火山引擎全站加速 |
|
||||||
|
| 7.| **火山引擎-部署证书至VOD** | 部署至火山引擎视频点播(暂不可用) |
|
||||||
## 9. 京东云
|
## 9. 京东云
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
@@ -98,26 +125,43 @@
|
|||||||
| 1.| **京东云-部署证书至CDN** | 京东云内容分发网络 |
|
| 1.| **京东云-部署证书至CDN** | 京东云内容分发网络 |
|
||||||
| 2.| **京东云-更新已有证书** | 更新SSL数字证书中的证书 |
|
| 2.| **京东云-更新已有证书** | 更新SSL数字证书中的证书 |
|
||||||
| 3.| **京东云-上传新证书** | 上传证书到SSL数字证书中心 |
|
| 3.| **京东云-上传新证书** | 上传证书到SSL数字证书中心 |
|
||||||
## 10. 七牛云
|
## 10. 百度云
|
||||||
|
|
||||||
|
| 序号 | 名称 | 说明 |
|
||||||
|
|-----|-----|-----|
|
||||||
|
| 1.| **百度云-部署证书到CDN** | 部署到百度云CDN |
|
||||||
|
| 2.| **百度云-部署证书到负载均衡** | 部署到百度云负载均衡,包括BLB、APPBLB |
|
||||||
|
| 3.| **百度云-上传到证书托管** | 上传证书到百度云证书托管中心 |
|
||||||
|
## 11. 七牛云
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
|-----|-----|-----|
|
|-----|-----|-----|
|
||||||
| 1.| **七牛云-部署证书至OSS** | 自动部署域名证书至七牛云KODO,注意是自定义源站域名,不是CDN域名 |
|
| 1.| **七牛云-部署证书至OSS** | 自动部署域名证书至七牛云KODO,注意是自定义源站域名,不是CDN域名 |
|
||||||
| 2.| **七牛云-部署证书至CDN** | 自动部署域名证书至七牛云CDN |
|
| 2.| **七牛云-部署证书至CDN/DCDN** | 自动部署域名证书至七牛云CDN、DCDN |
|
||||||
## 11. 亚马逊云
|
| 3.| **七牛云-上传证书到七牛云** | 上传到七牛云 |
|
||||||
|
## 12. 亚马逊云
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
|-----|-----|-----|
|
|-----|-----|-----|
|
||||||
| 1.| **AWS-部署证书到CloudFront** | 部署证书到 AWS CloudFront |
|
| 1.| **AWS-部署证书到CloudFront** | 部署证书到 AWS CloudFront |
|
||||||
## 12. 其他
|
| 2.| **AWS-上传证书到ACM** | 上传证书 AWS ACM |
|
||||||
|
| 3.| **AWS(国区)-部署证书到CloudFront** | 部署证书到 AWS CloudFront |
|
||||||
|
## 13. 其他
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
|-----|-----|-----|
|
|-----|-----|-----|
|
||||||
| 1.| **Demo-测试插件** | |
|
| 1.| **Demo-测试插件** | |
|
||||||
| 2.| **重启 Certd** | 【仅管理员可用】 重启 certd的https服务,用于更新 Certd 的 ssl 证书 |
|
| 2.| **等待** | 等待一段时间 |
|
||||||
| 3.| **自定义js脚本** | 【仅管理员】运行自定义js脚本执行 |
|
| 3.| **邮件发送证书** | 通过邮件发送证书 |
|
||||||
| 4.| **等待** | 等待一段时间 |
|
| 4.| **webhook方式部署证书** | 调用webhook部署证书 |
|
||||||
| 5.| **数据库备份** | 仅支持备份SQLite数据库 |
|
| 5.| **Github-检查Release版本** | 检查最新Release版本并推送消息 |
|
||||||
|
## 14. 管理
|
||||||
|
|
||||||
|
| 序号 | 名称 | 说明 |
|
||||||
|
|-----|-----|-----|
|
||||||
|
| 1.| **重启 Certd** | 【仅管理员可用】 重启 certd的https服务,用于更新 Certd 的 ssl 证书 |
|
||||||
|
| 2.| **自定义js脚本** | 【仅管理员】运行自定义js脚本执行 |
|
||||||
|
| 3.| **数据库备份** | 【仅管理员可用】仅支持备份SQLite数据库 |
|
||||||
|
|
||||||
<style module>
|
<style module>
|
||||||
table th:first-of-type {
|
table th:first-of-type {
|
||||||
|
|||||||
@@ -3,13 +3,21 @@
|
|||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
|-----|-----|-----|
|
|-----|-----|-----|
|
||||||
| 1.| **阿里云** | 阿里云DNS解析提供商 |
|
| 1.| **阿里云** | 阿里云DNS解析提供商 |
|
||||||
| 2.| **腾讯云** | 腾讯云域名DNS解析提供者 |
|
| 2.| **阿里ESA** | 阿里ESA DNS解析 |
|
||||||
| 3.| **华为云** | 华为云DNS解析提供商 |
|
| 3.| **火山引擎** | 火山引擎DNS解析提供商 |
|
||||||
| 4.| **西部数码** | west dns provider |
|
| 4.| **京东云** | 京东云DNS解析提供商 |
|
||||||
| 5.| **dns.la** | dns.la |
|
| 5.| **新网** | 新网域名解析 |
|
||||||
| 6.| **火山引擎** | 火山引擎DNS解析提供商 |
|
| 6.| **新网(代理方式)** | 新网域名解析(代理方式) |
|
||||||
| 7.| **京东云** | 京东云DNS解析提供商 |
|
| 7.| **腾讯云** | 腾讯云域名DNS解析提供者 |
|
||||||
| 8.| **51dns** | 51DNS |
|
| 8.| **华为云** | 华为云DNS解析提供商 |
|
||||||
|
| 9.| **西部数码** | west dns provider |
|
||||||
|
| 10.| **dns.la** | dns.la |
|
||||||
|
| 11.| **雨云** | 雨云DNS解析提供商 |
|
||||||
|
| 12.| **cloudflare** | cloudflare dns provider |
|
||||||
|
| 13.| **namesilo** | namesilo dns provider |
|
||||||
|
| 14.| **godaddy** | GoDaddy |
|
||||||
|
| 15.| **51dns** | 51DNS |
|
||||||
|
| 16.| **新网互联** | 新网互联 |
|
||||||
|
|
||||||
<style module>
|
<style module>
|
||||||
table th:first-of-type {
|
table th:first-of-type {
|
||||||
|
|||||||
@@ -2,10 +2,10 @@
|
|||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
|-----|-----|-----|
|
|-----|-----|-----|
|
||||||
| 1.| **企业微信通知** | 企业微信群聊机器人通知 |
|
| 1.| **电子邮件** | 电子邮件通知 |
|
||||||
| 2.| **电子邮件** | 电子邮件通知 |
|
| 2.| **自定义webhook** | 根据模版自定义http请求 |
|
||||||
| 3.| **爱语飞飞微信通知(iyuu)** | https://iyuu.cn/ |
|
| 3.| **企业微信通知** | 企业微信群聊机器人通知 |
|
||||||
| 4.| **自定义webhook** | 根据模版自定义http请求 |
|
| 4.| **爱语飞飞微信通知(iyuu)** | https://iyuu.cn/ |
|
||||||
| 5.| **Server酱ᵀ** | https://sct.ftqq.com/ |
|
| 5.| **Server酱ᵀ** | https://sct.ftqq.com/ |
|
||||||
| 6.| **Server酱³** | https://doc.sc3.ft07.com/serverchan3 |
|
| 6.| **Server酱³** | https://doc.sc3.ft07.com/serverchan3 |
|
||||||
| 7.| **AnPush** | https://anpush.com |
|
| 7.| **AnPush** | https://anpush.com |
|
||||||
@@ -14,6 +14,10 @@
|
|||||||
| 10.| **Slack通知** | Slack消息推送通知 |
|
| 10.| **Slack通知** | Slack消息推送通知 |
|
||||||
| 11.| **Bark 通知** | Bark 推送通知插件 |
|
| 11.| **Bark 通知** | Bark 推送通知插件 |
|
||||||
| 12.| **飞书通知** | 飞书群聊webhook通知 |
|
| 12.| **飞书通知** | 飞书群聊webhook通知 |
|
||||||
|
| 13.| **钉钉通知** | 钉钉群聊通知 |
|
||||||
|
| 14.| **VoceChat通知** | https://voce.chat |
|
||||||
|
| 15.| **OneBot V11 通知** | 通过动态拼接URL发送 OneBot V11 协议消息 |
|
||||||
|
| 16.| **MeoW通知** | https://api.chuckfang.com/ |
|
||||||
|
|
||||||
<style module>
|
<style module>
|
||||||
table th:first-of-type {
|
table th:first-of-type {
|
||||||
|
|||||||
+14
-1
@@ -19,7 +19,7 @@
|
|||||||
"detail": too many certificates (5) already issued for this exact set of idantifiers in the last 168hm0s
|
"detail": too many certificates (5) already issued for this exact set of idantifiers in the last 168hm0s
|
||||||
```
|
```
|
||||||
|
|
||||||
## ssl.com报错 CAA record does not include ssl.com which is required to issue the certificate
|
## 4. ssl.com报错 CAA record does not include ssl.com which is required to issue the certificate
|
||||||
ssl.com申请证书要求必须设置CAA记录,表示允许ssl.com为该域名颁发证书
|
ssl.com申请证书要求必须设置CAA记录,表示允许ssl.com为该域名颁发证书
|
||||||
请按如下格式添加CAA记录
|
请按如下格式添加CAA记录
|
||||||
|
|
||||||
@@ -29,5 +29,18 @@ ssl.com申请证书要求必须设置CAA记录,表示允许ssl.com为该域名
|
|||||||
| 一级泛域名 | CAA | * | 0 | issue/issuewild | "ssl.com" |
|
| 一级泛域名 | CAA | * | 0 | issue/issuewild | "ssl.com" |
|
||||||
| 固定子域名 | CAA | sub | 0 | issue |"ssl.com" |
|
| 固定子域名 | CAA | sub | 0 | issue |"ssl.com" |
|
||||||
|
|
||||||
|
## 5. address family not supported
|
||||||
|
启动时出现此错误,是由于您的服务器不支持绑定ipv6地址
|
||||||
|
|
||||||
|
请配置环境变量 certd_koa_hostname=0.0.0.0
|
||||||
|
|
||||||
|
在docker-compose.yml中添加如下配置
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
service:
|
||||||
|
certd:
|
||||||
|
environment:
|
||||||
|
certd_koa_hostname: 0.0.0.0
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+7
-1
@@ -7,10 +7,16 @@
|
|||||||
|
|
||||||
https://certd.handsfree.work/
|
https://certd.handsfree.work/
|
||||||
|
|
||||||
> 注意数据将不定期清理,不定期停止定时任务,生产使用请自行部署
|
注册 -> 创建证书流水线 -> 添加部署任务 -> 测试运行
|
||||||
|
|
||||||
|
> 注意demo的数据将不定期清理,生产使用请自行部署
|
||||||
> 包含敏感信息,务必自己本地部署进行生产使用
|
> 包含敏感信息,务必自己本地部署进行生产使用
|
||||||
|
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## 二、私有化部署
|
## 二、私有化部署
|
||||||
|
|
||||||
由于证书、授权信息等属于高度敏感数据,请务必私有化部署,保障数据安全
|
由于证书、授权信息等属于高度敏感数据,请务必私有化部署,保障数据安全
|
||||||
|
|||||||
@@ -18,6 +18,12 @@
|
|||||||
### 3. 配置Certd项目
|
### 3. 配置Certd项目
|
||||||
|
|
||||||

|

|
||||||
|
建议加上 `:delegated` 提升性能
|
||||||
|
```yaml
|
||||||
|
volumes:
|
||||||
|
↓↓↓↓------加上这个提升性能
|
||||||
|
- /volume1/docker/certd:/app/data:delegated
|
||||||
|
```
|
||||||
|
|
||||||
### 4. 外网访问设置
|
### 4. 外网访问设置
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 194 KiB |
+5
-5
@@ -24,13 +24,13 @@ features:
|
|||||||
- title: 全自动申请证书
|
- title: 全自动申请证书
|
||||||
details: 支持所有注册商注册的域名
|
details: 支持所有注册商注册的域名
|
||||||
- title: 全自动部署证书
|
- title: 全自动部署证书
|
||||||
details: 支持部署到主机、阿里云、腾讯云等,目前已支持60+部署插件
|
details: 支持部署到主机、阿里云、腾讯云等,目前已支持100+部署插件
|
||||||
- title: 多域名、泛域名打到一个证书上
|
- title: 多域名、泛域名打到一个证书上
|
||||||
details: 支持通配符域名/泛域名,支持多个域名打到一个证书上
|
details: 支持通配符域名/泛域名,支持多个域名打到一个证书上
|
||||||
- title: 多证书格式支持
|
- title: 多证书格式支持
|
||||||
details: 支持pem、pfx、der、jks等多种证书格式,支持Google、Letsencrypt、ZeroSSL证书颁发机构
|
details: 支持pem、pfx、der、jks等多种证书格式,支持Google、Letsencrypt、ZeroSSL证书颁发机构
|
||||||
- title: 支持私有化部署
|
- title: 私有化部署,数据安全
|
||||||
details: 授权数据加密存储,保障数据安全
|
details: 授权数据加密存储,保障数据安全,支持SQLite、Postgresql、MySQL多种数据库
|
||||||
- title: 多数据库支持
|
- title: 无痛升级
|
||||||
details: 支持SQLite、Postgresql、MySQL数据库
|
details: 有手就行,向下兼容,无需担心数据作废
|
||||||
---
|
---
|
||||||
|
|||||||
+1
-1
@@ -9,5 +9,5 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"npmClient": "pnpm",
|
"npmClient": "pnpm",
|
||||||
"version": "1.36.22"
|
"version": "1.37.4"
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-3
@@ -18,8 +18,9 @@
|
|||||||
"devb": "lerna run dev-build",
|
"devb": "lerna run dev-build",
|
||||||
"i-all": "lerna link && lerna exec npm install ",
|
"i-all": "lerna link && lerna exec npm install ",
|
||||||
"publish": "npm run prepublishOnly2 && lerna publish --force-publish=pro/plus-core --conventional-commits --create-release github && npm run afterpublishOnly && npm run commitAll",
|
"publish": "npm run prepublishOnly2 && lerna publish --force-publish=pro/plus-core --conventional-commits --create-release github && npm run afterpublishOnly && npm run commitAll",
|
||||||
"afterpublishOnly": "npm run copylogs && time /t >build.trigger && git add ./build.trigger && git commit -m \"build: trigger build image\" && TIMEOUT /T 10 && git push",
|
"afterpublishOnly": "npm run plugin-doc-gen && npm run copylogs && time /t >trigger/build.trigger && git add ./trigger/build.trigger && git commit -m \"build: trigger build image\" && TIMEOUT /T 10 && git push",
|
||||||
"transform-sql": "cd ./packages/ui/certd-server/db/ && node --experimental-json-modules transform.js",
|
"transform-sql": "cd ./packages/ui/certd-server/db/ && node --experimental-json-modules transform.js",
|
||||||
|
"plugin-doc-gen": "cd ./packages/ui/certd-server/ && npm run export-md",
|
||||||
"commitAll": "git add . && git commit -m \"build: publish\" && git push && npm run commitPro",
|
"commitAll": "git add . && git commit -m \"build: publish\" && git push && npm run commitPro",
|
||||||
"commitPro": "cd ./packages/pro/ && git add . && git commit -m \"build: publish\" && git push",
|
"commitPro": "cd ./packages/pro/ && git add . && git commit -m \"build: publish\" && git push",
|
||||||
"copylogs": "copyfiles \"CHANGELOG.md\" ./docs/guide/changelogs/",
|
"copylogs": "copyfiles \"CHANGELOG.md\" ./docs/guide/changelogs/",
|
||||||
@@ -33,11 +34,12 @@
|
|||||||
"docs:dev": "vitepress dev docs",
|
"docs:dev": "vitepress dev docs",
|
||||||
"docs:build": "npm run copylogs && vitepress build docs",
|
"docs:build": "npm run copylogs && vitepress build docs",
|
||||||
"docs:preview": "vitepress preview docs",
|
"docs:preview": "vitepress preview docs",
|
||||||
"pub": "echo 1"
|
"pub": "echo 1",
|
||||||
|
"dev": "pnpm run -r --parallel compile ",
|
||||||
|
"release": "time /t >trigger/release.trigger && git add trigger/release.trigger && git commit -m \"build: release\" && git push"
|
||||||
},
|
},
|
||||||
"license": "AGPL-3.0",
|
"license": "AGPL-3.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/ui-server": "link:packages/ui/certd-server",
|
|
||||||
"axios": "^1.7.7",
|
"axios": "^1.7.7",
|
||||||
"copyfiles": "^2.4.1",
|
"copyfiles": "^2.4.1",
|
||||||
"lodash-es": "^4.17.21",
|
"lodash-es": "^4.17.21",
|
||||||
|
|||||||
@@ -3,6 +3,42 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.4](https://github.com/publishlab/node-acme-client/compare/v1.37.3...v1.37.4) (2025-10-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.37.3](https://github.com/publishlab/node-acme-client/compare/v1.37.2...v1.37.3) (2025-10-24)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复并发情况下证书申请日志混乱的bug ([bb2714f](https://github.com/publishlab/node-acme-client/commit/bb2714ff241f9db4a71d805b23a1b0f9f2f6413a))
|
||||||
|
|
||||||
|
## [1.37.2](https://github.com/publishlab/node-acme-client/compare/v1.37.1...v1.37.2) (2025-10-14)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* aliyunoss 选择证书接入点选择新加坡无法上传的bug ([e00733a](https://github.com/publishlab/node-acme-client/commit/e00733a34644c23ffe926486b15dc96bf2fa4b57))
|
||||||
|
|
||||||
|
## [1.37.1](https://github.com/publishlab/node-acme-client/compare/v1.37.0...v1.37.1) (2025-09-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
# [1.37.0](https://github.com/publishlab/node-acme-client/compare/v1.36.25...v1.37.0) (2025-09-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.36.25](https://github.com/publishlab/node-acme-client/compare/v1.36.24...v1.36.25) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.36.24](https://github.com/publishlab/node-acme-client/compare/v1.36.23...v1.36.24) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.36.23](https://github.com/publishlab/node-acme-client/compare/v1.36.22...v1.36.23) (2025-09-26)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
## [1.36.22](https://github.com/publishlab/node-acme-client/compare/v1.36.21...v1.36.22) (2025-09-23)
|
## [1.36.22](https://github.com/publishlab/node-acme-client/compare/v1.36.21...v1.36.22) (2025-09-23)
|
||||||
|
|
||||||
**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.36.22",
|
"version": "1.37.4",
|
||||||
"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.36.22",
|
"@certd/basic": "^1.37.4",
|
||||||
"@peculiar/x509": "^1.11.0",
|
"@peculiar/x509": "^1.11.0",
|
||||||
"asn1js": "^3.0.5",
|
"asn1js": "^3.0.5",
|
||||||
"axios": "^1.7.2",
|
"axios": "^1.7.2",
|
||||||
@@ -52,7 +52,8 @@
|
|||||||
"lint-types": "tsd",
|
"lint-types": "tsd",
|
||||||
"prepublishOnly": "npm run build-docs",
|
"prepublishOnly": "npm run build-docs",
|
||||||
"test": "mocha -t 60000 \"test/setup.js\" \"test/**/*.spec.js\"",
|
"test": "mocha -t 60000 \"test/setup.js\" \"test/**/*.spec.js\"",
|
||||||
"pub": "npm publish"
|
"pub": "npm publish",
|
||||||
|
"compile": "tsc --skipLibCheck --watch"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
@@ -69,5 +70,5 @@
|
|||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/publishlab/node-acme-client/issues"
|
"url": "https://github.com/publishlab/node-acme-client/issues"
|
||||||
},
|
},
|
||||||
"gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
|
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ class AcmeApi {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
console.log(locationUrl, mapping);
|
|
||||||
return locationUrl;
|
return locationUrl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
* ACME auto helper
|
* ACME auto helper
|
||||||
*/
|
*/
|
||||||
import { readCsrDomains } from "./crypto/index.js";
|
import { readCsrDomains } from "./crypto/index.js";
|
||||||
import { log } from "./logger.js";
|
|
||||||
import { wait } from "./wait.js";
|
import { wait } from "./wait.js";
|
||||||
import { CancelError } from "./error.js";
|
import { CancelError } from "./error.js";
|
||||||
|
|
||||||
@@ -45,6 +44,9 @@ export default async (client, userOpts) => {
|
|||||||
accountPayload.externalAccountBinding = opts.externalAccountBinding;
|
accountPayload.externalAccountBinding = opts.externalAccountBinding;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const log = (...args)=>{
|
||||||
|
return client.logger.info(...args);
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* Register account
|
* Register account
|
||||||
*/
|
*/
|
||||||
@@ -255,7 +257,7 @@ export default async (client, userOpts) => {
|
|||||||
await wait(waitDnsDiffuseTime * 1000)
|
await wait(waitDnsDiffuseTime * 1000)
|
||||||
}
|
}
|
||||||
|
|
||||||
log("开始向提供商请求挑战验证");
|
log("开始向提供商请求检查验证");
|
||||||
await runPromisePa(completeChallengeTasks, 1000);
|
await runPromisePa(completeChallengeTasks, 1000);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
log(`证书申请失败${e.message}`);
|
log(`证书申请失败${e.message}`);
|
||||||
|
|||||||
@@ -3,9 +3,9 @@
|
|||||||
*/
|
*/
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { parseRetryAfterHeader } from './util.js';
|
import { parseRetryAfterHeader } from './util.js';
|
||||||
import { log } from './logger.js';
|
|
||||||
const { AxiosError } = axios;
|
const { AxiosError } = axios;
|
||||||
import {getGlobalAgents, HttpError} from '@certd/basic'
|
import {getGlobalAgents, HttpError} from '@certd/basic'
|
||||||
|
import { log } from './logger.js';
|
||||||
/**
|
/**
|
||||||
* Defaults
|
* Defaults
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
*/
|
*/
|
||||||
import { createHash } from 'crypto';
|
import { createHash } from 'crypto';
|
||||||
import { getPemBodyAsB64u } from './crypto/index.js';
|
import { getPemBodyAsB64u } from './crypto/index.js';
|
||||||
import { log } from './logger.js';
|
|
||||||
import HttpClient from './http.js';
|
import HttpClient from './http.js';
|
||||||
import AcmeApi from './api.js';
|
import AcmeApi from './api.js';
|
||||||
import verify from './verify.js';
|
import verify from './verify.js';
|
||||||
@@ -104,8 +103,13 @@ class AcmeClient {
|
|||||||
max: this.opts.backoffMax,
|
max: this.opts.backoffMax,
|
||||||
};
|
};
|
||||||
|
|
||||||
this.http = new HttpClient(this.opts.directoryUrl, this.opts.accountKey, this.opts.externalAccountBinding, this.opts.urlMapping);
|
this.http = new HttpClient(this.opts.directoryUrl, this.opts.accountKey, this.opts.externalAccountBinding, this.opts.urlMapping, opts.logger);
|
||||||
this.api = new AcmeApi(this.http, this.opts.accountUrl);
|
this.api = new AcmeApi(this.http, this.opts.accountUrl);
|
||||||
|
this.logger = opts.logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
log(...args) {
|
||||||
|
this.logger.info(...args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -177,7 +181,7 @@ class AcmeClient {
|
|||||||
this.getAccountUrl();
|
this.getAccountUrl();
|
||||||
|
|
||||||
/* Account URL exists */
|
/* Account URL exists */
|
||||||
log('Account URL exists, returning updateAccount()');
|
this.log('Account URL exists, returning updateAccount()');
|
||||||
return this.updateAccount(data);
|
return this.updateAccount(data);
|
||||||
}
|
}
|
||||||
catch (e) {
|
catch (e) {
|
||||||
@@ -185,7 +189,7 @@ class AcmeClient {
|
|||||||
|
|
||||||
/* HTTP 200: Account exists */
|
/* HTTP 200: Account exists */
|
||||||
if (resp.status === 200) {
|
if (resp.status === 200) {
|
||||||
log('Account already exists (HTTP 200), returning updateAccount()');
|
this.log('Account already exists (HTTP 200), returning updateAccount()');
|
||||||
return this.updateAccount(data);
|
return this.updateAccount(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -214,7 +218,7 @@ class AcmeClient {
|
|||||||
this.api.getAccountUrl();
|
this.api.getAccountUrl();
|
||||||
}
|
}
|
||||||
catch (e) {
|
catch (e) {
|
||||||
log('No account URL found, returning createAccount()');
|
this.log('No account URL found, returning createAccount()');
|
||||||
return this.createAccount(data);
|
return this.createAccount(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -502,7 +506,7 @@ class AcmeClient {
|
|||||||
await verify[challenge.type](authz, challenge, keyAuthorization);
|
await verify[challenge.type](authz, challenge, keyAuthorization);
|
||||||
};
|
};
|
||||||
|
|
||||||
log('Waiting for ACME challenge verification(等待ACME挑战验证)');
|
this.log('Waiting for ACME challenge verification(等待ACME检查验证)');
|
||||||
return util.retry(verifyFn, this.backoffOpts);
|
return util.retry(verifyFn, this.backoffOpts);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -570,7 +574,7 @@ class AcmeClient {
|
|||||||
const resp = await this.api.apiRequest(item.url, null, [200]);
|
const resp = await this.api.apiRequest(item.url, null, [200]);
|
||||||
|
|
||||||
/* Verify status */
|
/* Verify status */
|
||||||
log(`[${d}] Item has status(挑战状态): ${resp.data.status}`);
|
this.log(`[${d}] Item has status(检查状态): ${resp.data.status}`);
|
||||||
|
|
||||||
if (invalidStates.includes(resp.data.status)) {
|
if (invalidStates.includes(resp.data.status)) {
|
||||||
abort();
|
abort();
|
||||||
@@ -586,7 +590,7 @@ class AcmeClient {
|
|||||||
throw new Error(`[${d}] Unexpected item status: ${resp.data.status}`);
|
throw new Error(`[${d}] Unexpected item status: ${resp.data.status}`);
|
||||||
};
|
};
|
||||||
|
|
||||||
log(`[${d}] Waiting for valid status (等待valid状态): ${item.url}`, this.backoffOpts);
|
this.log(`[${d}] Waiting for valid status (等待valid状态): ${item.url}`, this.backoffOpts);
|
||||||
return util.retry(verifyFn, this.backoffOpts);
|
return util.retry(verifyFn, this.backoffOpts);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import { getJwk } from './crypto/index.js';
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
class HttpClient {
|
class HttpClient {
|
||||||
constructor(directoryUrl, accountKey, externalAccountBinding = {}, urlMapping = {}) {
|
constructor(directoryUrl, accountKey, externalAccountBinding = {}, urlMapping = {},logger) {
|
||||||
this.directoryUrl = directoryUrl;
|
this.directoryUrl = directoryUrl;
|
||||||
this.accountKey = accountKey;
|
this.accountKey = accountKey;
|
||||||
this.externalAccountBinding = externalAccountBinding;
|
this.externalAccountBinding = externalAccountBinding;
|
||||||
@@ -31,6 +31,7 @@ class HttpClient {
|
|||||||
this.directoryMaxAge = 86400;
|
this.directoryMaxAge = 86400;
|
||||||
this.directoryTimestamp = 0;
|
this.directoryTimestamp = 0;
|
||||||
this.urlMapping = urlMapping;
|
this.urlMapping = urlMapping;
|
||||||
|
this.log = logger? logger.info.bind(logger) : log;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -48,7 +49,7 @@ class HttpClient {
|
|||||||
for (const key in this.urlMapping.mappings) {
|
for (const key in this.urlMapping.mappings) {
|
||||||
if (url.includes(key)) {
|
if (url.includes(key)) {
|
||||||
const newUrl = url.replace(key, this.urlMapping.mappings[key]);
|
const newUrl = url.replace(key, this.urlMapping.mappings[key]);
|
||||||
log(`use reverse proxy: ${newUrl}`);
|
this.log(`use reverse proxy: ${newUrl}`);
|
||||||
url = newUrl;
|
url = newUrl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -65,10 +66,10 @@ class HttpClient {
|
|||||||
opts.headers['Content-Type'] = 'application/jose+json';
|
opts.headers['Content-Type'] = 'application/jose+json';
|
||||||
|
|
||||||
/* Request */
|
/* Request */
|
||||||
log(`HTTP request: ${method} ${url}`);
|
this.log(`HTTP request: ${method} ${url}`);
|
||||||
const resp = await axios.request(opts);
|
const resp = await axios.request(opts);
|
||||||
|
|
||||||
log(`RESP ${resp.status} ${method} ${url}`);
|
this.log(`RESP ${resp.status} ${method} ${url}`);
|
||||||
return resp;
|
return resp;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,7 +86,7 @@ class HttpClient {
|
|||||||
const age = (now - this.directoryTimestamp);
|
const age = (now - this.directoryTimestamp);
|
||||||
|
|
||||||
if (!this.directoryCache || (age > this.directoryMaxAge)) {
|
if (!this.directoryCache || (age > this.directoryMaxAge)) {
|
||||||
log(`Refreshing ACME directory, age: ${age}`);
|
this.log(`Refreshing ACME directory, age: ${age}`);
|
||||||
const resp = await this.request(this.directoryUrl, 'get');
|
const resp = await this.request(this.directoryUrl, 'get');
|
||||||
|
|
||||||
if (resp.status >= 400) {
|
if (resp.status >= 400) {
|
||||||
@@ -187,7 +188,7 @@ class HttpClient {
|
|||||||
|
|
||||||
/* Nonce */
|
/* Nonce */
|
||||||
if (nonce) {
|
if (nonce) {
|
||||||
log(`Using nonce: ${nonce}`);
|
this.log(`Using nonce: ${nonce}`);
|
||||||
header.nonce = nonce;
|
header.nonce = nonce;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -314,7 +315,7 @@ class HttpClient {
|
|||||||
nonce = resp.headers['replay-nonce'] || null;
|
nonce = resp.headers['replay-nonce'] || null;
|
||||||
attempts += 1;
|
attempts += 1;
|
||||||
|
|
||||||
log(`Caught invalid nonce error, retrying (${attempts}/${this.maxBadNonceRetries}) signed request to: ${url}`);
|
this.log(`Caught invalid nonce error, retrying (${attempts}/${this.maxBadNonceRetries}) signed request to: ${url}`);
|
||||||
return this.signedRequest(url, payload, { kid, nonce, includeExternalAccountBinding }, attempts);
|
return this.signedRequest(url, payload, { kid, nonce, includeExternalAccountBinding }, attempts);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
@@ -49,6 +49,7 @@ export interface ClientOptions {
|
|||||||
backoffMax?: number;
|
backoffMax?: number;
|
||||||
urlMapping?: UrlMapping;
|
urlMapping?: UrlMapping;
|
||||||
signal?: AbortSignal;
|
signal?: AbortSignal;
|
||||||
|
logger?:any
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ClientExternalAccountBindingOptions {
|
export interface ClientExternalAccountBindingOptions {
|
||||||
|
|||||||
@@ -3,6 +3,40 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持网络测试 ([2bef608](https://github.com/certd/certd/commit/2bef608e07ceb56d52007f290667e0afef401b22))
|
||||||
|
|
||||||
|
## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
||||||
|
|
||||||
### Performance Improvements
|
### Performance Improvements
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
01:46
|
01:28
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/basic",
|
"name": "@certd/basic",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.36.22",
|
"version": "1.37.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -13,7 +13,8 @@
|
|||||||
"dev-build": "npm run build",
|
"dev-build": "npm run build",
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
"test": "mocha --loader=ts-node/esm",
|
"test": "mocha --loader=ts-node/esm",
|
||||||
"pub": "npm publish"
|
"pub": "npm publish",
|
||||||
|
"compile": "tsc --skipLibCheck --watch"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"axios": "^1.7.2",
|
"axios": "^1.7.2",
|
||||||
@@ -45,5 +46,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
|
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,2 +1 @@
|
|||||||
export * from './utils/index.js';
|
export * from "./utils/index.js";
|
||||||
export * from './utils/util.id.js';
|
|
||||||
|
|||||||
@@ -22,12 +22,14 @@ import { sp } from "./util.sp.js";
|
|||||||
import { hashUtils } from "./util.hash.js";
|
import { hashUtils } from "./util.hash.js";
|
||||||
import { promises } from "./util.promise.js";
|
import { promises } from "./util.promise.js";
|
||||||
import { fileUtils } from "./util.file.js";
|
import { fileUtils } from "./util.file.js";
|
||||||
import * as _ from "lodash-es";
|
|
||||||
import { cache } from "./util.cache.js";
|
import { cache } from "./util.cache.js";
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
import { domainUtils } from "./util.domain.js";
|
import { domainUtils } from "./util.domain.js";
|
||||||
|
export * from "./util.domain.js";
|
||||||
import { optionsUtils } from "./util.options.js";
|
import { optionsUtils } from "./util.options.js";
|
||||||
|
export * from "./util.options.js";
|
||||||
import { amountUtils } from "./util.amount.js";
|
import { amountUtils } from "./util.amount.js";
|
||||||
|
export * from "./util.amount.js";
|
||||||
import { nanoid } from "nanoid";
|
import { nanoid } from "nanoid";
|
||||||
import * as id from "./util.id.js";
|
import * as id from "./util.id.js";
|
||||||
import { locker } from "./util.lock.js";
|
import { locker } from "./util.lock.js";
|
||||||
@@ -35,6 +37,9 @@ import { mitter } from "./util.mitter.js";
|
|||||||
|
|
||||||
import * as request from "./util.request.js";
|
import * as request from "./util.request.js";
|
||||||
export * from "./util.cache.js";
|
export * from "./util.cache.js";
|
||||||
|
|
||||||
|
export * from "./util.id.js";
|
||||||
|
|
||||||
export const utils = {
|
export const utils = {
|
||||||
sleep,
|
sleep,
|
||||||
http,
|
http,
|
||||||
@@ -43,7 +48,6 @@ export const utils = {
|
|||||||
hash: hashUtils,
|
hash: hashUtils,
|
||||||
promises,
|
promises,
|
||||||
file: fileUtils,
|
file: fileUtils,
|
||||||
_,
|
|
||||||
mergeUtils,
|
mergeUtils,
|
||||||
cache,
|
cache,
|
||||||
nanoid,
|
nanoid,
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
//转换为import
|
//转换为import
|
||||||
import childProcess from 'child_process';
|
//@ts-ignore
|
||||||
import { safePromise } from './util.promise.js';
|
import childProcess from "child_process";
|
||||||
import { ILogger, logger } from './util.log.js';
|
import { safePromise } from "./util.promise.js";
|
||||||
import iconv from 'iconv-lite';
|
import { ILogger, logger } from "./util.log.js";
|
||||||
|
//@ts-ignore
|
||||||
|
import iconv from "iconv-lite";
|
||||||
export type ExecOption = {
|
export type ExecOption = {
|
||||||
cmd: string | string[];
|
cmd: string | string[];
|
||||||
env: any;
|
env: any;
|
||||||
@@ -11,12 +13,12 @@ export type ExecOption = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
async function exec(opts: ExecOption): Promise<string> {
|
async function exec(opts: ExecOption): Promise<string> {
|
||||||
let cmd = '';
|
let cmd = "";
|
||||||
const log = opts.logger || logger;
|
const log = opts.logger || logger;
|
||||||
if (opts.cmd instanceof Array) {
|
if (opts.cmd instanceof Array) {
|
||||||
for (const item of opts.cmd) {
|
for (const item of opts.cmd) {
|
||||||
if (cmd) {
|
if (cmd) {
|
||||||
cmd += ' && ' + item;
|
cmd += " && " + item;
|
||||||
} else {
|
} else {
|
||||||
cmd = item;
|
cmd = item;
|
||||||
}
|
}
|
||||||
@@ -28,17 +30,18 @@ async function exec(opts: ExecOption): Promise<string> {
|
|||||||
cmd,
|
cmd,
|
||||||
{
|
{
|
||||||
env: {
|
env: {
|
||||||
|
//@ts-ignore
|
||||||
...process.env,
|
...process.env,
|
||||||
...opts.env,
|
...opts.env,
|
||||||
},
|
},
|
||||||
...opts.options,
|
...opts.options,
|
||||||
},
|
},
|
||||||
(error, stdout, stderr) => {
|
(error: any, stdout: { toString: (arg0: string) => any }, stderr: any) => {
|
||||||
if (error) {
|
if (error) {
|
||||||
log.error(`exec error: ${error}`);
|
log.error(`exec error: ${error}`);
|
||||||
reject(error);
|
reject(error);
|
||||||
} else {
|
} else {
|
||||||
const res = stdout.toString('utf-8');
|
const res = stdout.toString("utf-8");
|
||||||
log.info(`stdout: ${res}`);
|
log.info(`stdout: ${res}`);
|
||||||
resolve(res);
|
resolve(res);
|
||||||
}
|
}
|
||||||
@@ -57,11 +60,12 @@ export type SpawnOption = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
function isWindows() {
|
function isWindows() {
|
||||||
return process.platform === 'win32';
|
// @ts-ignore
|
||||||
|
return process.platform === "win32";
|
||||||
}
|
}
|
||||||
function convert(buffer: any) {
|
function convert(buffer: any) {
|
||||||
if (isWindows()) {
|
if (isWindows()) {
|
||||||
const decoded = iconv.decode(buffer, 'GBK');
|
const decoded = iconv.decode(buffer, "GBK");
|
||||||
// 检查是否有有效字符
|
// 检查是否有有效字符
|
||||||
return decoded && decoded.trim().length > 0 ? decoded : buffer.toString();
|
return decoded && decoded.trim().length > 0 ? decoded : buffer.toString();
|
||||||
} else {
|
} else {
|
||||||
@@ -74,12 +78,12 @@ function convert(buffer: any) {
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
async function spawn(opts: SpawnOption): Promise<string> {
|
async function spawn(opts: SpawnOption): Promise<string> {
|
||||||
let cmd = '';
|
let cmd = "";
|
||||||
const log = opts.logger || logger;
|
const log = opts.logger || logger;
|
||||||
if (opts.cmd instanceof Array) {
|
if (opts.cmd instanceof Array) {
|
||||||
for (const item of opts.cmd) {
|
for (const item of opts.cmd) {
|
||||||
if (cmd) {
|
if (cmd) {
|
||||||
cmd += ' && ' + item;
|
cmd += " && " + item;
|
||||||
} else {
|
} else {
|
||||||
cmd = item;
|
cmd = item;
|
||||||
}
|
}
|
||||||
@@ -88,37 +92,47 @@ async function spawn(opts: SpawnOption): Promise<string> {
|
|||||||
cmd = opts.cmd;
|
cmd = opts.cmd;
|
||||||
}
|
}
|
||||||
log.info(`执行命令: ${cmd}`);
|
log.info(`执行命令: ${cmd}`);
|
||||||
let stdout = '';
|
let stdout = "";
|
||||||
let stderr = '';
|
let stderr = "";
|
||||||
return safePromise((resolve, reject) => {
|
return safePromise((resolve, reject) => {
|
||||||
const ls = childProcess.spawn(cmd, {
|
const ls = childProcess.spawn(cmd, {
|
||||||
shell: true,
|
shell: true,
|
||||||
env: {
|
env: {
|
||||||
|
//@ts-ignore
|
||||||
...process.env,
|
...process.env,
|
||||||
...opts.env,
|
...opts.env,
|
||||||
},
|
},
|
||||||
...opts.options,
|
...opts.options,
|
||||||
});
|
});
|
||||||
ls.stdout.on('data', data => {
|
ls.stdout.on("data", (data: string) => {
|
||||||
data = convert(data);
|
data = convert(data);
|
||||||
log.info(`stdout: ${data}`);
|
log.info(`stdout: ${data}`);
|
||||||
stdout += data;
|
stdout += data;
|
||||||
});
|
});
|
||||||
|
|
||||||
ls.stderr.on('data', data => {
|
ls.stderr.on("data", (data: string) => {
|
||||||
data = convert(data);
|
data = convert(data);
|
||||||
log.warn(`stderr: ${data}`);
|
log.warn(`stderr: ${data}`);
|
||||||
stderr += data;
|
stderr += data;
|
||||||
});
|
});
|
||||||
ls.on('error', error => {
|
ls.on("error", (error: any) => {
|
||||||
log.error(`child process error: ${error}`);
|
log.error(`child process error: ${error}`);
|
||||||
|
//@ts-ignore
|
||||||
|
error.stderr = stderr;
|
||||||
|
//@ts-ignore
|
||||||
|
error.stdout = stdout;
|
||||||
reject(error);
|
reject(error);
|
||||||
});
|
});
|
||||||
|
|
||||||
ls.on('close', (code: number) => {
|
ls.on("close", (code: number) => {
|
||||||
if (code !== 0) {
|
if (code !== 0) {
|
||||||
log.error(`child process exited with code ${code}`);
|
log.error(`child process exited with code ${code}`);
|
||||||
reject(new Error(stderr));
|
const e = new Error(stderr || "return " + code);
|
||||||
|
//@ts-ignore
|
||||||
|
e.stderr = stderr;
|
||||||
|
//@ts-ignore
|
||||||
|
e.stdout = stdout;
|
||||||
|
reject(e);
|
||||||
} else {
|
} else {
|
||||||
resolve(stdout);
|
resolve(stdout);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,40 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 手动上传证书优化,增加到期前报错提醒 ([3d42bfd](https://github.com/certd/certd/commit/3d42bfd479eaacc4a49c401224815a6e2a0204b0))
|
||||||
|
|
||||||
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
||||||
|
|
||||||
**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.36.22",
|
"version": "1.37.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -14,11 +14,12 @@
|
|||||||
"build3": "rollup -c",
|
"build3": "rollup -c",
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
"test": "mocha --loader=ts-node/esm",
|
"test": "mocha --loader=ts-node/esm",
|
||||||
"pub": "npm publish"
|
"pub": "npm publish",
|
||||||
|
"compile": "tsc --skipLibCheck --watch"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/basic": "^1.36.22",
|
"@certd/basic": "^1.37.4",
|
||||||
"@certd/plus-core": "^1.36.22",
|
"@certd/plus-core": "^1.37.4",
|
||||||
"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"
|
||||||
@@ -44,5 +45,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
|
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -120,10 +120,9 @@ export class RunHistory {
|
|||||||
delete e.stack;
|
delete e.stack;
|
||||||
delete e.cause;
|
delete e.cause;
|
||||||
if (runnable.runnableType === "step") {
|
if (runnable.runnableType === "step") {
|
||||||
this._loggers[runnable.id].error(`[${runnable.runnableType}] [${runnable.title}]<id:${runnable.id}> :`, e, stack, cause);
|
this._loggers[runnable.id].error(stack, cause);
|
||||||
} else {
|
|
||||||
this._loggers[runnable.id].error(`[${runnable.runnableType}] [${runnable.title}]<id:${runnable.id}> :`, e.message);
|
|
||||||
}
|
}
|
||||||
|
this._loggers[runnable.id].error(`[${runnable.runnableType}] [${runnable.title}]<id:${runnable.id}> :`, e.message);
|
||||||
}
|
}
|
||||||
|
|
||||||
finally(runnable: Runnable) {
|
finally(runnable: Runnable) {
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ export type CnameRecord = {
|
|||||||
cnameProvider: CnameProvider;
|
cnameProvider: CnameProvider;
|
||||||
status: string;
|
status: string;
|
||||||
commonDnsProvider?: any;
|
commonDnsProvider?: any;
|
||||||
|
mainDomain?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type ICnameProxyService = {
|
export type ICnameProxyService = {
|
||||||
|
|||||||
@@ -3,6 +3,38 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
||||||
|
|
||||||
**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.36.22",
|
"version": "1.37.4",
|
||||||
"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": "c98f43b98459d107910c95d23fda785b0edc4702"
|
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,38 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
||||||
|
|
||||||
**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.36.22",
|
"version": "1.37.4",
|
||||||
"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": "c98f43b98459d107910c95d23fda785b0edc4702"
|
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,38 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
||||||
|
|
||||||
**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.36.22",
|
"version": "1.37.4",
|
||||||
"description": "jdcloud openApi sdk",
|
"description": "jdcloud openApi sdk",
|
||||||
"main": "./dist/bundle.js",
|
"main": "./dist/bundle.js",
|
||||||
"module": "./dist/bundle.js",
|
"module": "./dist/bundle.js",
|
||||||
@@ -61,5 +61,5 @@
|
|||||||
"fetch"
|
"fetch"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
|
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,38 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
||||||
|
|
||||||
**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.36.22",
|
"version": "1.37.4",
|
||||||
"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.36.22",
|
"@certd/basic": "^1.37.4",
|
||||||
"@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": "c98f43b98459d107910c95d23fda785b0edc4702"
|
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,46 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* dist打包前检查 ([8f6e5bd](https://github.com/certd/certd/commit/8f6e5bd24b3b65fbfcba36c08f532a3abad2d606))
|
||||||
|
|
||||||
|
## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 固定midwayjs版本,修复ui-server import 错误的bug ([eb4d125](https://github.com/certd/certd/commit/eb4d125eaf4a41e88c752d0c68993829589f8f27))
|
||||||
|
|
||||||
|
## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复 ui-server 加载失败问题 ([c2ccdbe](https://github.com/certd/certd/commit/c2ccdbec9dd08bca4688eeb2f34d0105eec43ba1))
|
||||||
|
|
||||||
|
## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持腾讯云验证码 ([03f317f](https://github.com/certd/certd/commit/03f317ffdb6595ce70e8a2302b05f390c52110c8))
|
||||||
|
|
||||||
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
||||||
|
|
||||||
**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.36.22",
|
"version": "1.37.4",
|
||||||
"description": "midway with flyway, sql upgrade way ",
|
"description": "midway with flyway, sql upgrade way ",
|
||||||
"private": false,
|
"private": false,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -17,7 +17,8 @@
|
|||||||
"lint": "mwts check",
|
"lint": "mwts check",
|
||||||
"lint:fix": "mwts fix",
|
"lint:fix": "mwts fix",
|
||||||
"prepublish": "npm run build",
|
"prepublish": "npm run build",
|
||||||
"pub": "npm publish"
|
"pub": "npm publish",
|
||||||
|
"compile": "tsc --skipLibCheck --watch"
|
||||||
},
|
},
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
"author": "greper",
|
"author": "greper",
|
||||||
@@ -27,19 +28,20 @@
|
|||||||
],
|
],
|
||||||
"license": "AGPL",
|
"license": "AGPL",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/acme-client": "^1.36.22",
|
"@certd/acme-client": "^1.37.4",
|
||||||
"@certd/basic": "^1.36.22",
|
"@certd/basic": "^1.37.4",
|
||||||
"@certd/pipeline": "^1.36.22",
|
"@certd/pipeline": "^1.37.4",
|
||||||
"@certd/plugin-lib": "^1.36.22",
|
"@certd/plugin-lib": "^1.37.4",
|
||||||
"@certd/plus-core": "^1.36.22",
|
"@certd/plus-core": "^1.37.4",
|
||||||
"@midwayjs/cache": "~3.14.0",
|
"@midwayjs/cache": "3.14.0",
|
||||||
"@midwayjs/core": "~3.20.3",
|
"@midwayjs/core": "3.20.11",
|
||||||
"@midwayjs/i18n": "~3.20.3",
|
"@midwayjs/i18n": "3.20.13",
|
||||||
"@midwayjs/info": "~3.20.3",
|
"@midwayjs/info": "3.20.13",
|
||||||
"@midwayjs/koa": "~3.20.3",
|
"@midwayjs/koa": "3.20.13",
|
||||||
"@midwayjs/logger": "~3.4.2",
|
"@midwayjs/logger": "3.4.2",
|
||||||
"@midwayjs/typeorm": "~3.20.3",
|
"@midwayjs/typeorm": "3.20.11",
|
||||||
"@midwayjs/upload": "^3.20.3",
|
"@midwayjs/upload": "3.20.13",
|
||||||
|
"@midwayjs/validate": "3.20.13",
|
||||||
"better-sqlite3": "^11.1.2",
|
"better-sqlite3": "^11.1.2",
|
||||||
"cross-env": "^7.0.3",
|
"cross-env": "^7.0.3",
|
||||||
"dayjs": "^1.11.7",
|
"dayjs": "^1.11.7",
|
||||||
@@ -62,5 +64,5 @@
|
|||||||
"typeorm": "^0.3.11",
|
"typeorm": "^0.3.11",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
|
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,4 +47,12 @@ export abstract class BaseController {
|
|||||||
}
|
}
|
||||||
return user;
|
return user;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
isAdmin() {
|
||||||
|
const roleIds: number[] = this.ctx?.user?.roles;
|
||||||
|
if (roleIds?.includes(1)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,3 +8,5 @@ export * from './common-exception.js';
|
|||||||
export * from './not-found-exception.js';
|
export * from './not-found-exception.js';
|
||||||
export * from './param-exception.js';
|
export * from './param-exception.js';
|
||||||
export * from './site-off-exception.js';
|
export * from './site-off-exception.js';
|
||||||
|
export * from './login-error-exception.js'
|
||||||
|
export * from './code-error-exception.js'
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { AppKey, PlusRequestService } from '@certd/plus-core';
|
|||||||
import { cache, http, HttpRequestConfig, logger } from '@certd/basic';
|
import { cache, http, HttpRequestConfig, logger } from '@certd/basic';
|
||||||
import { SysInstallInfo, SysLicenseInfo, SysSettingsService } from '../../settings/index.js';
|
import { SysInstallInfo, SysLicenseInfo, SysSettingsService } from '../../settings/index.js';
|
||||||
import { merge } from 'lodash-es';
|
import { merge } from 'lodash-es';
|
||||||
|
import fs from 'fs';
|
||||||
@Provide("plusService")
|
@Provide("plusService")
|
||||||
@Scope(ScopeEnum.Request, { allowDowngrade: true })
|
@Scope(ScopeEnum.Request, { allowDowngrade: true })
|
||||||
export class PlusService {
|
export class PlusService {
|
||||||
@@ -85,12 +85,31 @@ export class PlusService {
|
|||||||
|
|
||||||
async sendEmail(email: any) {
|
async sendEmail(email: any) {
|
||||||
const plusRequestService = await this.getPlusRequestService();
|
const plusRequestService = await this.getPlusRequestService();
|
||||||
|
|
||||||
|
let attachments = email.attachments || [];
|
||||||
|
if (attachments.length > 0) {
|
||||||
|
const newAttachments: any[] = [];
|
||||||
|
attachments.forEach((item: any) => {
|
||||||
|
const name = item.filename || item.path.split('/').pop();
|
||||||
|
const body = item.content || fs.readFileSync(item.path);
|
||||||
|
const bodyBase64 = Buffer.from(body).toString('base64');
|
||||||
|
item = {
|
||||||
|
name,
|
||||||
|
body: bodyBase64,
|
||||||
|
};
|
||||||
|
newAttachments.push(item);
|
||||||
|
});
|
||||||
|
attachments = newAttachments;
|
||||||
|
}
|
||||||
|
|
||||||
await plusRequestService.request({
|
await plusRequestService.request({
|
||||||
url: '/activation/emailSend',
|
url: '/activation/emailSend',
|
||||||
data: {
|
data: {
|
||||||
subject: email.subject,
|
subject: email.subject,
|
||||||
text: email.content,
|
|
||||||
to: email.receivers,
|
to: email.receivers,
|
||||||
|
text: email.content,
|
||||||
|
html: email.html,
|
||||||
|
attachments,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,6 +37,15 @@ export class SysPublicSettings extends BaseSettings {
|
|||||||
//验证码类型
|
//验证码类型
|
||||||
captchaType?: string;
|
captchaType?: string;
|
||||||
captchaAddonId?:number;
|
captchaAddonId?:number;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//流水线是否启用有效期
|
||||||
|
pipelineValidTimeEnabled?: boolean = false;
|
||||||
|
|
||||||
|
//证书域名添加到监控
|
||||||
|
certDomainAddToMonitorEnabled?: boolean = false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export class SysPrivateSettings extends BaseSettings {
|
export class SysPrivateSettings extends BaseSettings {
|
||||||
@@ -51,6 +60,8 @@ export class SysPrivateSettings extends BaseSettings {
|
|||||||
dnsResultOrder? = '';
|
dnsResultOrder? = '';
|
||||||
commonCnameEnabled?: boolean = true;
|
commonCnameEnabled?: boolean = true;
|
||||||
|
|
||||||
|
httpRequestTimeout?: number = 30;
|
||||||
|
|
||||||
sms?: {
|
sms?: {
|
||||||
type?: string;
|
type?: string;
|
||||||
config?: any;
|
config?: any;
|
||||||
@@ -214,3 +225,4 @@ export class SysSafeSetting extends BaseSettings {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,13 @@
|
|||||||
import { HttpClient, ILogger, utils } from "@certd/basic";
|
import { HttpClient, ILogger, utils } from "@certd/basic";
|
||||||
import {upperFirst} from "lodash-es";
|
import {upperFirst} from "lodash-es";
|
||||||
import { FormItemProps, PluginRequestHandleReq, Registrable } from "@certd/pipeline";
|
import {
|
||||||
|
accessRegistry,
|
||||||
|
FormItemProps,
|
||||||
|
IAccessService,
|
||||||
|
IServiceGetter,
|
||||||
|
PluginRequestHandleReq,
|
||||||
|
Registrable
|
||||||
|
} from "@certd/pipeline";
|
||||||
|
|
||||||
|
|
||||||
export type AddonRequestHandleReqInput<T = any> = {
|
export type AddonRequestHandleReqInput<T = any> = {
|
||||||
@@ -48,6 +55,7 @@ export type AddonContext = {
|
|||||||
http: HttpClient;
|
http: HttpClient;
|
||||||
logger: ILogger;
|
logger: ILogger;
|
||||||
utils: typeof utils;
|
utils: typeof utils;
|
||||||
|
serviceGetter: IServiceGetter;
|
||||||
};
|
};
|
||||||
|
|
||||||
export abstract class BaseAddon implements IAddon {
|
export abstract class BaseAddon implements IAddon {
|
||||||
@@ -58,8 +66,45 @@ export abstract class BaseAddon implements IAddon {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
||||||
async onInstance() {}
|
async onInstance() {}
|
||||||
|
|
||||||
|
|
||||||
|
async getAccess<T = any>(accessId: string | number, isCommon = false) {
|
||||||
|
if (accessId == null) {
|
||||||
|
throw new Error("您还没有配置授权");
|
||||||
|
}
|
||||||
|
const accessService = await this.ctx.serviceGetter.get<IAccessService>("accessService")
|
||||||
|
let res: any = null;
|
||||||
|
if (isCommon) {
|
||||||
|
res = await accessService.getCommonById(accessId);
|
||||||
|
} else {
|
||||||
|
res = await accessService.getById(accessId);
|
||||||
|
}
|
||||||
|
if (res == null) {
|
||||||
|
throw new Error("授权不存在,可能已被删除,请前往任务配置里面重新选择授权");
|
||||||
|
}
|
||||||
|
// @ts-ignore
|
||||||
|
if (this.logger?.addSecret) {
|
||||||
|
// 隐藏加密信息,不在日志中输出
|
||||||
|
const type = res._type;
|
||||||
|
const plugin = accessRegistry.get(type);
|
||||||
|
const define = plugin.define;
|
||||||
|
// @ts-ignore
|
||||||
|
const input = define.input;
|
||||||
|
for (const key in input) {
|
||||||
|
if (input[key].encrypt && res[key] != null) {
|
||||||
|
// @ts-ignore
|
||||||
|
this.logger.addSecret(res[key]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return res as T;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
setCtx(ctx: AddonContext) {
|
setCtx(ctx: AddonContext) {
|
||||||
this.ctx = ctx;
|
this.ctx = ctx;
|
||||||
this.http = ctx.http;
|
this.http = ctx.http;
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
export * from './api/index.js'
|
export * from './api/index.js'
|
||||||
export * from './entity/addon.js'
|
export * from './entity/addon.js'
|
||||||
export * from './service/addon-service.js'
|
export * from './service/addon-service.js'
|
||||||
export * from './service/addon-getter.js'
|
|
||||||
export * from './service/addon-sys-getter.js'
|
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
import { IAddonGetter } from "../api/index.js";
|
|
||||||
|
|
||||||
export class AddonGetter implements IAddonGetter {
|
|
||||||
userId: number;
|
|
||||||
getter: <T>(id: any, userId?: number) => Promise<T>;
|
|
||||||
constructor(userId: number, getter: (id: any, userId: number) => Promise<any>) {
|
|
||||||
this.userId = userId;
|
|
||||||
this.getter = getter;
|
|
||||||
}
|
|
||||||
|
|
||||||
async getById<T = any>(id: any) {
|
|
||||||
return await this.getter<T>(id, this.userId);
|
|
||||||
}
|
|
||||||
|
|
||||||
async getCommonById<T = any>(id: any) {
|
|
||||||
return await this.getter<T>(id, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +1,15 @@
|
|||||||
import { Provide, Scope, ScopeEnum } from "@midwayjs/core";
|
import { Provide, Scope, ScopeEnum } from "@midwayjs/core";
|
||||||
import { InjectEntityModel } from "@midwayjs/typeorm";
|
import { InjectEntityModel } from "@midwayjs/typeorm";
|
||||||
import { In, Repository } from "typeorm";
|
import { In, Repository } from "typeorm";
|
||||||
import { AddonDefine, BaseService, PageReq, PermissionException, ValidateException } from "../../../index.js";
|
import { AddonDefine, BaseService, PageReq, ValidateException } from "../../../index.js";
|
||||||
import { addonRegistry, newAddon } from "../api/index.js";
|
import { addonRegistry } from "../api/index.js";
|
||||||
import { AddonEntity } from "../entity/addon.js";
|
import { AddonEntity } from "../entity/addon.js";
|
||||||
import { http, logger, utils } from "@certd/basic";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Addon
|
* Addon
|
||||||
*/
|
*/
|
||||||
@Provide()
|
@Provide()
|
||||||
@Scope(ScopeEnum.Request, {allowDowngrade: true})
|
@Scope(ScopeEnum.Request, { allowDowngrade: true })
|
||||||
export class AddonService extends BaseService<AddonEntity> {
|
export class AddonService extends BaseService<AddonEntity> {
|
||||||
@InjectEntityModel(AddonEntity)
|
@InjectEntityModel(AddonEntity)
|
||||||
repository: Repository<AddonEntity>;
|
repository: Repository<AddonEntity>;
|
||||||
@@ -30,21 +29,21 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
|
|
||||||
async add(param) {
|
async add(param) {
|
||||||
let oldEntity = null;
|
let oldEntity = null;
|
||||||
if (param._copyFrom){
|
if (param._copyFrom) {
|
||||||
oldEntity = await this.info(param._copyFrom);
|
oldEntity = await this.info(param._copyFrom);
|
||||||
if (oldEntity == null) {
|
if (oldEntity == null) {
|
||||||
throw new ValidateException('该Addon配置不存在,请确认是否已被删除');
|
throw new ValidateException("该Addon配置不存在,请确认是否已被删除");
|
||||||
}
|
}
|
||||||
if (oldEntity.userId !== param.userId) {
|
if (oldEntity.userId !== param.userId) {
|
||||||
throw new ValidateException('您无权查看该Addon配置');
|
throw new ValidateException("您无权查看该Addon配置");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!param.userId){
|
if (!param.userId) {
|
||||||
param.isSystem = true
|
param.isSystem = true;
|
||||||
}else{
|
} else {
|
||||||
param.isSystem = false
|
param.isSystem = false;
|
||||||
}
|
}
|
||||||
delete param._copyFrom
|
delete param._copyFrom;
|
||||||
return await super.add(param);
|
return await super.add(param);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,7 +55,7 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
async update(param) {
|
async update(param) {
|
||||||
const oldEntity = await this.info(param.id);
|
const oldEntity = await this.info(param.id);
|
||||||
if (oldEntity == null) {
|
if (oldEntity == null) {
|
||||||
throw new ValidateException('该Addon配置不存在,请确认是否已被删除');
|
throw new ValidateException("该Addon配置不存在,请确认是否已被删除");
|
||||||
}
|
}
|
||||||
return await super.update(param);
|
return await super.update(param);
|
||||||
}
|
}
|
||||||
@@ -64,63 +63,24 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
async getSimpleInfo(id: number) {
|
async getSimpleInfo(id: number) {
|
||||||
const entity = await this.info(id);
|
const entity = await this.info(id);
|
||||||
if (entity == null) {
|
if (entity == null) {
|
||||||
throw new ValidateException('该Addon配置不存在,请确认是否已被删除');
|
throw new ValidateException("该Addon配置不存在,请确认是否已被删除");
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
id: entity.id,
|
id: entity.id,
|
||||||
name: entity.name,
|
name: entity.name,
|
||||||
userId: entity.userId,
|
userId: entity.userId,
|
||||||
addonType: entity.addonType,
|
addonType: entity.addonType,
|
||||||
type: entity.type,
|
type: entity.type
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
async getAddonById(id: any, checkUserId: boolean, userId?: number): Promise<any> {
|
|
||||||
const ctx = {
|
|
||||||
http: http,
|
|
||||||
logger: logger,
|
|
||||||
utils: utils,
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
if (!id){
|
|
||||||
//使用图片验证码
|
|
||||||
return await newAddon("captcha", "image", {},ctx);
|
|
||||||
}
|
|
||||||
const entity = await this.info(id);
|
|
||||||
if (entity == null) {
|
|
||||||
//使用图片验证码
|
|
||||||
return await newAddon("captcha", "image", {},ctx);
|
|
||||||
}
|
|
||||||
if (checkUserId) {
|
|
||||||
if (userId == null) {
|
|
||||||
throw new ValidateException('userId不能为空');
|
|
||||||
}
|
|
||||||
if (userId !== entity.userId) {
|
|
||||||
throw new PermissionException('您对该Addon无访问权限');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const setting = JSON.parse(entity.setting ??"{}")
|
|
||||||
const input = {
|
|
||||||
id: entity.id,
|
|
||||||
...setting,
|
|
||||||
};
|
|
||||||
|
|
||||||
return await newAddon(entity.addonType, entity.type, input,ctx);
|
|
||||||
}
|
|
||||||
|
|
||||||
async getById(id: any, userId: number): Promise<any> {
|
|
||||||
return await this.getAddonById(id, true, userId);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
getDefineList(addonType: string) {
|
getDefineList(addonType: string) {
|
||||||
return addonRegistry.getDefineList();
|
return addonRegistry.getDefineList();
|
||||||
}
|
}
|
||||||
|
|
||||||
getDefineByType(type: string,prefix?: string) {
|
getDefineByType(type: string, prefix?: string) {
|
||||||
return addonRegistry.getDefine(type,prefix) as AddonDefine;
|
return addonRegistry.getDefine(type, prefix) as AddonDefine;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -134,31 +94,30 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
return await this.repository.find({
|
return await this.repository.find({
|
||||||
where: {
|
where: {
|
||||||
id: In(ids),
|
id: In(ids),
|
||||||
userId,
|
userId
|
||||||
},
|
},
|
||||||
select: {
|
select: {
|
||||||
id: true,
|
id: true,
|
||||||
name: true,
|
name: true,
|
||||||
addonType: true,
|
addonType: true,
|
||||||
type: true,
|
type: true,
|
||||||
userId:true,
|
userId: true,
|
||||||
isSystem: true,
|
isSystem: true
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async getDefault(userId: number, addonType: string): Promise<any> {
|
||||||
async getDefault(userId: number,addonType: string): Promise<any> {
|
|
||||||
const res = await this.repository.findOne({
|
const res = await this.repository.findOne({
|
||||||
where: {
|
where: {
|
||||||
userId,
|
userId,
|
||||||
addonType
|
addonType
|
||||||
},
|
},
|
||||||
order: {
|
order: {
|
||||||
isDefault: 'DESC',
|
isDefault: "DESC"
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
if (!res) {
|
if (!res) {
|
||||||
return null;
|
return null;
|
||||||
@@ -174,16 +133,16 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
type: res.type,
|
type: res.type,
|
||||||
name: res.name,
|
name: res.name,
|
||||||
userId: res.userId,
|
userId: res.userId,
|
||||||
setting,
|
setting
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
async setDefault(id: number, userId: number,addonType:string) {
|
async setDefault(id: number, userId: number, addonType: string) {
|
||||||
if (!id) {
|
if (!id) {
|
||||||
throw new ValidateException('id不能为空');
|
throw new ValidateException("id不能为空");
|
||||||
}
|
}
|
||||||
if (!userId) {
|
if (!userId) {
|
||||||
throw new ValidateException('userId不能为空');
|
throw new ValidateException("userId不能为空");
|
||||||
}
|
}
|
||||||
await this.repository.update(
|
await this.repository.update(
|
||||||
{
|
{
|
||||||
@@ -191,7 +150,7 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
addonType
|
addonType
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
isDefault: false,
|
isDefault: false
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
await this.repository.update(
|
await this.repository.update(
|
||||||
@@ -201,22 +160,22 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
addonType
|
addonType
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
isDefault: true,
|
isDefault: true
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getOrCreateDefault(opts:{addonType:string,type:string, inputs: any, userId: any}) {
|
async getOrCreateDefault(opts: { addonType: string, type: string, inputs: any, userId: any }) {
|
||||||
const {addonType,type,inputs,userId} = opts;
|
const { addonType, type, inputs, userId } = opts;
|
||||||
|
|
||||||
const addonDefine = this.getDefineByType( type,addonType)
|
const addonDefine = this.getDefineByType(type, addonType);
|
||||||
|
|
||||||
const defaultConfig = await this.getDefault(userId,addonType);
|
const defaultConfig = await this.getDefault(userId, addonType);
|
||||||
if (defaultConfig) {
|
if (defaultConfig) {
|
||||||
return defaultConfig;
|
return defaultConfig;
|
||||||
}
|
}
|
||||||
const setting = {
|
const setting = {
|
||||||
...inputs,
|
...inputs
|
||||||
};
|
};
|
||||||
const res = await this.repository.save({
|
const res = await this.repository.save({
|
||||||
userId,
|
userId,
|
||||||
@@ -224,7 +183,7 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
type: type,
|
type: type,
|
||||||
name: addonDefine.title,
|
name: addonDefine.title,
|
||||||
setting: JSON.stringify(setting),
|
setting: JSON.stringify(setting),
|
||||||
isDefault: true,
|
isDefault: true
|
||||||
});
|
});
|
||||||
return this.buildAddonInstanceConfig(res);
|
return this.buildAddonInstanceConfig(res);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
import { IAccessService } from '@certd/pipeline';
|
|
||||||
import { AddonService } from './addon-service.js';
|
|
||||||
|
|
||||||
export class AddonSysGetter implements IAccessService {
|
|
||||||
addonService: AddonService;
|
|
||||||
constructor(addonService: AddonService) {
|
|
||||||
this.addonService = addonService;
|
|
||||||
}
|
|
||||||
|
|
||||||
async getById<T = any>(id: any) {
|
|
||||||
return await this.addonService.getById(id, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
async getCommonById<T = any>(id: any) {
|
|
||||||
return await this.addonService.getById(id, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -3,6 +3,38 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
||||||
|
|
||||||
**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.36.22",
|
"version": "1.37.4",
|
||||||
"description": "midway with flyway, sql upgrade way ",
|
"description": "midway with flyway, sql upgrade way ",
|
||||||
"private": false,
|
"private": false,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -25,9 +25,9 @@
|
|||||||
],
|
],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@midwayjs/core": "~3.20.3",
|
"@midwayjs/core": "3.20.11",
|
||||||
"@midwayjs/logger": "~3.4.2",
|
"@midwayjs/logger": "3.4.2",
|
||||||
"@midwayjs/typeorm": "~3.20.3",
|
"@midwayjs/typeorm": "3.20.11",
|
||||||
"better-sqlite3": "^11.1.2"
|
"better-sqlite3": "^11.1.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -46,5 +46,5 @@
|
|||||||
"typeorm": "^0.3.11",
|
"typeorm": "^0.3.11",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
|
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,50 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复lego模式下 私钥加密类型错误的bug ([f7cf7c1](https://github.com/certd/certd/commit/f7cf7c198d7f77b222099770f81accc637bc6619))
|
||||||
|
|
||||||
|
## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复并发情况下证书申请日志混乱的bug ([bb2714f](https://github.com/certd/certd/commit/bb2714ff241f9db4a71d805b23a1b0f9f2f6413a))
|
||||||
|
|
||||||
|
## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 证书监控支持设置证书即将过期天数 ([cd35568](https://github.com/certd/certd/commit/cd35568e042e6ab928685efad51cdbed823d2d4f))
|
||||||
|
* 支持新网代理方式 ([f612509](https://github.com/certd/certd/commit/f612509cac87b859e81a7a52fe94b2eaccad22f9))
|
||||||
|
|
||||||
|
## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* cname主域名校验提示优化,显示不一致的两方便于排查问题 ([6ebb365](https://github.com/certd/certd/commit/6ebb3659f42155e4e8da600c493fb5227cd08137))
|
||||||
|
|
||||||
|
# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 手动上传证书优化,增加到期前报错提醒 ([3d42bfd](https://github.com/certd/certd/commit/3d42bfd479eaacc4a49c401224815a6e2a0204b0))
|
||||||
|
* 支持腾讯云验证码 ([03f317f](https://github.com/certd/certd/commit/03f317ffdb6595ce70e8a2302b05f390c52110c8))
|
||||||
|
|
||||||
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/plugin-cert",
|
"name": "@certd/plugin-cert",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.36.22",
|
"version": "1.37.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
@@ -13,13 +13,14 @@
|
|||||||
"build3": "rollup -c",
|
"build3": "rollup -c",
|
||||||
"build2": "vue-tsc --noEmit && vite build",
|
"build2": "vue-tsc --noEmit && vite build",
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
"pub": "npm publish"
|
"pub": "npm publish",
|
||||||
|
"compile": "tsc --skipLibCheck --watch"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/acme-client": "^1.36.22",
|
"@certd/acme-client": "^1.37.4",
|
||||||
"@certd/basic": "^1.36.22",
|
"@certd/basic": "^1.37.4",
|
||||||
"@certd/pipeline": "^1.36.22",
|
"@certd/pipeline": "^1.37.4",
|
||||||
"@certd/plugin-lib": "^1.36.22",
|
"@certd/plugin-lib": "^1.37.4",
|
||||||
"@google-cloud/publicca": "^1.3.0",
|
"@google-cloud/publicca": "^1.3.0",
|
||||||
"dayjs": "^1.11.7",
|
"dayjs": "^1.11.7",
|
||||||
"jszip": "^3.10.1",
|
"jszip": "^3.10.1",
|
||||||
@@ -31,7 +32,6 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/chai": "^4.3.3",
|
"@types/chai": "^4.3.3",
|
||||||
"@types/mocha": "^10.0.0",
|
"@types/mocha": "^10.0.0",
|
||||||
"@types/psl": "^1.1.3",
|
|
||||||
"@typescript-eslint/eslint-plugin": "^8.26.1",
|
"@typescript-eslint/eslint-plugin": "^8.26.1",
|
||||||
"@typescript-eslint/parser": "^8.26.1",
|
"@typescript-eslint/parser": "^8.26.1",
|
||||||
"chai": "^4.3.6",
|
"chai": "^4.3.6",
|
||||||
@@ -43,5 +43,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
|
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,3 +2,4 @@ export * from "./api.js";
|
|||||||
export * from "./registry.js";
|
export * from "./registry.js";
|
||||||
export * from "./decorator.js";
|
export * from "./decorator.js";
|
||||||
export * from "./base.js";
|
export * from "./base.js";
|
||||||
|
export * from "./domain-parser.js";
|
||||||
|
|||||||
@@ -82,9 +82,9 @@ export class AcmeService {
|
|||||||
this.sslProvider = options.sslProvider || "letsencrypt";
|
this.sslProvider = options.sslProvider || "letsencrypt";
|
||||||
this.eab = options.eab;
|
this.eab = options.eab;
|
||||||
this.skipLocalVerify = options.skipLocalVerify ?? false;
|
this.skipLocalVerify = options.skipLocalVerify ?? false;
|
||||||
acme.setLogger((message: any, ...args: any[]) => {
|
// acme.setLogger((message: any, ...args: any[]) => {
|
||||||
this.logger.info(message, ...args);
|
// this.logger.info(message, ...args);
|
||||||
});
|
// });
|
||||||
}
|
}
|
||||||
|
|
||||||
async getAccountConfig(email: string, urlMapping: UrlMapping): Promise<any> {
|
async getAccountConfig(email: string, urlMapping: UrlMapping): Promise<any> {
|
||||||
@@ -155,6 +155,7 @@ export class AcmeService {
|
|||||||
backoffMax: 10000,
|
backoffMax: 10000,
|
||||||
urlMapping,
|
urlMapping,
|
||||||
signal: this.options.signal,
|
signal: this.options.signal,
|
||||||
|
logger: this.logger,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (conf.accountUrl == null) {
|
if (conf.accountUrl == null) {
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import dayjs from "dayjs";
|
|||||||
|
|
||||||
export { CertReader };
|
export { CertReader };
|
||||||
export type { CertInfo };
|
export type { CertInfo };
|
||||||
|
|
||||||
@IsTaskPlugin({
|
@IsTaskPlugin({
|
||||||
name: "CertApplyUpload",
|
name: "CertApplyUpload",
|
||||||
icon: "ph:certificate",
|
icon: "ph:certificate",
|
||||||
@@ -62,6 +63,19 @@ export type { CertInfo };
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
export class CertApplyUploadPlugin extends CertApplyBaseConvertPlugin {
|
export class CertApplyUploadPlugin extends CertApplyBaseConvertPlugin {
|
||||||
|
@TaskInput({
|
||||||
|
title: "过期前提醒",
|
||||||
|
value: 10,
|
||||||
|
component: {
|
||||||
|
name: "a-input-number",
|
||||||
|
vModel: "value",
|
||||||
|
},
|
||||||
|
required: true,
|
||||||
|
order: 100,
|
||||||
|
helper: "到期前多少天提醒",
|
||||||
|
})
|
||||||
|
renewDays!: number;
|
||||||
|
|
||||||
@TaskInput({
|
@TaskInput({
|
||||||
title: "手动上传证书",
|
title: "手动上传证书",
|
||||||
component: {
|
component: {
|
||||||
@@ -97,6 +111,7 @@ export class CertApplyUploadPlugin extends CertApplyBaseConvertPlugin {
|
|||||||
this.userContext = this.ctx.userContext;
|
this.userContext = this.ctx.userContext;
|
||||||
this.lastStatus = this.ctx.lastStatus as Step;
|
this.lastStatus = this.ctx.lastStatus as Step;
|
||||||
}
|
}
|
||||||
|
|
||||||
async onInit(): Promise<void> {}
|
async onInit(): Promise<void> {}
|
||||||
|
|
||||||
async getCertFromStore() {
|
async getCertFromStore() {
|
||||||
@@ -107,48 +122,54 @@ export class CertApplyUploadPlugin extends CertApplyBaseConvertPlugin {
|
|||||||
} catch (e) {
|
} catch (e) {
|
||||||
this.logger.warn("读取cert失败:", e);
|
this.logger.warn("读取cert失败:", e);
|
||||||
}
|
}
|
||||||
if (certReader == null) {
|
|
||||||
certReader = new CertReader(this.uploadCert);
|
|
||||||
}
|
|
||||||
if (!certReader.expires || certReader.expires < new Date().getTime()) {
|
|
||||||
throw new Error("证书已过期,停止部署,请重新上传证书");
|
|
||||||
}
|
|
||||||
|
|
||||||
return certReader;
|
return certReader;
|
||||||
}
|
}
|
||||||
|
|
||||||
async execute(): Promise<string | void> {
|
private checkExpires(certReader: CertReader) {
|
||||||
let certReader = await this.getCertFromStore();
|
const renewDays = (this.renewDays ?? 10) * 24 * 60 * 60 * 1000;
|
||||||
const crtMd5 = this.ctx.utils.hash.md5(certReader.cert.crt);
|
if (certReader.expires) {
|
||||||
|
if (certReader.expires < new Date().getTime()) {
|
||||||
const leftDays = dayjs(certReader.expires).diff(dayjs(), "day");
|
throw new Error("证书已过期,停止部署,请尽快上传新证书");
|
||||||
this.logger.info(`证书过期时间${dayjs(certReader.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${leftDays}天`);
|
}
|
||||||
|
if (certReader.expires < new Date().getTime() + renewDays) {
|
||||||
if (!this.ctx.inputChanged) {
|
throw new Error("证书即将已过期,停止部署,请尽快上传新证书");
|
||||||
this.logger.info("输入参数无变化");
|
}
|
||||||
const lastCrtMd5 = this.lastStatus?.status?.output?.certMd5;
|
}
|
||||||
this.logger.info("证书MD5", crtMd5);
|
}
|
||||||
this.logger.info("上次证书MD5", lastCrtMd5);
|
|
||||||
if (lastCrtMd5 === crtMd5) {
|
async execute(): Promise<string | void> {
|
||||||
this.logger.info("证书无变化,跳过");
|
const oldCertReader = await this.getCertFromStore();
|
||||||
//输出证书MD5
|
if (oldCertReader) {
|
||||||
this.certMd5 = crtMd5;
|
const leftDays = dayjs(oldCertReader.expires).diff(dayjs(), "day");
|
||||||
await this.output(certReader, false);
|
this.logger.info(`证书过期时间${dayjs(oldCertReader.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${leftDays}天`);
|
||||||
return "skip";
|
this.checkExpires(oldCertReader);
|
||||||
|
if (!this.ctx.inputChanged) {
|
||||||
|
this.logger.info("输入参数无变化");
|
||||||
|
const lastCrtMd5 = this.lastStatus?.status?.output?.certMd5;
|
||||||
|
const newCrtMd5 = this.ctx.utils.hash.md5(this.uploadCert.crt);
|
||||||
|
this.logger.info("证书MD5", newCrtMd5);
|
||||||
|
this.logger.info("上次证书MD5", lastCrtMd5);
|
||||||
|
if (lastCrtMd5 === newCrtMd5) {
|
||||||
|
this.logger.info("证书无变化,跳过");
|
||||||
|
//输出证书MD5
|
||||||
|
this.certMd5 = newCrtMd5;
|
||||||
|
await this.output(oldCertReader, false);
|
||||||
|
return "skip";
|
||||||
|
}
|
||||||
|
this.logger.info("证书有变化,重新部署");
|
||||||
|
} else {
|
||||||
|
this.logger.info("输入参数有变化,重新部署");
|
||||||
}
|
}
|
||||||
this.logger.info("证书有变化,重新部署");
|
|
||||||
} else {
|
|
||||||
this.logger.info("输入参数有变化,重新部署");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
certReader = new CertReader(this.uploadCert);
|
const newCertReader = new CertReader(this.uploadCert);
|
||||||
this.clearLastStatus();
|
this.clearLastStatus();
|
||||||
//输出证书MD5
|
//输出证书MD5
|
||||||
this.certMd5 = this.ctx.utils.hash.md5(certReader.cert.crt);
|
this.certMd5 = this.ctx.utils.hash.md5(newCertReader.cert.crt);
|
||||||
const newLeftDays = dayjs(certReader.expires).diff(dayjs(), "day");
|
const newLeftDays = dayjs(newCertReader.expires).diff(dayjs(), "day");
|
||||||
this.logger.info(`新证书过期时间${dayjs(certReader.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${newLeftDays}天`);
|
this.logger.info(`新证书过期时间${dayjs(newCertReader.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${newLeftDays}天`);
|
||||||
|
this.checkExpires(newCertReader);
|
||||||
await this.output(certReader, true);
|
await this.output(newCertReader, true);
|
||||||
|
|
||||||
//必须output之后执行
|
//必须output之后执行
|
||||||
await this.emitCertApplySuccess();
|
await this.emitCertApplySuccess();
|
||||||
|
|||||||
@@ -117,11 +117,11 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
|
|||||||
],
|
],
|
||||||
},
|
},
|
||||||
required: true,
|
required: true,
|
||||||
helper: `1. <b>DNS直接验证</b>:域名dns解析是在阿里云/腾讯云/华为云/CF/NameSilo/西数/火山/dns.la/京东云/51dns的,选它
|
helper: `1. <b>DNS直接验证</b>:当域名dns解析已被本系统支持时(即下方DNS解析服务商选项中可选),推荐选择此方式
|
||||||
2. <b>CNAME代理验证</b>:支持任何注册商的域名,第一次需要手动添加[CNAME记录](#/certd/cname/record)(建议将DNS服务器修改为阿里云/腾讯云的,然后使用DNS直接验证)
|
2. <b>CNAME代理验证</b>:支持任何注册商的域名,第一次需要手动添加[CNAME记录](#/certd/cname/record)(如果经常申请失败,建议将DNS服务器修改为阿里云/腾讯云的,然后使用DNS直接验证)
|
||||||
3. <b>HTTP文件验证</b>:不支持泛域名,需要配置网站文件上传
|
3. <b>HTTP文件验证</b>:不支持泛域名,需要配置网站文件上传
|
||||||
4. <b>多DNS提供商</b>:每个域名可以选择独立的DNS提供商
|
4. <b>多DNS提供商</b>:每个域名可以选择独立的DNS提供商
|
||||||
5. <b>自动匹配</b>:需要在[域名管理](#/certd/cert/domain)中事先配置好校验方式
|
5. <b>自动匹配</b>:此处无需选择校验方式,需要在[域名管理](#/certd/cert/domain)中提前配置好校验方式
|
||||||
`,
|
`,
|
||||||
})
|
})
|
||||||
challengeType!: string;
|
challengeType!: string;
|
||||||
@@ -133,9 +133,9 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
|
|||||||
name: "icon-select",
|
name: "icon-select",
|
||||||
vModel: "value",
|
vModel: "value",
|
||||||
options: [
|
options: [
|
||||||
{ value: "letsencrypt", label: "Let's Encrypt", icon: "simple-icons:letsencrypt" },
|
{ value: "letsencrypt", label: "Let's Encrypt(免费,新手推荐)", icon: "simple-icons:letsencrypt" },
|
||||||
{ value: "google", label: "Google", icon: "flat-color-icons:google" },
|
{ value: "google", label: "Google(免费)", icon: "flat-color-icons:google" },
|
||||||
{ value: "zerossl", label: "ZeroSSL", icon: "emojione:digit-zero" },
|
{ value: "zerossl", label: "ZeroSSL(免费)", icon: "emojione:digit-zero" },
|
||||||
{ value: "sslcom", label: "SSL.com(仅主域名和www免费)", icon: "la:expeditedssl" },
|
{ value: "sslcom", label: "SSL.com(仅主域名和www免费)", icon: "la:expeditedssl" },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
@@ -541,7 +541,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
|
|||||||
const mainDomain = await domainParser.parse(domain);
|
const mainDomain = await domainParser.parse(domain);
|
||||||
const planSetting: DomainVerifyPlanInput = verifyPlanSetting[mainDomain];
|
const planSetting: DomainVerifyPlanInput = verifyPlanSetting[mainDomain];
|
||||||
if (planSetting == null) {
|
if (planSetting == null) {
|
||||||
throw new Error(`没有找到域名(${domain})的校验计划`);
|
throw new Error(`没有找到域名(${domain})的校验计划(如果您在流水线创建之后设置了子域名托管,需要重新编辑证书申请任务和重新校验cname记录的校验状态)`);
|
||||||
}
|
}
|
||||||
if (planSetting.type === "dns") {
|
if (planSetting.type === "dns") {
|
||||||
plan[domain] = await this.createDnsDomainVerifyPlan(planSetting, domain, mainDomain);
|
plan[domain] = await this.createDnsDomainVerifyPlan(planSetting, domain, mainDomain);
|
||||||
@@ -630,10 +630,20 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
|
|||||||
if (cnameRecord == null) {
|
if (cnameRecord == null) {
|
||||||
throw new Error(`请先配置${domain}的CNAME记录,并通过校验`);
|
throw new Error(`请先配置${domain}的CNAME记录,并通过校验`);
|
||||||
}
|
}
|
||||||
|
if (cnameRecord.status !== "valid") {
|
||||||
|
throw new Error(`CNAME记录${domain}的校验状态为${cnameRecord.status},请等待校验通过`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 主域名异常
|
||||||
|
if (cnameRecord.mainDomain && mainDomain && cnameRecord.mainDomain !== mainDomain) {
|
||||||
|
throw new Error(`CNAME记录${domain}的域名与配置的主域名不一致(${cnameRecord.mainDomain}≠${mainDomain}),请确认是否在流水线创建之后修改了子域名托管,您需要重新校验CNAME记录的校验状态`);
|
||||||
|
}
|
||||||
|
|
||||||
let dnsProvider = cnameRecord.commonDnsProvider;
|
let dnsProvider = cnameRecord.commonDnsProvider;
|
||||||
if (cnameRecord.cnameProvider.id > 0) {
|
if (cnameRecord.cnameProvider.id > 0) {
|
||||||
dnsProvider = await this.createDnsProvider(cnameRecord.cnameProvider.dnsProviderType, cnameRecord.cnameProvider.access);
|
dnsProvider = await this.createDnsProvider(cnameRecord.cnameProvider.dnsProviderType, cnameRecord.cnameProvider.access);
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
type: "cname",
|
type: "cname",
|
||||||
domain,
|
domain,
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ export class CertApplyLegoPlugin extends CertApplyBasePlugin {
|
|||||||
if (this.eab) {
|
if (this.eab) {
|
||||||
eabArgs = ` --eab --kid "${this.eab.kid}" --hmac "${this.eab.hmacKey}"`;
|
eabArgs = ` --eab --kid "${this.eab.kid}" --hmac "${this.eab.hmacKey}"`;
|
||||||
}
|
}
|
||||||
const keyType = `-k ${this.privateKeyType}`;
|
const keyType = `-k ${this.privateKeyType?.replaceAll("_", "")}`;
|
||||||
|
|
||||||
const saveDir = `./data/.lego/pipeline_${this.pipeline.id}/`;
|
const saveDir = `./data/.lego/pipeline_${this.pipeline.id}/`;
|
||||||
const savePathArgs = `--path "${saveDir}"`;
|
const savePathArgs = `--path "${saveDir}"`;
|
||||||
|
|||||||
@@ -3,6 +3,42 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* ssh 增加禁止-i参数提示 ([3a8931f](https://github.com/certd/certd/commit/3a8931feeffd7157163ff7d46b693e5e1a434b9c))
|
||||||
|
|
||||||
|
## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* dns解析支持阿里esa ([9291fa6](https://github.com/certd/certd/commit/9291fa68aa7a88a05c2f888bf3048df36a8fbde3))
|
||||||
|
|
||||||
|
# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
||||||
|
|
||||||
**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.36.22",
|
"version": "1.37.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
@@ -13,7 +13,8 @@
|
|||||||
"build3": "rollup -c",
|
"build3": "rollup -c",
|
||||||
"build2": "vue-tsc --noEmit && vite build",
|
"build2": "vue-tsc --noEmit && vite build",
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
"pub": "npm publish"
|
"pub": "npm publish",
|
||||||
|
"compile": "tsc --skipLibCheck --watch"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@alicloud/openapi-client": "^0.4.14",
|
"@alicloud/openapi-client": "^0.4.14",
|
||||||
@@ -21,8 +22,8 @@
|
|||||||
"@alicloud/pop-core": "^1.7.10",
|
"@alicloud/pop-core": "^1.7.10",
|
||||||
"@alicloud/tea-util": "^1.4.10",
|
"@alicloud/tea-util": "^1.4.10",
|
||||||
"@aws-sdk/client-s3": "^3.787.0",
|
"@aws-sdk/client-s3": "^3.787.0",
|
||||||
"@certd/basic": "^1.36.22",
|
"@certd/basic": "^1.37.4",
|
||||||
"@certd/pipeline": "^1.36.22",
|
"@certd/pipeline": "^1.37.4",
|
||||||
"@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",
|
||||||
@@ -41,7 +42,6 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/chai": "^4.3.3",
|
"@types/chai": "^4.3.3",
|
||||||
"@types/mocha": "^10.0.0",
|
"@types/mocha": "^10.0.0",
|
||||||
"@types/psl": "^1.1.3",
|
|
||||||
"@typescript-eslint/eslint-plugin": "^8.26.1",
|
"@typescript-eslint/eslint-plugin": "^8.26.1",
|
||||||
"@typescript-eslint/parser": "^8.26.1",
|
"@typescript-eslint/parser": "^8.26.1",
|
||||||
"chai": "^4.3.6",
|
"chai": "^4.3.6",
|
||||||
@@ -53,5 +53,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
|
"gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,45 @@
|
|||||||
|
import { AccessInput, BaseAccess, IsAccess } from "@certd/pipeline";
|
||||||
|
|
||||||
|
@IsAccess({
|
||||||
|
name: "aliesa",
|
||||||
|
title: "阿里云ESA授权",
|
||||||
|
desc: "",
|
||||||
|
icon: "ant-design:aliyun-outlined",
|
||||||
|
order: 0,
|
||||||
|
})
|
||||||
|
export class AliesaAccess extends BaseAccess {
|
||||||
|
@AccessInput({
|
||||||
|
title: "阿里云授权",
|
||||||
|
component: {
|
||||||
|
name: "access-selector",
|
||||||
|
vModel: "modelValue",
|
||||||
|
type: "aliyun",
|
||||||
|
},
|
||||||
|
helper: "请选择阿里云授权",
|
||||||
|
required: true,
|
||||||
|
})
|
||||||
|
accessId = "";
|
||||||
|
|
||||||
|
@AccessInput({
|
||||||
|
title: "地区",
|
||||||
|
component: {
|
||||||
|
name: "a-select",
|
||||||
|
vModel: "value",
|
||||||
|
options: [
|
||||||
|
{
|
||||||
|
label: "杭州",
|
||||||
|
value: "cn-hangzhou",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "新加坡",
|
||||||
|
value: "ap-southeast-1",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
helper: "请选择ESA地区",
|
||||||
|
required: true,
|
||||||
|
})
|
||||||
|
region = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
new AliesaAccess();
|
||||||
@@ -1,2 +1,3 @@
|
|||||||
export * from "./aliyun-access.js";
|
export * from "./aliyun-access.js";
|
||||||
export * from "./alioss-access.js";
|
export * from "./alioss-access.js";
|
||||||
|
export * from "./aliesa-access.js";
|
||||||
|
|||||||
@@ -7,4 +7,4 @@ export * from "./qiniu/index.js";
|
|||||||
export * from "./ctyun/index.js";
|
export * from "./ctyun/index.js";
|
||||||
export * from "./oss/index.js";
|
export * from "./oss/index.js";
|
||||||
export * from "./s3/index.js";
|
export * from "./s3/index.js";
|
||||||
export * from "./lib/index.js";
|
export * from "./lib/index.js";
|
||||||
@@ -188,6 +188,11 @@ export class AsyncSsh2Client {
|
|||||||
// script += "\r\nexit\r\n";
|
// script += "\r\nexit\r\n";
|
||||||
// //保证windows下正常退出
|
// //保证windows下正常退出
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
if (script.includes(" -i ")) {
|
||||||
|
this.logger.warn("不支持交互式命令,请不要使用-i参数");
|
||||||
|
}
|
||||||
|
|
||||||
return safePromise((resolve, reject) => {
|
return safePromise((resolve, reject) => {
|
||||||
this.logger.info(`执行命令:[${this.connConf.host}][exec]: \n` + script);
|
this.logger.info(`执行命令:[${this.connConf.host}][exec]: \n` + script);
|
||||||
// pty 伪终端,window下的输出会带上conhost.exe之类的多余的字符串,影响返回结果判断
|
// pty 伪终端,window下的输出会带上conhost.exe之类的多余的字符串,影响返回结果判断
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ RUN cp /workspace/certd-client/dist/* /workspace/certd-server/public/ -rf
|
|||||||
RUN cd /workspace/certd-server && pnpm install && npm run build-on-docker
|
RUN cd /workspace/certd-server && pnpm install && npm run build-on-docker
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
FROM node:22-alpine
|
FROM node:22-alpine
|
||||||
EXPOSE 7001
|
EXPOSE 7001
|
||||||
EXPOSE 7002
|
EXPOSE 7002
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
#登录与权限开启
|
||||||
|
VITE_APP_PM_ENABLED=false
|
||||||
@@ -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.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复站点证书监控复制按钮无效的bug ([efa26a0](https://github.com/certd/certd/commit/efa26a067f06402f30befc016d9934cadcd5a563))
|
||||||
|
|
||||||
|
## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 注册页面增加手机注册tab页签 ([6b2f1fc](https://github.com/certd/certd/commit/6b2f1fcd3e058061b814c3331cda8ce1b2d80d73))
|
||||||
|
* 流水线创建时支持添加到证书监控 ([59ba408](https://github.com/certd/certd/commit/59ba4080706548828ef1c0a9cd893c1c9a7d591f))
|
||||||
|
* 流水线支持有效期设置 ([911e69e](https://github.com/certd/certd/commit/911e69e3bc0cdd48b62953b5d0981d640fc1f8ac))
|
||||||
|
* 站点证书监控增加导出和分组功能 ([2ed12c4](https://github.com/certd/certd/commit/2ed12c429eb58274a4f9dd0ed3b66e160d283ded))
|
||||||
|
* 证书监控增加批量删除 ([e578c52](https://github.com/certd/certd/commit/e578c52fdf2f838038062aa4209b655fbae461fb))
|
||||||
|
|
||||||
|
## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 证书监控支持设置证书即将过期天数 ([cd35568](https://github.com/certd/certd/commit/cd35568e042e6ab928685efad51cdbed823d2d4f))
|
||||||
|
* 支持网络测试 ([2bef608](https://github.com/certd/certd/commit/2bef608e07ceb56d52007f290667e0afef401b22))
|
||||||
|
|
||||||
|
## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复版本比较bug ([109696e](https://github.com/certd/certd/commit/109696e965d68c50c8627ffd40203edd1d2daea5))
|
||||||
|
|
||||||
|
# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/ui-client
|
||||||
|
|
||||||
|
## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/ui-client
|
||||||
|
|
||||||
|
## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/ui-client
|
||||||
|
|
||||||
|
## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 授权页面,id列位置不在第一列的bug ([3f1722d](https://github.com/certd/certd/commit/3f1722d54debcb4849dc14521a2da0d9b304b69f))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 动态加载验证码script ([dcc396a](https://github.com/certd/certd/commit/dcc396afb7a23aeb8af57c01014b09af5f033e61))
|
||||||
|
* 验证码支持测试,登录验证码需要测试通过后才能开启 ([83e6476](https://github.com/certd/certd/commit/83e6476408090b741fabb1b542fb458d9a8b4134))
|
||||||
|
|
||||||
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<script type="module" src="/src/main.ts"></script>
|
<script type="module" src="/src/main.ts"></script>
|
||||||
<script src="https://static.geetest.com/v4/gt4.js"></script>
|
<!--<script src="https://static.geetest.com/v4/gt4.js"></script>-->
|
||||||
|
<!--<script src="https://turing.captcha.qcloud.com/TJCaptcha.js"></script>-->
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/ui-client",
|
"name": "@certd/ui-client",
|
||||||
"version": "1.36.22",
|
"version": "1.37.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite --open",
|
"dev": "vite --open",
|
||||||
"dev:pm": "vite --mode pm",
|
"dev:pm": "vite --mode pm",
|
||||||
"dev:force": "vite --force",
|
"dev:force": "vite --force",
|
||||||
|
"remote": "vite --mode remote --open",
|
||||||
"debug": "vite --mode debug --open",
|
"debug": "vite --mode debug --open",
|
||||||
"debug:pm": "vite --mode debugpm",
|
"debug:pm": "vite --mode debugpm",
|
||||||
"debug:force": "vite --force --mode debug",
|
"debug:force": "vite --force --mode debug",
|
||||||
@@ -32,11 +33,11 @@
|
|||||||
"@aws-sdk/s3-request-presigner": "^3.535.0",
|
"@aws-sdk/s3-request-presigner": "^3.535.0",
|
||||||
"@certd/vue-js-cron-light": "^4.0.14",
|
"@certd/vue-js-cron-light": "^4.0.14",
|
||||||
"@ctrl/tinycolor": "^4.1.0",
|
"@ctrl/tinycolor": "^4.1.0",
|
||||||
"@fast-crud/editor-code": "^1.26.6",
|
"@fast-crud/editor-code": "^1.27.4",
|
||||||
"@fast-crud/fast-crud": "^1.26.6",
|
"@fast-crud/fast-crud": "^1.27.4",
|
||||||
"@fast-crud/fast-extends": "^1.26.6",
|
"@fast-crud/fast-extends": "^1.27.4",
|
||||||
"@fast-crud/ui-antdv4": "^1.26.6",
|
"@fast-crud/ui-antdv4": "^1.27.4",
|
||||||
"@fast-crud/ui-interface": "^1.26.6",
|
"@fast-crud/ui-interface": "^1.27.4",
|
||||||
"@iconify/tailwind": "^1.2.0",
|
"@iconify/tailwind": "^1.2.0",
|
||||||
"@iconify/vue": "^4.1.1",
|
"@iconify/vue": "^4.1.1",
|
||||||
"@manypkg/get-packages": "^2.2.2",
|
"@manypkg/get-packages": "^2.2.2",
|
||||||
@@ -97,6 +98,7 @@
|
|||||||
"vue-cropperjs": "^5.0.0",
|
"vue-cropperjs": "^5.0.0",
|
||||||
"vue-echarts": "^7.0.3",
|
"vue-echarts": "^7.0.3",
|
||||||
"vue-i18n": "^9.10.2",
|
"vue-i18n": "^9.10.2",
|
||||||
|
"vue-plugin-load-script": "2.1.1",
|
||||||
"vue-router": "^4.3.0",
|
"vue-router": "^4.3.0",
|
||||||
"vuedraggable": "^4.1.0",
|
"vuedraggable": "^4.1.0",
|
||||||
"watermark-js-plus": "^1.5.8",
|
"watermark-js-plus": "^1.5.8",
|
||||||
@@ -104,8 +106,8 @@
|
|||||||
"zod-defaults": "^0.1.3"
|
"zod-defaults": "^0.1.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@certd/lib-iframe": "^1.36.22",
|
"@certd/lib-iframe": "^1.37.4",
|
||||||
"@certd/pipeline": "^1.36.22",
|
"@certd/pipeline": "^1.37.4",
|
||||||
"@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",
|
||||||
|
|||||||
@@ -12,6 +12,14 @@ const props = defineProps({
|
|||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({}),
|
default: () => ({}),
|
||||||
},
|
},
|
||||||
|
type: {
|
||||||
|
type: String,
|
||||||
|
default: "image",
|
||||||
|
},
|
||||||
|
addonId: {
|
||||||
|
type: Number,
|
||||||
|
default: 0,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
const captchaRef = ref(null);
|
const captchaRef = ref(null);
|
||||||
const settingStore = useSettingStore();
|
const settingStore = useSettingStore();
|
||||||
@@ -23,7 +31,7 @@ const captchaAddonId = computed(() => {
|
|||||||
return settingStore.sysPublic.captchaAddonId ?? 0;
|
return settingStore.sysPublic.captchaAddonId ?? 0;
|
||||||
});
|
});
|
||||||
const captchaComponent = computed(() => {
|
const captchaComponent = computed(() => {
|
||||||
let type: any = "image";
|
let type: any = props.type ?? "image";
|
||||||
if (settingStore.sysPublic.captchaAddonId && settingStore.sysPublic.captchaType) {
|
if (settingStore.sysPublic.captchaAddonId && settingStore.sysPublic.captchaType) {
|
||||||
type = settingStore.sysPublic.captchaType;
|
type = settingStore.sysPublic.captchaType;
|
||||||
}
|
}
|
||||||
@@ -48,10 +56,10 @@ function onChange(data: any) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function getCaptchaForm() {
|
async function getCaptchaForm() {
|
||||||
return await captchaRef.value.getCaptchaForm();
|
return await captchaRef.value?.getCaptchaForm();
|
||||||
}
|
}
|
||||||
async function reset() {
|
async function reset() {
|
||||||
await captchaRef.value.reset();
|
await captchaRef.value?.reset();
|
||||||
}
|
}
|
||||||
defineExpose({
|
defineExpose({
|
||||||
getCaptchaForm,
|
getCaptchaForm,
|
||||||
|
|||||||
@@ -7,6 +7,14 @@ import { useSettingStore } from "/@/store/settings";
|
|||||||
import { request } from "/src/api/service";
|
import { request } from "/src/api/service";
|
||||||
import { notification } from "ant-design-vue";
|
import { notification } from "ant-design-vue";
|
||||||
|
|
||||||
|
import { loadScript } from "vue-plugin-load-script";
|
||||||
|
const loaded = ref(false);
|
||||||
|
async function loadCaptchaScript() {
|
||||||
|
// 加载验证码js
|
||||||
|
await loadScript("https://static.geetest.com/v4/gt4.js");
|
||||||
|
loaded.value = true;
|
||||||
|
}
|
||||||
|
|
||||||
defineOptions({
|
defineOptions({
|
||||||
name: "GeetestCaptcha",
|
name: "GeetestCaptcha",
|
||||||
});
|
});
|
||||||
@@ -16,15 +24,10 @@ const props = defineProps<{
|
|||||||
captchaGet: () => Promise<any>;
|
captchaGet: () => Promise<any>;
|
||||||
}>();
|
}>();
|
||||||
const captchaRef = ref(null);
|
const captchaRef = ref(null);
|
||||||
// const addonApi = createAddonApi();
|
|
||||||
const settingStore = useSettingStore();
|
|
||||||
|
|
||||||
const captchaInstanceRef: Ref = ref({});
|
const captchaInstanceRef: Ref = ref({});
|
||||||
async function init() {
|
async function init() {
|
||||||
// if (!initGeetest4) {
|
await loadCaptchaScript();
|
||||||
// await import("https://static.geetest.com/v4/gt4.js");
|
|
||||||
// }
|
|
||||||
|
|
||||||
const { captchaId } = await props.captchaGet();
|
const { captchaId } = await props.captchaGet();
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
initGeetest4(
|
initGeetest4(
|
||||||
|
|||||||
@@ -0,0 +1,233 @@
|
|||||||
|
<template>
|
||||||
|
<div ref="captchaRef" class="tencent_captcha_wrapper" :class="{ tencent_captcha_ok: modelValue }" @click="triggerCaptcha">
|
||||||
|
<div class="validation-box" :class="{ validated: modelValue != null }">
|
||||||
|
<div class="sweep-animation"></div>
|
||||||
|
<div class="box-content">
|
||||||
|
<div class="box-icon">✓</div>
|
||||||
|
<span v-if="modelValue == null" class="status-text">点击进行验证</span>
|
||||||
|
<span v-else class="status-text">验证成功</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { onMounted, defineProps, defineEmits, ref, onUnmounted, Ref, watch } from "vue";
|
||||||
|
import { notification } from "ant-design-vue";
|
||||||
|
|
||||||
|
import { loadScript } from "vue-plugin-load-script";
|
||||||
|
const loaded = ref(false);
|
||||||
|
async function loadCaptchaScript() {
|
||||||
|
// 加载验证码js
|
||||||
|
// var appid = "您的CaptchaAppId";
|
||||||
|
// loadScript("https://turing.captcha.qq.com/TJCaptcha.js?appid=" + appid);
|
||||||
|
await loadScript("https://turing.captcha.qcloud.com/TJCaptcha.js");
|
||||||
|
loaded.value = true;
|
||||||
|
}
|
||||||
|
loadCaptchaScript();
|
||||||
|
|
||||||
|
defineOptions({
|
||||||
|
name: "TencentCaptcha",
|
||||||
|
});
|
||||||
|
const emit = defineEmits(["update:modelValue", "change"]);
|
||||||
|
const props = defineProps<{
|
||||||
|
modelValue: any;
|
||||||
|
captchaGet: () => Promise<any>;
|
||||||
|
}>();
|
||||||
|
const captchaRef = ref(null);
|
||||||
|
|
||||||
|
const captchaInstanceRef: Ref = ref({});
|
||||||
|
|
||||||
|
// 定义回调函数
|
||||||
|
function callback(res: { ret: number; ticket: string; randstr: string; errorCode?: number; errorMessage?: string }) {
|
||||||
|
// 第一个参数传入回调结果,结果如下:
|
||||||
|
// ret Int 验证结果,0:验证成功。2:用户主动关闭验证码。
|
||||||
|
// ticket String 验证成功的票据,当且仅当 ret = 0 时 ticket 有值。
|
||||||
|
// CaptchaAppId String 验证码应用ID。
|
||||||
|
// bizState Any 自定义透传参数。
|
||||||
|
// randstr String 本次验证的随机串,后续票据校验时需传递该参数。
|
||||||
|
// verifyDuration Int 验证码校验接口耗时(ms)。
|
||||||
|
// actionDuration Int 操作校验成功耗时(用户动作+校验完成)(ms)。
|
||||||
|
// sid String 链路sid。
|
||||||
|
console.log("callback:", res);
|
||||||
|
// res(用户主动关闭验证码)= {ret: 2, ticket: null}
|
||||||
|
// res(验证成功) = {ret: 0, ticket: "String", randstr: "String"}
|
||||||
|
// res(请求验证码发生错误,验证码自动返回trerror_前缀的容灾票据) = {ret: 0, ticket: "String", randstr: "String", errorCode: Number, errorMessage: "String"}
|
||||||
|
// 此处代码仅为验证结果的展示示例,真实业务接入,建议基于ticket和errorCode情况做不同的业务处理
|
||||||
|
|
||||||
|
if (res.errorCode && res.errorCode > 0) {
|
||||||
|
notification.error({
|
||||||
|
message: `验证码验证失败:${res.errorMessage || res.errorCode}`,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (res.ret === 0) {
|
||||||
|
emitChange({
|
||||||
|
ticket: res.ticket,
|
||||||
|
randstr: res.randstr,
|
||||||
|
});
|
||||||
|
} else if (res.ret === 2) {
|
||||||
|
console.log("用户主动关闭验证码");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 定义验证码js加载错误处理函数
|
||||||
|
function loadErrorCallback(error: any) {
|
||||||
|
// var appid = "您的CaptchaAppId";
|
||||||
|
// // 生成容灾票据或自行做其它处理
|
||||||
|
// var ticket = "trerror_1001_" + appid + "_" + Math.floor(new Date().getTime() / 1000);
|
||||||
|
// callback({
|
||||||
|
// ret: 0,
|
||||||
|
// randstr: "@" + Math.random().toString(36).substr(2),
|
||||||
|
// ticket: ticket,
|
||||||
|
// errorCode: 1001,
|
||||||
|
// errorMessage: "jsload_error",
|
||||||
|
// });
|
||||||
|
notification.error({
|
||||||
|
message: `验证码加载失败:${error?.message || error}`,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
async function triggerCaptcha() {
|
||||||
|
if (!loaded.value) {
|
||||||
|
notification.error({
|
||||||
|
message: "验证码还未加载完成,请稍后再试",
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const { captchaAppId } = await props.captchaGet();
|
||||||
|
|
||||||
|
try {
|
||||||
|
// 生成一个验证码对象
|
||||||
|
// CaptchaAppId:登录验证码控制台,从【验证管理】页面进行查看。如果未创建过验证,请先新建验证。注意:不可使用客户端类型为小程序的CaptchaAppId,会导致数据统计错误。
|
||||||
|
//callback:定义的回调函数
|
||||||
|
// @ts-ignore
|
||||||
|
var captcha = new TencentCaptcha(captchaAppId + "", callback, {
|
||||||
|
userLanguage: "zh-cn",
|
||||||
|
// showFn: (ret: any) => {
|
||||||
|
// const {
|
||||||
|
// duration, // 验证码渲染完成的耗时(ms)
|
||||||
|
// sid, // 链路sid
|
||||||
|
// } = ret;
|
||||||
|
// },
|
||||||
|
});
|
||||||
|
// 调用方法,显示验证码
|
||||||
|
captcha.show();
|
||||||
|
} catch (error) {
|
||||||
|
// 加载异常,调用验证码js加载错误处理函数
|
||||||
|
loadErrorCallback(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function emitChange(value: any) {
|
||||||
|
emit("update:modelValue", value);
|
||||||
|
emit("change", value);
|
||||||
|
}
|
||||||
|
function reset() {
|
||||||
|
captchaInstanceRef.value?.instance?.reset();
|
||||||
|
}
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => {
|
||||||
|
return props.modelValue;
|
||||||
|
},
|
||||||
|
value => {
|
||||||
|
if (value == null) {
|
||||||
|
reset();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
defineExpose({
|
||||||
|
reset,
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
<style lang="less">
|
||||||
|
.tencent_captcha_wrapper {
|
||||||
|
.validation-box {
|
||||||
|
width: 100%;
|
||||||
|
height: 40px;
|
||||||
|
margin: 0 auto 30px;
|
||||||
|
border: 1px solid #ddd;
|
||||||
|
border-radius: 8px;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: all 0.3s ease;
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
background-color: #f9f9f9;
|
||||||
|
}
|
||||||
|
|
||||||
|
.validation-box:hover {
|
||||||
|
border-color: #aaa;
|
||||||
|
background-color: #f0f0f0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.validation-box.validated {
|
||||||
|
border-color: #4caf50;
|
||||||
|
background-color: #f1f8e9;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box-content {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
z-index: 2;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box-icon {
|
||||||
|
font-size: 18px;
|
||||||
|
color: #bbb;
|
||||||
|
margin-right: 15px;
|
||||||
|
transition: all 0.3s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.validation-box.validated .box-icon {
|
||||||
|
color: #4caf50;
|
||||||
|
}
|
||||||
|
|
||||||
|
.status-text {
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 500;
|
||||||
|
color: #888;
|
||||||
|
transition: all 0.3s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.validation-box.validated .status-text {
|
||||||
|
color: #4caf50;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 划过动画效果 */
|
||||||
|
.sweep-animation {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: -100%;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
background: linear-gradient(90deg, transparent, rgba(76, 175, 80, 0.2), transparent);
|
||||||
|
z-index: 1;
|
||||||
|
opacity: 0;
|
||||||
|
transition: opacity 0.3s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.validation-box.validated .sweep-animation {
|
||||||
|
animation: sweep 0.8s ease forwards;
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes sweep {
|
||||||
|
0% {
|
||||||
|
left: -100%;
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
left: 0;
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
left: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
+10
@@ -45,6 +45,16 @@ export async function DoVerify(id: number) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function ResetStatus(id: number) {
|
||||||
|
return await request({
|
||||||
|
url: apiPrefix + "/resetStatus",
|
||||||
|
method: "post",
|
||||||
|
data: {
|
||||||
|
id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
export async function ParseDomain(fullDomain: string) {
|
export async function ParseDomain(fullDomain: string) {
|
||||||
return await request({
|
return await request({
|
||||||
url: subDomainApiPrefix + "/parseDomain",
|
url: subDomainApiPrefix + "/parseDomain",
|
||||||
|
|||||||
+19
-1
@@ -16,6 +16,9 @@
|
|||||||
<a-tooltip v-if="cnameRecord.error" :title="cnameRecord.error">
|
<a-tooltip v-if="cnameRecord.error" :title="cnameRecord.error">
|
||||||
<fs-icon class="ml-5 color-red" icon="ion:warning-outline"></fs-icon>
|
<fs-icon class="ml-5 color-red" icon="ion:warning-outline"></fs-icon>
|
||||||
</a-tooltip>
|
</a-tooltip>
|
||||||
|
<a-tooltip v-if="cnameRecord.status === 'valid'" title="重置校验状态,重新校验">
|
||||||
|
<fs-icon class="ml-2 color-yellow text-md pointer" icon="solar:undo-left-square-bold" @click="resetStatus"></fs-icon>
|
||||||
|
</a-tooltip>
|
||||||
</td>
|
</td>
|
||||||
<td class="center">
|
<td class="center">
|
||||||
<template v-if="cnameRecord.status !== 'valid'">
|
<template v-if="cnameRecord.status !== 'valid'">
|
||||||
@@ -35,6 +38,7 @@ import { ref, watch } from "vue";
|
|||||||
import { dict } from "@fast-crud/fast-crud";
|
import { dict } from "@fast-crud/fast-crud";
|
||||||
import * as api from "./api.js";
|
import * as api from "./api.js";
|
||||||
import CnameTip from "./cname-tip.vue";
|
import CnameTip from "./cname-tip.vue";
|
||||||
|
import { Modal } from "ant-design-vue";
|
||||||
const statusDict = dict({
|
const statusDict = dict({
|
||||||
data: [
|
data: [
|
||||||
{ label: "待设置CNAME", value: "cname", color: "warning" },
|
{ label: "待设置CNAME", value: "cname", color: "warning" },
|
||||||
@@ -71,12 +75,15 @@ function onRecordChange() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function loadRecord() {
|
||||||
|
cnameRecord.value = await GetByDomain(props.domain);
|
||||||
|
}
|
||||||
let refreshIntervalId: any = null;
|
let refreshIntervalId: any = null;
|
||||||
async function doRefresh() {
|
async function doRefresh() {
|
||||||
if (!props.domain) {
|
if (!props.domain) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
cnameRecord.value = await GetByDomain(props.domain);
|
await loadRecord();
|
||||||
onRecordChange();
|
onRecordChange();
|
||||||
|
|
||||||
if (cnameRecord.value.status === "validating") {
|
if (cnameRecord.value.status === "validating") {
|
||||||
@@ -114,6 +121,17 @@ async function doVerify() {
|
|||||||
}
|
}
|
||||||
await doRefresh();
|
await doRefresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function resetStatus() {
|
||||||
|
Modal.confirm({
|
||||||
|
title: "重置状态",
|
||||||
|
content: "确定要重置校验状态吗?",
|
||||||
|
onOk: async () => {
|
||||||
|
await api.ResetStatus(cnameRecord.value.id);
|
||||||
|
await loadRecord();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="less">
|
<style lang="less">
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ export default {
|
|||||||
suiteBuy: "Suite Purchase",
|
suiteBuy: "Suite Purchase",
|
||||||
myTrade: "My Orders",
|
myTrade: "My Orders",
|
||||||
paymentReturn: "Payment Return",
|
paymentReturn: "Payment Return",
|
||||||
|
hasExpired: "Expired",
|
||||||
user: {
|
user: {
|
||||||
greeting: "Hello",
|
greeting: "Hello",
|
||||||
profile: "Account Info",
|
profile: "Account Info",
|
||||||
@@ -136,10 +137,16 @@ export default {
|
|||||||
triggerType: "Trigger Type",
|
triggerType: "Trigger Type",
|
||||||
pipelineId: "Pipeline Id",
|
pipelineId: "Pipeline Id",
|
||||||
},
|
},
|
||||||
|
|
||||||
|
pi: {
|
||||||
|
validTime: "Piepline Valid Time",
|
||||||
|
validTimeHelper: "Not filled in means permanent validity",
|
||||||
|
},
|
||||||
types: {
|
types: {
|
||||||
certApply: "Certificate Application",
|
certApply: "Cert Apply",
|
||||||
certUpload: "Certificate Upload",
|
certUpload: "Cert Upload",
|
||||||
custom: "Custom",
|
custom: "Custom",
|
||||||
|
template: "Template",
|
||||||
},
|
},
|
||||||
myPipelines: "My Pipelines",
|
myPipelines: "My Pipelines",
|
||||||
selectedCount: "Selected {count} items",
|
selectedCount: "Selected {count} items",
|
||||||
@@ -175,6 +182,7 @@ export default {
|
|||||||
suiteSetting: "Suite Settings",
|
suiteSetting: "Suite Settings",
|
||||||
orderManager: "Order Management",
|
orderManager: "Order Management",
|
||||||
userSuites: "User Suites",
|
userSuites: "User Suites",
|
||||||
|
netTest: "Network Test",
|
||||||
},
|
},
|
||||||
certificateRepo: {
|
certificateRepo: {
|
||||||
title: "Certificate Repository",
|
title: "Certificate Repository",
|
||||||
@@ -223,9 +231,13 @@ export default {
|
|||||||
notificationWhen: "Notification Timing",
|
notificationWhen: "Notification Timing",
|
||||||
notificationHelper: "Get real-time alerts when the task fails",
|
notificationHelper: "Get real-time alerts when the task fails",
|
||||||
groupIdTitle: "Pipeline Group",
|
groupIdTitle: "Pipeline Group",
|
||||||
|
|
||||||
|
addToMonitorEnabled: "Add to Cert Monitor",
|
||||||
|
addToMonitorDomains: "Add to Monitor Domains",
|
||||||
},
|
},
|
||||||
notificationDefault: "Use Default Notification",
|
notificationDefault: "Use Default Notification",
|
||||||
monitor: {
|
monitor: {
|
||||||
|
remark: "Remark",
|
||||||
title: "Site Certificate Monitoring",
|
title: "Site Certificate Monitoring",
|
||||||
description: "Check website certificates' expiration at 0:00 daily; reminders sent 10 days before expiration (using default notification channel);",
|
description: "Check website certificates' expiration at 0:00 daily; reminders sent 10 days before expiration (using default notification channel);",
|
||||||
settingLink: "Site Monitoring Settings",
|
settingLink: "Site Monitoring Settings",
|
||||||
@@ -247,6 +259,7 @@ export default {
|
|||||||
certDomains: "Certificate Domains",
|
certDomains: "Certificate Domains",
|
||||||
certProvider: "Issuer",
|
certProvider: "Issuer",
|
||||||
certStatus: "Certificate Status",
|
certStatus: "Certificate Status",
|
||||||
|
error: "Error",
|
||||||
status: {
|
status: {
|
||||||
ok: "Valid",
|
ok: "Valid",
|
||||||
expired: "Expired",
|
expired: "Expired",
|
||||||
@@ -280,6 +293,8 @@ export default {
|
|||||||
cronTrigger: "Scheduled trigger for monitoring",
|
cronTrigger: "Scheduled trigger for monitoring",
|
||||||
dnsServer: "DNS Server",
|
dnsServer: "DNS Server",
|
||||||
dnsServerHelper: "Use a custom domain name resolution server, such as: 1.1.1.1 , support multiple",
|
dnsServerHelper: "Use a custom domain name resolution server, such as: 1.1.1.1 , support multiple",
|
||||||
|
certValidDays: "Certificate Valid Days",
|
||||||
|
certValidDaysHelper: "Number of days before expiration to send a notification",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
checkStatus: {
|
checkStatus: {
|
||||||
@@ -289,7 +304,7 @@ export default {
|
|||||||
},
|
},
|
||||||
domainList: {
|
domainList: {
|
||||||
title: "Domain List",
|
title: "Domain List",
|
||||||
helper: "Format: domain:port:name, one per line. Port and name are optional.\nExamples:\nwww.baidu.com:443:Baidu\nwww.taobao.com::Taobao\nwww.google.com",
|
helper: "Format: domain:port:name:remark, one per line. Port and name are optional.\nExamples:\nwww.baidu.com:443:Baidu:remarkText\nwww.taobao.com::Taobao\nwww.google.com",
|
||||||
required: "Please enter domains to import",
|
required: "Please enter domains to import",
|
||||||
placeholder: "www.baidu.com:443:Baidu\nwww.taobao.com::Taobao\nwww.google.com\n",
|
placeholder: "www.baidu.com:443:Baidu\nwww.taobao.com::Taobao\nwww.google.com\n",
|
||||||
},
|
},
|
||||||
@@ -447,6 +462,7 @@ export default {
|
|||||||
description: "Description",
|
description: "Description",
|
||||||
createTime: "Creation Time",
|
createTime: "Creation Time",
|
||||||
updateTime: "Update Time",
|
updateTime: "Update Time",
|
||||||
|
mainDomain: "Main Domain",
|
||||||
edit: "Edit",
|
edit: "Edit",
|
||||||
groupName: "Group Name",
|
groupName: "Group Name",
|
||||||
enterGroupName: "Please enter group name",
|
enterGroupName: "Please enter group name",
|
||||||
@@ -715,19 +731,32 @@ export default {
|
|||||||
addonName: "Name",
|
addonName: "Name",
|
||||||
addonNameHelper: "Fill freely, helps to distinguish when multiple same type exist",
|
addonNameHelper: "Fill freely, helps to distinguish when multiple same type exist",
|
||||||
addonTypeSelect: "Select type",
|
addonTypeSelect: "Select type",
|
||||||
|
dates: {
|
||||||
|
years: "{count} years",
|
||||||
|
months: "{count} months",
|
||||||
|
},
|
||||||
sys: {
|
sys: {
|
||||||
setting: {
|
setting: {
|
||||||
|
baseSetting: "Base Settings",
|
||||||
|
registerSetting: "Register Settings",
|
||||||
|
safeSetting: "Safe Settings",
|
||||||
|
paymentSetting: "Payment Settings",
|
||||||
|
captchaSetting: "Captcha Setting",
|
||||||
|
pipelineSetting: "Pipeline 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",
|
||||||
|
|
||||||
captchaEnabled: "Enable Login Captcha",
|
captchaEnabled: "Enable Login Captcha",
|
||||||
captchaHelper: "Whether to enable captcha verification for login",
|
captchaHelper: "Whether to enable captcha verification for login",
|
||||||
captchaType: "Captcha Setting",
|
captchaType: "Captcha Setting",
|
||||||
|
captchaTest: "Captcha Test",
|
||||||
|
// 保存后再点击测试,请务必测试通过了,再开启登录验证码
|
||||||
|
captchaTestHelper: "Save and click test, please make sure the test is passed before enabling login captcha",
|
||||||
|
|
||||||
baseSetting: "Base Settings",
|
pipelineValidTimeEnabled: "Enable Pipeline Valid Time",
|
||||||
registerSetting: "Register Settings",
|
pipelineValidTimeEnabledHelper: "Whether to enable the valid time of the pipeline",
|
||||||
safeSetting: "Safe Settings",
|
certDomainAddToMonitorEnabled: "Add Domain to Certificate Monitor",
|
||||||
paymentSetting: "Payment Settings",
|
certDomainAddToMonitorEnabledHelper: "Whether to add the domain to the certificate monitor",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
modal: {
|
modal: {
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ export default {
|
|||||||
suiteBuy: "套餐购买",
|
suiteBuy: "套餐购买",
|
||||||
myTrade: "我的订单",
|
myTrade: "我的订单",
|
||||||
paymentReturn: "支付返回",
|
paymentReturn: "支付返回",
|
||||||
|
hasExpired: "已过期",
|
||||||
|
|
||||||
user: {
|
user: {
|
||||||
greeting: "您好",
|
greeting: "您好",
|
||||||
@@ -142,10 +143,15 @@ export default {
|
|||||||
triggerType: "触发类型",
|
triggerType: "触发类型",
|
||||||
pipelineId: "流水线Id",
|
pipelineId: "流水线Id",
|
||||||
},
|
},
|
||||||
|
pi: {
|
||||||
|
validTime: "流水线有效期",
|
||||||
|
validTimeHelper: "不填则为永久有效",
|
||||||
|
},
|
||||||
types: {
|
types: {
|
||||||
certApply: "证书申请",
|
certApply: "证书申请",
|
||||||
certUpload: "证书上传",
|
certUpload: "证书上传",
|
||||||
custom: "自定义",
|
custom: "自定义",
|
||||||
|
template: "模版",
|
||||||
},
|
},
|
||||||
myPipelines: "我的流水线",
|
myPipelines: "我的流水线",
|
||||||
selectedCount: "已选择 {count} 项",
|
selectedCount: "已选择 {count} 项",
|
||||||
@@ -181,6 +187,7 @@ export default {
|
|||||||
suiteSetting: "套餐设置",
|
suiteSetting: "套餐设置",
|
||||||
orderManager: "订单管理",
|
orderManager: "订单管理",
|
||||||
userSuites: "用户套餐",
|
userSuites: "用户套餐",
|
||||||
|
netTest: "网络测试",
|
||||||
},
|
},
|
||||||
certificateRepo: {
|
certificateRepo: {
|
||||||
title: "证书仓库",
|
title: "证书仓库",
|
||||||
@@ -228,9 +235,12 @@ export default {
|
|||||||
notificationWhen: "通知时机",
|
notificationWhen: "通知时机",
|
||||||
notificationHelper: "任务执行失败实时提醒",
|
notificationHelper: "任务执行失败实时提醒",
|
||||||
groupIdTitle: "流水线分组",
|
groupIdTitle: "流水线分组",
|
||||||
|
addToMonitorEnabled: "添加到证书监控",
|
||||||
|
addToMonitorDomains: "添加到监控域名",
|
||||||
},
|
},
|
||||||
notificationDefault: "使用默认通知",
|
notificationDefault: "使用默认通知",
|
||||||
monitor: {
|
monitor: {
|
||||||
|
remark: "备注",
|
||||||
title: "站点证书监控",
|
title: "站点证书监控",
|
||||||
description: "每天0点,检查网站证书的过期时间,到期前10天时将发出提醒(使用默认通知渠道);",
|
description: "每天0点,检查网站证书的过期时间,到期前10天时将发出提醒(使用默认通知渠道);",
|
||||||
settingLink: "站点监控设置",
|
settingLink: "站点监控设置",
|
||||||
@@ -252,6 +262,7 @@ export default {
|
|||||||
certDomains: "证书域名",
|
certDomains: "证书域名",
|
||||||
certProvider: "颁发机构",
|
certProvider: "颁发机构",
|
||||||
certStatus: "证书状态",
|
certStatus: "证书状态",
|
||||||
|
error: "错误信息",
|
||||||
status: {
|
status: {
|
||||||
ok: "正常",
|
ok: "正常",
|
||||||
expired: "过期",
|
expired: "过期",
|
||||||
@@ -285,6 +296,8 @@ export default {
|
|||||||
cronTrigger: "定时触发监控",
|
cronTrigger: "定时触发监控",
|
||||||
dnsServer: "DNS服务器",
|
dnsServer: "DNS服务器",
|
||||||
dnsServerHelper: "使用自定义的域名解析服务器,如:1.1.1.1 , 支持多个",
|
dnsServerHelper: "使用自定义的域名解析服务器,如:1.1.1.1 , 支持多个",
|
||||||
|
certValidDays: "证书到期前天数",
|
||||||
|
certValidDaysHelper: "证书到期前多少天发送通知",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
checkStatus: {
|
checkStatus: {
|
||||||
@@ -294,9 +307,9 @@ export default {
|
|||||||
},
|
},
|
||||||
domainList: {
|
domainList: {
|
||||||
title: "域名列表",
|
title: "域名列表",
|
||||||
helper: "格式【域名:端口:名称】,一行一个,其中端口、名称可以省略\n比如:\nwww.baidu.com:443:百度\nwww.taobao.com::淘宝\nwww.google.com",
|
helper: "格式【域名:端口:名称:备注】,一行一个,其中端口、名称、备注可以省略\n比如:\nwww.baidu.com:443:百度:备注文本\nwww.taobao.com::淘宝\nwww.google.com",
|
||||||
required: "请输入要导入的域名",
|
required: "请输入要导入的域名",
|
||||||
placeholder: "www.baidu.com:443:百度\nwww.taobao.com::淘宝\nwww.google.com\n",
|
placeholder: "www.baidu.com:443:百度:备注文本\nwww.taobao.com::淘宝\nwww.google.com\n",
|
||||||
},
|
},
|
||||||
accountInfo: "账号信息",
|
accountInfo: "账号信息",
|
||||||
securitySettings: "认证安全设置",
|
securitySettings: "认证安全设置",
|
||||||
@@ -453,6 +466,7 @@ export default {
|
|||||||
description: "说明",
|
description: "说明",
|
||||||
createTime: "创建时间",
|
createTime: "创建时间",
|
||||||
updateTime: "更新时间",
|
updateTime: "更新时间",
|
||||||
|
mainDomain: "主域名",
|
||||||
edit: "编辑",
|
edit: "编辑",
|
||||||
groupName: "分组名称",
|
groupName: "分组名称",
|
||||||
enterGroupName: "请输入分组名称",
|
enterGroupName: "请输入分组名称",
|
||||||
@@ -461,7 +475,7 @@ export default {
|
|||||||
batchDeleteConfirm: "确定要批量删除这{count}条记录吗",
|
batchDeleteConfirm: "确定要批量删除这{count}条记录吗",
|
||||||
selectRecordFirst: "请先勾选记录",
|
selectRecordFirst: "请先勾选记录",
|
||||||
subdomainHosted: "托管的子域名",
|
subdomainHosted: "托管的子域名",
|
||||||
subdomainHelpText: "如果您不理解什么是子域托管,请不要随意设置,可能导致证书无法申请,可以参考文档",
|
subdomainHelpText: "如果您不理解什么是子域托管,请不要随意设置(可能导致证书无法申请,以前设置过的cname记录也需要重新配置),可以参考文档",
|
||||||
subdomainManagement: "子域管理",
|
subdomainManagement: "子域管理",
|
||||||
isDisabled: "是否禁用",
|
isDisabled: "是否禁用",
|
||||||
enabled: "启用",
|
enabled: "启用",
|
||||||
@@ -717,19 +731,32 @@ export default {
|
|||||||
copyPipelineConfig: "复制该流水线配置作为模板来源",
|
copyPipelineConfig: "复制该流水线配置作为模板来源",
|
||||||
pipeline: "流水线",
|
pipeline: "流水线",
|
||||||
},
|
},
|
||||||
|
dates: {
|
||||||
|
years: "{count}年",
|
||||||
|
months: "{count}月",
|
||||||
|
},
|
||||||
sys: {
|
sys: {
|
||||||
setting: {
|
setting: {
|
||||||
|
baseSetting: "基本设置",
|
||||||
|
registerSetting: "注册设置",
|
||||||
|
safeSetting: "安全设置",
|
||||||
|
paymentSetting: "支付设置",
|
||||||
|
captchaSetting: "验证码设置",
|
||||||
|
pipelineSetting: "流水线设置",
|
||||||
|
|
||||||
showRunStrategy: "显示运行策略选择",
|
showRunStrategy: "显示运行策略选择",
|
||||||
showRunStrategyHelper: "任务设置中是否允许选择运行策略",
|
showRunStrategyHelper: "任务设置中是否允许选择运行策略",
|
||||||
|
|
||||||
captchaEnabled: "启用登录验证码",
|
captchaEnabled: "启用登录验证码",
|
||||||
captchaHelper: "登录时是否启用验证码",
|
captchaHelper: "登录时是否启用验证码",
|
||||||
captchaType: "验证码配置",
|
captchaType: "验证码配置",
|
||||||
|
captchaTest: "测试验证码",
|
||||||
|
captchaTestHelper: "保存后再点击测试,请务必测试通过了,再开启登录验证码",
|
||||||
|
|
||||||
baseSetting: "基本设置",
|
pipelineValidTimeEnabled: "启用流水线有效期",
|
||||||
registerSetting: "注册设置",
|
pipelineValidTimeEnabledHelper: "是否启用流水线有效期",
|
||||||
safeSetting: "安全设置",
|
certDomainAddToMonitorEnabled: "证书域名添加到证书监控",
|
||||||
paymentSetting: "支付设置",
|
certDomainAddToMonitorEnabledHelper: "创建证书流水线时是否可以选择将域名添加到证书监控",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
modal: {
|
modal: {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { request } from "/src/api/service";
|
import { request } from "/src/api/service";
|
||||||
// import "/src/mock";
|
// import "/src/mock";
|
||||||
import { ColumnCompositionProps, CrudOptions, FastCrud, PageQuery, PageRes, setLogger, TransformResProps, useColumns, UseCrudProps, UserPageQuery, useTypes, utils } from "@fast-crud/fast-crud";
|
import { ColumnCompositionProps, CrudOptions, FastCrud, PageQuery, PageRes, setLogger, TransformResProps, useColumns, UseCrudProps, UserPageQuery, useTypes, utils, forEachTableColumns } from "@fast-crud/fast-crud";
|
||||||
import "@fast-crud/fast-crud/dist/style.css";
|
import "@fast-crud/fast-crud/dist/style.css";
|
||||||
import { FsExtendsCopyable, FsExtendsEditor, FsExtendsJson, FsExtendsTime, FsExtendsUploader, FsExtendsInput } from "@fast-crud/fast-extends";
|
import { FsExtendsCopyable, FsExtendsEditor, FsExtendsJson, FsExtendsTime, FsExtendsUploader, FsExtendsInput } from "@fast-crud/fast-extends";
|
||||||
import "@fast-crud/fast-extends/dist/style.css";
|
import "@fast-crud/fast-extends/dist/style.css";
|
||||||
@@ -14,25 +14,27 @@ import { usePreferences } from "/@/vben/preferences";
|
|||||||
import { LocalStorage } from "/@/utils/util.storage";
|
import { LocalStorage } from "/@/utils/util.storage";
|
||||||
|
|
||||||
import { FsEditorCode } from "@fast-crud/editor-code";
|
import { FsEditorCode } from "@fast-crud/editor-code";
|
||||||
import "@fast-crud/editor-code/dist/style.css"
|
import "@fast-crud/editor-code/dist/style.css";
|
||||||
|
|
||||||
class ColumnSizeSaver {
|
class ColumnSizeSaver {
|
||||||
save: (key: string, size: number) => void;
|
type: string;
|
||||||
constructor() {
|
save: (key: string, value: any) => void;
|
||||||
this.save = debounce((key: string, size: number) => {
|
constructor(type: string = "columnSize") {
|
||||||
|
this.type = type;
|
||||||
|
this.save = debounce((key: string, value: any) => {
|
||||||
const saveKey = this.getKey();
|
const saveKey = this.getKey();
|
||||||
let data = LocalStorage.get(saveKey);
|
let data = LocalStorage.get(saveKey);
|
||||||
if (!data) {
|
if (!data) {
|
||||||
data = {};
|
data = {};
|
||||||
}
|
}
|
||||||
data[key] = size;
|
data[key] = value;
|
||||||
LocalStorage.set(saveKey, data);
|
LocalStorage.set(saveKey, data);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
getKey() {
|
getKey() {
|
||||||
const loc = window.location;
|
const loc = window.location;
|
||||||
const currentUrl = `${loc.pathname}${loc.search}${loc.hash}`;
|
const currentUrl = `${loc.pathname}${loc.search}${loc.hash}`;
|
||||||
return `columnSize-${currentUrl}`;
|
return `${this.type}-${currentUrl}`;
|
||||||
}
|
}
|
||||||
get(key: string) {
|
get(key: string) {
|
||||||
const saveKey = this.getKey();
|
const saveKey = this.getKey();
|
||||||
@@ -45,6 +47,7 @@ class ColumnSizeSaver {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
const columnSizeSaver = new ColumnSizeSaver();
|
const columnSizeSaver = new ColumnSizeSaver();
|
||||||
|
const tableSortSaver = new ColumnSizeSaver("tableSorter");
|
||||||
|
|
||||||
function install(app: App, options: any = {}) {
|
function install(app: App, options: any = {}) {
|
||||||
app.use(UiAntdv);
|
app.use(UiAntdv);
|
||||||
@@ -63,6 +66,8 @@ function install(app: App, options: any = {}) {
|
|||||||
commonOptions(props: UseCrudProps): CrudOptions {
|
commonOptions(props: UseCrudProps): CrudOptions {
|
||||||
utils.logger.debug("commonOptions:", props);
|
utils.logger.debug("commonOptions:", props);
|
||||||
const crudBinding = props.crudExpose?.crudBinding;
|
const crudBinding = props.crudExpose?.crudBinding;
|
||||||
|
const crudExpose = props.crudExpose;
|
||||||
|
|
||||||
const { isMobile } = usePreferences();
|
const { isMobile } = usePreferences();
|
||||||
const opts: CrudOptions = {
|
const opts: CrudOptions = {
|
||||||
settings: {
|
settings: {
|
||||||
@@ -74,6 +79,20 @@ function install(app: App, options: any = {}) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
onUseCrud(bindings: any) {
|
||||||
|
const oldSorter = tableSortSaver.get("sorter");
|
||||||
|
if (oldSorter) {
|
||||||
|
const { prop, order } = oldSorter;
|
||||||
|
forEachTableColumns(bindings.table.columns, (column: any) => {
|
||||||
|
if (column.key === prop) {
|
||||||
|
column.sortOrder = order;
|
||||||
|
} else {
|
||||||
|
column.sortOrder = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
bindings.table.sort = oldSorter;
|
||||||
|
}
|
||||||
|
},
|
||||||
},
|
},
|
||||||
table: {
|
table: {
|
||||||
scroll: {
|
scroll: {
|
||||||
@@ -104,6 +123,30 @@ function install(app: App, options: any = {}) {
|
|||||||
return "-";
|
return "-";
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
onSortChange: (sortChange: any) => {
|
||||||
|
const { isServerSort, prop, asc, order } = sortChange;
|
||||||
|
const oldSort = crudBinding.value.table.sort;
|
||||||
|
const newSorter = isServerSort ? { prop, order, asc } : null;
|
||||||
|
|
||||||
|
forEachTableColumns(crudBinding.value.table.columns, (column: any) => {
|
||||||
|
if (column.key === prop) {
|
||||||
|
column.sortOrder = order;
|
||||||
|
} else {
|
||||||
|
column.sortOrder = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
crudBinding.value.table.sort = newSorter;
|
||||||
|
if (newSorter) {
|
||||||
|
tableSortSaver.save("sorter", newSorter);
|
||||||
|
} else {
|
||||||
|
tableSortSaver.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isServerSort || oldSort != null) {
|
||||||
|
crudExpose.doRefresh();
|
||||||
|
}
|
||||||
|
},
|
||||||
},
|
},
|
||||||
toolbar: {
|
toolbar: {
|
||||||
export: {
|
export: {
|
||||||
@@ -189,6 +232,10 @@ function install(app: App, options: any = {}) {
|
|||||||
},
|
},
|
||||||
wrapperCol: {
|
wrapperCol: {
|
||||||
span: null,
|
span: null,
|
||||||
|
buttons: {
|
||||||
|
copy: { show: false },
|
||||||
|
paste: { show: false },
|
||||||
|
},
|
||||||
},
|
},
|
||||||
wrapper: {
|
wrapper: {
|
||||||
saveRemind: true,
|
saveRemind: true,
|
||||||
|
|||||||
@@ -249,6 +249,17 @@ export const sysResources = [
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: "certd.sysResources.netTest",
|
||||||
|
name: "NetTest",
|
||||||
|
path: "/sys/nettest",
|
||||||
|
component: "/sys/nettest/index.vue",
|
||||||
|
meta: {
|
||||||
|
icon: "ion:build-outline",
|
||||||
|
auth: true,
|
||||||
|
keepAlive: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -50,6 +50,12 @@ export type SysPublicSetting = {
|
|||||||
captchaEnabled?: boolean;
|
captchaEnabled?: boolean;
|
||||||
captchaType?: number;
|
captchaType?: number;
|
||||||
captchaAddonId?: number;
|
captchaAddonId?: number;
|
||||||
|
|
||||||
|
//流水线是否启用有效期
|
||||||
|
pipelineValidTimeEnabled?: boolean;
|
||||||
|
|
||||||
|
//证书域名添加到监控
|
||||||
|
certDomainAddToMonitorEnabled?: boolean;
|
||||||
};
|
};
|
||||||
export type SuiteSetting = {
|
export type SuiteSetting = {
|
||||||
enabled?: boolean;
|
enabled?: boolean;
|
||||||
@@ -63,6 +69,9 @@ export type SysPrivateSetting = {
|
|||||||
type?: string;
|
type?: string;
|
||||||
config?: any;
|
config?: any;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
//http请求超时时间
|
||||||
|
httpRequestTimeout?: number;
|
||||||
};
|
};
|
||||||
export type SysInstallInfo = {
|
export type SysInstallInfo = {
|
||||||
siteId: string;
|
siteId: string;
|
||||||
|
|||||||
@@ -19,6 +19,10 @@ div#app {
|
|||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pre.pre{
|
||||||
|
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
|
||||||
|
}
|
||||||
|
|
||||||
h1,
|
h1,
|
||||||
h2,
|
h2,
|
||||||
h3,
|
h3,
|
||||||
|
|||||||
@@ -1,23 +1,23 @@
|
|||||||
::-webkit-scrollbar {
|
::-webkit-scrollbar {
|
||||||
width: 8px;
|
width: 12px !important;
|
||||||
height: 8px;
|
height: 12px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
::-webkit-scrollbar-track {
|
::-webkit-scrollbar-track {
|
||||||
width: 8px;
|
width: 12px !important;
|
||||||
background: rgba(#101f1c, 0.1);
|
background: rgba(#101f1c, 0.1);
|
||||||
-webkit-border-radius: 2em;
|
-webkit-border-radius: 4em;
|
||||||
-moz-border-radius: 2em;
|
-moz-border-radius: 4em;
|
||||||
border-radius: 2em;
|
border-radius: 4em;
|
||||||
}
|
}
|
||||||
|
|
||||||
::-webkit-scrollbar-thumb {
|
::-webkit-scrollbar-thumb {
|
||||||
// background-color: rgba(#101F1C, 0.5);
|
// background-color: rgba(#101F1C, 0.5);
|
||||||
background-clip: padding-box;
|
background-clip: padding-box;
|
||||||
min-height: 28px;
|
min-height: 28px;
|
||||||
-webkit-border-radius: 2em;
|
-webkit-border-radius: 4em;
|
||||||
-moz-border-radius: 2em;
|
-moz-border-radius: 4em;
|
||||||
border-radius: 2em;
|
border-radius: 4em;
|
||||||
background-color: #b3b3b3;
|
background-color: #b3b3b3;
|
||||||
box-shadow: 0px 1px 1px #eee inset;
|
box-shadow: 0px 1px 1px #eee inset;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,8 +54,8 @@ export function useVbenModal<TParentModalProps extends ModalProps = ModalProps>(
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
inheritAttrs: false,
|
|
||||||
name: "VbenParentModal",
|
name: "VbenParentModal",
|
||||||
|
inheritAttrs: false,
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
return [Modal, extendedApi as ExtendedModalApi] as const;
|
return [Modal, extendedApi as ExtendedModalApi] as const;
|
||||||
@@ -104,8 +104,8 @@ export function useVbenModal<TParentModalProps extends ModalProps = ModalProps>(
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
inheritAttrs: false,
|
|
||||||
name: "VbenModal",
|
name: "VbenModal",
|
||||||
|
inheritAttrs: false,
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
injectData.extendApi?.(extendedApi);
|
injectData.extendApi?.(extendedApi);
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user