diff --git a/packages/ui/certd-client/public/static/doc/images/1-add.png b/packages/ui/certd-client/public/static/doc/images/1-add.png index 2deaf39a..65e487c6 100644 Binary files a/packages/ui/certd-client/public/static/doc/images/1-add.png and b/packages/ui/certd-client/public/static/doc/images/1-add.png differ diff --git a/packages/ui/certd-client/public/static/doc/images/10-1-log.png b/packages/ui/certd-client/public/static/doc/images/10-1-log.png index 507d36dc..d9f76837 100644 Binary files a/packages/ui/certd-client/public/static/doc/images/10-1-log.png and b/packages/ui/certd-client/public/static/doc/images/10-1-log.png differ diff --git a/packages/ui/certd-client/public/static/doc/images/11-1-error.png b/packages/ui/certd-client/public/static/doc/images/11-1-error.png index dc9f8c0f..36a29db6 100644 Binary files a/packages/ui/certd-client/public/static/doc/images/11-1-error.png and b/packages/ui/certd-client/public/static/doc/images/11-1-error.png differ diff --git a/packages/ui/certd-client/public/static/doc/images/11-2-error.png b/packages/ui/certd-client/public/static/doc/images/11-2-error.png index 7fb4e895..46d5b5af 100644 Binary files a/packages/ui/certd-client/public/static/doc/images/11-2-error.png and b/packages/ui/certd-client/public/static/doc/images/11-2-error.png differ diff --git a/packages/ui/certd-client/public/static/doc/images/12-1-log-success.png b/packages/ui/certd-client/public/static/doc/images/12-1-log-success.png index fd8d2c61..1e858962 100644 Binary files a/packages/ui/certd-client/public/static/doc/images/12-1-log-success.png and b/packages/ui/certd-client/public/static/doc/images/12-1-log-success.png differ diff --git a/packages/ui/certd-client/public/static/doc/images/12-2-skip-log.png b/packages/ui/certd-client/public/static/doc/images/12-2-skip-log.png index cca26b3c..3bd46cc9 100644 Binary files a/packages/ui/certd-client/public/static/doc/images/12-2-skip-log.png and b/packages/ui/certd-client/public/static/doc/images/12-2-skip-log.png differ diff --git a/packages/ui/certd-client/public/static/doc/images/13-1-result.png b/packages/ui/certd-client/public/static/doc/images/13-1-result.png index 04feadda..5cb7ab95 100644 Binary files a/packages/ui/certd-client/public/static/doc/images/13-1-result.png and b/packages/ui/certd-client/public/static/doc/images/13-1-result.png differ diff --git a/packages/ui/certd-client/public/static/doc/images/13-3-download.png b/packages/ui/certd-client/public/static/doc/images/13-3-download.png index 3a4a0cb7..c7dcf820 100644 Binary files a/packages/ui/certd-client/public/static/doc/images/13-3-download.png and b/packages/ui/certd-client/public/static/doc/images/13-3-download.png differ diff --git a/packages/ui/certd-client/public/static/doc/images/14-timer.png b/packages/ui/certd-client/public/static/doc/images/14-timer.png index f4612c56..4f507127 100644 Binary files a/packages/ui/certd-client/public/static/doc/images/14-timer.png and b/packages/ui/certd-client/public/static/doc/images/14-timer.png differ diff --git a/packages/ui/certd-client/public/static/doc/images/3-add-access.png b/packages/ui/certd-client/public/static/doc/images/3-add-access.png deleted file mode 100644 index 563c95b6..00000000 Binary files a/packages/ui/certd-client/public/static/doc/images/3-add-access.png and /dev/null differ diff --git a/packages/ui/certd-client/public/static/doc/images/3-add-success.png b/packages/ui/certd-client/public/static/doc/images/3-add-success.png new file mode 100644 index 00000000..03467d71 Binary files /dev/null and b/packages/ui/certd-client/public/static/doc/images/3-add-success.png differ diff --git a/packages/ui/certd-client/public/static/doc/images/4-add-success.png b/packages/ui/certd-client/public/static/doc/images/4-add-success.png deleted file mode 100644 index 57ecf83b..00000000 Binary files a/packages/ui/certd-client/public/static/doc/images/4-add-success.png and /dev/null differ diff --git a/packages/ui/certd-client/public/static/doc/images/5-1-add-host.png b/packages/ui/certd-client/public/static/doc/images/5-1-add-host.png new file mode 100644 index 00000000..35297a3f Binary files /dev/null and b/packages/ui/certd-client/public/static/doc/images/5-1-add-host.png differ diff --git a/packages/ui/certd-client/public/static/doc/images/5-2-add-host.png b/packages/ui/certd-client/public/static/doc/images/5-2-add-host.png new file mode 100644 index 00000000..875f6956 Binary files /dev/null and b/packages/ui/certd-client/public/static/doc/images/5-2-add-host.png differ diff --git a/packages/ui/certd-client/public/static/doc/images/5-3-add-host.png b/packages/ui/certd-client/public/static/doc/images/5-3-add-host.png new file mode 100644 index 00000000..02b2003c Binary files /dev/null and b/packages/ui/certd-client/public/static/doc/images/5-3-add-host.png differ diff --git a/packages/ui/certd-client/public/static/doc/images/5-4-add-host.png b/packages/ui/certd-client/public/static/doc/images/5-4-add-host.png new file mode 100644 index 00000000..47464c6a Binary files /dev/null and b/packages/ui/certd-client/public/static/doc/images/5-4-add-host.png differ diff --git a/packages/ui/certd-client/public/static/doc/images/5-5-plugin-list.png b/packages/ui/certd-client/public/static/doc/images/5-5-plugin-list.png new file mode 100644 index 00000000..8de28a53 Binary files /dev/null and b/packages/ui/certd-client/public/static/doc/images/5-5-plugin-list.png differ diff --git a/packages/ui/certd-client/public/static/doc/images/9-start.png b/packages/ui/certd-client/public/static/doc/images/9-start.png index 18028bb5..fd507acf 100644 Binary files a/packages/ui/certd-client/public/static/doc/images/9-start.png and b/packages/ui/certd-client/public/static/doc/images/9-start.png differ diff --git a/packages/ui/certd-client/public/static/icons/demo_index.html b/packages/ui/certd-client/public/static/icons/demo_index.html index 2e018521..cda06fa1 100644 --- a/packages/ui/certd-client/public/static/icons/demo_index.html +++ b/packages/ui/certd-client/public/static/icons/demo_index.html @@ -6,9 +6,9 @@ - - - + + + @@ -38,7 +38,7 @@

