v1.25.4

CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

build.trigger

@@ -1 +1 @@
-02:43
+03:33

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.25.2"
+  "version": "1.25.4"
 }

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.25.2",
+    "version": "1.25.4",
     "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": "c7f7910fa98e96edeff905326b0a714f1e49b8d5"
+    "gitHead": "c2650d308c7f64af60f1658ea4844b0f2b13351b"
 }

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.25.2",
+  "version": "1.25.4",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -14,7 +14,7 @@
     "test": "mocha   --loader=ts-node/esm"
   },
   "dependencies": {
-    "@certd/plus": "1.25.1",
+    "@certd/plus": "^1.25.1",
     "axios": "^1.7.2",
     "fix-path": "^4.0.0",
     "http-proxy-agent": "^7.0.2",
@@ -60,5 +60,5 @@
     "vite": "^4.3.8",
     "vue-tsc": "^1.6.5"
   },
-  "gitHead": "c7f7910fa98e96edeff905326b0a714f1e49b8d5"
+  "gitHead": "c2650d308c7f64af60f1658ea4844b0f2b13351b"
 }

packages/libs/lib-iframe/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

packages/libs/lib-iframe/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-iframe",
   "private": false,
-  "version": "1.25.2",
+  "version": "1.25.4",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -36,5 +36,5 @@
     "tslib": "^2.5.2",
     "typescript": "^4.8.4"
   },
-  "gitHead": "c7f7910fa98e96edeff905326b0a714f1e49b8d5"
+  "gitHead": "c2650d308c7f64af60f1658ea4844b0f2b13351b"
 }

packages/libs/lib-jdcloud/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

packages/libs/lib-jdcloud/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-jdcloud",
   "private": false,
-  "version": "1.25.2",
+  "version": "1.25.4",
   "main": "./dist/bundle.mjs",
   "module": "./dist/bundle.mjs",
   "types": "./dist/d/index.d.ts",
@@ -24,5 +24,5 @@
     "url": "^0.11.0",
     "uuid": "^3.1.0"
   },
-  "gitHead": "c7f7910fa98e96edeff905326b0a714f1e49b8d5"
+  "gitHead": "c2650d308c7f64af60f1658ea4844b0f2b13351b"
 }

packages/libs/lib-k8s/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

packages/libs/lib-k8s/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-k8s",
   "private": false,
-  "version": "1.25.2",
+  "version": "1.25.4",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -16,7 +16,7 @@
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
-    "@certd/pipeline": "^1.25.2",
+    "@certd/pipeline": "^1.25.4",
     "@rollup/plugin-commonjs": "^23.0.4",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
@@ -37,5 +37,5 @@
     "tslib": "^2.5.2",
     "typescript": "^4.8.4"
   },
-  "gitHead": "c7f7910fa98e96edeff905326b0a714f1e49b8d5"
+  "gitHead": "c2650d308c7f64af60f1658ea4844b0f2b13351b"
 }

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

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

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

@@ -1,6 +1,6 @@
 {
   "name": "@certd/midway-flyway-js",
-  "version": "1.25.2",
+  "version": "1.25.4",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -53,5 +53,5 @@
     "typeorm": "^0.3.11",
     "typescript": "~5.1.0"
   },
-  "gitHead": "c7f7910fa98e96edeff905326b0a714f1e49b8d5"
+  "gitHead": "c2650d308c7f64af60f1658ea4844b0f2b13351b"
 }

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.25.2",
+  "version": "1.25.4",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -13,8 +13,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.25.2",
-    "@certd/pipeline": "^1.25.2",
+    "@certd/acme-client": "^1.25.4",
+    "@certd/pipeline": "^1.25.4",
     "jszip": "^3.10.1",
     "node-forge": "^0.10.0",
     "psl": "^1.9.0"
@@ -53,5 +53,5 @@
     "vite": "^3.1.0",
     "vue-tsc": "^0.38.9"
   },
-  "gitHead": "c7f7910fa98e96edeff905326b0a714f1e49b8d5"
+  "gitHead": "c2650d308c7f64af60f1658ea4844b0f2b13351b"
 }

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.25.2",
+  "version": "1.25.4",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -58,8 +58,8 @@
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.25.2",
-    "@certd/pipeline": "^1.25.2",
+    "@certd/lib-iframe": "^1.25.4",
+    "@certd/pipeline": "^1.25.4",
     "@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,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

packages/ui/certd-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-server",
-  "version": "1.25.2",
+  "version": "1.25.4",
   "description": "fast-server base midway",
   "private": true,
   "type": "module",
@@ -22,14 +22,14 @@
   "dependencies": {
     "@alicloud/cs20151215": "^3.0.3",
     "@alicloud/pop-core": "^1.7.10",
-    "@certd/acme-client": "^1.25.2",
+    "@certd/acme-client": "^1.25.4",
     "@certd/lib-huawei": "^1.24.3",
-    "@certd/lib-jdcloud": "^1.25.2",
-    "@certd/lib-k8s": "^1.25.2",
-    "@certd/midway-flyway-js": "^1.25.2",
-    "@certd/pipeline": "^1.25.2",
-    "@certd/plugin-cert": "^1.25.2",
-    "@certd/plugin-plus": "^1.25.2",
+    "@certd/lib-jdcloud": "^1.25.4",
+    "@certd/lib-k8s": "^1.25.4",
+    "@certd/midway-flyway-js": "^1.25.4",
+    "@certd/pipeline": "^1.25.4",
+    "@certd/plugin-cert": "^1.25.4",
+    "@certd/plugin-plus": "^1.25.4",
     "@koa/cors": "^5.0.0",
     "@midwayjs/bootstrap": "^3.16.2",
     "@midwayjs/cache": "^3.14.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();
-  }
-  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,
-    });
-
+    const verifyRes = await this.verify();
     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/upload-to-host/index.ts

@@ -235,7 +235,7 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
       handle,
     });
 
-    if (this.script.trim()) {
+    if (this.script && this.script?.trim()) {
       this.logger.info('执行脚本命令');
       const scripts = this.script.split('\n');
       await sshClient.exec({