From 093520b686d2a6f169b1b1f87e9450118e5c6c7e Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 22:37:32 +0800 Subject: [PATCH 01/30] chore: --- .github/workflows/build-image.yml | 4 ++-- build.trigger | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 95ae3f95..dc8db9ba 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -26,7 +26,7 @@ jobs: const fs = require('fs'); const path = require('path'); - const pnpmWorkspace = "pnpm-workspace.yaml"; + const pnpmWorkspace = "./pnpm-workspace.yaml"; fs.removeSync(jsonFilePath) const jsonFilePath = "./packages/ui/certd-server/package.json"; @@ -62,4 +62,4 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: | - registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.version}} \ No newline at end of file + registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.version}} diff --git a/build.trigger b/build.trigger index 7813681f..7f8f011e 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -5 \ No newline at end of file +7 From a6113f237b060fc61532948ca2bcccc0359c656f Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 22:38:38 +0800 Subject: [PATCH 02/30] chore: --- .github/workflows/build-image.yml | 2 +- build.trigger | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index dc8db9ba..d89f37a5 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -27,7 +27,7 @@ jobs: const path = require('path'); const pnpmWorkspace = "./pnpm-workspace.yaml"; - fs.removeSync(jsonFilePath) + fs.removeSync(pnpmWorkspace) const jsonFilePath = "./packages/ui/certd-server/package.json"; const jsonContent = fs.readFileSync(jsonFilePath, 'utf-8'); diff --git a/build.trigger b/build.trigger index 7f8f011e..45a4fb75 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -7 +8 From ffddb3b4acf34982ee2dc59116de81aaa36f5ab8 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 22:40:05 +0800 Subject: [PATCH 03/30] chore: github action build image --- .github/workflows/build-image.yml | 2 +- build.trigger | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index d89f37a5..3f805fc3 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -27,7 +27,7 @@ jobs: const path = require('path'); const pnpmWorkspace = "./pnpm-workspace.yaml"; - fs.removeSync(pnpmWorkspace) + fs.unlinkSync(pnpmWorkspace) const jsonFilePath = "./packages/ui/certd-server/package.json"; const jsonContent = fs.readFileSync(jsonFilePath, 'utf-8'); diff --git a/build.trigger b/build.trigger index 45a4fb75..ec635144 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -8 +9 From d456ff9830c9edd7023e596c32c870065bf91684 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 22:48:30 +0800 Subject: [PATCH 04/30] chore: github action build image --- .github/workflows/build-image.yml | 4 ++-- build.trigger | 2 +- packages/ui/Dockerfile | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 3f805fc3..9e3db9e4 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -36,7 +36,7 @@ jobs: // 打印 JSON 文件内容 console.log("certd_version:",pkg.version); // 输出 JSON 对象,可以在后续步骤中使用 - return {"version":"0.0.5"}; + echo "{version}={0.0.5}" >> $GITHUB_OUTPUT - name: Set up the working directory run: | @@ -62,4 +62,4 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: | - registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.version}} + registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs}} diff --git a/build.trigger b/build.trigger index ec635144..d00491fd 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -9 +1 diff --git a/packages/ui/Dockerfile b/packages/ui/Dockerfile index 3c7f3453..aee00fba 100644 --- a/packages/ui/Dockerfile +++ b/packages/ui/Dockerfile @@ -2,8 +2,7 @@ FROM node:18-alpine as builder EXPOSE 7001 WORKDIR /workspace/ COPY . /workspace/ -RUN npm install -g pnpm@8.15.7 --registry=https://registry.npmmirror.com -RUN pnpm config set registry https://registry.npmmirror.com/ +RUN npm install -g pnpm@8.15.7 RUN cd /workspace/certd-client && pnpm install && npm run build RUN cd /workspace/certd-server && pnpm install && npm run build-on-docker From e40bb9e14d03befa83338acb19329cf4e6a74650 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 22:50:15 +0800 Subject: [PATCH 05/30] chore: github action build image --- .github/workflows/build-image.yml | 2 +- build.trigger | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 9e3db9e4..32c6588f 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -36,7 +36,7 @@ jobs: // 打印 JSON 文件内容 console.log("certd_version:",pkg.version); // 输出 JSON 对象,可以在后续步骤中使用 - echo "{version}={0.0.5}" >> $GITHUB_OUTPUT + echo "version=0.0.5" >> $GITHUB_OUTPUT - name: Set up the working directory run: | diff --git a/build.trigger b/build.trigger index d00491fd..0cfbf088 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -1 +2 From 2877b9b50548ea261b0f0bbc93a4d841b36c3476 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 22:52:56 +0800 Subject: [PATCH 06/30] chore: github action build image --- .github/workflows/build-image.yml | 5 +++-- build.trigger | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 32c6588f..1bb5b815 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -20,7 +20,7 @@ jobs: - name: get_certd_version id: get_certd_version - uses: actions/github-script@v5 + uses: actions/github-script@v6 with: script: | const fs = require('fs'); @@ -36,7 +36,8 @@ jobs: // 打印 JSON 文件内容 console.log("certd_version:",pkg.version); // 输出 JSON 对象,可以在后续步骤中使用 - echo "version=0.0.5" >> $GITHUB_OUTPUT + // echo "version=0.0.5" >> $GITHUB_OUTPUT + return {"version":"0.0.5"} - name: Set up the working directory run: | diff --git a/build.trigger b/build.trigger index 0cfbf088..00750edc 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -2 +3 From 6f2c5674c9896567104192243ee2681a8948d5be Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 22:54:23 +0800 Subject: [PATCH 07/30] chore: github action build image --- .github/workflows/build-image.yml | 5 +++-- build.trigger | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 1bb5b815..648cb1ac 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -22,6 +22,7 @@ jobs: id: get_certd_version uses: actions/github-script@v6 with: + result-encoding: string script: | const fs = require('fs'); const path = require('path'); @@ -37,7 +38,7 @@ jobs: console.log("certd_version:",pkg.version); // 输出 JSON 对象,可以在后续步骤中使用 // echo "version=0.0.5" >> $GITHUB_OUTPUT - return {"version":"0.0.5"} + return "0.0.5" - name: Set up the working directory run: | @@ -63,4 +64,4 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: | - registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs}} + registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}} diff --git a/build.trigger b/build.trigger index 00750edc..7ed6ff82 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -3 +5 From dfcabc02a4926542324d205522113df21e2847d7 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 22:56:16 +0800 Subject: [PATCH 08/30] chore: github action build image --- .github/workflows/build-image.yml | 2 +- build.trigger | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 648cb1ac..ba62faf5 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -42,7 +42,7 @@ jobs: - name: Set up the working directory run: | - mkdir -p ./packages/ui/ + ls ./packages/ui/ working-directory: ./packages/ui/ - name: Set up QEMU diff --git a/build.trigger b/build.trigger index 7ed6ff82..1e8b3149 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -5 +6 From 4e7b7ae97412446fcf9ca43a7391bb6ba809e869 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 22:57:55 +0800 Subject: [PATCH 09/30] chore: github action build image --- .github/workflows/build-image.yml | 4 ++-- build.trigger | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index ba62faf5..721eecba 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -42,8 +42,8 @@ jobs: - name: Set up the working directory run: | - ls ./packages/ui/ - working-directory: ./packages/ui/ + ls ./certd/certd/packages/ui/ + working-directory: ./certd/certd/packages/ui/ - name: Set up QEMU uses: docker/setup-qemu-action@v3 diff --git a/build.trigger b/build.trigger index 1e8b3149..7f8f011e 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -6 +7 From c9d9c6513bdeb228873103cfcce15aa8fafdb37e Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 22:59:23 +0800 Subject: [PATCH 10/30] chore: github action build image --- .github/workflows/build-image.yml | 5 +++-- build.trigger | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 721eecba..c3b225f3 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -42,8 +42,9 @@ jobs: - name: Set up the working directory run: | - ls ./certd/certd/packages/ui/ - working-directory: ./certd/certd/packages/ui/ + cd ./packages/ui/ + ls + working-directory: ./packages/ui/ - name: Set up QEMU uses: docker/setup-qemu-action@v3 diff --git a/build.trigger b/build.trigger index 7f8f011e..45a4fb75 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -7 +8 From 7bf19f8f6f326238e098dc8281f3f0c779379d84 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 23:00:56 +0800 Subject: [PATCH 11/30] chore: github action build image --- .github/workflows/build-image.yml | 3 +-- build.trigger | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index c3b225f3..668aea2c 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -42,9 +42,8 @@ jobs: - name: Set up the working directory run: | - cd ./packages/ui/ ls - working-directory: ./packages/ui/ + working-directory: /home/runner/work/certd/certd/packages/ui/ - name: Set up QEMU uses: docker/setup-qemu-action@v3 diff --git a/build.trigger b/build.trigger index 45a4fb75..ec635144 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -8 +9 From b6b8661c362f771afd9fee78c57c2d6751e6023b Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 23:03:15 +0800 Subject: [PATCH 12/30] chore: github action build image --- .github/workflows/build-image.yml | 6 +++++- build.trigger | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 668aea2c..2ec0feef 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -45,13 +45,17 @@ jobs: ls working-directory: /home/runner/work/certd/certd/packages/ui/ + - name: list files + run: | + ls + - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Login to GitHub Container Registry + - name: Login to aliyun container Registry uses: docker/login-action@v3 with: registry: registry.cn-shenzhen.aliyuncs.com diff --git a/build.trigger b/build.trigger index ec635144..d00491fd 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -9 +1 From 0b131c00ed6d7b6c41851f0f4f039f74916c3cd4 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 23:06:11 +0800 Subject: [PATCH 13/30] chore: github action build image --- .github/workflows/build-image.yml | 10 +--------- build.trigger | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 2ec0feef..4fbe77d6 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -40,15 +40,6 @@ jobs: // echo "version=0.0.5" >> $GITHUB_OUTPUT return "0.0.5" - - name: Set up the working directory - run: | - ls - working-directory: /home/runner/work/certd/certd/packages/ui/ - - - name: list files - run: | - ls - - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -67,5 +58,6 @@ jobs: with: platforms: linux/amd64,linux/arm64 push: true + context: ./packages/ui/ tags: | registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}} diff --git a/build.trigger b/build.trigger index d00491fd..0cfbf088 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -1 +2 From b6ef39fb30983585de2b9f75e60a1eb185250fea Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 23:12:50 +0800 Subject: [PATCH 14/30] chore: github action build image --- .github/workflows/build-image.yml | 2 +- build.trigger | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 4fbe77d6..642ef3e6 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -56,7 +56,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v6.5.0 with: - platforms: linux/amd64,linux/arm64 +# platforms: linux/amd64,linux/arm64 push: true context: ./packages/ui/ tags: | diff --git a/build.trigger b/build.trigger index 0cfbf088..00750edc 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -2 +3 From 06be993afcda1cdd5e5f4244ea13611fb6fb8b1b Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 23:16:55 +0800 Subject: [PATCH 15/30] chore: github action build image --- packages/ui/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/ui/Dockerfile b/packages/ui/Dockerfile index aee00fba..41182997 100644 --- a/packages/ui/Dockerfile +++ b/packages/ui/Dockerfile @@ -13,9 +13,9 @@ RUN cp /workspace/certd-client/dist/* /workspace/certd-server/public/ -rf FROM node:18-alpine WORKDIR /app/ COPY --from=builder /workspace/certd-server/ /app/ -ENV TZ Asia/Shanghai -ENV NODE_ENV production -ENV MIDWAY_SERVER_ENV production +ENV TZ=Asia/Shanghai +ENV NODE_ENV=production +ENV MIDWAY_SERVER_ENV=production CMD ["npm", "run","start"] From b9fe3b9c875ea1f2967fb59fa51fa4a9dd7b3f4b Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 23:23:45 +0800 Subject: [PATCH 16/30] chore: github action build image --- .github/workflows/build-image.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 642ef3e6..1706ee3d 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -12,7 +12,7 @@ permissions: contents: read jobs: - sync: + build-certd-image: runs-on: ubuntu-latest steps: - name: Checkout Code @@ -26,19 +26,13 @@ jobs: script: | const fs = require('fs'); const path = require('path'); - const pnpmWorkspace = "./pnpm-workspace.yaml"; fs.unlinkSync(pnpmWorkspace) - const jsonFilePath = "./packages/ui/certd-server/package.json"; const jsonContent = fs.readFileSync(jsonFilePath, 'utf-8'); - console.log(jsonContent) const pkg = JSON.parse(jsonContent) - // 打印 JSON 文件内容 console.log("certd_version:",pkg.version); - // 输出 JSON 对象,可以在后续步骤中使用 - // echo "version=0.0.5" >> $GITHUB_OUTPUT - return "0.0.5" + return pkg.version - name: Set up QEMU uses: docker/setup-qemu-action@v3 From f7fc06e65744077e6acd21c88ce805a425d3cc56 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jul 2024 23:39:13 +0800 Subject: [PATCH 17/30] chore: --- package.json | 2 +- publish-check.js | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 75805538..eef2facd 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 && npm run afterpublishOnly && npm run deploy1", + "publish": "npm run prepublishOnly1 && lerna publish --conventional-commits --create-release github && npm run afterpublishOnly && npm run deploy1", "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.trigger && git commit -m \\\"build: prepare to build\\\"", diff --git a/publish-check.js b/publish-check.js index 1beb67d5..5592dec0 100644 --- a/publish-check.js +++ b/publish-check.js @@ -8,6 +8,12 @@ function check(){ console.error("git-add 没有修改过") throw new Error("git-add 还没修改过") } + + //GH_TOKEN + if(!process.env.GH_TOKEN){ + console.error("GH_TOKEN 未设置") + throw new Error("GH_TOKEN 未设置") + } } -check() \ No newline at end of file +check() From a2c43b50a6069ed48958fd142844a8568c2af452 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 24 Jul 2024 00:42:33 +0800 Subject: [PATCH 18/30] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=B5=81=E6=B0=B4=E7=BA=BF=E6=97=B6=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=A0=B9=E6=8D=AEdns=E7=B1=BB=E5=9E=8B=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=AD=A3=E7=A1=AE=E7=9A=84dns=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes https://github.com/certd/certd/issues/97 --- .../ui/certd-client/src/use/use-refrence.ts | 19 +++++++++++++++++++ .../views/certd/pipeline/certd-form/crud.tsx | 5 ++++- .../certd-server/src/config/config.default.ts | 2 +- .../certd-server/src/config/config.preview.ts | 7 +++++++ .../src/config/config.production.ts | 7 +++++++ 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 packages/ui/certd-client/src/use/use-refrence.ts diff --git a/packages/ui/certd-client/src/use/use-refrence.ts b/packages/ui/certd-client/src/use/use-refrence.ts new file mode 100644 index 00000000..a908ea62 --- /dev/null +++ b/packages/ui/certd-client/src/use/use-refrence.ts @@ -0,0 +1,19 @@ +import _ from "lodash-es"; +import { compute } from "@fast-crud/fast-crud"; + +export function useReference(form: any) { + if (!form.reference) { + return; + } + for (const reference of form.reference) { + debugger; + _.set( + form, + reference.dest, + compute((scope) => { + debugger; + return _.get(scope, reference.src); + }) + ); + } +} diff --git a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx index 5765df1c..77e7f105 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx @@ -1,5 +1,7 @@ import { compute, CreateCrudOptionsRet, dict } from "@fast-crud/fast-crud"; import { PluginGroup } from "@certd/pipeline"; +import { useReference } from "/@/use/use-refrence"; +import _ from "lodash-es"; export default function (certPluginGroup: PluginGroup, formWrapperRef: any): CreateCrudOptionsRet { const inputs: any = {}; @@ -10,10 +12,11 @@ export default function (certPluginGroup: PluginGroup, formWrapperRef: any): Cre inputs[inputKey].form.show = true; continue; } - const inputDefine = plugin.input[inputKey]; + const inputDefine = _.cloneDeep(plugin.input[inputKey]); if (!inputDefine.required && !inputDefine.maybeNeed) { continue; } + useReference(inputDefine); inputs[inputKey] = { title: inputDefine.title, form: { diff --git a/packages/ui/certd-server/src/config/config.default.ts b/packages/ui/certd-server/src/config/config.default.ts index 07cff24f..1a843c67 100644 --- a/packages/ui/certd-server/src/config/config.default.ts +++ b/packages/ui/certd-server/src/config/config.default.ts @@ -59,7 +59,7 @@ const development = { type: 'better-sqlite3', database: './data/db.sqlite', synchronize: false, // 如果第一次使用,不存在表,有同步的需求可以写 true - logging: true, + logging: false, // 配置实体模型 或者 entities: '/entity', entities: ['**/modules/*/entity/*.ts', '**/entity/*.js', '**/entity/*.d.ts', PipelineEntity, FlywayHistory, UserEntity], diff --git a/packages/ui/certd-server/src/config/config.preview.ts b/packages/ui/certd-server/src/config/config.preview.ts index 5b717e81..ebe30965 100644 --- a/packages/ui/certd-server/src/config/config.preview.ts +++ b/packages/ui/certd-server/src/config/config.preview.ts @@ -8,6 +8,13 @@ const preview = { preview: { enabled: true, }, + typeorm: { + dataSource: { + default: { + logging: false, + }, + }, + }, } as MidwayConfig; mergeConfig(preview, 'preview'); diff --git a/packages/ui/certd-server/src/config/config.production.ts b/packages/ui/certd-server/src/config/config.production.ts index 29f89aae..41a3442a 100644 --- a/packages/ui/certd-server/src/config/config.production.ts +++ b/packages/ui/certd-server/src/config/config.production.ts @@ -8,6 +8,13 @@ const production = { preview: { enabled: false, }, + typeorm: { + dataSource: { + default: { + logging: false, + }, + }, + }, } as MidwayConfig; mergeConfig(production, 'production'); From 6693d1acfb01558b6645880274f36f2a4b0c2fc9 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 24 Jul 2024 00:42:50 +0800 Subject: [PATCH 19/30] chore: --- docker/run/run.sh | 13 ------------- packages/core/pipeline/src/core/executor.ts | 2 +- packages/libs/midway-flyway-js/src/flyway.ts | 2 ++ .../plugin-cert/src/plugin/cert-plugin/lego/dns.ts | 3 +++ .../plugin/cert-plugin/{lego.ts => lego/index.ts} | 8 ++++---- packages/plugins/plugin-cert/src/plugin/index.ts | 2 +- 6 files changed, 11 insertions(+), 19 deletions(-) delete mode 100644 docker/run/run.sh create mode 100644 packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/dns.ts rename packages/plugins/plugin-cert/src/plugin/cert-plugin/{lego.ts => lego/index.ts} (95%) diff --git a/docker/run/run.sh b/docker/run/run.sh deleted file mode 100644 index a36f095d..00000000 --- a/docker/run/run.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -e -# 判断$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 diff --git a/packages/core/pipeline/src/core/executor.ts b/packages/core/pipeline/src/core/executor.ts index f1fc620b..9e20c82a 100644 --- a/packages/core/pipeline/src/core/executor.ts +++ b/packages/core/pipeline/src/core/executor.ts @@ -283,7 +283,7 @@ export class Executor { } if (notification.type === "email") { try { - this.options.emailService?.send({ + await this.options.emailService?.send({ userId: this.pipeline.userId, subject, content, diff --git a/packages/libs/midway-flyway-js/src/flyway.ts b/packages/libs/midway-flyway-js/src/flyway.ts index a412f863..ac70184b 100644 --- a/packages/libs/midway-flyway-js/src/flyway.ts +++ b/packages/libs/midway-flyway-js/src/flyway.ts @@ -227,8 +227,10 @@ export class Flyway { if (history.hash !== hash && this.allowHashNotMatch === false) { throw new Error(file + `hash conflict ,old: ${history.hash} != new: ${hash}`); } + this.logger.info('[ midfly ] script<' + file + '> already executed'); return true; } + this.logger.info('[ midfly ] script<' + file + '> not yet execute'); return false; } diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/dns.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/dns.ts new file mode 100644 index 00000000..cb670276 --- /dev/null +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/dns.ts @@ -0,0 +1,3 @@ +export const dnsList = [ + +] diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/index.ts similarity index 95% rename from packages/plugins/plugin-cert/src/plugin/cert-plugin/lego.ts rename to packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/index.ts index d735d630..8458224f 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/index.ts @@ -1,9 +1,9 @@ import { IsTaskPlugin, pluginGroups, RunStrategy, sp, Step, TaskInput } from "@certd/pipeline"; -import type { CertInfo } from "./acme.js"; -import { CertReader } from "./cert-reader.js"; -import { CertApplyBasePlugin } from "./base.js"; +import type { CertInfo } from "../acme"; +import { CertReader } from "../cert-reader"; +import { CertApplyBasePlugin } from "../base"; import fs from "fs"; -import { EabAccess } from "../../access"; +import { EabAccess } from "../../../access"; import path from "path"; export { CertReader }; diff --git a/packages/plugins/plugin-cert/src/plugin/index.ts b/packages/plugins/plugin-cert/src/plugin/index.ts index 1bb9235c..aaafb350 100644 --- a/packages/plugins/plugin-cert/src/plugin/index.ts +++ b/packages/plugins/plugin-cert/src/plugin/index.ts @@ -1,2 +1,2 @@ export * from "./cert-plugin/index.js"; -export * from "./cert-plugin/lego.js"; +export * from "./cert-plugin/lego/index.js"; From 83d0209775062da9a76cd423a1cef323246cb5bf Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 24 Jul 2024 02:11:38 +0800 Subject: [PATCH 20/30] chore: --- .../src/plugin/cert-plugin/index.ts | 1 + .../src/plugin/cert-plugin/lego/dns.ts | 4 +-- .../src/plugin/cert-plugin/lego/index.ts | 31 ++++++++++++++++--- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts index eac31023..5c4b4b69 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts @@ -33,6 +33,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin { vModel: "value", options: [ { value: "letsencrypt", label: "Let's Encrypt" }, + // { value: "letsencrypt-proxy", label: "Let's Encrypt代理,letsencrypt.org无法访问时使用" }, // { value: "buypass", label: "Buypass" }, { value: "zerossl", label: "ZeroSSL" }, ], diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/dns.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/dns.ts index cb670276..740904f2 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/dns.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/dns.ts @@ -1,3 +1 @@ -export const dnsList = [ - -] +export const dnsList = []; diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/index.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/index.ts index 8458224f..ac709556 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/index.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/index.ts @@ -1,9 +1,9 @@ import { IsTaskPlugin, pluginGroups, RunStrategy, sp, Step, TaskInput } from "@certd/pipeline"; -import type { CertInfo } from "../acme"; -import { CertReader } from "../cert-reader"; -import { CertApplyBasePlugin } from "../base"; +import type { CertInfo } from "../acme.js"; +import { CertReader } from "../cert-reader.js"; +import { CertApplyBasePlugin } from "../base.js"; import fs from "fs"; -import { EabAccess } from "../../../access"; +import { EabAccess } from "../../../access/index.js"; import path from "path"; export { CertReader }; @@ -25,6 +25,21 @@ export type { CertInfo }; }, }) export class CertApplyLegoPlugin extends CertApplyBasePlugin { + // @TaskInput({ + // title: "ACME服务端点", + // default: "https://acme-v02.api.letsencrypt.org/directory", + // component: { + // name: "a-select", + // vModel: "value", + // options: [ + // { value: "https://acme-v02.api.letsencrypt.org/directory", label: "Let's Encrypt" }, + // { value: "https://letsencrypt.proxy.handsfree.work/directory", label: "Let's Encrypt代理,letsencrypt.org无法访问时使用" }, + // ], + // }, + // required: true, + // }) + acmeServer!: string; + @TaskInput({ title: "DNS类型", component: { @@ -110,8 +125,14 @@ export class CertApplyLegoPlugin extends CertApplyBasePlugin { const savePathArgs = `--path "${saveDir}"`; const os_type = process.platform === "win32" ? "windows" : "linux"; const legoPath = path.resolve("./tools", os_type, "lego"); + let serverArgs = ""; + if (this.acmeServer) { + serverArgs = ` --server ${this.acmeServer}`; + } const cmds = [ - `${legoPath} -a --email "${this.email}" --dns ${this.dnsType} ${keyType} ${domainArgs} ${eabArgs} ${savePathArgs} ${this.customArgs || ""} run`, + `${legoPath} -a --email "${this.email}" --dns ${this.dnsType} ${keyType} ${domainArgs} ${serverArgs} ${eabArgs} ${savePathArgs} ${ + this.customArgs || "" + } run`, ]; await sp.spawn({ From 741172fd98cf68338e5f8c47037a8e3f48c88df2 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 24 Jul 2024 02:16:12 +0800 Subject: [PATCH 21/30] chore: --- package.json | 2 +- packages/core/acme-client/build.md | 2 +- publish-check.js | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index eef2facd..01bc98b4 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "publish": "npm run prepublishOnly1 && lerna publish --conventional-commits --create-release github && npm run afterpublishOnly && npm run deploy1", "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.trigger && git commit -m \\\"build: prepare to build\\\"", + "before-build": "cd ./packages/core/acme-client && time /t >build.md && git add . && 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" diff --git a/packages/core/acme-client/build.md b/packages/core/acme-client/build.md index 12524293..e9dc6ed7 100644 --- a/packages/core/acme-client/build.md +++ b/packages/core/acme-client/build.md @@ -1 +1 @@ -03:10 +02:16 diff --git a/publish-check.js b/publish-check.js index 5592dec0..dfb4650d 100644 --- a/publish-check.js +++ b/publish-check.js @@ -1,5 +1,6 @@ import fs from 'fs' +import childProcess from 'child_process'; function check(){ const gitAdd = fs.readFileSync("./node_modules/@lerna-lite/version/dist/lib/git-add.js","utf-8") if(gitAdd.indexOf("('git', ['add', '.']") > -1){ @@ -10,7 +11,13 @@ function check(){ } //GH_TOKEN + console.log("检查 GH_TOKEN") + if(process.env.npm_config_gh_token){ + process.env.GH_TOKEN = process.env.npm_config_gh_token + childProcess.exec("set GH_TOKEN="+process.env.npm_config_gh_token) + } if(!process.env.GH_TOKEN){ + console.log(process.env) console.error("GH_TOKEN 未设置") throw new Error("GH_TOKEN 未设置") } From bc02559bc739830e36619070a9d3eccf3f5e05ea Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 24 Jul 2024 02:17:06 +0800 Subject: [PATCH 22/30] chore: --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 01bc98b4..55aaa4c4 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "publish": "npm run prepublishOnly1 && lerna publish --conventional-commits --create-release github && npm run afterpublishOnly && npm run deploy1", "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 . && git commit -m \\\"build: prepare to 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 --experimental-json-modules deploy.js ", "check": "node --experimental-json-modules publish-check.js", "init": "lerna run build" From ca524657b6e6059ea800aec8b3474f04fec964a8 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 24 Jul 2024 02:17:12 +0800 Subject: [PATCH 23/30] build: prepare to build --- packages/core/acme-client/build.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/acme-client/build.md b/packages/core/acme-client/build.md index e9dc6ed7..07c2ff19 100644 --- a/packages/core/acme-client/build.md +++ b/packages/core/acme-client/build.md @@ -1 +1 @@ -02:16 +02:17 From e7c4ade57db23bd4f6f0e4065d82a1de6b86b862 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 24 Jul 2024 02:18:13 +0800 Subject: [PATCH 24/30] build: prepare to build --- packages/core/acme-client/build.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/acme-client/build.md b/packages/core/acme-client/build.md index 07c2ff19..495f4757 100644 --- a/packages/core/acme-client/build.md +++ b/packages/core/acme-client/build.md @@ -1 +1 @@ -02:17 +02:18 From 3c9c3ca3b05b7d3ffa5c8c92c45e593b57b50b72 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 24 Jul 2024 02:19:05 +0800 Subject: [PATCH 25/30] build: prepare to build --- packages/core/acme-client/build.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/acme-client/build.md b/packages/core/acme-client/build.md index 495f4757..e9f34f37 100644 --- a/packages/core/acme-client/build.md +++ b/packages/core/acme-client/build.md @@ -1 +1 @@ -02:18 +02:19 From 95d071ba564c941f9c1d761439ed8826a1597afa Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 24 Jul 2024 02:23:09 +0800 Subject: [PATCH 26/30] chore: --- package.json | 2 +- publish-check.js | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 55aaa4c4..8c5bb2ac 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "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\"", "deploy1": "node --experimental-json-modules deploy.js ", - "check": "node --experimental-json-modules publish-check.js", + "check": "node --experimental-json-modules publish-check.js && echo %GH_TOKEN%", "init": "lerna run build" }, "license": "AGPL-3.0", diff --git a/publish-check.js b/publish-check.js index dfb4650d..d2de3910 100644 --- a/publish-check.js +++ b/publish-check.js @@ -12,12 +12,8 @@ function check(){ //GH_TOKEN console.log("检查 GH_TOKEN") - if(process.env.npm_config_gh_token){ - process.env.GH_TOKEN = process.env.npm_config_gh_token - childProcess.exec("set GH_TOKEN="+process.env.npm_config_gh_token) - } if(!process.env.GH_TOKEN){ - console.log(process.env) + // setx /M GH_TOKEN xxxxx console.error("GH_TOKEN 未设置") throw new Error("GH_TOKEN 未设置") } From 46140c8efa3191ef7df851b5d23643bb8e7d6d35 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 24 Jul 2024 02:24:04 +0800 Subject: [PATCH 27/30] build: prepare to build --- packages/core/acme-client/build.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/acme-client/build.md b/packages/core/acme-client/build.md index e9f34f37..45b0270d 100644 --- a/packages/core/acme-client/build.md +++ b/packages/core/acme-client/build.md @@ -1 +1 @@ -02:19 +02:24 From eabb3e38b541f26b88f3a5829059b7fa1b2a43f8 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 24 Jul 2024 02:24:37 +0800 Subject: [PATCH 28/30] chore: --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c5bb2ac..55aaa4c4 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "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\"", "deploy1": "node --experimental-json-modules deploy.js ", - "check": "node --experimental-json-modules publish-check.js && echo %GH_TOKEN%", + "check": "node --experimental-json-modules publish-check.js", "init": "lerna run build" }, "license": "AGPL-3.0", From e5da46cfc31b2e30a4903bcb2251b1851265ef41 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 24 Jul 2024 02:25:12 +0800 Subject: [PATCH 29/30] v1.22.2 --- CHANGELOG.md | 6 ++++++ lerna.json | 2 +- packages/core/acme-client/CHANGELOG.md | 4 ++++ packages/core/acme-client/package.json | 2 +- packages/core/pipeline/CHANGELOG.md | 4 ++++ packages/core/pipeline/package.json | 2 +- packages/libs/lib-k8s/CHANGELOG.md | 4 ++++ packages/libs/lib-k8s/package.json | 4 ++-- packages/libs/midway-flyway-js/CHANGELOG.md | 4 ++++ packages/libs/midway-flyway-js/package.json | 2 +- packages/plugins/plugin-cert/CHANGELOG.md | 4 ++++ packages/plugins/plugin-cert/package.json | 6 +++--- packages/ui/certd-client/CHANGELOG.md | 6 ++++++ packages/ui/certd-client/package.json | 4 ++-- packages/ui/certd-server/CHANGELOG.md | 6 ++++++ packages/ui/certd-server/package.json | 12 ++++++------ 16 files changed, 55 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56b688ac..b1aef48b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23) + +### Bug Fixes + +* 修复创建流水线时,无法根据dns类型默认正确的dns授权的bug ([a2c43b5](https://github.com/certd/certd/commit/a2c43b50a6069ed48958fd142844a8568c2af452)) + ## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20) ### Performance Improvements diff --git a/lerna.json b/lerna.json index 14c53d82..31e5eafa 100644 --- a/lerna.json +++ b/lerna.json @@ -9,5 +9,5 @@ } }, "npmClient": "pnpm", - "version": "1.22.1" + "version": "1.22.2" } diff --git a/packages/core/acme-client/CHANGELOG.md b/packages/core/acme-client/CHANGELOG.md index 5e104f4d..b83c994a 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.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 + ## [1.22.1](https://github.com/publishlab/node-acme-client/compare/v1.22.0...v1.22.1) (2024-07-20) **Note:** Version bump only for package @certd/acme-client diff --git a/packages/core/acme-client/package.json b/packages/core/acme-client/package.json index c7e5a8d3..32a83380 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.1", + "version": "1.22.2", "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 c53c0364..cdfaf96e 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.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23) + +**Note:** Version bump only for package @certd/pipeline + ## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20) ### Performance Improvements diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index d61efc25..5509b174 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.1", + "version": "1.22.2", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/libs/lib-k8s/CHANGELOG.md b/packages/libs/lib-k8s/CHANGELOG.md index 1c95abae..c088ae06 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.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 + ## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20) **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 7cfc460d..0a300096 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.1", + "version": "1.22.2", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -17,7 +17,7 @@ "shelljs": "^0.8.5" }, "devDependencies": { - "@certd/pipeline": "^1.22.1", + "@certd/pipeline": "^1.22.2", "@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 751b37ca..9469a854 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.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 + ## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20) **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 7f0cf532..970ee36e 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.1", + "version": "1.22.2", "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 250c1540..f9b99365 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.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 + ## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20) ### Performance Improvements diff --git a/packages/plugins/plugin-cert/package.json b/packages/plugins/plugin-cert/package.json index cd56e463..55064bbd 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.1", + "version": "1.22.2", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -13,8 +13,8 @@ "preview": "vite preview" }, "dependencies": { - "@certd/acme-client": "^1.22.1", - "@certd/pipeline": "^1.22.1", + "@certd/acme-client": "^1.22.2", + "@certd/pipeline": "^1.22.2", "jszip": "^3.10.1", "node-forge": "^0.10.0", "psl": "^1.9.0" diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md index 4d8ec696..7fd1d9fd 100644 --- a/packages/ui/certd-client/CHANGELOG.md +++ b/packages/ui/certd-client/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23) + +### Bug Fixes + +* 修复创建流水线时,无法根据dns类型默认正确的dns授权的bug ([a2c43b5](https://github.com/certd/certd/commit/a2c43b50a6069ed48958fd142844a8568c2af452)) + ## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20) ### Performance Improvements diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index 09b1fb3d..57b629a9 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.1", + "version": "1.22.2", "private": true, "scripts": { "dev": "vite --open", @@ -59,7 +59,7 @@ "vuedraggable": "^2.24.3" }, "devDependencies": { - "@certd/pipeline": "^1.22.1", + "@certd/pipeline": "^1.22.2", "@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 a0335b57..b443df7b 100644 --- a/packages/ui/certd-server/CHANGELOG.md +++ b/packages/ui/certd-server/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23) + +### Bug Fixes + +* 修复创建流水线时,无法根据dns类型默认正确的dns授权的bug ([a2c43b5](https://github.com/certd/certd/commit/a2c43b50a6069ed48958fd142844a8568c2af452)) + ## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20) ### Performance Improvements diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index 7b2db4eb..0f3d6be8 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.1", + "version": "1.22.2", "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.1", + "@certd/acme-client": "^1.22.2", "@certd/lib-huawei": "^1.22.1", - "@certd/lib-k8s": "^1.22.1", - "@certd/midway-flyway-js": "^1.22.1", - "@certd/pipeline": "^1.22.1", - "@certd/plugin-cert": "^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", "@koa/cors": "^3.4.3", "@midwayjs/bootstrap": "^3.16.2", "@midwayjs/cache": "^3.14.0", From 7cb5f21444bb7e3129bf07f009108b357ff3ad6c Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 24 Jul 2024 02:29:53 +0800 Subject: [PATCH 30/30] chore: --- build.trigger | 2 +- packages/core/acme-client/package.json | 2 +- packages/core/pipeline/package.json | 2 +- packages/libs/lib-k8s/package.json | 2 +- packages/libs/midway-flyway-js/package.json | 2 +- packages/plugins/plugin-cert/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.trigger b/build.trigger index 00750edc..b8626c4c 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -3 +4 diff --git a/packages/core/acme-client/package.json b/packages/core/acme-client/package.json index 32a83380..19ea85b5 100644 --- a/packages/core/acme-client/package.json +++ b/packages/core/acme-client/package.json @@ -59,5 +59,5 @@ "bugs": { "url": "https://github.com/publishlab/node-acme-client/issues" }, - "gitHead": "47fe3d5826661f678d081ab53e67c847a3239d88" + "gitHead": "e5da46cfc31b2e30a4903bcb2251b1851265ef41" } diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index 5509b174..4464cd5e 100644 --- a/packages/core/pipeline/package.json +++ b/packages/core/pipeline/package.json @@ -55,5 +55,5 @@ "vite": "^4.3.8", "vue-tsc": "^1.6.5" }, - "gitHead": "47fe3d5826661f678d081ab53e67c847a3239d88" + "gitHead": "e5da46cfc31b2e30a4903bcb2251b1851265ef41" } diff --git a/packages/libs/lib-k8s/package.json b/packages/libs/lib-k8s/package.json index 0a300096..afc2bc0d 100644 --- a/packages/libs/lib-k8s/package.json +++ b/packages/libs/lib-k8s/package.json @@ -38,5 +38,5 @@ "tslib": "^2.5.2", "typescript": "^4.8.4" }, - "gitHead": "47fe3d5826661f678d081ab53e67c847a3239d88" + "gitHead": "e5da46cfc31b2e30a4903bcb2251b1851265ef41" } diff --git a/packages/libs/midway-flyway-js/package.json b/packages/libs/midway-flyway-js/package.json index 970ee36e..7a7ad9c3 100644 --- a/packages/libs/midway-flyway-js/package.json +++ b/packages/libs/midway-flyway-js/package.json @@ -53,5 +53,5 @@ "typeorm": "^0.3.11", "typescript": "~5.1.0" }, - "gitHead": "47fe3d5826661f678d081ab53e67c847a3239d88" + "gitHead": "e5da46cfc31b2e30a4903bcb2251b1851265ef41" } diff --git a/packages/plugins/plugin-cert/package.json b/packages/plugins/plugin-cert/package.json index 55064bbd..8104bf7f 100644 --- a/packages/plugins/plugin-cert/package.json +++ b/packages/plugins/plugin-cert/package.json @@ -53,5 +53,5 @@ "vite": "^3.1.0", "vue-tsc": "^0.38.9" }, - "gitHead": "47fe3d5826661f678d081ab53e67c847a3239d88" + "gitHead": "e5da46cfc31b2e30a4903bcb2251b1851265ef41" }