v1.25.5

CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.25.5](https://github.com/certd/certd/compare/v1.25.4...v1.25.5) (2024-09-26)
+
+**Note:** Version bump only for package root
+
+## [1.25.4](https://github.com/certd/certd/compare/v1.25.3...v1.25.4) (2024-09-25)
+
+### Bug Fixes
+
+* 修复启动报授权验证失败的bug ([3460d3d](https://github.com/certd/certd/commit/3460d3ddca222ea702816ab805909d489eff957f))
+
+## [1.25.3](https://github.com/certd/certd/compare/v1.25.2...v1.25.3) (2024-09-24)
+
+### Bug Fixes
+
+* 修复upload to host trim错误 ([0f0ddb9](https://github.com/certd/certd/commit/0f0ddb9c5963fd643d6d203334efac471c43ec3b))
+
+## [1.25.2](https://github.com/certd/certd/compare/v1.25.1...v1.25.2) (2024-09-24)
+
+**Note:** Version bump only for package root
+
+## [1.25.1](https://github.com/certd/certd/compare/v1.25.0...v1.25.1) (2024-09-24)
+
+**Note:** Version bump only for package root
+
 # [1.25.0](https://github.com/certd/certd/compare/v1.24.4...v1.25.0) (2024-09-24)
 
 ### Bug Fixes

README.md

@@ -70,13 +70,12 @@ https://certd.handsfree.work/
 
 3. 安装完成后在应用商店中找到`certd`，点击安装，配置域名等基本信息即可完成安装
 
-### 4.2 Docker部署
+### 4.2 Docker部署【推荐】
 #### 1. 安装docker、docker-compose
 
 1.1 准备一台云服务器
 * 【阿里云】云服务器2核2G，新老用户同享，99元/年，续费同价！【 [立即购买](https://www.aliyun.com/benefit?scm=20140722.M_10244282._.V_1&source=5176.11533457&userCode=qya11txb )】
 * 【腾讯云】云服务器2核2G，新老用户同享，99元/年，续费同价！【 [立即购买](https://cloud.tencent.com/act/cps/redirect?redirect=6094&cps_key=b3ef73330335d7a6efa4a4bbeeb6b2c9&from=console)】
-  
 
 1.2 安装docker      
 
@@ -110,7 +109,7 @@ docker compose up -d
 > 如果提示 没有compose命令,请安装docker-compose   
 > https://docs.docker.com/compose/install/linux/
 
-#### 镜像说明：
+#### 3. 镜像说明：
 * 国内镜像地址:
   * `registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest`
   * `registry.cn-shenzhen.aliyuncs.com/handsfree/certd:armv7`、`[version]-armv7`
@@ -124,13 +123,19 @@ docker compose up -d
 
 ![](./doc/images/action-build.jpg)
 
-#### 3. 访问
+#### 4. 访问测试
 
 http://your_server_ip:7001    
 默认账号密码：admin/123456    
 记得修改密码   
 
-
+### 4.3 源码部署
+```shell
+# 克隆代码
+git clone https://github.com/certd/certd
+cd certd
+./start.sh  
+```
 
 
 ## 五、 升级
@@ -223,11 +228,13 @@ https://afdian.com/a/greper
 
 ## 十一、贡献代码
 
-1.  [贡献插件教程](./plugin.md)
+1. 本地开发 [贡献插件教程](./dev/development.md)
 2. 作为贡献者，代表您同意您贡献的代码如下许可：
    1. 可以调整开源协议以使其更严格或更宽松。
    2. 可以用于商业用途。
 
+
+
 ## 十二、 开源许可
 * 本项目遵循 GNU Affero General Public License（AGPL）开源协议。   
 * 允许个人和公司使用、复制、修改和分发本项目，禁止任何形式的商业用途 

build.trigger

@@ -1 +1 @@
-1
+09:53

doc/dev/development.md

@@ -1,4 +1,5 @@
-# 贡献插件
+# 本地开发
+欢迎贡献插件
 
 ## 1.本地调试运行
 
@@ -11,9 +12,6 @@ git clone https://github.com/certd/certd
 #进入项目目录
 cd certd
 
-# 切换到最新的版本tag，v2分支可能不稳定
-checkout tags/vx.x.x # x.x.x为最新的版本号
-
 # 安装依赖
 npm install -g pnpm@8.15.7
 pnpm install

init.sh

@@ -1,3 +1,4 @@
+
 current_pwd=$(pwd)
 
 echo "开始设置git配置"

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.25.0"
+  "version": "1.25.5"
 }

package.json

@@ -16,7 +16,7 @@
     "afterpublishOnly": "time /t >build.trigger && git add ./build.trigger && git commit -m \"build: trigger build image\" && TIMEOUT /T 10 && git push",
     "prepublishOnly1": "npm run check && lerna run build ",
     "prepublishOnly2": "npm run check && npm run before-build && lerna run build ",
-    "before-build": "cd ./packages/core/pipeline && time /t >build.md && git add ./build.md && git commit -m \"build: prepare to build\"",
+    "before-build": "cd ./packages/pro/plus-core && time /t >build.md && git add ./build.md && git commit -m \"build: prepare to build\"",
     "deploy1": "node --experimental-json-modules deploy.js ",
     "check": "node --experimental-json-modules publish-check.js",
     "init": "lerna run build"
@@ -29,4 +29,4 @@
   "workspaces": [
     "packages/**"
   ]
-}
+}

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.25.5](https://github.com/publishlab/node-acme-client/compare/v1.25.4...v1.25.5) (2024-09-26)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.25.4](https://github.com/publishlab/node-acme-client/compare/v1.25.3...v1.25.4) (2024-09-25)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.25.3](https://github.com/publishlab/node-acme-client/compare/v1.25.2...v1.25.3) (2024-09-24)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.25.2](https://github.com/publishlab/node-acme-client/compare/v1.25.1...v1.25.2) (2024-09-24)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.25.1](https://github.com/publishlab/node-acme-client/compare/v1.25.0...v1.25.1) (2024-09-24)
+
+**Note:** Version bump only for package @certd/acme-client
+
 # [1.25.0](https://github.com/publishlab/node-acme-client/compare/v1.24.4...v1.25.0) (2024-09-24)
 
 ### Performance Improvements

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.25.0",
+    "version": "1.25.5",
     "main": "src/index.js",
     "types": "types/index.d.ts",
     "license": "MIT",
@@ -59,5 +59,5 @@
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
     },
-    "gitHead": "6fe2d2c3288b698e9cbdc91725abcbb072278fab"
+    "gitHead": "03ce69dbfb317db7a3688d33ccc17ef06fd68393"
 }

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.25.5](https://github.com/certd/certd/compare/v1.25.4...v1.25.5) (2024-09-26)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.25.4](https://github.com/certd/certd/compare/v1.25.3...v1.25.4) (2024-09-25)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.25.3](https://github.com/certd/certd/compare/v1.25.2...v1.25.3) (2024-09-24)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.25.2](https://github.com/certd/certd/compare/v1.25.1...v1.25.2) (2024-09-24)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.25.1](https://github.com/certd/certd/compare/v1.25.0...v1.25.1) (2024-09-24)
+
+**Note:** Version bump only for package @certd/pipeline
+
 # [1.25.0](https://github.com/certd/certd/compare/v1.24.4...v1.25.0) (2024-09-24)
 
 ### Bug Fixes

packages/core/pipeline/build.md

@@ -1 +1 @@
-02:35
+02:40

packages/core/pipeline/package.json

@@ -1,20 +1,21 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.25.0",
+  "version": "1.25.5",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {
     "dev": "vite",
-    "build": "tsc --skipLibCheck",
+    "before-build": "rimraf dist && rimraf tsconfig.tsbuildinfo && rimraf .rollup.cache",
+    "build": "npm run before-build && tsc --skipLibCheck",
     "build3": "rollup -c",
     "build2": "vue-tsc --noEmit && vite build",
     "preview": "vite preview",
     "test": "mocha   --loader=ts-node/esm"
   },
   "dependencies": {
-    "@certd/plus": "1.22.1",
+    "@certd/plus-core": "^1.25.4",
     "axios": "^1.7.2",
     "fix-path": "^4.0.0",
     "http-proxy-agent": "^7.0.2",
@@ -50,6 +51,7 @@
     "mocha": "^10.2.0",
     "prettier": "^2.8.8",
     "reflect-metadata": "^0.1.13",
+    "rimraf": "^5.0.5",
     "rollup": "^3.7.4",
     "rollup-plugin-typescript2": "^0.34.1",
     "rollup-plugin-visualizer": "^5.8.2",
@@ -60,5 +62,5 @@
     "vite": "^4.3.8",
     "vue-tsc": "^1.6.5"
   },
-  "gitHead": "6fe2d2c3288b698e9cbdc91725abcbb072278fab"
+  "gitHead": "03ce69dbfb317db7a3688d33ccc17ef06fd68393"
 }

packages/core/pipeline/src/core/license.ts

@@ -1,7 +1,7 @@
 import { logger } from "../utils/index.js";
-import { setLogger, isPlus } from "@certd/plus";
+import { setLogger, isPlus } from "@certd/plus-core";
 setLogger(logger);
-export * from "@certd/plus";
+export * from "@certd/plus-core";
 
 export function checkPlus() {
   if (!isPlus()) {

packages/libs/lib-huawei/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.25.5](https://github.com/certd/certd/compare/v1.25.4...v1.25.5) (2024-09-26)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.24.3](https://github.com/certd/certd/compare/v1.24.2...v1.24.3) (2024-09-06)
 
 **Note:** Version bump only for package @certd/lib-huawei

packages/libs/lib-huawei/package.json

@@ -1,19 +1,20 @@
 {
   "name": "@certd/lib-huawei",
   "private": false,
-  "version": "1.24.3",
+  "version": "1.25.5",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
   "types": "./dist/d/index.d.ts",
   "scripts": {
     "dev": "vite",
-    "build": "rollup -c ",
+    "before-build": "rimraf dist && rimraf tsconfig.tsbuildinfo && rimraf .rollup.cache",
+    "build": "npm run before-build && rollup -c ",
     "build2": "vue-tsc --noEmit && vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/pipeline": "1.21.0",
     "axios": "^1.7.2",
+    "rimraf": "^5.0.5",
     "rollup": "^3.7.4"
   },
   "gitHead": "c49ccbde93dbad7062ac39d4f18eca7d561f573f"

packages/libs/lib-iframe/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.25.5](https://github.com/certd/certd/compare/v1.25.4...v1.25.5) (2024-09-26)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.25.4](https://github.com/certd/certd/compare/v1.25.3...v1.25.4) (2024-09-25)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.25.3](https://github.com/certd/certd/compare/v1.25.2...v1.25.3) (2024-09-24)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.25.2](https://github.com/certd/certd/compare/v1.25.1...v1.25.2) (2024-09-24)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.25.1](https://github.com/certd/certd/compare/v1.25.0...v1.25.1) (2024-09-24)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
 # [1.25.0](https://github.com/certd/certd/compare/v1.24.4...v1.25.0) (2024-09-24)
 
 ### Features

packages/libs/lib-iframe/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@certd/lib-iframe",
   "private": false,
-  "version": "1.25.0",
+  "version": "1.25.5",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {
     "dev": "vite",
-    "build": "tsc --skipLibCheck",
+    "before-build": "rimraf dist && rimraf tsconfig.tsbuildinfo && rimraf .rollup.cache",
+    "build": "npm run before-build && tsc --skipLibCheck",
     "build3": "rollup -c",
     "build2": "vue-tsc --noEmit && vite build",
     "preview": "vite preview"
@@ -30,11 +31,12 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
     "prettier": "^2.8.8",
+    "rimraf": "^5.0.5",
     "rollup": "^3.7.4",
     "rollup-plugin-visualizer": "^5.8.2",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.2",
     "typescript": "^4.8.4"
   },
-  "gitHead": "6fe2d2c3288b698e9cbdc91725abcbb072278fab"
+  "gitHead": "03ce69dbfb317db7a3688d33ccc17ef06fd68393"
 }

packages/libs/lib-jdcloud/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.25.5](https://github.com/certd/certd/compare/v1.25.4...v1.25.5) (2024-09-26)
+
+**Note:** Version bump only for package @certd/lib-jdcloud
+
+## [1.25.4](https://github.com/certd/certd/compare/v1.25.3...v1.25.4) (2024-09-25)
+
+**Note:** Version bump only for package @certd/lib-jdcloud
+
+## [1.25.3](https://github.com/certd/certd/compare/v1.25.2...v1.25.3) (2024-09-24)
+
+**Note:** Version bump only for package @certd/lib-jdcloud
+
+## [1.25.2](https://github.com/certd/certd/compare/v1.25.1...v1.25.2) (2024-09-24)
+
+**Note:** Version bump only for package @certd/lib-jdcloud
+
+## [1.25.1](https://github.com/certd/certd/compare/v1.25.0...v1.25.1) (2024-09-24)
+
+**Note:** Version bump only for package @certd/lib-jdcloud
+
 # [1.25.0](https://github.com/certd/certd/compare/v1.24.4...v1.25.0) (2024-09-24)
 
 **Note:** Version bump only for package @certd/lib-jdcloud

packages/libs/lib-jdcloud/package.json

@@ -1,28 +1,31 @@
 {
   "name": "@certd/lib-jdcloud",
   "private": false,
-  "version": "1.25.0",
+  "version": "1.25.5",
   "main": "./dist/bundle.mjs",
   "module": "./dist/bundle.mjs",
   "types": "./dist/d/index.d.ts",
   "scripts": {
     "dev": "vite",
-    "build": "rollup -c ",
+    "before-build": "rimraf dist && rimraf tsconfig.tsbuildinfo && rimraf .rollup.cache",
+    "build": "npm run before-build && rollup -c ",
     "build2": "vue-tsc --noEmit && vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/pipeline": "1.21.0",
     "axios": "^1.7.2",
-    "babel-register": "^6.26.0",
     "buffer": "^5.0.8",
     "create-hash": "^1.1.3",
     "create-hmac": "^1.1.6",
     "debug": "^3.1.0",
     "node-fetch": "^2.1.2",
-    "rollup": "^3.7.4",
     "url": "^0.11.0",
     "uuid": "^3.1.0"
   },
-  "gitHead": "c49ccbde93dbad7062ac39d4f18eca7d561f573f"
+  "devDependencies": {
+    "babel-register": "^6.26.0",
+    "rimraf": "^5.0.5",
+    "rollup": "^3.7.4"
+  },
+  "gitHead": "03ce69dbfb317db7a3688d33ccc17ef06fd68393"
 }

packages/libs/lib-k8s/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.25.5](https://github.com/certd/certd/compare/v1.25.4...v1.25.5) (2024-09-26)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.25.4](https://github.com/certd/certd/compare/v1.25.3...v1.25.4) (2024-09-25)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.25.3](https://github.com/certd/certd/compare/v1.25.2...v1.25.3) (2024-09-24)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.25.2](https://github.com/certd/certd/compare/v1.25.1...v1.25.2) (2024-09-24)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.25.1](https://github.com/certd/certd/compare/v1.25.0...v1.25.1) (2024-09-24)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 # [1.25.0](https://github.com/certd/certd/compare/v1.24.4...v1.25.0) (2024-09-24)
 
 ### Performance Improvements

packages/libs/lib-k8s/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@certd/lib-k8s",
   "private": false,
-  "version": "1.25.0",
+  "version": "1.25.5",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {
     "dev": "vite",
-    "build": "tsc --skipLibCheck",
+    "before-build": "rimraf dist && rimraf tsconfig.tsbuildinfo && rimraf .rollup.cache",
+    "build": "npm run before-build && tsc --skipLibCheck",
     "build3": "rollup -c",
     "build2": "vue-tsc --noEmit && vite build",
     "preview": "vite preview"
@@ -16,7 +17,7 @@
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
-    "@certd/pipeline": "^1.25.0",
+    "@certd/pipeline": "^1.25.5",
     "@rollup/plugin-commonjs": "^23.0.4",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
@@ -31,11 +32,12 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
     "prettier": "^2.8.8",
+    "rimraf": "^5.0.5",
     "rollup": "^3.7.4",
     "rollup-plugin-visualizer": "^5.8.2",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.2",
     "typescript": "^4.8.4"
   },
-  "gitHead": "6fe2d2c3288b698e9cbdc91725abcbb072278fab"
+  "gitHead": "03ce69dbfb317db7a3688d33ccc17ef06fd68393"
 }

packages/libs/midway-flyway-js/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.25.5](https://github.com/certd/certd/compare/v1.25.4...v1.25.5) (2024-09-26)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.25.4](https://github.com/certd/certd/compare/v1.25.3...v1.25.4) (2024-09-25)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.25.3](https://github.com/certd/certd/compare/v1.25.2...v1.25.3) (2024-09-24)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.25.2](https://github.com/certd/certd/compare/v1.25.1...v1.25.2) (2024-09-24)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.25.1](https://github.com/certd/certd/compare/v1.25.0...v1.25.1) (2024-09-24)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
 # [1.25.0](https://github.com/certd/certd/compare/v1.24.4...v1.25.0) (2024-09-24)
 
 **Note:** Version bump only for package @certd/midway-flyway-js

packages/libs/midway-flyway-js/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@certd/midway-flyway-js",
-  "version": "1.25.0",
+  "version": "1.25.5",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {
-    "build": "tsc --skipLibCheck",
+    "before-build": "rimraf dist && rimraf tsconfig.tsbuildinfo && rimraf .rollup.cache",
+    "build": "npm run before-build && tsc --skipLibCheck",
     "test": "midway-bin test --ts -V",
     "test1": "midway-bin test --ts -V -f test/blank.test.ts -t 'hash-check'",
     "cov": "midway-bin cov --ts",
@@ -46,6 +47,7 @@
     "mwts": "^1.3.0",
     "mwtsc": "^1.4.0",
     "prettier": "^2.8.8",
+    "rimraf": "^5.0.5",
     "rollup": "^3.7.4",
     "rollup-plugin-visualizer": "^5.8.2",
     "ts-node": "^10.9.1",
@@ -53,5 +55,5 @@
     "typeorm": "^0.3.11",
     "typescript": "~5.1.0"
   },
-  "gitHead": "6fe2d2c3288b698e9cbdc91725abcbb072278fab"
+  "gitHead": "03ce69dbfb317db7a3688d33ccc17ef06fd68393"
 }

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.25.5](https://github.com/certd/certd/compare/v1.25.4...v1.25.5) (2024-09-26)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.25.4](https://github.com/certd/certd/compare/v1.25.3...v1.25.4) (2024-09-25)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.25.3](https://github.com/certd/certd/compare/v1.25.2...v1.25.3) (2024-09-24)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.25.2](https://github.com/certd/certd/compare/v1.25.1...v1.25.2) (2024-09-24)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.25.1](https://github.com/certd/certd/compare/v1.25.0...v1.25.1) (2024-09-24)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
 # [1.25.0](https://github.com/certd/certd/compare/v1.24.4...v1.25.0) (2024-09-24)
 
 ### Features

packages/plugins/plugin-cert/package.json

@@ -1,23 +1,25 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.25.0",
+  "version": "1.25.5",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {
     "dev": "vite",
-    "build": "tsc --skipLibCheck",
+    "before-build": "rimraf dist && rimraf tsconfig.tsbuildinfo && rimraf .rollup.cache",
+    "build": "npm run before-build &&tsc --skipLibCheck",
     "build3": "rollup -c",
     "build2": "vue-tsc --noEmit && vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.25.0",
+    "@certd/acme-client": "^1.25.5",
-    "@certd/pipeline": "^1.25.0",
+    "@certd/pipeline": "^1.25.5",
     "jszip": "^3.10.1",
     "node-forge": "^0.10.0",
-    "psl": "^1.9.0"
+    "psl": "^1.9.0",
+    "rimraf": "^5.0.5"
   },
   "devDependencies": {
     "@alicloud/cs20151215": "^3.0.3",
@@ -53,5 +55,5 @@
     "vite": "^3.1.0",
     "vue-tsc": "^0.38.9"
   },
-  "gitHead": "6fe2d2c3288b698e9cbdc91725abcbb072278fab"
+  "gitHead": "03ce69dbfb317db7a3688d33ccc17ef06fd68393"
 }

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.25.5](https://github.com/certd/certd/compare/v1.25.4...v1.25.5) (2024-09-26)
+
+**Note:** Version bump only for package @certd/ui-client
+
+## [1.25.4](https://github.com/certd/certd/compare/v1.25.3...v1.25.4) (2024-09-25)
+
+**Note:** Version bump only for package @certd/ui-client
+
+## [1.25.3](https://github.com/certd/certd/compare/v1.25.2...v1.25.3) (2024-09-24)
+
+**Note:** Version bump only for package @certd/ui-client
+
+## [1.25.2](https://github.com/certd/certd/compare/v1.25.1...v1.25.2) (2024-09-24)
+
+**Note:** Version bump only for package @certd/ui-client
+
+## [1.25.1](https://github.com/certd/certd/compare/v1.25.0...v1.25.1) (2024-09-24)
+
+**Note:** Version bump only for package @certd/ui-client
+
 # [1.25.0](https://github.com/certd/certd/compare/v1.24.4...v1.25.0) (2024-09-24)
 
 ### Bug Fixes

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.25.0",
+  "version": "1.25.5",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -58,8 +58,8 @@
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.25.0",
+    "@certd/lib-iframe": "^1.25.5",
-    "@certd/pipeline": "^1.25.0",
+    "@certd/pipeline": "^1.25.5",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/trigger-form/index.vue

@@ -59,7 +59,7 @@
                 vModel: 'modelValue'
               },
               helper:
