-## 九、捐赠
+## 十、捐赠
媳妇儿说：“一天到晚搞开源，也不管管老婆孩子！😡😡😡”
拜托各位捐赠支持一下，让媳妇儿开心开心，我也能有更多时间进行开源项目，感谢🙏🙏🙏
@@ -158,16 +176,20 @@ docker compose up -d
-## 十、贡献代码 +## 十一、贡献代码 [贡献插件教程](./plugin.md) -## 十一、我的其他项目（求Star） +## 十二、我的其他项目（求Star） * [袖手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无法访问的问题 -## 十二、版本更新日志 -https://github.com/certd/certd/blob/v2/CHANGELOG.md \ No newline at end of file + +## 十三、更新日志 + +更新日志：[CHANGELOG](./CHANGELOG.md) + + diff --git a/build.trigger b/build.trigger index b8626c4cf..7f8f011eb 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -4 +7 diff --git a/doc/images/action-build.jpg b/doc/images/action-build.jpg new file mode 100644 index 000000000..9e7187a0a Binary files /dev/null and b/doc/images/action-build.jpg differ diff --git a/lerna.json b/lerna.json index 31e5eafa0..30b8b59a4 100644 --- a/lerna.json +++ b/lerna.json @@ -9,5 +9,5 @@ } }, "npmClient": "pnpm", - "version": "1.22.2" + "version": "1.22.3" } diff --git a/package.json b/package.json index 55aaa4c4e..e3a007e8b 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "scripts": { "start": "lerna bootstrap --hoist", "i-all": "lerna link && lerna exec npm install ", - "publish": "npm run prepublishOnly1 && lerna publish --conventional-commits --create-release github && npm run afterpublishOnly && npm run deploy1", + "publish": "npm run prepublishOnly1 && lerna publish --conventional-commits --create-release github && npm run afterpublishOnly", "afterpublishOnly": "", "prepublishOnly1": "npm run check && 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\"", diff --git a/packages/core/acme-client/CHANGELOG.md b/packages/core/acme-client/CHANGELOG.md index b83c994ad..58803bf0c 100644 --- a/packages/core/acme-client/CHANGELOG.md +++ b/packages/core/acme-client/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.22.3](https://github.com/publishlab/node-acme-client/compare/v1.22.2...v1.22.3) (2024-07-25) + +**Note:** Version bump only for package @certd/acme-client + ## [1.22.2](https://github.com/publishlab/node-acme-client/compare/v1.22.1...v1.22.2) (2024-07-23) **Note:** Version bump only for package @certd/acme-client diff --git a/packages/core/acme-client/build.md b/packages/core/acme-client/build.md index 45b0270d5..de3fb51f6 100644 --- a/packages/core/acme-client/build.md +++ b/packages/core/acme-client/build.md @@ -1 +1 @@ -02:24 +22:32 diff --git a/packages/core/acme-client/package.json b/packages/core/acme-client/package.json index 19ea85b51..3e2e8ad1d 100644 --- a/packages/core/acme-client/package.json +++ b/packages/core/acme-client/package.json @@ -3,7 +3,7 @@ "description": "Simple and unopinionated ACME client", "private": false, "author": "nmorsman", - "version": "1.22.2", + "version": "1.22.3", "main": "src/index.js", "types": "types/index.d.ts", "license": "MIT", diff --git a/packages/core/pipeline/CHANGELOG.md b/packages/core/pipeline/CHANGELOG.md index cdfaf96e4..9ce09c90b 100644 --- a/packages/core/pipeline/CHANGELOG.md +++ b/packages/core/pipeline/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.22.3](https://github.com/certd/certd/compare/v1.22.2...v1.22.3) (2024-07-25) + +**Note:** Version bump only for package @certd/pipeline + ## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23) **Note:** Version bump only for package @certd/pipeline diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index 4464cd5ec..b96f7df31 100644 --- a/packages/core/pipeline/package.json +++ b/packages/core/pipeline/package.json @@ -1,7 +1,7 @@ { "name": "@certd/pipeline", "private": false, - "version": "1.22.2", + "version": "1.22.3", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/core/pipeline/src/utils/util.request.ts b/packages/core/pipeline/src/utils/util.request.ts index 736612d21..874a91b16 100644 --- a/packages/core/pipeline/src/utils/util.request.ts +++ b/packages/core/pipeline/src/utils/util.request.ts @@ -50,7 +50,7 @@ export function createAxiosService({ logger }: { logger: Logger }) { // case 505: error.message = 'HTTP版本不受支持'; break // default: break // } - logger.error(`请求出错：url:${error?.response?.config.url},method:${error.response.config.method},status:${error?.response?.status}`); + logger.error(`请求出错：url:${error?.response?.config.url},method:${error?.response?.config?.method},status:${error?.response?.status}`); logger.info("返回数据:", JSON.stringify(error?.response?.data)); delete error.config; delete error.response; diff --git a/packages/libs/lib-k8s/CHANGELOG.md b/packages/libs/lib-k8s/CHANGELOG.md index c088ae068..db52fac2f 100644 --- a/packages/libs/lib-k8s/CHANGELOG.md +++ b/packages/libs/lib-k8s/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.22.3](https://github.com/certd/certd/compare/v1.22.2...v1.22.3) (2024-07-25) + +**Note:** Version bump only for package @certd/lib-k8s + ## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23) **Note:** Version bump only for package @certd/lib-k8s diff --git a/packages/libs/lib-k8s/package.json b/packages/libs/lib-k8s/package.json index afc2bc0d0..0489cf69d 100644 --- a/packages/libs/lib-k8s/package.json +++ b/packages/libs/lib-k8s/package.json @@ -1,7 +1,7 @@ { "name": "@certd/lib-k8s", "private": false, - "version": "1.22.2", + "version": "1.22.3", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -17,7 +17,7 @@ "shelljs": "^0.8.5" }, "devDependencies": { - "@certd/pipeline": "^1.22.2", + "@certd/pipeline": "^1.22.3", "@rollup/plugin-commonjs": "^23.0.4", "@rollup/plugin-json": "^6.0.0", "@rollup/plugin-node-resolve": "^15.0.1", diff --git a/packages/libs/midway-flyway-js/CHANGELOG.md b/packages/libs/midway-flyway-js/CHANGELOG.md index 9469a854d..f6561002f 100644 --- a/packages/libs/midway-flyway-js/CHANGELOG.md +++ b/packages/libs/midway-flyway-js/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.22.3](https://github.com/certd/certd/compare/v1.22.2...v1.22.3) (2024-07-25) + +**Note:** Version bump only for package @certd/midway-flyway-js + ## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23) **Note:** Version bump only for package @certd/midway-flyway-js diff --git a/packages/libs/midway-flyway-js/package.json b/packages/libs/midway-flyway-js/package.json index 7a7ad9c34..25f23a364 100644 --- a/packages/libs/midway-flyway-js/package.json +++ b/packages/libs/midway-flyway-js/package.json @@ -1,6 +1,6 @@ { "name": "@certd/midway-flyway-js", - "version": "1.22.2", + "version": "1.22.3", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", diff --git a/packages/plugins/plugin-cert/CHANGELOG.md b/packages/plugins/plugin-cert/CHANGELOG.md index f9b993653..26ef0ecc9 100644 --- a/packages/plugins/plugin-cert/CHANGELOG.md +++ b/packages/plugins/plugin-cert/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.22.3](https://github.com/certd/certd/compare/v1.22.2...v1.22.3) (2024-07-25) + +**Note:** Version bump only for package @certd/plugin-cert + ## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23) **Note:** Version bump only for package @certd/plugin-cert diff --git a/packages/plugins/plugin-cert/package.json b/packages/plugins/plugin-cert/package.json index 8104bf7f8..6bd9190c8 100644 --- a/packages/plugins/plugin-cert/package.json +++ b/packages/plugins/plugin-cert/package.json @@ -1,7 +1,7 @@ { "name": "@certd/plugin-cert", "private": false, - "version": "1.22.2", + "version": "1.22.3", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -13,8 +13,8 @@ "preview": "vite preview" }, "dependencies": { - "@certd/acme-client": "^1.22.2", - "@certd/pipeline": "^1.22.2", + "@certd/acme-client": "^1.22.3", + "@certd/pipeline": "^1.22.3", "jszip": "^3.10.1", "node-forge": "^0.10.0", "psl": "^1.9.0" diff --git a/packages/ui/Dockerfile b/packages/ui/Dockerfile index 41182997a..776eeb076 100644 --- a/packages/ui/Dockerfile +++ b/packages/ui/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-alpine as builder +FROM node:18-alpine AS builder EXPOSE 7001 WORKDIR /workspace/ COPY . /workspace/ @@ -9,10 +9,10 @@ RUN cd /workspace/certd-server && pnpm install && npm run build-on-docker RUN cp /workspace/certd-client/dist/* /workspace/certd-server/public/ -rf - FROM node:18-alpine WORKDIR /app/ COPY --from=builder /workspace/certd-server/ /app/ +RUN chmod +x /app/tools/linux/* ENV TZ=Asia/Shanghai ENV NODE_ENV=production ENV MIDWAY_SERVER_ENV=production diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md index 7fd1d9fd7..040d0042e 100644 --- a/packages/ui/certd-client/CHANGELOG.md +++ b/packages/ui/certd-client/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.22.3](https://github.com/certd/certd/compare/v1.22.2...v1.22.3) (2024-07-25) + +**Note:** Version bump only for package @certd/ui-client + ## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23) ### Bug Fixes diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index 57b629a93..47b422041 100644 --- a/packages/ui/certd-client/package.json +++ b/packages/ui/certd-client/package.json @@ -1,6 +1,6 @@ { "name": "@certd/ui-client", - "version": "1.22.2", + "version": "1.22.3", "private": true, "scripts": { "dev": "vite --open", @@ -59,7 +59,7 @@ "vuedraggable": "^2.24.3" }, "devDependencies": { - "@certd/pipeline": "^1.22.2", + "@certd/pipeline": "^1.22.3", "@rollup/plugin-commonjs": "^25.0.7", "@rollup/plugin-node-resolve": "^15.2.3", "@types/chai": "^4.3.12", diff --git a/packages/ui/certd-server/CHANGELOG.md b/packages/ui/certd-server/CHANGELOG.md index b443df7b5..4402547c7 100644 --- a/packages/ui/certd-server/CHANGELOG.md +++ b/packages/ui/certd-server/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.22.3](https://github.com/certd/certd/compare/v1.22.2...v1.22.3) (2024-07-25) + +**Note:** Version bump only for package @certd/ui-server + ## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23) ### Bug Fixes diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index 0f3d6be8a..867c97f36 100644 --- a/packages/ui/certd-server/package.json +++ b/packages/ui/certd-server/package.json @@ -1,6 +1,6 @@ { "name": "@certd/ui-server", - "version": "1.22.2", + "version": "1.22.3", "description": "fast-server base midway", "private": true, "type": "module", @@ -21,12 +21,12 @@ "@alicloud/cs20151215": "^3.0.3", "@alicloud/openapi-client": "^0.4.0", "@alicloud/pop-core": "^1.7.10", - "@certd/acme-client": "^1.22.2", + "@certd/acme-client": "^1.22.3", "@certd/lib-huawei": "^1.22.1", - "@certd/lib-k8s": "^1.22.2", - "@certd/midway-flyway-js": "^1.22.2", - "@certd/pipeline": "^1.22.2", - "@certd/plugin-cert": "^1.22.2", + "@certd/lib-k8s": "^1.22.3", + "@certd/midway-flyway-js": "^1.22.3", + "@certd/pipeline": "^1.22.3", + "@certd/plugin-cert": "^1.22.3", "@koa/cors": "^3.4.3", "@midwayjs/bootstrap": "^3.16.2", "@midwayjs/cache": "^3.14.0",