diff --git a/.gitignore b/.gitignore index f6125b9..61a2d61 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,5 @@ go.sum account/ gen_result/ -etc/app-cloudep-notification-service.yaml +etc/service.yaml ./client \ No newline at end of file diff --git a/Makefile b/Makefile index 24f9860..1d51c21 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ GO_CTL_NAME=goctl + # go-zero 生成風格 GO_ZERO_STYLE=go_zero @@ -9,7 +10,6 @@ LDFLAGS := -s -w VERSION="v1.0.3" DOCKER_REPO="igs170911/notification" - .PHONY: test test: # 進行測試 go test -v --cover ./... @@ -45,4 +45,5 @@ run-docker: # 建立 rpc code build-docker: cp ./build/Dockerfile Dockerfile docker buildx build -t $(DOCKER_REPO):$(VERSION) --build-arg SSH_PRIVATE_KEY="$(cat ~/.ssh/ed_25519)" . - rm -rf Dockerfile \ No newline at end of file + rm -rf Dockerfile + @echo "Generate core-api files successfully" diff --git a/etc/service.yaml b/etc/service.yaml index 60b422e..f9a189a 100644 --- a/etc/service.yaml +++ b/etc/service.yaml @@ -2,5 +2,5 @@ Name: service.rpc ListenOn: 0.0.0.0:8080 Etcd: Hosts: - - docker-etcd.digimon.orb.local:2379 + - 127.0.0.1:2379 Key: service.rpc diff --git a/internal/logic/senderservice/send_mail_by_template_id_logic.go b/internal/logic/senderservice/send_mail_by_template_id_logic.go index 75a4b7e..abf4b49 100644 --- a/internal/logic/senderservice/send_mail_by_template_id_logic.go +++ b/internal/logic/senderservice/send_mail_by_template_id_logic.go @@ -1,13 +1,11 @@ package senderservicelogic import ( - "context" - "fmt" - "app-cloudep-notification-service/gen_result/pb/notification" "app-cloudep-notification-service/internal/svc" - ers "code.30cm.net/digimon/library-go/errors" + "context" + "fmt" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/server/senderservice/sender_service_server.go b/internal/server/senderservice/sender_service_server.go index ea7fd95..14d51b9 100644 --- a/internal/server/senderservice/sender_service_server.go +++ b/internal/server/senderservice/sender_service_server.go @@ -8,6 +8,7 @@ import ( "app-cloudep-notification-service/gen_result/pb/notification" senderservicelogic "app-cloudep-notification-service/internal/logic/senderservice" + "app-cloudep-notification-service/internal/logic/senderservice" "app-cloudep-notification-service/internal/svc" )