From bbc6d094c3b0b91900a26ed9e6e2eca154c560c4 Mon Sep 17 00:00:00 2001 From: yoan <536464346@qq.com> Date: Wed, 21 Aug 2024 21:34:11 +0800 Subject: [PATCH] Resolved the issue where the final deployment logs for the domain were not recorded after immediate execution. --- .gitignore | 1 + Makefile | 37 +++++++++++++++++++++++++++++++++++++ internal/domains/domains.go | 8 ++------ internal/domains/history.go | 1 + 4 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 Makefile diff --git a/.gitignore b/.gitignore index ed648b4c..81dfbea9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ vendor pb_data main certimate +build # Editor directories and files .vscode/* diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..fb6c79e9 --- /dev/null +++ b/Makefile @@ -0,0 +1,37 @@ +# 定义变量 +BINARY_NAME=certimate +VERSION=$(shell git describe --tags --always) +BUILD_DIR=build + +# 支持的操作系统和架构列表 +OS_ARCH=\ + linux/amd64 \ + linux/arm64 \ + darwin/amd64 \ + darwin/arm64 \ + windows/amd64 \ + windows/arm64 + +# 默认目标 +all: build + +# 构建所有平台的二进制文件 +build: $(OS_ARCH) +$(OS_ARCH): + @mkdir -p $(BUILD_DIR) + GOOS=$(word 1,$(subst /, ,$@)) \ + GOARCH=$(word 2,$(subst /, ,$@)) \ + go build -o $(BUILD_DIR)/$(BINARY_NAME)_$(word 1,$(subst /, ,$@))_$(word 2,$(subst /, ,$@)) -ldflags="-X main.version=$(VERSION)" . + +# 清理构建文件 +clean: + rm -rf $(BUILD_DIR) + +# 帮助信息 +help: + @echo "Usage:" + @echo " make - 编译所有平台的二进制文件" + @echo " make clean - 清理构建文件" + @echo " make help - 显示此帮助信息" + +.PHONY: all build clean help \ No newline at end of file diff --git a/internal/domains/domains.go b/internal/domains/domains.go index 4d9d369f..6144fa8f 100644 --- a/internal/domains/domains.go +++ b/internal/domains/domains.go @@ -14,9 +14,7 @@ func create(ctx context.Context, record *models.Record) error { } if record.GetBool("rightnow") { - defer func() { - setRightnow(ctx, record, false) - }() + if err := deploy(ctx, record); err != nil { return err } @@ -46,9 +44,7 @@ func update(ctx context.Context, record *models.Record) error { } if record.GetBool("rightnow") { - defer func() { - setRightnow(ctx, record, false) - }() + if err := deploy(ctx, record); err != nil { return err } diff --git a/internal/domains/history.go b/internal/domains/history.go index 4e7c4deb..6823778c 100644 --- a/internal/domains/history.go +++ b/internal/domains/history.go @@ -77,6 +77,7 @@ func (a *history) commit() error { domainRecord.Set("lastDeployedAt", a.DeployedAt) domainRecord.Set("lastDeployment", record.Id) + domainRecord.Set("rightnow", false) if err := app.GetApp().Dao().SaveRecord(domainRecord); err != nil { return err