From 0584b3672b40f9042a2ed87e5627022606d046cd Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Fri, 4 Oct 2024 00:52:19 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4=E9=9D=99=E6=80=81?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=88=B0static=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 ++-- packages/plugins/plugin-cert/src/index.ts | 2 +- packages/ui/certd-client/.env | 2 +- packages/ui/certd-client/index.html | 6 +- .../assets => public/static}/background.svg | 0 .../static}/doc/images/1-add.png | Bin .../static}/doc/images/10-1-log.png | Bin .../static}/doc/images/11-1-error.png | Bin .../static}/doc/images/11-2-error.png | Bin .../static}/doc/images/12-1-log-success.png | Bin .../static}/doc/images/12-2-skip-log.png | Bin .../static}/doc/images/13-1-result.png | Bin .../static}/doc/images/13-2-result.png | Bin .../static}/doc/images/13-3-download.png | Bin .../static}/doc/images/14-timer.png | Bin .../static}/doc/images/15-1-email.png | Bin .../static}/doc/images/15-2-email.png | Bin .../static}/doc/images/2-access-provider.png | Bin .../static}/doc/images/3-add-access.png | Bin .../static}/doc/images/4-add-success.png | Bin .../static}/doc/images/5-view.png | Bin .../static}/doc/images/6-1-add-task.png | Bin .../static}/doc/images/6-2-add-task.png | Bin .../static}/doc/images/6-3-add-task.png | Bin .../static}/doc/images/7-1-add-host-task.png | Bin .../static}/doc/images/7-2-add-host-task.png | Bin .../static}/doc/images/7-3-add-host-task.png | Bin .../static}/doc/images/8-1-add-host-task.png | Bin .../static}/doc/images/8-2-add-host-task.png | Bin .../static}/doc/images/8-4-add-host-task.png | Bin .../static}/doc/images/8-5-add-host-task.png | Bin .../static}/doc/images/9-start.png | Bin .../public/{ => static}/favicon.ico | Bin .../assets => public/static}/icons/demo.css | 0 .../static}/icons/demo_index.html | 48 ++++++++-------- .../static}/icons/iconfont.css | 0 .../static}/icons/iconfont.js | 0 .../static}/icons/iconfont.json | 0 .../static}/icons/iconfont.svg | 0 .../static}/images/logo/logo.svg | 0 .../static}/images/logo/rect-black.svg | 0 .../static}/images/logo/square.svg | 0 .../static}/images/plugin.png | Bin .../static}/images/preview.png | Bin .../public/{ => static}/index.css | 0 .../certd-client/public/{ => static}/logo.svg | 0 packages/ui/certd-client/src/assets/logo.png | Bin 6849 -> 0 bytes .../components/tutorial/tutorial-steps.vue | 52 ++++++++--------- .../src/store/modules/settings.ts | 7 ++- .../ui/certd-client/src/store/modules/user.ts | 4 +- .../src/views/certd/history/crud.tsx | 10 +++- .../ui/certd-client/src/views/sys/site/api.ts | 29 +--------- .../src/modules/account/account-controller.ts | 3 +- .../src/modules/auto/auto-init-site.ts | 3 +- .../src/modules/auto/auto-register-cron.ts | 1 - .../pipeline/controller/history-controller.ts | 25 +++++++- .../pipeline/service/history-service.ts | 3 + packages/ui/certd-server/tsconfig.json | 8 --- step.md | 54 +++++++++--------- 59 files changed, 131 insertions(+), 136 deletions(-) rename packages/ui/certd-client/{src/assets => public/static}/background.svg (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/1-add.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/10-1-log.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/11-1-error.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/11-2-error.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/12-1-log-success.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/12-2-skip-log.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/13-1-result.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/13-2-result.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/13-3-download.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/14-timer.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/15-1-email.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/15-2-email.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/2-access-provider.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/3-add-access.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/4-add-success.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/5-view.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/6-1-add-task.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/6-2-add-task.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/6-3-add-task.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/7-1-add-host-task.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/7-2-add-host-task.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/7-3-add-host-task.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/8-1-add-host-task.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/8-2-add-host-task.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/8-4-add-host-task.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/8-5-add-host-task.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/doc/images/9-start.png (100%) rename packages/ui/certd-client/public/{ => static}/favicon.ico (100%) rename packages/ui/certd-client/{src/assets => public/static}/icons/demo.css (100%) rename packages/ui/certd-client/{src/assets => public/static}/icons/demo_index.html (96%) rename packages/ui/certd-client/{src/assets => public/static}/icons/iconfont.css (100%) rename packages/ui/certd-client/{src/assets => public/static}/icons/iconfont.js (100%) rename packages/ui/certd-client/{src/assets => public/static}/icons/iconfont.json (100%) rename packages/ui/certd-client/{src/assets => public/static}/icons/iconfont.svg (100%) rename packages/ui/certd-client/{src/assets => public/static}/images/logo/logo.svg (100%) rename packages/ui/certd-client/{src/assets => public/static}/images/logo/rect-black.svg (100%) rename packages/ui/certd-client/{src/assets => public/static}/images/logo/square.svg (100%) rename packages/ui/certd-client/{src/assets => public/static}/images/plugin.png (100%) rename packages/ui/certd-client/{src/assets => public/static}/images/preview.png (100%) rename packages/ui/certd-client/public/{ => static}/index.css (100%) rename packages/ui/certd-client/public/{ => static}/logo.svg (100%) delete mode 100644 packages/ui/certd-client/src/assets/logo.png diff --git a/README.md b/README.md index eca6b1dd..320da589 100644 --- a/README.md +++ b/README.md @@ -29,11 +29,11 @@ https://certd.handsfree.work/ ## 三、使用教程 本案例演示，如何配置自动申请证书，并部署到阿里云CDN，然后快要到期前自动更新证书并重新部署 -![演示](./packages/ui/certd-client/src/assets/doc/images/5-view.png) -![演示](./packages/ui/certd-client/src/assets/doc/images/9-start.png) -![演示](./packages/ui/certd-client/src/assets/doc/images/10-1-log.png) -![演示](./packages/ui/certd-client/src/assets/doc/images/13-3-download.png) -![演示](./packages/ui/certd-client/src/assets/doc/images/13-1-result.png) +![演示](packages/ui/certd-client/public/statics/doc/images/5-view.png) +![演示](packages/ui/certd-client/public/statics/doc/images/9-start.png) +![演示](packages/ui/certd-client/public/statics/doc/images/10-1-log.png) +![演示](packages/ui/certd-client/public/statics/doc/images/13-3-download.png) +![演示](packages/ui/certd-client/public/statics/doc/images/13-1-result.png) ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ -------> [点我查看详细使用步骤演示](./step.md) <-------- diff --git a/packages/plugins/plugin-cert/src/index.ts b/packages/plugins/plugin-cert/src/index.ts index 150a1022..ef88c758 100644 --- a/packages/plugins/plugin-cert/src/index.ts +++ b/packages/plugins/plugin-cert/src/index.ts @@ -1,3 +1,3 @@ +export * from "./access/index.js"; export * from "./plugin/index.js"; export * from "./dns-provider/index.js"; -export * from "./access/index.js"; diff --git a/packages/ui/certd-client/.env b/packages/ui/certd-client/.env index 4c6a5356..df344b87 100644 --- a/packages/ui/certd-client/.env +++ b/packages/ui/certd-client/.env @@ -6,6 +6,6 @@ VITE_APP_SLOGAN=让你的证书永不过期 VITE_APP_COPYRIGHT_YEAR=2021-2024 VITE_APP_COPYRIGHT_NAME=handsfree.work VITE_APP_COPYRIGHT_URL=https://certd.handsfree.work -VITE_APP_LOGO=./assets/images/logo/logo.svg +VITE_APP_LOGO=/statics/images/logo/logo.svg VITE_APP_PROJECT_PATH=https://github.com/certd/certd diff --git a/packages/ui/certd-client/index.html b/packages/ui/certd-client/index.html index 8a75edd7..9abb0bdf 100644 --- a/packages/ui/certd-client/index.html +++ b/packages/ui/certd-client/index.html @@ -2,11 +2,11 @@ - + Certd-让你的证书永不过期 - - + +
diff --git a/packages/ui/certd-client/src/assets/background.svg b/packages/ui/certd-client/public/static/background.svg similarity index 100% rename from packages/ui/certd-client/src/assets/background.svg rename to packages/ui/certd-client/public/static/background.svg diff --git a/packages/ui/certd-client/src/assets/doc/images/1-add.png b/packages/ui/certd-client/public/static/doc/images/1-add.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/1-add.png rename to packages/ui/certd-client/public/static/doc/images/1-add.png diff --git a/packages/ui/certd-client/src/assets/doc/images/10-1-log.png b/packages/ui/certd-client/public/static/doc/images/10-1-log.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/10-1-log.png rename to packages/ui/certd-client/public/static/doc/images/10-1-log.png diff --git a/packages/ui/certd-client/src/assets/doc/images/11-1-error.png b/packages/ui/certd-client/public/static/doc/images/11-1-error.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/11-1-error.png rename to packages/ui/certd-client/public/static/doc/images/11-1-error.png diff --git a/packages/ui/certd-client/src/assets/doc/images/11-2-error.png b/packages/ui/certd-client/public/static/doc/images/11-2-error.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/11-2-error.png rename to packages/ui/certd-client/public/static/doc/images/11-2-error.png diff --git a/packages/ui/certd-client/src/assets/doc/images/12-1-log-success.png b/packages/ui/certd-client/public/static/doc/images/12-1-log-success.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/12-1-log-success.png rename to packages/ui/certd-client/public/static/doc/images/12-1-log-success.png diff --git a/packages/ui/certd-client/src/assets/doc/images/12-2-skip-log.png b/packages/ui/certd-client/public/static/doc/images/12-2-skip-log.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/12-2-skip-log.png rename to packages/ui/certd-client/public/static/doc/images/12-2-skip-log.png diff --git a/packages/ui/certd-client/src/assets/doc/images/13-1-result.png b/packages/ui/certd-client/public/static/doc/images/13-1-result.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/13-1-result.png rename to packages/ui/certd-client/public/static/doc/images/13-1-result.png diff --git a/packages/ui/certd-client/src/assets/doc/images/13-2-result.png b/packages/ui/certd-client/public/static/doc/images/13-2-result.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/13-2-result.png rename to packages/ui/certd-client/public/static/doc/images/13-2-result.png diff --git a/packages/ui/certd-client/src/assets/doc/images/13-3-download.png b/packages/ui/certd-client/public/static/doc/images/13-3-download.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/13-3-download.png rename to packages/ui/certd-client/public/static/doc/images/13-3-download.png diff --git a/packages/ui/certd-client/src/assets/doc/images/14-timer.png b/packages/ui/certd-client/public/static/doc/images/14-timer.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/14-timer.png rename to packages/ui/certd-client/public/static/doc/images/14-timer.png diff --git a/packages/ui/certd-client/src/assets/doc/images/15-1-email.png b/packages/ui/certd-client/public/static/doc/images/15-1-email.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/15-1-email.png rename to packages/ui/certd-client/public/static/doc/images/15-1-email.png diff --git a/packages/ui/certd-client/src/assets/doc/images/15-2-email.png b/packages/ui/certd-client/public/static/doc/images/15-2-email.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/15-2-email.png rename to packages/ui/certd-client/public/static/doc/images/15-2-email.png diff --git a/packages/ui/certd-client/src/assets/doc/images/2-access-provider.png b/packages/ui/certd-client/public/static/doc/images/2-access-provider.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/2-access-provider.png rename to packages/ui/certd-client/public/static/doc/images/2-access-provider.png diff --git a/packages/ui/certd-client/src/assets/doc/images/3-add-access.png b/packages/ui/certd-client/public/static/doc/images/3-add-access.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/3-add-access.png rename to packages/ui/certd-client/public/static/doc/images/3-add-access.png diff --git a/packages/ui/certd-client/src/assets/doc/images/4-add-success.png b/packages/ui/certd-client/public/static/doc/images/4-add-success.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/4-add-success.png rename to packages/ui/certd-client/public/static/doc/images/4-add-success.png diff --git a/packages/ui/certd-client/src/assets/doc/images/5-view.png b/packages/ui/certd-client/public/static/doc/images/5-view.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/5-view.png rename to packages/ui/certd-client/public/static/doc/images/5-view.png diff --git a/packages/ui/certd-client/src/assets/doc/images/6-1-add-task.png b/packages/ui/certd-client/public/static/doc/images/6-1-add-task.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/6-1-add-task.png rename to packages/ui/certd-client/public/static/doc/images/6-1-add-task.png diff --git a/packages/ui/certd-client/src/assets/doc/images/6-2-add-task.png b/packages/ui/certd-client/public/static/doc/images/6-2-add-task.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/6-2-add-task.png rename to packages/ui/certd-client/public/static/doc/images/6-2-add-task.png diff --git a/packages/ui/certd-client/src/assets/doc/images/6-3-add-task.png b/packages/ui/certd-client/public/static/doc/images/6-3-add-task.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/6-3-add-task.png rename to packages/ui/certd-client/public/static/doc/images/6-3-add-task.png diff --git a/packages/ui/certd-client/src/assets/doc/images/7-1-add-host-task.png b/packages/ui/certd-client/public/static/doc/images/7-1-add-host-task.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/7-1-add-host-task.png rename to packages/ui/certd-client/public/static/doc/images/7-1-add-host-task.png diff --git a/packages/ui/certd-client/src/assets/doc/images/7-2-add-host-task.png b/packages/ui/certd-client/public/static/doc/images/7-2-add-host-task.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/7-2-add-host-task.png rename to packages/ui/certd-client/public/static/doc/images/7-2-add-host-task.png diff --git a/packages/ui/certd-client/src/assets/doc/images/7-3-add-host-task.png b/packages/ui/certd-client/public/static/doc/images/7-3-add-host-task.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/7-3-add-host-task.png rename to packages/ui/certd-client/public/static/doc/images/7-3-add-host-task.png diff --git a/packages/ui/certd-client/src/assets/doc/images/8-1-add-host-task.png b/packages/ui/certd-client/public/static/doc/images/8-1-add-host-task.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/8-1-add-host-task.png rename to packages/ui/certd-client/public/static/doc/images/8-1-add-host-task.png diff --git a/packages/ui/certd-client/src/assets/doc/images/8-2-add-host-task.png b/packages/ui/certd-client/public/static/doc/images/8-2-add-host-task.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/8-2-add-host-task.png rename to packages/ui/certd-client/public/static/doc/images/8-2-add-host-task.png diff --git a/packages/ui/certd-client/src/assets/doc/images/8-4-add-host-task.png b/packages/ui/certd-client/public/static/doc/images/8-4-add-host-task.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/8-4-add-host-task.png rename to packages/ui/certd-client/public/static/doc/images/8-4-add-host-task.png diff --git a/packages/ui/certd-client/src/assets/doc/images/8-5-add-host-task.png b/packages/ui/certd-client/public/static/doc/images/8-5-add-host-task.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/8-5-add-host-task.png rename to packages/ui/certd-client/public/static/doc/images/8-5-add-host-task.png diff --git a/packages/ui/certd-client/src/assets/doc/images/9-start.png b/packages/ui/certd-client/public/static/doc/images/9-start.png similarity index 100% rename from packages/ui/certd-client/src/assets/doc/images/9-start.png rename to packages/ui/certd-client/public/static/doc/images/9-start.png diff --git a/packages/ui/certd-client/public/favicon.ico b/packages/ui/certd-client/public/static/favicon.ico similarity index 100% rename from packages/ui/certd-client/public/favicon.ico rename to packages/ui/certd-client/public/static/favicon.ico diff --git a/packages/ui/certd-client/src/assets/icons/demo.css b/packages/ui/certd-client/public/static/icons/demo.css similarity index 100% rename from packages/ui/certd-client/src/assets/icons/demo.css rename to packages/ui/certd-client/public/static/icons/demo.css diff --git a/packages/ui/certd-client/src/assets/icons/demo_index.html b/packages/ui/certd-client/public/static/icons/demo_index.html similarity index 96% rename from packages/ui/certd-client/src/assets/icons/demo_index.html rename to packages/ui/certd-client/public/static/icons/demo_index.html index 9b6bff9a..2e018521 100644 --- a/packages/ui/certd-client/src/assets/icons/demo_index.html +++ b/packages/ui/certd-client/public/static/icons/demo_index.html @@ -6,9 +6,9 @@ - - - + + + @@ -38,7 +38,7 @@

- +

    @@ -46,44 +46,44 @@
  • Font class
  • Symbol
- + 查看项目 - +
    - +
  • qiniuyun
    &#xe603;
    • - +
  • aliyun
    &#xe601;
    • - +
  • 腾讯云
    &#xe747;
    • - +
  • doge
    &#xe605;
    • - +
  • bt
    &#xe600;
    • - +

Unicode 引用

@@ -127,7 +127,7 @@
    - +
  • @@ -136,7 +136,7 @@
    .icon-qiniuyun
    • - +
  • @@ -145,7 +145,7 @@
    .icon-aliyun
    • - +
  • @@ -154,7 +154,7 @@
    .icon-tencentcloud
    • - +
  • @@ -163,7 +163,7 @@
    .icon-dogecloud
    • - +
  • @@ -172,7 +172,7 @@
    .icon-bt
    • - +

font-class 引用

@@ -199,7 +199,7 @@
    - +
  • qiniuyun
    #icon-qiniuyun
    • - +
  • aliyun
    #icon-aliyun
    • - +
  • 腾讯云
    #icon-tencentcloud
    • - +
  • doge
    #icon-dogecloud
    • - +
  • bt
    #icon-bt
    • - +

Symbol 引用

diff --git a/packages/ui/certd-client/src/assets/icons/iconfont.css b/packages/ui/certd-client/public/static/icons/iconfont.css similarity index 100% rename from packages/ui/certd-client/src/assets/icons/iconfont.css rename to packages/ui/certd-client/public/static/icons/iconfont.css diff --git a/packages/ui/certd-client/src/assets/icons/iconfont.js b/packages/ui/certd-client/public/static/icons/iconfont.js similarity index 100% rename from packages/ui/certd-client/src/assets/icons/iconfont.js rename to packages/ui/certd-client/public/static/icons/iconfont.js diff --git a/packages/ui/certd-client/src/assets/icons/iconfont.json b/packages/ui/certd-client/public/static/icons/iconfont.json similarity index 100% rename from packages/ui/certd-client/src/assets/icons/iconfont.json rename to packages/ui/certd-client/public/static/icons/iconfont.json diff --git a/packages/ui/certd-client/src/assets/icons/iconfont.svg b/packages/ui/certd-client/public/static/icons/iconfont.svg similarity index 100% rename from packages/ui/certd-client/src/assets/icons/iconfont.svg rename to packages/ui/certd-client/public/static/icons/iconfont.svg diff --git a/packages/ui/certd-client/src/assets/images/logo/logo.svg b/packages/ui/certd-client/public/static/images/logo/logo.svg similarity index 100% rename from packages/ui/certd-client/src/assets/images/logo/logo.svg rename to packages/ui/certd-client/public/static/images/logo/logo.svg diff --git a/packages/ui/certd-client/src/assets/images/logo/rect-black.svg b/packages/ui/certd-client/public/static/images/logo/rect-black.svg similarity index 100% rename from packages/ui/certd-client/src/assets/images/logo/rect-black.svg rename to packages/ui/certd-client/public/static/images/logo/rect-black.svg diff --git a/packages/ui/certd-client/src/assets/images/logo/square.svg b/packages/ui/certd-client/public/static/images/logo/square.svg similarity index 100% rename from packages/ui/certd-client/src/assets/images/logo/square.svg rename to packages/ui/certd-client/public/static/images/logo/square.svg diff --git a/packages/ui/certd-client/src/assets/images/plugin.png b/packages/ui/certd-client/public/static/images/plugin.png similarity index 100% rename from packages/ui/certd-client/src/assets/images/plugin.png rename to packages/ui/certd-client/public/static/images/plugin.png diff --git a/packages/ui/certd-client/src/assets/images/preview.png b/packages/ui/certd-client/public/static/images/preview.png similarity index 100% rename from packages/ui/certd-client/src/assets/images/preview.png rename to packages/ui/certd-client/public/static/images/preview.png diff --git a/packages/ui/certd-client/public/index.css b/packages/ui/certd-client/public/static/index.css similarity index 100% rename from packages/ui/certd-client/public/index.css rename to packages/ui/certd-client/public/static/index.css diff --git a/packages/ui/certd-client/public/logo.svg b/packages/ui/certd-client/public/static/logo.svg similarity index 100% rename from packages/ui/certd-client/public/logo.svg rename to packages/ui/certd-client/public/static/logo.svg diff --git a/packages/ui/certd-client/src/assets/logo.png b/packages/ui/certd-client/src/assets/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 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[ description: "演示证书申请任务如何配置", items: [ { - image: "/assets/doc/images/1-add.png", + image: "/static/doc/images/1-add.png", title: "创建证书流水线", descriptions: ["点击添加流水线，选择证书申请"] }, { - image: "/assets/doc/images/2-access-provider.png", + image: "/static/doc/images/2-access-provider.png", title: "DNS授权", descriptions: ["证书申请需要给域名添加TXT解析记录来验证域名所有权"] }, { - image: "/assets/doc/images/3-add-access.png", + image: "/static/doc/images/3-add-access.png", title: "第一次使用，需要添加DNS授权", descriptions: ["选择DNS授权，确认创建"] }, // { - // image: "/assets/doc/images/3-add-access.png", + // image: "/static/doc/images/3-add-access.png", // title: "确定创建流水线", // descriptions: ["选择DNS授权，信息填写无误，确认创建"] // }, { - image: "/assets/doc/images/4-add-success.png", + image: "/static/doc/images/4-add-success.png", title: "流水线创建成功", descriptions: ["此时证书申请任务已经建好，点击手动触发即可测试证书申请", "接下来演示如何添加部署任务"] } @@ -74,52 +74,52 @@ const steps = ref([ description: "演示部署到阿里云CDN和Nginx", items: [ { - image: "/assets/doc/images/6-1-add-task.png", + image: "/static/doc/images/6-1-add-task.png", title: "添加部署任务", descriptions: ["演示第一个部署任务，部署到阿里云CDN"] }, { - image: "/assets/doc/images/6-2-add-task.png", + image: "/static/doc/images/6-2-add-task.png", title: "选择任务插件", descriptions: ["可以搜索插件，这里选择阿里云CDN插件"] }, { - image: "/assets/doc/images/6-3-add-task.png", + image: "/static/doc/images/6-3-add-task.png", title: "配置任务参数", descriptions: ["填写CDN的域名和证书ID", "任务保存之后，阿里云CDN的部署任务就配置好了"] }, { - image: "/assets/doc/images/7-1-add-host-task.png", + image: "/static/doc/images/7-1-add-host-task.png", title: "添加主机部署任务", descriptions: ["接下来演示配置第二个部署任务，部署到主机", "部署到主机分两步: 1. 上传证书到主机 2. 运行主机命令"] }, { - image: "/assets/doc/images/7-2-add-host-task.png", + image: "/static/doc/images/7-2-add-host-task.png", title: "配置上传到主机任务", descriptions: ["填写上传到主机任务参数", "比如证书保存路径"] }, { - image: "/assets/doc/images/7-3-add-host-task.png", + image: "/static/doc/images/7-3-add-host-task.png", title: "添加主机ssh登录授权", descriptions: ["填写主机ip、用户名、密码，授权只需添加一次，后续其他任务可以复用"] }, { - image: "/assets/doc/images/8-1-add-host-task.png", + image: "/static/doc/images/8-1-add-host-task.png", title: "上传到主机任务配置完成", descriptions: ["接下来配置主机执行脚本，去部署证书"] }, { - image: "/assets/doc/images/8-2-add-host-task.png", + image: "/static/doc/images/8-2-add-host-task.png", title: "选择添加主机远程命令任务", descriptions: ["选择主机远程命令任务"] }, { - image: "/assets/doc/images/8-4-add-host-task.png", + image: "/static/doc/images/8-4-add-host-task.png", title: "填写证书部署脚本", descriptions: ["选择主机授权，编写部署脚本，这里演示部署到nginx，需要重启nginx，让证书生效"] }, { - image: "/assets/doc/images/8-5-add-host-task.png", + image: "/static/doc/images/8-5-add-host-task.png", title: "上传到主机任务的两个步骤配置完成", descriptions: ["接下来测试运行"] } @@ -130,47 +130,47 @@ const steps = ref([ description: "演示流水线运行,查看日志，成功后跳过等", items: [ { - image: "/assets/doc/images/9-start.png", + image: "/static/doc/images/9-start.png", title: "运行测试一下", descriptions: ["之前是把证书上传到主机，接下来要运行命令，去部署证书"] }, { - image: "/assets/doc/images/10-1-log.png", + image: "/static/doc/images/10-1-log.png", title: "查看日志", descriptions: ["点击任务可以查看状态和日志"] }, { - image: "/assets/doc/images/11-1-error.png", + image: "/static/doc/images/11-1-error.png", title: "执行失败如何排查", descriptions: ["查看错误日志"] }, { - image: "/assets/doc/images/11-2-error.png", + image: "/static/doc/images/11-2-error.png", title: "执行失败如何排查", descriptions: ["查看错误日志,这里报的是nginx容器不存在，修改命令改成正确的nginx容器名称"] }, { - image: "/assets/doc/images/12-1-log-success.png", + image: "/static/doc/images/12-1-log-success.png", title: "执行成功", descriptions: ["修改正确后，重新点击手动触发，重新运行一次，执行成功"] }, { - image: "/assets/doc/images/12-2-skip-log.png", + image: "/static/doc/images/12-2-skip-log.png", title: "成功后自动跳过", descriptions: ["可以看到成功过的将会自动跳过，不会重复执行，只有当参数变更或者证书更新了，才会重新运行"] }, { - image: "/assets/doc/images/13-1-result.png", + image: "/static/doc/images/13-1-result.png", title: "查看证书部署成功", descriptions: ["访问nginx上的网站，可以看到证书已经部署成功"] }, { - image: "/assets/doc/images/13-2-result.png", + image: "/static/doc/images/13-2-result.png", title: "阿里云CDN也部署成功", descriptions: ["阿里云CDN上已经更新证书，证书名称已certd开头"] }, { - image: "/assets/doc/images/13-3-download.png", + image: "/static/doc/images/13-3-download.png", title: "还可以下载证书，手动部署", descriptions: ["如果还没有好用的部署插件，没办法自动部署，你还可以下载证书，手动部署"] } @@ -181,7 +181,7 @@ const steps = ref([ description: "自动运行", items: [ { - image: "/assets/doc/images/14-timer.png", + image: "/static/doc/images/14-timer.png", title: "设置定时执行", descriptions: [ "流水线测试成功，接下来配置定时触发，以后每天定时执行就不用管了", @@ -189,7 +189,7 @@ const steps = ref([ ] }, { - image: "/assets/doc/images/15-1-email.png", + image: "/static/doc/images/15-1-email.png", title: "设置邮件通知", descriptions: ["建议选择监听'错误时'和'错误转成功'两种即可，在意外失败时可以尽快去排查问题，（免费版需要配置邮件服务器）"] } diff --git a/packages/ui/certd-client/src/store/modules/settings.ts b/packages/ui/certd-client/src/store/modules/settings.ts index fee81cc0..0976044b 100644 --- a/packages/ui/certd-client/src/store/modules/settings.ts +++ b/packages/ui/certd-client/src/store/modules/settings.ts @@ -85,8 +85,11 @@ export const useSettingStore = defineStore({ const settings = await basicApi.getSysPublicSettings(); _.merge(this.sysPublic, settings); - const siteInfo = await basicApi.getSiteInfo(); - _.merge(this.siteInfo, siteInfo); + const userStore = useUserStore(); + if (userStore.isComm) { + const siteInfo = await basicApi.getSiteInfo(); + _.merge(this.siteInfo, siteInfo); + } await this.loadInstallInfo(); diff --git a/packages/ui/certd-client/src/store/modules/user.ts b/packages/ui/certd-client/src/store/modules/user.ts index 1d9d9a58..9aef5cf2 100644 --- a/packages/ui/certd-client/src/store/modules/user.ts +++ b/packages/ui/certd-client/src/store/modules/user.ts @@ -58,10 +58,10 @@ export const useUserStore = defineStore({ vipLabel(): string { const vipLabelMap: any = { free: "免费版", - vip: "专业版", + plus: "专业版", comm: "商业版" }; - return vipLabelMap[this.plusInfo?.vipType]; + return vipLabelMap[this.plusInfo?.vipType || "free"]; } }, actions: { diff --git a/packages/ui/certd-client/src/views/certd/history/crud.tsx b/packages/ui/certd-client/src/views/certd/history/crud.tsx index d2b0edca..2402fd42 100644 --- a/packages/ui/certd-client/src/views/certd/history/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/history/crud.tsx @@ -100,7 +100,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat column: { show: computed(() => { return userStore.isAdmin && settingStore.sysPublic.managerOtherUserPipeline; - }) + }), + width: 100 } }, pipelineId: { @@ -111,6 +112,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat }, form: { show: false + }, + column: { + width: 100 } }, pipelineTitle: { @@ -123,7 +127,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat } }, column: { - width: 200 + width: 300 } }, createTime: { @@ -134,7 +138,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat }, column: { sorter: true, - width: 125, + width: 160, align: "center" } }, diff --git a/packages/ui/certd-client/src/views/sys/site/api.ts b/packages/ui/certd-client/src/views/sys/site/api.ts index 719cc3af..b7159acc 100644 --- a/packages/ui/certd-client/src/views/sys/site/api.ts +++ b/packages/ui/certd-client/src/views/sys/site/api.ts @@ -1,43 +1,20 @@ // @ts-ignore import { request } from "/src/api/service"; -const apiPrefix = "/sys/settings"; +const apiPrefix = "/sys/site"; -export const SettingKeys = { - SysPublic: "sys.public", - SysPrivate: "sys.private" -}; export async function SettingsGet(key: string) { return await request({ url: apiPrefix + "/get", - method: "post", - params: { - key - } + method: "post" }); } -export async function SettingsSave(key: string, setting: any) { +export async function SettingsSave(setting: any) { await request({ url: apiPrefix + "/save", method: "post", data: { - key, setting: JSON.stringify(setting) } }); } - -export async function PublicSettingsSave(setting: any) { - await request({ - url: apiPrefix + "/savePublicSettings", - method: "post", - data: setting - }); -} - -export async function stopOtherUserTimer() { - await request({ - url: apiPrefix + "/stopOtherUserTimer", - method: "post" - }); -} diff --git a/packages/ui/certd-server/src/modules/account/account-controller.ts b/packages/ui/certd-server/src/modules/account/account-controller.ts index d01291e9..110b5e24 100644 --- a/packages/ui/certd-server/src/modules/account/account-controller.ts +++ b/packages/ui/certd-server/src/modules/account/account-controller.ts @@ -1,6 +1,5 @@ import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core'; -import { BaseController } from '@certd/lib-server'; -import { PlusService } from '../basic/service/plus-service.js'; +import { BaseController, PlusService } from '@certd/lib-server'; import { AppKey } from '@certd/pipeline'; import { SysSettingsService } from '@certd/lib-server'; import { SysInstallInfo } from '@certd/lib-server'; diff --git a/packages/ui/certd-server/src/modules/auto/auto-init-site.ts b/packages/ui/certd-server/src/modules/auto/auto-init-site.ts index 915de0b8..9b42f015 100644 --- a/packages/ui/certd-server/src/modules/auto/auto-init-site.ts +++ b/packages/ui/certd-server/src/modules/auto/auto-init-site.ts @@ -1,11 +1,10 @@ import { Autoload, Config, Init, Inject, Scope, ScopeEnum } from '@midwayjs/core'; import { logger } from '@certd/pipeline'; import { UserService } from '../authority/service/user-service.js'; -import { SysSettingsService } from '@certd/lib-server'; +import { PlusService, SysSettingsService } from '@certd/lib-server'; import { nanoid } from 'nanoid'; import { SysInstallInfo, SysPrivateSettings } from '@certd/lib-server'; import crypto from 'crypto'; -import { PlusService } from '../basic/service/plus-service.js'; export type InstallInfo = { installTime: number; diff --git a/packages/ui/certd-server/src/modules/auto/auto-register-cron.ts b/packages/ui/certd-server/src/modules/auto/auto-register-cron.ts index 16cd2aaf..51029a71 100644 --- a/packages/ui/certd-server/src/modules/auto/auto-register-cron.ts +++ b/packages/ui/certd-server/src/modules/auto/auto-register-cron.ts @@ -23,7 +23,6 @@ export class AutoRegisterCron { @Init() async init() { logger.info('加载定时trigger开始'); - await this.pipelineService.onStartup(this.immediateTriggerOnce, this.onlyAdminUser); logger.info('加载定时trigger完成'); // diff --git a/packages/ui/certd-server/src/modules/pipeline/controller/history-controller.ts b/packages/ui/certd-server/src/modules/pipeline/controller/history-controller.ts index ce282d42..3052d3cd 100644 --- a/packages/ui/certd-server/src/modules/pipeline/controller/history-controller.ts +++ b/packages/ui/certd-server/src/modules/pipeline/controller/history-controller.ts @@ -10,6 +10,7 @@ import * as fs from 'fs'; import { logger } from '@certd/pipeline'; import { AuthService } from '../../authority/service/auth-service.js'; import { SysSettingsService } from '@certd/lib-server'; +import { In } from 'typeorm'; /** * 证书 @@ -35,16 +36,34 @@ export class HistoryController extends CrudController { } @Post('/page', { summary: Constants.per.authOnly }) - async page(@Body(ALL) body) { + async page(@Body(ALL) body: any) { const isAdmin = await this.authService.isAdmin(this.ctx); const publicSettings = await this.sysSettingsService.getPublicSettings(); + const pipelineQuery: any = {}; if (!(publicSettings.managerOtherUserPipeline && isAdmin)) { body.query.userId = this.ctx.user.id; + pipelineQuery.userId = this.ctx.user.id; } - const res = await super.page(body); + let pipelineIds: any = null; + const pipelineTitle = body.query?.pipelineTitle; + if (pipelineTitle) { + const pipelines = await this.pipelineService.list(pipelineQuery, null, qb => { + qb.where('title like :title', { title: `%${pipelineTitle}%` }); + }); + pipelineIds = pipelines.map(p => p.id); + } - return res; + const buildQuery = qb => { + if (pipelineIds) { + qb.where({ + pipelineId: In(pipelineIds), + }); + } + }; + + const res = await this.service.page(body?.query, body?.page, body?.sort, buildQuery); + return this.ok(res); } @Post('/list', { summary: Constants.per.authOnly }) diff --git a/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts index 93060d9c..49d1f7d2 100644 --- a/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts +++ b/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts @@ -18,6 +18,9 @@ import { logger } from '@certd/pipeline'; export class HistoryService extends BaseService { @InjectEntityModel(HistoryEntity) repository: Repository; + + @InjectEntityModel(PipelineEntity) + pipelineRepository: Repository; @Inject() logService: HistoryLogService; diff --git a/packages/ui/certd-server/tsconfig.json b/packages/ui/certd-server/tsconfig.json index 25ab4c0e..a1f4e698 100644 --- a/packages/ui/certd-server/tsconfig.json +++ b/packages/ui/certd-server/tsconfig.json @@ -26,13 +26,5 @@ "dist", "node_modules", "test" - ], - "references": [ - { "path": "../../libs/midway-flyway-js" }, - { "path": "../../libs/lib-k8s" }, - { "path": "../../libs/lib-huawei" }, - { "path": "../../plugins/plugin-cert" }, - { "path": "../../core/acme-client" }, - { "path": "../../core/pipeline" } ] } diff --git a/step.md b/step.md index 321a0b57..7a6d1864 100644 --- a/step.md +++ b/step.md @@ -13,19 +13,19 @@ ## 自动化流水线创建 ### 1. 创建证书申请部署流水线 -![创建证书申请任务](./packages/ui/certd-client/src/assets/doc/images/1-add.png) +![创建证书申请任务](packages/ui/certd-client/public/statics/doc/images/1-add.png) 需要添加域名的DNS解析服务商的授权 -![添加域名的DNS解析服务商的授权](./packages/ui/certd-client/src/assets/doc/images/2-access-provider.png) +![添加域名的DNS解析服务商的授权](packages/ui/certd-client/public/statics/doc/images/2-access-provider.png) 填写accessKey和accessSecret -![](./packages/ui/certd-client/src/assets/doc/images/3-add-access.png) +![](packages/ui/certd-client/public/statics/doc/images/3-add-access.png) 流水线创建成功 -![](./packages/ui/certd-client/src/assets/doc/images/4-add-success.png) +![](packages/ui/certd-client/public/statics/doc/images/4-add-success.png) ### 2. 任务详情界面 -![](./packages/ui/certd-client/src/assets/doc/images/5-view.png) +![](packages/ui/certd-client/public/statics/doc/images/5-view.png) 到这一步申请证书就已经配置完成了。 点击手动触发，就可以申请证书了。 @@ -34,72 +34,72 @@ ### 3. 添加部署到阿里云CDN任务 点击添加任务 -![](./packages/ui/certd-client/src/assets/doc/images/6-1-add-task.png) +![](packages/ui/certd-client/public/statics/doc/images/6-1-add-task.png) 选择任务类型 -![](./packages/ui/certd-client/src/assets/doc/images/6-2-add-task.png) +![](packages/ui/certd-client/public/statics/doc/images/6-2-add-task.png) 填写任务参数 -![](./packages/ui/certd-client/src/assets/doc/images/6-3-add-task.png) +![](packages/ui/certd-client/public/statics/doc/images/6-3-add-task.png) 点击确定，部署到CDN任务配置成功 ### 4. 添加部署到服务器主机任务 点击新任务，弹出添加任务界面 -![](./packages/ui/certd-client/src/assets/doc/images/7-1-add-host-task.png) +![](packages/ui/certd-client/public/statics/doc/images/7-1-add-host-task.png) 先选择上传到主机任务 填写任务参数，比如证书保存路径 -![](./packages/ui/certd-client/src/assets/doc/images/7-2-add-host-task.png) +![](packages/ui/certd-client/public/statics/doc/images/7-2-add-host-task.png) 需要添加主机ip、用户名、密码，只需添加一次，后续其他任务可以复用 -![](./packages/ui/certd-client/src/assets/doc/images/7-3-add-host-task.png) +![](packages/ui/certd-client/public/statics/doc/images/7-3-add-host-task.png) 然后添加第二个任务，执行主机命令，部署证书 -![](./packages/ui/certd-client/src/assets/doc/images/8-1-add-host-task.png) +![](packages/ui/certd-client/public/statics/doc/images/8-1-add-host-task.png) 选择执行脚本命令任务 -![](./packages/ui/certd-client/src/assets/doc/images/8-2-add-host-task.png) +![](packages/ui/certd-client/public/statics/doc/images/8-2-add-host-task.png) 编写脚本，选择之前添加的主机 -![](./packages/ui/certd-client/src/assets/doc/images/8-4-add-host-task.png) +![](packages/ui/certd-client/public/statics/doc/images/8-4-add-host-task.png) 点击确定，部署到主机任务配置成功 -![](./packages/ui/certd-client/src/assets/doc/images/8-5-add-host-task.png) +![](packages/ui/certd-client/public/statics/doc/images/8-5-add-host-task.png) ### 5. 手动触发执行任务，测试一下 -![](./packages/ui/certd-client/src/assets/doc/images/9-start.png) +![](packages/ui/certd-client/public/statics/doc/images/9-start.png) 点击任务可以查看状态和日志 -![](./packages/ui/certd-client/src/assets/doc/images/10-1-log.png) +![](packages/ui/certd-client/public/statics/doc/images/10-1-log.png) 这里执行失败，可以查看错误日志 -![](./packages/ui/certd-client/src/assets/doc/images/11-1-error.png) -![](./packages/ui/certd-client/src/assets/doc/images/11-2-error.png) +![](packages/ui/certd-client/public/statics/doc/images/11-1-error.png) +![](packages/ui/certd-client/public/statics/doc/images/11-2-error.png) 修改正确后，重新执行 -![](./packages/ui/certd-client/src/assets/doc/images/12-1-log-success.png) +![](packages/ui/certd-client/public/statics/doc/images/12-1-log-success.png) 可以看到前面执行过的就会跳过，不会重复执行 -![](./packages/ui/certd-client/src/assets/doc/images/12-2-skip-log.png) +![](packages/ui/certd-client/public/statics/doc/images/12-2-skip-log.png) ### 6. 查看证书部署效果 可以看到证书已经部署到CDN成功 -![](./packages/ui/certd-client/src/assets/doc/images/13-1-result.png) -![](./packages/ui/certd-client/src/assets/doc/images/13-2-result.png) +![](packages/ui/certd-client/public/statics/doc/images/13-1-result.png) +![](packages/ui/certd-client/public/statics/doc/images/13-2-result.png) 也可以手动下载证书 -![](./packages/ui/certd-client/src/assets/doc/images/13-3-download.png) +![](packages/ui/certd-client/public/statics/doc/images/13-3-download.png) ### 7. 定时触发 配置定时触发，以后每天定时执行 cron格式，例如： `0 0 3 * * *` 表示每天凌晨3点执行 到期前20天会自动申请新证书并部署，没到期前不会重复申请 -![](./packages/ui/certd-client/src/assets/doc/images/14-timer.png) +![](packages/ui/certd-client/public/statics/doc/images/14-timer.png) ### 8. 邮件通知 可以接收邮件通知（支持时机：开始、成功、失败、失败转成功） -![](./packages/ui/certd-client/src/assets/doc/images/15-1-email.png) +![](packages/ui/certd-client/public/statics/doc/images/15-1-email.png) 需要配置邮件服务器 -![](./packages/ui/certd-client/src/assets/doc/images/15-2-email.png) +![](packages/ui/certd-client/public/statics/doc/images/15-2-email.png)