merge mail

.gitignore

@@ -2,5 +2,6 @@
 go.sum
 account/
 gen_result/
-etc/service.yaml
+etc/notification.yaml
-client/
+client/
+.DS_Store

Makefile

@@ -21,7 +21,7 @@ fmt: # 格式優化
 
 .PHONY: gen-rpc
 gen-rpc: # 建立 rpc code
-	$(GO_CTL_NAME) rpc protoc ./generate/protobuf/service.proto -m --style=$(GO_ZERO_STYLE) --go_out=./gen_result/pb --go-grpc_out=./gen_result/pb --zrpc_out=.
+	$(GO_CTL_NAME) rpc protoc ./generate/protobuf/notification.proto -m --style=$(GO_ZERO_STYLE) --go_out=./gen_result/pb --go-grpc_out=./gen_result/pb --zrpc_out=.
 	copy ./etc/service.yaml ./etc/service.example.yaml
 	go mod tidy
 	@echo "Generate core-api files successfully"

client/senderservice/sender_service.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// Source: service.proto
+// Source: notification.proto
 
 package senderservice
 

etc/service.example.yaml

@@ -1,14 +1,14 @@
-Name: service.rpc
+Name: notification.rpc
-ListenOn: 0.0.0.0:8080
+ListenOn: 0.0.0.0:8003
 Etcd:
   Hosts:
-  - 127.0.0.1:2379
+    - 127.0.0.1:2379
-  Key: service.rpc
+  Key: notification.rpc
 SMTP:
   Host: smtp.mailgun.org
   Port: 25
-  User: xxx
+  User: postmaster@abc123@30.com
-  Password: 000
+  Password: gg88g88
 
 SMSSender:
   User: daniel@30cm.net

internal/server/senderservice/sender_service_server.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// Source: service.proto
+// Source: notification.proto
 
 package server
 
@@ -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/svc"
 )
 

notification.go

@@ -16,7 +16,7 @@ import (
 	"google.golang.org/grpc/reflection"
 )
 
-var configFile = flag.String("f", "etc/service.yaml", "the config file")
+var configFile = flag.String("f", "etc/notification.yaml", "the config file")
 
 func main() {
 	flag.Parse()