- +

    - + +
  • + +
    华为
    +
    
    +
  • +
  • qiniuyun
    
  • - +
  • aliyun
    
  • - +
  • 腾讯云
    
  • - +
  • doge
    
  • - +
  • bt
    
  • - +

Unicode 引用

@@ -102,7 +108,7 @@
@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.svg?t=1727153857332#iconfont') format('svg');
+  src: url('iconfont.svg?t=1730278432006#iconfont') format('svg');
 }
 

第二步:定义使用 iconfont 的样式

@@ -127,7 +133,16 @@
    - + +
  • + +
    + 华为 +
    +
    .icon-huawei +
    +
  • +
  • @@ -136,7 +151,7 @@
    .icon-qiniuyun
  • - +
  • @@ -145,7 +160,7 @@
    .icon-aliyun
  • - +
  • @@ -154,7 +169,7 @@
    .icon-tencentcloud
  • - +
  • @@ -163,7 +178,7 @@
    .icon-dogecloud
  • - +
  • @@ -172,7 +187,7 @@
    .icon-bt
  • - +

font-class 引用

@@ -199,7 +214,15 @@
    - + +
  • + +
    华为
    +
    #icon-huawei
    +
  • +
  • qiniuyun
    #icon-qiniuyun
  • - +
  • aliyun
    #icon-aliyun
  • - +
  • 腾讯云
    #icon-tencentcloud
  • - +
  • doge
    #icon-dogecloud
  • - +
  • bt
    #icon-bt
  • - +

Symbol 引用

