From c45ad3c901e0cf62c62842e9f3be1466f2e925f9 Mon Sep 17 00:00:00 2001 From: yoan <536464346@qq.com> Date: Sun, 20 Oct 2024 13:00:27 +0800 Subject: [PATCH] update actions,fix something --- .github/workflows/push_image.yml | 2 +- .github/workflows/release.yml | 12 ++++++------ Dockerfile_build => Dockerfile | 0 internal/applicant/applicant.go | 3 --- internal/domain/access.go | 1 + ui/src/i18n/locales/zh/nls.common.json | 3 ++- 6 files changed, 10 insertions(+), 11 deletions(-) rename Dockerfile_build => Dockerfile (100%) diff --git a/.github/workflows/push_image.yml b/.github/workflows/push_image.yml index b64c8bbf..22802cbf 100644 --- a/.github/workflows/push_image.yml +++ b/.github/workflows/push_image.yml @@ -52,7 +52,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . - file: ./Dockerfile_build + file: ./Dockerfile platforms: linux/amd64,linux/arm64 push: true tags: ${{ steps.meta.outputs.tags }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d1b51411..8ec32deb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,18 +14,18 @@ jobs: with: fetch-depth: 0 - # - name: Set up Node.js - # uses: actions/setup-node@v4 - # with: - # node-version: 20.11.0 + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 20.11.0 - name: Set up Go uses: actions/setup-go@v5 with: go-version: ">=1.22.5" - # - name: Build Admin dashboard UI - # run: npm --prefix=./ui ci && npm --prefix=./ui run build + - name: Build Admin dashboard UI + run: npm --prefix=./ui ci && npm --prefix=./ui run build - name: Run GoReleaser uses: goreleaser/goreleaser-action@v3 diff --git a/Dockerfile_build b/Dockerfile similarity index 100% rename from Dockerfile_build rename to Dockerfile diff --git a/internal/applicant/applicant.go b/internal/applicant/applicant.go index 1786ce1a..99153e8d 100644 --- a/internal/applicant/applicant.go +++ b/internal/applicant/applicant.go @@ -19,9 +19,6 @@ import ( "github.com/go-acme/lego/v4/lego" "github.com/go-acme/lego/v4/registration" "github.com/pocketbase/pocketbase/models" - - "certimate/internal/domain" - "certimate/internal/utils/app" ) const ( diff --git a/internal/domain/access.go b/internal/domain/access.go index ca3d4a0f..889d37fa 100644 --- a/internal/domain/access.go +++ b/internal/domain/access.go @@ -51,6 +51,7 @@ type HttpreqAccess struct { Mode string `json:"mode"` Username string `json:"username"` Password string `json:"password"` +} type LocalAccess struct{} diff --git a/ui/src/i18n/locales/zh/nls.common.json b/ui/src/i18n/locales/zh/nls.common.json index 458d7436..f6179636 100644 --- a/ui/src/i18n/locales/zh/nls.common.json +++ b/ui/src/i18n/locales/zh/nls.common.json @@ -67,7 +67,7 @@ "common.provider.namesilo": "Namesilo", "common.provider.godaddy": "GoDaddy", "common.provider.pdns": "PowerDNS", - "common.provider.httpreq": "HTTP 请求", + "common.provider.httpreq": "Http Request", "common.provider.local": "本地部署", "common.provider.ssh": "SSH 部署", "common.provider.webhook": "Webhook", @@ -77,3 +77,4 @@ "common.provider.telegram": "Telegram", "common.provider.lark": "飞书" } +