Compare commits
244 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
74c5259af8 | ||
|
|
a3e7d4414d | ||
|
|
986d32eb81 | ||
|
|
de0ae14544 | ||
|
|
6b52276fb6 | ||
|
|
a19ea7489c | ||
|
|
14229c2f00 | ||
|
|
6eb20a1f2e | ||
|
|
8debac2edf | ||
|
|
a68301e4dc | ||
|
|
c6a988bc92 | ||
|
|
fe02ce7b64 | ||
|
|
df012dec90 | ||
|
|
5969425a6f | ||
|
|
b17b1e6463 | ||
|
|
c99e61c402 | ||
|
|
f4aaec8b3c | ||
|
|
adc3e6118b | ||
|
|
d933493c31 | ||
|
|
f91d591b03 | ||
|
|
af6deb99cd | ||
|
|
c5d285f755 | ||
|
|
b1eb706925 | ||
|
|
5a01634ca3 | ||
|
|
487676ce13 | ||
|
|
0280ca7b1a | ||
|
|
b0ccab41e1 | ||
|
|
ccda3a3325 | ||
|
|
4b7eeaa6e0 | ||
|
|
2951f0030d | ||
|
|
acc2df29de | ||
|
|
431afd618f | ||
|
|
6d5e5bd692 | ||
|
|
ffd2e8149e | ||
|
|
2ab92dc13e | ||
|
|
7f6a8bc87e | ||
|
|
b1ff163a28 | ||
|
|
440d55ccb8 | ||
|
|
285532d431 | ||
|
|
f2c47459f8 | ||
|
|
49703f08e5 | ||
|
|
1d0aa9573b | ||
|
|
b2014cf88b | ||
|
|
a0e0078bad | ||
|
|
5ebca21c32 | ||
|
|
970aea90c9 | ||
|
|
5f9341ad8e | ||
|
|
574c0983f5 | ||
|
|
be6c7c7ac8 | ||
|
|
4fd31f276b | ||
|
|
224db7da57 | ||
|
|
1413e1aff4 | ||
|
|
68b669d3ff | ||
|
|
29f44c67c8 | ||
|
|
3332d2288f | ||
|
|
34702196e1 | ||
|
|
d45c8d1e9b | ||
|
|
bc19825ada | ||
|
|
72bb640239 | ||
|
|
aacee4a94c | ||
|
|
3ab37d5c5d | ||
|
|
3dd3ecf8f1 | ||
|
|
a3831827d0 | ||
|
|
6aa6c957ee | ||
|
|
9e12412f5f | ||
|
|
0f9eb31740 | ||
|
|
6be8ab581d | ||
|
|
d8425bc9c5 | ||
|
|
0ddcb9c00a | ||
|
|
6d43623f45 | ||
|
|
196cd88010 | ||
|
|
7f37df4227 | ||
|
|
985a12a63b | ||
|
|
9058c0e9fc | ||
|
|
4b0cd32d12 | ||
|
|
6cb51bc55d | ||
|
|
119e3c31c9 | ||
|
|
56164c25d0 | ||
|
|
c66e5f9fcd | ||
|
|
12700e1754 | ||
|
|
50db6f0765 | ||
|
|
64e8adddfd | ||
|
|
729a4d64e9 | ||
|
|
6f12504588 | ||
|
|
271459f820 | ||
|
|
5000c95d01 | ||
|
|
f477733483 | ||
|
|
54e1681c5e | ||
|
|
2f6d9a156a | ||
|
|
10dd89ae62 | ||
|
|
d01bfbec96 | ||
|
|
5eb4aa3a0e | ||
|
|
0b9933df1e | ||
|
|
76d12d6062 | ||
|
|
cf10faf61c | ||
|
|
1cbf9c1cd9 | ||
|
|
25e361b9f9 | ||
|
|
b88ee33ae4 | ||
|
|
684964da4f | ||
|
|
8a3841f638 | ||
|
|
f642e42eea | ||
|
|
bbef854c02 | ||
|
|
e50611666e | ||
|
|
eae4f721e8 | ||
|
|
12fed34e10 | ||
|
|
56350b54ee | ||
|
|
10b7644bb7 | ||
|
|
d79db3bd3f | ||
|
|
1588461633 | ||
|
|
dd999b60a4 | ||
|
|
3abee72fee | ||
|
|
b5577b1d37 | ||
|
|
e15ffb5820 | ||
|
|
4d9a5ed4a1 | ||
|
|
b2bc1debe0 | ||
|
|
590ff67fcb | ||
|
|
209e1adf53 | ||
|
|
53c08484a3 | ||
|
|
c6ca832737 | ||
|
|
2c399a078e | ||
|
|
8c519f13da | ||
|
|
853fdc70a2 | ||
|
|
dc4f811eaa | ||
|
|
d23c8b4a2a | ||
|
|
00c0dcc81d | ||
|
|
f77feefdb8 | ||
|
|
2e346e5369 | ||
|
|
17023f6b55 | ||
|
|
3bb29abe32 | ||
|
|
ac42d38b7a | ||
|
|
d9c0130b59 | ||
|
|
4925d5a5e7 | ||
|
|
dd9a7cf5d7 | ||
|
|
5ee3874b7e | ||
|
|
17dd77cc96 | ||
|
|
6c546b5290 | ||
|
|
a853fc2026 | ||
|
|
92c9ac3826 | ||
|
|
78c2ced43b | ||
|
|
72f850f675 | ||
|
|
bc326489ab | ||
|
|
ea5e7d9563 | ||
|
|
5b5b48fc06 | ||
|
|
1548ba0b8d | ||
|
|
26b1c4244f | ||
|
|
8a4e981931 | ||
|
|
6163c3f08e | ||
|
|
e17f381b1f | ||
|
|
316537eb4d | ||
|
|
b2c421600c | ||
|
|
787f6ef528 | ||
|
|
8578547467 | ||
|
|
51ab6d6da1 | ||
|
|
3a8b5de8f7 | ||
|
|
faf08f6513 | ||
|
|
06c69d23be | ||
|
|
1bcadd5f8e | ||
|
|
524195d729 | ||
|
|
0c25d277ef | ||
|
|
27b0348e1d | ||
|
|
ea5aa68769 | ||
|
|
99fefb168a | ||
|
|
49457505cd | ||
|
|
bfc948a9b4 | ||
|
|
c407206627 | ||
|
|
39d3bf97d1 | ||
|
|
79be392775 | ||
|
|
be4c6b8e16 | ||
|
|
c8e193e70d | ||
|
|
35859ffc3f | ||
|
|
0d81ada5a8 | ||
|
|
b68cf0fb45 | ||
|
|
9ed2078e92 | ||
|
|
1f002159e2 | ||
|
|
5bc690fcd9 | ||
|
|
bab9adce24 | ||
|
|
e47eddaa85 | ||
|
|
8ef1f2e395 | ||
|
|
541131bbc6 | ||
|
|
7626eecbf6 | ||
|
|
49afa75929 | ||
|
|
5c5265ede2 | ||
|
|
42d61d8089 | ||
|
|
01eb50078e | ||
|
|
eef021f472 | ||
|
|
6f3fd785e7 | ||
|
|
7cd8a645a8 | ||
|
|
9671348dc1 | ||
|
|
7a3e68d656 | ||
|
|
42c7ec2f75 | ||
|
|
32c3ce5c98 | ||
|
|
e55a3a82fc | ||
|
|
305da86f97 | ||
|
|
c23d1d11b5 | ||
|
|
a3cabd5f36 | ||
|
|
66ac4716f2 | ||
|
|
3cd1aaeb03 | ||
|
|
4eb940ffe7 | ||
|
|
61800b23e2 | ||
|
|
0283662931 | ||
|
|
d125eb56b3 | ||
|
|
956d68695c | ||
|
|
83d81b64b3 | ||
|
|
a4ea82c04b | ||
|
|
8387fe0d5b | ||
|
|
cfd5b388f1 | ||
|
|
4ee6e38a94 | ||
|
|
3f87752d1f | ||
|
|
b91548eef4 | ||
|
|
1195417b97 | ||
|
|
67f347197e | ||
|
|
8c2dfa9140 | ||
|
|
a3fbfe0bff | ||
|
|
99db1b1cc3 | ||
|
|
638a7f0ab4 | ||
|
|
806a69fef3 | ||
|
|
8ba2e9e34c | ||
|
|
e7e54bc19e | ||
|
|
9fb980599f | ||
|
|
28dfef985c | ||
|
|
1e416b9f8a | ||
|
|
784bcb0aa5 | ||
|
|
9642df2d9d | ||
|
|
37340838b6 | ||
|
|
d1a8dd7817 | ||
|
|
8919a3937a | ||
|
|
5032030f8d | ||
|
|
b16f92314b | ||
|
|
ad22244388 | ||
|
|
2e3d0cc57c | ||
|
|
1e44115461 | ||
|
|
1ee1d61c74 | ||
|
|
7b8b9cfd2b | ||
|
|
5e7a67834b | ||
|
|
3c85602ab1 | ||
|
|
66d0d0e213 | ||
|
|
1f68faddb9 | ||
|
|
db06f06c96 | ||
|
|
79e973e9c8 | ||
|
|
8d8304e859 | ||
|
|
6ddc23e2aa | ||
|
|
2fc491015e | ||
|
|
bb0afe1fa7 | ||
|
|
eb46f8c776 |
4
.github/workflows/build-image.yml
vendored
@@ -4,7 +4,7 @@ on:
|
|||||||
branches: ['v2-dev']
|
branches: ['v2-dev']
|
||||||
paths:
|
paths:
|
||||||
- "trigger/build.trigger"
|
- "trigger/build.trigger"
|
||||||
|
workflow_dispatch: # 添加手动触发
|
||||||
# schedule:
|
# schedule:
|
||||||
# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
|
# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
|
||||||
# - cron: '17 19 * * *'
|
# - cron: '17 19 * * *'
|
||||||
@@ -21,7 +21,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
lfs: true
|
lfs: true
|
||||||
|
ref: 'v2-dev'
|
||||||
- name: get_certd_version
|
- name: get_certd_version
|
||||||
id: get_certd_version
|
id: get_certd_version
|
||||||
uses: actions/github-script@v6
|
uses: actions/github-script@v6
|
||||||
|
|||||||
5
.github/workflows/deploy-demo.yml
vendored
@@ -8,6 +8,8 @@ on:
|
|||||||
workflows: [ "build-image" ]
|
workflows: [ "build-image" ]
|
||||||
types:
|
types:
|
||||||
- completed
|
- completed
|
||||||
|
workflow_dispatch: # 添加手动触发
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# schedule:
|
# schedule:
|
||||||
@@ -26,6 +28,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
ref: v2-dev
|
ref: v2-dev
|
||||||
|
|
||||||
- name: get_certd_version
|
- name: get_certd_version
|
||||||
id: get_certd_version
|
id: get_certd_version
|
||||||
uses: actions/github-script@v6
|
uses: actions/github-script@v6
|
||||||
@@ -43,7 +46,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
time: '10' # for 60 seconds
|
time: '10' # for 60 seconds
|
||||||
- name: deploy-certd-demo
|
- name: deploy-certd-demo
|
||||||
uses: tyrrrz/action-http-request@master
|
uses: tyrrrz/action-http-request@prime
|
||||||
with:
|
with:
|
||||||
# 通过webhook 触发 certd-demo来部署
|
# 通过webhook 触发 certd-demo来部署
|
||||||
url: ${{ secrets.WEBHOOK_CERTD_DEMO }}
|
url: ${{ secrets.WEBHOOK_CERTD_DEMO }}
|
||||||
|
|||||||
8
.github/workflows/publish-atom.yaml
vendored
@@ -8,7 +8,7 @@ on:
|
|||||||
workflows: [ "build-image-for-release" ]
|
workflows: [ "build-image-for-release" ]
|
||||||
types:
|
types:
|
||||||
- completed
|
- completed
|
||||||
|
workflow_dispatch: # 添加手动触发
|
||||||
# schedule:
|
# schedule:
|
||||||
# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
|
# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
|
||||||
# - cron: '17 19 * * *'
|
# - cron: '17 19 * * *'
|
||||||
@@ -19,13 +19,17 @@ permissions:
|
|||||||
jobs:
|
jobs:
|
||||||
publish-atomgit:
|
publish-atomgit:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: ${{ github.event.workflow_run.conclusion == 'success' }}
|
if: |
|
||||||
|
github.event_name == 'workflow_dispatch' ||
|
||||||
|
(github.event.workflow_run.conclusion == 'success')
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Code
|
- name: Checkout Code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
lfs: true
|
lfs: true
|
||||||
|
ref: 'v2-dev'
|
||||||
|
|
||||||
- name: get_certd_version
|
- name: get_certd_version
|
||||||
id: get_certd_version
|
id: get_certd_version
|
||||||
uses: actions/github-script@v6
|
uses: actions/github-script@v6
|
||||||
|
|||||||
7
.github/workflows/publish-gitee.yaml
vendored
@@ -8,7 +8,7 @@ on:
|
|||||||
workflows: [ "build-image-for-release" ]
|
workflows: [ "build-image-for-release" ]
|
||||||
types:
|
types:
|
||||||
- completed
|
- completed
|
||||||
|
workflow_dispatch: # 添加手动触发
|
||||||
# schedule:
|
# schedule:
|
||||||
# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
|
# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
|
||||||
# - cron: '17 19 * * *'
|
# - cron: '17 19 * * *'
|
||||||
@@ -19,13 +19,16 @@ permissions:
|
|||||||
jobs:
|
jobs:
|
||||||
publish-gitee:
|
publish-gitee:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: ${{ github.event.workflow_run.conclusion == 'success' }}
|
if: |
|
||||||
|
github.event_name == 'workflow_dispatch' ||
|
||||||
|
(github.event.workflow_run.conclusion == 'success')
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Code
|
- name: Checkout Code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
lfs: true
|
lfs: true
|
||||||
|
ref: 'v2-dev'
|
||||||
|
|
||||||
- name: publish_to_gitee
|
- name: publish_to_gitee
|
||||||
id: publish_to_gitee
|
id: publish_to_gitee
|
||||||
|
|||||||
7
.github/workflows/publish-github.yaml
vendored
@@ -8,7 +8,7 @@ on:
|
|||||||
workflows: [ "build-image-for-release" ]
|
workflows: [ "build-image-for-release" ]
|
||||||
types:
|
types:
|
||||||
- completed
|
- completed
|
||||||
|
workflow_dispatch: # 添加手动触发
|
||||||
# schedule:
|
# schedule:
|
||||||
# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
|
# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
|
||||||
# - cron: '17 19 * * *'
|
# - cron: '17 19 * * *'
|
||||||
@@ -19,13 +19,16 @@ permissions:
|
|||||||
jobs:
|
jobs:
|
||||||
publish-github:
|
publish-github:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: ${{ github.event.workflow_run.conclusion == 'success' }}
|
if: |
|
||||||
|
github.event_name == 'workflow_dispatch' ||
|
||||||
|
(github.event.workflow_run.conclusion == 'success')
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Code
|
- name: Checkout Code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
lfs: true
|
lfs: true
|
||||||
|
ref: 'v2-dev'
|
||||||
|
|
||||||
- name: publish_to_github
|
- name: publish_to_github
|
||||||
id: publish_to_github
|
id: publish_to_github
|
||||||
|
|||||||
4
.github/workflows/release-image.yml
vendored
@@ -4,6 +4,7 @@ on:
|
|||||||
branches: ['v2-dev']
|
branches: ['v2-dev']
|
||||||
paths:
|
paths:
|
||||||
- "trigger/release.trigger"
|
- "trigger/release.trigger"
|
||||||
|
workflow_dispatch: # 添加手动触发
|
||||||
# workflow_run:
|
# workflow_run:
|
||||||
# workflows: [ "deploy-demo" ]
|
# workflows: [ "deploy-demo" ]
|
||||||
# types:
|
# types:
|
||||||
@@ -25,6 +26,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
lfs: true
|
lfs: true
|
||||||
|
ref: 'v2-dev'
|
||||||
|
|
||||||
- name: get_certd_version
|
- name: get_certd_version
|
||||||
id: get_certd_version
|
id: get_certd_version
|
||||||
@@ -118,7 +120,7 @@ jobs:
|
|||||||
# greper/certd-agent:latest
|
# greper/certd-agent:latest
|
||||||
# greper/certd-agent:${{steps.get_certd_version.outputs.result}}
|
# greper/certd-agent:${{steps.get_certd_version.outputs.result}}
|
||||||
- name: deploy-certd-doc
|
- name: deploy-certd-doc
|
||||||
uses: tyrrrz/action-http-request@master
|
uses: tyrrrz/action-http-request@prime
|
||||||
with:
|
with:
|
||||||
url: ${{ secrets.WEBHOOK_CERTD_DOC }}
|
url: ${{ secrets.WEBHOOK_CERTD_DOC }}
|
||||||
method: POST
|
method: POST
|
||||||
|
|||||||
1
.github/workflows/sync-to-atomgit-dev.yml
vendored
@@ -17,6 +17,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
lfs: true
|
lfs: true
|
||||||
|
ref: v2-dev
|
||||||
- name: Set git user # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
|
- name: Set git user # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
|
||||||
run: |
|
run: |
|
||||||
git config --global user.name "xiaojunnuo"
|
git config --global user.name "xiaojunnuo"
|
||||||
|
|||||||
1
.github/workflows/sync-to-atomgit.yml
vendored
@@ -17,6 +17,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
lfs: true
|
lfs: true
|
||||||
|
ref: v2
|
||||||
- name: Set git user # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
|
- name: Set git user # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
|
||||||
run: |
|
run: |
|
||||||
git config --global user.name "xiaojunnuo"
|
git config --global user.name "xiaojunnuo"
|
||||||
|
|||||||
35
.github/workflows/sync-to-cnb-dev.yml
vendored
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
name: sync-to-cnb-dev
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: ['v2-dev']
|
||||||
|
# schedule:
|
||||||
|
# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
|
||||||
|
# - cron: '17 19 * * *'
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
sync:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout work repo # 1. 检出当前仓库(certd-sync-work)
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
lfs: true
|
||||||
|
ref: v2-dev
|
||||||
|
- name: Set git user # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
|
||||||
|
run: |
|
||||||
|
git config --global user.name "xiaojunnuo"
|
||||||
|
git config --global user.email "xiaojunnuo@qq.com"
|
||||||
|
|
||||||
|
- name: Set git token # 3. 给git命令设置token,用于push到目标仓库
|
||||||
|
uses: de-vri-es/setup-git-credentials@v2
|
||||||
|
with: # token 格式为: username:password
|
||||||
|
credentials: https://cnb:${{secrets.CNB_TOKEN}}@cnb.cool
|
||||||
|
|
||||||
|
- name: push to cnb # 4. 执行同步
|
||||||
|
run: |
|
||||||
|
git remote add upstream https://cnb.cool/certd/certd.git
|
||||||
|
git push --set-upstream upstream v2-dev
|
||||||
|
|
||||||
34
.github/workflows/sync-to-cnb.yml
vendored
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
name: sync-to-cnb
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: ['v2']
|
||||||
|
# schedule:
|
||||||
|
# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
|
||||||
|
# - cron: '17 19 * * *'
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
sync:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout work repo # 1. 检出当前仓库(certd-sync-work)
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
lfs: true
|
||||||
|
- name: Set git user # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
|
||||||
|
run: |
|
||||||
|
git config --global user.name "xiaojunnuo"
|
||||||
|
git config --global user.email "xiaojunnuo@qq.com"
|
||||||
|
|
||||||
|
- name: Set git token # 3. 给git命令设置token,用于push到目标仓库
|
||||||
|
uses: de-vri-es/setup-git-credentials@v2
|
||||||
|
with: # token 格式为: username:password
|
||||||
|
credentials: https://cnb:${{secrets.CNB_TOKEN}}@cnb.cool
|
||||||
|
|
||||||
|
- name: push to cnb # 4. 执行同步
|
||||||
|
run: |
|
||||||
|
git remote add upstream https://cnb.cool/certd/certd.git
|
||||||
|
git push --set-upstream upstream v2
|
||||||
|
|
||||||
1
.github/workflows/sync-to-gitee-dev.yml
vendored
@@ -17,6 +17,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
lfs: true
|
lfs: true
|
||||||
|
ref: v2-dev
|
||||||
- name: Set git user # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
|
- name: Set git user # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
|
||||||
run: |
|
run: |
|
||||||
git config --global user.name "xiaojunnuo"
|
git config --global user.name "xiaojunnuo"
|
||||||
|
|||||||
3
.gitignore
vendored
@@ -30,4 +30,5 @@ test/**/*.js
|
|||||||
/packages/ui/certd-server/data/keys.yaml
|
/packages/ui/certd-server/data/keys.yaml
|
||||||
/packages/pro/
|
/packages/pro/
|
||||||
test.js
|
test.js
|
||||||
.history
|
.history
|
||||||
|
/logs
|
||||||
315
.trae/skills/access-plugin-dev/SKILL.md
Normal file
@@ -0,0 +1,315 @@
|
|||||||
|
# Access 插件开发技能
|
||||||
|
|
||||||
|
## 什么是 Access 插件
|
||||||
|
|
||||||
|
Access 插件是 Certd 系统中用于存储用户第三方应用授权数据的插件,例如用户名密码、accessSecret 或 accessToken 等。同时,它还负责对接实现第三方的 API 接口,供其他插件调用使用。
|
||||||
|
|
||||||
|
## 开发步骤
|
||||||
|
|
||||||
|
### 1. 导入必要的依赖
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
import { AccessInput, BaseAccess, IsAccess, Pager, PageRes, PageSearch } from '@certd/pipeline';
|
||||||
|
import { DomainRecord } from '@certd/plugin-lib';
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. 使用 @IsAccess 注解注册插件
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
@IsAccess({
|
||||||
|
name: 'demo', // 插件唯一标识
|
||||||
|
title: '授权插件示例', // 插件标题
|
||||||
|
icon: 'clarity:plugin-line', // 插件图标
|
||||||
|
desc: '这是一个示例授权插件,用于演示如何实现一个授权插件', // 插件描述
|
||||||
|
})
|
||||||
|
export class DemoAccess extends BaseAccess {
|
||||||
|
// 插件实现...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. 定义授权属性
|
||||||
|
|
||||||
|
使用 `@AccessInput` 注解定义授权属性:
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
@AccessInput({
|
||||||
|
title: '授权方式',
|
||||||
|
value: 'apiKey', // 默认值
|
||||||
|
component: {
|
||||||
|
name: "a-select", // 基于 antdv 的输入组件
|
||||||
|
vModel: "value", // v-model 绑定的属性名
|
||||||
|
options: [ // 组件参数
|
||||||
|
{ label: "API密钥(推荐)", value: "apiKey" },
|
||||||
|
{ label: "账号密码", value: "account" },
|
||||||
|
],
|
||||||
|
placeholder: 'demoKeyId',
|
||||||
|
},
|
||||||
|
required: true,
|
||||||
|
})
|
||||||
|
apiType = '';
|
||||||
|
|
||||||
|
@AccessInput({
|
||||||
|
title: '密钥Id',
|
||||||
|
component: {
|
||||||
|
name:"a-input",
|
||||||
|
allowClear: true,
|
||||||
|
placeholder: 'demoKeyId',
|
||||||
|
},
|
||||||
|
required: true,
|
||||||
|
})
|
||||||
|
demoKeyId = '';
|
||||||
|
|
||||||
|
@AccessInput({
|
||||||
|
title: '密钥',//标题
|
||||||
|
required: true, //text组件可以省略
|
||||||
|
encrypt: true, //该属性是否需要加密
|
||||||
|
})
|
||||||
|
demoKeySecret = '';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@AccessInput({
|
||||||
|
title: '另外一个授权Id',//标题
|
||||||
|
component: {
|
||||||
|
name:"access-selector", //access选择组件
|
||||||
|
vModel:"modelValue",
|
||||||
|
type: "ssh", // access类型,让用户固定选择这种类型的access
|
||||||
|
},
|
||||||
|
required: true, //text组件可以省略
|
||||||
|
})
|
||||||
|
otherAccessId;
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4. 实现测试方法
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
@AccessInput({
|
||||||
|
title: "测试",
|
||||||
|
component: {
|
||||||
|
name: "api-test",
|
||||||
|
action: "TestRequest"
|
||||||
|
},
|
||||||
|
helper: "点击测试接口是否正常"
|
||||||
|
})
|
||||||
|
testRequest = true;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 会通过上面的testRequest参数在ui界面上生成测试按钮,供用户测试接口调用是否正常
|
||||||
|
*/
|
||||||
|
async onTestRequest() {
|
||||||
|
await this.GetDomainList({});
|
||||||
|
return "ok"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5. 实现 API 方法
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
/**
|
||||||
|
* api接口示例 获取域名列表,
|
||||||
|
*/
|
||||||
|
async GetDomainList(req: PageSearch): Promise<PageRes<DomainRecord>> {
|
||||||
|
//输出日志必须使用ctx.logger
|
||||||
|
this.ctx.logger.info(`获取域名列表,req:${JSON.stringify(req)}`);
|
||||||
|
const pager = new Pager(req);
|
||||||
|
const resp = await this.doRequest({
|
||||||
|
action: "ListDomains",
|
||||||
|
data: {
|
||||||
|
domain: req.searchKey,
|
||||||
|
offset: pager.getOffset(),
|
||||||
|
limit: pager.pageSize,
|
||||||
|
}
|
||||||
|
});
|
||||||
|
const total = resp?.TotalCount || 0;
|
||||||
|
let list = resp?.DomainList?.map((item) => {
|
||||||
|
item.domain = item.Domain;
|
||||||
|
item.id = item.DomainId;
|
||||||
|
return item;
|
||||||
|
})
|
||||||
|
return {
|
||||||
|
total,
|
||||||
|
list
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通用api调用方法, 具体如何构造请求体,需参考对应应用的API文档
|
||||||
|
*/
|
||||||
|
async doRequest(req: { action: string, data?: any }) {
|
||||||
|
/**
|
||||||
|
this.ctx中包含很多有用的工具类
|
||||||
|
type AccessContext = {
|
||||||
|
http: HttpClient;
|
||||||
|
logger: ILogger;
|
||||||
|
utils: typeof utils;
|
||||||
|
accessService: IAccessService;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
const res = await this.ctx.http.request({
|
||||||
|
url: "https://api.demo.cn/api/",
|
||||||
|
method: "POST",
|
||||||
|
data: {
|
||||||
|
Action: req.action,
|
||||||
|
Body: req.data
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (res.Code !== 0) {
|
||||||
|
//异常处理
|
||||||
|
throw new Error(res.Message || "请求失败");
|
||||||
|
}
|
||||||
|
return res.Resp;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## 注意事项
|
||||||
|
|
||||||
|
1. **插件命名**:插件名称应简洁明了,反映其功能。
|
||||||
|
2. **属性加密**:对于敏感信息(如密钥),应设置 `encrypt: true`。
|
||||||
|
3. **日志输出**:必须使用 `this.ctx.logger` 输出日志,而不是 `console`。
|
||||||
|
4. **错误处理**:API 调用失败时应抛出明确的错误信息。
|
||||||
|
5. **测试方法**:实现 `onTestRequest` 方法,以便用户可以测试授权是否正常。
|
||||||
|
|
||||||
|
## 完整示例
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
import { AccessInput, BaseAccess, IsAccess, Pager, PageRes, PageSearch } from '@certd/pipeline';
|
||||||
|
import { DomainRecord } from '@certd/plugin-lib';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 这个注解将注册一个授权配置
|
||||||
|
* 在certd的后台管理系统中,用户可以选择添加此类型的授权
|
||||||
|
*/
|
||||||
|
@IsAccess({
|
||||||
|
name: 'demo',
|
||||||
|
title: '授权插件示例',
|
||||||
|
icon: 'clarity:plugin-line', //插件图标
|
||||||
|
desc: '这是一个示例授权插件,用于演示如何实现一个授权插件',
|
||||||
|
})
|
||||||
|
export class DemoAccess extends BaseAccess {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 授权属性配置
|
||||||
|
*/
|
||||||
|
@AccessInput({
|
||||||
|
title: '授权方式',
|
||||||
|
value: 'apiKey', //默认值
|
||||||
|
component: {
|
||||||
|
name: "a-select", //基于antdv的输入组件
|
||||||
|
vModel: "value", // v-model绑定的属性名
|
||||||
|
options: [ //组件参数
|
||||||
|
{
|
||||||
|
label: "API密钥(推荐)",
|
||||||
|
value: "apiKey"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "账号密码",
|
||||||
|
value: "account"
|
||||||
|
},
|
||||||
|
],
|
||||||
|
placeholder: 'demoKeyId',
|
||||||
|
},
|
||||||
|
required: true,
|
||||||
|
})
|
||||||
|
apiType = '';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 授权属性配置
|
||||||
|
*/
|
||||||
|
@AccessInput({
|
||||||
|
title: '密钥Id',
|
||||||
|
component: {
|
||||||
|
name:"a-input",
|
||||||
|
allowClear: true,
|
||||||
|
placeholder: 'demoKeyId',
|
||||||
|
},
|
||||||
|
required: true,
|
||||||
|
})
|
||||||
|
demoKeyId = '';
|
||||||
|
|
||||||
|
@AccessInput({
|
||||||
|
title: '密钥',//标题
|
||||||
|
required: true, //text组件可以省略
|
||||||
|
encrypt: true, //该属性是否需要加密
|
||||||
|
})
|
||||||
|
demoKeySecret = '';
|
||||||
|
|
||||||
|
|
||||||
|
@AccessInput({
|
||||||
|
title: "测试",
|
||||||
|
component: {
|
||||||
|
name: "api-test",
|
||||||
|
action: "TestRequest"
|
||||||
|
},
|
||||||
|
helper: "点击测试接口是否正常"
|
||||||
|
})
|
||||||
|
testRequest = true;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 会通过上面的testRequest参数在ui界面上生成测试按钮,供用户测试接口调用是否正常
|
||||||
|
*/
|
||||||
|
async onTestRequest() {
|
||||||
|
await this.GetDomainList({});
|
||||||
|
return "ok"
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获api接口示例 取域名列表,
|
||||||
|
*/
|
||||||
|
async GetDomainList(req: PageSearch): Promise<PageRes<DomainRecord>> {
|
||||||
|
//输出日志必须使用ctx.logger
|
||||||
|
this.ctx.logger.info(`获取域名列表,req:${JSON.stringify(req)}`);
|
||||||
|
const pager = new Pager(req);
|
||||||
|
const resp = await this.doRequest({
|
||||||
|
action: "ListDomains",
|
||||||
|
data: {
|
||||||
|
domain: req.searchKey,
|
||||||
|
offset: pager.getOffset(),
|
||||||
|
limit: pager.pageSize,
|
||||||
|
}
|
||||||
|
});
|
||||||
|
const total = resp?.TotalCount || 0;
|
||||||
|
let list = resp?.DomainList?.map((item) => {
|
||||||
|
item.domain = item.Domain;
|
||||||
|
item.id = item.DomainId;
|
||||||
|
return item;
|
||||||
|
})
|
||||||
|
return {
|
||||||
|
total,
|
||||||
|
list
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 还可以继续编写API
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通用api调用方法, 具体如何构造请求体,需参考对应应用的API文档
|
||||||
|
*/
|
||||||
|
async doRequest(req: { action: string, data?: any }) {
|
||||||
|
/**
|
||||||
|
this.ctx中包含很多有用的工具类
|
||||||
|
type AccessContext = {
|
||||||
|
http: HttpClient;
|
||||||
|
logger: ILogger;
|
||||||
|
utils: typeof utils;
|
||||||
|
accessService: IAccessService;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
const res = await this.ctx.http.request({
|
||||||
|
url: "https://api.demo.cn/api/",
|
||||||
|
method: "POST",
|
||||||
|
data: {
|
||||||
|
Action: req.action,
|
||||||
|
Body: req.data
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (res.Code !== 0) {
|
||||||
|
//异常处理
|
||||||
|
throw new Error(res.Message || "请求失败");
|
||||||
|
}
|
||||||
|
return res.Resp;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
1
.trae/skills/access-plugin-dev/examples/input.md
Normal file
@@ -0,0 +1 @@
|
|||||||
|
我需要开发一个 Access 插件,用于存储和管理第三方应用的授权信息。请指导我如何实现。
|
||||||
145
.trae/skills/access-plugin-dev/examples/output.md
Normal file
@@ -0,0 +1,145 @@
|
|||||||
|
# Access 插件开发指南
|
||||||
|
|
||||||
|
## 开发步骤
|
||||||
|
|
||||||
|
### 1. 导入必要的依赖
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
import { AccessInput, BaseAccess, IsAccess, Pager, PageRes, PageSearch } from '@certd/pipeline';
|
||||||
|
import { DomainRecord } from '@certd/plugin-lib';
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. 使用 @IsAccess 注解注册插件
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
@IsAccess({
|
||||||
|
name: 'demo', // 插件唯一标识
|
||||||
|
title: '授权插件示例', // 插件标题
|
||||||
|
icon: 'clarity:plugin-line', // 插件图标
|
||||||
|
desc: '这是一个示例授权插件,用于演示如何实现一个授权插件', // 插件描述
|
||||||
|
})
|
||||||
|
export class DemoAccess extends BaseAccess {
|
||||||
|
// 插件实现...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. 定义授权属性
|
||||||
|
|
||||||
|
使用 `@AccessInput` 注解定义授权属性:
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
@AccessInput({
|
||||||
|
title: '授权方式',
|
||||||
|
value: 'apiKey', // 默认值
|
||||||
|
component: {
|
||||||
|
name: "a-select", // 基于 antdv 的输入组件
|
||||||
|
vModel: "value", // v-model 绑定的属性名
|
||||||
|
options: [ // 组件参数
|
||||||
|
{ label: "API密钥(推荐)", value: "apiKey" },
|
||||||
|
{ label: "账号密码", value: "account" },
|
||||||
|
],
|
||||||
|
placeholder: 'demoKeyId',
|
||||||
|
},
|
||||||
|
required: true,
|
||||||
|
})
|
||||||
|
apiType = '';
|
||||||
|
|
||||||
|
@AccessInput({
|
||||||
|
title: '密钥Id',
|
||||||
|
component: {
|
||||||
|
name:"a-input",
|
||||||
|
allowClear: true,
|
||||||
|
placeholder: 'demoKeyId',
|
||||||
|
},
|
||||||
|
required: true,
|
||||||
|
})
|
||||||
|
demoKeyId = '';
|
||||||
|
|
||||||
|
@AccessInput({
|
||||||
|
title: '密钥',//标题
|
||||||
|
required: true, //text组件可以省略
|
||||||
|
encrypt: true, //该属性是否需要加密
|
||||||
|
})
|
||||||
|
demoKeySecret = '';
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4. 实现测试方法
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
@AccessInput({
|
||||||
|
title: "测试",
|
||||||
|
component: {
|
||||||
|
name: "api-test",
|
||||||
|
action: "TestRequest"
|
||||||
|
},
|
||||||
|
helper: "点击测试接口是否正常"
|
||||||
|
})
|
||||||
|
testRequest = true;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 会通过上面的testRequest参数在ui界面上生成测试按钮,供用户测试接口调用是否正常
|
||||||
|
*/
|
||||||
|
async onTestRequest() {
|
||||||
|
await this.GetDomainList({});
|
||||||
|
return "ok"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5. 实现 API 方法
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
/**
|
||||||
|
* 获api接口示例 取域名列表,
|
||||||
|
*/
|
||||||
|
async GetDomainList(req: PageSearch): Promise<PageRes<DomainRecord>> {
|
||||||
|
//输出日志必须使用ctx.logger
|
||||||
|
this.ctx.logger.info(`获取域名列表,req:${JSON.stringify(req)}`);
|
||||||
|
const pager = new Pager(req);
|
||||||
|
const resp = await this.doRequest({
|
||||||
|
action: "ListDomains",
|
||||||
|
data: {
|
||||||
|
domain: req.searchKey,
|
||||||
|
offset: pager.getOffset(),
|
||||||
|
limit: pager.pageSize,
|
||||||
|
}
|
||||||
|
});
|
||||||
|
const total = resp?.TotalCount || 0;
|
||||||
|
let list = resp?.DomainList?.map((item) => {
|
||||||
|
item.domain = item.Domain;
|
||||||
|
item.id = item.DomainId;
|
||||||
|
return item;
|
||||||
|
})
|
||||||
|
return {
|
||||||
|
total,
|
||||||
|
list
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通用api调用方法, 具体如何构造请求体,需参考对应应用的API文档
|
||||||
|
*/
|
||||||
|
async doRequest(req: { action: string, data?: any }) {
|
||||||
|
const res = await this.ctx.http.request({
|
||||||
|
url: "https://api.demo.cn/api/",
|
||||||
|
method: "POST",
|
||||||
|
data: {
|
||||||
|
Action: req.action,
|
||||||
|
Body: req.data
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (res.Code !== 0) {
|
||||||
|
//异常处理
|
||||||
|
throw new Error(res.Message || "请求失败");
|
||||||
|
}
|
||||||
|
return res.Resp;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## 注意事项
|
||||||
|
|
||||||
|
1. **插件命名**:插件名称应简洁明了,反映其功能。
|
||||||
|
2. **属性加密**:对于敏感信息(如密钥),应设置 `encrypt: true`。
|
||||||
|
3. **日志输出**:必须使用 `this.ctx.logger` 输出日志,而不是 `console`。
|
||||||
|
4. **错误处理**:API 调用失败时应抛出明确的错误信息。
|
||||||
|
5. **测试方法**:实现 `onTestRequest` 方法,以便用户可以测试授权是否正常。
|
||||||
14
.trae/skills/agent.md
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
你是一名资深nodejs工程师,擅长开发Certd开源系统的任务插件。
|
||||||
|
certd是一款全自动证书申请部署管理工具,基于流水线的方式,通过里面申请证书插件申请证书,然后将证书传递给下一个部署任务插件,不同的部署任务插件将证书部署到用户的各个应用系统当中。
|
||||||
|
|
||||||
|
certd插件分成以下几种类型:
|
||||||
|
Access:存储用户的第三放应用的授权数据,比如用户名密码,accessSecret 或 accessToken等。同时它里面的方法还负责对接第三方的api接口
|
||||||
|
Task: 部署任务插件,它继承AbstractTaskPlugin类,被流水线调用execute方法,将证书部署到对应的应用上
|
||||||
|
DnsProvider: DNS提供商插件,它用于在ACME申请证书时给域名添加txt解析记录。
|
||||||
|
|
||||||
|
在开始工作前,请阅读并加载.trae/skills下面的技能,根据skills进行相应的插件开发
|
||||||
|
当开发过程中遇到问题,需要参考plugins目录下的其他插件,或者用户提醒你更好的做法时,你需要总结经验,更新相应的skills,让skills越来越完善,能够在以后得新插件开发中具备指导意义。
|
||||||
|
|
||||||
|
一般调用的api接口文档会比较复杂,你不知道接口是什么时,请务必询问用户,让用户提供API接口文档
|
||||||
|
|
||||||
|
完成开发后无需测试,通知用户自己去测试
|
||||||
212
.trae/skills/dns-provider-dev/SKILL.md
Normal file
@@ -0,0 +1,212 @@
|
|||||||
|
# DNS Provider 插件开发技能
|
||||||
|
|
||||||
|
## 什么是 DNS Provider 插件
|
||||||
|
|
||||||
|
DNS Provider 插件是 Certd 系统中的 DNS 提供商插件,它用于在 ACME 申请证书时给域名添加 TXT 解析记录,以验证域名所有权。
|
||||||
|
|
||||||
|
## 开发步骤
|
||||||
|
|
||||||
|
### 1. 导入必要的依赖
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
import { AbstractDnsProvider, CreateRecordOptions, IsDnsProvider, RemoveRecordOptions } from '@certd/plugin-cert';
|
||||||
|
import { DemoAccess } from './access.js';
|
||||||
|
import { isDev } from '../../utils/env.js';
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. 定义记录数据结构
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
type DemoRecord = {
|
||||||
|
// 这里定义 Record 记录的数据结构,跟对应云平台接口返回值一样即可,一般是拿到 id 就行,用于删除 txt 解析记录,清理申请痕迹
|
||||||
|
// id:string
|
||||||
|
};
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. 使用 @IsDnsProvider 注解注册插件
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
// 这里通过 IsDnsProvider 注册一个 dnsProvider
|
||||||
|
@IsDnsProvider({
|
||||||
|
name: 'demo', // 插件唯一标识
|
||||||
|
title: 'Dns提供商Demo', // 插件标题
|
||||||
|
desc: 'dns provider示例', // 插件描述
|
||||||
|
icon: 'clarity:plugin-line', // 插件图标
|
||||||
|
// 这里是对应的云平台的 access 类型名称
|
||||||
|
accessType: 'demo',
|
||||||
|
order: 99, // 排序
|
||||||
|
})
|
||||||
|
export class DemoDnsProvider extends AbstractDnsProvider<DemoRecord> {
|
||||||
|
access!: DemoAccess;
|
||||||
|
|
||||||
|
async onInstance() {
|
||||||
|
this.access = this.ctx.access as DemoAccess;
|
||||||
|
// 也可以通过 ctx 成员变量传递 context
|
||||||
|
this.logger.debug('access', this.access);
|
||||||
|
// 初始化的操作
|
||||||
|
// ...
|
||||||
|
}
|
||||||
|
|
||||||
|
// 插件实现...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4. 实现 createRecord 方法
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
/**
|
||||||
|
* 创建 dns 解析记录,用于验证域名所有权
|
||||||
|
*/
|
||||||
|
async createRecord(options: CreateRecordOptions): Promise<any> {
|
||||||
|
/**
|
||||||
|
* options 参数说明
|
||||||
|
* fullRecord: '_acme-challenge.example.com',
|
||||||
|
* value: 一串 uuid
|
||||||
|
* type: 'TXT',
|
||||||
|
* domain: 'example.com'
|
||||||
|
*/
|
||||||
|
const { fullRecord, value, type, domain } = options;
|
||||||
|
this.logger.info('添加域名解析:', fullRecord, value, type, domain);
|
||||||
|
|
||||||
|
// 调用创建 dns 解析记录的对应的云端接口,创建 txt 类型的 dns 解析记录
|
||||||
|
// 请根据实际接口情况调用,例如:
|
||||||
|
// const createDnsRecordUrl = "xxx"
|
||||||
|
// const record = this.http.post(createDnsRecordUrl,{
|
||||||
|
// // 授权参数
|
||||||
|
// // 创建 dns 解析记录的参数
|
||||||
|
// })
|
||||||
|
// // 返回本次创建的 dns 解析记录,这个记录会在删除的时候用到
|
||||||
|
// return record
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5. 实现 removeRecord 方法
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
/**
|
||||||
|
* 删除 dns 解析记录,清理申请痕迹
|
||||||
|
* @param options
|
||||||
|
*/
|
||||||
|
async removeRecord(options: RemoveRecordOptions<DemoRecord>): Promise<void> {
|
||||||
|
const { fullRecord, value, domain } = options.recordReq;
|
||||||
|
const record = options.recordRes;
|
||||||
|
this.logger.info('删除域名解析:', domain, fullRecord, value, record);
|
||||||
|
// 这里调用删除 txt dns 解析记录接口
|
||||||
|
// 请根据实际接口情况调用,例如:
|
||||||
|
|
||||||
|
// const deleteDnsRecordUrl = "xxx"
|
||||||
|
// const res = this.http.delete(deleteDnsRecordUrl,{
|
||||||
|
// // 授权参数
|
||||||
|
// // 删除 dns 解析记录的参数
|
||||||
|
// })
|
||||||
|
|
||||||
|
|
||||||
|
this.logger.info('删除域名解析成功:', fullRecord, value);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 6. 实例化插件
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
// 实例化这个 provider,将其自动注册到系统中
|
||||||
|
if (isDev()) {
|
||||||
|
// 你的实现 要去掉这个 if,不然生产环境将不会显示
|
||||||
|
new DemoDnsProvider();
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## 注意事项
|
||||||
|
|
||||||
|
1. **插件命名**:插件名称应简洁明了,反映其功能。
|
||||||
|
2. **accessType**:必须指定对应的云平台的 access 类型名称。
|
||||||
|
3. **记录结构**:定义适合对应云平台的记录数据结构,至少包含 id 字段用于删除记录。
|
||||||
|
4. **日志输出**:使用 `this.logger` 输出日志,而不是 `console`。
|
||||||
|
5. **错误处理**:API 调用失败时应抛出明确的错误信息。
|
||||||
|
6. **实例化**:生产环境中应移除 `if (isDev())` 条件,确保插件在生产环境中也能被注册。
|
||||||
|
|
||||||
|
## 完整示例
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
import { AbstractDnsProvider, CreateRecordOptions, IsDnsProvider, RemoveRecordOptions } from '@certd/plugin-cert';
|
||||||
|
import { DemoAccess } from './access.js';
|
||||||
|
import { isDev } from '../../utils/env.js';
|
||||||
|
|
||||||
|
type DemoRecord = {
|
||||||
|
// 这里定义 Record 记录的数据结构,跟对应云平台接口返回值一样即可,一般是拿到 id 就行,用于删除 txt 解析记录,清理申请痕迹
|
||||||
|
// id:string
|
||||||
|
};
|
||||||
|
|
||||||
|
// 这里通过 IsDnsProvider 注册一个 dnsProvider
|
||||||
|
@IsDnsProvider({
|
||||||
|
name: 'demo',
|
||||||
|
title: 'Dns提供商Demo',
|
||||||
|
desc: 'dns provider示例',
|
||||||
|
icon: 'clarity:plugin-line',
|
||||||
|
// 这里是对应的云平台的 access 类型名称
|
||||||
|
accessType: 'demo',
|
||||||
|
order: 99,
|
||||||
|
})
|
||||||
|
export class DemoDnsProvider extends AbstractDnsProvider<DemoRecord> {
|
||||||
|
access!: DemoAccess;
|
||||||
|
|
||||||
|
async onInstance() {
|
||||||
|
this.access = this.ctx.access as DemoAccess;
|
||||||
|
// 也可以通过 ctx 成员变量传递 context
|
||||||
|
this.logger.debug('access', this.access);
|
||||||
|
// 初始化的操作
|
||||||
|
// ...
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 创建 dns 解析记录,用于验证域名所有权
|
||||||
|
*/
|
||||||
|
async createRecord(options: CreateRecordOptions): Promise<any> {
|
||||||
|
/**
|
||||||
|
* options 参数说明
|
||||||
|
* fullRecord: '_acme-challenge.example.com',
|
||||||
|
* value: 一串 uuid
|
||||||
|
* type: 'TXT',
|
||||||
|
* domain: 'example.com'
|
||||||
|
*/
|
||||||
|
const { fullRecord, value, type, domain } = options;
|
||||||
|
this.logger.info('添加域名解析:', fullRecord, value, type, domain);
|
||||||
|
|
||||||
|
// 调用创建 dns 解析记录的对应的云端接口,创建 txt 类型的 dns 解析记录
|
||||||
|
// 请根据实际接口情况调用,例如:
|
||||||
|
// const createDnsRecordUrl = "xxx"
|
||||||
|
// const record = this.http.post(createDnsRecordUrl,{
|
||||||
|
// // 授权参数
|
||||||
|
// // 创建 dns 解析记录的参数
|
||||||
|
// })
|
||||||
|
// // 返回本次创建的 dns 解析记录,这个记录会在删除的时候用到
|
||||||
|
// return record
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除 dns 解析记录,清理申请痕迹
|
||||||
|
* @param options
|
||||||
|
*/
|
||||||
|
async removeRecord(options: RemoveRecordOptions<DemoRecord>): Promise<void> {
|
||||||
|
const { fullRecord, value, domain } = options.recordReq;
|
||||||
|
const record = options.recordRes;
|
||||||
|
this.logger.info('删除域名解析:', domain, fullRecord, value, record);
|
||||||
|
// 这里调用删除 txt dns 解析记录接口
|
||||||
|
// 请根据实际接口情况调用,例如:
|
||||||
|
|
||||||
|
// const deleteDnsRecordUrl = "xxx"
|
||||||
|
// const res = this.http.delete(deleteDnsRecordUrl,{
|
||||||
|
// // 授权参数
|
||||||
|
// // 删除 dns 解析记录的参数
|
||||||
|
// })
|
||||||
|
|
||||||
|
|
||||||
|
this.logger.info('删除域名解析成功:', fullRecord, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 实例化这个 provider,将其自动注册到系统中
|
||||||
|
if (isDev()) {
|
||||||
|
// 你的实现 要去掉这个 if,不然生产环境将不会显示
|
||||||
|
new DemoDnsProvider();
|
||||||
|
}
|
||||||
|
```
|
||||||
1
.trae/skills/dns-provider-dev/examples/input.md
Normal file
@@ -0,0 +1 @@
|
|||||||
|
我需要开发一个 DNS Provider 插件,用于在 ACME 申请证书时添加 TXT 解析记录。请指导我如何实现。
|
||||||
121
.trae/skills/dns-provider-dev/examples/output.md
Normal file
@@ -0,0 +1,121 @@
|
|||||||
|
# DNS Provider 插件开发指南
|
||||||
|
|
||||||
|
## 开发步骤
|
||||||
|
|
||||||
|
### 1. 导入必要的依赖
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
import { AbstractDnsProvider, CreateRecordOptions, IsDnsProvider, RemoveRecordOptions } from '@certd/plugin-cert';
|
||||||
|
import { DemoAccess } from './access.js';
|
||||||
|
import { isDev } from '../../utils/env.js';
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. 定义记录数据结构
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
type DemoRecord = {
|
||||||
|
// 这里定义 Record 记录的数据结构,跟对应云平台接口返回值一样即可,一般是拿到 id 就行,用于删除 txt 解析记录,清理申请痕迹
|
||||||
|
// id:string
|
||||||
|
};
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. 使用 @IsDnsProvider 注解注册插件
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
// 这里通过 IsDnsProvider 注册一个 dnsProvider
|
||||||
|
@IsDnsProvider({
|
||||||
|
name: 'demo', // 插件唯一标识
|
||||||
|
title: 'Dns提供商Demo', // 插件标题
|
||||||
|
desc: 'dns provider示例', // 插件描述
|
||||||
|
icon: 'clarity:plugin-line', // 插件图标
|
||||||
|
// 这里是对应的云平台的 access 类型名称
|
||||||
|
accessType: 'demo',
|
||||||
|
order: 99, // 排序
|
||||||
|
})
|
||||||
|
export class DemoDnsProvider extends AbstractDnsProvider<DemoRecord> {
|
||||||
|
access!: DemoAccess;
|
||||||
|
|
||||||
|
async onInstance() {
|
||||||
|
this.access = this.ctx.access as DemoAccess;
|
||||||
|
// 也可以通过 ctx 成员变量传递 context
|
||||||
|
this.logger.debug('access', this.access);
|
||||||
|
// 初始化的操作
|
||||||
|
// ...
|
||||||
|
}
|
||||||
|
|
||||||
|
// 插件实现...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4. 实现 createRecord 方法
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
/**
|
||||||
|
* 创建 dns 解析记录,用于验证域名所有权
|
||||||
|
*/
|
||||||
|
async createRecord(options: CreateRecordOptions): Promise<any> {
|
||||||
|
/**
|
||||||
|
* options 参数说明
|
||||||
|
* fullRecord: '_acme-challenge.example.com',
|
||||||
|
* value: 一串 uuid
|
||||||
|
* type: 'TXT',
|
||||||
|
* domain: 'example.com'
|
||||||
|
*/
|
||||||
|
const { fullRecord, value, type, domain } = options;
|
||||||
|
this.logger.info('添加域名解析:', fullRecord, value, type, domain);
|
||||||
|
|
||||||
|
// 调用创建 dns 解析记录的对应的云端接口,创建 txt 类型的 dns 解析记录
|
||||||
|
// 请根据实际接口情况调用,例如:
|
||||||
|
// const createDnsRecordUrl = "xxx"
|
||||||
|
// const record = this.http.post(createDnsRecordUrl,{
|
||||||
|
// // 授权参数
|
||||||
|
// // 创建 dns 解析记录的参数
|
||||||
|
// })
|
||||||
|
// // 返回本次创建的 dns 解析记录,这个记录会在删除的时候用到
|
||||||
|
// return record
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5. 实现 removeRecord 方法
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
/**
|
||||||
|
* 删除 dns 解析记录,清理申请痕迹
|
||||||
|
* @param options
|
||||||
|
*/
|
||||||
|
async removeRecord(options: RemoveRecordOptions<DemoRecord>): Promise<void> {
|
||||||
|
const { fullRecord, value, domain } = options.recordReq;
|
||||||
|
const record = options.recordRes;
|
||||||
|
this.logger.info('删除域名解析:', domain, fullRecord, value, record);
|
||||||
|
// 这里调用删除 txt dns 解析记录接口
|
||||||
|
// 请根据实际接口情况调用,例如:
|
||||||
|
|
||||||
|
// const deleteDnsRecordUrl = "xxx"
|
||||||
|
// const res = this.http.delete(deleteDnsRecordUrl,{
|
||||||
|
// // 授权参数
|
||||||
|
// // 删除 dns 解析记录的参数
|
||||||
|
// })
|
||||||
|
|
||||||
|
|
||||||
|
this.logger.info('删除域名解析成功:', fullRecord, value);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 6. 实例化插件
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
// 实例化这个 provider,将其自动注册到系统中
|
||||||
|
if (isDev()) {
|
||||||
|
// 你的实现 要去掉这个 if,不然生产环境将不会显示
|
||||||
|
new DemoDnsProvider();
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## 注意事项
|
||||||
|
|
||||||
|
1. **插件命名**:插件名称应简洁明了,反映其功能。
|
||||||
|
2. **accessType**:必须指定对应的云平台的 access 类型名称。
|
||||||
|
3. **记录结构**:定义适合对应云平台的记录数据结构,至少包含 id 字段用于删除记录。
|
||||||
|
4. **日志输出**:使用 `this.logger` 输出日志,而不是 `console`。
|
||||||
|
5. **错误处理**:API 调用失败时应抛出明确的错误信息。
|
||||||
|
6. **实例化**:生产环境中应移除 `if (isDev())` 条件,确保插件在生产环境中也能被注册。
|
||||||
201
.trae/skills/plugin-converter/SKILL.md
Normal file
@@ -0,0 +1,201 @@
|
|||||||
|
# 插件转换工具技能
|
||||||
|
|
||||||
|
## 什么是插件转换工具
|
||||||
|
|
||||||
|
插件转换工具是一个用于将 Certd 插件转换为 YAML 配置文件的命令行工具。它可以分析单个插件文件,识别插件类型,并生成对应的 YAML 配置,可以让插件分发和在线注册。
|
||||||
|
|
||||||
|
## 工具位置
|
||||||
|
|
||||||
|
`trae/skills/convert-plugin-to-yaml.js`
|
||||||
|
|
||||||
|
## 功能特性
|
||||||
|
|
||||||
|
- **单个插件转换**:支持指定单个插件文件进行转换,而不是扫描整个目录
|
||||||
|
- **自动类型识别**:自动识别插件类型(Access、Task、DNS Provider、Notification、Addon)
|
||||||
|
- **详细日志输出**:提供详细的转换过程日志,便于调试
|
||||||
|
- **YAML 配置生成**:生成标准的 YAML 配置文件
|
||||||
|
- **配置文件保存**:自动将生成的配置保存到 `./metadata` 目录
|
||||||
|
- **可复用函数**:导出了可复用的函数,便于其他模块调用
|
||||||
|
|
||||||
|
## 使用方法
|
||||||
|
|
||||||
|
### 基本用法
|
||||||
|
|
||||||
|
```bash
|
||||||
|
node trae/skills/convert-plugin-to-yaml.js <插件文件路径>
|
||||||
|
```
|
||||||
|
|
||||||
|
### 示例
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 转换 Access 插件
|
||||||
|
node trae/skills/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/access.js
|
||||||
|
|
||||||
|
# 转换 Task 插件
|
||||||
|
node trae/skills/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.js
|
||||||
|
|
||||||
|
# 转换 DNS Provider 插件
|
||||||
|
node trae/skills/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/dns-provider.js
|
||||||
|
```
|
||||||
|
|
||||||
|
## 转换过程
|
||||||
|
|
||||||
|
1. **加载插件模块**:使用 `import()` 动态加载指定的插件文件
|
||||||
|
2. **分析插件定义**:检查模块导出的对象,寻找带有 `define` 属性的插件
|
||||||
|
3. **识别插件类型**:根据插件的继承关系或属性识别插件类型
|
||||||
|
4. **生成 YAML 配置**:基于插件定义生成标准的 YAML 配置
|
||||||
|
5. **保存配置文件**:将生成的配置保存到 `./metadata` 目录
|
||||||
|
|
||||||
|
## 输出说明
|
||||||
|
|
||||||
|
### 命令行输出
|
||||||
|
|
||||||
|
执行转换命令后,工具会输出以下信息:
|
||||||
|
|
||||||
|
- 插件加载状态
|
||||||
|
- 插件导出的对象列表
|
||||||
|
- 插件类型识别结果
|
||||||
|
- 生成的 YAML 配置内容
|
||||||
|
- 配置文件保存路径
|
||||||
|
|
||||||
|
### 配置文件命名规则
|
||||||
|
|
||||||
|
生成的配置文件命名规则为:
|
||||||
|
|
||||||
|
```
|
||||||
|
<插件类型>[_<子类型>]_<插件名称>.yaml
|
||||||
|
```
|
||||||
|
|
||||||
|
例如:
|
||||||
|
- `access_demo.yaml`(Access 插件)
|
||||||
|
- `deploy_DemoTest.yaml`(Task 插件)
|
||||||
|
- `dnsProvider_demo.yaml`(DNS Provider 插件)
|
||||||
|
|
||||||
|
## 插件类型识别逻辑
|
||||||
|
|
||||||
|
工具通过以下逻辑识别插件类型:
|
||||||
|
|
||||||
|
1. **DNS Provider**:如果插件定义中包含 `accessType` 属性
|
||||||
|
2. **Task**:如果插件继承自 `AbstractTaskPlugin`
|
||||||
|
3. **Notification**:如果插件继承自 `BaseNotification`
|
||||||
|
4. **Access**:如果插件继承自 `BaseAccess`
|
||||||
|
5. **Addon**:如果插件继承自 `BaseAddon`
|
||||||
|
|
||||||
|
## 注意事项
|
||||||
|
|
||||||
|
1. **文件路径**:插件文件路径可以是相对路径或绝对路径
|
||||||
|
2. **文件格式**:仅支持 `.js` 文件,不支持 `.ts` 文件(需要先编译)
|
||||||
|
3. **依赖安装**:执行前确保已安装所有必要的依赖
|
||||||
|
4. **配置目录**:如果 `./metadata` 目录不存在,工具会自动创建
|
||||||
|
5. **错误处理**:如果插件加载失败或识别失败,工具会输出错误信息但不会终止执行
|
||||||
|
|
||||||
|
## 代码结构
|
||||||
|
|
||||||
|
### 主要函数
|
||||||
|
|
||||||
|
1. **isPrototypeOf(value, cls)**:检查对象是否是指定类的原型
|
||||||
|
2. **loadSingleModule(filePath)**:加载单个插件模块
|
||||||
|
3. **convertSinglePlugin(pluginPath)**:分析单个插件并生成 YAML 配置
|
||||||
|
4. **main()**:主函数,处理命令行参数并执行转换
|
||||||
|
|
||||||
|
### 导出函数
|
||||||
|
|
||||||
|
工具导出了以下函数,便于其他模块调用:
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
export {
|
||||||
|
convertSinglePlugin, // 转换单个插件
|
||||||
|
loadSingleModule, // 加载单个模块
|
||||||
|
isPrototypeOf // 检查原型关系
|
||||||
|
};
|
||||||
|
```
|
||||||
|
|
||||||
|
## 应用场景
|
||||||
|
|
||||||
|
1. **插件开发**:在开发新插件时,快速生成配置文件
|
||||||
|
2. **插件调试**:查看插件的内部定义和配置
|
||||||
|
3. **插件管理**:批量转换现有插件为标准配置格式
|
||||||
|
4. **自动化构建**:集成到构建流程中,自动生成插件配置
|
||||||
|
|
||||||
|
## 示例输出
|
||||||
|
|
||||||
|
### 转换 Access 插件示例
|
||||||
|
|
||||||
|
```bash
|
||||||
|
$ node trae/skills/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/access.js
|
||||||
|
开始转换插件: packages/ui/certd-server/src/plugins/plugin-demo/access.js
|
||||||
|
插件模块导出了 1 个对象: DemoAccess
|
||||||
|
处理插件: DemoAccess
|
||||||
|
插件类型: access
|
||||||
|
脚本路径: packages/ui/certd-server/src/plugins/plugin-demo/access.js
|
||||||
|
|
||||||
|
生成的 YAML 配置:
|
||||||
|
name: demo
|
||||||
|
title: 授权插件示例
|
||||||
|
desc: 这是一个示例授权插件,用于演示如何实现一个授权插件
|
||||||
|
icon: clarity:plugin-line
|
||||||
|
pluginType: access
|
||||||
|
type: builtIn
|
||||||
|
scriptFilePath: packages/ui/certd-server/src/plugins/plugin-demo/access.js
|
||||||
|
|
||||||
|
YAML 配置已保存到: ./metadata/access_demo.yaml
|
||||||
|
插件转换完成!
|
||||||
|
```
|
||||||
|
|
||||||
|
### 转换 Task 插件示例
|
||||||
|
|
||||||
|
```bash
|
||||||
|
$ node trae/skills/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.js
|
||||||
|
开始转换插件: packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.js
|
||||||
|
插件模块导出了 1 个对象: DemoTest
|
||||||
|
处理插件: DemoTest
|
||||||
|
插件类型: deploy
|
||||||
|
脚本路径: packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.js
|
||||||
|
|
||||||
|
生成的 YAML 配置:
|
||||||
|
name: DemoTest
|
||||||
|
title: Demo-测试插件
|
||||||
|
desc: ""
|
||||||
|
icon: clarity:plugin-line
|
||||||
|
group: other
|
||||||
|
default:
|
||||||
|
strategy:
|
||||||
|
runStrategy: SkipWhenSucceed
|
||||||
|
pluginType: deploy
|
||||||
|
type: builtIn
|
||||||
|
scriptFilePath: packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.js
|
||||||
|
|
||||||
|
YAML 配置已保存到: ./metadata/deploy_DemoTest.yaml
|
||||||
|
插件转换完成!
|
||||||
|
```
|
||||||
|
|
||||||
|
## 故障排除
|
||||||
|
|
||||||
|
### 常见问题
|
||||||
|
|
||||||
|
1. **模块加载失败**
|
||||||
|
- 原因:插件文件依赖未安装或路径错误
|
||||||
|
- 解决:确保已安装所有依赖,检查文件路径是否正确
|
||||||
|
|
||||||
|
2. **插件类型识别失败**
|
||||||
|
- 原因:插件未正确继承基类或缺少必要的属性
|
||||||
|
- 解决:检查插件代码,确保正确继承对应的基类
|
||||||
|
|
||||||
|
3. **YAML 配置生成失败**
|
||||||
|
- 原因:插件定义格式不正确
|
||||||
|
- 解决:检查插件的 `define` 属性格式是否正确
|
||||||
|
|
||||||
|
4. **配置文件保存失败**
|
||||||
|
- 原因:权限不足或磁盘空间不足
|
||||||
|
- 解决:确保有足够的权限和磁盘空间
|
||||||
|
|
||||||
|
### 调试建议
|
||||||
|
|
||||||
|
- **查看详细日志**:工具会输出详细的转换过程日志,仔细查看日志信息
|
||||||
|
- **检查插件代码**:确保插件代码符合 Certd 插件开发规范
|
||||||
|
- **尝试简化插件**:如果转换失败,尝试创建一个最小化的插件示例进行测试
|
||||||
|
- **检查依赖版本**:确保使用的依赖版本与 Certd 兼容
|
||||||
|
|
||||||
|
## 总结
|
||||||
|
|
||||||
|
插件转换工具是一个方便实用的工具,它可以帮助开发者快速生成插件的 YAML 配置文件,简化插件的注册和管理过程。通过命令行参数指定单个插件文件,工具会自动完成类型识别、配置生成和保存等操作,大大提高了插件开发和管理的效率。
|
||||||
1
.trae/skills/plugin-converter/examples/input.md
Normal file
@@ -0,0 +1 @@
|
|||||||
|
我需要将一个插件转换为 YAML 配置文件。请指导我如何使用插件转换工具。
|
||||||
95
.trae/skills/plugin-converter/examples/output.md
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
# 插件转换工具使用指南
|
||||||
|
|
||||||
|
## 工具说明
|
||||||
|
|
||||||
|
插件转换工具用于将单个 Certd 插件转换为 YAML 配置文件,方便插件的注册和管理。
|
||||||
|
|
||||||
|
## 工具位置
|
||||||
|
|
||||||
|
`.trae/skills/plugin-converter/resources/convert-plugin-to-yaml.js`
|
||||||
|
|
||||||
|
## 使用方法
|
||||||
|
|
||||||
|
### 基本用法
|
||||||
|
|
||||||
|
```bash
|
||||||
|
node .trae/skills/plugin-converter/resources/convert-plugin-to-yaml.js <插件文件路径>
|
||||||
|
```
|
||||||
|
|
||||||
|
### 示例
|
||||||
|
|
||||||
|
#### 转换 Access 插件
|
||||||
|
|
||||||
|
```bash
|
||||||
|
node .trae/skills/plugin-converter/resources/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/access.js
|
||||||
|
```
|
||||||
|
|
||||||
|
#### 转换 Task 插件
|
||||||
|
|
||||||
|
```bash
|
||||||
|
node .trae/skills/plugin-converter/resources/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.js
|
||||||
|
```
|
||||||
|
|
||||||
|
#### 转换 DNS Provider 插件
|
||||||
|
|
||||||
|
```bash
|
||||||
|
node .trae/skills/plugin-converter/resources/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/dns-provider.js
|
||||||
|
```
|
||||||
|
|
||||||
|
## 转换过程
|
||||||
|
|
||||||
|
1. **加载插件模块**:使用 `import()` 动态加载指定的插件文件
|
||||||
|
2. **分析插件定义**:检查模块导出的对象,寻找带有 `define` 属性的插件
|
||||||
|
3. **识别插件类型**:根据插件的继承关系或属性识别插件类型
|
||||||
|
4. **生成 YAML 配置**:基于插件定义生成标准的 YAML 配置
|
||||||
|
5. **保存配置文件**:将生成的配置保存到 `./metadata` 目录
|
||||||
|
|
||||||
|
## 输出说明
|
||||||
|
|
||||||
|
### 命令行输出
|
||||||
|
|
||||||
|
执行转换命令后,工具会输出以下信息:
|
||||||
|
|
||||||
|
- 插件加载状态
|
||||||
|
- 插件导出的对象列表
|
||||||
|
- 插件类型识别结果
|
||||||
|
- 生成的 YAML 配置内容
|
||||||
|
- 配置文件保存路径
|
||||||
|
|
||||||
|
### 配置文件命名规则
|
||||||
|
|
||||||
|
生成的配置文件命名规则为:
|
||||||
|
|
||||||
|
```
|
||||||
|
<插件类型>[_<子类型>]_<插件名称>.yaml
|
||||||
|
```
|
||||||
|
|
||||||
|
例如:
|
||||||
|
- `access_demo.yaml`(Access 插件)
|
||||||
|
- `deploy_DemoTest.yaml`(Task 插件)
|
||||||
|
- `dnsProvider_demo.yaml`(DNS Provider 插件)
|
||||||
|
|
||||||
|
## 示例输出
|
||||||
|
|
||||||
|
### 转换 Access 插件示例
|
||||||
|
|
||||||
|
```bash
|
||||||
|
$ node .trae/skills/plugin-converter/resources/convert-plugin-to-yaml.js packages/ui/certd-server/src/plugins/plugin-demo/access.js
|
||||||
|
开始转换插件: packages/ui/certd-server/src/plugins/plugin-demo/access.js
|
||||||
|
插件模块导出了 1 个对象: DemoAccess
|
||||||
|
处理插件: DemoAccess
|
||||||
|
插件类型: access
|
||||||
|
脚本路径: packages/ui/certd-server/src/plugins/plugin-demo/access.js
|
||||||
|
|
||||||
|
生成的 YAML 配置:
|
||||||
|
name: demo
|
||||||
|
title: 授权插件示例
|
||||||
|
desc: 这是一个示例授权插件,用于演示如何实现一个授权插件
|
||||||
|
icon: clarity:plugin-line
|
||||||
|
pluginType: access
|
||||||
|
type: builtIn
|
||||||
|
scriptFilePath: packages/ui/certd-server/src/plugins/plugin-demo/access.js
|
||||||
|
|
||||||
|
YAML 配置已保存到: ./metadata/access_demo.yaml
|
||||||
|
插件转换完成!
|
||||||
|
```
|
||||||
@@ -0,0 +1,160 @@
|
|||||||
|
// 转换单个插件为 YAML 配置的技能脚本
|
||||||
|
|
||||||
|
import path from "path";
|
||||||
|
import fs from "fs";
|
||||||
|
import { pathToFileURL } from "node:url";
|
||||||
|
import * as yaml from "js-yaml";
|
||||||
|
import { AbstractTaskPlugin, BaseAccess, BaseNotification} from "@certd/pipeline";
|
||||||
|
import { BaseAddon} from "@certd/lib-server";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 检查对象是否是指定类的原型
|
||||||
|
*/
|
||||||
|
function isPrototypeOf(value, cls) {
|
||||||
|
return cls.prototype.isPrototypeOf(value.prototype);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 加载单个插件模块
|
||||||
|
*/
|
||||||
|
async function loadSingleModule(filePath) {
|
||||||
|
try {
|
||||||
|
// 转换为 file:// URL(Windows 必需)
|
||||||
|
const moduleUrl = pathToFileURL(filePath).href;
|
||||||
|
const module = await import(moduleUrl);
|
||||||
|
return module.default || module;
|
||||||
|
} catch (err) {
|
||||||
|
console.error(`加载模块 ${filePath} 失败:`, err);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分析单个插件并生成 YAML 配置
|
||||||
|
*/
|
||||||
|
async function convertSinglePlugin(pluginPath) {
|
||||||
|
console.log(`开始转换插件: ${pluginPath}`);
|
||||||
|
|
||||||
|
// 加载插件模块
|
||||||
|
const module = await loadSingleModule(pluginPath);
|
||||||
|
if (!module) {
|
||||||
|
console.error("加载插件失败,退出");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理模块中的所有导出
|
||||||
|
const entry = Object.entries(module);
|
||||||
|
if (entry.length === 0) {
|
||||||
|
console.error("插件模块没有导出任何内容");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`插件模块导出了 ${entry.length} 个对象: ${entry.map(([name]) => name).join(", ")}`);
|
||||||
|
|
||||||
|
// 处理每个导出的对象
|
||||||
|
for (const [name, value] of entry) {
|
||||||
|
// 检查是否是插件(有 define 属性)
|
||||||
|
if (!value.define) {
|
||||||
|
console.log(`跳过非插件对象: ${name}`);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`处理插件: ${name}`);
|
||||||
|
|
||||||
|
// 构建插件定义
|
||||||
|
const pluginDefine = {
|
||||||
|
...value.define
|
||||||
|
};
|
||||||
|
|
||||||
|
let subType = "";
|
||||||
|
|
||||||
|
// 确定插件类型
|
||||||
|
if (pluginDefine.accessType) {
|
||||||
|
pluginDefine.pluginType = "dnsProvider";
|
||||||
|
} else if (isPrototypeOf(value, AbstractTaskPlugin)) {
|
||||||
|
pluginDefine.pluginType = "deploy";
|
||||||
|
} else if (isPrototypeOf(value, BaseNotification)) {
|
||||||
|
pluginDefine.pluginType = "notification";
|
||||||
|
} else if (isPrototypeOf(value, BaseAccess)) {
|
||||||
|
pluginDefine.pluginType = "access";
|
||||||
|
} else if (isPrototypeOf(value, BaseAddon)) {
|
||||||
|
pluginDefine.pluginType = "addon";
|
||||||
|
subType = "_" + (pluginDefine.addonType || "");
|
||||||
|
} else {
|
||||||
|
console.log(`[warning] 未知的插件类型:${pluginDefine.name}`);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
pluginDefine.type = "builtIn";
|
||||||
|
|
||||||
|
// 计算脚本文件路径
|
||||||
|
const relativePath = path.relative(process.cwd(), pluginPath);
|
||||||
|
const scriptFilePath = relativePath.replace(/\\/g, "/").replace(/\.js$/, ".js");
|
||||||
|
pluginDefine.scriptFilePath = scriptFilePath;
|
||||||
|
|
||||||
|
console.log(`插件类型: ${pluginDefine.pluginType}`);
|
||||||
|
console.log(`脚本路径: ${scriptFilePath}`);
|
||||||
|
|
||||||
|
// 生成 YAML 配置
|
||||||
|
const yamlContent = yaml.dump(pluginDefine);
|
||||||
|
console.log("\n生成的 YAML 配置:");
|
||||||
|
console.log(yamlContent);
|
||||||
|
|
||||||
|
// 可选:保存到文件
|
||||||
|
const outputDir = "./metadata";
|
||||||
|
if (!fs.existsSync(outputDir)) {
|
||||||
|
fs.mkdirSync(outputDir, { recursive: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
const outputFileName = `${pluginDefine.pluginType}${subType}_${pluginDefine.name}.yaml`;
|
||||||
|
const outputPath = path.join(outputDir, outputFileName);
|
||||||
|
|
||||||
|
fs.writeFileSync(outputPath, yamlContent, 'utf8');
|
||||||
|
console.log(`\nYAML 配置已保存到: ${outputPath}`);
|
||||||
|
|
||||||
|
return pluginDefine;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.error("未找到有效的插件定义");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 主函数
|
||||||
|
*/
|
||||||
|
async function main() {
|
||||||
|
const args = process.argv.slice(2);
|
||||||
|
|
||||||
|
if (args.length === 0) {
|
||||||
|
console.error("请指定插件文件路径");
|
||||||
|
console.log("用法: node convert-plugin-to-yaml.js <插件文件路径>");
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const pluginPath = args[0];
|
||||||
|
|
||||||
|
if (!fs.existsSync(pluginPath)) {
|
||||||
|
console.error(`插件文件不存在: ${pluginPath}`);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await convertSinglePlugin(pluginPath);
|
||||||
|
console.log("\n插件转换完成!");
|
||||||
|
} catch (error) {
|
||||||
|
console.error("转换过程中出错:", error);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果直接运行此脚本
|
||||||
|
if (import.meta.url === pathToFileURL(process.argv[1]).href) {
|
||||||
|
main();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 导出函数,以便其他模块使用
|
||||||
|
export {
|
||||||
|
convertSinglePlugin,
|
||||||
|
loadSingleModule,
|
||||||
|
isPrototypeOf
|
||||||
|
};
|
||||||
|
|
||||||
437
.trae/skills/task-plugin-dev/SKILL.md
Normal file
@@ -0,0 +1,437 @@
|
|||||||
|
# Task 插件开发技能
|
||||||
|
|
||||||
|
## 什么是 Task 插件
|
||||||
|
|
||||||
|
Task 插件是 Certd 系统中的部署任务插件,它继承自 `AbstractTaskPlugin` 类,被流水线调用 `execute` 方法,将证书部署到对应的应用上。
|
||||||
|
|
||||||
|
## 开发步骤
|
||||||
|
|
||||||
|
### 1. 导入必要的依赖
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
import { AbstractTaskPlugin, IsTaskPlugin, PageSearch, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
|
||||||
|
import { CertInfo, CertReader } from '@certd/plugin-cert';
|
||||||
|
import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib';
|
||||||
|
import { optionsUtils } from '@certd/basic';
|
||||||
|
import { CertApplyPluginNames} from '@certd/plugin-cert';
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. 使用 @IsTaskPlugin 注解注册插件
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
@IsTaskPlugin({
|
||||||
|
// 命名规范,插件类型+功能,大写字母开头,驼峰命名
|
||||||
|
name: 'DemoTest',
|
||||||
|
title: 'Demo-测试插件', // 插件标题
|
||||||
|
icon: 'clarity:plugin-line', // 插件图标
|
||||||
|
// 插件分组
|
||||||
|
group: pluginGroups.other.key,
|
||||||
|
default: {
|
||||||
|
// 默认值配置照抄即可
|
||||||
|
strategy: {
|
||||||
|
runStrategy: RunStrategy.SkipWhenSucceed,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
// 类名规范,跟上面插件名称(name)一致
|
||||||
|
export class DemoTest extends AbstractTaskPlugin {
|
||||||
|
// 插件实现...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. 定义任务输入参数
|
||||||
|
|
||||||
|
使用 `@TaskInput` 注解定义任务输入参数:
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
// 测试参数
|
||||||
|
@TaskInput({
|
||||||
|
title: '属性示例',
|
||||||
|
value: '默认值',
|
||||||
|
component: {
|
||||||
|
// 前端组件配置,具体配置见组件文档 https://www.antdv.com/components/input-cn
|
||||||
|
name: 'a-input',
|
||||||
|
vModel: 'value', // 双向绑定组件的 props 名称
|
||||||
|
},
|
||||||
|
helper: '帮助说明,[链接](https://certd.docmirror.cn)',
|
||||||
|
required: false, // 是否必填
|
||||||
|
})
|
||||||
|
text!: string;
|
||||||
|
|
||||||
|
// 证书选择,此项必须要有
|
||||||
|
@TaskInput({
|
||||||
|
title: '域名证书',
|
||||||
|
helper: '请选择前置任务输出的域名证书',
|
||||||
|
component: {
|
||||||
|
name: 'output-selector',
|
||||||
|
from: [...CertApplyPluginNames],
|
||||||
|
},
|
||||||
|
// required: true, // 必填
|
||||||
|
})
|
||||||
|
cert!: CertInfo;
|
||||||
|
|
||||||
|
@TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
|
||||||
|
// 前端可以展示,当前申请的证书域名列表
|
||||||
|
certDomains!: string[];
|
||||||
|
|
||||||
|
// 授权选择框
|
||||||
|
@TaskInput({
|
||||||
|
title: 'demo授权',
|
||||||
|
helper: 'demoAccess授权',
|
||||||
|
component: {
|
||||||
|
name: 'access-selector',
|
||||||
|
vModel:"modelValue",
|
||||||
|
type: "demo", // access类型,让用户固定选择这种类型的access
|
||||||
|
},
|
||||||
|
// rules: [{ required: true, message: '此项必填' }],
|
||||||
|
// required: true, // 必填
|
||||||
|
})
|
||||||
|
accessId!: string;
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4. 动态显隐配置(mergeScript)
|
||||||
|
|
||||||
|
使用 `mergeScript` 可以实现根据其他输入值动态控制当前输入项的显隐状态。
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
@TaskInput({
|
||||||
|
title: '匹配模式',
|
||||||
|
component: {
|
||||||
|
name: 'select',
|
||||||
|
options: [
|
||||||
|
{ label: '手动选择', value: 'manual' },
|
||||||
|
{ label: '根据证书匹配', value: 'auto' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
default: 'manual',
|
||||||
|
})
|
||||||
|
domainMatchMode!: 'manual' | 'auto';
|
||||||
|
|
||||||
|
@TaskInput(
|
||||||
|
createRemoteSelectInputDefine({
|
||||||
|
title: 'DCDN加速域名',
|
||||||
|
helper: '你在阿里云上配置的DCDN加速域名',
|
||||||
|
action: DeployCertToAliyunDCDN.prototype.onGetDomainList.name,
|
||||||
|
watches: ['certDomains', 'accessId'],
|
||||||
|
required: true,
|
||||||
|
mergeScript: `
|
||||||
|
return {
|
||||||
|
show: ctx.compute(({form})=>{
|
||||||
|
return domainMatchMode === "manual"
|
||||||
|
})
|
||||||
|
}
|
||||||
|
`,
|
||||||
|
})
|
||||||
|
)
|
||||||
|
domainName!: string | string[];
|
||||||
|
```
|
||||||
|
|
||||||
|
`mergeScript` 中的 `ctx.compute` 函数接收一个回调函数,通过 `form` 参数可以访问表单中的其他字段值。
|
||||||
|
|
||||||
|
### 5. 实现插件方法
|
||||||
|
|
||||||
|
#### 5.1 插件实例化时执行的方法
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
// 插件实例化时执行的方法
|
||||||
|
async onInstance() {}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### 5.2 插件执行方法
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
// 插件执行方法
|
||||||
|
async execute(): Promise<void> {
|
||||||
|
const { select, text, cert, accessId } = this;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const access = await this.getAccess(accessId);
|
||||||
|
this.logger.debug('access', access);
|
||||||
|
} catch (e) {
|
||||||
|
this.logger.error('获取授权失败', e);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const certReader = new CertReader(cert);
|
||||||
|
this.logger.debug('certReader', certReader);
|
||||||
|
} catch (e) {
|
||||||
|
this.logger.error('读取crt失败', e);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.logger.info('DemoTestPlugin execute');
|
||||||
|
this.logger.info('text:', text);
|
||||||
|
this.logger.info('select:', select);
|
||||||
|
this.logger.info('switch:', this.switch);
|
||||||
|
this.logger.info('授权id:', accessId);
|
||||||
|
|
||||||
|
// 具体的部署逻辑
|
||||||
|
// ...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### 5.3 后端获取选项方法
|
||||||
|
|
||||||
|
使用 `createRemoteSelectInputDefine` 创建远程选择输入项,`action` 指向的方法接收 `PageSearch` 参数并返回 `{ list, total }` 格式。
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
@TaskInput(
|
||||||
|
createRemoteSelectInputDefine({
|
||||||
|
title: '从后端获取选项',
|
||||||
|
helper: '选择时可以从后端获取选项',
|
||||||
|
action: DemoTest.prototype.onGetSiteList.name,
|
||||||
|
// 当以下参数变化时,触发获取选项
|
||||||
|
watches: ['certDomains', 'accessId'],
|
||||||
|
required: true,
|
||||||
|
})
|
||||||
|
)
|
||||||
|
siteName!: string | string[];
|
||||||
|
|
||||||
|
// 从后端获取选项的方法,接收PageSearch参数
|
||||||
|
async onGetSiteList(data: PageSearch) {
|
||||||
|
if (!this.accessId) {
|
||||||
|
throw new Error('请选择Access授权');
|
||||||
|
}
|
||||||
|
|
||||||
|
// @ts-ignore
|
||||||
|
const access = await this.getAccess(this.accessId);
|
||||||
|
|
||||||
|
// const siteRes = await access.GetDomainList(data);
|
||||||
|
// 以下是模拟数据
|
||||||
|
const siteRes = [
|
||||||
|
{ id: 1, siteName: 'site1.com' },
|
||||||
|
{ id: 2, siteName: 'site2.com' },
|
||||||
|
{ id: 3, siteName: 'site2.com' },
|
||||||
|
];
|
||||||
|
// 转换为前端所需要的格式
|
||||||
|
const options = siteRes.map((item: any) => {
|
||||||
|
return {
|
||||||
|
value: item.siteName,
|
||||||
|
label: item.siteName,
|
||||||
|
domain: item.siteName,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
// 返回{list, total}格式
|
||||||
|
return {
|
||||||
|
list: optionsUtils.buildGroupOptions(options, this.certDomains),
|
||||||
|
total: siteRes.length,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## 注意事项
|
||||||
|
|
||||||
|
1. **插件命名**:插件名称应遵循命名规范,大写字母开头,驼峰命名。
|
||||||
|
2. **类名规范**:类名应与插件名称(name)一致。
|
||||||
|
3. **证书选择**:必须包含证书选择参数,用于获取前置任务输出的域名证书。
|
||||||
|
4. **日志输出**:使用 `this.logger` 输出日志,而不是 `console`。
|
||||||
|
5. **错误处理**:执行过程中的错误应被捕获并记录。
|
||||||
|
6. **授权获取**:使用 `this.getAccess(accessId)` 获取授权信息。
|
||||||
|
|
||||||
|
## 完整示例
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
import { AbstractTaskPlugin, IsTaskPlugin, PageSearch, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
|
||||||
|
import { CertInfo, CertReader } from '@certd/plugin-cert';
|
||||||
|
import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib';
|
||||||
|
import { optionsUtils } from '@certd/basic';
|
||||||
|
import { CertApplyPluginNames} from '@certd/plugin-cert';
|
||||||
|
@IsTaskPlugin({
|
||||||
|
//命名规范,插件类型+功能(就是目录plugin-demo中的demo),大写字母开头,驼峰命名
|
||||||
|
name: 'DemoTest',
|
||||||
|
title: 'Demo-测试插件',
|
||||||
|
icon: 'clarity:plugin-line',
|
||||||
|
//插件分组
|
||||||
|
group: pluginGroups.other.key,
|
||||||
|
default: {
|
||||||
|
//默认值配置照抄即可
|
||||||
|
strategy: {
|
||||||
|
runStrategy: RunStrategy.SkipWhenSucceed,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
//类名规范,跟上面插件名称(name)一致
|
||||||
|
export class DemoTest extends AbstractTaskPlugin {
|
||||||
|
//测试参数
|
||||||
|
@TaskInput({
|
||||||
|
title: '属性示例',
|
||||||
|
value: '默认值',
|
||||||
|
component: {
|
||||||
|
//前端组件配置,具体配置见组件文档 https://www.antdv.com/components/input-cn
|
||||||
|
name: 'a-input',
|
||||||
|
vModel: 'value', //双向绑定组件的props名称
|
||||||
|
},
|
||||||
|
helper: '帮助说明,[链接](https://certd.docmirror.cn)',
|
||||||
|
required: false, //是否必填
|
||||||
|
})
|
||||||
|
text!: string;
|
||||||
|
|
||||||
|
//测试参数
|
||||||
|
@TaskInput({
|
||||||
|
title: '选择框',
|
||||||
|
component: {
|
||||||
|
//前端组件配置,具体配置见组件文档 https://www.antdv.com/components/select-cn
|
||||||
|
name: 'a-auto-complete',
|
||||||
|
vModel: 'value',
|
||||||
|
options: [
|
||||||
|
//选项列表
|
||||||
|
{ label: '动态显', value: 'show' },
|
||||||
|
{ label: '动态隐', value: 'hide' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
})
|
||||||
|
select!: string;
|
||||||
|
|
||||||
|
@TaskInput({
|
||||||
|
title: '动态显隐',
|
||||||
|
helper: '我会根据选择框的值进行显隐',
|
||||||
|
show: true, //动态计算的值会覆盖它
|
||||||
|
//动态计算脚本, mergeScript返回的对象会合并当前配置,此处演示 show的值会被动态计算结果覆盖,show的值根据用户选择的select的值决定
|
||||||
|
mergeScript: `
|
||||||
|
return {
|
||||||
|
show: ctx.compute(({form})=>{
|
||||||
|
return form.select === 'show';
|
||||||
|
})
|
||||||
|
}
|
||||||
|
`,
|
||||||
|
})
|
||||||
|
showText!: string;
|
||||||
|
|
||||||
|
//测试参数
|
||||||
|
@TaskInput({
|
||||||
|
title: '多选框',
|
||||||
|
component: {
|
||||||
|
//前端组件配置,具体配置见组件文档 https://www.antdv.com/components/select-cn
|
||||||
|
name: 'a-select',
|
||||||
|
vModel: 'value',
|
||||||
|
mode: 'tags',
|
||||||
|
multiple: true,
|
||||||
|
options: [
|
||||||
|
{ value: '1', label: '选项1' },
|
||||||
|
{ value: '2', label: '选项2' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
})
|
||||||
|
multiSelect!: string;
|
||||||
|
|
||||||
|
//测试参数
|
||||||
|
@TaskInput({
|
||||||
|
title: 'switch',
|
||||||
|
component: {
|
||||||
|
//前端组件配置,具体配置见组件文档 https://www.antdv.com/components/switch-cn
|
||||||
|
name: 'a-switch',
|
||||||
|
vModel: 'checked',
|
||||||
|
},
|
||||||
|
})
|
||||||
|
switch!: boolean;
|
||||||
|
//证书选择,此项必须要有
|
||||||
|
@TaskInput({
|
||||||
|
title: '域名证书',
|
||||||
|
helper: '请选择前置任务输出的域名证书',
|
||||||
|
component: {
|
||||||
|
name: 'output-selector',
|
||||||
|
from: [...CertApplyPluginNames],
|
||||||
|
},
|
||||||
|
// required: true, // 必填
|
||||||
|
})
|
||||||
|
cert!: CertInfo;
|
||||||
|
|
||||||
|
@TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
|
||||||
|
//前端可以展示,当前申请的证书域名列表
|
||||||
|
certDomains!: string[];
|
||||||
|
|
||||||
|
//授权选择框
|
||||||
|
@TaskInput({
|
||||||
|
title: 'demo授权',
|
||||||
|
helper: 'demoAccess授权',
|
||||||
|
component: {
|
||||||
|
name: 'access-selector',
|
||||||
|
type: 'demo', //固定授权类型
|
||||||
|
},
|
||||||
|
// rules: [{ required: true, message: '此项必填' }],
|
||||||
|
// required: true, //必填
|
||||||
|
})
|
||||||
|
accessId!: string;
|
||||||
|
|
||||||
|
@TaskInput(
|
||||||
|
createRemoteSelectInputDefine({
|
||||||
|
title: '从后端获取选项',
|
||||||
|
helper: '选择时可以从后端获取选项',
|
||||||
|
action: DemoTest.prototype.onGetSiteList.name,
|
||||||
|
//当以下参数变化时,触发获取选项
|
||||||
|
watches: ['certDomains', 'accessId'],
|
||||||
|
required: true,
|
||||||
|
})
|
||||||
|
)
|
||||||
|
siteName!: string | string[];
|
||||||
|
|
||||||
|
//插件实例化时执行的方法
|
||||||
|
async onInstance() {}
|
||||||
|
|
||||||
|
//插件执行方法
|
||||||
|
async execute(): Promise<void> {
|
||||||
|
const { select, text, cert, accessId } = this;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const access = await this.getAccess(accessId);
|
||||||
|
this.logger.debug('access', access);
|
||||||
|
} catch (e) {
|
||||||
|
this.logger.error('获取授权失败', e);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const certReader = new CertReader(cert);
|
||||||
|
this.logger.debug('certReader', certReader);
|
||||||
|
} catch (e) {
|
||||||
|
this.logger.error('读取crt失败', e);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.logger.info('DemoTestPlugin execute');
|
||||||
|
this.logger.info('text:', text);
|
||||||
|
this.logger.info('select:', select);
|
||||||
|
this.logger.info('switch:', this.switch);
|
||||||
|
this.logger.info('授权id:', accessId);
|
||||||
|
|
||||||
|
// const res = await this.http.request({
|
||||||
|
// url: 'https://api.demo.com',
|
||||||
|
// method: 'GET',
|
||||||
|
// });
|
||||||
|
// if (res.code !== 0) {
|
||||||
|
// //检查res是否报错,你需要抛异常,来结束插件执行,否则会判定为执行成功,下次执行时会跳过本任务
|
||||||
|
// throw new Error(res.message);
|
||||||
|
// }
|
||||||
|
// this.logger.info('部署成功:', res);
|
||||||
|
}
|
||||||
|
|
||||||
|
//此方法演示,如何让前端在添加插件时可以从后端获取选项,这里是后端返回选项的方法
|
||||||
|
async onGetSiteList(req: PageSearch) {
|
||||||
|
if (!this.accessId) {
|
||||||
|
throw new Error('请选择Access授权');
|
||||||
|
}
|
||||||
|
|
||||||
|
// @ts-ignore
|
||||||
|
const access = await this.getAccess(this.accessId);
|
||||||
|
|
||||||
|
// const siteRes = await access.GetDomainList(req);
|
||||||
|
//以下是模拟数据
|
||||||
|
const siteRes = [
|
||||||
|
{ id: 1, siteName: 'site1.com' },
|
||||||
|
{ id: 2, siteName: 'site2.com' },
|
||||||
|
{ id: 3, siteName: 'site2.com' },
|
||||||
|
];
|
||||||
|
//转换为前端所需要的格式
|
||||||
|
const options = siteRes.map((item: any) => {
|
||||||
|
return {
|
||||||
|
value: item.siteName,
|
||||||
|
label: item.siteName,
|
||||||
|
domain: item.siteName,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
//将站点域名名称根据证书域名进行匹配分组,分成匹配的和不匹配的两组选项,返回给前端,供用户选择
|
||||||
|
return {
|
||||||
|
list: optionsUtils.buildGroupOptions(options, this.certDomains),
|
||||||
|
total: siteRes.length,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
1
.trae/skills/task-plugin-dev/examples/input.md
Normal file
@@ -0,0 +1 @@
|
|||||||
|
我需要开发一个 Task 插件,用于将申请的证书部署到指定的应用系统中。请指导我如何实现。
|
||||||
129
.trae/skills/task-plugin-dev/examples/output.md
Normal file
@@ -0,0 +1,129 @@
|
|||||||
|
# Task 插件开发指南
|
||||||
|
|
||||||
|
## 开发步骤
|
||||||
|
|
||||||
|
### 1. 导入必要的依赖
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
import { AbstractTaskPlugin, IsTaskPlugin, PageSearch, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
|
||||||
|
import { CertInfo, CertReader } from '@certd/plugin-cert';
|
||||||
|
import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib';
|
||||||
|
import { optionsUtils } from '@certd/basic';
|
||||||
|
import { CertApplyPluginNames} from '@certd/plugin-cert';
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. 使用 @IsTaskPlugin 注解注册插件
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
@IsTaskPlugin({
|
||||||
|
// 命名规范,插件类型+功能,大写字母开头,驼峰命名
|
||||||
|
name: 'DemoTest',
|
||||||
|
title: 'Demo-测试插件', // 插件标题
|
||||||
|
icon: 'clarity:plugin-line', // 插件图标
|
||||||
|
// 插件分组
|
||||||
|
group: pluginGroups.other.key,
|
||||||
|
default: {
|
||||||
|
// 默认值配置照抄即可
|
||||||
|
strategy: {
|
||||||
|
runStrategy: RunStrategy.SkipWhenSucceed,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
// 类名规范,跟上面插件名称(name)一致
|
||||||
|
export class DemoTest extends AbstractTaskPlugin {
|
||||||
|
// 插件实现...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. 定义任务输入参数
|
||||||
|
|
||||||
|
使用 `@TaskInput` 注解定义任务输入参数:
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
// 测试参数
|
||||||
|
@TaskInput({
|
||||||
|
title: '属性示例',
|
||||||
|
value: '默认值',
|
||||||
|
component: {
|
||||||
|
//前端组件配置,具体配置见组件文档 https://www.antdv.com/components/input-cn
|
||||||
|
name: 'a-input',
|
||||||
|
vModel: 'value', //双向绑定组件的props名称
|
||||||
|
},
|
||||||
|
helper: '帮助说明,[链接](https://certd.docmirror.cn)',
|
||||||
|
required: false, //是否必填
|
||||||
|
})
|
||||||
|
text!: string;
|
||||||
|
|
||||||
|
//证书选择,此项必须要有
|
||||||
|
@TaskInput({
|
||||||
|
title: '域名证书',
|
||||||
|
helper: '请选择前置任务输出的域名证书',
|
||||||
|
component: {
|
||||||
|
name: 'output-selector',
|
||||||
|
from: [...CertApplyPluginNames],
|
||||||
|
},
|
||||||
|
// required: true, // 必填
|
||||||
|
})
|
||||||
|
cert!: CertInfo;
|
||||||
|
|
||||||
|
@TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
|
||||||
|
//前端可以展示,当前申请的证书域名列表
|
||||||
|
certDomains!: string[];
|
||||||
|
|
||||||
|
//授权选择框
|
||||||
|
@TaskInput({
|
||||||
|
title: 'demo授权',
|
||||||
|
helper: 'demoAccess授权',
|
||||||
|
component: {
|
||||||
|
name: 'access-selector',
|
||||||
|
type: 'demo', //固定授权类型
|
||||||
|
},
|
||||||
|
// rules: [{ required: true, message: '此项必填' }],
|
||||||
|
// required: true, //必填
|
||||||
|
})
|
||||||
|
accessId!: string;
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4. 实现插件方法
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
//插件实例化时执行的方法
|
||||||
|
async onInstance() {}
|
||||||
|
|
||||||
|
//插件执行方法
|
||||||
|
async execute(): Promise<void> {
|
||||||
|
const { select, text, cert, accessId } = this;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const access = await this.getAccess(accessId);
|
||||||
|
this.logger.debug('access', access);
|
||||||
|
} catch (e) {
|
||||||
|
this.logger.error('获取授权失败', e);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const certReader = new CertReader(cert);
|
||||||
|
this.logger.debug('certReader', certReader);
|
||||||
|
} catch (e) {
|
||||||
|
this.logger.error('读取crt失败', e);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.logger.info('DemoTestPlugin execute');
|
||||||
|
this.logger.info('text:', text);
|
||||||
|
this.logger.info('select:', select);
|
||||||
|
this.logger.info('switch:', this.switch);
|
||||||
|
this.logger.info('授权id:', accessId);
|
||||||
|
|
||||||
|
// 具体的部署逻辑
|
||||||
|
// ...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## 注意事项
|
||||||
|
|
||||||
|
1. **插件命名**:插件名称应遵循命名规范,大写字母开头,驼峰命名。
|
||||||
|
2. **类名规范**:类名应与插件名称(name)一致。
|
||||||
|
3. **证书选择**:必须包含证书选择参数,用于获取前置任务输出的域名证书。
|
||||||
|
4. **日志输出**:使用 `this.logger` 输出日志,而不是 `console`。
|
||||||
|
5. **错误处理**:执行过程中的错误应被捕获并记录。
|
||||||
|
6. **授权获取**:使用 `this.getAccess(accessId)` 获取授权信息。
|
||||||
10
.vscode/launch.json
vendored
@@ -79,5 +79,15 @@
|
|||||||
"PLUS_SERVER_BASE_URL": "http://127.0.0.1:11007"
|
"PLUS_SERVER_BASE_URL": "http://127.0.0.1:11007"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
],
|
||||||
|
"compounds": [
|
||||||
|
{
|
||||||
|
"name": "all",
|
||||||
|
"configurations": [
|
||||||
|
"server",
|
||||||
|
"client",
|
||||||
|
],
|
||||||
|
"stopAll": false
|
||||||
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
175
CHANGELOG.md
@@ -3,6 +3,181 @@
|
|||||||
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.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复某些情况下报没有匹配到任何校验方式的bug ([fe02ce7](https://github.com/certd/certd/commit/fe02ce7b64cf23c4dc4c30daccd5330059a35e9a))
|
||||||
|
* 修复上传头像退出登录的bug ([6eb20a1](https://github.com/certd/certd/commit/6eb20a1f2e31d984d9135edbf39c97cdd15621f9))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 阿里云CDN部署支持根据证书域名自动匹配部署 ([a68301e](https://github.com/certd/certd/commit/a68301e4dcea8b7391ad751aa57555d566297ad9))
|
||||||
|
* 阿里云dcdn支持根据证书域名匹配模式 ([df012de](https://github.com/certd/certd/commit/df012dec90590ecba85a69ed6355cfa8382c1da3))
|
||||||
|
* 支持部署证书到百度CCE ([a19ea74](https://github.com/certd/certd/commit/a19ea7489c01cdbf795fb51f804bd6d00389f604))
|
||||||
|
* dcdn自动匹配部署,支持新增域名感知 ([c6a988b](https://github.com/certd/certd/commit/c6a988bc925886bd7163c1270f2b7a10a57b1c5b))
|
||||||
|
|
||||||
|
## [1.39.7](https://github.com/certd/certd/compare/v1.39.6...v1.39.7) (2026-03-25)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复cname校验报该授权无权限的bug ([b1eb706](https://github.com/certd/certd/commit/b1eb7069258d6ff2b128091911fa448eaffc5f33))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持部署到火山云tos自定义域名证书 ([af6deb9](https://github.com/certd/certd/commit/af6deb99cd24a69a189b1fdd1df51c8f7816dcda))
|
||||||
|
* 支持部署证书到火山引擎vod ([f91d591](https://github.com/certd/certd/commit/f91d591b03c50166d9fa352ba11c62d963869aa5))
|
||||||
|
|
||||||
|
## [1.39.6](https://github.com/certd/certd/compare/v1.39.5...v1.39.6) (2026-03-22)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复模版id不正确导致修改到错误的模版流水线bug ([b1ff163](https://github.com/certd/certd/commit/b1ff163a2828b205297408d5aed21cf1eff335e8))
|
||||||
|
* 修复批量执行按钮无效的bug ([49703f0](https://github.com/certd/certd/commit/49703f08e55b303851086d9f36aca562d7999be6))
|
||||||
|
* remote-select默认pageSize设置为50,阿里云WAF不支持pageSize100 ([285532d](https://github.com/certd/certd/commit/285532d4318b90d0d7f8154f070274c0a0ec0269))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 火山引擎部署alb证书插件支持部署扩展证书以及删除已过期扩展证书 ([ffd2e81](https://github.com/certd/certd/commit/ffd2e8149e3a06bf3eec456ff85dbed793af9e90))
|
||||||
|
* 企业模式下面增加个人数据迁移的引导 ([431afd6](https://github.com/certd/certd/commit/431afd618f547cecf9a29433f46d4367619e2ecf))
|
||||||
|
* 新增阿里云证书清理插件 ([4b7eeaa](https://github.com/certd/certd/commit/4b7eeaa6e0a14d2e461c7c473a920a0966b1fe8e))
|
||||||
|
* 优化远程数据选择框,选择数据时不刷新闪烁 ([7f6a8bc](https://github.com/certd/certd/commit/7f6a8bc87e364685defe7f039264b2de064806c5))
|
||||||
|
* 支持复制粘贴任务步骤 ([acc2df2](https://github.com/certd/certd/commit/acc2df29def017fb8165f931b41ef95414966afc))
|
||||||
|
|
||||||
|
## [1.39.5](https://github.com/certd/certd/compare/v1.39.4...v1.39.5) (2026-03-18)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复修改分组报错的bug ([224db7d](https://github.com/certd/certd/commit/224db7da57dbdddf25bcac7faa0a29eb228c5a33))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 移除passkey的counter递增校验 ([68b669d](https://github.com/certd/certd/commit/68b669d3ff3e13b931939093320ce7237bb02b1b))
|
||||||
|
* passkey 支持Bitwarden ([29f44c6](https://github.com/certd/certd/commit/29f44c67c808bed9ff1c9d4884d39a1a62d043a7))
|
||||||
|
* passkey登录放到下方其他登录位置 ([1413e1a](https://github.com/certd/certd/commit/1413e1aff4aabcfd471716338c210fbcfd76c8f9))
|
||||||
|
|
||||||
|
## [1.39.4](https://github.com/certd/certd/compare/v1.39.3...v1.39.4) (2026-03-17)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复阿里云证书订单翻页问题 ([6d43623](https://github.com/certd/certd/commit/6d43623f459a7594599e50a7ed89d67fcc775518))
|
||||||
|
* 修复查看证书详情页面错位的bug ([7f37df4](https://github.com/certd/certd/commit/7f37df42274e657892d92e868ceac67e139f3bf2))
|
||||||
|
* 修复选择插件页面无法滚动的bug ([d8425bc](https://github.com/certd/certd/commit/d8425bc9c5ee81bb669706c6de6bad69d7c38d8e))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化passkey ([9e12412](https://github.com/certd/certd/commit/9e12412f5fa7800df1d7efaf62cd8fd5d79bb569))
|
||||||
|
|
||||||
|
## [1.39.3](https://github.com/certd/certd/compare/v1.39.2...v1.39.3) (2026-03-17)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复多选框只能单选的bug ([12700e1](https://github.com/certd/certd/commit/12700e1754319513ac02822ff1588d63420b964e))
|
||||||
|
* 修复旧版1panel插件 报sslIds is not iterable的错误 ([50db6f0](https://github.com/certd/certd/commit/50db6f0765e7ec9a5698cd99540d90e188634fb1))
|
||||||
|
|
||||||
|
## [1.39.2](https://github.com/certd/certd/compare/v1.39.1...v1.39.2) (2026-03-16)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复当证书更新后第一次站点检查会报与主站证书过期时间不一致错误的bug ([dd999b6](https://github.com/certd/certd/commit/dd999b60a4fe3507ff5e0109d637b4e891b28bdd))
|
||||||
|
* 修复京东云报错不准确的bug ([10dd89a](https://github.com/certd/certd/commit/10dd89ae62e438a211a15e729559af823a096583))
|
||||||
|
* 修复群晖测试时报addSecret undefine错误 ([5eb4aa3](https://github.com/certd/certd/commit/5eb4aa3a0eab9ffa729c8e813cbf973d9683cc13))
|
||||||
|
* 修复提示支付失败的bug ([12fed34](https://github.com/certd/certd/commit/12fed34e109f3254de664813954081a52513bd38))
|
||||||
|
* 修复修改项目名称后,没有同步刷新的bug ([3abee72](https://github.com/certd/certd/commit/3abee72fee286864b665033b23b172ef0ea92d83))
|
||||||
|
* cname provider授权修改为sys级别 ([d01bfbe](https://github.com/certd/certd/commit/d01bfbec96a3a2109ec864953b0c9e8c1f95b97b))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 查看证书增加证书详情显示,包括域名,过期时间,颁发机构,指纹等 ([0b9933d](https://github.com/certd/certd/commit/0b9933df1e8d1685d14271435a8a7488974cc47b))
|
||||||
|
* 获取阿里证书订单id组件增加翻页功能,突破50的上限 ([d79db3b](https://github.com/certd/certd/commit/d79db3bd3f0d5ad39664bb47ec3814d43ad93304))
|
||||||
|
* 优化阿里云连接超时时长为10秒,支持配置环境变量 ([1588461](https://github.com/certd/certd/commit/1588461633bd275765daa96fc68320abb58d616d))
|
||||||
|
* 优化个人账户页面 ([e506116](https://github.com/certd/certd/commit/e50611666ef731a903d7bdd8eb62333b97e2cc5b))
|
||||||
|
* 支持批量转移流水线到其他项目 ([8a3841f](https://github.com/certd/certd/commit/8a3841f6382b53ce2343307fb035e74fa5383fef))
|
||||||
|
* 支持passkey登录 ([10b7644](https://github.com/certd/certd/commit/10b7644bb7ba5f82776537bc0c4f5eb95d5f8e4e))
|
||||||
|
* dns-provider 支持bind9 ,support bind9 ([76d12d6](https://github.com/certd/certd/commit/76d12d60624c0672fd3717a80a2cfef6845b14b8))
|
||||||
|
|
||||||
|
## [1.39.1](https://github.com/certd/certd/compare/v1.39.0...v1.39.1) (2026-03-09)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复企业管理模式下,切换用户登录后,丢失项目列表的bug ([d23c8b4](https://github.com/certd/certd/commit/d23c8b4a2a5f5ab17822c6ee1d4108ac7280b9d1))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持迁移个人数据到企业项目中 ([c6ca832](https://github.com/certd/certd/commit/c6ca83273779ed84de1b23b5e477063af043d015))
|
||||||
|
* install tip ([853fdc7](https://github.com/certd/certd/commit/853fdc70a263b62d75c9ff3970607e6bf1c1593b))
|
||||||
|
|
||||||
|
# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复部署到openwrt错误的bug ([2e3d0cc](https://github.com/certd/certd/commit/2e3d0cc57c16c48ad435bc8fde729bacaedde9f5))
|
||||||
|
* 修复发件邮箱无法输入的bug ([27b0348](https://github.com/certd/certd/commit/27b0348e1d3d752f418f851965d6afbc26c0160c))
|
||||||
|
* 修复复制流水线保存后丢失分组和排序号的问题 ([bc32648](https://github.com/certd/certd/commit/bc326489abc1d50a0930b4f47aa2d62d3a486798))
|
||||||
|
* 修复获取群辉deviceid报错的bug ([79be392](https://github.com/certd/certd/commit/79be392775a2c91848dd5a66a2618adc4e4b48f6))
|
||||||
|
* 修复京东云域名申请证书报错的bug ([d9c0130](https://github.com/certd/certd/commit/d9c0130b59997144a3c274d456635b800135e43f))
|
||||||
|
* 修复偶尔下载证书报未授权的错误 ([316537e](https://github.com/certd/certd/commit/316537eb4dcbe5ec57784e8bf95ee3cdfd21dce7))
|
||||||
|
* 修复dcdn多个域名同时部署时 可能会出现证书名称重复的bug ([78c2ced](https://github.com/certd/certd/commit/78c2ced43b1a73d142b0ed783b162b97f545ab06))
|
||||||
|
* 优化dcdn部署上传多次证书 偶尔报 The CertName already exists的问题 ([72f850f](https://github.com/certd/certd/commit/72f850f675b500d12ebff2338d1b99d6fab476e1))
|
||||||
|
* **cert-plugin:** 优化又拍云客户端错误处理逻辑,当域名已绑定证书时不再抛出异常。 ([92c9ac3](https://github.com/certd/certd/commit/92c9ac382692e6c84140ff787759ab6d39ccbe96))
|
||||||
|
* esxi部署失败的bug ([1e44115](https://github.com/certd/certd/commit/1e441154617e6516a9a3610412bf597128c62696))
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* 支持企业级管理模式,项目管理,细分权限 ([3734083](https://github.com/certd/certd/commit/37340838b6a61a94b86bfa13cf5da88b26f1315a))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 【破坏性更新】错误返回信息msg字段名统一改成message,与成功的返回结构一致 ([51ab6d6](https://github.com/certd/certd/commit/51ab6d6da1bb551b55b3a6a4a9a945c8d6ace806))
|
||||||
|
* 当域名管理中没有域名时,创建流水线时不展开域名选择框 ([bb0afe1](https://github.com/certd/certd/commit/bb0afe1fa7b0fc52fde051d24fbe6be69d52f4cc))
|
||||||
|
* 任务步骤页面增加串行执行提示说明 ([787f6ef](https://github.com/certd/certd/commit/787f6ef52893d8dc912ee2a7a5b8ce2b73c108c9))
|
||||||
|
* 站点监控支持指定ip地址检查 ([83d81b6](https://github.com/certd/certd/commit/83d81b64b3adb375366039e07c87d1ad79121c13))
|
||||||
|
* AI开发插件 skills 定义初步 ([1f68fad](https://github.com/certd/certd/commit/1f68faddb97a978c5a5e731a8895b4bb0587ad83))
|
||||||
|
* http请求增加建立连接超时配置 ([3c85602](https://github.com/certd/certd/commit/3c85602ab1fc1953cdc06a6cd75a971d14119179))
|
||||||
|
|
||||||
|
## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复获取群辉deviceid报错的bug ([39d3bf9](https://github.com/certd/certd/commit/39d3bf97d1935918bac575da9d0726310c83c19d))
|
||||||
|
|
||||||
|
## [1.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复1panel2.1.0新版本测试失败的问题 ([8ef1f2e](https://github.com/certd/certd/commit/8ef1f2e395ea5969a95f55535e6c16a65e2b463b))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化登陆页面的黑暗模式 ([e47edda](https://github.com/certd/certd/commit/e47eddaa858f8fffe7a40dfbd14e8cda1dcba4ac))
|
||||||
|
* 支持自定义发件人名称,格式:名称<邮箱> ([bab9adc](https://github.com/certd/certd/commit/bab9adce240108d4291eedc67e04abc4a01019e0))
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复1panel 请求失败的bug ([0283662](https://github.com/certd/certd/commit/0283662931ff47d6b5d49f91a30c4a002fe1d108))
|
||||||
|
* 修复阿里云dcdn使用上传到cas的id引用错误的bug ([61800b2](https://github.com/certd/certd/commit/61800b23e2be324169990810d1176c18decabb23))
|
||||||
|
* 修复保存站点监控dns设置,偶尔无法保存成功的bug ([8387fe0](https://github.com/certd/certd/commit/8387fe0d5b2e77b8c2788a10791e5389d97a3e41))
|
||||||
|
* 修复任务步骤标题过长导致错位的问题 ([9fb9805](https://github.com/certd/certd/commit/9fb980599f96ccbf61bd46019411db2f13c70e57))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 421 支持3次重试 ([b91548e](https://github.com/certd/certd/commit/b91548eef4c24faa822d3a40f1f6a77b41d274e4))
|
||||||
|
* 备份支持scp上传 ([66ac471](https://github.com/certd/certd/commit/66ac4716f2565d7ee827461b625397ae21599451))
|
||||||
|
* 监控设置支持逗号分割 ([c23d1d1](https://github.com/certd/certd/commit/c23d1d11b58a6cdfe431a7e8abbd5d955146c38d))
|
||||||
|
* 列表中支持下次执行时间显示 ([a3cabd5](https://github.com/certd/certd/commit/a3cabd5f36ed41225ad418098596e9b2c44e31a1))
|
||||||
|
* 模版编辑页面,hover反色过亮问题优化 ([e55a3a8](https://github.com/certd/certd/commit/e55a3a82fc6939b940f0c3be4529d74a625f6f4e))
|
||||||
|
* 群晖支持刷新登录有效期 ([42c7ec2](https://github.com/certd/certd/commit/42c7ec2f75947e2b8298d6605d4dbcd441aacd51))
|
||||||
|
* 所有授权增加测试按钮 ([7a3e68d](https://github.com/certd/certd/commit/7a3e68d656c1dcdcd814b69891bd2c2c6fe3098a))
|
||||||
|
* 新网互联支持查询域名列表 ([e7e54bc](https://github.com/certd/certd/commit/e7e54bc19e3a734913a93a94e25db3bb06d2ab0f))
|
||||||
|
* 优化京东云报错详情显示 ([1195417](https://github.com/certd/certd/commit/1195417b9714d2fcb540e43c0a20809b7ee2052b))
|
||||||
|
* 优化网络测试页面,夜间模式显示效果 ([305da86](https://github.com/certd/certd/commit/305da86f97d918374819ecd6c50685f09b94ea59))
|
||||||
|
* 增加部署证书到certd本身插件 ([3cd1aae](https://github.com/certd/certd/commit/3cd1aaeb035f8af79714030889b2b4dc259b700e))
|
||||||
|
* 支持next-terminal ([6f3fd78](https://github.com/certd/certd/commit/6f3fd785e77a33c72bdf4115dc5d498e677d1863))
|
||||||
|
* 主题默认跟随系统颜色(自动切换深色浅色模式) ([32c3ce5](https://github.com/certd/certd/commit/32c3ce5c9868569523901a9a939ca5b535ec3277))
|
||||||
|
* http校验方式支持scp上传 ([4eb940f](https://github.com/certd/certd/commit/4eb940ffe765a0330331bc6af8396315e36d4e4a))
|
||||||
|
|
||||||
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -3,6 +3,196 @@
|
|||||||
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.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复某些情况下报没有匹配到任何校验方式的bug ([fe02ce7](https://github.com/certd/certd/commit/fe02ce7b64cf23c4dc4c30daccd5330059a35e9a))
|
||||||
|
* 修复上传头像退出登录的bug ([6eb20a1](https://github.com/certd/certd/commit/6eb20a1f2e31d984d9135edbf39c97cdd15621f9))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 阿里云CDN部署支持根据证书域名自动匹配部署 ([a68301e](https://github.com/certd/certd/commit/a68301e4dcea8b7391ad751aa57555d566297ad9))
|
||||||
|
* 阿里云dcdn支持根据证书域名匹配模式 ([df012de](https://github.com/certd/certd/commit/df012dec90590ecba85a69ed6355cfa8382c1da3))
|
||||||
|
* 支持部署证书到百度CCE ([a19ea74](https://github.com/certd/certd/commit/a19ea7489c01cdbf795fb51f804bd6d00389f604))
|
||||||
|
* dcdn自动匹配部署,支持新增域名感知 ([c6a988b](https://github.com/certd/certd/commit/c6a988bc925886bd7163c1270f2b7a10a57b1c5b))
|
||||||
|
|
||||||
|
## [1.39.7](https://github.com/certd/certd/compare/v1.39.6...v1.39.7) (2026-03-25)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复cname校验报该授权无权限的bug ([b1eb706](https://github.com/certd/certd/commit/b1eb7069258d6ff2b128091911fa448eaffc5f33))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持部署到火山云tos自定义域名证书 ([af6deb9](https://github.com/certd/certd/commit/af6deb99cd24a69a189b1fdd1df51c8f7816dcda))
|
||||||
|
* 支持部署证书到火山引擎vod ([f91d591](https://github.com/certd/certd/commit/f91d591b03c50166d9fa352ba11c62d963869aa5))
|
||||||
|
|
||||||
|
## [1.39.6](https://github.com/certd/certd/compare/v1.39.5...v1.39.6) (2026-03-22)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复模版id不正确导致修改到错误的模版流水线bug ([b1ff163](https://github.com/certd/certd/commit/b1ff163a2828b205297408d5aed21cf1eff335e8))
|
||||||
|
* 修复批量执行按钮无效的bug ([49703f0](https://github.com/certd/certd/commit/49703f08e55b303851086d9f36aca562d7999be6))
|
||||||
|
* remote-select默认pageSize设置为50,阿里云WAF不支持pageSize100 ([285532d](https://github.com/certd/certd/commit/285532d4318b90d0d7f8154f070274c0a0ec0269))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 火山引擎部署alb证书插件支持部署扩展证书以及删除已过期扩展证书 ([ffd2e81](https://github.com/certd/certd/commit/ffd2e8149e3a06bf3eec456ff85dbed793af9e90))
|
||||||
|
* 企业模式下面增加个人数据迁移的引导 ([431afd6](https://github.com/certd/certd/commit/431afd618f547cecf9a29433f46d4367619e2ecf))
|
||||||
|
* 新增阿里云证书清理插件 ([4b7eeaa](https://github.com/certd/certd/commit/4b7eeaa6e0a14d2e461c7c473a920a0966b1fe8e))
|
||||||
|
* 优化远程数据选择框,选择数据时不刷新闪烁 ([7f6a8bc](https://github.com/certd/certd/commit/7f6a8bc87e364685defe7f039264b2de064806c5))
|
||||||
|
* 支持复制粘贴任务步骤 ([acc2df2](https://github.com/certd/certd/commit/acc2df29def017fb8165f931b41ef95414966afc))
|
||||||
|
|
||||||
|
## [1.39.5](https://github.com/certd/certd/compare/v1.39.4...v1.39.5) (2026-03-18)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复修改分组报错的bug ([224db7d](https://github.com/certd/certd/commit/224db7da57dbdddf25bcac7faa0a29eb228c5a33))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 移除passkey的counter递增校验 ([68b669d](https://github.com/certd/certd/commit/68b669d3ff3e13b931939093320ce7237bb02b1b))
|
||||||
|
* passkey 支持Bitwarden ([29f44c6](https://github.com/certd/certd/commit/29f44c67c808bed9ff1c9d4884d39a1a62d043a7))
|
||||||
|
* passkey登录放到下方其他登录位置 ([1413e1a](https://github.com/certd/certd/commit/1413e1aff4aabcfd471716338c210fbcfd76c8f9))
|
||||||
|
|
||||||
|
## [1.39.4](https://github.com/certd/certd/compare/v1.39.3...v1.39.4) (2026-03-17)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复阿里云证书订单翻页问题 ([6d43623](https://github.com/certd/certd/commit/6d43623f459a7594599e50a7ed89d67fcc775518))
|
||||||
|
* 修复查看证书详情页面错位的bug ([7f37df4](https://github.com/certd/certd/commit/7f37df42274e657892d92e868ceac67e139f3bf2))
|
||||||
|
* 修复选择插件页面无法滚动的bug ([d8425bc](https://github.com/certd/certd/commit/d8425bc9c5ee81bb669706c6de6bad69d7c38d8e))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化passkey ([9e12412](https://github.com/certd/certd/commit/9e12412f5fa7800df1d7efaf62cd8fd5d79bb569))
|
||||||
|
|
||||||
|
## [1.39.3](https://github.com/certd/certd/compare/v1.39.2...v1.39.3) (2026-03-17)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复多选框只能单选的bug ([12700e1](https://github.com/certd/certd/commit/12700e1754319513ac02822ff1588d63420b964e))
|
||||||
|
* 修复旧版1panel插件 报sslIds is not iterable的错误 ([50db6f0](https://github.com/certd/certd/commit/50db6f0765e7ec9a5698cd99540d90e188634fb1))
|
||||||
|
|
||||||
|
## [1.39.2](https://github.com/certd/certd/compare/v1.39.1...v1.39.2) (2026-03-16)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复当证书更新后第一次站点检查会报与主站证书过期时间不一致错误的bug ([dd999b6](https://github.com/certd/certd/commit/dd999b60a4fe3507ff5e0109d637b4e891b28bdd))
|
||||||
|
* 修复京东云报错不准确的bug ([10dd89a](https://github.com/certd/certd/commit/10dd89ae62e438a211a15e729559af823a096583))
|
||||||
|
* 修复群晖测试时报addSecret undefine错误 ([5eb4aa3](https://github.com/certd/certd/commit/5eb4aa3a0eab9ffa729c8e813cbf973d9683cc13))
|
||||||
|
* 修复提示支付失败的bug ([12fed34](https://github.com/certd/certd/commit/12fed34e109f3254de664813954081a52513bd38))
|
||||||
|
* 修复修改项目名称后,没有同步刷新的bug ([3abee72](https://github.com/certd/certd/commit/3abee72fee286864b665033b23b172ef0ea92d83))
|
||||||
|
* cname provider授权修改为sys级别 ([d01bfbe](https://github.com/certd/certd/commit/d01bfbec96a3a2109ec864953b0c9e8c1f95b97b))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 查看证书增加证书详情显示,包括域名,过期时间,颁发机构,指纹等 ([0b9933d](https://github.com/certd/certd/commit/0b9933df1e8d1685d14271435a8a7488974cc47b))
|
||||||
|
* 获取阿里证书订单id组件增加翻页功能,突破50的上限 ([d79db3b](https://github.com/certd/certd/commit/d79db3bd3f0d5ad39664bb47ec3814d43ad93304))
|
||||||
|
* 优化阿里云连接超时时长为10秒,支持配置环境变量 ([1588461](https://github.com/certd/certd/commit/1588461633bd275765daa96fc68320abb58d616d))
|
||||||
|
* 优化个人账户页面 ([e506116](https://github.com/certd/certd/commit/e50611666ef731a903d7bdd8eb62333b97e2cc5b))
|
||||||
|
* 支持批量转移流水线到其他项目 ([8a3841f](https://github.com/certd/certd/commit/8a3841f6382b53ce2343307fb035e74fa5383fef))
|
||||||
|
* 支持passkey登录 ([10b7644](https://github.com/certd/certd/commit/10b7644bb7ba5f82776537bc0c4f5eb95d5f8e4e))
|
||||||
|
* dns-provider 支持bind9 ,support bind9 ([76d12d6](https://github.com/certd/certd/commit/76d12d60624c0672fd3717a80a2cfef6845b14b8))
|
||||||
|
|
||||||
|
## [1.39.1](https://github.com/certd/certd/compare/v1.39.0...v1.39.1) (2026-03-09)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复企业管理模式下,切换用户登录后,丢失项目列表的bug ([d23c8b4](https://github.com/certd/certd/commit/d23c8b4a2a5f5ab17822c6ee1d4108ac7280b9d1))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持迁移个人数据到企业项目中 ([c6ca832](https://github.com/certd/certd/commit/c6ca83273779ed84de1b23b5e477063af043d015))
|
||||||
|
* install tip ([853fdc7](https://github.com/certd/certd/commit/853fdc70a263b62d75c9ff3970607e6bf1c1593b))
|
||||||
|
|
||||||
|
# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复部署到openwrt错误的bug ([2e3d0cc](https://github.com/certd/certd/commit/2e3d0cc57c16c48ad435bc8fde729bacaedde9f5))
|
||||||
|
* 修复发件邮箱无法输入的bug ([27b0348](https://github.com/certd/certd/commit/27b0348e1d3d752f418f851965d6afbc26c0160c))
|
||||||
|
* 修复复制流水线保存后丢失分组和排序号的问题 ([bc32648](https://github.com/certd/certd/commit/bc326489abc1d50a0930b4f47aa2d62d3a486798))
|
||||||
|
* 修复获取群辉deviceid报错的bug ([79be392](https://github.com/certd/certd/commit/79be392775a2c91848dd5a66a2618adc4e4b48f6))
|
||||||
|
* 修复京东云域名申请证书报错的bug ([d9c0130](https://github.com/certd/certd/commit/d9c0130b59997144a3c274d456635b800135e43f))
|
||||||
|
* 修复偶尔下载证书报未授权的错误 ([316537e](https://github.com/certd/certd/commit/316537eb4dcbe5ec57784e8bf95ee3cdfd21dce7))
|
||||||
|
* 修复dcdn多个域名同时部署时 可能会出现证书名称重复的bug ([78c2ced](https://github.com/certd/certd/commit/78c2ced43b1a73d142b0ed783b162b97f545ab06))
|
||||||
|
* 优化dcdn部署上传多次证书 偶尔报 The CertName already exists的问题 ([72f850f](https://github.com/certd/certd/commit/72f850f675b500d12ebff2338d1b99d6fab476e1))
|
||||||
|
* **cert-plugin:** 优化又拍云客户端错误处理逻辑,当域名已绑定证书时不再抛出异常。 ([92c9ac3](https://github.com/certd/certd/commit/92c9ac382692e6c84140ff787759ab6d39ccbe96))
|
||||||
|
* esxi部署失败的bug ([1e44115](https://github.com/certd/certd/commit/1e441154617e6516a9a3610412bf597128c62696))
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* 支持企业级管理模式,项目管理,细分权限 ([3734083](https://github.com/certd/certd/commit/37340838b6a61a94b86bfa13cf5da88b26f1315a))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 【破坏性更新】错误返回信息msg字段名统一改成message,与成功的返回结构一致 ([51ab6d6](https://github.com/certd/certd/commit/51ab6d6da1bb551b55b3a6a4a9a945c8d6ace806))
|
||||||
|
* 当域名管理中没有域名时,创建流水线时不展开域名选择框 ([bb0afe1](https://github.com/certd/certd/commit/bb0afe1fa7b0fc52fde051d24fbe6be69d52f4cc))
|
||||||
|
* 任务步骤页面增加串行执行提示说明 ([787f6ef](https://github.com/certd/certd/commit/787f6ef52893d8dc912ee2a7a5b8ce2b73c108c9))
|
||||||
|
* 站点监控支持指定ip地址检查 ([83d81b6](https://github.com/certd/certd/commit/83d81b64b3adb375366039e07c87d1ad79121c13))
|
||||||
|
* AI开发插件 skills 定义初步 ([1f68fad](https://github.com/certd/certd/commit/1f68faddb97a978c5a5e731a8895b4bb0587ad83))
|
||||||
|
* http请求增加建立连接超时配置 ([3c85602](https://github.com/certd/certd/commit/3c85602ab1fc1953cdc06a6cd75a971d14119179))
|
||||||
|
|
||||||
|
## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复获取群辉deviceid报错的bug ([39d3bf9](https://github.com/certd/certd/commit/39d3bf97d1935918bac575da9d0726310c83c19d))
|
||||||
|
|
||||||
|
## [1.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复1panel2.1.0新版本测试失败的问题 ([8ef1f2e](https://github.com/certd/certd/commit/8ef1f2e395ea5969a95f55535e6c16a65e2b463b))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化登陆页面的黑暗模式 ([e47edda](https://github.com/certd/certd/commit/e47eddaa858f8fffe7a40dfbd14e8cda1dcba4ac))
|
||||||
|
* 支持自定义发件人名称,格式:名称<邮箱> ([bab9adc](https://github.com/certd/certd/commit/bab9adce240108d4291eedc67e04abc4a01019e0))
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复1panel 请求失败的bug ([0283662](https://github.com/certd/certd/commit/0283662931ff47d6b5d49f91a30c4a002fe1d108))
|
||||||
|
* 修复阿里云dcdn使用上传到cas的id引用错误的bug ([61800b2](https://github.com/certd/certd/commit/61800b23e2be324169990810d1176c18decabb23))
|
||||||
|
* 修复保存站点监控dns设置,偶尔无法保存成功的bug ([8387fe0](https://github.com/certd/certd/commit/8387fe0d5b2e77b8c2788a10791e5389d97a3e41))
|
||||||
|
* 修复任务步骤标题过长导致错位的问题 ([9fb9805](https://github.com/certd/certd/commit/9fb980599f96ccbf61bd46019411db2f13c70e57))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 421 支持3次重试 ([b91548e](https://github.com/certd/certd/commit/b91548eef4c24faa822d3a40f1f6a77b41d274e4))
|
||||||
|
* 备份支持scp上传 ([66ac471](https://github.com/certd/certd/commit/66ac4716f2565d7ee827461b625397ae21599451))
|
||||||
|
* 监控设置支持逗号分割 ([c23d1d1](https://github.com/certd/certd/commit/c23d1d11b58a6cdfe431a7e8abbd5d955146c38d))
|
||||||
|
* 列表中支持下次执行时间显示 ([a3cabd5](https://github.com/certd/certd/commit/a3cabd5f36ed41225ad418098596e9b2c44e31a1))
|
||||||
|
* 模版编辑页面,hover反色过亮问题优化 ([e55a3a8](https://github.com/certd/certd/commit/e55a3a82fc6939b940f0c3be4529d74a625f6f4e))
|
||||||
|
* 群晖支持刷新登录有效期 ([42c7ec2](https://github.com/certd/certd/commit/42c7ec2f75947e2b8298d6605d4dbcd441aacd51))
|
||||||
|
* 所有授权增加测试按钮 ([7a3e68d](https://github.com/certd/certd/commit/7a3e68d656c1dcdcd814b69891bd2c2c6fe3098a))
|
||||||
|
* 新网互联支持查询域名列表 ([e7e54bc](https://github.com/certd/certd/commit/e7e54bc19e3a734913a93a94e25db3bb06d2ab0f))
|
||||||
|
* 优化京东云报错详情显示 ([1195417](https://github.com/certd/certd/commit/1195417b9714d2fcb540e43c0a20809b7ee2052b))
|
||||||
|
* 优化网络测试页面,夜间模式显示效果 ([305da86](https://github.com/certd/certd/commit/305da86f97d918374819ecd6c50685f09b94ea59))
|
||||||
|
* 增加部署证书到certd本身插件 ([3cd1aae](https://github.com/certd/certd/commit/3cd1aaeb035f8af79714030889b2b4dc259b700e))
|
||||||
|
* 支持next-terminal ([6f3fd78](https://github.com/certd/certd/commit/6f3fd785e77a33c72bdf4115dc5d498e677d1863))
|
||||||
|
* 主题默认跟随系统颜色(自动切换深色浅色模式) ([32c3ce5](https://github.com/certd/certd/commit/32c3ce5c9868569523901a9a939ca5b535ec3277))
|
||||||
|
* http校验方式支持scp上传 ([4eb940f](https://github.com/certd/certd/commit/4eb940ffe765a0330331bc6af8396315e36d4e4a))
|
||||||
|
|
||||||
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复部署到openwrt错误的bug ([9ac33f9](https://github.com/certd/certd/commit/9ac33f9b9ba7727fcbbd320dd866bc048cbb3d72))
|
||||||
|
* 修复新版本上传到阿里云cas后,其他依赖任务无法部署的bug ([99f5b8e](https://github.com/certd/certd/commit/99f5b8ebc1c64798ceb42042ad71cf71e967beb0))
|
||||||
|
* esxi部署失败的bug ([6ab1fca](https://github.com/certd/certd/commit/6ab1fcaf894f7ce343af4b5bf4b0d67438df6618))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 修改sql升级语句,兼容mysql5.7 ([02f89a9](https://github.com/certd/certd/commit/02f89a9c9d77850437285844670aed441e5953c3))
|
||||||
|
* 已登录状态访问登录页面自动跳转到首页 ([bd8caff](https://github.com/certd/certd/commit/bd8caff0b754cb13530cf0f1644b33e29fde5d01))
|
||||||
|
* 优化access授权支持remote-auto-complete ([2f40f79](https://github.com/certd/certd/commit/2f40f795ee6131132d3fab2601f92a567bbdc4b7))
|
||||||
|
* access 插件支持remote-select等配置 ([d286c04](https://github.com/certd/certd/commit/d286c040a5232dcca829945734affead3ee08b3c))
|
||||||
|
|
||||||
## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
|
## [1.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
|
||||||
|
|
||||||
### Performance Improvements
|
### Performance Improvements
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ https://1panel.cn/docs/installation/online_installation/
|
|||||||
|
|
||||||

|

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

|

|
||||||
|
|
||||||
#### 1.2 访问测试:
|
#### 1.2 访问测试:
|
||||||
@@ -40,6 +39,9 @@ admin/123456
|
|||||||
1. 打开`docker-compose.yaml`,整个内容复制下来
|
1. 打开`docker-compose.yaml`,整个内容复制下来
|
||||||
https://gitee.com/certd/certd/raw/v2/docker/run/docker-compose.yaml
|
https://gitee.com/certd/certd/raw/v2/docker/run/docker-compose.yaml
|
||||||
|
|
||||||
|
::: tip
|
||||||
|
默认使用SQLite数据库,如果需要使用MySQL、PostgreSQL数据库,请参考[多数据库支持](../database.md)
|
||||||
|
:::
|
||||||
|
|
||||||
2. 然后到 `1Panel->容器->编排->新建编排`
|
2. 然后到 `1Panel->容器->编排->新建编排`
|
||||||
输入名称,粘贴`docker-compose.yaml`原文内容
|
输入名称,粘贴`docker-compose.yaml`原文内容
|
||||||
@@ -49,7 +51,10 @@ admin/123456
|
|||||||

|

|
||||||
|
|
||||||
> 默认使用sqlite数据库,数据保存在`/data/certd`目录下,您可以手动备份该目录
|
> 默认使用sqlite数据库,数据保存在`/data/certd`目录下,您可以手动备份该目录
|
||||||
> certd还支持`mysql`和`postgresql`数据库,[点我了解如何切换其他数据库](../database)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#### 2.2 访问测试
|
#### 2.2 访问测试
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,9 @@
|
|||||||
点击确定,等待启动完成
|
点击确定,等待启动完成
|
||||||

|

|
||||||
|
|
||||||
> certd默认使用sqlite数据库,另外支持`mysql`和`postgresql`数据库,[点我了解如何切换其他数据库](../database)
|
::: tip
|
||||||
|
默认安装使用SQLite数据库,如果需要使用MySQL、PostgreSQL数据库,请参考[多数据库支持](../database.md)
|
||||||
|
:::
|
||||||
|
|
||||||
|
|
||||||
## 二、访问应用
|
## 二、访问应用
|
||||||
|
|||||||
@@ -42,8 +42,9 @@ docker compose up -d
|
|||||||
> 如果提示 没有docker compose命令,请安装docker-compose
|
> 如果提示 没有docker compose命令,请安装docker-compose
|
||||||
> https://docs.docker.com/compose/install/linux/
|
> https://docs.docker.com/compose/install/linux/
|
||||||
|
|
||||||
> certd默认使用sqlite数据库,另外还支持`mysql`和`postgresql`数据库,[点我了解如何切换其他数据库](../database)
|
::: tip
|
||||||
|
默认安装使用SQLite数据库,如果需要使用MySQL、PostgreSQL数据库,请参考[多数据库支持](../database.md)
|
||||||
|
:::
|
||||||
|
|
||||||
### 3. 访问测试
|
### 3. 访问测试
|
||||||
|
|
||||||
|
|||||||
@@ -20,57 +20,59 @@
|
|||||||
| 16.| **APISIX授权** | |
|
| 16.| **APISIX授权** | |
|
||||||
| 17.| **亚马逊云aws授权** | |
|
| 17.| **亚马逊云aws授权** | |
|
||||||
| 18.| **亚马逊云科技(国区)授权** | |
|
| 18.| **亚马逊云科技(国区)授权** | |
|
||||||
| 19.| **CacheFly** | CacheFly |
|
| 19.| **BIND9 DNS 授权** | 通过 SSH 连接到 BIND9 服务器,使用 nsupdate 命令管理 DNS 记录 |
|
||||||
| 20.| **EAB授权** | ZeroSSL证书申请需要EAB授权 |
|
| 20.| **CacheFly** | CacheFly |
|
||||||
| 21.| **google cloud** | 谷歌云授权 |
|
| 21.| **EAB授权** | ZeroSSL证书申请需要EAB授权 |
|
||||||
| 22.| **cloudflare授权** | |
|
| 22.| **google cloud** | 谷歌云授权 |
|
||||||
| 23.| **中国移动CND授权** | |
|
| 23.| **cloudflare授权** | |
|
||||||
| 24.| **授权插件示例** | 这是一个示例授权插件,用于演示如何实现一个授权插件 |
|
| 24.| **中国移动CND授权** | |
|
||||||
| 25.| **dns.la授权** | |
|
| 25.| **授权插件示例** | 这是一个示例授权插件,用于演示如何实现一个授权插件 |
|
||||||
| 26.| **多吉云** | |
|
| 26.| **dns.la授权** | |
|
||||||
| 27.| **Dokploy授权** | |
|
| 27.| **多吉云** | |
|
||||||
| 28.| **farcdn授权** | |
|
| 28.| **Dokploy授权** | |
|
||||||
| 29.| **FlexCDN授权** | |
|
| 29.| **farcdn授权** | |
|
||||||
| 30.| **Gcore** | Gcore |
|
| 30.| **FlexCDN授权** | |
|
||||||
| 31.| **Github授权** | |
|
| 31.| **Gcore** | Gcore |
|
||||||
| 32.| **godaddy授权** | |
|
| 32.| **Github授权** | |
|
||||||
| 33.| **金山云授权** | |
|
| 33.| **godaddy授权** | |
|
||||||
| 34.| **FTP授权** | |
|
| 34.| **金山云授权** | |
|
||||||
| 35.| **七牛OSS授权** | |
|
| 35.| **FTP授权** | |
|
||||||
| 36.| **腾讯云COS授权** | 腾讯云对象存储授权,包含地域和存储桶 |
|
| 36.| **七牛OSS授权** | |
|
||||||
| 37.| **s3/minio授权** | S3/minio oss授权 |
|
| 37.| **腾讯云COS授权** | 腾讯云对象存储授权,包含地域和存储桶 |
|
||||||
| 38.| **namesilo授权** | |
|
| 38.| **s3/minio授权** | S3/minio oss授权 |
|
||||||
| 39.| **1panel授权** | 账号和密码 |
|
| 39.| **namesilo授权** | |
|
||||||
| 40.| **支付宝** | |
|
| 40.| **Next Terminal 授权** | 用于访问 Next Terminal API 的授权配置 |
|
||||||
| 41.| **白山云授权** | |
|
| 41.| **1panel授权** | 账号和密码 |
|
||||||
| 42.| **宝塔云WAF授权** | 用于连接和管理宝塔云WAF服务的授权配置 |
|
| 42.| **支付宝** | |
|
||||||
| 43.| **cdnfly授权** | |
|
| 43.| **白山云授权** | |
|
||||||
| 44.| **k8s授权** | |
|
| 44.| **宝塔云WAF授权** | 用于连接和管理宝塔云WAF服务的授权配置 |
|
||||||
| 45.| **括彩云cdn授权** | 括彩云CDN,每月免费30G,[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) |
|
| 45.| **cdnfly授权** | |
|
||||||
| 46.| **LeCDN授权** | |
|
| 46.| **k8s授权** | |
|
||||||
| 47.| **lucky** | |
|
| 47.| **括彩云cdn授权** | 括彩云CDN,每月免费30G,[注册即领](https://kuocaicdn.com/register?code=8mn536rrzfbf8) |
|
||||||
| 48.| **猫云授权** | |
|
| 48.| **LeCDN授权** | |
|
||||||
| 49.| **plesk授权** | |
|
| 49.| **lucky** | |
|
||||||
| 50.| **长亭雷池授权** | |
|
| 50.| **猫云授权** | |
|
||||||
| 51.| **群晖登录授权** | |
|
| 51.| **plesk授权** | |
|
||||||
| 52.| **uniCloud** | unicloud授权 |
|
| 52.| **长亭雷池授权** | |
|
||||||
| 53.| **微信支付** | |
|
| 53.| **群晖登录授权** | |
|
||||||
| 54.| **易盾rcdn授权** | 易盾CDN,每月免费30G,[注册即领](https://rhcdn.yiduncdn.com/register?code=8mn536rrzfbf8) |
|
| 54.| **uniCloud** | unicloud授权 |
|
||||||
| 55.| **易发云短信** | sms.yfyidc.cn/ |
|
| 55.| **微信支付** | |
|
||||||
| 56.| **易盾DCDN授权** | https://user.yiduncdn.com |
|
| 56.| **易盾rcdn授权** | 易盾CDN,每月免费30G,[注册即领](https://rhcdn.yiduncdn.com/register?code=8mn536rrzfbf8) |
|
||||||
| 57.| **易支付** | |
|
| 57.| **易发云短信** | sms.yfyidc.cn/ |
|
||||||
| 58.| **proxmox** | |
|
| 58.| **易盾DCDN授权** | https://user.yiduncdn.com |
|
||||||
| 59.| **UCloud授权** | 优刻得授权 |
|
| 59.| **易支付** | |
|
||||||
| 60.| **又拍云** | |
|
| 60.| **proxmox** | |
|
||||||
| 61.| **网宿授权** | |
|
| 61.| **UCloud授权** | 优刻得授权 |
|
||||||
| 62.| **西部数码授权** | |
|
| 62.| **又拍云** | |
|
||||||
| 63.| **我爱云授权** | 我爱云CDN |
|
| 63.| **网宿授权** | |
|
||||||
| 64.| **新网授权(代理方式)** | |
|
| 64.| **西部数码授权** | |
|
||||||
| 65.| **新网授权** | |
|
| 65.| **我爱云授权** | 我爱云CDN |
|
||||||
| 66.| **新网互联授权** | 仅支持代理账号,ip需要加入白名单 |
|
| 66.| **新网授权(代理方式)** | |
|
||||||
| 67.| **Zenlayer授权** | Zenlayer授权 |
|
| 67.| **新网授权** | |
|
||||||
| 68.| **GoEdge授权** | |
|
| 68.| **新网互联授权** | 仅支持代理账号,ip需要加入白名单 |
|
||||||
| 69.| **雨云授权** | https://app.rainyun.com/ |
|
| 69.| **Zenlayer授权** | Zenlayer授权 |
|
||||||
|
| 70.| **GoEdge授权** | |
|
||||||
|
| 71.| **雨云授权** | https://app.rainyun.com/ |
|
||||||
|
|
||||||
<style module>
|
<style module>
|
||||||
table th:first-of-type {
|
table th:first-of-type {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# 任务插件
|
# 任务插件
|
||||||
共 `122` 款任务插件
|
共 `129` 款任务插件
|
||||||
## 1. 证书申请
|
## 1. 证书申请
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
@@ -57,44 +57,47 @@
|
|||||||
| 2.| **AcePanel-面板证书** | 部署AcePanel面板证书 |
|
| 2.| **AcePanel-面板证书** | 部署AcePanel面板证书 |
|
||||||
| 3.| **Dokploy-部署server证书** | 自动更新Dokploy server证书 |
|
| 3.| **Dokploy-部署server证书** | 自动更新Dokploy server证书 |
|
||||||
| 4.| **飞牛NAS-部署证书** | |
|
| 4.| **飞牛NAS-部署证书** | |
|
||||||
| 5.| **1Panel-部署面板证书** | 更新1Panel的面板证书 |
|
| 5.| **NextTerminal-更新证书** | 更新 Next Terminal 证书 |
|
||||||
| 6.| **1Panel-更新站点证书** | 更新1Panel的站点证书 |
|
| 6.| **1Panel-部署面板证书** | 更新1Panel的面板证书 |
|
||||||
| 7.| **宝塔-删除过期证书** | 删除证书夹中过期证书 |
|
| 7.| **1Panel-更新站点证书** | 更新1Panel的站点证书 |
|
||||||
| 8.| **宝塔-WAF证书部署** | 部署宝塔云WAF/aaWAF |
|
| 8.| **宝塔-删除过期证书** | 删除证书夹中过期证书 |
|
||||||
| 9.| **宝塔-面板证书部署** | 部署宝塔面板本身的ssl证书 |
|
| 9.| **宝塔-WAF证书部署** | 部署宝塔云WAF/aaWAF |
|
||||||
| 10.| **宝塔win-网站证书部署** | 部署到Windows版宝塔管理的站点的ssl证书 |
|
| 10.| **宝塔-面板证书部署** | 部署宝塔面板本身的ssl证书 |
|
||||||
| 11.| **宝塔-网站证书部署** | 部署宝塔管理的站点的ssl证书,目前支持宝塔网站站点、docker站点等。本插件也支持aaPanel。 |
|
| 11.| **宝塔win-网站证书部署** | 部署到Windows版宝塔管理的站点的ssl证书 |
|
||||||
| 12.| **K8S-Apply自定义yaml** | apply自定义yaml到k8s |
|
| 12.| **宝塔-网站证书部署** | 部署宝塔管理的站点的ssl证书,目前支持宝塔网站站点、docker站点等。本插件也支持aaPanel。 |
|
||||||
| 13.| **K8S-Ingress 证书部署** | 部署证书到k8s的Ingress |
|
| 13.| **K8S-Apply自定义yaml** | apply自定义yaml到k8s |
|
||||||
| 14.| **K8S-部署证书到Secret** | 部署证书到k8s的secret |
|
| 14.| **K8S-Ingress 证书部署** | 部署证书到k8s的Ingress |
|
||||||
| 15.| **lucky-更新Lucky证书** | |
|
| 15.| **K8S-部署证书到Secret** | 部署证书到k8s的secret |
|
||||||
| 16.| **Plesk-部署Plesk网站证书** | |
|
| 16.| **lucky-更新Lucky证书** | |
|
||||||
| 17.| **Plesk-更新证书** | 不会创建新证书记录,直接更新旧的证书 |
|
| 17.| **Plesk-部署Plesk网站证书** | |
|
||||||
| 18.| **雷池-更新证书** | 更新长亭雷池WAF的证书 |
|
| 18.| **Plesk-更新证书** | 不会创建新证书记录,直接更新旧的证书 |
|
||||||
| 19.| **群晖-部署证书到群晖面板** | Synology,支持6.x以上版本 |
|
| 19.| **雷池-更新证书(支持控制台和防护应用)** | 更新长亭雷池WAF的证书,支持更新控制台和防护应用的证书。 |
|
||||||
| 20.| **uniCloud-部署到服务空间** | 部署到服务空间 |
|
| 20.| **群晖-部署证书到群晖面板** | Synology,支持6.x以上版本 |
|
||||||
| 21.| **Proxmox-上传证书到Proxmox** | |
|
| 21.| **群晖-刷新OTP登录有效期** | 群晖登录状态可能30天失效,需要在失效之前登录一次,刷新有效期,您可以将其放在“部署到群晖面板”任务之后 |
|
||||||
| 22.| **威联通-部署证书到威联通** | 部署证书到qnap |
|
| 22.| **uniCloud-部署到服务空间** | 部署到服务空间 |
|
||||||
|
| 23.| **Proxmox-上传证书到Proxmox** | |
|
||||||
|
| 24.| **威联通-部署证书到威联通** | 部署证书到qnap |
|
||||||
## 5. 阿里云
|
## 5. 阿里云
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
|-----|-----|-----|
|
|-----|-----|-----|
|
||||||
| 1.| **阿里云-部署到Ack** | 部署到阿里云Ack集群Ingress等通过Secret管理证书的应用 |
|
| 1.| **阿里云-删除即将过期证书** | 仅删除未使用的证书 |
|
||||||
| 2.| **阿里云-部署至ALB(应用负载均衡)** | ALB,更新监听器的默认证书 |
|
| 2.| **阿里云-部署到Ack** | 部署到阿里云Ack集群Ingress等通过Secret管理证书的应用 |
|
||||||
| 3.| **阿里云-部署至任意云资源** | 【不建议使用】需要消耗阿里云自动部署次数,支持SLB、LIVE、webHosting、VOD、CR、DCDN、DDoS、CDN、ALB、APIGateway、FC、GA、MSE、NLB、OSS、SAE、WAF等云产品 |
|
| 3.| **阿里云-部署至ALB(应用负载均衡)** | ALB,更新监听器的默认证书 |
|
||||||
| 4.| **阿里云-部署至云原生API网关/AI网关** | 自动部署域名证书至云原生API网关、AI网关 |
|
| 4.| **阿里云-部署至任意云资源** | 【不建议使用】需要消耗阿里云自动部署次数,支持SLB、LIVE、webHosting、VOD、CR、DCDN、DDoS、CDN、ALB、APIGateway、FC、GA、MSE、NLB、OSS、SAE、WAF等云产品 |
|
||||||
| 5.| **阿里云-部署证书至API网关** | 自动部署域名证书至阿里云API网关(APIGateway) |
|
| 5.| **阿里云-部署至云原生API网关/AI网关** | 自动部署域名证书至云原生API网关、AI网关 |
|
||||||
| 6.| **阿里云-部署证书至CDN** | 自动部署域名证书至阿里云CDN |
|
| 6.| **阿里云-部署证书至API网关** | 自动部署域名证书至阿里云API网关(APIGateway) |
|
||||||
| 7.| **阿里云-部署证书至DCDN** | 依赖证书申请前置任务,自动部署域名证书至阿里云DCDN |
|
| 7.| **阿里云-部署证书至CDN** | 自动部署域名证书至阿里云CDN |
|
||||||
| 8.| **阿里云-部署至ESA** | 部署证书到阿里云ESA(边缘安全加速),自动删除过期证书 |
|
| 8.| **阿里云-部署证书至DCDN** | 依赖证书申请前置任务,自动部署域名证书至阿里云DCDN |
|
||||||
| 9.| **阿里云-部署至阿里云FC(3.0)** | 部署证书到阿里云函数计算(FC3.0) |
|
| 9.| **阿里云-部署至ESA** | 部署证书到阿里云ESA(边缘安全加速),自动删除过期证书 |
|
||||||
| 10.| **阿里云-部署至GA** | 部署证书到阿里云GA(全球加速),支持更新默认证书和扩展证书 |
|
| 10.| **阿里云-部署至阿里云FC(3.0)** | 部署证书到阿里云函数计算(FC3.0) |
|
||||||
| 11.| **阿里云-部署至NLB(网络负载均衡)** | NLB,网络负载均衡,更新监听器的默认证书 |
|
| 11.| **阿里云-部署至GA** | 部署证书到阿里云GA(全球加速),支持更新默认证书和扩展证书 |
|
||||||
| 12.| **阿里云-部署证书至OSS** | 部署域名证书至阿里云OSS自定义域名,不是上传到阿里云oss |
|
| 12.| **阿里云-部署至NLB(网络负载均衡)** | NLB,网络负载均衡,更新监听器的默认证书 |
|
||||||
| 13.| **阿里云-部署至CLB(传统负载均衡)** | 部署证书到阿里云CLB(传统负载均衡) |
|
| 13.| **阿里云-部署证书至OSS** | 部署域名证书至阿里云OSS自定义域名,不是上传到阿里云oss |
|
||||||
| 14.| **阿里云-部署至VOD** | 部署证书到阿里云视频点播(vod) |
|
| 14.| **阿里云-部署至CLB(传统负载均衡)** | 部署证书到阿里云CLB(传统负载均衡) |
|
||||||
| 15.| **阿里云-部署至阿里云WAF** | 部署证书到阿里云WAF |
|
| 15.| **阿里云-部署至VOD** | 部署证书到阿里云视频点播(vod) |
|
||||||
| 16.| **阿里云-上传证书到CAS** | 上传证书到阿里云证书管理服务(CAS),如果不想在阿里云上同一份证书上传多次,可以把此任务作为前置任务,其他阿里云任务证书那一项选择此任务的输出 |
|
| 16.| **阿里云-部署至阿里云WAF** | 部署证书到阿里云WAF |
|
||||||
|
| 17.| **阿里云-上传证书到CAS** | 上传证书到阿里云证书管理服务(CAS),如果不想在阿里云上同一份证书上传多次,可以把此任务作为前置任务,其他阿里云任务证书那一项选择此任务的输出 |
|
||||||
## 6. 华为云
|
## 6. 华为云
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
@@ -110,9 +113,9 @@
|
|||||||
| 1.| **腾讯云-删除即将过期证书** | 仅删除未使用的证书 |
|
| 1.| **腾讯云-删除即将过期证书** | 仅删除未使用的证书 |
|
||||||
| 2.| **腾讯云-部署证书到任意云资源** | 支持负载均衡、CDN、DDoS、直播、点播、Web应用防火墙、API网关、TEO、容器服务、对象存储、轻应用服务器、云原生微服务、云开发 |
|
| 2.| **腾讯云-部署证书到任意云资源** | 支持负载均衡、CDN、DDoS、直播、点播、Web应用防火墙、API网关、TEO、容器服务、对象存储、轻应用服务器、云原生微服务、云开发 |
|
||||||
| 3.| **腾讯云-部署到CDN(废弃)** | 已废弃,请使用v2版 |
|
| 3.| **腾讯云-部署到CDN(废弃)** | 已废弃,请使用v2版 |
|
||||||
| 4.| **腾讯云-部署到CDN-v2** | 推荐使用 |
|
| 4.| **腾讯云-部署到CDN-v2** | 推荐使用,支持CDN域名以及COS加速域名 |
|
||||||
| 5.| **腾讯云-部署到CLB** | 暂时只支持单向认证证书,暂时只支持通用负载均衡 |
|
| 5.| **腾讯云-部署到CLB** | 暂时只支持单向认证证书,暂时只支持通用负载均衡 |
|
||||||
| 6.| **腾讯云-部署证书到COS** | 部署到腾讯云COS源站域名证书【注意:很不稳定,需要重试很多次偶尔才能成功一次】 |
|
| 6.| **腾讯云-部署证书到COS** | 部署到腾讯云COS源站域名证书,注意是源站域名,加速域名请使用腾讯云CDN v2插件【注意:很不稳定,需要重试很多次偶尔才能成功一次】 |
|
||||||
| 7.| **腾讯云-部署到腾讯云EO** | 腾讯云边缘安全加速平台EdgeOne(EO) |
|
| 7.| **腾讯云-部署到腾讯云EO** | 腾讯云边缘安全加速平台EdgeOne(EO) |
|
||||||
| 8.| **腾讯云-部署到腾讯云直播** | https://console.cloud.tencent.com/live/ |
|
| 8.| **腾讯云-部署到腾讯云直播** | https://console.cloud.tencent.com/live/ |
|
||||||
| 9.| **腾讯云-部署到TKE** | 修改TKE集群密钥配置,支持Opaque和TLS证书类型。注意: 1. serverless集群请使用K8S部署插件; 2. Opaque类型需要【上传到腾讯云】作为前置任务; 3. ApiServer需要开通公网访问(或者certd可访问),实际上底层仍然是通过KubeClient进行部署 |
|
| 9.| **腾讯云-部署到TKE** | 修改TKE集群密钥配置,支持Opaque和TLS证书类型。注意: 1. serverless集群请使用K8S部署插件; 2. Opaque类型需要【上传到腾讯云】作为前置任务; 3. ApiServer需要开通公网访问(或者certd可访问),实际上底层仍然是通过KubeClient进行部署 |
|
||||||
@@ -128,8 +131,9 @@
|
|||||||
| 3.| **火山引擎-部署证书至CLB** | 部署至火山引擎负载均衡 |
|
| 3.| **火山引擎-部署证书至CLB** | 部署至火山引擎负载均衡 |
|
||||||
| 4.| **火山引擎-部署证书至DCDN** | 部署至火山引擎全站加速 |
|
| 4.| **火山引擎-部署证书至DCDN** | 部署至火山引擎全站加速 |
|
||||||
| 5.| **火山引擎-部署证书至Live** | 部署至火山引擎视频直播 |
|
| 5.| **火山引擎-部署证书至Live** | 部署至火山引擎视频直播 |
|
||||||
| 6.| **火山引擎-部署证书至VOD** | 部署至火山引擎视频点播(暂不可用) |
|
| 6.| **火山引擎-部署证书至TOS自定义域名** | 仅限TOS自定义域名,加速域名请选择火山引擎的CDN插件 |
|
||||||
| 7.| **火山引擎-上传证书至证书中心** | 上传证书至火山引擎证书中心 |
|
| 7.| **火山引擎-部署证书至VOD** | 部署至火山引擎视频点播 |
|
||||||
|
| 8.| **火山引擎-上传证书至证书中心** | 上传证书至火山引擎证书中心 |
|
||||||
## 9. 京东云
|
## 9. 京东云
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
@@ -151,8 +155,9 @@
|
|||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
|-----|-----|-----|
|
|-----|-----|-----|
|
||||||
| 1.| **百度云-部署证书到负载均衡** | 部署到百度云负载均衡,包括BLB、APPBLB |
|
| 1.| **百度云-部署证书到负载均衡** | 部署到百度云负载均衡,包括BLB、APPBLB |
|
||||||
| 2.| **百度云-部署证书到CDN** | 部署到百度云CDN |
|
| 2.| **百度云-部署到CCE** | 部署到百度云CCE集群Ingress等通过Secret管理证书的应用 |
|
||||||
| 3.| **百度云-上传到证书托管** | 上传证书到百度云证书托管中心 |
|
| 3.| **百度云-部署证书到CDN** | 部署到百度云CDN |
|
||||||
|
| 4.| **百度云-上传到证书托管** | 上传证书到百度云证书托管中心 |
|
||||||
## 12. 七牛云
|
## 12. 七牛云
|
||||||
|
|
||||||
| 序号 | 名称 | 说明 |
|
| 序号 | 名称 | 说明 |
|
||||||
@@ -182,7 +187,8 @@
|
|||||||
|-----|-----|-----|
|
|-----|-----|-----|
|
||||||
| 1.| **数据库备份** | 【仅管理员可用】仅支持备份SQLite数据库 |
|
| 1.| **数据库备份** | 【仅管理员可用】仅支持备份SQLite数据库 |
|
||||||
| 2.| **重启 Certd** | 【仅管理员可用】 重启 certd的https服务,用于更新 Certd 的 ssl 证书 |
|
| 2.| **重启 Certd** | 【仅管理员可用】 重启 certd的https服务,用于更新 Certd 的 ssl 证书 |
|
||||||
| 3.| **自定义js脚本** | 【仅管理员】运行自定义js脚本执行 |
|
| 3.| **部署证书到Certd本身** | 【仅管理员可用】 部署证书到 certd的https服务,用于更新 Certd 的 ssl 证书,建议将此任务放在流水线的最后一步 |
|
||||||
|
| 4.| **自定义js脚本** | 【仅管理员】运行自定义js脚本执行 |
|
||||||
|
|
||||||
<style module>
|
<style module>
|
||||||
table th:first-of-type {
|
table th:first-of-type {
|
||||||
|
|||||||
@@ -9,18 +9,19 @@
|
|||||||
| 5.| **京东云** | 京东云DNS解析提供商 |
|
| 5.| **京东云** | 京东云DNS解析提供商 |
|
||||||
| 6.| **新网(代理方式)** | 新网域名解析(代理方式) |
|
| 6.| **新网(代理方式)** | 新网域名解析(代理方式) |
|
||||||
| 7.| **新网** | 新网域名解析 |
|
| 7.| **新网** | 新网域名解析 |
|
||||||
| 8.| **cloudflare** | cloudflare dns provider |
|
| 8.| **BIND9 DNS** | 通过 SSH 连接到 BIND9 服务器,使用 nsupdate 命令管理 DNS 记录 |
|
||||||
| 9.| **dns.la** | dns.la |
|
| 9.| **cloudflare** | cloudflare dns provider |
|
||||||
| 10.| **godaddy** | GoDaddy |
|
| 10.| **dns.la** | dns.la |
|
||||||
| 11.| **华为云** | 华为云DNS解析提供商 |
|
| 11.| **godaddy** | GoDaddy |
|
||||||
| 12.| **namesilo** | namesilo dns provider |
|
| 12.| **华为云** | 华为云DNS解析提供商 |
|
||||||
| 13.| **雨云** | 雨云DNS解析提供商 |
|
| 13.| **namesilo** | namesilo dns provider |
|
||||||
| 14.| **腾讯云** | 腾讯云域名DNS解析提供者 |
|
| 14.| **雨云** | 雨云DNS解析提供商 |
|
||||||
| 15.| **腾讯云EO DNS** | 腾讯云EO DNS解析提供者 |
|
| 15.| **腾讯云** | 腾讯云域名DNS解析提供者 |
|
||||||
| 16.| **西部数码** | west dns provider |
|
| 16.| **腾讯云EO DNS** | 腾讯云EO DNS解析提供者 |
|
||||||
| 17.| **Dns提供商Demo** | dns provider示例 |
|
| 17.| **西部数码** | west dns provider |
|
||||||
| 18.| **51dns** | 51DNS |
|
| 18.| **Dns提供商Demo** | dns provider示例 |
|
||||||
| 19.| **新网互联** | 新网互联 |
|
| 19.| **51dns** | 51DNS |
|
||||||
|
| 20.| **新网互联** | 新网互联 |
|
||||||
|
|
||||||
<style module>
|
<style module>
|
||||||
table th:first-of-type {
|
table th:first-of-type {
|
||||||
|
|||||||
@@ -28,6 +28,11 @@ https://certd.handsfree.work/
|
|||||||
2. [Docker方式部署](./install/docker/)
|
2. [Docker方式部署](./install/docker/)
|
||||||
3. [源码方式部署](./install/source/)
|
3. [源码方式部署](./install/source/)
|
||||||
|
|
||||||
|
::: tip
|
||||||
|
默认安装使用SQLite数据库,如果需要使用MySQL、PostgreSQL数据库,请参考[多数据库支持](./install/database.md)
|
||||||
|
:::
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
### 2. 访问测试
|
### 2. 访问测试
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 51 KiB |
|
Before Width: | Height: | Size: 33 KiB |
BIN
docs/guide/use/https/images/4.png
Normal file
|
After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 28 KiB |
@@ -16,21 +16,11 @@ CERTD_HTTPS_port=7002
|
|||||||
|
|
||||||
参考Certd顶部的创建证书流水线教程
|
参考Certd顶部的创建证书流水线教程
|
||||||
|
|
||||||
### 2、配置复制到本机任务
|
### 2、配置部署证书到certd任务
|
||||||
将证书复制到certd的证书安装位置
|
|
||||||
证书路径:`ssl/cert.crt`
|
|
||||||
私钥路径:`ssl/cert.key`
|
|
||||||
|
|
||||||

|

|
||||||

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

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

|

|
||||||
|
|||||||
@@ -9,5 +9,5 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"npmClient": "pnpm",
|
"npmClient": "pnpm",
|
||||||
"version": "1.38.9"
|
"version": "1.39.8"
|
||||||
}
|
}
|
||||||
|
|||||||
19
package.json
@@ -15,28 +15,29 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "lerna bootstrap --hoist",
|
"start": "lerna bootstrap --hoist",
|
||||||
"start:server": "cd ./packages/ui/certd-server && npm start",
|
"start:server": "cd ./packages/ui/certd-server && pnpm start",
|
||||||
"devb": "lerna run dev-build",
|
"devb": "lerna run dev-build",
|
||||||
"i-all": "lerna link && lerna exec npm install ",
|
"i-all": "lerna link && lerna exec npm install ",
|
||||||
"publish": "npm run prepublishOnly2 && lerna publish --force-publish=pro/plus-core --conventional-commits && npm run afterpublishOnly ",
|
"publish": "pnpm run prepublishOnly2 && lerna publish --force-publish=pro/plus-core --conventional-commits && pnpm run afterpublishOnly ",
|
||||||
"afterpublishOnly": "npm run copylogs && time /t >trigger/build.trigger && git add ./trigger/build.trigger && git commit -m \"build: trigger build image\" && TIMEOUT /T 10 && npm run commitAll",
|
"afterpublishOnly": "pnpm run copylogs && time /t >trigger/build.trigger && git add ./trigger/build.trigger && git commit -m \"build: trigger build image\" && TIMEOUT /T 10 && pnpm run commitAll",
|
||||||
"transform-sql": "cd ./packages/ui/certd-server/db/ && node --experimental-json-modules transform.js",
|
"transform-sql": "cd ./packages/ui/certd-server/db/ && node --experimental-json-modules transform.js",
|
||||||
"plugin-doc-gen": "cd ./packages/ui/certd-server/ && npm run export-metadata",
|
"plugin-doc-gen": "cd ./packages/ui/certd-server/ && pnpm run export-metadata",
|
||||||
"commitAll": "git add . && git commit -m \"build: publish\" && git push && npm run commitPro",
|
"commitAll": "git add . && git commit -m \"build: publish\" && git push && pnpm 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/",
|
||||||
"prepublishOnly1": "npm run check && lerna run build ",
|
"prepublishOnly1": "pnpm run check && lerna run build ",
|
||||||
"prepublishOnly2": "npm run check && npm run before-build && lerna run build && npm run plugin-doc-gen",
|
"prepublishOnly2": "pnpm run check && pnpm run before-build && lerna run build && pnpm run plugin-doc-gen",
|
||||||
"before-build": "npm run transform-sql && cd ./packages/core/basic && time /t >build.md && git add ./build.md && git commit -m \"build: prepare to build\"",
|
"before-build": "pnpm run transform-sql && cd ./packages/core/basic && time /t >build.md && git add ./build.md && git commit -m \"build: prepare to build\"",
|
||||||
"deploy1": "node --experimental-json-modules ./scripts/deploy.js ",
|
"deploy1": "node --experimental-json-modules ./scripts/deploy.js ",
|
||||||
"check": "node --experimental-json-modules ./scripts/publish-check.js",
|
"check": "node --experimental-json-modules ./scripts/publish-check.js",
|
||||||
"init": "lerna run build",
|
"init": "lerna run build",
|
||||||
"init:dev": "lerna run build",
|
"init:dev": "lerna run build",
|
||||||
"docs:dev": "vitepress dev docs",
|
"docs:dev": "vitepress dev docs",
|
||||||
"docs:build": "npm run copylogs && vitepress build docs",
|
"docs:build": "pnpm 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 ",
|
"dev": "pnpm run -r --parallel compile ",
|
||||||
|
"pub_all":"pnpm run -r --parallel pub ",
|
||||||
"release": "time /t >trigger/release.trigger && git add trigger/release.trigger && git commit -m \"build: release\" && git push",
|
"release": "time /t >trigger/release.trigger && git add trigger/release.trigger && git commit -m \"build: release\" && git push",
|
||||||
"publish_to_atomgit": "node --experimental-json-modules ./scripts/publish-atomgit.js",
|
"publish_to_atomgit": "node --experimental-json-modules ./scripts/publish-atomgit.js",
|
||||||
"publish_to_gitee": "node --experimental-json-modules ./scripts/publish-gitee.js",
|
"publish_to_gitee": "node --experimental-json-modules ./scripts/publish-gitee.js",
|
||||||
|
|||||||
@@ -3,6 +3,56 @@
|
|||||||
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.39.8](https://github.com/publishlab/node-acme-client/compare/v1.39.7...v1.39.8) (2026-03-31)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.39.7](https://github.com/publishlab/node-acme-client/compare/v1.39.6...v1.39.7) (2026-03-25)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.39.6](https://github.com/publishlab/node-acme-client/compare/v1.39.5...v1.39.6) (2026-03-22)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.39.5](https://github.com/publishlab/node-acme-client/compare/v1.39.4...v1.39.5) (2026-03-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.39.4](https://github.com/publishlab/node-acme-client/compare/v1.39.3...v1.39.4) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.39.3](https://github.com/publishlab/node-acme-client/compare/v1.39.2...v1.39.3) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.39.2](https://github.com/publishlab/node-acme-client/compare/v1.39.1...v1.39.2) (2026-03-16)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复京东云报错不准确的bug ([10dd89a](https://github.com/publishlab/node-acme-client/commit/10dd89ae62e438a211a15e729559af823a096583))
|
||||||
|
|
||||||
|
## [1.39.1](https://github.com/publishlab/node-acme-client/compare/v1.39.0...v1.39.1) (2026-03-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
# [1.39.0](https://github.com/publishlab/node-acme-client/compare/v1.38.12...v1.39.0) (2026-03-07)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.38.12](https://github.com/publishlab/node-acme-client/compare/v1.38.11...v1.38.12) (2026-02-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.38.11](https://github.com/publishlab/node-acme-client/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/publishlab/node-acme-client/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
## [1.38.9](https://github.com/publishlab/node-acme-client/compare/v1.38.8...v1.38.9) (2026-02-09)
|
## [1.38.9](https://github.com/publishlab/node-acme-client/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/acme-client
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"description": "Simple and unopinionated ACME client",
|
"description": "Simple and unopinionated ACME client",
|
||||||
"private": false,
|
"private": false,
|
||||||
"author": "nmorsman",
|
"author": "nmorsman",
|
||||||
"version": "1.38.9",
|
"version": "1.39.8",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"module": "scr/index.js",
|
"module": "scr/index.js",
|
||||||
"main": "src/index.js",
|
"main": "src/index.js",
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
"types"
|
"types"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/basic": "^1.38.9",
|
"@certd/basic": "^1.39.8",
|
||||||
"@peculiar/x509": "^1.11.0",
|
"@peculiar/x509": "^1.11.0",
|
||||||
"asn1js": "^3.0.5",
|
"asn1js": "^3.0.5",
|
||||||
"axios": "^1.9.0",
|
"axios": "^1.9.0",
|
||||||
@@ -53,7 +53,7 @@
|
|||||||
"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"
|
"compile": "echo '1'"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
@@ -70,5 +70,5 @@
|
|||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/publishlab/node-acme-client/issues"
|
"url": "https://github.com/publishlab/node-acme-client/issues"
|
||||||
},
|
},
|
||||||
"gitHead": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
|
"gitHead": "de0ae14544f1c3da4923dddc6a1a3bea4db295e7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -174,7 +174,7 @@ export default async (client, userOpts) => {
|
|||||||
|
|
||||||
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
log(`[auto] [${d}] challengeCreateFn threw error: ${e.message}`);
|
log(`[auto] [${d}] challengeCreateFn threw error: ${e.message || e}`);
|
||||||
await deactivateAuth(e);
|
await deactivateAuth(e);
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -588,7 +588,8 @@ class AcmeClient {
|
|||||||
|
|
||||||
if (invalidStates.includes(resp.data.status)) {
|
if (invalidStates.includes(resp.data.status)) {
|
||||||
abort();
|
abort();
|
||||||
throw new Error(util.formatResponseError(resp));
|
this.log(`[${d}] : 检查状态 = ${resp.data.status} : ${JSON.stringify(resp.data)}`);
|
||||||
|
throw new Error("校验失败:" + util.formatResponseError(resp));
|
||||||
}
|
}
|
||||||
else if (pendingStates.includes(resp.data.status)) {
|
else if (pendingStates.includes(resp.data.status)) {
|
||||||
throw new Error(`[${d}] Operation is pending or processing(当前仍然在等待状态)`);
|
throw new Error(`[${d}] Operation is pending or processing(当前仍然在等待状态)`);
|
||||||
|
|||||||
@@ -3,6 +3,64 @@
|
|||||||
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.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.39.7](https://github.com/certd/certd/compare/v1.39.6...v1.39.7) (2026-03-25)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.39.6](https://github.com/certd/certd/compare/v1.39.5...v1.39.6) (2026-03-22)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.39.5](https://github.com/certd/certd/compare/v1.39.4...v1.39.5) (2026-03-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.39.4](https://github.com/certd/certd/compare/v1.39.3...v1.39.4) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.39.3](https://github.com/certd/certd/compare/v1.39.2...v1.39.3) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.39.2](https://github.com/certd/certd/compare/v1.39.1...v1.39.2) (2026-03-16)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复群晖测试时报addSecret undefine错误 ([5eb4aa3](https://github.com/certd/certd/commit/5eb4aa3a0eab9ffa729c8e813cbf973d9683cc13))
|
||||||
|
|
||||||
|
## [1.39.1](https://github.com/certd/certd/compare/v1.39.0...v1.39.1) (2026-03-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* esxi部署失败的bug ([1e44115](https://github.com/certd/certd/commit/1e441154617e6516a9a3610412bf597128c62696))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* http请求增加建立连接超时配置 ([3c85602](https://github.com/certd/certd/commit/3c85602ab1fc1953cdc06a6cd75a971d14119179))
|
||||||
|
|
||||||
|
## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 421 支持3次重试 ([b91548e](https://github.com/certd/certd/commit/b91548eef4c24faa822d3a40f1f6a77b41d274e4))
|
||||||
|
|
||||||
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
23:08
|
23:54
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/basic",
|
"name": "@certd/basic",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.38.9",
|
"version": "1.39.8",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -47,5 +47,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
|
"gitHead": "de0ae14544f1c3da4923dddc6a1a3bea4db295e7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ export function resetLogConfigure() {
|
|||||||
}
|
}
|
||||||
resetLogConfigure();
|
resetLogConfigure();
|
||||||
export const logger: ILogger = log4js.getLogger("default") as any;
|
export const logger: ILogger = log4js.getLogger("default") as any;
|
||||||
|
logger.addSecret = (secret: string) => {};
|
||||||
|
|
||||||
export function resetLogFilePath(filePath: string) {
|
export function resetLogFilePath(filePath: string) {
|
||||||
logFilePath = filePath;
|
logFilePath = filePath;
|
||||||
@@ -106,8 +107,8 @@ export class PipelineLogger implements ILogger {
|
|||||||
logger: ILogger;
|
logger: ILogger;
|
||||||
customWriter!: (text: string) => void;
|
customWriter!: (text: string) => void;
|
||||||
|
|
||||||
constructor(name: string, write: (text: string) => void) {
|
constructor(name: string, write?: (text: string) => void) {
|
||||||
this.customWriter = write;
|
this.customWriter = write || (() => {});
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
this.logger = log4js.getLogger(name);
|
this.logger = log4js.getLogger(name);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import * as https from "node:https";
|
|||||||
import { merge } from "lodash-es";
|
import { merge } from "lodash-es";
|
||||||
import { safePromise } from "./util.promise.js";
|
import { safePromise } from "./util.promise.js";
|
||||||
import fs from "fs";
|
import fs from "fs";
|
||||||
|
import sleep from "./util.sleep.js";
|
||||||
const errorMap: Record<string, string> = {
|
const errorMap: Record<string, string> = {
|
||||||
"ssl3_get_record:wrong version number": "http协议错误,服务端要求http协议,请检查是否使用了https请求",
|
"ssl3_get_record:wrong version number": "http协议错误,服务端要求http协议,请检查是否使用了https请求",
|
||||||
"getaddrinfo EAI_AGAIN": "无法解析域名,请检查网络连接或dns配置,更换docker-compose.yaml中dns配置",
|
"getaddrinfo EAI_AGAIN": "无法解析域名,请检查网络连接或dns配置,更换docker-compose.yaml中dns配置",
|
||||||
@@ -148,6 +148,16 @@ export function createAxiosService({ logger }: { logger: ILogger }) {
|
|||||||
// });
|
// });
|
||||||
// config.httpsAgent = agent;
|
// config.httpsAgent = agent;
|
||||||
config.proxy = false; //必须 否则还会走一层代理,
|
config.proxy = false; //必须 否则还会走一层代理,
|
||||||
|
|
||||||
|
config.retry = merge(
|
||||||
|
{
|
||||||
|
status: [421],
|
||||||
|
count: 0,
|
||||||
|
max: 3,
|
||||||
|
delay: 1000,
|
||||||
|
},
|
||||||
|
config.retry
|
||||||
|
);
|
||||||
return config;
|
return config;
|
||||||
},
|
},
|
||||||
(error: Error) => {
|
(error: Error) => {
|
||||||
@@ -175,7 +185,7 @@ export function createAxiosService({ logger }: { logger: ILogger }) {
|
|||||||
}
|
}
|
||||||
return response.data;
|
return response.data;
|
||||||
},
|
},
|
||||||
(error: any) => {
|
async (error: any) => {
|
||||||
const status = error.response?.status;
|
const status = error.response?.status;
|
||||||
let message = "";
|
let message = "";
|
||||||
switch (status) {
|
switch (status) {
|
||||||
@@ -215,6 +225,9 @@ export function createAxiosService({ logger }: { logger: ILogger }) {
|
|||||||
case 302:
|
case 302:
|
||||||
//重定向
|
//重定向
|
||||||
return Promise.resolve(error.response);
|
return Promise.resolve(error.response);
|
||||||
|
case 421:
|
||||||
|
message = "源站请求超时";
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -256,6 +269,22 @@ export function createAxiosService({ logger }: { logger: ILogger }) {
|
|||||||
if (error instanceof AggregateError) {
|
if (error instanceof AggregateError) {
|
||||||
logger.error("AggregateError", error);
|
logger.error("AggregateError", error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const originalRequest = error.config || {};
|
||||||
|
logger.info(`config`, originalRequest);
|
||||||
|
const retry = originalRequest.retry || {};
|
||||||
|
if (retry.status && retry.status.includes(status)) {
|
||||||
|
if (retry.max > 0 && retry.count < retry.max) {
|
||||||
|
// 重试次数增加
|
||||||
|
retry.count++;
|
||||||
|
const delay = retry.delay * retry.count;
|
||||||
|
logger.error(`status=${status},重试次数${retry.count},将在${delay}ms后重试,请求地址:${originalRequest.url}`);
|
||||||
|
await sleep(delay);
|
||||||
|
return service.request(originalRequest); // 重试请求
|
||||||
|
}
|
||||||
|
logger.error(`重试超过最大次数${retry.max},请求失败:${originalRequest.url}`);
|
||||||
|
}
|
||||||
|
|
||||||
const err = new HttpError(error);
|
const err = new HttpError(error);
|
||||||
if (error.response?.config?.logParams === false) {
|
if (error.response?.config?.logParams === false) {
|
||||||
delete err.request?.params;
|
delete err.request?.params;
|
||||||
@@ -294,6 +323,7 @@ export function createAgent(opts: CreateAgentOptions = {}) {
|
|||||||
{
|
{
|
||||||
autoSelectFamily: true,
|
autoSelectFamily: true,
|
||||||
autoSelectFamilyAttemptTimeout: 1000,
|
autoSelectFamilyAttemptTimeout: 1000,
|
||||||
|
connectTimeout: 5000, // 连接建立超时
|
||||||
},
|
},
|
||||||
opts
|
opts
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -13,6 +13,19 @@
|
|||||||
|
|
||||||
// await testLocker();
|
// await testLocker();
|
||||||
|
|
||||||
import { domainUtils } from "./dist/utils/util.domain.js";
|
// import { domainUtils } from "./dist/utils/util.domain.js";
|
||||||
|
|
||||||
console.log(domainUtils.isIpv6("::0:0:0:FFFF:129.144.52.38"));
|
// console.log(domainUtils.isIpv6("::0:0:0:FFFF:129.144.52.38"));
|
||||||
|
|
||||||
|
// import { http } from "./dist/utils/util.request.js";
|
||||||
|
|
||||||
|
// http
|
||||||
|
// .request({
|
||||||
|
// url: "https://www.baidu.com/234234/3333",
|
||||||
|
// retry: {
|
||||||
|
// status: [404],
|
||||||
|
// },
|
||||||
|
// })
|
||||||
|
// .then(res => {
|
||||||
|
// console.log(res.data);
|
||||||
|
// });
|
||||||
|
|||||||
@@ -3,6 +3,66 @@
|
|||||||
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.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 阿里云CDN部署支持根据证书域名自动匹配部署 ([a68301e](https://github.com/certd/certd/commit/a68301e4dcea8b7391ad751aa57555d566297ad9))
|
||||||
|
* 阿里云dcdn支持根据证书域名匹配模式 ([df012de](https://github.com/certd/certd/commit/df012dec90590ecba85a69ed6355cfa8382c1da3))
|
||||||
|
* dcdn自动匹配部署,支持新增域名感知 ([c6a988b](https://github.com/certd/certd/commit/c6a988bc925886bd7163c1270f2b7a10a57b1c5b))
|
||||||
|
|
||||||
|
## [1.39.7](https://github.com/certd/certd/compare/v1.39.6...v1.39.7) (2026-03-25)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.39.6](https://github.com/certd/certd/compare/v1.39.5...v1.39.6) (2026-03-22)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.39.5](https://github.com/certd/certd/compare/v1.39.4...v1.39.5) (2026-03-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.39.4](https://github.com/certd/certd/compare/v1.39.3...v1.39.4) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.39.3](https://github.com/certd/certd/compare/v1.39.2...v1.39.3) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.39.2](https://github.com/certd/certd/compare/v1.39.1...v1.39.2) (2026-03-16)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* cname provider授权修改为sys级别 ([d01bfbe](https://github.com/certd/certd/commit/d01bfbec96a3a2109ec864953b0c9e8c1f95b97b))
|
||||||
|
|
||||||
|
## [1.39.1](https://github.com/certd/certd/compare/v1.39.0...v1.39.1) (2026-03-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复1panel 请求失败的bug ([0283662](https://github.com/certd/certd/commit/0283662931ff47d6b5d49f91a30c4a002fe1d108))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 所有授权增加测试按钮 ([7a3e68d](https://github.com/certd/certd/commit/7a3e68d656c1dcdcd814b69891bd2c2c6fe3098a))
|
||||||
|
|
||||||
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/pipeline
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/pipeline",
|
"name": "@certd/pipeline",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.38.9",
|
"version": "1.39.8",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -18,8 +18,8 @@
|
|||||||
"compile": "tsc --skipLibCheck --watch"
|
"compile": "tsc --skipLibCheck --watch"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/basic": "^1.38.9",
|
"@certd/basic": "^1.39.8",
|
||||||
"@certd/plus-core": "^1.38.9",
|
"@certd/plus-core": "^1.39.8",
|
||||||
"dayjs": "^1.11.7",
|
"dayjs": "^1.11.7",
|
||||||
"lodash-es": "^4.17.21",
|
"lodash-es": "^4.17.21",
|
||||||
"reflect-metadata": "^0.1.13"
|
"reflect-metadata": "^0.1.13"
|
||||||
@@ -45,5 +45,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
|
"gitHead": "de0ae14544f1c3da4923dddc6a1a3bea4db295e7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,13 +4,13 @@ import { HttpClient, ILogger, utils } from "@certd/basic";
|
|||||||
import * as _ from "lodash-es";
|
import * as _ from "lodash-es";
|
||||||
import { PluginRequestHandleReq } from "../plugin/index.js";
|
import { PluginRequestHandleReq } from "../plugin/index.js";
|
||||||
|
|
||||||
export type AccessRequestHandleReqInput<T = any> = {
|
// export type AccessRequestHandleReqInput<T = any> = {
|
||||||
id?: number;
|
// id?: number;
|
||||||
title?: string;
|
// title?: string;
|
||||||
access: T;
|
// access: T;
|
||||||
};
|
// };
|
||||||
|
|
||||||
export type AccessRequestHandleReq<T = any> = PluginRequestHandleReq<AccessRequestHandleReqInput<T>>;
|
export type AccessRequestHandleReq<T = any> = PluginRequestHandleReq<T>;
|
||||||
|
|
||||||
export type AccessInputDefine = FormItemProps & {
|
export type AccessInputDefine = FormItemProps & {
|
||||||
title: string;
|
title: string;
|
||||||
|
|||||||
@@ -334,7 +334,7 @@ export class Executor {
|
|||||||
//参数没有变化
|
//参数没有变化
|
||||||
inputChanged = false;
|
inputChanged = false;
|
||||||
}
|
}
|
||||||
if (step.strategy?.runStrategy === RunStrategy.SkipWhenSucceed) {
|
if (step.strategy?.runStrategy === RunStrategy.SkipWhenSucceed && define.runStrategy !== RunStrategy.AlwaysRun) {
|
||||||
if (lastResult != null && lastResult === ResultType.success && !inputChanged) {
|
if (lastResult != null && lastResult === ResultType.success && !inputChanged) {
|
||||||
step.status!.output = lastNode?.status?.output;
|
step.status!.output = lastNode?.status?.output;
|
||||||
step.status!.files = lastNode?.status?.files;
|
step.status!.files = lastNode?.status?.files;
|
||||||
|
|||||||
@@ -1,22 +1,24 @@
|
|||||||
import { Registrable } from "../registry/index.js";
|
import { domainUtils, HttpClient, HttpRequestConfig, ILogger, logger, utils } from "@certd/basic";
|
||||||
import { FileItem, FormItemProps, Pipeline, Runnable, Step } from "../dt/index.js";
|
|
||||||
import { FileStore } from "../core/file-store.js";
|
|
||||||
import { accessRegistry, IAccessService } from "../access/index.js";
|
|
||||||
import { ICnameProxyService, IEmailService, IServiceGetter, IUrlService } from "../service/index.js";
|
|
||||||
import { CancelError, IContext, RunHistory, RunnableCollection } from "../core/index.js";
|
|
||||||
import { HttpRequestConfig, ILogger, logger, utils } from "@certd/basic";
|
|
||||||
import { HttpClient } from "@certd/basic";
|
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
import { IPluginConfigService } from "../service/config.js";
|
import { cloneDeep, upperFirst } from "lodash-es";
|
||||||
import { upperFirst } from "lodash-es";
|
import { accessRegistry, IAccessService } from "../access/index.js";
|
||||||
|
import { PageSearch } from "../context/index.js";
|
||||||
|
import { FileStore } from "../core/file-store.js";
|
||||||
|
import { CancelError, IContext, RunHistory, RunnableCollection } from "../core/index.js";
|
||||||
|
import { FileItem, FormItemProps, Pipeline, Runnable, Step } from "../dt/index.js";
|
||||||
import { INotificationService } from "../notification/index.js";
|
import { INotificationService } from "../notification/index.js";
|
||||||
|
import { Registrable } from "../registry/index.js";
|
||||||
|
import { IPluginConfigService } from "../service/config.js";
|
||||||
import { TaskEmitter } from "../service/emit.js";
|
import { TaskEmitter } from "../service/emit.js";
|
||||||
|
import { ICnameProxyService, IEmailService, IServiceGetter, IUrlService } from "../service/index.js";
|
||||||
|
|
||||||
export type PluginRequestHandleReq<T = any> = {
|
export type PluginRequestHandleReq<T = any> = {
|
||||||
typeName: string;
|
typeName: string;
|
||||||
action: string;
|
action: string;
|
||||||
input: T;
|
input: T;
|
||||||
data: any;
|
data: any;
|
||||||
|
record: { id: number; type: string; title: string };
|
||||||
|
fromType?: "sys" | "user"; // sys、user
|
||||||
};
|
};
|
||||||
|
|
||||||
export type UserInfo = {
|
export type UserInfo = {
|
||||||
@@ -62,6 +64,7 @@ export type PluginDefine = Registrable & {
|
|||||||
onlyAdmin?: boolean;
|
onlyAdmin?: boolean;
|
||||||
needPlus?: boolean;
|
needPlus?: boolean;
|
||||||
showRunStrategy?: boolean;
|
showRunStrategy?: boolean;
|
||||||
|
runStrategy?: any;
|
||||||
pluginType?: string; //类型
|
pluginType?: string; //类型
|
||||||
type?: string; //来源
|
type?: string; //来源
|
||||||
};
|
};
|
||||||
@@ -79,6 +82,12 @@ export type TaskResult = {
|
|||||||
pipelineVars: Record<string, any>;
|
pipelineVars: Record<string, any>;
|
||||||
pipelinePrivateVars?: Record<string, any>;
|
pipelinePrivateVars?: Record<string, any>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type CertTargetItem = {
|
||||||
|
value: string;
|
||||||
|
label: string;
|
||||||
|
domain: string | string[];
|
||||||
|
};
|
||||||
export type TaskInstanceContext = {
|
export type TaskInstanceContext = {
|
||||||
//流水线定义
|
//流水线定义
|
||||||
pipeline: Pipeline;
|
pipeline: Pipeline;
|
||||||
@@ -122,6 +131,9 @@ export type TaskInstanceContext = {
|
|||||||
//用户信息
|
//用户信息
|
||||||
user: UserInfo;
|
user: UserInfo;
|
||||||
|
|
||||||
|
//项目id
|
||||||
|
projectId?: number;
|
||||||
|
|
||||||
emitter: TaskEmitter;
|
emitter: TaskEmitter;
|
||||||
|
|
||||||
//service 容器
|
//service 容器
|
||||||
@@ -166,9 +178,7 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (this.ctx?.define?.onlyAdmin) {
|
if (this.ctx?.define?.onlyAdmin) {
|
||||||
if (!this.isAdmin()) {
|
this.checkAdmin();
|
||||||
throw new Error("只有管理员才能运行此任务");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -280,6 +290,12 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
|
|||||||
return this.ctx.user.role === "admin";
|
return this.ctx.user.role === "admin";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
checkAdmin() {
|
||||||
|
if (!this.isAdmin()) {
|
||||||
|
throw new Error("只有“管理员”或“系统级项目”才有权限运行此插件任务");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
getStepFromPipeline(stepId: string) {
|
getStepFromPipeline(stepId: string) {
|
||||||
let found: any = null;
|
let found: any = null;
|
||||||
RunnableCollection.each(this.ctx.pipeline.stages, step => {
|
RunnableCollection.each(this.ctx.pipeline.stages, step => {
|
||||||
@@ -298,6 +314,111 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
|
|||||||
buildDomainGroupOptions(options: any[], domains: string[]) {
|
buildDomainGroupOptions(options: any[], domains: string[]) {
|
||||||
return utils.options.buildGroupOptions(options, domains);
|
return utils.options.buildGroupOptions(options, domains);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getLastStatus(): Runnable {
|
||||||
|
return this.ctx.lastStatus || ({} as any);
|
||||||
|
}
|
||||||
|
|
||||||
|
getLastOutput(key: string) {
|
||||||
|
return this.getLastStatus().status?.output?.[key];
|
||||||
|
}
|
||||||
|
|
||||||
|
isDomainMatched(domainList: string | string[], certDomains: string[]): boolean {
|
||||||
|
const matched = domainUtils.match(domainList, certDomains);
|
||||||
|
return matched;
|
||||||
|
}
|
||||||
|
|
||||||
|
isNotChanged() {
|
||||||
|
const lastResult = this.ctx?.lastStatus?.status?.status;
|
||||||
|
return !this.ctx.inputChanged && lastResult === "success";
|
||||||
|
}
|
||||||
|
|
||||||
|
async getAutoMatchedTargets(req: {
|
||||||
|
targetName: string;
|
||||||
|
certDomains: string[];
|
||||||
|
pageSize: number;
|
||||||
|
getDeployTargetList: (req: PageSearch) => Promise<{ list: CertTargetItem[]; total: number }>;
|
||||||
|
}): Promise<CertTargetItem[]> {
|
||||||
|
const matchedDomains: CertTargetItem[] = [];
|
||||||
|
let pageNo = 1;
|
||||||
|
const { certDomains } = req;
|
||||||
|
|
||||||
|
const pageSize = req.pageSize || 100;
|
||||||
|
while (true) {
|
||||||
|
const result = await req.getDeployTargetList({
|
||||||
|
pageNo,
|
||||||
|
pageSize,
|
||||||
|
});
|
||||||
|
const pageData = result.list;
|
||||||
|
this.logger.info(`获取到 ${pageData.length} 个 ${req.targetName}`);
|
||||||
|
|
||||||
|
if (!pageData || pageData.length === 0) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const item of pageData) {
|
||||||
|
const domainName = item.domain;
|
||||||
|
if (this.isDomainMatched(domainName, certDomains)) {
|
||||||
|
matchedDomains.push(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const totalCount = result.total || 0;
|
||||||
|
if (pageNo * pageSize >= totalCount || matchedDomains.length == 0) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
pageNo++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return matchedDomains;
|
||||||
|
}
|
||||||
|
|
||||||
|
async autoMatchedDeploy(req: {
|
||||||
|
targetName: string;
|
||||||
|
getCertDomains: () => Promise<string[]>;
|
||||||
|
uploadCert: () => Promise<any>;
|
||||||
|
deployOne: (req: { target: CertTargetItem; cert: any }) => Promise<void>;
|
||||||
|
getDeployTargetList: (req: PageSearch) => Promise<{ list: CertTargetItem[]; total: number }>;
|
||||||
|
}): Promise<{ result: string; deployedList: string[] }> {
|
||||||
|
this.logger.info("证书匹配模式部署");
|
||||||
|
const certDomains = await req.getCertDomains();
|
||||||
|
const certTargetList = await this.getAutoMatchedTargets({
|
||||||
|
targetName: req.targetName,
|
||||||
|
pageSize: 200,
|
||||||
|
certDomains,
|
||||||
|
getDeployTargetList: req.getDeployTargetList,
|
||||||
|
});
|
||||||
|
if (certTargetList.length === 0) {
|
||||||
|
this.logger.warn(`未找到匹配的${req.targetName}`);
|
||||||
|
return { result: "skip", deployedList: [] };
|
||||||
|
}
|
||||||
|
this.logger.info(`找到 ${certTargetList.length} 个匹配的${req.targetName}`);
|
||||||
|
|
||||||
|
//开始部署,检查是否已经部署过
|
||||||
|
const deployedList = cloneDeep(this.getLastStatus()?.status?.output?.deployedList || []);
|
||||||
|
const unDeployedTargets = certTargetList.filter(item => !deployedList.includes(item.value));
|
||||||
|
const count = unDeployedTargets.length;
|
||||||
|
const deployedCount = certTargetList.length - count;
|
||||||
|
if (deployedCount > 0) {
|
||||||
|
this.logger.info(`跳过 ${deployedCount} 个已部署过的${req.targetName}`);
|
||||||
|
}
|
||||||
|
this.logger.info(`需要部署 ${count} 个${req.targetName}`);
|
||||||
|
if (count === 0) {
|
||||||
|
return { result: "skip", deployedList };
|
||||||
|
}
|
||||||
|
this.logger.info(`开始部署`);
|
||||||
|
const aliCrtId = await req.uploadCert();
|
||||||
|
for (const target of unDeployedTargets) {
|
||||||
|
await req.deployOne({
|
||||||
|
cert: aliCrtId,
|
||||||
|
target,
|
||||||
|
});
|
||||||
|
deployedList.push(target.value);
|
||||||
|
}
|
||||||
|
this.logger.info(`本次成功部署 ${count} 个${req.targetName}`);
|
||||||
|
return { result: "success", deployedList };
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export type OutputVO = {
|
export type OutputVO = {
|
||||||
|
|||||||
@@ -3,6 +3,54 @@
|
|||||||
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.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.39.7](https://github.com/certd/certd/compare/v1.39.6...v1.39.7) (2026-03-25)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.39.6](https://github.com/certd/certd/compare/v1.39.5...v1.39.6) (2026-03-22)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.39.5](https://github.com/certd/certd/compare/v1.39.4...v1.39.5) (2026-03-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.39.4](https://github.com/certd/certd/compare/v1.39.3...v1.39.4) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.39.3](https://github.com/certd/certd/compare/v1.39.2...v1.39.3) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.39.2](https://github.com/certd/certd/compare/v1.39.1...v1.39.2) (2026-03-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.39.1](https://github.com/certd/certd/compare/v1.39.0...v1.39.1) (2026-03-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-huawei
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-huawei",
|
"name": "@certd/lib-huawei",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.38.9",
|
"version": "1.39.8",
|
||||||
"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": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
|
"gitHead": "de0ae14544f1c3da4923dddc6a1a3bea4db295e7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,54 @@
|
|||||||
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.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.39.7](https://github.com/certd/certd/compare/v1.39.6...v1.39.7) (2026-03-25)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.39.6](https://github.com/certd/certd/compare/v1.39.5...v1.39.6) (2026-03-22)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.39.5](https://github.com/certd/certd/compare/v1.39.4...v1.39.5) (2026-03-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.39.4](https://github.com/certd/certd/compare/v1.39.3...v1.39.4) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.39.3](https://github.com/certd/certd/compare/v1.39.2...v1.39.3) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.39.2](https://github.com/certd/certd/compare/v1.39.1...v1.39.2) (2026-03-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.39.1](https://github.com/certd/certd/compare/v1.39.0...v1.39.1) (2026-03-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-iframe
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-iframe",
|
"name": "@certd/lib-iframe",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.38.9",
|
"version": "1.39.8",
|
||||||
"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": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
|
"gitHead": "de0ae14544f1c3da4923dddc6a1a3bea4db295e7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,54 @@
|
|||||||
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.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.39.7](https://github.com/certd/certd/compare/v1.39.6...v1.39.7) (2026-03-25)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.39.6](https://github.com/certd/certd/compare/v1.39.5...v1.39.6) (2026-03-22)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.39.5](https://github.com/certd/certd/compare/v1.39.4...v1.39.5) (2026-03-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.39.4](https://github.com/certd/certd/compare/v1.39.3...v1.39.4) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.39.3](https://github.com/certd/certd/compare/v1.39.2...v1.39.3) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.39.2](https://github.com/certd/certd/compare/v1.39.1...v1.39.2) (2026-03-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.39.1](https://github.com/certd/certd/compare/v1.39.0...v1.39.1) (2026-03-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/jdcloud
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/jdcloud",
|
"name": "@certd/jdcloud",
|
||||||
"version": "1.38.9",
|
"version": "1.39.8",
|
||||||
"description": "jdcloud openApi sdk",
|
"description": "jdcloud openApi sdk",
|
||||||
"main": "./dist/bundle.js",
|
"main": "./dist/bundle.js",
|
||||||
"module": "./dist/bundle.js",
|
"module": "./dist/bundle.js",
|
||||||
@@ -56,5 +56,5 @@
|
|||||||
"fetch"
|
"fetch"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"gitHead": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
|
"gitHead": "de0ae14544f1c3da4923dddc6a1a3bea4db295e7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,56 @@
|
|||||||
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.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持部署证书到百度CCE ([a19ea74](https://github.com/certd/certd/commit/a19ea7489c01cdbf795fb51f804bd6d00389f604))
|
||||||
|
|
||||||
|
## [1.39.7](https://github.com/certd/certd/compare/v1.39.6...v1.39.7) (2026-03-25)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.39.6](https://github.com/certd/certd/compare/v1.39.5...v1.39.6) (2026-03-22)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.39.5](https://github.com/certd/certd/compare/v1.39.4...v1.39.5) (2026-03-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.39.4](https://github.com/certd/certd/compare/v1.39.3...v1.39.4) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.39.3](https://github.com/certd/certd/compare/v1.39.2...v1.39.3) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.39.2](https://github.com/certd/certd/compare/v1.39.1...v1.39.2) (2026-03-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.39.1](https://github.com/certd/certd/compare/v1.39.0...v1.39.1) (2026-03-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-k8s
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-k8s",
|
"name": "@certd/lib-k8s",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.38.9",
|
"version": "1.39.8",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -14,10 +14,11 @@
|
|||||||
"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/basic": "^1.38.9",
|
"@certd/basic": "^1.39.8",
|
||||||
"@kubernetes/client-node": "0.21.0"
|
"@kubernetes/client-node": "0.21.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -32,5 +33,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
|
"gitHead": "de0ae14544f1c3da4923dddc6a1a3bea4db295e7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,9 +59,9 @@ export class K8sClient {
|
|||||||
const yml = loadYaml<KubernetesObject>(manifest);
|
const yml = loadYaml<KubernetesObject>(manifest);
|
||||||
const client = this.getKubeClient();
|
const client = this.getKubeClient();
|
||||||
try {
|
try {
|
||||||
|
this.logger.info("apply yaml:", yml);
|
||||||
await client.create(yml);
|
await client.create(yml);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
this.logger.error("apply error", e.response?.body);
|
|
||||||
if (e.response?.body?.reason === "AlreadyExists") {
|
if (e.response?.body?.reason === "AlreadyExists") {
|
||||||
//patch
|
//patch
|
||||||
this.logger.info("patch existing resource: ", yml.metadata?.name);
|
this.logger.info("patch existing resource: ", yml.metadata?.name);
|
||||||
@@ -70,13 +70,26 @@ export class K8sClient {
|
|||||||
yml.metadata = {};
|
yml.metadata = {};
|
||||||
}
|
}
|
||||||
yml.metadata.resourceVersion = existing.body.metadata.resourceVersion;
|
yml.metadata.resourceVersion = existing.body.metadata.resourceVersion;
|
||||||
await client.patch(yml);
|
const res = await client.patch(yml);
|
||||||
return;
|
return res?.body;
|
||||||
}
|
}
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async applyPatch(manifest: string) {
|
||||||
|
const yml = loadYaml<KubernetesObject>(manifest);
|
||||||
|
const client = this.getKubeClient();
|
||||||
|
this.logger.info("patch yaml:", yml);
|
||||||
|
const existing = await client.read(yml as any);
|
||||||
|
if (!yml.metadata) {
|
||||||
|
yml.metadata = {};
|
||||||
|
}
|
||||||
|
yml.metadata.resourceVersion = existing.body.metadata.resourceVersion;
|
||||||
|
const res = await client.patch(yml);
|
||||||
|
return res?.body;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param localRecords { [domain]:{ip:'xxx.xx.xxx'} }
|
* @param localRecords { [domain]:{ip:'xxx.xx.xxx'} }
|
||||||
@@ -112,6 +125,7 @@ export class K8sClient {
|
|||||||
*/
|
*/
|
||||||
async createSecret(opts: { namespace: string; body: V1Secret }) {
|
async createSecret(opts: { namespace: string; body: V1Secret }) {
|
||||||
const namespace = opts.namespace || "default";
|
const namespace = opts.namespace || "default";
|
||||||
|
this.logger.info("create secret:", opts.body.metadata);
|
||||||
const created = await this.client.createNamespacedSecret(namespace, opts.body);
|
const created = await this.client.createNamespacedSecret(namespace, opts.body);
|
||||||
this.logger.info("new secrets:", opts.body.metadata);
|
this.logger.info("new secrets:", opts.body.metadata);
|
||||||
return created.body;
|
return created.body;
|
||||||
@@ -152,6 +166,8 @@ export class K8sClient {
|
|||||||
this.logger.info(`secret ${secretName} 已创建`);
|
this.logger.info(`secret ${secretName} 已创建`);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
throw new Error(`secret ${secretName} 不存在`);
|
||||||
}
|
}
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,66 @@
|
|||||||
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.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
## [1.39.7](https://github.com/certd/certd/compare/v1.39.6...v1.39.7) (2026-03-25)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复cname校验报该授权无权限的bug ([b1eb706](https://github.com/certd/certd/commit/b1eb7069258d6ff2b128091911fa448eaffc5f33))
|
||||||
|
|
||||||
|
## [1.39.6](https://github.com/certd/certd/compare/v1.39.5...v1.39.6) (2026-03-22)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
## [1.39.5](https://github.com/certd/certd/compare/v1.39.4...v1.39.5) (2026-03-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
## [1.39.4](https://github.com/certd/certd/compare/v1.39.3...v1.39.4) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
## [1.39.3](https://github.com/certd/certd/compare/v1.39.2...v1.39.3) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
## [1.39.2](https://github.com/certd/certd/compare/v1.39.1...v1.39.2) (2026-03-16)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复京东云报错不准确的bug ([10dd89a](https://github.com/certd/certd/commit/10dd89ae62e438a211a15e729559af823a096583))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化阿里云连接超时时长为10秒,支持配置环境变量 ([1588461](https://github.com/certd/certd/commit/1588461633bd275765daa96fc68320abb58d616d))
|
||||||
|
* 优化个人账户页面 ([e506116](https://github.com/certd/certd/commit/e50611666ef731a903d7bdd8eb62333b97e2cc5b))
|
||||||
|
* 支持批量转移流水线到其他项目 ([8a3841f](https://github.com/certd/certd/commit/8a3841f6382b53ce2343307fb035e74fa5383fef))
|
||||||
|
|
||||||
|
## [1.39.1](https://github.com/certd/certd/compare/v1.39.0...v1.39.1) (2026-03-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 【破坏性更新】错误返回信息msg字段名统一改成message,与成功的返回结构一致 ([51ab6d6](https://github.com/certd/certd/commit/51ab6d6da1bb551b55b3a6a4a9a945c8d6ace806))
|
||||||
|
|
||||||
|
## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
## [1.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|
||||||
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-server
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-server",
|
"name": "@certd/lib-server",
|
||||||
"version": "1.38.9",
|
"version": "1.39.8",
|
||||||
"description": "midway with flyway, sql upgrade way ",
|
"description": "midway with flyway, sql upgrade way ",
|
||||||
"private": false,
|
"private": false,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -28,11 +28,11 @@
|
|||||||
],
|
],
|
||||||
"license": "AGPL",
|
"license": "AGPL",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/acme-client": "^1.38.9",
|
"@certd/acme-client": "^1.39.8",
|
||||||
"@certd/basic": "^1.38.9",
|
"@certd/basic": "^1.39.8",
|
||||||
"@certd/pipeline": "^1.38.9",
|
"@certd/pipeline": "^1.39.8",
|
||||||
"@certd/plugin-lib": "^1.38.9",
|
"@certd/plugin-lib": "^1.39.8",
|
||||||
"@certd/plus-core": "^1.38.9",
|
"@certd/plus-core": "^1.39.8",
|
||||||
"@midwayjs/cache": "3.14.0",
|
"@midwayjs/cache": "3.14.0",
|
||||||
"@midwayjs/core": "3.20.11",
|
"@midwayjs/core": "3.20.11",
|
||||||
"@midwayjs/i18n": "3.20.13",
|
"@midwayjs/i18n": "3.20.13",
|
||||||
@@ -64,5 +64,5 @@
|
|||||||
"typeorm": "^0.3.11",
|
"typeorm": "^0.3.11",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
|
"gitHead": "de0ae14544f1c3da4923dddc6a1a3bea4db295e7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,17 @@
|
|||||||
import { Inject } from '@midwayjs/core';
|
import { ApplicationContext, Inject } from '@midwayjs/core';
|
||||||
|
import type {IMidwayContainer} from '@midwayjs/core';
|
||||||
import * as koa from '@midwayjs/koa';
|
import * as koa from '@midwayjs/koa';
|
||||||
import { Constants } from './constants.js';
|
import { Constants } from './constants.js';
|
||||||
|
import { isEnterprise } from './mode.js';
|
||||||
|
|
||||||
|
|
||||||
export abstract class BaseController {
|
export abstract class BaseController {
|
||||||
@Inject()
|
@Inject()
|
||||||
ctx: koa.Context;
|
ctx: koa.Context;
|
||||||
|
|
||||||
|
@ApplicationContext()
|
||||||
|
applicationContext: IMidwayContainer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 成功返回
|
* 成功返回
|
||||||
* @param data 返回数据
|
* @param data 返回数据
|
||||||
@@ -28,7 +34,7 @@ export abstract class BaseController {
|
|||||||
fail(msg: string, code?: any) {
|
fail(msg: string, code?: any) {
|
||||||
return {
|
return {
|
||||||
code: code ? code : Constants.res.error.code,
|
code: code ? code : Constants.res.error.code,
|
||||||
msg: msg ? msg : Constants.res.error.code,
|
message: msg ? msg : Constants.res.error.code,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,4 +61,73 @@ export abstract class BaseController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async getProjectId(permission:string) {
|
||||||
|
if (!isEnterprise()) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
let projectIdStr = this.ctx.headers["project-id"] as string;
|
||||||
|
if (!projectIdStr){
|
||||||
|
projectIdStr = this.ctx.request.query["projectId"] as string;
|
||||||
|
}
|
||||||
|
if (!projectIdStr) {
|
||||||
|
//这里必须抛异常,否则可能会有权限问题
|
||||||
|
throw new Error("projectId 不能为空")
|
||||||
|
}
|
||||||
|
const userId = this.getUserId()
|
||||||
|
const projectId = parseInt(projectIdStr)
|
||||||
|
await this.checkProjectPermission(userId, projectId,permission)
|
||||||
|
return projectId;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getProjectUserId(permission:string){
|
||||||
|
let userId = this.getUserId()
|
||||||
|
const projectId = await this.getProjectId(permission)
|
||||||
|
if(projectId){
|
||||||
|
userId = -1 // 企业管理模式下,用户id固定-1
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
projectId,userId
|
||||||
|
}
|
||||||
|
}
|
||||||
|
async getProjectUserIdRead(){
|
||||||
|
return await this.getProjectUserId("read")
|
||||||
|
}
|
||||||
|
async getProjectUserIdWrite(){
|
||||||
|
return await this.getProjectUserId("write")
|
||||||
|
}
|
||||||
|
async getProjectUserIdAdmin(){
|
||||||
|
return await this.getProjectUserId("admin")
|
||||||
|
}
|
||||||
|
|
||||||
|
async checkProjectPermission(userId: number, projectId: number,permission:string) {
|
||||||
|
const projectService:any = await this.applicationContext.getAsync("projectService");
|
||||||
|
await projectService.checkPermission({userId,projectId,permission})
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @param service 检查记录是否属于某用户或某项目
|
||||||
|
* @param id
|
||||||
|
*/
|
||||||
|
async checkOwner(service:any,id:number,permission:string,allowAdmin:boolean = false){
|
||||||
|
let { projectId,userId } = await this.getProjectUserId(permission)
|
||||||
|
const authService:any = await this.applicationContext.getAsync("authService");
|
||||||
|
if (projectId) {
|
||||||
|
await authService.checkProjectId(service, id, projectId);
|
||||||
|
}else{
|
||||||
|
|
||||||
|
if(userId === Constants.systemUserId){
|
||||||
|
//系统级别,不检查权限
|
||||||
|
}else{
|
||||||
|
if(allowAdmin){
|
||||||
|
await authService.checkUserIdButAllowAdmin(this.ctx, service, id);
|
||||||
|
}else{
|
||||||
|
await authService.checkUserId( service, id, userId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
return {projectId,userId}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { Inject } from '@midwayjs/core';
|
|||||||
import { TypeORMDataSourceManager } from '@midwayjs/typeorm';
|
import { TypeORMDataSourceManager } from '@midwayjs/typeorm';
|
||||||
import { EntityManager } from 'typeorm/entity-manager/EntityManager.js';
|
import { EntityManager } from 'typeorm/entity-manager/EntityManager.js';
|
||||||
import { FindManyOptions } from 'typeorm';
|
import { FindManyOptions } from 'typeorm';
|
||||||
|
import { Constants } from './constants.js';
|
||||||
|
|
||||||
export type PageReq<T = any> = {
|
export type PageReq<T = any> = {
|
||||||
page?: { offset: number; limit: number };
|
page?: { offset: number; limit: number };
|
||||||
@@ -206,30 +207,41 @@ export abstract class BaseService<T> {
|
|||||||
return await qb.getMany();
|
return await qb.getMany();
|
||||||
}
|
}
|
||||||
|
|
||||||
async checkUserId(id: any = 0, userId: number, userKey = 'userId') {
|
async checkUserId(ids: number | number[] = 0, userId: number, userKey = 'userId') {
|
||||||
const res = await this.getRepository().findOne({
|
if (ids == null) {
|
||||||
|
throw new ValidateException('id不能为空');
|
||||||
|
}
|
||||||
|
if (userId == null) {
|
||||||
|
throw new ValidateException('userId不能为空');
|
||||||
|
}
|
||||||
|
if (!Array.isArray(ids)) {
|
||||||
|
ids = [ids];
|
||||||
|
}
|
||||||
|
const res = await this.getRepository().find({
|
||||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
select: { [userKey]: true },
|
select: { [userKey]: true },
|
||||||
where: {
|
where: {
|
||||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
id,
|
id: In(ids),
|
||||||
|
[userKey]: userId,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
if (!res || res[userKey] === userId) {
|
if (!res || res.length === ids.length) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
throw new PermissionException('权限不足');
|
throw new PermissionException('权限不足');
|
||||||
}
|
}
|
||||||
|
|
||||||
async batchDelete(ids: number[], userId: number) {
|
async batchDelete(ids: number[], userId: number,projectId?:number) {
|
||||||
if(userId >0){
|
if(userId!=null){
|
||||||
const list = await this.getRepository().find({
|
const list = await this.getRepository().find({
|
||||||
where: {
|
where: {
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
id: In(ids),
|
id: In(ids),
|
||||||
userId,
|
userId,
|
||||||
|
projectId,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
@@ -242,4 +254,19 @@ export abstract class BaseService<T> {
|
|||||||
async findOne(options: FindOneOptions<T>) {
|
async findOne(options: FindOneOptions<T>) {
|
||||||
return await this.getRepository().findOne(options);
|
return await this.getRepository().findOne(options);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function checkUserProjectParam(userId: number, projectId: number) {
|
||||||
|
if (projectId != null ){
|
||||||
|
if( userId !== Constants.enterpriseUserId) {
|
||||||
|
throw new ValidateException('userId projectId 错误');
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}else{
|
||||||
|
if( userId != null) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
throw new ValidateException('userId不能为空');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -120,4 +120,6 @@ export const Constants = {
|
|||||||
message: '用户邮箱还未配置',
|
message: '用户邮箱还未配置',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
systemUserId: 0, // 系统级别userid固定为0
|
||||||
|
enterpriseUserId: -1 // 企业模式用户id固定为-1
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
export class BaseException extends Error {
|
export class BaseException extends Error {
|
||||||
code: number;
|
code: number;
|
||||||
data?:any
|
data?:any
|
||||||
constructor(name, code, message,data?:any) {
|
constructor(name: string, code: number, message: string ,data?:any) {
|
||||||
super(message);
|
super(message);
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.code = code;
|
this.code = code;
|
||||||
|
|||||||
@@ -5,3 +5,4 @@ export * from './enum-item.js';
|
|||||||
export * from './exception/index.js';
|
export * from './exception/index.js';
|
||||||
export * from './result.js';
|
export * from './result.js';
|
||||||
export * from './base-service.js';
|
export * from './base-service.js';
|
||||||
|
export * from "./mode.js"
|
||||||
12
packages/libs/lib-server/src/basic/mode.ts
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
let adminMode = "saas"
|
||||||
|
|
||||||
|
export function setAdminMode(mode:string = "saas"){
|
||||||
|
adminMode = mode
|
||||||
|
}
|
||||||
|
export function getAdminMode(){
|
||||||
|
return adminMode
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isEnterprise(){
|
||||||
|
return adminMode === "enterprise"
|
||||||
|
}
|
||||||
@@ -1,19 +1,19 @@
|
|||||||
export class Result<T> {
|
export class Result<T> {
|
||||||
code: number;
|
code: number;
|
||||||
msg: string;
|
message: string;
|
||||||
data: T;
|
data: T;
|
||||||
|
|
||||||
constructor(code, msg, data?) {
|
constructor(code, message, data?) {
|
||||||
this.code = code;
|
this.code = code;
|
||||||
this.msg = msg;
|
this.message = message;
|
||||||
this.data = data;
|
this.data = data;
|
||||||
}
|
}
|
||||||
|
|
||||||
static error(code = 1, msg, data?: any) {
|
static error(code = 1, message, data?: any) {
|
||||||
return new Result(code, msg, data);
|
return new Result(code, message, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
static success(msg, data?) {
|
static success(message, data?) {
|
||||||
return new Result(0, msg, data);
|
return new Result(0, message, data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,6 +65,8 @@ export class SysPublicSettings extends BaseSettings {
|
|||||||
}> = {};
|
}> = {};
|
||||||
|
|
||||||
notice?: string;
|
notice?: string;
|
||||||
|
|
||||||
|
adminMode?: "enterprise" | "saas" = "saas";
|
||||||
}
|
}
|
||||||
|
|
||||||
export class SysPrivateSettings extends BaseSettings {
|
export class SysPrivateSettings extends BaseSettings {
|
||||||
@@ -86,6 +88,10 @@ export class SysPrivateSettings extends BaseSettings {
|
|||||||
|
|
||||||
pipelineMaxRunningCount?: number;
|
pipelineMaxRunningCount?: number;
|
||||||
|
|
||||||
|
|
||||||
|
environmentVars?: string = '';
|
||||||
|
|
||||||
|
|
||||||
sms?: {
|
sms?: {
|
||||||
type?: string;
|
type?: string;
|
||||||
config?: any;
|
config?: any;
|
||||||
|
|||||||
@@ -7,9 +7,12 @@ import { BaseSettings, SysInstallInfo, SysPrivateSettings, SysPublicSettings, Sy
|
|||||||
import { getAllSslProviderDomains, setSslProviderReverseProxies } from '@certd/acme-client';
|
import { getAllSslProviderDomains, setSslProviderReverseProxies } from '@certd/acme-client';
|
||||||
import { cache, logger, mergeUtils, setGlobalProxy } from '@certd/basic';
|
import { cache, logger, mergeUtils, setGlobalProxy } from '@certd/basic';
|
||||||
import * as dns from 'node:dns';
|
import * as dns from 'node:dns';
|
||||||
import { BaseService } from '../../../basic/index.js';
|
import { BaseService, setAdminMode } from '../../../basic/index.js';
|
||||||
import { executorQueue } from '../../basic/service/executor-queue.js';
|
import { executorQueue } from '../../basic/service/executor-queue.js';
|
||||||
const {merge} = mergeUtils;
|
import { isComm, isPlus } from '@certd/plus-core';
|
||||||
|
const { merge } = mergeUtils;
|
||||||
|
|
||||||
|
let lastSaveEnvVars = {};
|
||||||
/**
|
/**
|
||||||
* 设置
|
* 设置
|
||||||
*/
|
*/
|
||||||
@@ -116,7 +119,15 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async savePublicSettings(bean: SysPublicSettings) {
|
async savePublicSettings(bean: SysPublicSettings) {
|
||||||
|
if (isComm()) {
|
||||||
|
if (bean.adminMode === 'enterprise') {
|
||||||
|
throw new Error("商业版不支持使用企业管理模式")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
await this.saveSetting(bean);
|
await this.saveSetting(bean);
|
||||||
|
//让设置生效
|
||||||
|
await this.reloadPublicSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
async getPrivateSettings(): Promise<SysPrivateSettings> {
|
async getPrivateSettings(): Promise<SysPrivateSettings> {
|
||||||
@@ -137,23 +148,73 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
|
|||||||
await this.reloadPrivateSettings();
|
await this.reloadPrivateSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async reloadSettings() {
|
||||||
|
await this.reloadPrivateSettings()
|
||||||
|
await this.reloadPublicSettings()
|
||||||
|
}
|
||||||
|
|
||||||
|
async reloadPublicSettings() {
|
||||||
|
const publicSetting = await this.getPublicSettings()
|
||||||
|
if (isPlus()){
|
||||||
|
setAdminMode(publicSetting.adminMode )
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async reloadPrivateSettings() {
|
async reloadPrivateSettings() {
|
||||||
const bean = await this.getPrivateSettings();
|
const privateSetting = await this.getPrivateSettings();
|
||||||
const opts = {
|
const opts = {
|
||||||
httpProxy: bean.httpProxy,
|
httpProxy: privateSetting.httpProxy,
|
||||||
httpsProxy: bean.httpsProxy,
|
httpsProxy: privateSetting.httpsProxy,
|
||||||
};
|
};
|
||||||
setGlobalProxy(opts);
|
setGlobalProxy(opts);
|
||||||
|
|
||||||
if (bean.dnsResultOrder) {
|
if (privateSetting.dnsResultOrder) {
|
||||||
dns.setDefaultResultOrder(bean.dnsResultOrder as any);
|
dns.setDefaultResultOrder(privateSetting.dnsResultOrder as any);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bean.pipelineMaxRunningCount){
|
if (privateSetting.pipelineMaxRunningCount) {
|
||||||
executorQueue.setMaxRunningCount(bean.pipelineMaxRunningCount);
|
executorQueue.setMaxRunningCount(privateSetting.pipelineMaxRunningCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
setSslProviderReverseProxies(bean.reverseProxies);
|
setSslProviderReverseProxies(privateSetting.reverseProxies);
|
||||||
|
|
||||||
|
//加载环境变量
|
||||||
|
this.setEnvironmentVars(privateSetting.environmentVars);
|
||||||
|
}
|
||||||
|
|
||||||
|
setEnvironmentVars(vars: string) {
|
||||||
|
const envVars = {}
|
||||||
|
if (typeof vars !== 'string') {
|
||||||
|
vars = ""
|
||||||
|
}
|
||||||
|
vars.split('\n').forEach(line => {
|
||||||
|
line = line.trim();
|
||||||
|
if (!line || line.startsWith('#')) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const arr = line.split("#")
|
||||||
|
if (arr.length > 0) {
|
||||||
|
line = arr[0].trim();
|
||||||
|
}
|
||||||
|
if (!line.includes("=")) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const [key, value] = line.split('=');
|
||||||
|
if (key && value) {
|
||||||
|
envVars[key.trim()] = value.trim();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
//先删除旧环境变量
|
||||||
|
if (lastSaveEnvVars) {
|
||||||
|
for (const key in lastSaveEnvVars) {
|
||||||
|
delete process.env[key];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
merge(process.env, envVars);
|
||||||
|
lastSaveEnvVars = envVars;
|
||||||
}
|
}
|
||||||
|
|
||||||
async updateByKey(key: string, setting: any) {
|
async updateByKey(key: string, setting: any) {
|
||||||
|
|||||||
@@ -7,8 +7,12 @@ import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
|
|||||||
export class AccessEntity {
|
export class AccessEntity {
|
||||||
@PrimaryGeneratedColumn()
|
@PrimaryGeneratedColumn()
|
||||||
id: number;
|
id: number;
|
||||||
|
@Column({ name: 'key_id', comment: 'key_id', length: 100 })
|
||||||
|
keyId: string;
|
||||||
|
|
||||||
@Column({ name: 'user_id', comment: '用户id' })
|
@Column({ name: 'user_id', comment: '用户id' })
|
||||||
userId: number;
|
userId: number; // 0为系统级别, -1为企业,大于1为用户
|
||||||
|
|
||||||
@Column({ comment: '名称', length: 100 })
|
@Column({ comment: '名称', length: 100 })
|
||||||
name: string;
|
name: string;
|
||||||
|
|
||||||
@@ -21,6 +25,9 @@ export class AccessEntity {
|
|||||||
@Column({ name: 'encrypt_setting', comment: '已加密设置', length: 10240, nullable: true })
|
@Column({ name: 'encrypt_setting', comment: '已加密设置', length: 10240, nullable: true })
|
||||||
encryptSetting: string;
|
encryptSetting: string;
|
||||||
|
|
||||||
|
@Column({ name: 'project_id', comment: '项目id' })
|
||||||
|
projectId: number;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
name: 'create_time',
|
name: 'create_time',
|
||||||
comment: '创建时间',
|
comment: '创建时间',
|
||||||
|
|||||||
@@ -2,17 +2,19 @@ import { IAccessService } from '@certd/pipeline';
|
|||||||
|
|
||||||
export class AccessGetter implements IAccessService {
|
export class AccessGetter implements IAccessService {
|
||||||
userId: number;
|
userId: number;
|
||||||
getter: <T>(id: any, userId?: number) => Promise<T>;
|
projectId?: number;
|
||||||
constructor(userId: number, getter: (id: any, userId: number) => Promise<any>) {
|
getter: <T>(id: any, userId?: number, projectId?: number, ignorePermission?: boolean) => Promise<T>;
|
||||||
|
constructor(userId: number, projectId: number, getter: (id: any, userId: number, projectId?: number, ignorePermission?: boolean) => Promise<any>) {
|
||||||
this.userId = userId;
|
this.userId = userId;
|
||||||
|
this.projectId = projectId;
|
||||||
this.getter = getter;
|
this.getter = getter;
|
||||||
}
|
}
|
||||||
|
|
||||||
async getById<T = any>(id: any) {
|
async getById<T = any>(id: any) {
|
||||||
return await this.getter<T>(id, this.userId);
|
return await this.getter<T>(id, this.userId, this.projectId);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getCommonById<T = any>(id: any) {
|
async getCommonById<T = any>(id: any) {
|
||||||
return await this.getter<T>(id, 0);
|
return await this.getter<T>(id, 0,null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import {AccessGetter, BaseService, PageReq, PermissionException, ValidateExcepti
|
|||||||
import {AccessEntity} from '../entity/access.js';
|
import {AccessEntity} from '../entity/access.js';
|
||||||
import {AccessDefine, accessRegistry, newAccess} from '@certd/pipeline';
|
import {AccessDefine, accessRegistry, newAccess} from '@certd/pipeline';
|
||||||
import {EncryptService} from './encrypt-service.js';
|
import {EncryptService} from './encrypt-service.js';
|
||||||
|
import { logger, utils } from '@certd/basic';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 授权
|
* 授权
|
||||||
@@ -46,6 +47,7 @@ export class AccessService extends BaseService<AccessEntity> {
|
|||||||
}
|
}
|
||||||
delete param._copyFrom
|
delete param._copyFrom
|
||||||
this.encryptSetting(param, oldEntity);
|
this.encryptSetting(param, oldEntity);
|
||||||
|
param.keyId = "ac_" + utils.id.simpleNanoId();
|
||||||
return await super.add(param);
|
return await super.add(param);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -117,6 +119,7 @@ export class AccessService extends BaseService<AccessEntity> {
|
|||||||
throw new ValidateException('该授权配置不存在,请确认是否已被删除');
|
throw new ValidateException('该授权配置不存在,请确认是否已被删除');
|
||||||
}
|
}
|
||||||
this.encryptSetting(param, oldEntity);
|
this.encryptSetting(param, oldEntity);
|
||||||
|
delete param.keyId
|
||||||
return await super.update(param);
|
return await super.update(param);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -129,10 +132,11 @@ export class AccessService extends BaseService<AccessEntity> {
|
|||||||
id: entity.id,
|
id: entity.id,
|
||||||
name: entity.name,
|
name: entity.name,
|
||||||
userId: entity.userId,
|
userId: entity.userId,
|
||||||
|
projectId: entity.projectId,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
async getAccessById(id: any, checkUserId: boolean, userId?: number): Promise<any> {
|
async getAccessById(id: any, checkUserId: boolean, userId?: number, projectId?: number): Promise<any> {
|
||||||
const entity = await this.info(id);
|
const entity = await this.info(id);
|
||||||
if (entity == null) {
|
if (entity == null) {
|
||||||
throw new Error(`该授权配置不存在,请确认是否已被删除:id=${id}`);
|
throw new Error(`该授权配置不存在,请确认是否已被删除:id=${id}`);
|
||||||
@@ -145,6 +149,9 @@ export class AccessService extends BaseService<AccessEntity> {
|
|||||||
throw new PermissionException('您对该Access授权无访问权限');
|
throw new PermissionException('您对该Access授权无访问权限');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (projectId != null && projectId !== entity.projectId) {
|
||||||
|
throw new PermissionException('您对该Access授权无访问权限');
|
||||||
|
}
|
||||||
|
|
||||||
// const access = accessRegistry.get(entity.type);
|
// const access = accessRegistry.get(entity.type);
|
||||||
const setting = this.decryptAccessEntity(entity);
|
const setting = this.decryptAccessEntity(entity);
|
||||||
@@ -152,12 +159,12 @@ export class AccessService extends BaseService<AccessEntity> {
|
|||||||
id: entity.id,
|
id: entity.id,
|
||||||
...setting,
|
...setting,
|
||||||
};
|
};
|
||||||
const accessGetter = new AccessGetter(userId, this.getById.bind(this));
|
const accessGetter = new AccessGetter(userId,projectId, this.getById.bind(this));
|
||||||
return await newAccess(entity.type, input,accessGetter);
|
return await newAccess(entity.type, input,accessGetter);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getById(id: any, userId: number): Promise<any> {
|
async getById(id: any, userId: number, projectId?: number): Promise<any> {
|
||||||
return await this.getAccessById(id, true, userId);
|
return await this.getAccessById(id, true, userId, projectId);
|
||||||
}
|
}
|
||||||
|
|
||||||
decryptAccessEntity(entity: AccessEntity): any {
|
decryptAccessEntity(entity: AccessEntity): any {
|
||||||
@@ -188,25 +195,60 @@ export class AccessService extends BaseService<AccessEntity> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async getSimpleByIds(ids: number[], userId: any) {
|
async getSimpleByIds(ids: number[], userId: any, projectId?: number) {
|
||||||
if (ids.length === 0) {
|
if (ids.length === 0) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
if (!userId) {
|
if (userId==null) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
return await this.repository.find({
|
return await this.repository.find({
|
||||||
where: {
|
where: {
|
||||||
id: In(ids),
|
id: In(ids),
|
||||||
userId,
|
userId,
|
||||||
|
projectId,
|
||||||
},
|
},
|
||||||
select: {
|
select: {
|
||||||
id: true,
|
id: true,
|
||||||
name: true,
|
name: true,
|
||||||
type: true,
|
type: true,
|
||||||
userId:true
|
userId:true,
|
||||||
|
projectId:true,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 复制授权到其他项目
|
||||||
|
* @param accessId
|
||||||
|
* @param projectId
|
||||||
|
*/
|
||||||
|
async copyTo(accessId: number,projectId?: number) {
|
||||||
|
const access = await this.info(accessId);
|
||||||
|
if (access == null) {
|
||||||
|
throw new Error(`该授权配置不存在,请确认是否已被删除:id=${accessId}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const keyId = access.keyId;
|
||||||
|
//检查目标项目里是否已经有相同keyId的配置
|
||||||
|
const existAccess = await this.repository.findOne({
|
||||||
|
where: {
|
||||||
|
keyId,
|
||||||
|
projectId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (existAccess) {
|
||||||
|
logger.info(`目标项目已存在相同keyId的授权配置,跳过复制:keyId=${keyId}`);
|
||||||
|
return existAccess.id;
|
||||||
|
}
|
||||||
|
const newAccess = {
|
||||||
|
...access,
|
||||||
|
userId:-1,
|
||||||
|
id: undefined,
|
||||||
|
projectId,
|
||||||
|
}
|
||||||
|
await this.repository.save(newAccess);
|
||||||
|
return newAccess.id;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
|
|||||||
export class AddonEntity {
|
export class AddonEntity {
|
||||||
@PrimaryGeneratedColumn()
|
@PrimaryGeneratedColumn()
|
||||||
id: number;
|
id: number;
|
||||||
|
@Column({ name: 'key_id', comment: 'key_id', length: 100 })
|
||||||
|
keyId: string;
|
||||||
@Column({ name: 'user_id', comment: '用户id' })
|
@Column({ name: 'user_id', comment: '用户id' })
|
||||||
userId: number;
|
userId: number;
|
||||||
@Column({ comment: '名称', length: 100 })
|
@Column({ comment: '名称', length: 100 })
|
||||||
@@ -28,6 +30,9 @@ export class AddonEntity {
|
|||||||
@Column({ name: 'is_default', comment: '是否默认', nullable: false, default: false })
|
@Column({ name: 'is_default', comment: '是否默认', nullable: false, default: false })
|
||||||
isDefault: boolean;
|
isDefault: boolean;
|
||||||
|
|
||||||
|
@Column({ name: 'project_id', comment: '项目id' })
|
||||||
|
projectId: number;
|
||||||
|
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
name: 'create_time',
|
name: 'create_time',
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { In, Repository } from "typeorm";
|
|||||||
import { AddonDefine, BaseService, PageReq, ValidateException } from "../../../index.js";
|
import { AddonDefine, BaseService, PageReq, ValidateException } from "../../../index.js";
|
||||||
import { addonRegistry } from "../api/index.js";
|
import { addonRegistry } from "../api/index.js";
|
||||||
import { AddonEntity } from "../entity/addon.js";
|
import { AddonEntity } from "../entity/addon.js";
|
||||||
|
import { utils } from "@certd/basic";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Addon
|
* Addon
|
||||||
@@ -43,6 +44,7 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
} else {
|
} else {
|
||||||
param.isSystem = false;
|
param.isSystem = false;
|
||||||
}
|
}
|
||||||
|
param.keyId = "ad_" + utils.id.simpleNanoId();
|
||||||
delete param._copyFrom;
|
delete param._copyFrom;
|
||||||
return await super.add(param);
|
return await super.add(param);
|
||||||
}
|
}
|
||||||
@@ -57,6 +59,7 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
if (oldEntity == null) {
|
if (oldEntity == null) {
|
||||||
throw new ValidateException("该Addon配置不存在,请确认是否已被删除");
|
throw new ValidateException("该Addon配置不存在,请确认是否已被删除");
|
||||||
}
|
}
|
||||||
|
delete param.keyId
|
||||||
return await super.update(param);
|
return await super.update(param);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -67,10 +70,12 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
id: entity.id,
|
id: entity.id,
|
||||||
|
keyId: entity.keyId,
|
||||||
name: entity.name,
|
name: entity.name,
|
||||||
userId: entity.userId,
|
userId: entity.userId,
|
||||||
addonType: entity.addonType,
|
addonType: entity.addonType,
|
||||||
type: entity.type
|
type: entity.type,
|
||||||
|
projectId: entity.projectId
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -84,20 +89,22 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async getSimpleByIds(ids: number[], userId: any) {
|
async getSimpleByIds(ids: number[], userId: any,projectId?:number) {
|
||||||
if (ids.length === 0) {
|
if (ids.length === 0) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
if (!userId) {
|
if (userId==null) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
return await this.repository.find({
|
return await this.repository.find({
|
||||||
where: {
|
where: {
|
||||||
id: In(ids),
|
id: In(ids),
|
||||||
userId
|
userId,
|
||||||
|
projectId
|
||||||
},
|
},
|
||||||
select: {
|
select: {
|
||||||
id: true,
|
id: true,
|
||||||
|
keyId: true,
|
||||||
name: true,
|
name: true,
|
||||||
addonType: true,
|
addonType: true,
|
||||||
type: true,
|
type: true,
|
||||||
@@ -109,11 +116,12 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async getDefault(userId: number, addonType: string): Promise<any> {
|
async getDefault(userId: number, addonType: string,projectId?:number): Promise<any> {
|
||||||
const res = await this.repository.findOne({
|
const res = await this.repository.findOne({
|
||||||
where: {
|
where: {
|
||||||
userId,
|
userId,
|
||||||
addonType
|
addonType,
|
||||||
|
projectId
|
||||||
},
|
},
|
||||||
order: {
|
order: {
|
||||||
isDefault: "DESC"
|
isDefault: "DESC"
|
||||||
@@ -129,25 +137,28 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
const setting = JSON.parse(res.setting);
|
const setting = JSON.parse(res.setting);
|
||||||
return {
|
return {
|
||||||
id: res.id,
|
id: res.id,
|
||||||
|
keyId: res.keyId,
|
||||||
addonType: res.addonType,
|
addonType: res.addonType,
|
||||||
type: res.type,
|
type: res.type,
|
||||||
name: res.name,
|
name: res.name,
|
||||||
userId: res.userId,
|
userId: res.userId,
|
||||||
setting
|
setting,
|
||||||
|
projectId: res.projectId
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
async setDefault(id: number, userId: number, addonType: string) {
|
async setDefault(id: number, userId: number, addonType: string,projectId?:number) {
|
||||||
if (!id) {
|
if (!id) {
|
||||||
throw new ValidateException("id不能为空");
|
throw new ValidateException("id不能为空");
|
||||||
}
|
}
|
||||||
if (!userId) {
|
if (userId==null) {
|
||||||
throw new ValidateException("userId不能为空");
|
throw new ValidateException("userId不能为空");
|
||||||
}
|
}
|
||||||
await this.repository.update(
|
await this.repository.update(
|
||||||
{
|
{
|
||||||
userId,
|
userId,
|
||||||
addonType
|
addonType,
|
||||||
|
projectId
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
isDefault: false
|
isDefault: false
|
||||||
@@ -157,7 +168,8 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
{
|
{
|
||||||
id,
|
id,
|
||||||
userId,
|
userId,
|
||||||
addonType
|
addonType,
|
||||||
|
projectId
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
isDefault: true
|
isDefault: true
|
||||||
@@ -165,12 +177,12 @@ export class AddonService extends BaseService<AddonEntity> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getOrCreateDefault(opts: { addonType: string, type: string, inputs: any, userId: any }) {
|
async getOrCreateDefault(opts: { addonType: string, type: string, inputs: any, userId: any,projectId?:number }) {
|
||||||
const { addonType, type, inputs, userId } = opts;
|
const { addonType, type, inputs, userId,projectId } = 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,projectId);
|
||||||
if (defaultConfig) {
|
if (defaultConfig) {
|
||||||
return defaultConfig;
|
return defaultConfig;
|
||||||
}
|
}
|
||||||
@@ -183,17 +195,19 @@ 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,
|
||||||
|
projectId
|
||||||
});
|
});
|
||||||
return this.buildAddonInstanceConfig(res);
|
return this.buildAddonInstanceConfig(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getOneByType(req:{addonType:string,type:string,userId:number}) {
|
async getOneByType(req:{addonType:string,type:string,userId:number,projectId?:number}) {
|
||||||
return await this.repository.findOne({
|
return await this.repository.findOne({
|
||||||
where: {
|
where: {
|
||||||
addonType: req.addonType,
|
addonType: req.addonType,
|
||||||
type: req.type,
|
type: req.type,
|
||||||
userId: req.userId
|
userId: req.userId,
|
||||||
|
projectId: req.projectId
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,54 @@
|
|||||||
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.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.39.7](https://github.com/certd/certd/compare/v1.39.6...v1.39.7) (2026-03-25)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.39.6](https://github.com/certd/certd/compare/v1.39.5...v1.39.6) (2026-03-22)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.39.5](https://github.com/certd/certd/compare/v1.39.4...v1.39.5) (2026-03-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.39.4](https://github.com/certd/certd/compare/v1.39.3...v1.39.4) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.39.3](https://github.com/certd/certd/compare/v1.39.2...v1.39.3) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.39.2](https://github.com/certd/certd/compare/v1.39.1...v1.39.2) (2026-03-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.39.1](https://github.com/certd/certd/compare/v1.39.0...v1.39.1) (2026-03-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
### Performance Improvements
|
### Performance Improvements
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/midway-flyway-js",
|
"name": "@certd/midway-flyway-js",
|
||||||
"version": "1.38.9",
|
"version": "1.39.8",
|
||||||
"description": "midway with flyway, sql upgrade way ",
|
"description": "midway with flyway, sql upgrade way ",
|
||||||
"private": false,
|
"private": false,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -46,5 +46,5 @@
|
|||||||
"typeorm": "^0.3.11",
|
"typeorm": "^0.3.11",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
|
"gitHead": "de0ae14544f1c3da4923dddc6a1a3bea4db295e7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,54 @@
|
|||||||
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.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.39.7](https://github.com/certd/certd/compare/v1.39.6...v1.39.7) (2026-03-25)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.39.6](https://github.com/certd/certd/compare/v1.39.5...v1.39.6) (2026-03-22)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.39.5](https://github.com/certd/certd/compare/v1.39.4...v1.39.5) (2026-03-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.39.4](https://github.com/certd/certd/compare/v1.39.3...v1.39.4) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.39.3](https://github.com/certd/certd/compare/v1.39.2...v1.39.3) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.39.2](https://github.com/certd/certd/compare/v1.39.1...v1.39.2) (2026-03-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.39.1](https://github.com/certd/certd/compare/v1.39.0...v1.39.1) (2026-03-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/plugin-cert
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/plugin-cert",
|
"name": "@certd/plugin-cert",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.38.9",
|
"version": "1.39.8",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
@@ -17,10 +17,10 @@
|
|||||||
"compile": "tsc --skipLibCheck --watch"
|
"compile": "tsc --skipLibCheck --watch"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/acme-client": "^1.38.9",
|
"@certd/acme-client": "^1.39.8",
|
||||||
"@certd/basic": "^1.38.9",
|
"@certd/basic": "^1.39.8",
|
||||||
"@certd/pipeline": "^1.38.9",
|
"@certd/pipeline": "^1.39.8",
|
||||||
"@certd/plugin-lib": "^1.38.9",
|
"@certd/plugin-lib": "^1.39.8",
|
||||||
"psl": "^1.9.0",
|
"psl": "^1.9.0",
|
||||||
"punycode.js": "^2.3.1"
|
"punycode.js": "^2.3.1"
|
||||||
},
|
},
|
||||||
@@ -38,5 +38,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
|
"gitHead": "de0ae14544f1c3da4923dddc6a1a3bea4db295e7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,61 @@
|
|||||||
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.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* dcdn自动匹配部署,支持新增域名感知 ([c6a988b](https://github.com/certd/certd/commit/c6a988bc925886bd7163c1270f2b7a10a57b1c5b))
|
||||||
|
|
||||||
|
## [1.39.7](https://github.com/certd/certd/compare/v1.39.6...v1.39.7) (2026-03-25)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.39.6](https://github.com/certd/certd/compare/v1.39.5...v1.39.6) (2026-03-22)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.39.5](https://github.com/certd/certd/compare/v1.39.4...v1.39.5) (2026-03-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.39.4](https://github.com/certd/certd/compare/v1.39.3...v1.39.4) (2026-03-17)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复阿里云证书订单翻页问题 ([6d43623](https://github.com/certd/certd/commit/6d43623f459a7594599e50a7ed89d67fcc775518))
|
||||||
|
|
||||||
|
## [1.39.3](https://github.com/certd/certd/compare/v1.39.2...v1.39.3) (2026-03-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.39.2](https://github.com/certd/certd/compare/v1.39.1...v1.39.2) (2026-03-16)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 查看证书增加证书详情显示,包括域名,过期时间,颁发机构,指纹等 ([0b9933d](https://github.com/certd/certd/commit/0b9933df1e8d1685d14271435a8a7488974cc47b))
|
||||||
|
* dns-provider 支持bind9 ,support bind9 ([76d12d6](https://github.com/certd/certd/commit/76d12d60624c0672fd3717a80a2cfef6845b14b8))
|
||||||
|
|
||||||
|
## [1.39.1](https://github.com/certd/certd/compare/v1.39.0...v1.39.1) (2026-03-09)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|
||||||
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/plugin-lib
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/plugin-lib",
|
"name": "@certd/plugin-lib",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.38.9",
|
"version": "1.39.8",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
@@ -22,10 +22,10 @@
|
|||||||
"@alicloud/pop-core": "^1.7.10",
|
"@alicloud/pop-core": "^1.7.10",
|
||||||
"@alicloud/tea-util": "^1.4.11",
|
"@alicloud/tea-util": "^1.4.11",
|
||||||
"@aws-sdk/client-s3": "^3.964.0",
|
"@aws-sdk/client-s3": "^3.964.0",
|
||||||
"@certd/acme-client": "^1.38.9",
|
"@certd/acme-client": "^1.39.8",
|
||||||
"@certd/basic": "^1.38.9",
|
"@certd/basic": "^1.39.8",
|
||||||
"@certd/pipeline": "^1.38.9",
|
"@certd/pipeline": "^1.39.8",
|
||||||
"@certd/plus-core": "^1.38.9",
|
"@certd/plus-core": "^1.39.8",
|
||||||
"@kubernetes/client-node": "0.21.0",
|
"@kubernetes/client-node": "0.21.0",
|
||||||
"ali-oss": "^6.22.0",
|
"ali-oss": "^6.22.0",
|
||||||
"basic-ftp": "^5.0.5",
|
"basic-ftp": "^5.0.5",
|
||||||
@@ -57,5 +57,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
|
"gitHead": "de0ae14544f1c3da4923dddc6a1a3bea4db295e7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import fs from "fs";
|
|||||||
import os from "os";
|
import os from "os";
|
||||||
import path from "path";
|
import path from "path";
|
||||||
import { CertificateInfo, crypto } from "@certd/acme-client";
|
import { CertificateInfo, crypto } from "@certd/acme-client";
|
||||||
|
import cryptoLib from "crypto";
|
||||||
import { ILogger } from "@certd/basic";
|
import { ILogger } from "@certd/basic";
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
import { uniq } from "lodash-es";
|
import { uniq } from "lodash-es";
|
||||||
@@ -42,6 +43,12 @@ const formats = {
|
|||||||
jks: ["jks"],
|
jks: ["jks"],
|
||||||
p7b: ["p7b", "key"],
|
p7b: ["p7b", "key"],
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type SimpleCertDetail = {
|
||||||
|
notBefore: Date;
|
||||||
|
notAfter: Date;
|
||||||
|
domains: string[];
|
||||||
|
};
|
||||||
export class CertReader {
|
export class CertReader {
|
||||||
cert: CertInfo;
|
cert: CertInfo;
|
||||||
|
|
||||||
@@ -115,13 +122,41 @@ export class CertReader {
|
|||||||
return CertReader.readCertDetail(crt);
|
return CertReader.readCertDetail(crt);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getSimpleDetail() {
|
||||||
|
const { detail } = this.getCrtDetail();
|
||||||
|
return {
|
||||||
|
notBefore: detail.notBefore,
|
||||||
|
notAfter: detail.notAfter,
|
||||||
|
domains: this.getAllDomains(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
static readCertDetail(crt: string) {
|
static readCertDetail(crt: string) {
|
||||||
const detail = crypto.readCertificateInfo(crt.toString());
|
const detail = crypto.readCertificateInfo(crt.toString());
|
||||||
const effective = detail.notBefore;
|
const effective = detail.notBefore;
|
||||||
const expires = detail.notAfter;
|
const expires = detail.notAfter;
|
||||||
|
const fingerprints = CertReader.getFingerprintX509(crt);
|
||||||
|
// @ts-ignore
|
||||||
|
detail.fingerprints = fingerprints;
|
||||||
return { detail, effective, expires };
|
return { detail, effective, expires };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static getFingerprintX509(crt: string) {
|
||||||
|
try {
|
||||||
|
// 创建X509Certificate实例
|
||||||
|
const cert = new cryptoLib.X509Certificate(crt);
|
||||||
|
// 获取指纹
|
||||||
|
return {
|
||||||
|
fingerprint: cert.fingerprint,
|
||||||
|
fingerprint256: cert.fingerprint256,
|
||||||
|
fingerprint512: cert.fingerprint512,
|
||||||
|
};
|
||||||
|
} catch (error) {
|
||||||
|
console.error("处理证书失败:", error.message);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
getAllDomains() {
|
getAllDomains() {
|
||||||
const { detail } = this.getCrtDetail();
|
const { detail } = this.getCrtDetail();
|
||||||
const domains = [];
|
const domains = [];
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { HttpClient, ILogger, utils } from "@certd/basic";
|
import { HttpClient, ILogger, utils } from "@certd/basic";
|
||||||
import { IAccess, IServiceGetter, PageRes, PageSearch, Registrable } from "@certd/pipeline";
|
import { IAccess, IAccessService, IServiceGetter, PageRes, PageSearch, Registrable } from "@certd/pipeline";
|
||||||
|
|
||||||
export type DnsProviderDefine = Registrable & {
|
export type DnsProviderDefine = Registrable & {
|
||||||
accessType: string;
|
accessType: string;
|
||||||
@@ -26,6 +26,7 @@ export type DnsProviderContext = {
|
|||||||
utils: typeof utils;
|
utils: typeof utils;
|
||||||
domainParser: IDomainParser;
|
domainParser: IDomainParser;
|
||||||
serviceGetter: IServiceGetter;
|
serviceGetter: IServiceGetter;
|
||||||
|
accessGetter?: IAccessService;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type DomainRecord = {
|
export type DomainRecord = {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { HttpClient, ILogger } from "@certd/basic";
|
import { HttpClient, ILogger } from "@certd/basic";
|
||||||
import { PageRes, PageSearch } from "@certd/pipeline";
|
import { IAccessService, PageRes, PageSearch } from "@certd/pipeline";
|
||||||
import punycode from "punycode.js";
|
import punycode from "punycode.js";
|
||||||
import { CreateRecordOptions, DnsProviderContext, DnsProviderDefine, DomainRecord, IDnsProvider, RemoveRecordOptions } from "./api.js";
|
import { CreateRecordOptions, DnsProviderContext, DnsProviderDefine, DomainRecord, IDnsProvider, RemoveRecordOptions } from "./api.js";
|
||||||
import { dnsProviderRegistry } from "./registry.js";
|
import { dnsProviderRegistry } from "./registry.js";
|
||||||
@@ -59,6 +59,11 @@ export async function createDnsProvider(opts: { dnsProviderType: string; context
|
|||||||
if (dnsProviderDefine.deprecated) {
|
if (dnsProviderDefine.deprecated) {
|
||||||
context.logger.warn(dnsProviderDefine.deprecated);
|
context.logger.warn(dnsProviderDefine.deprecated);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!context.accessGetter) {
|
||||||
|
const accessGetter: IAccessService = await context.serviceGetter.get("accessService");
|
||||||
|
context.accessGetter = accessGetter;
|
||||||
|
}
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
const dnsProvider: IDnsProvider = new DnsProviderClass();
|
const dnsProvider: IDnsProvider = new DnsProviderClass();
|
||||||
dnsProvider.setCtx(context);
|
dnsProvider.setCtx(context);
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ export function createRemoteSelectInputDefine(opts?: {
|
|||||||
pager?: boolean;
|
pager?: boolean;
|
||||||
component?: any;
|
component?: any;
|
||||||
value?: any;
|
value?: any;
|
||||||
|
pageSize?: number;
|
||||||
}) {
|
}) {
|
||||||
const title = opts?.title || "请选择";
|
const title = opts?.title || "请选择";
|
||||||
const certDomainsInputKey = opts?.certDomainsInputKey || "certDomains";
|
const certDomainsInputKey = opts?.certDomainsInputKey || "certDomains";
|
||||||
@@ -54,13 +55,11 @@ export function createRemoteSelectInputDefine(opts?: {
|
|||||||
const helper = opts?.helper || "请选择";
|
const helper = opts?.helper || "请选择";
|
||||||
const search = opts?.search ?? false;
|
const search = opts?.search ?? false;
|
||||||
const pager = opts?.pager ?? false;
|
const pager = opts?.pager ?? false;
|
||||||
let mode = "tags";
|
let mode = "default";
|
||||||
if (opts.multi === false) {
|
const multi = opts?.multi ?? true;
|
||||||
mode = undefined;
|
if (multi) {
|
||||||
} else {
|
mode = "tags";
|
||||||
mode = opts?.mode ?? "tags";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const item = {
|
const item = {
|
||||||
title,
|
title,
|
||||||
component: {
|
component: {
|
||||||
@@ -72,6 +71,8 @@ export function createRemoteSelectInputDefine(opts?: {
|
|||||||
action,
|
action,
|
||||||
search,
|
search,
|
||||||
pager,
|
pager,
|
||||||
|
multi,
|
||||||
|
pageSize: opts?.pageSize,
|
||||||
watches: [certDomainsInputKey, accessIdInputKey, ...watches],
|
watches: [certDomainsInputKey, accessIdInputKey, ...watches],
|
||||||
...opts.component,
|
...opts.component,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -38,6 +38,10 @@ COPY ./patch/ssh2/*.js /app/node_modules/.pnpm/node_modules/ssh2/lib/protocol/
|
|||||||
|
|
||||||
ENV LEGO_VERSION=4.30.1
|
ENV LEGO_VERSION=4.30.1
|
||||||
ENV LEGO_DOWNLOAD_DIR=/app/tools/lego
|
ENV LEGO_DOWNLOAD_DIR=/app/tools/lego
|
||||||
|
|
||||||
|
ENV ALIYUN_CLIENT_CONNECT_TIMEOUT=10000
|
||||||
|
ENV ALIYUN_CLIENT_READ_TIMEOUT=20000
|
||||||
|
|
||||||
RUN mkdir -p $LEGO_DOWNLOAD_DIR
|
RUN mkdir -p $LEGO_DOWNLOAD_DIR
|
||||||
|
|
||||||
# 根据架构下载不同的文件
|
# 根据架构下载不同的文件
|
||||||
|
|||||||
@@ -3,6 +3,142 @@
|
|||||||
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.39.8](https://github.com/certd/certd/compare/v1.39.7...v1.39.8) (2026-03-31)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复上传头像退出登录的bug ([6eb20a1](https://github.com/certd/certd/commit/6eb20a1f2e31d984d9135edbf39c97cdd15621f9))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 阿里云dcdn支持根据证书域名匹配模式 ([df012de](https://github.com/certd/certd/commit/df012dec90590ecba85a69ed6355cfa8382c1da3))
|
||||||
|
* dcdn自动匹配部署,支持新增域名感知 ([c6a988b](https://github.com/certd/certd/commit/c6a988bc925886bd7163c1270f2b7a10a57b1c5b))
|
||||||
|
|
||||||
|
## [1.39.7](https://github.com/certd/certd/compare/v1.39.6...v1.39.7) (2026-03-25)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/ui-client
|
||||||
|
|
||||||
|
## [1.39.6](https://github.com/certd/certd/compare/v1.39.5...v1.39.6) (2026-03-22)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复模版id不正确导致修改到错误的模版流水线bug ([b1ff163](https://github.com/certd/certd/commit/b1ff163a2828b205297408d5aed21cf1eff335e8))
|
||||||
|
* remote-select默认pageSize设置为50,阿里云WAF不支持pageSize100 ([285532d](https://github.com/certd/certd/commit/285532d4318b90d0d7f8154f070274c0a0ec0269))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 企业模式下面增加个人数据迁移的引导 ([431afd6](https://github.com/certd/certd/commit/431afd618f547cecf9a29433f46d4367619e2ecf))
|
||||||
|
* 优化远程数据选择框,选择数据时不刷新闪烁 ([7f6a8bc](https://github.com/certd/certd/commit/7f6a8bc87e364685defe7f039264b2de064806c5))
|
||||||
|
* 支持复制粘贴任务步骤 ([acc2df2](https://github.com/certd/certd/commit/acc2df29def017fb8165f931b41ef95414966afc))
|
||||||
|
|
||||||
|
## [1.39.5](https://github.com/certd/certd/compare/v1.39.4...v1.39.5) (2026-03-18)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复修改分组报错的bug ([224db7d](https://github.com/certd/certd/commit/224db7da57dbdddf25bcac7faa0a29eb228c5a33))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* passkey 支持Bitwarden ([29f44c6](https://github.com/certd/certd/commit/29f44c67c808bed9ff1c9d4884d39a1a62d043a7))
|
||||||
|
* passkey登录放到下方其他登录位置 ([1413e1a](https://github.com/certd/certd/commit/1413e1aff4aabcfd471716338c210fbcfd76c8f9))
|
||||||
|
|
||||||
|
## [1.39.4](https://github.com/certd/certd/compare/v1.39.3...v1.39.4) (2026-03-17)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复阿里云证书订单翻页问题 ([6d43623](https://github.com/certd/certd/commit/6d43623f459a7594599e50a7ed89d67fcc775518))
|
||||||
|
* 修复查看证书详情页面错位的bug ([7f37df4](https://github.com/certd/certd/commit/7f37df42274e657892d92e868ceac67e139f3bf2))
|
||||||
|
* 修复选择插件页面无法滚动的bug ([d8425bc](https://github.com/certd/certd/commit/d8425bc9c5ee81bb669706c6de6bad69d7c38d8e))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化passkey ([9e12412](https://github.com/certd/certd/commit/9e12412f5fa7800df1d7efaf62cd8fd5d79bb569))
|
||||||
|
|
||||||
|
## [1.39.3](https://github.com/certd/certd/compare/v1.39.2...v1.39.3) (2026-03-17)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复多选框只能单选的bug ([12700e1](https://github.com/certd/certd/commit/12700e1754319513ac02822ff1588d63420b964e))
|
||||||
|
|
||||||
|
## [1.39.2](https://github.com/certd/certd/compare/v1.39.1...v1.39.2) (2026-03-16)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复群晖测试时报addSecret undefine错误 ([5eb4aa3](https://github.com/certd/certd/commit/5eb4aa3a0eab9ffa729c8e813cbf973d9683cc13))
|
||||||
|
* 修复提示支付失败的bug ([12fed34](https://github.com/certd/certd/commit/12fed34e109f3254de664813954081a52513bd38))
|
||||||
|
* 修复修改项目名称后,没有同步刷新的bug ([3abee72](https://github.com/certd/certd/commit/3abee72fee286864b665033b23b172ef0ea92d83))
|
||||||
|
* cname provider授权修改为sys级别 ([d01bfbe](https://github.com/certd/certd/commit/d01bfbec96a3a2109ec864953b0c9e8c1f95b97b))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 查看证书增加证书详情显示,包括域名,过期时间,颁发机构,指纹等 ([0b9933d](https://github.com/certd/certd/commit/0b9933df1e8d1685d14271435a8a7488974cc47b))
|
||||||
|
* 获取阿里证书订单id组件增加翻页功能,突破50的上限 ([d79db3b](https://github.com/certd/certd/commit/d79db3bd3f0d5ad39664bb47ec3814d43ad93304))
|
||||||
|
* 优化阿里云连接超时时长为10秒,支持配置环境变量 ([1588461](https://github.com/certd/certd/commit/1588461633bd275765daa96fc68320abb58d616d))
|
||||||
|
* 优化个人账户页面 ([e506116](https://github.com/certd/certd/commit/e50611666ef731a903d7bdd8eb62333b97e2cc5b))
|
||||||
|
* 支持批量转移流水线到其他项目 ([8a3841f](https://github.com/certd/certd/commit/8a3841f6382b53ce2343307fb035e74fa5383fef))
|
||||||
|
* 支持passkey登录 ([10b7644](https://github.com/certd/certd/commit/10b7644bb7ba5f82776537bc0c4f5eb95d5f8e4e))
|
||||||
|
* dns-provider 支持bind9 ,support bind9 ([76d12d6](https://github.com/certd/certd/commit/76d12d60624c0672fd3717a80a2cfef6845b14b8))
|
||||||
|
|
||||||
|
## [1.39.1](https://github.com/certd/certd/compare/v1.39.0...v1.39.1) (2026-03-09)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复企业管理模式下,切换用户登录后,丢失项目列表的bug ([d23c8b4](https://github.com/certd/certd/commit/d23c8b4a2a5f5ab17822c6ee1d4108ac7280b9d1))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 支持迁移个人数据到企业项目中 ([c6ca832](https://github.com/certd/certd/commit/c6ca83273779ed84de1b23b5e477063af043d015))
|
||||||
|
|
||||||
|
# [1.39.0](https://github.com/certd/certd/compare/v1.38.12...v1.39.0) (2026-03-07)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复发件邮箱无法输入的bug ([27b0348](https://github.com/certd/certd/commit/27b0348e1d3d752f418f851965d6afbc26c0160c))
|
||||||
|
* 修复复制流水线保存后丢失分组和排序号的问题 ([bc32648](https://github.com/certd/certd/commit/bc326489abc1d50a0930b4f47aa2d62d3a486798))
|
||||||
|
* 修复获取群辉deviceid报错的bug ([79be392](https://github.com/certd/certd/commit/79be392775a2c91848dd5a66a2618adc4e4b48f6))
|
||||||
|
* 修复偶尔下载证书报未授权的错误 ([316537e](https://github.com/certd/certd/commit/316537eb4dcbe5ec57784e8bf95ee3cdfd21dce7))
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* 支持企业级管理模式,项目管理,细分权限 ([3734083](https://github.com/certd/certd/commit/37340838b6a61a94b86bfa13cf5da88b26f1315a))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 当域名管理中没有域名时,创建流水线时不展开域名选择框 ([bb0afe1](https://github.com/certd/certd/commit/bb0afe1fa7b0fc52fde051d24fbe6be69d52f4cc))
|
||||||
|
* 任务步骤页面增加串行执行提示说明 ([787f6ef](https://github.com/certd/certd/commit/787f6ef52893d8dc912ee2a7a5b8ce2b73c108c9))
|
||||||
|
|
||||||
|
## [1.38.12](https://github.com/certd/certd/compare/v1.38.11...v1.38.12) (2026-02-18)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复获取群辉deviceid报错的bug ([39d3bf9](https://github.com/certd/certd/commit/39d3bf97d1935918bac575da9d0726310c83c19d))
|
||||||
|
|
||||||
|
## [1.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 优化登陆页面的黑暗模式 ([e47edda](https://github.com/certd/certd/commit/e47eddaa858f8fffe7a40dfbd14e8cda1dcba4ac))
|
||||||
|
* 支持自定义发件人名称,格式:名称<邮箱> ([bab9adc](https://github.com/certd/certd/commit/bab9adce240108d4291eedc67e04abc4a01019e0))
|
||||||
|
|
||||||
|
## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复1panel 请求失败的bug ([0283662](https://github.com/certd/certd/commit/0283662931ff47d6b5d49f91a30c4a002fe1d108))
|
||||||
|
* 修复保存站点监控dns设置,偶尔无法保存成功的bug ([8387fe0](https://github.com/certd/certd/commit/8387fe0d5b2e77b8c2788a10791e5389d97a3e41))
|
||||||
|
* 修复任务步骤标题过长导致错位的问题 ([9fb9805](https://github.com/certd/certd/commit/9fb980599f96ccbf61bd46019411db2f13c70e57))
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* 监控设置支持逗号分割 ([c23d1d1](https://github.com/certd/certd/commit/c23d1d11b58a6cdfe431a7e8abbd5d955146c38d))
|
||||||
|
* 列表中支持下次执行时间显示 ([a3cabd5](https://github.com/certd/certd/commit/a3cabd5f36ed41225ad418098596e9b2c44e31a1))
|
||||||
|
* 模版编辑页面,hover反色过亮问题优化 ([e55a3a8](https://github.com/certd/certd/commit/e55a3a82fc6939b940f0c3be4529d74a625f6f4e))
|
||||||
|
* 所有授权增加测试按钮 ([7a3e68d](https://github.com/certd/certd/commit/7a3e68d656c1dcdcd814b69891bd2c2c6fe3098a))
|
||||||
|
* 优化网络测试页面,夜间模式显示效果 ([305da86](https://github.com/certd/certd/commit/305da86f97d918374819ecd6c50685f09b94ea59))
|
||||||
|
* 支持next-terminal ([6f3fd78](https://github.com/certd/certd/commit/6f3fd785e77a33c72bdf4115dc5d498e677d1863))
|
||||||
|
* 主题默认跟随系统颜色(自动切换深色浅色模式) ([32c3ce5](https://github.com/certd/certd/commit/32c3ce5c9868569523901a9a939ca5b535ec3277))
|
||||||
|
* http校验方式支持scp上传 ([4eb940f](https://github.com/certd/certd/commit/4eb940ffe765a0330331bc6af8396315e36d4e4a))
|
||||||
|
|
||||||
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
|
||||||
|
|
||||||
### Performance Improvements
|
### Performance Improvements
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/ui-client",
|
"name": "@certd/ui-client",
|
||||||
"version": "1.38.9",
|
"version": "1.39.8",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite --open",
|
"dev": "vite --open",
|
||||||
@@ -106,8 +106,8 @@
|
|||||||
"zod-defaults": "^0.1.3"
|
"zod-defaults": "^0.1.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@certd/lib-iframe": "^1.38.9",
|
"@certd/lib-iframe": "^1.39.8",
|
||||||
"@certd/pipeline": "^1.38.9",
|
"@certd/pipeline": "^1.39.8",
|
||||||
"@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",
|
||||||
|
|||||||
BIN
packages/ui/certd-client/public/static/images/ent/admin_mode.png
Normal file
|
After Width: | Height: | Size: 117 KiB |
@@ -1,7 +1,7 @@
|
|||||||
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
|
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
|
||||||
width="500" height="500" viewBox="0 0 500.000000 500.000000"
|
width="500" height="500" viewBox="0 0 500.000000 500.000000"
|
||||||
>
|
>
|
||||||
<path d="M28.34 56.68h28.34V36.12H28.34a7.79 7.79 0 1 1 0-15.58h19.84v9.05h8.5V12H28.34a16.29 16.29 0 0 0 0 32.58h19.84v3.56H28.34a19.84 19.84 0 0 1 0-39.68h28.34V0H28.34a28.34 28.34 0 0 0 0 56.68z"
|
<path fill="#333" d="M28.34 56.68h28.34V36.12H28.34a7.79 7.79 0 1 1 0-15.58h19.84v9.05h8.5V12H28.34a16.29 16.29 0 0 0 0 32.58h19.84v3.56H28.34a19.84 19.84 0 0 1 0-39.68h28.34V0H28.34a28.34 28.34 0 0 0 0 56.68z"
|
||||||
transform="translate(70, 76) scale(6,6)"
|
transform="translate(70, 76) scale(6,6)"
|
||||||
></path>
|
></path>
|
||||||
</svg>
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 397 B After Width: | Height: | Size: 409 B |
BIN
packages/ui/certd-client/public/static/logos/next-terminal.png
Normal file
|
After Width: | Height: | Size: 5.4 KiB |