-                '点击上面的按钮，选择每天几点几分定时执行，后面的分秒都要选择0。\n 例如：0 0 4 * * *，每天凌晨4点0分0秒触发\n建议设置为每天触发一次，证书未到期之前任务会跳过，不会重复执行',
+                '点击上面的按钮，选择每天几点几分定时执行，后面的分秒都要选择0。\n例如：0 0 4 * * *，每天凌晨4点0分0秒触发\n建议设置为每天触发一次，证书未到期之前任务会跳过，不会重复执行',
               rules: [{ required: true, message: '此项必填' }]
             }"
           />

packages/ui/certd-server/.env.development.yaml

@@ -9,7 +9,7 @@ plus:
 #typeorm:
 #  dataSource:
 #    default:
-#      database: './data/db1.sqlite'
+#      database: './data/db2.sqlite'
 #account:
 #  server:
 #    baseUrl: 'http://127.0.0.1:1017/subject'

packages/ui/certd-server/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.25.5](https://github.com/certd/certd/compare/v1.25.4...v1.25.5) (2024-09-26)
+
+**Note:** Version bump only for package @certd/ui-server
+
+## [1.25.4](https://github.com/certd/certd/compare/v1.25.3...v1.25.4) (2024-09-25)
+
+### Bug Fixes
+
+* 修复启动报授权验证失败的bug ([3460d3d](https://github.com/certd/certd/commit/3460d3ddca222ea702816ab805909d489eff957f))
+
+## [1.25.3](https://github.com/certd/certd/compare/v1.25.2...v1.25.3) (2024-09-24)
+
+### Bug Fixes
+
+* 修复upload to host trim错误 ([0f0ddb9](https://github.com/certd/certd/commit/0f0ddb9c5963fd643d6d203334efac471c43ec3b))
+
+## [1.25.2](https://github.com/certd/certd/compare/v1.25.1...v1.25.2) (2024-09-24)
+
+**Note:** Version bump only for package @certd/ui-server
+
+## [1.25.1](https://github.com/certd/certd/compare/v1.25.0...v1.25.1) (2024-09-24)
+
+**Note:** Version bump only for package @certd/ui-server
+
 # [1.25.0](https://github.com/certd/certd/compare/v1.24.4...v1.25.0) (2024-09-24)
 
 ### Bug Fixes

packages/ui/certd-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-server",
-  "version": "1.25.0",
+  "version": "1.25.5",
   "description": "fast-server base midway",
   "private": true,
   "type": "module",
@@ -22,14 +22,15 @@
   "dependencies": {
     "@alicloud/cs20151215": "^3.0.3",
     "@alicloud/pop-core": "^1.7.10",
-    "@certd/acme-client": "^1.25.0",
+    "@certd/acme-client": "^1.25.5",
-    "@certd/lib-huawei": "^1.24.3",
+    "@certd/lib-huawei": "^1.25.5",
-    "@certd/lib-jdcloud": "^1.25.0",
+    "@certd/lib-jdcloud": "^1.25.5",
-    "@certd/lib-k8s": "^1.25.0",
+    "@certd/lib-k8s": "^1.25.5",
-    "@certd/midway-flyway-js": "^1.25.0",
+    "@certd/midway-flyway-js": "^1.25.5",
-    "@certd/pipeline": "^1.25.0",
+    "@certd/pipeline": "^1.25.5",
-    "@certd/plugin-cert": "^1.25.0",
+    "@certd/plugin-cert": "^1.25.5",
-    "@certd/plugin-plus": "^1.25.0",
+    "@certd/plugin-plus": "^1.25.5",
+    "@certd/plus-core": "^1.25.4",
     "@koa/cors": "^5.0.0",
     "@midwayjs/bootstrap": "^3.16.2",
     "@midwayjs/cache": "^3.14.0",
@@ -68,6 +69,7 @@
     "qiniu": "^7.12.0",
     "querystring": "^0.2.1",
     "reflect-metadata": "^0.1.13",
+    "rimraf": "^5.0.5",
     "ssh2": "^1.15.0",
     "strip-ansi": "^7.1.0",
     "svg-captcha": "^1.4.0",

packages/ui/certd-server/src/modules/basic/service/plus-service.ts

@@ -47,25 +47,24 @@ export class PlusService {
     }
     licenseInfo.license = license;
     await this.sysSettingsService.saveSetting(licenseInfo);
-    await this.verify();
+    const verifyRes = await this.verify();
-  }
-  async verify() {
-    const licenseInfo: SysLicenseInfo = await this.sysSettingsService.getSetting(SysLicenseInfo);
-    const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
-
-    const verifyRes = await verify({
-      subjectId: installInfo.siteId,
-      license: licenseInfo.license,
-      plusRequestService: this.plusRequestService,
-      bindUrl: installInfo?.bindUrl,
-    });
-
     if (!verifyRes.isPlus) {
       const message = verifyRes.message || '授权码校验失败';
       logger.error(message);
       throw new Error(message);
     }
   }
+  async verify() {
+    const licenseInfo: SysLicenseInfo = await this.sysSettingsService.getSetting(SysLicenseInfo);
+    const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
+
+    return await verify({
+      subjectId: installInfo.siteId,
+      license: licenseInfo.license,
+      plusRequestService: this.plusRequestService,
+      bindUrl: installInfo?.bindUrl,
+    });
+  }
 
   async bindUrl(subjectId: string, url: string) {
     return await this.plusRequestService.request({

packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts

@@ -34,6 +34,15 @@ export class CopyCertToLocalPlugin extends AbstractTaskPlugin {
   })
   keyPath!: string;
 
+  @TaskInput({
+    title: '中间证书保存路径',
+    helper: '需要有写入权限，路径要包含私钥文件名，文件名不能用*?!等特殊符号，例如：/tmp/intermediate.crt',
+    component: {
+      placeholder: '/root/deploy/nginx/intermediate.crt',
+    },
+  })
+  icPath!: string;
+
   @TaskInput({
     title: 'PFX证书保存路径',
     helper: '用于IIS证书部署，路径要包含文件名，文件名不能用*?!等特殊符号\n推荐使用相对路径，将写入与数据库同级目录，无需映射，例如：./tmp/cert.pfx',
@@ -76,6 +85,12 @@ export class CopyCertToLocalPlugin extends AbstractTaskPlugin {
   })
   hostKeyPath!: string;
 
+  @TaskOutput({
+    title: '中间证书保存路径',
+    type: 'HostKeyPath',
+  })
+  hostIcPath!: string;
+
   @TaskOutput({
     title: 'PFX保存路径',
     type: 'HostPfxPath',
@@ -99,7 +114,7 @@ export class CopyCertToLocalPlugin extends AbstractTaskPlugin {
     fs.copyFileSync(srcFile, destFile);
   }
   async execute(): Promise<void> {
-    let { crtPath, keyPath, pfxPath, derPath } = this;
+    let { crtPath, keyPath, icPath, pfxPath, derPath } = this;
     const certReader = new CertReader(this.cert);
 
     const handle = async ({ reader, tmpCrtPath, tmpKeyPath, tmpDerPath, tmpPfxPath }) => {
@@ -114,6 +129,11 @@ export class CopyCertToLocalPlugin extends AbstractTaskPlugin {
         this.copyFile(tmpKeyPath, keyPath);
         this.hostKeyPath = keyPath;
       }
+      if (icPath) {
+        icPath = icPath.startsWith('/') ? icPath : path.join(Constants.dataDir, icPath);
+        this.copyFile(tmpPfxPath, icPath);
+        this.hostIcPath = icPath;
+      }
       if (pfxPath) {
         pfxPath = pfxPath.startsWith('/') ? pfxPath : path.join(Constants.dataDir, pfxPath);
         this.copyFile(tmpPfxPath, pfxPath);

packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts

@@ -79,7 +79,7 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
       name: 'pi-access-selector',
       type: 'ssh',
     },
-    rules: [{ required: false, message: '' }],
+    required: true,
   })
   accessId!: string;
 
@@ -106,18 +106,6 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
   })
   script!: string;
 
-  @TaskInput({
-    title: '仅复制到当前主机',
-    helper:
-      '注意：本配置即将废弃\n' +
-      '开启后，将直接复制到当前主机某个目录，不上传到主机，由于是docker启动，实际上是复制到docker容器内的“证书保存路径”\n' +
-      '你需要事先在docker-compose.yaml中配置主机目录映射： volumes: /your_target_path:/your_target_path',
-    value: false,
-    component: {
-      name: 'a-switch',
-      vModel: 'checked',
-    },
-  })
   copyToThisHost!: boolean;
 
   @TaskOutput({
@@ -161,8 +149,6 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
   async execute(): Promise<void> {
     const { crtPath, keyPath, cert, accessId } = this;
     const certReader = new CertReader(cert);
-    const connectConf: SshAccess = await this.accessService.getById(accessId);
-    const sshClient = new SshClient(this.logger);
 
     const handle = async (opts: CertReaderHandleContext) => {
       const { tmpCrtPath, tmpKeyPath, tmpDerPath, tmpPfxPath, tmpIcPath } = opts;
@@ -173,69 +159,77 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
         this.copyFile(tmpIcPath, this.icPath);
         this.copyFile(tmpPfxPath, this.pfxPath);
         this.copyFile(tmpDerPath, this.derPath);
-      } else {
+        this.logger.warn('复制到当前主机功能已迁移到 “复制到本机”插件，请尽快换成复制到本机插件');
-        if (!accessId) {
+        return;
-          throw new Error('主机登录授权配置不能为空');
-        }
-        this.logger.info('准备上传文件到服务器');
-
-        const transports: any = [];
-        if (crtPath) {
-          transports.push({
-            localPath: tmpCrtPath,
-            remotePath: crtPath,
-          });
-          this.logger.info(`上传证书到主机：${crtPath}`);
-        }
-        if (keyPath) {
-          transports.push({
-            localPath: tmpKeyPath,
-            remotePath: keyPath,
-          });
-          this.logger.info(`上传私钥到主机：${keyPath}`);
-        }
-        if (this.icPath) {
-          transports.push({
-            localPath: tmpIcPath,
-            remotePath: this.icPath,
-          });
-          this.logger.info(`上传中间证书到主机：${this.icPath}`);
-        }
-        if (this.pfxPath) {
-          transports.push({
-            localPath: tmpPfxPath,
-            remotePath: this.pfxPath,
-          });
-          this.logger.info(`上传PFX证书到主机：${this.pfxPath}`);
-        }
-        if (this.derPath) {
-          transports.push({
-            localPath: tmpDerPath,
-            remotePath: this.derPath,
-          });
-          this.logger.info(`上传DER证书到主机：${this.derPath}`);
-        }
-        this.logger.info('开始上传文件到服务器');
-        await sshClient.uploadFiles({
-          connectConf,
-          transports,
-          mkdirs: this.mkdirs,
-        });
-        this.logger.info('上传文件到服务器成功');
-        //输出
-        this.hostCrtPath = crtPath;
-        this.hostKeyPath = keyPath;
-        this.hostIcPath = this.icPath;
-        this.hostPfxPath = this.pfxPath;
-        this.hostDerPath = this.derPath;
       }
+
+      const connectConf: SshAccess = await this.accessService.getById(accessId);
+      const sshClient = new SshClient(this.logger);
+
+      if (!accessId) {
+        throw new Error('主机登录授权配置不能为空');
+      }
+      this.logger.info('准备上传文件到服务器');
+
+      const transports: any = [];
+      if (crtPath) {
+        transports.push({
+          localPath: tmpCrtPath,
+          remotePath: crtPath,
+        });
+        this.logger.info(`上传证书到主机：${crtPath}`);
+      }
+      if (keyPath) {
+        transports.push({
+          localPath: tmpKeyPath,
+          remotePath: keyPath,
+        });
+        this.logger.info(`上传私钥到主机：${keyPath}`);
+      }
+      if (this.icPath) {
+        transports.push({
+          localPath: tmpIcPath,
+          remotePath: this.icPath,
+        });
+        this.logger.info(`上传中间证书到主机：${this.icPath}`);
+      }
+      if (this.pfxPath) {
+        transports.push({
+          localPath: tmpPfxPath,
+          remotePath: this.pfxPath,
+        });
+        this.logger.info(`上传PFX证书到主机：${this.pfxPath}`);
+      }
+      if (this.derPath) {
+        transports.push({
+          localPath: tmpDerPath,
+          remotePath: this.derPath,
+        });
+        this.logger.info(`上传DER证书到主机：${this.derPath}`);
+      }
+      this.logger.info('开始上传文件到服务器');
+      await sshClient.uploadFiles({
+        connectConf,
+        transports,
+        mkdirs: this.mkdirs,
+      });
+      this.logger.info('上传文件到服务器成功');
+      //输出
+      this.hostCrtPath = crtPath;
+      this.hostKeyPath = keyPath;
+      this.hostIcPath = this.icPath;
+      this.hostPfxPath = this.pfxPath;
+      this.hostDerPath = this.derPath;
     };
+
     await certReader.readCertFile({
       logger: this.logger,
       handle,
     });
 
-    if (this.script.trim()) {
+    if (this.script && this.script?.trim()) {
+      const connectConf: SshAccess = await this.accessService.getById(accessId);
+      const sshClient = new SshClient(this.logger);
       this.logger.info('执行脚本命令');
       const scripts = this.script.split('\n');
       await sshClient.exec({

packages/ui/certd-server/src/plugins/plugin-qiniu/plugin/deploy-to-cdn/index.ts

@@ -8,7 +8,7 @@ import { doRequest, uploadCert } from '../lib/sdk.js';
   title: '部署证书至七牛CDN',
   icon: 'svg:icon-qiniuyun',
   group: pluginGroups.cdn.key,
-  desc: '自动部署域名证书至七牛云CDN',
+  desc: '自动部署域名证书至七牛云CDN，七牛云OSS',
   default: {
     strategy: {
       runStrategy: RunStrategy.SkipWhenSucceed,

start.sh

@@ -0,0 +1,29 @@
+
+#
+echo "即将删除packages下除ui之外的其他目录，按y确认"
+read -p "y/n: " confirm
+if [ $confirm != "y" ]; then
+  echo "取消操作"
+  exit 1
+fi
+find ./packages -mindepth 1 -maxdepth 1 -type d ! -name 'ui' -exec rm -rf {} +
+
+echo "删除成功"
+
+echo "安装pnpm 8.15.7, 前提是已经安装了nodejs"
+npm install -g pnpm@8.15.7
+echo "安装依赖"
+pnpm install
+
+echo "开始构建"
+echo "构建certd-client"
+cd packages/ui/certd-client
+npm run build
+cp -r dist/* ../certd-server/public
+
+echo "构建certd-server"
+cd ../certd-server
+npm run build
+echo "构建完成"
+echo "启动服务"
+npm run start