diff --git a/packages/ui/certd-client/public/static/icons/iconfont.css b/packages/ui/certd-client/public/static/icons/iconfont.css index 6c7f524a..748656a7 100644 --- a/packages/ui/certd-client/public/static/icons/iconfont.css +++ b/packages/ui/certd-client/public/static/icons/iconfont.css @@ -1,6 +1,6 @@ @font-face { font-family: "iconfont"; /* Project id 4688792 */ - src: url('iconfont.svg?t=1727153857332#iconfont') format('svg'); + src: url('iconfont.svg?t=1730278432006#iconfont') format('svg'); } .iconfont { @@ -11,6 +11,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-huawei:before { + content: "\e610"; +} + .icon-qiniuyun:before { content: "\e603"; } diff --git a/packages/ui/certd-client/public/static/icons/iconfont.js b/packages/ui/certd-client/public/static/icons/iconfont.js index 4106c7ce..e99de337 100644 --- a/packages/ui/certd-client/public/static/icons/iconfont.js +++ b/packages/ui/certd-client/public/static/icons/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_4688792='',(e=>{var t=(c=(c=document.getElementsByTagName("script"))[c.length-1]).getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var l,a,i,n,o,d=function(t,c){c.parentNode.insertBefore(t,c)};if(t&&!e.__iconfont__svg__cssinject__){e.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(t){console&&console.log(t)}}l=function(){var t,c=document.createElement("div");c.innerHTML=e._iconfont_svg_string_4688792,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(t=document.body).firstChild?d(c,t.firstChild):t.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),l()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(i=l,n=e.document,o=!1,s(),n.onreadystatechange=function(){"complete"==n.readyState&&(n.onreadystatechange=null,h())})}function h(){o||(o=!0,i())}function s(){try{n.documentElement.doScroll("left")}catch(t){return void setTimeout(s,50)}h()}})(window); \ No newline at end of file +window._iconfont_svg_string_4688792='',(e=>{var t=(c=(c=document.getElementsByTagName("script"))[c.length-1]).getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var l,a,i,n,o,d=function(t,c){c.parentNode.insertBefore(t,c)};if(t&&!e.__iconfont__svg__cssinject__){e.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(t){console&&console.log(t)}}l=function(){var t,c=document.createElement("div");c.innerHTML=e._iconfont_svg_string_4688792,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(t=document.body).firstChild?d(c,t.firstChild):t.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),l()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(i=l,n=e.document,o=!1,s(),n.onreadystatechange=function(){"complete"==n.readyState&&(n.onreadystatechange=null,h())})}function h(){o||(o=!0,i())}function s(){try{n.documentElement.doScroll("left")}catch(t){return void setTimeout(s,50)}h()}})(window); \ No newline at end of file diff --git a/packages/ui/certd-client/public/static/icons/iconfont.json b/packages/ui/certd-client/public/static/icons/iconfont.json index 4478cead..d70e57b1 100644 --- a/packages/ui/certd-client/public/static/icons/iconfont.json +++ b/packages/ui/certd-client/public/static/icons/iconfont.json @@ -5,6 +5,13 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "24164616", + "name": "华为", + "font_class": "huawei", + "unicode": "e610", + "unicode_decimal": 58896 + }, { "icon_id": "9612999", "name": "qiniuyun", diff --git a/packages/ui/certd-client/public/static/icons/iconfont.svg b/packages/ui/certd-client/public/static/icons/iconfont.svg index 899cdaf2..0f3f761c 100644 --- a/packages/ui/certd-client/public/static/icons/iconfont.svg +++ b/packages/ui/certd-client/public/static/icons/iconfont.svg @@ -14,7 +14,9 @@ /> - + + + diff --git a/packages/ui/certd-client/src/components/tutorial/tutorial-steps.vue b/packages/ui/certd-client/src/components/tutorial/tutorial-steps.vue index bdd2fbaf..6c7da607 100644 --- a/packages/ui/certd-client/src/components/tutorial/tutorial-steps.vue +++ b/packages/ui/certd-client/src/components/tutorial/tutorial-steps.vue @@ -31,7 +31,7 @@ type Step = { items: StepItems[]; }; type StepItems = { - image: string; + image?: string; title: string; descriptions?: string[]; }; @@ -56,22 +56,7 @@ const steps = ref([ descriptions: ["点击添加证书流水线,填写证书申请信息"] }, { - image: "/static/doc/images/2-access-provider.png", - title: "DNS授权", - descriptions: ["证书申请需要给域名添加TXT解析记录来验证域名所有权", "根据你的域名注册商,选择对应的平台授权"] - }, - { - image: "/static/doc/images/3-add-access.png", - title: "第一次使用,需要添加DNS授权", - descriptions: ["选择DNS授权,确认创建"] - }, - // { - // image: "/static/doc/images/3-add-access.png", - // title: "确定创建流水线", - // descriptions: ["选择DNS授权,信息填写无误,确认创建"] - // }, - { - image: "/static/doc/images/4-add-success.png", + image: "/static/doc/images/3-add-success.png", title: "流水线创建成功", descriptions: ["此时证书申请任务已经建好", "点击手动触发即可测试证书申请", "接下来演示如何添加部署任务"] } @@ -79,57 +64,32 @@ const steps = ref([ }, { title: "添加部署证书任务", - description: "演示部署到阿里云CDN和Nginx", + description: "演示部署到主机上的Nginx", items: [ { - image: "/static/doc/images/6-1-add-task.png", - title: "添加部署任务", - descriptions: ["演示第一个部署任务,部署到阿里云CDN"] + image: "/static/doc/images/5-1-add-host.png", + title: "添加nginx部署任务", + descriptions: ["演示第一个部署任务,部署到nginx"] }, { - image: "/static/doc/images/6-2-add-task.png", - title: "选择任务插件", - descriptions: ["可以搜索插件,这里选择阿里云CDN插件"] + image: "/static/doc/images/5-2-add-host.png", + title: "填写任务参数", + descriptions: ["填写主机上证书文件的路径", "选择主机ssh登录授权"] }, { - image: "/static/doc/images/6-3-add-task.png", - title: "配置任务参数", - descriptions: ["填写CDN的域名和证书ID", "任务保存之后,阿里云CDN的部署任务就配置好了"] + image: "/static/doc/images/5-3-add-host.png", + title: "让新证书生效", + descriptions: ["执行重启脚本", "让证书生效"] }, { - image: "/static/doc/images/7-1-add-host-task.png", - title: "添加主机部署任务", - descriptions: ["接下来演示配置第二个部署任务,部署到主机", "部署到主机分两步: 1. 上传证书到主机 2. 运行主机命令"] + image: "/static/doc/images/5-4-add-host.png", + title: "部署任务添加成功", + descriptions: ["现在可以运行"] }, { - image: "/static/doc/images/7-2-add-host-task.png", - title: "配置上传到主机任务", - descriptions: ["填写上传到主机任务参数", "比如证书保存路径"] - }, - { - image: "/static/doc/images/7-3-add-host-task.png", - title: "添加主机ssh登录授权", - descriptions: ["填写主机ip、用户名、密码,授权只需添加一次,后续其他任务可以复用"] - }, - { - image: "/static/doc/images/8-1-add-host-task.png", - title: "上传到主机任务配置完成", - descriptions: ["接下来配置主机执行脚本,去部署证书"] - }, - { - image: "/static/doc/images/8-2-add-host-task.png", - title: "选择添加主机远程命令任务", - descriptions: ["选择主机远程命令任务"] - }, - { - image: "/static/doc/images/8-4-add-host-task.png", - title: "填写证书部署脚本", - descriptions: ["选择主机授权,编写部署脚本,这里演示部署到nginx,需要重启nginx,让证书生效"] - }, - { - image: "/static/doc/images/8-5-add-host-task.png", - title: "上传到主机任务的两个步骤配置完成", - descriptions: ["接下来测试运行"] + image: "/static/doc/images/5-5-plugin-list.png", + title: "还可以添加其他更多部署任务", + descriptions: ["插件列表"] } ] }, @@ -172,11 +132,6 @@ const steps = ref([ title: "查看证书部署成功", descriptions: ["访问nginx上的网站,可以看到证书已经部署成功"] }, - { - image: "/static/doc/images/13-2-result.png", - title: "阿里云CDN也部署成功", - descriptions: ["阿里云CDN上已经更新证书,证书名称已certd开头"] - }, { image: "/static/doc/images/13-3-download.png", title: "还可以下载证书,手动部署", diff --git a/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue b/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue index 895daf07..43f21664 100644 --- a/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue +++ b/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue @@ -14,24 +14,43 @@
- - + + - - - - + - - + + - - + +
+ +
+ + + + + +
+
+ +
+
+
{{ item.title }}
+
+
+
+
+
+
+
@@ -42,14 +61,26 @@ defineOptions({ name: "DashboardUser" }); import { useUserStore } from "/@/store/modules/user"; -import { computed, ref } from "vue"; +import { computed, onMounted, ref } from "vue"; import dayjs from "dayjs"; import StatisticCard from "/@/views/framework/home/dashboard/statistic-card.vue"; +import * as pluginApi from "/@/views/certd/pipeline/api.plugin"; +import { PluginGroups } from "/@/views/certd/pipeline/pipeline/type"; const userStore = useUserStore(); const now = computed(() => { return dayjs().format("YYYY-MM-DD HH:mm:ss"); }); + +async function getPluginGroups() { + const groups = await pluginApi.GetGroups({}); + return new PluginGroups(groups); +} + +const pluginGroups = ref(); +onMounted(async () => { + pluginGroups.value = await getPluginGroups(); +}); diff --git a/packages/ui/certd-client/src/views/framework/home/dashboard/statistic-card.vue b/packages/ui/certd-client/src/views/framework/home/dashboard/statistic-card.vue index 7318c22e..6b6a66dd 100644 --- a/packages/ui/certd-client/src/views/framework/home/dashboard/statistic-card.vue +++ b/packages/ui/certd-client/src/views/framework/home/dashboard/statistic-card.vue @@ -26,6 +26,7 @@ const props = defineProps<{