v1.20.2

# Conflicts:
#	packages/ui/certd-client/CHANGELOG.md
#	packages/ui/certd-client/package.json

.gitignore

@@ -1,3 +1,4 @@
+./packages/core/lego
 # IntelliJ project files
 .vscode/
 node_modules/
@@ -32,3 +33,4 @@ gen
 /pnpm-lock.yaml
 
 docker/image/workspace
+/packages/core/lego

CHANGELOG.md

@@ -3,6 +3,51 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.2](https://github.com/certd/certd/compare/v1.2.1...v1.20.2) (2024-02-28)
+
+### Bug Fixes
+
+* 临时修复阿里云domainlist接口返回域名列表不全的问题，后续还需要增加翻页查询 ([849c145](https://github.com/certd/certd/commit/849c145926984762bd9dbec87bd91cd047fc0855))
+
+## [1.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12)
+
+### Bug Fixes
+
+* 修复邮箱设置无效的bug ([aaa3224](https://github.com/certd/certd/commit/aaa322464d0f65e924d1850995540d396ee24d25))
+
+**Note:** Version bump only for package root
+
+# [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27)
+
+* 🔱: [client] sync upgrade with 2 commits [trident-sync] ([aa3207f](https://github.com/certd/certd/commit/aa3207fca5f15f7c3da789989d99c8ae7d1c4551))
+
+### BREAKING CHANGES
+
+* search支持自定义布局，search.layout、search.collapse转移到 search.container之下。如果想使用原来的search组件，请配置search.is=fs-search-v1
+
+## [1.1.6](https://github.com/certd/certd/compare/v1.1.5...v1.1.6) (2023-07-10)
+
+### Bug Fixes
+
+* 修复上传证书到腾讯云失败的bug ([e950322](https://github.com/certd/certd/commit/e950322232e19d1263b8552eefa5b0150fd7864e))
+
+## [1.1.5](https://github.com/certd/certd/compare/v1.1.4...v1.1.5) (2023-07-03)
+
+**Note:** Version bump only for package root
+
+## [1.1.4](https://github.com/certd/certd/compare/v1.1.3...v1.1.4) (2023-07-03)
+
+### Bug Fixes
+
+* 成功图标转动的问题 ([f87eee3](https://github.com/certd/certd/commit/f87eee3b9ff1ef9874e79a81fe0ed7104cb9ee8c))
+
+### Performance Improvements
+
+* cancel task ([bc65c0a](https://github.com/certd/certd/commit/bc65c0a786360c087fe95cad93ec6a87804cc5ee))
+* flush log ([891a43a](https://github.com/certd/certd/commit/891a43ae6716ff98ed06643f7da2e35199ee195c))
+* flush logger ([91be682](https://github.com/certd/certd/commit/91be6826b902e0f302b1a6cbdb1d24e15914c18d))
+* timeout ([3eeb1f7](https://github.com/certd/certd/commit/3eeb1f77aa2922f3545f3d2067f561d95621d54f))
+
 ## [1.1.3](https://github.com/certd/certd/compare/v1.1.2...v1.1.3) (2023-07-03)
 
 **Note:** Version bump only for package root

README.md

@@ -1,140 +1,125 @@
 # CertD
 
-CertD 是一个帮助你全自动申请和部署SSL证书的工具。       
+CertD 是一个免费全自动申请和部署SSL证书的工具。       
 后缀D取自linux守护进程的命名风格，意为证书守护进程。    
 
-## 特性
+## 一、特性
 本项目不仅支持证书申请过程自动化，还可以自动化部署证书，让你的证书永不过期。     
 
 * 全自动申请证书（支持阿里云、腾讯云、华为云注册的域名）
-* 全自动部署证书（目前支持服务器上传部署、阿里云、腾讯云等）
+* 全自动部署证书（目前支持服务器上传部署、部署到阿里云、腾讯云等）
 * 支持通配符域名
 * 支持多个域名打到一个证书上
+* 邮件通知
+* 证书自动更新
+* 免费、免费、免费（[阿里云单个通配符域名证书最便宜也要1800/年](https://yundun.console.aliyun.com/?p=cas#/certExtend/buy/cn-hangzhou)）
+
+
+
+## 二、在线体验
+
+官方Demo地址，自助注册后体验    
+
+https://certd.handsfree.work/
+
+> 注意数据将不定期清理，生产使用请自行部署    
+> 包含敏感信息，务必自己本地部署进行生产使用
+
+## 三、使用教程
+本案例演示，如何配置自动申请证书，并部署到阿里云CDN，然后快要到期前自动更新证书并重新部署     
+
+![演示](./doc/images/5-view.png)
+![演示](./doc/images/9-start.png)
+![演示](./doc/images/10-1-log.png)
+![演示](./doc/images/13-3-download.png)
+![演示](./doc/images/13-1-result.png)
+
+↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓      
+-------> [点我查看详细使用步骤演示](./step.md)   <--------      
+↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑     
+
+## 四、本地docker部署
+
+### 1. 安装docker、docker-compose
+
+1.1 安装docker    
+https://docs.docker.com/engine/install/
+
+1.2 安装docker-compose     
+https://docs.docker.com/compose/install/linux/
+
+### 2. 下载docker-compose.yaml文件
+```bash
+mkdir certd
+cd certd
+wget https://raw.githubusercontent.com/certd/certd/v2/docker/run/docker-compose.yaml
+# 或者使用gitee地址
+wget https://gitee.com/certd/certd/raw/v2/docker/run/docker-compose.yaml
+
+# 根据需要修改里面的配置
+# 1.修改镜像版本号
+# 2.配置数据保存路径
+# 3.配置certd_auth_jwt_secret
+vi docker-compose.yaml
+
+
+```
+> 镜像版本号与release版本号同步：    
+https://github.com/certd/certd/releases
+
+
+### 3. 运行
+```bash
+# 如果docker compose是插件化安装
+export CERTD_VERSION=1.2.0
+docker compose up -d
+
+#如果docker compose是独立安装
+export CERTD_VERSION=1.2.0
+docker-compose up -d
+
+```
+### 4. 访问
+
+http://your_server_ip:7001 
+默认账号密码：admin/123456 
+记得修改密码
+
+
+## 五、一些说明
 
-## 免费证书申请说明
 * 本项目ssl证书提供商为letencrypt
 * 申请过程遵循acme协议
-* 需要验证域名所有权，一般有两种方式（目前本项目仅支持dns-01）      
-  * http-01： 在网站根目录下放置一份txt文件     
-  * dns-01： 需要给域名添加txt解析记录，泛域名只能用这种方式   
+* 需要验证域名所有权，一般有两种方式（目前本项目仅支持dns-01）
+  * http-01： 在网站根目录下放置一份txt文件
+  * dns-01： 需要给域名添加txt解析记录，通配符域名只能用这种方式
 * 证书续期：
   * 实际上acme并没有续期概念。
   * 我们所说的续期，其实就是按照全套流程重新申请一份新证书。
 * 免费证书过期时间90天，以后可能还会缩短，所以自动化部署必不可少
+* 设置每天自动运行，当证书过期前20天，会自动重新申请证书并部署
+
+## 六、联系作者
+如有疑问，欢迎加入群聊（请备注certd）
+* QQ群：141236433
+* 微信群：   
+  ![](https://ai.handsfree.work/images/exchange_wxqroup.png)
 
 
+加作者好友
+<p align="center">
+<img height="230" src="./doc/images/me.png">
+</p>
 
-## 快速开始
-本案例演示，如何配置自动申请证书，并部署到阿里云CDN，然后快要到期前自动更新证书并重新部署    
+## 捐赠
+媳妇儿说：“一天到晚搞开源，也不管管老婆孩子！😡😡😡”        
+拜托各位捐赠支持一下，让媳妇儿开心开心，我也能有更多时间进行开源项目，感谢🙏🙏🙏
+<p align="center">
+<img height="380" src="./doc/images/donate.png">
+</p>
 
 
-1. 环境准备   
-安装[nodejs](https://nodejs.org/zh-cn/)
-
-
-2. 生成node项目
-
-  通过ui生成： https://certd.docmirror.cn/
-  
-开始生成证书，先填写域名，支持将多个域名打到一个证书上
-![](./doc/step1.png)
-
-配置证书详细信息
-![](./doc/step2.png)
-
-配置证书部署流程
-![](./doc/step3.png)
-
-配置好之后，点击导出按钮，导出一个node项目包
-
-4. 运行    
-将导出的压缩包解压，然后执行如下命令，即可开始申请证书并部署
-```
-npm install
-npm run certd
-```
-5. 执行效果
-生成的证书默认会存储在 `${home}/.certd/${email}/certs/${domain}/current`目录下 
-```
-[2021-01-08T16:15:04.681] [INFO] certd - 任务完成
-[2021-01-08T16:15:04.681] [INFO] certd - ---------------------------任务结果总览--------------------------
-[2021-01-08T16:15:04.682] [INFO] certd - 【更新证书】---------------------------------------	[success] 
-  证书申请成功
-[2021-01-08T16:15:04.682] [INFO] certd - 【流程1-部署到阿里云CDN】----------------------------	[success]  	执行成功
-[2021-01-08T16:15:04.682] [INFO] certd -    └【上传到阿里云】--------------------------------	[success]  	执行成功
-[2021-01-08T16:15:04.682] [INFO] certd -    └【部署证书到CDN】-------------------------------	[success]  	执行成功
-```
-6. 证书续期    
-实际上没有证书续期的概念，只有重新生成一份新的证书，然后重新部署证书    
-所以每天定时运行即可，当证书过期日前20天时，会重新申请新的证书，然后执行部署任务。     
-
-7. 其他说明    
-证书的部署任务执行后会记录执行结果，已经成功过的不会重复执行     
-所以当你临时需要将证书部署到其他地方时，直接追加部署任务，然后再次运行即可
-
-## CI/DI集成与自动续期重新部署
-集成前，将以上导出的node项目提交到内网git仓库，或者私有git仓库（由于包含敏感信息，不要提交到公开git仓库）
-
-### jenkins任务
-1. 创建任务     
-选择构建自由风格的任务     
-
-2. 配置git    
-配置cert-run的git地址     
-
-3. 构建触发器    
-配置 `H 3 * * *` ，每天凌晨3点-4点执行一次
-
-4. 构建环境    
-勾选 `Provide Node & npm bin/ folder to PATH`，提供nodejs运行环境     
-如果没有此选项，需要jenkins安装`nodejs`插件
-
-5. 构建    
-执行shell
-```
-npm install --production   #执行过一次之后，就可以注释掉，加快执行速度
-npm run post
-```
-6. 构建后操作     
-邮件通知   
-配置你的邮箱地址，可以在执行失败时收到邮件通知。
-
-
-## API
-先列个提纲，待完善
-
-参数示例参考：https://gitee.com/certd/certd/blob/master/test/options.js
-
-### 授权提供者
-用于dns验证接口调用
-#### aliyun
-
-#### dnspod
-
-### deploy插件
-部署任务插件
-#### 阿里云
-##### 上传到阿里云
-type = uploadCertToAliyun
-##### 部署到阿里云DNS
-type = deployCertToAliyunCDN
-
-##### 部署到阿里云CLB
-type = deployCertToAliyunCLB
-
-#### 腾讯云
-##### 上传到腾讯云
-type = uploadCertToTencent
-
-##### 部署到腾讯云DNS
-type = deployCertToTencentDNS
-
-##### 部署到腾讯云CLB
-type = deployCertToTencentCLB
-
-##### 部署到腾讯云TKE-ingress
-type = deployCertToTencentTKEIngress
-
-
-### 更多部署插件
-等你来提需求
+## 七、我的其他项目
+* [袖手GPT](https://ai.handsfree.work/) ChatGPT，国内可用，无需FQ，每日免费额度
+* [fast-crud](https://gitee.com/fast-crud/fast-crud/) 基于vue3的crud快速开发框架
+* [dev-sidecar](https://github.com/docmirror/dev-sidecar/) 直连访问github工具，无需FQ，解决github无法访问的问题

deploy.js

@@ -2,9 +2,10 @@ import http from 'axios'
 import fs from 'fs'
 
 //读取 packages/core/pipline/package.json的版本号
-import { default as packageJson } from './packages/core/pipeline/package.json' assert { type: "json" };
+import {default as packageJson} from './packages/core/pipeline/package.json' assert {type: "json"};
+
 const certdVersion = packageJson.version
-console.log("certdVersion",certdVersion)
+console.log("certdVersion", certdVersion)
 
 // 同步npmmirror的包
 async function getPackages(directoryPath) {
@@ -29,18 +30,18 @@ async function getPackages(directoryPath) {
 
 }
 
-async function getAllPackages(){
+async function getAllPackages() {
     const base = await getPackages("./packages/core")
-    const plugins =await getPackages("./packages/plugins")
+    const plugins = await getPackages("./packages/plugins")
 
     return base.concat(plugins)
 }
 
-async function sync(){
+async function sync() {
     const packages = await getAllPackages()
-    for(const pkg of packages){
+    for (const pkg of packages) {
         await http({
-            url: `https://registry-direct.npmmirror.com/@certd/${pkg}/sync?sync_upstream=true`,
+            url: `http://registry-direct.npmmirror.com/@certd/${pkg}/sync?sync_upstream=true`,
             method: 'PUT',
             headers: {
                 "Content-Type": "application/json"
@@ -48,9 +49,8 @@ async function sync(){
             data: {}
         })
         console.log(`sync success:${pkg}`)
-        await sleep(1000)
+        await sleep(10000)
     }
-    await sleep(60000)
 }
 
 // curl -X PUT https://registry-direct.npmmirror.com/@certd/plugin-cert/sync?sync_upstream=true
@@ -65,6 +65,7 @@ async function sleep(time) {
 }
 
 async function triggerBuild() {
+    await sleep(60000)
     for (const webhook of webhooks) {
         await http({
             url: webhook,
@@ -87,6 +88,7 @@ async function start() {
     console.log("等待60秒")
     await sleep(60 * 1000)
     await sync()
+    await sleep(60 * 1000)
     await triggerBuild()
 }
 

docker/image/docker-compose.yaml

@@ -11,4 +11,5 @@ services: # 要拉起的服务们
       - "7001:7001"
     environment:
       - TZ=Asia/Shanghai
+      - node_sqlite3_binary_host_mirror=https://registry.npmmirror.com/-/binary/sqlite3
 

docker/run/build.sh

@@ -1,7 +1,13 @@
 #!/bin/bash
 set -e
-echo "请先输入一个版本号(如 1.0.6)："
-read version
-echo "您输入的版本号是： $version"
-export TAG="$version"
+# 判断$CERTD_VERSION 是否存在
+if [ -n "$CERTD_VERSION" ]; then
+    echo "CERTD_VERSION is set = $CERTD_VERSION"
+else
+    echo "CERTD_VERSION is not set"
+    echo "请先输入一个版本号(如 1.0.6)："
+    read CERTD_VERSION
+fi
+
+echo "您输入的版本号是： $CERTD_VERSION"
 sudo -E docker compose up -d

docker/run/docker-compose.yaml

@@ -1,20 +1,23 @@
-version: '3.3' # 指定docker-compose 版本
-services: # 要拉起的服务们
+version: '3.3'
+services:
   certd:
-#    build:
-#        context: ./
-#        dockerfile: Dockerfile
-#                                                              ↓↓↓↓↓  修改镜像版本号
-    image: registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${TAG}
+    # 镜像                                                  #  ↓↓↓↓↓ --- 1、 修改镜像版本号，或者干脆写成latest
+    image: registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${CERTD_VERSION}
     container_name: certd # 容器名
     restart: unless-stopped # 重启
     volumes:
-      #   ↓↓↓↓↓  修改数据库以及证书存储路径
+      #   ↓↓↓↓↓ ------------------------------------------------------- 2、 修改数据库以及证书存储路径
       - /data/certd:/app/data
     ports: # 端口映射
       - "7001:7001"
-    environment:
+    environment: # 环境变量
       - TZ=Asia/Shanghai
       - certd_auth_jwt_secret=changeme
-#                               ↑↑↑↑↑   注意修改成你的自定义密钥
+                            #  ↑↑↑↑↑ ---------------------------------- 3、 修改成你的自定义密钥
+      # 设置环境变量即可自定义certd配置
+      # 服务端配置项见： packages/ui/certd-server/src/config/config.default.ts
+      # 服务端配置规则： certd_ + 配置项, 点号用_代替
+      # 如jwt密钥配置为： auth.jwt.secret，则设置环境变量 certd_auth_jwt_secret=changeme
 
+      # 客户端配置项见： packages/ui/certd-client/.env
+      # 按实际名称配置环境变量即可，如： VITE_APP_API=http://localhost:7001

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.1.3"
+  "version": "1.20.2"
 }

package.json

@@ -4,21 +4,22 @@
   "private": true,
   "type": "module",
   "devDependencies": {
-    "@lerna-lite/cli": "^2.4.0",
-    "@lerna-lite/publish": "^2.4.0",
-    "@lerna-lite/run": "^2.4.0"
+    "@lerna-lite/cli": "^3.2.1",
+    "@lerna-lite/publish": "^3.2.1",
+    "@lerna-lite/run": "^3.2.1",
+    "@lerna-lite/version": "^3.2.1"
   },
   "scripts": {
     "start": "lerna bootstrap --hoist",
     "i-all": "lerna link && lerna exec npm install  ",
-    "publish": "npm run proxy && npm run prepublishOnly1  && lerna publish --conventional-commits && npm run afterpublishOnly && node deploy.js",
+    "publish": "npm run proxy && npm run prepublishOnly1  && lerna publish --conventional-commits && npm run afterpublishOnly && npm run deploy1",
     "afterpublishOnly": "",
     "proxy": "npm config set proxy=http://127.0.0.1:10809",
     "prepublishOnly1": "npm run before-build && lerna run build ",
     "before-build": "cd ./packages/core/acme-client && time /t >build.md && git add ./build.md && git commit -m \"build: prepare to build\"",
     "deploy1": "node deploy.js"
   },
-  "license": "MIT",
+  "license": "AGPL-3.0",
   "dependencies": {
     "axios": "^1.4.0",
     "lodash": "^4.17.21"

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.2](https://github.com/publishlab/node-acme-client/compare/v1.2.1...v1.20.2) (2024-02-28)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.2.1](https://github.com/publishlab/node-acme-client/compare/v1.2.0...v1.2.1) (2023-12-12)
+
+**Note:** Version bump only for package @certd/acme-client
+
+**Note:** Version bump only for package @certd/acme-client
+
+# [1.2.0](https://github.com/publishlab/node-acme-client/compare/v1.1.6...v1.2.0) (2023-10-27)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.1.6](https://github.com/publishlab/node-acme-client/compare/v1.1.5...v1.1.6) (2023-07-10)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.1.5](https://github.com/publishlab/node-acme-client/compare/v1.1.4...v1.1.5) (2023-07-03)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.1.4](https://github.com/publishlab/node-acme-client/compare/v1.1.3...v1.1.4) (2023-07-03)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.1.3](https://github.com/publishlab/node-acme-client/compare/v1.1.2...v1.1.3) (2023-07-03)
 
 **Note:** Version bump only for package @certd/acme-client

packages/core/acme-client/build.md

@@ -1 +1 @@
-09:21
+11:14

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.1.3",
+    "version": "1.20.2",
     "main": "src/index.js",
     "types": "types",
     "license": "MIT",
@@ -58,5 +58,5 @@
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
     },
-    "gitHead": "ecfcada8020661b922cbe4f4984d76efb7f2b3e3"
+    "gitHead": "b258e926209fef4cc4d633b0383eb54e26c516f9"
 }

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.2](https://github.com/certd/certd/compare/v1.2.1...v1.20.2) (2024-02-28)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12)
+
+**Note:** Version bump only for package @certd/pipeline
+
+**Note:** Version bump only for package @certd/pipeline
+
+# [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.1.6](https://github.com/certd/certd/compare/v1.1.5...v1.1.6) (2023-07-10)
+
+### Bug Fixes
+
+* 修复上传证书到腾讯云失败的bug ([e950322](https://github.com/certd/certd/commit/e950322232e19d1263b8552eefa5b0150fd7864e))
+
+## [1.1.5](https://github.com/certd/certd/compare/v1.1.4...v1.1.5) (2023-07-03)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.1.4](https://github.com/certd/certd/compare/v1.1.3...v1.1.4) (2023-07-03)
+
+### Performance Improvements
+
+* cancel task ([bc65c0a](https://github.com/certd/certd/commit/bc65c0a786360c087fe95cad93ec6a87804cc5ee))
+* flush log ([891a43a](https://github.com/certd/certd/commit/891a43ae6716ff98ed06643f7da2e35199ee195c))
+* flush logger ([91be682](https://github.com/certd/certd/commit/91be6826b902e0f302b1a6cbdb1d24e15914c18d))
+* timeout ([3eeb1f7](https://github.com/certd/certd/commit/3eeb1f77aa2922f3545f3d2067f561d95621d54f))
+
 ## [1.1.3](https://github.com/certd/certd/compare/v1.1.2...v1.1.3) (2023-07-03)
 
 **Note:** Version bump only for package @certd/pipeline

packages/core/pipeline/package.json

@@ -1,10 +1,15 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.1.3",
-  "main": "./dist/bundle.js",
-  "module": "./dist/bundle.mjs",
-  "types": "./dist/d/index.d.ts",
+  "version": "1.20.2",
+  "main": "./src/index.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
+  "publishConfig": {
+    "main": "./dist/bundle.js",
+    "module": "./dist/bundle.mjs",
+    "types": "./dist/d/index.d.ts"
+  },
   "scripts": {
     "dev": "vite",
     "build": "rollup -c",
@@ -18,7 +23,7 @@
     "qs": "^6.11.2"
   },
   "devDependencies": {
-    "@certd/acme-client": "^1.1.3",
+    "@certd/acme-client": "^1.20.2",
     "@rollup/plugin-commonjs": "^23.0.4",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
@@ -51,5 +56,5 @@
     "vite": "^4.3.8",
     "vue-tsc": "^1.6.5"
   },
-  "gitHead": "ecfcada8020661b922cbe4f4984d76efb7f2b3e3"
+  "gitHead": "b258e926209fef4cc4d633b0383eb54e26c516f9"
 }

packages/core/pipeline/src/core/executor.ts

@@ -12,6 +12,7 @@ import { RegistryItem } from "../registry";
 import { Decorator } from "../decorator";
 import { IEmailService } from "../service";
 import { FileStore } from "./file-store";
+import { TimeoutPromise } from "../utils/util.promise";
 
 export type ExecutorOptions = {
   userId: any;
@@ -31,6 +32,7 @@ export class Executor {
   lastStatusMap!: RunnableCollection;
   lastRuntime!: RunHistory;
   options: ExecutorOptions;
+  canceled = false;
   onChanged: (history: RunHistory) => void;
   constructor(options: ExecutorOptions) {
     this.options = options;
@@ -50,6 +52,12 @@ export class Executor {
     this.lastStatusMap = new RunnableCollection(lastRuntime?.pipeline);
   }
 
+  async cancel() {
+    this.canceled = true;
+    this.runtime?.cancel(this.pipeline);
+    await this.onChanged(this.runtime);
+  }
+
   async run(runtimeId: any = 0, triggerType: string) {
     try {
       await this.init();
@@ -99,17 +107,24 @@ export class Executor {
         return ResultType.skip;
       }
     }
-    try {
-      await run();
-      this.runtime.success(runnable);
+    const intervalFlushLogId = setInterval(async () => {
       await this.onChanged(this.runtime);
+    }, 5000);
+    const timeout = runnable.timeout ?? 20 * 60 * 1000;
+    try {
+      if (this.canceled) {
+        throw new Error("task canceled");
+      }
+      await TimeoutPromise(run, timeout);
+      this.runtime.success(runnable);
       return ResultType.success;
     } catch (e: any) {
       this.runtime.error(runnable, e);
-      await this.onChanged(this.runtime);
       throw e;
     } finally {
       this.runtime.finally(runnable);
+      clearInterval(intervalFlushLogId);
+      await this.onChanged(this.runtime);
     }
   }
 
@@ -174,6 +189,8 @@ export class Executor {
   }
 
   private async runStep(step: Step) {
+    const currentLogger = this.runtime._loggers[step.id];
+
     const lastStatus = this.lastStatusMap.get(step.id);
     //执行任务
     const plugin: RegistryItem<AbstractTaskPlugin> = pluginRegistry.get(step.type);
@@ -187,7 +204,11 @@ export class Executor {
       if (item.component?.name === "pi-output-selector") {
         const contextKey = step.input[key];
         if (contextKey != null) {
-          step.input[key] = this.runtime.context[contextKey];
+          const value = this.runtime.context[contextKey];
+          if (value == null) {
+            currentLogger.warn(`[step init] input ${define.title} is null`);
+          }
+          step.input[key] = value;
         }
       }
     });
@@ -197,7 +218,7 @@ export class Executor {
       step,
       lastStatus,
       http: request,
-      logger: this.runtime._loggers[step.id],
+      logger: currentLogger,
       accessService: this.options.accessService,
       emailService: this.options.emailService,
       pipelineContext: this.pipelineContext,

packages/core/pipeline/src/core/run-history.ts

@@ -92,6 +92,19 @@ export class RunHistory {
     this.logError(runnable, e);
   }
 
+  cancel(runnable: Runnable) {
+    const now = new Date().getTime();
+    const status = runnable.status;
+    _.merge(status, {
+      status: ResultType.canceled,
+      endTime: now,
+      result: ResultType.canceled,
+      message: "用户取消",
+    });
+
+    this.log(runnable, "任务取消");
+  }
+
   log(runnable: Runnable, text: string) {
     // @ts-ignore
     this._loggers[runnable.id].info(`[${runnable.title}]<id:${runnable.id}> [${runnable.runnableType}]`, text);

packages/core/pipeline/src/d.ts/pipeline.ts

@@ -66,6 +66,7 @@ export type Runnable = {
   strategy?: RunnableStrategy;
   runnableType?: string; // pipeline, stage, task , step
   status?: HistoryResult;
+  timeout?: number;
   default?: {
     [key: string]: any;
   };
@@ -87,7 +88,7 @@ export type Pipeline = Runnable & {
   userId: any;
   stages: Stage[];
   triggers: Trigger[];
-  notifications: Notification[];
+  notifications?: Notification[];
 };
 
 export type Context = {
@@ -105,6 +106,7 @@ export enum ResultType {
   start = "start",
   success = "success",
   error = "error",
+  canceled = "canceled",
   skip = "skip",
   none = "none",
 }

packages/core/pipeline/src/utils/util.promise.ts

@@ -0,0 +1,13 @@
+export function TimeoutPromise(callback: () => Promise<void>, ms = 30 * 1000) {
+  let timeout: any;
+  return Promise.race([
+    callback(),
+    new Promise((resolve, reject) => {
+      timeout = setTimeout(() => {
+        reject(new Error(`Task timeout in ${ms} ms`));
+      }, ms);
+    }),
+  ]).finally(() => {
+    clearTimeout(timeout);
+  });
+}

packages/plugins/plugin-aliyun/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.2](https://github.com/certd/certd/compare/v1.2.1...v1.20.2) (2024-02-28)
+
+### Bug Fixes
+
+* 临时修复阿里云domainlist接口返回域名列表不全的问题，后续还需要增加翻页查询 ([849c145](https://github.com/certd/certd/commit/849c145926984762bd9dbec87bd91cd047fc0855))
+
+## [1.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12)
+
+**Note:** Version bump only for package @certd/plugin-aliyun
+
+**Note:** Version bump only for package @certd/plugin-aliyun
+
+# [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27)
+
+**Note:** Version bump only for package @certd/plugin-aliyun
+
+## [1.1.6](https://github.com/certd/certd/compare/v1.1.5...v1.1.6) (2023-07-10)
+
+**Note:** Version bump only for package @certd/plugin-aliyun
+
+## [1.1.5](https://github.com/certd/certd/compare/v1.1.4...v1.1.5) (2023-07-03)
+
+**Note:** Version bump only for package @certd/plugin-aliyun
+
+## [1.1.4](https://github.com/certd/certd/compare/v1.1.3...v1.1.4) (2023-07-03)
+
+### Performance Improvements
+
+* timeout ([3eeb1f7](https://github.com/certd/certd/commit/3eeb1f77aa2922f3545f3d2067f561d95621d54f))
+
 ## [1.1.3](https://github.com/certd/certd/compare/v1.1.2...v1.1.3) (2023-07-03)
 
 **Note:** Version bump only for package @certd/plugin-aliyun

packages/plugins/plugin-aliyun/package.json

@@ -1,10 +1,15 @@
 {
   "name": "@certd/plugin-aliyun",
   "private": false,
-  "version": "1.1.3",
-  "main": "./dist/bundle.js",
-  "module": "./dist/bundle.mjs",
-  "types": "./dist/d/index.d.ts",
+  "version": "1.20.2",
+  "main": "./src/index.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
+  "publishConfig": {
+    "main": "./dist/bundle.js",
+    "module": "./dist/bundle.mjs",
+    "types": "./dist/d/index.d.ts"
+  },
   "scripts": {
     "dev": "vite",
     "build1": "vue-tsc --noEmit && vite build",
@@ -18,10 +23,10 @@
     "node-forge": "^0.10.0"
   },
   "devDependencies": {
-    "@certd/acme-client": "^1.1.3",
-    "@certd/pipeline": "^1.1.3",
-    "@certd/plugin-cert": "^1.1.3",
-    "@certd/plugin-util": "^1.1.3",
+    "@certd/acme-client": "^1.20.2",
+    "@certd/pipeline": "^1.20.2",
+    "@certd/plugin-cert": "^1.20.2",
+    "@certd/plugin-util": "^1.20.2",
     "@midwayjs/core": "^3.0.0",
     "@midwayjs/decorator": "^3.0.0",
     "@rollup/plugin-commonjs": "^23.0.4",
@@ -54,5 +59,5 @@
     "vite": "^3.1.0",
     "vue-tsc": "^0.38.9"
   },
-  "gitHead": "ecfcada8020661b922cbe4f4984d76efb7f2b3e3"
+  "gitHead": "b258e926209fef4cc4d633b0383eb54e26c516f9"
 }

packages/plugins/plugin-aliyun/src/dns-provider/aliyun-dns-provider.ts

@@ -29,6 +29,7 @@ export class AliyunDnsProvider implements IDnsProvider {
   async getDomainList() {
     const params = {
       RegionId: "cn-hangzhou",
+      PageSize: 100,
     };
 
     const requestOption = {
@@ -42,14 +43,16 @@ export class AliyunDnsProvider implements IDnsProvider {
   async matchDomain(dnsRecord: string) {
     const list = await this.getDomainList();
     let domain = null;
+    const domainList = [];
     for (const item of list) {
+      domainList.push(item.DomainName);
       if (_.endsWith(dnsRecord, item.DomainName)) {
         domain = item.DomainName;
         break;
       }
     }
     if (!domain) {
-      throw new Error("can not find Domain ," + dnsRecord);
+      throw new Error(`can not find Domain :${dnsRecord} ,list: ${JSON.stringify(domainList)}`);
     }
     return domain;
   }

packages/plugins/plugin-all/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.2](https://github.com/certd/certd/compare/v1.2.1...v1.20.2) (2024-02-28)
+
+**Note:** Version bump only for package @certd/plugin-all
+
+## [1.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12)
+
+**Note:** Version bump only for package @certd/plugin-all
+
+**Note:** Version bump only for package @certd/plugin-all
+
+# [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27)
+
+**Note:** Version bump only for package @certd/plugin-all
+
+## [1.1.6](https://github.com/certd/certd/compare/v1.1.5...v1.1.6) (2023-07-10)
+
+### Bug Fixes
+
+* 修复上传证书到腾讯云失败的bug ([e950322](https://github.com/certd/certd/commit/e950322232e19d1263b8552eefa5b0150fd7864e))
+
+## [1.1.5](https://github.com/certd/certd/compare/v1.1.4...v1.1.5) (2023-07-03)
+
+**Note:** Version bump only for package @certd/plugin-all
+
+## [1.1.4](https://github.com/certd/certd/compare/v1.1.3...v1.1.4) (2023-07-03)
+
+### Performance Improvements
+
+* timeout ([3eeb1f7](https://github.com/certd/certd/commit/3eeb1f77aa2922f3545f3d2067f561d95621d54f))
+
 ## [1.1.3](https://github.com/certd/certd/compare/v1.1.2...v1.1.3) (2023-07-03)
 
 **Note:** Version bump only for package @certd/plugin-all

packages/plugins/plugin-all/package.json

@@ -1,10 +1,15 @@
 {
   "name": "@certd/plugin-all",
   "private": false,
-  "version": "1.1.3",
-  "main": "./dist/bundle.js",
-  "module": "./dist/bundle.mjs",
-  "types": "./dist/d/index.d.ts",
+  "version": "1.20.2",
+  "main": "./src/index.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
+  "publishConfig": {
+    "main": "./dist/bundle.js",
+    "module": "./dist/bundle.mjs",
+    "types": "./dist/d/index.d.ts"
+  },
   "scripts": {
     "dev": "vite",
     "build2": " vite build",
@@ -12,12 +17,12 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@certd/pipeline": "^1.1.3",
-    "@certd/plugin-aliyun": "^1.1.3",
-    "@certd/plugin-cert": "^1.1.3",
-    "@certd/plugin-host": "^1.1.3",
-    "@certd/plugin-huawei": "^1.1.3",
-    "@certd/plugin-tencent": "^1.1.3",
+    "@certd/pipeline": "^1.20.2",
+    "@certd/plugin-aliyun": "^1.20.2",
+    "@certd/plugin-cert": "^1.20.2",
+    "@certd/plugin-host": "^1.20.2",
+    "@certd/plugin-huawei": "^1.20.2",
+    "@certd/plugin-tencent": "^1.20.2",
     "@rollup/plugin-commonjs": "^23.0.4",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
@@ -43,5 +48,5 @@
     "vite": "^3.1.0",
     "vue-tsc": "^0.38.9"
   },
-  "gitHead": "ecfcada8020661b922cbe4f4984d76efb7f2b3e3"
+  "gitHead": "b258e926209fef4cc4d633b0383eb54e26c516f9"
 }

packages/plugins/plugin-all/test/pipeline/access-service-test.ts

@@ -1,6 +1,7 @@
-import { IAccessService } from "@certd/pipeline";
+import { EmailSend, IAccessService, IEmailService } from "@certd/pipeline";
 import { AliyunAccess } from "@certd/plugin-aliyun";
 import { aliyunSecret } from "../user.secret";
+
 export class AccessServiceTest implements IAccessService {
   async getById(id: any): Promise<any> {
     return {
@@ -8,3 +9,10 @@ export class AccessServiceTest implements IAccessService {
     } as AliyunAccess;
   }
 }
+
+export class EmailServiceTest implements IEmailService {
+  send(email: EmailSend): Promise<void> {
+    console.log("send email", email);
+    return Promise.resolve(undefined);
+  }
+}

packages/plugins/plugin-all/test/pipeline/pipeline.define.ts

@@ -58,6 +58,17 @@ export const pipeline: Pipeline = {
                 runStrategy: RunStrategy.SkipWhenSucceed,
               },
             },
+            {
+              id: generateId(),
+              title: "上传证书到腾讯云",
+              type: "EchoPlugin",
+              input: {
+                cert: "cert",
+              },
+              strategy: {
+                runStrategy: RunStrategy.SkipWhenSucceed,
+              },
+            },
           ],
         },
       ],

packages/plugins/plugin-all/test/pipeline/pipeline.test.ts

@@ -1,7 +1,7 @@
 import "mocha";
 import { Executor, FileStorage, RunHistory } from "@certd/pipeline";
 import { pipeline } from "./pipeline.define";
-import { AccessServiceTest } from "./access-service-test";
+import { AccessServiceTest, EmailServiceTest } from "./access-service-test";
 import "../../src";
 import "../plugin/echo-plugin";
 
@@ -13,7 +13,14 @@ describe("pipeline", function () {
       console.log("changed:");
     }
 
-    const executor = new Executor({ userId: "test", pipeline, onChanged, accessService: new AccessServiceTest(), storage: new FileStorage() });
+    const executor = new Executor({
+      userId: "test",
+      pipeline,
+      onChanged,
+      accessService: new AccessServiceTest(),
+      emailService: new EmailServiceTest(),
+      storage: new FileStorage(),
+    });
     await executor.run(1, "user");
     // expect(define.name).eq("EchoPlugin");
   });

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.2](https://github.com/certd/certd/compare/v1.2.1...v1.20.2) (2024-02-28)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+# [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.1.6](https://github.com/certd/certd/compare/v1.1.5...v1.1.6) (2023-07-10)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.1.5](https://github.com/certd/certd/compare/v1.1.4...v1.1.5) (2023-07-03)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.1.4](https://github.com/certd/certd/compare/v1.1.3...v1.1.4) (2023-07-03)
+
+### Performance Improvements
+
+* timeout ([3eeb1f7](https://github.com/certd/certd/commit/3eeb1f77aa2922f3545f3d2067f561d95621d54f))
+
 ## [1.1.3](https://github.com/certd/certd/compare/v1.1.2...v1.1.3) (2023-07-03)
 
 **Note:** Version bump only for package @certd/plugin-cert

packages/plugins/plugin-cert/package.json

@@ -1,10 +1,15 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.1.3",
-  "main": "./dist/bundle.js",
-  "module": "./dist/bundle.mjs",
-  "types": "./dist/d/index.d.ts",
+  "version": "1.20.2",
+  "main": "./src/index.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
+  "publishConfig": {
+    "main": "./dist/bundle.js",
+    "module": "./dist/bundle.mjs",
+    "types": "./dist/d/index.d.ts"
+  },
   "scripts": {
     "dev": "vite",
     "build": "rollup -c",
@@ -12,8 +17,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.1.3",
-    "@certd/pipeline": "^1.1.3",
+    "@certd/acme-client": "^1.20.2",
+    "@certd/pipeline": "^1.20.2",
     "jszip": "^3.10.1",
     "node-forge": "^0.10.0"
   },
@@ -52,5 +57,5 @@
     "vite": "^3.1.0",
     "vue-tsc": "^0.38.9"
   },
-  "gitHead": "ecfcada8020661b922cbe4f4984d76efb7f2b3e3"
+  "gitHead": "b258e926209fef4cc4d633b0383eb54e26c516f9"
 }

packages/plugins/plugin-host/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.2](https://github.com/certd/certd/compare/v1.2.1...v1.20.2) (2024-02-28)
+
+**Note:** Version bump only for package @certd/plugin-host
+
+## [1.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12)
+
+**Note:** Version bump only for package @certd/plugin-host
+
+**Note:** Version bump only for package @certd/plugin-host
+
+# [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27)
+
+**Note:** Version bump only for package @certd/plugin-host
+
+## [1.1.6](https://github.com/certd/certd/compare/v1.1.5...v1.1.6) (2023-07-10)
+
+**Note:** Version bump only for package @certd/plugin-host
+
+## [1.1.5](https://github.com/certd/certd/compare/v1.1.4...v1.1.5) (2023-07-03)
+
+**Note:** Version bump only for package @certd/plugin-host
+
+## [1.1.4](https://github.com/certd/certd/compare/v1.1.3...v1.1.4) (2023-07-03)
+
+### Performance Improvements
+
+* timeout ([3eeb1f7](https://github.com/certd/certd/commit/3eeb1f77aa2922f3545f3d2067f561d95621d54f))
+
 ## [1.1.3](https://github.com/certd/certd/compare/v1.1.2...v1.1.3) (2023-07-03)
 
 **Note:** Version bump only for package @certd/plugin-host

packages/plugins/plugin-host/package.json

@@ -1,10 +1,15 @@
 {
   "name": "@certd/plugin-host",
   "private": false,
-  "version": "1.1.3",
-  "main": "./dist/bundle.js",
-  "module": "./dist/bundle.mjs",
-  "types": "./dist/d/index.d.ts",
+  "version": "1.20.2",
+  "main": "./src/index.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
+  "publishConfig": {
+    "main": "./dist/bundle.js",
+    "module": "./dist/bundle.mjs",
+    "types": "./dist/d/index.d.ts"
+  },
   "scripts": {
     "dev": "vite",
     "build": "rollup -c",
@@ -12,8 +17,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/pipeline": "^1.1.3",
-    "@certd/plugin-cert": "^1.1.3",
+    "@certd/pipeline": "^1.20.2",
+    "@certd/plugin-cert": "^1.20.2",
     "ssh2": "^0.8.9"
   },
   "devDependencies": {
@@ -52,5 +57,5 @@
     "vite": "^3.1.0",
     "vue-tsc": "^0.38.9"
   },
-  "gitHead": "ecfcada8020661b922cbe4f4984d76efb7f2b3e3"
+  "gitHead": "b258e926209fef4cc4d633b0383eb54e26c516f9"
 }

packages/plugins/plugin-huawei/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.2](https://github.com/certd/certd/compare/v1.2.1...v1.20.2) (2024-02-28)
+
+**Note:** Version bump only for package @certd/plugin-huawei
+
+## [1.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12)
+
+**Note:** Version bump only for package @certd/plugin-huawei
+
+**Note:** Version bump only for package @certd/plugin-huawei
+
+# [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27)
+
+**Note:** Version bump only for package @certd/plugin-huawei
+
+## [1.1.6](https://github.com/certd/certd/compare/v1.1.5...v1.1.6) (2023-07-10)
+
+**Note:** Version bump only for package @certd/plugin-huawei
+
+## [1.1.5](https://github.com/certd/certd/compare/v1.1.4...v1.1.5) (2023-07-03)
+
+**Note:** Version bump only for package @certd/plugin-huawei
+
+## [1.1.4](https://github.com/certd/certd/compare/v1.1.3...v1.1.4) (2023-07-03)
+
+### Performance Improvements
+
+* timeout ([3eeb1f7](https://github.com/certd/certd/commit/3eeb1f77aa2922f3545f3d2067f561d95621d54f))
+
 ## [1.1.3](https://github.com/certd/certd/compare/v1.1.2...v1.1.3) (2023-07-03)
 
 **Note:** Version bump only for package @certd/plugin-huawei

packages/plugins/plugin-huawei/package.json

@@ -1,10 +1,15 @@
 {
   "name": "@certd/plugin-huawei",
   "private": false,
-  "version": "1.1.3",
-  "main": "./dist/bundle.js",
-  "module": "./dist/bundle.mjs",
-  "types": "./dist/d/index.d.ts",
+  "version": "1.20.2",
+  "main": "./src/index.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
+  "publishConfig": {
+    "main": "./dist/bundle.js",
+    "module": "./dist/bundle.mjs",
+    "types": "./dist/d/index.d.ts"
+  },
   "scripts": {
     "dev": "vite",
     "build": "rollup -c",
@@ -12,10 +17,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.1.3",
-    "@certd/pipeline": "^1.1.3",
-    "@certd/plugin-cert": "^1.1.3",
-    "@certd/plugin-util": "^1.1.3",
+    "@certd/acme-client": "^1.20.2",
+    "@certd/pipeline": "^1.20.2",
+    "@certd/plugin-cert": "^1.20.2",
+    "@certd/plugin-util": "^1.20.2",
     "axios": "^0.27.2",
     "dayjs": "^1.11.6",
     "lodash": "^4.17.21",
@@ -54,5 +59,5 @@
     "vite": "^3.1.0",
     "vue-tsc": "^0.38.9"
   },
-  "gitHead": "ecfcada8020661b922cbe4f4984d76efb7f2b3e3"
+  "gitHead": "b258e926209fef4cc4d633b0383eb54e26c516f9"
 }

packages/plugins/plugin-tencent/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.2](https://github.com/certd/certd/compare/v1.2.1...v1.20.2) (2024-02-28)
+
+**Note:** Version bump only for package @certd/plugin-tencent
+
+## [1.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12)
+
+**Note:** Version bump only for package @certd/plugin-tencent
+
+**Note:** Version bump only for package @certd/plugin-tencent
+
+# [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27)
+
+**Note:** Version bump only for package @certd/plugin-tencent
+
+## [1.1.6](https://github.com/certd/certd/compare/v1.1.5...v1.1.6) (2023-07-10)
+
+### Bug Fixes
+
+* 修复上传证书到腾讯云失败的bug ([e950322](https://github.com/certd/certd/commit/e950322232e19d1263b8552eefa5b0150fd7864e))
+
+## [1.1.5](https://github.com/certd/certd/compare/v1.1.4...v1.1.5) (2023-07-03)
+
+**Note:** Version bump only for package @certd/plugin-tencent
+
+## [1.1.4](https://github.com/certd/certd/compare/v1.1.3...v1.1.4) (2023-07-03)
+
+### Performance Improvements
+
+* timeout ([3eeb1f7](https://github.com/certd/certd/commit/3eeb1f77aa2922f3545f3d2067f561d95621d54f))
+
 ## [1.1.3](https://github.com/certd/certd/compare/v1.1.2...v1.1.3) (2023-07-03)
 
 **Note:** Version bump only for package @certd/plugin-tencent

packages/plugins/plugin-tencent/package.json

@@ -1,10 +1,15 @@
 {
   "name": "@certd/plugin-tencent",
   "private": false,
-  "version": "1.1.3",
-  "main": "./dist/bundle.js",
-  "module": "./dist/bundle.mjs",
-  "types": "./dist/d/index.d.ts",
+  "version": "1.20.2",
+  "main": "./src/index.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
+  "publishConfig": {
+    "main": "./dist/bundle.js",
+    "module": "./dist/bundle.mjs",
+    "types": "./dist/d/index.d.ts"
+  },
   "scripts": {
     "dev": "vite",
     "build": "rollup -c",
@@ -12,9 +17,9 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/pipeline": "^1.1.3",
-    "@certd/plugin-cert": "^1.1.3",
-    "@certd/plugin-util": "^1.1.3",
+    "@certd/pipeline": "^1.20.2",
+    "@certd/plugin-cert": "^1.20.2",
+    "@certd/plugin-util": "^1.20.2",
     "tencentcloud-sdk-nodejs": "^4.0.44"
   },
   "devDependencies": {
@@ -53,5 +58,5 @@
     "vite": "^3.1.0",
     "vue-tsc": "^0.38.9"
   },
-  "gitHead": "ecfcada8020661b922cbe4f4984d76efb7f2b3e3"
+  "gitHead": "b258e926209fef4cc4d633b0383eb54e26c516f9"
 }

packages/plugins/plugin-tencent/src/access/dnspod-access.ts

@@ -7,13 +7,20 @@ import { IsAccess, AccessInput } from "@certd/pipeline";
 })
 export class DnspodAccess {
   @AccessInput({
-    title: "token",
+    title: "端点",
     component: {
-      placeholder: "开放接口token",
+      placeholder: "endpoint",
+      name: "a-select",
+      vModel: "value",
+      options: [
+        { value: "https://dnsapi.cn", label: "中国站" },
+        { value: "https://api.dnspod.com", label: "国际站" },
+      ],
     },
     rules: [{ required: true, message: "该项必填" }],
   })
-  token = "";
+  endpoint = "";
+
   @AccessInput({
     title: "账户id",
     component: {
@@ -22,6 +29,15 @@ export class DnspodAccess {
     rules: [{ required: true, message: "该项必填" }],
   })
   id = "";
+
+  @AccessInput({
+    title: "token",
+    component: {
+      placeholder: "开放接口token",
+    },
+    rules: [{ required: true, message: "该项必填" }],
+  })
+  token = "";
 }
 
 new DnspodAccess();

packages/plugins/plugin-tencent/src/dns-provider/dnspod-dns-provider.ts

@@ -20,9 +20,11 @@ export class DnspodDnsProvider implements IDnsProvider {
 
   loginToken: any;
 
+  endpoint = "";
   async onInstance() {
     const access: DnspodAccess = this.access as DnspodAccess;
     this.loginToken = access.id + "," + access.token;
+    this.endpoint = access.endpoint || "https://dnsapi.cn";
   }
 
   async doRequest(options: any, successCodes: string[] = []) {
@@ -51,7 +53,7 @@ export class DnspodDnsProvider implements IDnsProvider {
 
   async getDomainList() {
     const ret = await this.doRequest({
-      url: "https://dnsapi.cn/Domain.List",
+      url: this.access.endpoint + "/Domain.List",
     });
     this.logger.debug("dnspod 域名列表：", ret.domains);
     return ret.domains;
@@ -66,7 +68,7 @@ export class DnspodDnsProvider implements IDnsProvider {
 
     const ret = await this.doRequest(
       {
-        url: "https://dnsapi.cn/Record.Create",
+        url: this.access.endpoint + "/Record.Create",
         formData: {
           domain,
           sub_domain: rr,
@@ -87,7 +89,7 @@ export class DnspodDnsProvider implements IDnsProvider {
     const domain = await this.matchDomain(fullRecord);
 
     const ret = await this.doRequest({
-      url: "https://dnsapi.cn/Record.Remove",
+      url: this.access.endpoint + "/Record.Remove",
       formData: {
         domain,
         record_id: record.id,
@@ -101,7 +103,7 @@ export class DnspodDnsProvider implements IDnsProvider {
     const list = await this.getDomainList();
     let domain = null;
     for (const item of list) {
-      if (_.endsWith(dnsRecord, item.name)) {
+      if (_.endsWith(dnsRecord, "." + item.name)) {
         domain = item;
         break;
       }

packages/plugins/plugin-tencent/src/plugin/deploy-to-cdn/index.ts

@@ -47,6 +47,17 @@ export class DeployToCdnPlugin extends AbstractTaskPlugin {
   })
   domainName!: string;
 
+  @TaskInput({
+    title: "CDN接口",
+    helper: "CDN接口端点",
+    component: {
+      name: "a-select",
+      type: "tencent",
+    },
+    required: true,
+  })
+  endpoint!: string;
+
   accessService!: IAccessService;
 
   logger!: ILogger;

packages/plugins/plugin-tencent/src/plugin/deploy-to-tke-ingress/index.ts

@@ -87,7 +87,7 @@ export class DeployCertToTencentTKEIngressPlugin extends AbstractTaskPlugin {
     this.logger = this.ctx.logger;
   }
   async execute(): Promise<void> {
-    const accessProvider = this.accessService.getById(this.accessId);
+    const accessProvider = await this.accessService.getById(this.accessId);
     const tkeClient = this.getTkeClient(accessProvider, this.region);
     const kubeConfigStr = await this.getTkeKubeConfig(tkeClient, this.clusterId);
 

packages/plugins/plugin-tencent/src/plugin/upload-to-tencent/index.ts

@@ -52,7 +52,7 @@ export class UploadToTencentPlugin extends AbstractTaskPlugin {
 
   async execute(): Promise<void> {
     const { accessId, name, cert } = this;
-    const accessProvider = this.accessService.getById(accessId);
+    const accessProvider = await this.accessService.getById(accessId);
     const certName = this.appendTimeSuffix(name || cert.domain);
     const client = this.getClient(accessProvider);
 
@@ -96,7 +96,7 @@ export class UploadToTencentPlugin extends AbstractTaskPlugin {
 
   // async rollback({ input }) {
   //   const { accessId } = input;
-  //   const accessProvider = this.accessService.getById(accessId);
+  //   const accessProvider = await this.accessService.getById(accessId);
   //   const client = this.getClient(accessProvider);
   //
   //   const { tencentCertId } = context;

packages/plugins/plugin-util/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.2](https://github.com/certd/certd/compare/v1.2.1...v1.20.2) (2024-02-28)
+
+**Note:** Version bump only for package @certd/plugin-util
+
+## [1.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12)
+
+**Note:** Version bump only for package @certd/plugin-util
+
+**Note:** Version bump only for package @certd/plugin-util
+
+# [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27)
+
+**Note:** Version bump only for package @certd/plugin-util
+
+## [1.1.6](https://github.com/certd/certd/compare/v1.1.5...v1.1.6) (2023-07-10)
+
+**Note:** Version bump only for package @certd/plugin-util
+
+## [1.1.5](https://github.com/certd/certd/compare/v1.1.4...v1.1.5) (2023-07-03)
+
+**Note:** Version bump only for package @certd/plugin-util
+
+## [1.1.4](https://github.com/certd/certd/compare/v1.1.3...v1.1.4) (2023-07-03)
+
+### Performance Improvements
+
+* timeout ([3eeb1f7](https://github.com/certd/certd/commit/3eeb1f77aa2922f3545f3d2067f561d95621d54f))
+
 ## [1.1.3](https://github.com/certd/certd/compare/v1.1.2...v1.1.3) (2023-07-03)
 
 **Note:** Version bump only for package @certd/plugin-util

packages/plugins/plugin-util/package.json

@@ -1,10 +1,15 @@
 {
   "name": "@certd/plugin-util",
   "private": false,
-  "version": "1.1.3",
-  "main": "./dist/bundle.js",
-  "module": "./dist/bundle.mjs",
-  "types": "./dist/d/index.d.ts",
+  "version": "1.20.2",
+  "main": "./src/index.ts",
+  "module": "./src/index.ts",
+  "types": "./src/index.ts",
+  "publishConfig": {
+    "main": "./dist/bundle.js",
+    "module": "./dist/bundle.mjs",
+    "types": "./dist/d/index.d.ts"
+  },
   "scripts": {
     "dev": "vite",
     "build": "rollup -c",
@@ -16,7 +21,7 @@
     "shelljs": "^0.8.5"
   },
   "devDependencies": {
-    "@certd/pipeline": "^1.1.3",
+    "@certd/pipeline": "^1.20.2",
     "@rollup/plugin-commonjs": "^23.0.4",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
@@ -39,5 +44,5 @@
     "vite": "^3.1.0",
     "vue-tsc": "^0.38.9"
   },
-  "gitHead": "ecfcada8020661b922cbe4f4984d76efb7f2b3e3"
+  "gitHead": "b258e926209fef4cc4d633b0383eb54e26c516f9"
 }

packages/ui/certd-client/.dependency-cruiser.js

@@ -0,0 +1,463 @@
+/** @type {import('dependency-cruiser').IConfiguration} */
+module.exports = {
+  forbidden: [
+    /* rules from the 'recommended' preset: */
+    {
+      name: 'no-circular',
+      severity: 'warn',
+      comment:
+        'This dependency is part of a circular relationship. You might want to revise ' +
+        'your solution (i.e. use dependency inversion, make sure the modules have a single responsibility) ',
+      from: {},
+      to: {
+        circular: true
+      }
+    },
+    {
+      name: 'no-orphans',
+      comment:
+        "This is an orphan module - it's likely not used (anymore?). Either use it or " +
+        "remove it. If it's logical this module is an orphan (i.e. it's a config file), " +
+        "add an exception for it in your dependency-cruiser configuration. By default " +
+        "this rule does not scrutinize dot-files (e.g. .eslintrc.js), TypeScript declaration " +
+        "files (.d.ts), tsconfig.json and some of the babel and webpack configs.",
+      severity: 'warn',
+      from: {
+        orphan: true,
+        pathNot: [
+          '(^|/)\\.[^/]+\\.(js|cjs|mjs|ts|json)$', // dot files
+          '\\.d\\.ts$',                            // TypeScript declaration files
+          '(^|/)tsconfig\\.json$',                 // TypeScript config
+          '(^|/)(babel|webpack)\\.config\\.(js|cjs|mjs|ts|json)$' // other configs
+        ]
+      },
+      to: {},
+    },
+    {
+      name: 'no-deprecated-core',
+      comment:
+        'A module depends on a node core module that has been deprecated. Find an alternative - these are ' +
+        "bound to exist - node doesn't deprecate lightly.",
+      severity: 'warn',
+      from: {},
+      to: {
+        dependencyTypes: [
+          'core'
+        ],
+        path: [
+          '^(v8\/tools\/codemap)$',
+          '^(v8\/tools\/consarray)$',
+          '^(v8\/tools\/csvparser)$',
+          '^(v8\/tools\/logreader)$',
+          '^(v8\/tools\/profile_view)$',
+          '^(v8\/tools\/profile)$',
+          '^(v8\/tools\/SourceMap)$',
+          '^(v8\/tools\/splaytree)$',
+          '^(v8\/tools\/tickprocessor-driver)$',
+          '^(v8\/tools\/tickprocessor)$',
+          '^(node-inspect\/lib\/_inspect)$',
+          '^(node-inspect\/lib\/internal\/inspect_client)$',
+          '^(node-inspect\/lib\/internal\/inspect_repl)$',
+          '^(async_hooks)$',
+          '^(punycode)$',
+          '^(domain)$',
+          '^(constants)$',
+          '^(sys)$',
+          '^(_linklist)$',
+          '^(_stream_wrap)$'
+        ],
+      }
+    },
+    {
+      name: 'not-to-deprecated',
+      comment:
+        'This module uses a (version of an) npm module that has been deprecated. Either upgrade to a later ' +
+        'version of that module, or find an alternative. Deprecated modules are a security risk.',
+      severity: 'warn',
+      from: {},
+      to: {
+        dependencyTypes: [
+          'deprecated'
+        ]
+      }
+    },
+    {
+      name: 'no-non-package-json',
+      severity: 'error',
+      comment:
+        "This module depends on an npm package that isn't in the 'dependencies' section of your package.json. " +
+        "That's problematic as the package either (1) won't be available on live (2 - worse) will be " +
+        "available on live with an non-guaranteed version. Fix it by adding the package to the dependencies " +
+        "in your package.json.",
+      from: {},
+      to: {
+        dependencyTypes: [
+          'npm-no-pkg',
+          'npm-unknown'
+        ]
+      }
+    },
+    {
+      name: 'not-to-unresolvable',
+      comment:
+        "This module depends on a module that cannot be found ('resolved to disk'). If it's an npm " +
+        'module: add it to your package.json. In all other cases you likely already know what to do.',
+      severity: 'error',
+      from: {},
+      to: {
+        couldNotResolve: true
+      }
+    },
+    {
+      name: 'no-duplicate-dep-types',
+      comment:
+        "Likely this module depends on an external ('npm') package that occurs more than once " +
+        "in your package.json i.e. bot as a devDependencies and in dependencies. This will cause " +
+        "maintenance problems later on.",
+      severity: 'warn',
+      from: {},
+      to: {
+        moreThanOneDependencyType: true,
+        // as it's pretty common to have a type import be a type only import 
+        // _and_ (e.g.) a devDependency - don't consider type-only dependency
+        // types for this rule
+        dependencyTypesNot: ["type-only"]
+      }
+    },
+
+    /* rules you might want to tweak for your specific situation: */
+    {
+      name: 'not-to-test',
+      comment:
+        "This module depends on code within a folder that should only contain tests. As tests don't " +
+        "implement functionality this is odd. Either you're writing a test outside the test folder " +
+        "or there's something in the test folder that isn't a test.",
+      severity: 'error',
+      from: {
+        pathNot: '^(tests)'
+      },
+      to: {
+        path: '^(tests)'
+      }
+    },
+    {
+      name: 'not-to-spec',
+      comment:
+        'This module depends on a spec (test) file. The sole responsibility of a spec file is to test code. ' +
+        "If there's something in a spec that's of use to other modules, it doesn't have that single " +
+        'responsibility anymore. Factor it out into (e.g.) a separate utility/ helper or a mock.',
+      severity: 'error',
+      from: {},
+      to: {
+        path: '\\.(spec|test)\\.(js|mjs|cjs|ts|ls|coffee|litcoffee|coffee\\.md)$'
+      }
+    },
+    {
+      name: 'not-to-dev-dep',
+      severity: 'error',
+      comment:
+        "This module depends on an npm package from the 'devDependencies' section of your " +
+        'package.json. It looks like something that ships to production, though. To prevent problems ' +
+        "with npm packages that aren't there on production declare it (only!) in the 'dependencies'" +
+        'section of your package.json. If this module is development only - add it to the ' +
+        'from.pathNot re of the not-to-dev-dep rule in the dependency-cruiser configuration',
+      from: {
+        path: '^(src)',
+        pathNot: '\\.(spec|test)\\.(js|mjs|cjs|ts|ls|coffee|litcoffee|coffee\\.md)$'
+      },
+      to: {
+        dependencyTypes: [
+          'npm-dev'
+        ]
+      }
+    },
+    {
+      name: 'optional-deps-used',
+      severity: 'info',
+      comment:
+        "This module depends on an npm package that is declared as an optional dependency " +
+        "in your package.json. As this makes sense in limited situations only, it's flagged here. " +
+        "If you're using an optional dependency here by design - add an exception to your" +
+        "dependency-cruiser configuration.",
+      from: {},
+      to: {
+        dependencyTypes: [
+          'npm-optional'
+        ]
+      }
+    },
+    {
+      name: 'peer-deps-used',
+      comment:
+        "This module depends on an npm package that is declared as a peer dependency " +
+        "in your package.json. This makes sense if your package is e.g. a plugin, but in " +
+        "other cases - maybe not so much. If the use of a peer dependency is intentional " +
+        "add an exception to your dependency-cruiser configuration.",
+      severity: 'warn',
+      from: {},
+      to: {
+        dependencyTypes: [
+          'npm-peer'
+        ]
+      }
+    }
+  ],
+  options: {
+
+    /* conditions specifying which files not to follow further when encountered:
+       - path: a regular expression to match
+       - dependencyTypes: see https://github.com/sverweij/dependency-cruiser/blob/master/doc/rules-reference.md#dependencytypes-and-dependencytypesnot
+       for a complete list
+    */
+    doNotFollow: {
+      path: 'node_modules'
+    },
+
+    /* conditions specifying which dependencies to exclude
+       - path: a regular expression to match
+       - dynamic: a boolean indicating whether to ignore dynamic (true) or static (false) dependencies.
+          leave out if you want to exclude neither (recommended!)
+    */
+    // exclude : {
+    //   path: '',
+    //   dynamic: true
+    // },
+
+    /* pattern specifying which files to include (regular expression)
+       dependency-cruiser will skip everything not matching this pattern
+    */
+    // includeOnly : '',
+
+    /* dependency-cruiser will include modules matching against the focus
+       regular expression in its output, as well as their neighbours (direct
+       dependencies and dependents)
+    */
+    // focus : '',
+
+    /* list of module systems to cruise */
+    // moduleSystems: ['amd', 'cjs', 'es6', 'tsd'],
+
+    /* prefix for links in html and svg output (e.g. 'https://github.com/you/yourrepo/blob/develop/'
+       to open it on your online repo or `vscode://file/${process.cwd()}/` to 
+       open it in visual studio code),
+     */
+    // prefix: '',
+
+    /* false (the default): ignore dependencies that only exist before typescript-to-javascript compilation
+       true: also detect dependencies that only exist before typescript-to-javascript compilation
+       "specify": for each dependency identify whether it only exists before compilation or also after
+     */
+    tsPreCompilationDeps: true,
+    
+    /* 
+       list of extensions to scan that aren't javascript or compile-to-javascript. 
+       Empty by default. Only put extensions in here that you want to take into
+       account that are _not_ parsable. 
+    */
+    // extraExtensionsToScan: [".json", ".jpg", ".png", ".svg", ".webp"],
+
+    /* if true combines the package.jsons found from the module up to the base
+       folder the cruise is initiated from. Useful for how (some) mono-repos
+       manage dependencies & dependency definitions.
+     */
+    // combinedDependencies: false,
+
+    /* if true leave symlinks untouched, otherwise use the realpath */
+    // preserveSymlinks: false,
+
+    /* TypeScript project file ('tsconfig.json') to use for
+       (1) compilation and
+       (2) resolution (e.g. with the paths property)
+
+       The (optional) fileName attribute specifies which file to take (relative to
+       dependency-cruiser's current working directory). When not provided
+       defaults to './tsconfig.json'.
+     */
+    tsConfig: {
+      fileName: 'tsconfig.json'
+    },
+
+    /* Webpack configuration to use to get resolve options from.
+
+       The (optional) fileName attribute specifies which file to take (relative
+       to dependency-cruiser's current working directory. When not provided defaults
+       to './webpack.conf.js'.
+
+       The (optional) `env` and `args` attributes contain the parameters to be passed if
+       your webpack config is a function and takes them (see webpack documentation
+       for details)
+     */
+    // webpackConfig: {
+    //  fileName: './webpack.config.js',
+    //  env: {},
+    //  args: {},
+    // },
+
+    /* Babel config ('.babelrc', '.babelrc.json', '.babelrc.json5', ...) to use
+      for compilation (and whatever other naughty things babel plugins do to
+      source code). This feature is well tested and usable, but might change
+      behavior a bit over time (e.g. more precise results for used module 
+      systems) without dependency-cruiser getting a major version bump.
+     */
+    // babelConfig: {
+    //   fileName: './.babelrc'
+    // },
+
+    /* List of strings you have in use in addition to cjs/ es6 requires
+       & imports to declare module dependencies. Use this e.g. if you've
+       re-declared require, use a require-wrapper or use window.require as
+       a hack.
+    */
+    // exoticRequireStrings: [],
+    /* options to pass on to enhanced-resolve, the package dependency-cruiser
+       uses to resolve module references to disk. You can set most of these
+       options in a webpack.conf.js - this section is here for those
+       projects that don't have a separate webpack config file.
+
+       Note: settings in webpack.conf.js override the ones specified here.
+     */
+    enhancedResolveOptions: {
+      /* List of strings to consider as 'exports' fields in package.json. Use
+         ['exports'] when you use packages that use such a field and your environment
+         supports it (e.g. node ^12.19 || >=14.7 or recent versions of webpack).
+
+         If you have an `exportsFields` attribute in your webpack config, that one
+         will have precedence over the one specified here.
+      */ 
+      exportsFields: ["exports"],
+      /* List of conditions to check for in the exports field. e.g. use ['imports']
+         if you're only interested in exposed es6 modules, ['require'] for commonjs,
+         or all conditions at once `(['import', 'require', 'node', 'default']`)
+         if anything goes for you. Only works when the 'exportsFields' array is
+         non-empty.
+
+        If you have a 'conditionNames' attribute in your webpack config, that one will
+        have precedence over the one specified here.
+      */
+      conditionNames: ["import", "require", "node", "default"],
+      /*
+         The extensions, by default are the same as the ones dependency-cruiser
+         can access (run `npx depcruise --info` to see which ones that are in
+         _your_ environment. If that list is larger than what you need (e.g. 
+         it contains .js, .jsx, .ts, .tsx, .cts, .mts - but you don't use 
+         TypeScript you can pass just the extensions you actually use (e.g. 
+         [".js", ".jsx"]). This can speed up the most expensive step in 
+         dependency cruising (module resolution) quite a bit.
+       */
+      // extensions: [".js", ".jsx", ".ts", ".tsx", ".d.ts"],
+      /* 
+         If your TypeScript project makes use of types specified in 'types'
+         fields in package.jsons of external dependencies, specify "types"
+         in addition to "main" in here, so enhanced-resolve (the resolver
+         dependency-cruiser uses) knows to also look there. You can also do
+         this if you're not sure, but still use TypeScript. In a future version
+         of dependency-cruiser this will likely become the default.
+       */
+      mainFields: ["main", "types"],
+    },
+    reporterOptions: {
+      dot: {
+        /* pattern of modules that can be consolidated in the detailed
+           graphical dependency graph. The default pattern in this configuration
+           collapses everything in node_modules to one folder deep so you see
+           the external modules, but not the innards your app depends upon.
+         */
+        collapsePattern: 'node_modules/(@[^/]+/[^/]+|[^/]+)',
+
+        /* Options to tweak the appearance of your graph.See
+           https://github.com/sverweij/dependency-cruiser/blob/master/doc/options-reference.md#reporteroptions
+           for details and some examples. If you don't specify a theme
+           don't worry - dependency-cruiser will fall back to the default one.
+        */
+        // theme: {
+        //   graph: {
+        //     /* use splines: "ortho" for straight lines. Be aware though
+        //       graphviz might take a long time calculating ortho(gonal)
+        //       routings.
+        //    */
+        //     splines: "true"
+        //   },
+        //   modules: [
+        //     {
+        //       criteria: { matchesFocus: true },
+        //       attributes: {
+        //         fillcolor: "lime",
+        //         penwidth: 2,
+        //       },
+        //     },
+        //     {
+        //       criteria: { matchesFocus: false },
+        //       attributes: {
+        //         fillcolor: "lightgrey",
+        //       },
+        //     },
+        //     {
+        //       criteria: { matchesReaches: true },
+        //       attributes: {
+        //         fillcolor: "lime",
+        //         penwidth: 2,
+        //       },
+        //     },
+        //     {
+        //       criteria: { matchesReaches: false },
+        //       attributes: {
+        //         fillcolor: "lightgrey",
+        //       },
+        //     },
+        //     {
+        //       criteria: { source: "^src/model" },
+        //       attributes: { fillcolor: "#ccccff" }
+        //     },
+        //     {
+        //       criteria: { source: "^src/view" },
+        //       attributes: { fillcolor: "#ccffcc" }
+        //     },
+        //   ],
+        //   dependencies: [
+        //     {
+        //       criteria: { "rules[0].severity": "error" },
+        //       attributes: { fontcolor: "red", color: "red" }
+        //     },
+        //     {
+        //       criteria: { "rules[0].severity": "warn" },
+        //       attributes: { fontcolor: "orange", color: "orange" }
+        //     },
+        //     {
+        //       criteria: { "rules[0].severity": "info" },
+        //       attributes: { fontcolor: "blue", color: "blue" }
+        //     },
+        //     {
+        //       criteria: { resolved: "^src/model" },
+        //       attributes: { color: "#0000ff77" }
+        //     },
+        //     {
+        //       criteria: { resolved: "^src/view" },
+        //       attributes: { color: "#00770077" }
+        //     }
+        //   ]
+        // }
+      },
+      archi: {
+        /* pattern of modules that can be consolidated in the high level
+          graphical dependency graph. If you use the high level graphical
+          dependency graph reporter (`archi`) you probably want to tweak
+          this collapsePattern to your situation.
+        */
+        collapsePattern: '^(packages|src|lib|app|bin|test(s?)|spec(s?))/[^/]+|node_modules/(@[^/]+/[^/]+|[^/]+)',
+
+        /* Options to tweak the appearance of your graph.See
+           https://github.com/sverweij/dependency-cruiser/blob/master/doc/options-reference.md#reporteroptions
+           for details and some examples. If you don't specify a theme
+           for 'archi' dependency-cruiser will use the one specified in the
+           dot section (see above), if any, and otherwise use the default one.
+         */
+        // theme: {
+        // },
+      },
+      "text": {
+        "highlightFocused": true
+      },
+    }
+  }
+};
+// generated: dependency-cruiser@12.11.0 on 2023-03-24T14:11:38.647Z

packages/ui/certd-client/.eslintrc.js

@@ -16,14 +16,11 @@ module.exports = {
       tsx: true
     }
   },
-  extends: [
-    "plugin:vue/vue3-recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:prettier/recommended",
-    "prettier"
-  ],
+  extends: ["plugin:vue/vue3-recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended", "prettier"],
   rules: {
     //"max-len": [0, 200, 2, { ignoreUrls: true }],
+    "@typescript-eslint/no-unused-vars": "off",
+    "no-unused-vars": "off",
     "@typescript-eslint/ban-ts-ignore": "off",
     "@typescript-eslint/ban-ts-comment": "off",
     "@typescript-eslint/ban-types": "off",
@@ -32,8 +29,6 @@ module.exports = {
     "@typescript-eslint/no-var-requires": "off",
     "@typescript-eslint/no-empty-function": "off",
     "@typescript-eslint/no-use-before-define": "off",
-    "@typescript-eslint/ban-ts-comment": "off",
-    "@typescript-eslint/ban-types": "off",
     "@typescript-eslint/no-non-null-assertion": "off",
     "@typescript-eslint/explicit-module-boundary-types": "off"
     // "@typescript-eslint/no-unused-vars": [

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,43 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.2](https://github.com/certd/certd/compare/v1.2.1...v1.20.2) (2024-02-28)
+
+**Note:** Version bump only for package @certd/ui-client
+
+## [1.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12)
+
+**Note:** Version bump only for package @certd/ui-client
+
+**Note:** Version bump only for package @certd/ui-client
+
+# [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27)
+
+* 🔱: [client] sync upgrade with 2 commits [trident-sync] ([aa3207f](https://github.com/certd/certd/commit/aa3207fca5f15f7c3da789989d99c8ae7d1c4551))
+
+### BREAKING CHANGES
+
+* search支持自定义布局，search.layout、search.collapse转移到 search.container之下。如果想使用原来的search组件，请配置search.is=fs-search-v1
+
+## [1.1.6](https://github.com/certd/certd/compare/v1.1.5...v1.1.6) (2023-07-10)
+
+**Note:** Version bump only for package @certd/ui-client
+
+## [1.1.5](https://github.com/certd/certd/compare/v1.1.4...v1.1.5) (2023-07-03)
+
+**Note:** Version bump only for package @certd/ui-client
+
+## [1.1.4](https://github.com/certd/certd/compare/v1.1.3...v1.1.4) (2023-07-03)
+
+### Bug Fixes
+
+* 成功图标转动的问题 ([f87eee3](https://github.com/certd/certd/commit/f87eee3b9ff1ef9874e79a81fe0ed7104cb9ee8c))
+
+### Performance Improvements
+
+* cancel task ([bc65c0a](https://github.com/certd/certd/commit/bc65c0a786360c087fe95cad93ec6a87804cc5ee))
+* flush log ([891a43a](https://github.com/certd/certd/commit/891a43ae6716ff98ed06643f7da2e35199ee195c))
+
 ## [1.1.3](https://github.com/certd/certd/compare/v1.1.2...v1.1.3) (2023-07-03)
 
 **Note:** Version bump only for package @certd/ui-client

packages/ui/certd-client/README.md

@@ -34,3 +34,4 @@ https://github.com/fast-crud/fs-server-js
 
 
 
+

packages/ui/certd-client/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.1.3",
+  "version": "1.20.2",
   "private": true,
   "scripts": {
     "dev": "vite",
     "dev:pm": "vite --mode pm",
     "dev:force": "vite --force",
-    "debug": "vite --mode debug",
+    "debug": "vite --mode debug --open",
     "debug:pm": "vite --mode debugpm",
     "debug:force": "vite --force --mode debug",
     "build": "vite build ",
@@ -15,100 +15,110 @@
     "pretty-quick": "pretty-quick",
     "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/",
     "upgrade": "yarn upgrade-interactive --latest",
-    "tsc": "vue-tsc --noEmit --skipLibCheck"
+    "tsc": "vue-tsc --noEmit --skipLibCheck",
+    "circle:check": "pnpm dependency-cruise --validate --output-type err-html -f dependency-report.html src",
+    "afterPubPush": "git add . && git commit -m \"build: publish success\" && git push"
   },
   "author": "Greper",
-  "license": "MIT",
+  "license": "AGPL-3.0",
   "dependencies": {
-    "@ant-design/colors": "^6.0.0",
-    "@ant-design/icons-vue": "^6.0.1",
-    "@certd/acme-client": "^1.1.3",
-    "@fast-crud/fast-crud": "^1.14.4",
-    "@fast-crud/fast-extends": "^1.14.4",
-    "@fast-crud/ui-antdv": "^1.14.4",
-    "@fast-crud/ui-interface": "^1.14.4",
-    "@iconify/iconify": "^3.0.1",
-    "@iconify/json": "^2.1.151",
+    "@ant-design/colors": "^7.0.0",
+    "@ant-design/icons-vue": "^6.1.0",
+    "@aws-sdk/client-s3": "^3.383.0",
+    "@aws-sdk/s3-request-presigner": "^3.383.0",
+    "@fast-crud/fast-crud": "^1.20.1",
+    "@fast-crud/fast-extends": "^1.20.1",
+    "@fast-crud/ui-antdv": "^1.20.1",
+    "@fast-crud/ui-interface": "^1.20.1",
+    "@iconify/iconify": "^3.1.1",
+    "@iconify/json": "^2.2.98",
+    "@iconify/vue": "^4.1.1",
     "@purge-icons/generated": "^0.9.0",
     "@soerenmartius/vue3-clipboard": "^0.1.2",
-    "ant-design-vue": "^3.2.15",
-    "axios": "^1.2.1",
+    "ant-design-vue": "^3.2.20",
+    "axios": "^1.3.4",
     "axios-mock-adapter": "^1.21.2",
     "base64-js": "^1.5.1",
-    "better-scroll": "^2.5.0",
-    "china-division": "^2.4.0",
-    "core-js": "^3.26.1",
-    "cos-js-sdk-v5": "^1.4.15-beta.0",
+    "better-scroll": "^2.5.1",
+    "china-division": "^2.6.1",
+    "core-js": "^3.32.0",
+    "cos-js-sdk-v5": "^1.4.19",
     "cropperjs": "^1.5.13",
-    "dayjs": "^1.11.7",
-    "deepdash-es": "5.3.5",
-    "highlight.js": "^11.7.0",
+    "dayjs": "^1.11.9",
+    "highlight.js": "^11.8.0",
     "humanize-duration": "^3.27.3",
     "lodash-es": "^4.17.21",
-    "mitt": "^3.0.0",
+    "mitt": "^3.0.1",
     "nanoid": "^4.0.0",
     "nprogress": "^0.2.0",
     "object-assign": "^4.1.1",
-    "pinia": "2.0.28",
+    "pinia": "2.1.6",
     "qiniu-js": "^3.4.1",
-    "sortablejs": "^1.14.0",
-    "vue": "^3.2.45",
+    "sortablejs": "^1.15.0",
+    "vue": "^3.3.4",
     "vue-cropperjs": "^5.0.0",
     "vue-i18n": "^9.2.2",
-    "vue-router": "^4.1.5",
-    "vuedraggable": "^4.0.1"
+    "vue-router": "^4.2.4",
+    "vuedraggable": "^2.24.3"
   },
   "devDependencies": {
-    "@certd/pipeline": "^1.1.3",
-    "@rollup/plugin-commonjs": "^23.0.4",
-    "@rollup/plugin-node-resolve": "^15.0.1",
-    "@types/chai": "^4.3.4",
-    "@types/lodash-es": "^4.17.7",
+    "@certd/pipeline": "^1.20.2",
+    "@rollup/plugin-commonjs": "^25.0.3",
+    "@rollup/plugin-node-resolve": "^15.1.0",
+    "@types/chai": "^4.3.5",
+    "@types/lodash-es": "^4.17.8",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.11.15",
-    "@typescript-eslint/eslint-plugin": "^5.46.1",
-    "@typescript-eslint/parser": "^5.46.1",
-    "@vitejs/plugin-legacy": "^3.0.1",
-    "@vitejs/plugin-vue": "^4.0.0",
-    "@vitejs/plugin-vue-jsx": "^3.0.0",
-    "@vue/compiler-sfc": "^3.2.45",
-    "@vue/eslint-config-typescript": "^11.0.2",
-    "@vue/test-utils": "^2.2.6",
+    "@types/node": "^20.4.7",
+    "@types/nprogress": "^0.2.0",
+    "@typescript-eslint/eslint-plugin": "^6.2.1",
+    "@typescript-eslint/parser": "^6.2.1",
+    "@vitejs/plugin-legacy": "^4.1.1",
+    "@vitejs/plugin-vue": "^4.2.3",
+    "@vitejs/plugin-vue-jsx": "^3.0.1",
+    "@vue/compiler-sfc": "^3.3.4",
+    "@vue/eslint-config-typescript": "^11.0.3",
+    "@vue/test-utils": "^2.4.1",
     "autoprefixer": "^10.4.14",
     "caller-path": "^4.0.0",
     "chai": "^4.3.7",
-    "eslint": "8.29.0",
-    "eslint-config-prettier": "^8.1.0",
-    "eslint-plugin-import": "^2.26.0",
+    "dependency-cruiser": "^13.1.1",
+    "dot": "^1.1.3",
+    "eslint": "8.46.0",
+    "eslint-config-prettier": "^8.10.0",
+    "eslint-plugin-import": "^2.28.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-promise": "^6.0.1",
-    "eslint-plugin-vue": "^9.8.0",
-    "esno": "^0.16.3",
-    "husky": "^8.0.2",
+    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-vue": "^9.16.1",
+    "esno": "^0.17.0",
+    "husky": "^8.0.3",
     "less": "^4.1.3",
-    "less-loader": "^11.0.0",
-    "lint-staged": "^13.1.0",
-    "postcss": "^8.4.23",
-    "prettier": "2.8.1",
+    "less-loader": "^11.1.3",
+    "lint-staged": "^13.2.3",
+    "postcss": "^8.4.27",
+    "prettier": "3.0.1",
     "pretty-quick": "^3.1.3",
-    "rimraf": "^3.0.2",
-    "rollup": "^3.7.4",
-    "rollup-plugin-visualizer": "^5.8.2",
-    "stylelint": "^14.16.0",
-    "stylelint-config-prettier": "^9.0.4",
-    "stylelint-order": "^5.0.0",
-    "tailwindcss": "^3.3.2",
+    "rimraf": "^5.0.1",
+    "rollup": "^3.27.2",
+    "rollup-plugin-visualizer": "^5.9.2",
+    "stylelint": "^15.10.2",
+    "stylelint-config-prettier": "^9.0.5",
+    "stylelint-order": "^6.0.3",
+    "tailwindcss": "^3.3.5",
+    "terser": "^5.19.2",
     "ts-node": "^10.9.1",
-    "typescript": "4.9.4",
-    "vite": "^4.0.1",
+    "typescript": "5.1.6",
+    "unplugin-vue-define-options": "^1.3.14",
+    "vite": "^4.4.8",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-optimize-persist": "^0.1.2",
     "vite-plugin-package-config": "^0.1.1",
     "vite-plugin-purge-icons": "^0.9.2",
-    "vite-plugin-theme": "^0.8.1",
-    "vue-eslint-parser": "^9.1.0",
-    "vue-tsc": "^0.40.13"
+    "vite-plugin-theme": "^0.8.6",
+    "vite-plugin-windicss": "^1.9.0",
+    "vue-eslint-parser": "^9.3.1",
+    "vue-tsc": "^1.8.8",
+    "windicss": "^3.5.6"
   },
   "husky": {
     "hooks": {

packages/ui/certd-client/public/index.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>

packages/ui/certd-client/public/template-import.csv

@@ -0,0 +1,6 @@
+name,mobile
+张三,18603040102
+李四,18603040103
+王五,18603040104
+赵六,18603040105
+田七,18603040106

packages/ui/certd-client/src/App.vue

@@ -4,10 +4,10 @@
   </a-config-provider>
 </template>
 
-<script>
+<script lang="ts">
 import zhCN from "ant-design-vue/es/locale/zh_CN";
 import enUS from "ant-design-vue/es/locale/en_US";
-import { provide, ref, nextTick } from "vue";
+import { provide, ref, nextTick, getCurrentInstance } from "vue";
 import { usePageStore } from "/src/store/modules/page";
 import { useResourceStore } from "/src/store/modules/resource";
 import { useSettingStore } from "/@/store/modules/settings";
@@ -16,7 +16,7 @@ import "dayjs/locale/en";
 import dayjs from "dayjs";
 export default {
   name: "App",
-  setup() {
+  setup(props: any, ctx: any) {
     //刷新页面方法
     const routerEnabled = ref(true);
     const locale = ref(zhCN);
@@ -25,7 +25,7 @@ export default {
       await nextTick();
       routerEnabled.value = true;
     }
-    function localeChanged(value) {
+    function localeChanged(value: any) {
       console.log("locale changed:", value);
       if (value === "zh-cn") {
         locale.value = zhCN;

packages/ui/certd-client/src/api/tools.ts

@@ -49,13 +49,14 @@ export function responseError(data = {}, msg = "请求失败", code = 500) {
  * @param {Error} error 错误对象
  */
 export function errorLog(error: any) {
-  if (error?.response?.data?.message) {
-    error.message = error?.response?.data?.message;
-  }
   // 打印到控制台
   console.error("errorLog", error);
+  let message = error.message;
+  if (error.response?.data?.message) {
+    message = error.response.data.message;
+  }
   // 显示提示
-  uiContext.get().notification.error({ message: error.message });
+  uiContext.get().notification.error({ message });
 }
 
 /**

packages/ui/certd-client/src/components/dns-provider-selector/index.vue

@@ -16,7 +16,7 @@ export default {
     }
   },
   emits: ["update:modelValue"],
-  setup(props, ctx) {
+  setup(props:any, ctx:any) {
     const options = ref<any[]>([]);
 
     async function onCreate() {
@@ -35,7 +35,7 @@ export default {
     }
     onCreate();
 
-    function onChanged(value) {
+    function onChanged(value:any) {
       ctx.emit("update:modelValue", value);
     }
     return {

packages/ui/certd-client/src/components/highlight/index.vue

@@ -1,15 +1,18 @@
 <template>
-  <pre class="fs-highlight hljs" v-html="highlightHTML"></pre>
+  <pre class="fs-highlight hljs" v-html="highlightHTMLRef"></pre>
 </template>
 
-<script>
+<script lang="ts">
 // 相关文档
 // https://highlightjs.org/usage/
 // http://highlightjs.readthedocs.io/en/latest/api.html#configure-options
 import highlight from "highlight.js";
+import { ref, watch } from "vue";
+import { defineComponent, Ref } from "vue";
 import "../highlight-styles/github-gist.css";
-import htmlFormat from "./libs/htmlFormat";
-export default {
+//@ts-ignore
+import htmlFormat from "./libs/htmlFormat.js";
+export default defineComponent({
   name: "FsHighlight",
   props: {
     code: {
@@ -28,34 +31,31 @@ export default {
       default: ""
     }
   },
-  data() {
+  setup(props: any, ctx: any) {
+    const highlightHTMLRef: Ref = ref("");
+
+    watch(
+      () => {
+        return props.code;
+      },
+      () => {
+        doHighlight();
+      },
+      {
+        immediate: true
+      }
+    );
+
+    function doHighlight() {
+      const code = props.formatHtml ? htmlFormat(props.code) : props.code;
+      highlightHTMLRef.value = (highlight as any).highlightAuto(code, [props.lang, "html", "javascript", "json", "css", "scss", "less"]).value;
+    }
     return {
-      highlightHTML: ""
+      highlightHTMLRef,
+      doHighlight
     };
-  },
-  watch: {
-    code() {
-      this.highlight();
-    }
-  },
-  mounted() {
-    this.highlight();
-  },
-  methods: {
-    highlight() {
-      const code = this.formatHtml ? htmlFormat(this.code) : this.code;
-      this.highlightHTML = highlight.highlightAuto(code, [
-        this.lang,
-        "html",
-        "javascript",
-        "json",
-        "css",
-        "scss",
-        "less"
-      ]).value;
-    }
   }
-};
+});
 </script>
 
 <style lang="less">

packages/ui/certd-client/src/components/index.ts

@@ -4,7 +4,7 @@ import PiDnsProviderSelector from "./dns-provider-selector/index.vue";
 import PiOutputSelector from "../views/certd/pipeline/pipeline/component/output-selector/index.vue";import PiEditable from "./editable.vue";
 import { CheckCircleOutlined, InfoCircleOutlined, UndoOutlined } from "@ant-design/icons-vue";
 export default {
-  install(app) {
+  install(app:any) {
     app.component("PiContainer", PiContainer);
     app.component("PiAccessSelector", PiAccessSelector);
     app.component("PiEditable", PiEditable);

packages/ui/certd-client/src/layout/components/contextmenu/components/contentmenuList/index.vue

@@ -1,56 +0,0 @@
-<template>
-  <div class="fs-contentmenu-list" @click="rowClick">
-    <div
-      v-for="item in menulist"
-      :key="item.value"
-      :data-value="item.value"
-      class="fs-contentmenu-item"
-      flex="cross:center main:center"
-    >
-      <d2-icon v-if="item.icon" :name="item.icon" />
-      <div class="fs-contentmenu-item-title" flex-box="1">
-        {{ item.title }}
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "FsContextmenuList",
-  props: {
-    menulist: {
-      type: Array,
-      default: () => []
-    }
-  },
-  methods: {
-    rowClick(event) {
-      let target = event.target;
-      while (!target.dataset.value) {
-        target = target.parentNode;
-      }
-      this.$emit("rowClick", target.dataset.value);
-    }
-  }
-};
-</script>
-
-<style lang="less">
-.fs-contentmenu-list {
-  .fs-contentmenu-item {
-    padding: 8px 20px 8px 15px;
-    margin: 0;
-    font-size: 14px;
-    color: #606266;
-    cursor: pointer;
-    &:hover {
-      background: #ecf5ff;
-      color: #66b1ff;
-    }
-    .fs-contentmenu-item-title {
-      margin-left: 10px;
-    }
-  }
-}
-</style>

packages/ui/certd-client/src/layout/components/contextmenu/index.vue

@@ -1,68 +0,0 @@
-<template>
-  <div v-show="flag" class="fs-contextmenu" :style="style">
-    <slot />
-  </div>
-</template>
-
-<script>
-export default {
-  name: "FsContextmenu",
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    x: {
-      type: Number,
-      default: 0
-    },
-    y: {
-      type: Number,
-      default: 0
-    }
-  },
-  computed: {
-    flag: {
-      get() {
-        if (this.visible) {
-          // 注册全局监听事件 [ 目前只考虑鼠标解除触发 ]
-          window.addEventListener("mousedown", this.watchContextmenu);
-        }
-        return this.visible;
-      },
-      set(newVal) {
-        this.$emit("update:visible", newVal);
-      }
-    },
-    style() {
-      return {
-        left: this.x + "px",
-        top: this.y + "px",
-        display: this.visible ? "block" : "none "
-      };
-    }
-  },
-  mounted() {
-    // 将菜单放置到body下
-    document.querySelector("body").appendChild(this.$el);
-  },
-  methods: {
-    watchContextmenu(event) {
-      if (!this.$el.contains(event.target) || event.button !== 0) this.flag = false;
-      window.removeEventListener("mousedown", this.watchContextmenu);
-    }
-  }
-};
-</script>
-
-<style>
-.fs-contextmenu {
-  position: absolute;
-  padding: 5px 0;
-  z-index: 2018;
-  background: #fff;
-  border: 1px solid #cfd7e5;
-  border-radius: 4px;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-}
-</style>

packages/ui/certd-client/src/layout/components/locale/index.vue

@@ -22,7 +22,7 @@
   </a-dropdown>
 </template>
 
-<script>
+<script lang="ts">
 import i18n from "../../../i18n";
 import { computed, inject } from "vue";
 import _ from "lodash-es";
@@ -30,8 +30,8 @@ export default {
   name: "FsLocale",
   setup() {
     const languages = computed(() => {
-      const map = i18n.global.messages?.value || {};
-      const list = [];
+      const map: any = i18n.global.messages?.value || {};
+      const list: any = [];
       _.forEach(map, (item, key) => {
         list.push({
           key,
@@ -44,9 +44,9 @@ export default {
       return i18n.global.locale.value;
     });
 
-    const routerReload = inject("fn:router.reload");
-    const localeChanged = inject("fn:locale.changed");
-    const changeLocale = (change) => {
+    const routerReload: any = inject("fn:router.reload");
+    const localeChanged: any = inject("fn:locale.changed");
+    const changeLocale = (change: any) => {
       i18n.global.locale.value = change.key;
       routerReload();
       localeChanged(change.key);

packages/ui/certd-client/src/layout/components/menu/index.tsx

@@ -1,14 +1,13 @@
 import { useRoute, useRouter } from "vue-router";
 import { ref, watch, onMounted, onUnmounted, resolveComponent, nextTick, defineComponent } from "vue";
-import getEachDeep from "deepdash-es/getEachDeep";
 import _ from "lodash-es";
 import BScroll from "better-scroll";
 import "./index.less";
-const eachDeep = getEachDeep(_);
+import { utils } from "@fast-crud/fast-crud";
 
 function useBetterScroll(enabled = true) {
-  let bsRef = ref(null);
-  let asideMenuRef = ref();
+  const bsRef = ref(null);
+  const asideMenuRef = ref();
 
   let onOpenChange = () => {};
   if (enabled) {
@@ -71,7 +70,7 @@ export default defineComponent({
     scroll: {}
   },
   setup(props, ctx) {
-    async function open(path) {
+    async function open(path: any) {
       if (path == null) {
         return;
       }
@@ -90,23 +89,24 @@ export default defineComponent({
         console.error("导航失败", e);
       }
     }
-    function onSelect(item) {
+    function onSelect(item: any) {
       open(item.key);
     }
 
-    const FsIcon = resolveComponent("FsIcon");
+    const fsIcon = resolveComponent("FsIcon");
 
-    const buildMenus = (children) => {
-      const slots = [];
+    const buildMenus = (children: any) => {
+      const slots: any = [];
       if (children == null) {
         return slots;
       }
-      for (let sub of children) {
-        const title = () => {
+      for (const sub of children) {
+        const title: any = () => {
           if (sub?.meta?.icon) {
+            // @ts-ignore
             return (
               <div class={"menu-item-title"}>
-                <FsIcon class={"anticon"} icon={sub.meta.icon} />
+                <fsIcon class={"anticon"} icon={sub.meta.icon} />
                 <span>{sub.title}</span>
               </div>
             );
@@ -147,16 +147,16 @@ export default defineComponent({
     const route = useRoute();
     const router = useRouter();
 
-    function openSelectedParents(fullPath) {
+    function openSelectedParents(fullPath: any) {
       if (!props.expandSelected) {
         return;
       }
       if (props.menus == null) {
         return;
       }
-      const keys = [];
+      const keys: any = [];
       let changed = false;
-      eachDeep(props.menus, (value, key, parent, context) => {
+      utils.deepdash.forEachDeep(props.menus, (value: any, key: any, parent: any, context: any) => {
         if (value == null) {
           return;
         }
@@ -170,7 +170,7 @@ export default defineComponent({
         }
       });
       if (keys.length > 0) {
-        for (let key of keys) {
+        for (const key of keys) {
           if (openKeys.value.indexOf(key) === -1) {
             openKeys.value.push(key);
             changed = true;
@@ -180,7 +180,7 @@ export default defineComponent({
       return changed;
     }
 
-    const { asideMenuRef, onOpenChange } = useBetterScroll(props.scroll);
+    const { asideMenuRef, onOpenChange } = useBetterScroll(props.scroll as any);
 
     watch(
       () => {

packages/ui/certd-client/src/layout/components/source-link/index.vue

@@ -5,7 +5,7 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 import { defineComponent, ref, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
 export default defineComponent({
@@ -22,8 +22,8 @@ export default defineComponent({
       },
       { immediate: true }
     );
-    const middle = "/fast-crud/fs-admin-antdv/tree/main/src/views";
-    function goSource(prefix) {
+    const middle = "/fast-crud/fs-admin-antdv/blob/main/src/views";
+    function goSource(prefix: any) {
       const path = router.currentRoute.value.fullPath;
       window.open(prefix + middle + path + "/index.vue");
     }

packages/ui/certd-client/src/layout/components/tabs/index.vue

@@ -2,22 +2,8 @@
   <div class="fs-multiple-page-control-group">
     <div class="fs-multiple-page-control-content">
       <div class="fs-multiple-page-control-content-inner">
-        <a-tabs
-          class="fs-multiple-page-control fs-multiple-page-sort"
-          :active-key="page.getCurrent"
-          type="editable-card"
-          hide-add
-          @tabClick="handleClick"
-          @edit="handleTabEdit"
-          @contextmenu="handleContextmenu"
-        >
-          <a-tab-pane
-            v-for="item in page.getOpened"
-            :key="item.fullPath"
-            :tab="item.meta?.title || '未命名'"
-            :name="item.fullPath"
-            :closable="isTabClosable(item)"
-          />
+        <a-tabs class="fs-multiple-page-control fs-multiple-page-sort" :active-key="page.getCurrent" type="editable-card" hide-add @tabClick="handleClick" @edit="handleTabEdit">
+          <a-tab-pane v-for="item in page.getOpened" :key="item.fullPath" :tab="item.meta?.title || '未命名'" :name="item.fullPath" :closable="isTabClosable(item)" />
         </a-tabs>
         <!--        <fs-contextmenu v-model:visible="contextmenuFlag" :x="contentmenuX" :y="contentmenuY">-->
         <!--          <fs-contextmenu-list-->
@@ -33,7 +19,7 @@
         <span class="iconify" data-icon="ion:close-circle" data-inline="false"></span>
         <template #icon><DownOutlined /></template>
         <template #overlay>
-          <a-menu @click="(command) => handleControlItemClick(command)">
+          <a-menu @click="(command:any) => handleControlItemClick(command)">
             <a-menu-item key="left">
               <fs-icon name="arrow-left" class="fs-mr-10" />
               关闭左侧
@@ -57,8 +43,7 @@
   </div>
 </template>
 
-<script>
-import Sortable from "sortablejs";
+<script lang="ts">
 import { usePageStore } from "../../../store/modules/page";
 import { computed } from "vue";
 export default {
@@ -119,14 +104,14 @@ export default {
      * @description 计算某个标签页是否可关闭
      * @param {Object} page 其中一个标签页
      */
-    isTabClosable(page) {
+    isTabClosable(page: any) {
       return page.name !== "index";
     },
     /**
      * @description 右键菜单功能点击
      * @param {Object} event 事件
      */
-    handleContextmenu(event) {
+    handleContextmenu(event: any) {
       let target = event.target;
       // fix https://github.com/fs-projects/fs-admin/issues/54
       let flag = false;
@@ -148,7 +133,7 @@ export default {
      * @description 右键菜单的 row-click 事件
      * @param {String} command 事件类型
      */
-    contextmenuClick(command) {
+    contextmenuClick(command: any) {
       this.handleControlItemClick(command, this.tagName);
     },
     /**
@@ -156,7 +141,7 @@ export default {
      * @param {String} command 事件类型
      * @param {String} tagName tab 名称
      */
-    handleControlItemClick(command, tagName = null) {
+    handleControlItemClick(command: any, tagName: any = null) {
       //if (tagName) this.contextmenuFlag = false;
       const params = { pageSelect: tagName };
       switch (command.key) {
@@ -182,9 +167,9 @@ export default {
      * @param {object} tab 标签
      * @param {object} event 事件
      */
-    handleClick(tab) {
+    handleClick(tab: any) {
       // 找到点击的页面在 tag 列表里是哪个
-      const page = this.page.getOpened.find((page) => page.fullPath === tab);
+      const page = this.page.getOpened.find((page: any) => page.fullPath === tab);
       if (page) {
         const { name, params, query } = page;
         this.$router.push({ name, params, query });
@@ -194,12 +179,12 @@ export default {
      * @description 点击 tab 上的删除按钮触发这里
      * @param {String} tagName tab 名称
      */
-    handleTabEdit(tagName, action) {
+    handleTabEdit(tagName: any, action: any) {
       if (action === "remove") {
         this.close({ tagName });
       }
     }
-  }
+  } as any
 };
 </script>
 <style lang="less">
@@ -217,6 +202,11 @@ export default {
 }
 //antdv
 .fs-multiple-page-control-group {
+  .ant-tabs-tab-remove {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
   .ant-tabs-bar {
     margin: 0;
     border-bottom: 1px solid #f0f0f0;

packages/ui/certd-client/src/layout/components/theme/color-picker.vue

@@ -14,7 +14,7 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 import { defineComponent, ref } from "vue";
 const colorListDefine = [
   {
@@ -60,7 +60,7 @@ export default defineComponent({
   emits: ["change"],
   setup(props, ctx) {
     const colorList = ref(colorListDefine);
-    function changeColor(color) {
+    function changeColor(color: any) {
       ctx.emit("change", color);
     }
     return {

packages/ui/certd-client/src/layout/components/theme/index.vue

@@ -1,23 +1,13 @@
 <template>
   <div class="fs-theme" @click="show()">
     <fs-iconify icon="ion:sparkles-outline" />
-    <a-drawer
-      v-model:visible="visible"
-      title="主题设置"
-      placement="right"
-      width="350px"
-      :closable="false"
-      @after-visible-change="afterVisibleChange"
-    >
-      <fs-theme-color-picker
-        :primary-color="setting.getTheme.primaryColor"
-        @change="setting.setPrimaryColor"
-      ></fs-theme-color-picker>
+    <a-drawer v-model:visible="visible" title="主题设置" placement="right" width="350px" :closable="false" @after-visible-change="afterVisibleChange">
+      <fs-theme-color-picker :primary-color="setting.getTheme.primaryColor" @change="setting.setPrimaryColor"></fs-theme-color-picker>
     </a-drawer>
   </div>
 </template>
 
-<script>
+<script lang="ts">
 import { ref, defineComponent } from "vue";
 import FsThemeColorPicker from "./color-picker.vue";
 import { useSettingStore } from "/@/store/modules/settings";

packages/ui/certd-client/src/layout/components/user-info/index.vue

@@ -10,7 +10,7 @@
     </template>
   </a-dropdown>
 </template>
-<script>
+<script lang="ts">
 import { defineComponent } from "vue";
 import { useUserStore } from "/src/store/modules/user";
 import { Modal } from "ant-design-vue";

packages/ui/certd-client/src/layout/layout-framework.vue

@@ -58,7 +58,7 @@
   </a-layout>
 </template>
 
-<script>
+<script lang="ts">
 import { computed, onErrorCaptured, ref } from "vue";
 import FsMenu from "./components/menu/index.jsx";
 import FsLocale from "./components/locale/index.vue";
@@ -152,6 +152,11 @@ export default {
     background: #f6f6f6;
     display: flex;
     justify-content: space-between;
+
+    > div {
+      height: auto;
+      padding: 5px;
+    }
   }
   .header-buttons {
     display: flex;

packages/ui/certd-client/src/layout/layout-outside.vue

@@ -25,7 +25,7 @@
     </div>
   </div>
 </template>
-<script>
+<script lang="ts">
 export default {
   name: "LayoutOutside"
 };
@@ -75,7 +75,10 @@ export default {
 
       .top {
         text-align: center;
-
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
         .header {
           height: 44px;
           line-height: 44px;

packages/ui/certd-client/src/main.ts

@@ -2,15 +2,19 @@ import { createApp } from "vue";
 import App from "./App.vue";
 import router from "./router";
 import Antd from "ant-design-vue";
+import "ant-design-vue/dist/antd.less";
 import "./style/common.less";
+
 import i18n from "./i18n";
 import store from "./store";
 import components from "./components";
 import plugin from "./plugin/";
 
+// 正式项目请删除mock，避免影响性能
+//import "./mock";
+
 // @ts-ignore
 const app = createApp(App);
-// 尽量
 app.use(Antd);
 app.use(router);
 app.use(i18n);

packages/ui/certd-client/src/mock/base.ts

@@ -1,7 +1,11 @@
 import _ from "lodash-es";
-function copyList(originList, newList, options, parentId) {
+function copyList(originList: any, newList: any, options: any, parentId?: any) {
   for (const item of originList) {
-    const newItem = { ...item, parentId };
+    const newItem: any = _.cloneDeep(item);
+    if(parentId!= null && newItem.parentId == null){
+      newItem.parentId = parentId;
+    }
+
     newItem.id = ++options.idGenerator;
     newList.push(newItem);
     if (item.children != null) {
@@ -11,7 +15,7 @@ function copyList(originList, newList, options, parentId) {
   }
 }
 
-function delById(req, list) {
+function delById(req: any, list: any) {
   for (let i = 0; i < list.length; i++) {
     const item = list[i];
     console.log("remove i", i, req, req.params.id, item.id);
@@ -26,27 +30,38 @@ function delById(req, list) {
   }
 }
 
-function findById(id, list) {
+function findById(id: any, list: any) {
   for (const item of list) {
     if (item.id === id) {
       return item;
     }
     if (item.children != null && item.children.length > 0) {
-      const sub = findById(id, item.children);
+      const sub: any = findById(id, item.children);
       if (sub != null) {
         return sub;
       }
     }
   }
 }
-export default {
+function findByIds(ids: any[], list: any) {
+  const res = [];
+  for (const id of ids) {
+    const item = findById(id, list);
+    if (item != null) {
+      res.push(item);
+    }
+  }
+  console.log("findbyids", res, ids);
+  return res;
+}
+const mockUtil: any = {
   findById,
-  buildMock(options) {
+  buildMock(options: any) {
     const name = options.name;
     if (options.copyTimes == null) {
       options.copyTimes = 29;
     }
-    const list = [];
+    const list: any = [];
     for (let i = 0; i < options.copyTimes; i++) {
       copyList(options.list, list, options);
     }
@@ -55,7 +70,7 @@ export default {
       {
         path: "/mock/" + name + "/page",
         method: "get",
-        handle(req) {
+        handle(req: any) {
           let data = [...list];
           let limit = 20;
           let offset = 0;
@@ -65,9 +80,10 @@ export default {
               item.lazy = false;
             }
           }
-          let orderProp, orderAsc;
+          let orderProp: any, orderAsc: any;
           if (req && req.body) {
-            const { page, query, sort } = req.body;
+            const { page, sort } = req.body;
+            let query = req.body.query;
             if (page.limit != null) {
               limit = parseInt(page.limit);
             }
@@ -76,9 +92,9 @@ export default {
             }
             orderProp = sort.prop;
             orderAsc = sort.asc;
-
+            query = query || {};
             if (Object.keys(query).length > 0) {
-              data = list.filter((item) => {
+              data = list.filter((item: any) => {
                 let allFound = true; // 是否所有条件都符合
                 for (const key in query) {
                   // 判定某一个条件
@@ -169,16 +185,10 @@ export default {
       {
         path: "/mock/" + name + "/get",
         method: "get",
-        handle(req) {
+        handle(req: any) {
           let id = req.params.id;
           id = parseInt(id);
-          let current = null;
-          for (const item of list) {
-            if (item.id === id) {
-              current = item;
-              break;
-            }
-          }
+          const current = findById(req.body.id, list);
           return {
             code: 0,
             msg: "success",
@@ -186,23 +196,36 @@ export default {
           };
         }
       },
+      {
+        path: "/mock/" + name + "/byIds",
+        method: "post",
+        handle(req: any) {
+          const ids = req.body.ids;
+          const res = findByIds(ids, list);
+          return {
+            code: 0,
+            msg: "success",
+            data: res
+          };
+        }
+      },
       {
         path: "/mock/" + name + "/add",
         method: "post",
-        handle(req) {
+        handle(req: any) {
           req.body.id = ++options.idGenerator;
           list.unshift(req.body);
           return {
             code: 0,
             msg: "success",
-            data: req.body.id
+            data: _.cloneDeep(req.body)
           };
         }
       },
       {
         path: "/mock/" + name + "/update",
         method: "post",
-        handle(req) {
+        handle(req: any): any {
           const item = findById(req.body.id, list);
           if (item) {
             _.mergeWith(item, req.body, (objValue, srcValue) => {
@@ -225,7 +248,7 @@ export default {
       {
         path: "/mock/" + name + "/delete",
         method: "post",
-        handle(req) {
+        handle(req: any): any {
           delById(req, list);
           return {
             code: 0,
@@ -237,7 +260,7 @@ export default {
       {
         path: "/mock/" + name + "/batchDelete",
         method: "post",
-        handle(req) {
+        handle(req: any): any {
           const ids = req.body.ids;
           for (let i = list.length - 1; i >= 0; i--) {
             const item = list[i];
@@ -255,7 +278,7 @@ export default {
       {
         path: "/mock/" + name + "/delete",
         method: "post",
-        handle(req) {
+        handle(req: any): any {
           delById(req, list);
           return {
             code: 0,
@@ -267,14 +290,72 @@ export default {
       {
         path: "/mock/" + name + "/all",
         method: "post",
-        handle(req) {
+        handle(req: any): any {
           return {
             code: 0,
             msg: "success",
             data: list
           };
         }
+      },
+      {
+        path: "/mock/" + name + "/cellUpdate",
+        method: "post",
+        handle(req: any): any {
+          console.log("req", req);
+          let item = findById(req.body.id, list);
+          if (item) {
+            _.mergeWith(item, { [req.body.key]: req.body.value }, (objValue, srcValue) => {
+              if (srcValue == null) {
+                return;
+              }
+              // 如果被合并对象为数组，则直接被覆盖对象覆盖，只要覆盖对象不为空
+              if (_.isArray(objValue)) {
+                return srcValue;
+              }
+            });
+          } else {
+            item = {
+              id: ++options.idGenerator,
+              [req.body.key]: req.body.value
+            };
+            list.unshift(item);
+          }
+
+          return {
+            code: 0,
+            msg: "success",
+            data: item
+          };
+        }
+      },
+      {
+        path: "/mock/" + name + "/columnUpdate",
+        method: "post",
+        handle(req: any): any {
+          for (const item of req.body) {
+            const item2 = findById(item.id, list);
+            if (item2) {
+              _.mergeWith(item2, item, (objValue, srcValue) => {
+                if (srcValue == null) {
+                  return;
+                }
+                // 如果被合并对象为数组，则直接被覆盖对象覆盖，只要覆盖对象不为空
+                if (_.isArray(objValue)) {
+                  return srcValue;
+                }
+              });
+            }
+          }
+          return {
+            code: 0,
+            msg: "success",
+            data: null
+          };
+        }
       }
     ];
   }
 };
+
+export default mockUtil;