golint
This commit is contained in:
parent
8478442979
commit
b8b64302d6
|
@ -117,6 +117,14 @@ issues:
|
||||||
- gocognit
|
- gocognit
|
||||||
- contextcheck
|
- contextcheck
|
||||||
|
|
||||||
|
exclude-dirs:
|
||||||
|
- internal/model
|
||||||
|
|
||||||
|
exclude-files:
|
||||||
|
- .*_test.go
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
linters-settings:
|
linters-settings:
|
||||||
gci:
|
gci:
|
||||||
sections:
|
sections:
|
||||||
|
|
1
Makefile
1
Makefile
|
@ -18,6 +18,7 @@ test: # 進行測試
|
||||||
fmt: # 格式優化
|
fmt: # 格式優化
|
||||||
$(GOFMT) -w $(GOFILES)
|
$(GOFMT) -w $(GOFILES)
|
||||||
goimports -w ./
|
goimports -w ./
|
||||||
|
golangci-lint run
|
||||||
|
|
||||||
.PHONY: gen-rpc
|
.PHONY: gen-rpc
|
||||||
gen-rpc: # 建立 rpc code
|
gen-rpc: # 建立 rpc code
|
||||||
|
|
|
@ -24,10 +24,10 @@ type (
|
||||||
SendMail(ctx context.Context, in *SendMailReq, opts ...grpc.CallOption) (*OKResp, error)
|
SendMail(ctx context.Context, in *SendMailReq, opts ...grpc.CallOption) (*OKResp, error)
|
||||||
// SendSms 寄簡訊
|
// SendSms 寄簡訊
|
||||||
SendSms(ctx context.Context, in *SendSMSReq, opts ...grpc.CallOption) (*OKResp, error)
|
SendSms(ctx context.Context, in *SendSMSReq, opts ...grpc.CallOption) (*OKResp, error)
|
||||||
// SendMailByTemplateId 寄送模板信件
|
// SendMailByTemplateID 寄送模板信件
|
||||||
SendMailByTemplateId(ctx context.Context, in *SendByTemplateIDReq, opts ...grpc.CallOption) (*OKResp, error)
|
SendMailByTemplateID(ctx context.Context, in *SendByTemplateIDReq, opts ...grpc.CallOption) (*OKResp, error)
|
||||||
// SendSmsByTemplateId 寄送模板簡訊
|
// SendSmsByTemplateID 寄送模板簡訊
|
||||||
SendSmsByTemplateId(ctx context.Context, in *SendByTemplateIDReq, opts ...grpc.CallOption) (*OKResp, error)
|
SendSmsByTemplateID(ctx context.Context, in *SendByTemplateIDReq, opts ...grpc.CallOption) (*OKResp, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultSenderService struct {
|
defaultSenderService struct {
|
||||||
|
@ -53,14 +53,14 @@ func (m *defaultSenderService) SendSms(ctx context.Context, in *SendSMSReq, opts
|
||||||
return client.SendSms(ctx, in, opts...)
|
return client.SendSms(ctx, in, opts...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// SendMailByTemplateId 寄送模板信件
|
// SendMailByTemplateID 寄送模板信件
|
||||||
func (m *defaultSenderService) SendMailByTemplateId(ctx context.Context, in *SendByTemplateIDReq, opts ...grpc.CallOption) (*OKResp, error) {
|
func (m *defaultSenderService) SendMailByTemplateID(ctx context.Context, in *SendByTemplateIDReq, opts ...grpc.CallOption) (*OKResp, error) {
|
||||||
client := notification.NewSenderServiceClient(m.cli.Conn())
|
client := notification.NewSenderServiceClient(m.cli.Conn())
|
||||||
return client.SendMailByTemplateId(ctx, in, opts...)
|
return client.SendMailByTemplateID(ctx, in, opts...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// SendSmsByTemplateId 寄送模板簡訊
|
// SendSmsByTemplateID 寄送模板簡訊
|
||||||
func (m *defaultSenderService) SendSmsByTemplateId(ctx context.Context, in *SendByTemplateIDReq, opts ...grpc.CallOption) (*OKResp, error) {
|
func (m *defaultSenderService) SendSmsByTemplateID(ctx context.Context, in *SendByTemplateIDReq, opts ...grpc.CallOption) (*OKResp, error) {
|
||||||
client := notification.NewSenderServiceClient(m.cli.Conn())
|
client := notification.NewSenderServiceClient(m.cli.Conn())
|
||||||
return client.SendSmsByTemplateId(ctx, in, opts...)
|
return client.SendSmsByTemplateID(ctx, in, opts...)
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,10 +35,10 @@ service SenderService {
|
||||||
rpc SendMail(SendMailReq) returns(OKResp);
|
rpc SendMail(SendMailReq) returns(OKResp);
|
||||||
// SendSms 寄簡訊
|
// SendSms 寄簡訊
|
||||||
rpc SendSms(SendSMSReq) returns(OKResp);
|
rpc SendSms(SendSMSReq) returns(OKResp);
|
||||||
// SendMailByTemplateId 寄送模板信件
|
// SendMailByTemplateID 寄送模板信件
|
||||||
rpc SendMailByTemplateId(SendByTemplateIDReq) returns(OKResp);
|
rpc SendMailByTemplateID(SendByTemplateIDReq) returns(OKResp);
|
||||||
// SendSmsByTemplateId 寄送模板簡訊
|
// SendSmsByTemplateID 寄送模板簡訊
|
||||||
rpc SendSmsByTemplateId(SendByTemplateIDReq) returns(OKResp);
|
rpc SendSmsByTemplateID(SendByTemplateIDReq) returns(OKResp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package domain
|
package domain
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"code.30cm.net/digimon/library-go/errs"
|
"code.30cm.net/digimon/library-go/errs"
|
||||||
|
@ -24,14 +23,13 @@ const (
|
||||||
// SendMailError ...
|
// SendMailError ...
|
||||||
func SendMailError(s ...string) *errs.LibError {
|
func SendMailError(s ...string) *errs.LibError {
|
||||||
return errs.NewError(code.CloudEPNotification, code.ThirdParty,
|
return errs.NewError(code.CloudEPNotification, code.ThirdParty,
|
||||||
SendMailErrorCode.ToUint32(),
|
SendMailErrorCode.ToUint32(), strings.Join(s, " "))
|
||||||
fmt.Sprintf("%s", strings.Join(s, " ")))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// SendMailErrorL logs error message and returns Err
|
// SendMailErrorL logs error message and returns Err
|
||||||
func SendMailErrorL(l logx.Logger, filed []logx.LogField, s ...string) *errs.LibError {
|
func SendMailErrorL(l logx.Logger, filed []logx.LogField, s ...string) *errs.LibError {
|
||||||
e := SendMailError(s...)
|
e := SendMailError(s...)
|
||||||
if filed != nil || len(filed) >= 0 {
|
if filed != nil || len(filed) > 0 {
|
||||||
l.WithCallerSkip(1).WithFields(filed...).Error(e.Error())
|
l.WithCallerSkip(1).WithFields(filed...).Error(e.Error())
|
||||||
}
|
}
|
||||||
l.WithCallerSkip(1).Error(e.Error())
|
l.WithCallerSkip(1).Error(e.Error())
|
||||||
|
@ -42,14 +40,13 @@ func SendMailErrorL(l logx.Logger, filed []logx.LogField, s ...string) *errs.Lib
|
||||||
// SendSMSError ...
|
// SendSMSError ...
|
||||||
func SendSMSError(s ...string) *errs.LibError {
|
func SendSMSError(s ...string) *errs.LibError {
|
||||||
return errs.NewError(code.CloudEPNotification, code.ThirdParty,
|
return errs.NewError(code.CloudEPNotification, code.ThirdParty,
|
||||||
SendSMSErrorCode.ToUint32(),
|
SendSMSErrorCode.ToUint32(), strings.Join(s, " "))
|
||||||
fmt.Sprintf("%s", strings.Join(s, " ")))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// SendSMSErrorL logs error message and returns Err
|
// SendSMSErrorL logs error message and returns Err
|
||||||
func SendSMSErrorL(l logx.Logger, filed []logx.LogField, s ...string) *errs.LibError {
|
func SendSMSErrorL(l logx.Logger, filed []logx.LogField, s ...string) *errs.LibError {
|
||||||
e := SendSMSError(s...)
|
e := SendSMSError(s...)
|
||||||
if filed != nil || len(filed) >= 0 {
|
if filed != nil || len(filed) > 0 {
|
||||||
l.WithCallerSkip(1).WithFields(filed...).Error(e.Error())
|
l.WithCallerSkip(1).WithFields(filed...).Error(e.Error())
|
||||||
}
|
}
|
||||||
l.WithCallerSkip(1).Error(e.Error())
|
l.WithCallerSkip(1).Error(e.Error())
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
package senderservicelogic
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"app-cloudep-notification-service/gen_result/pb/notification"
|
||||||
|
"app-cloudep-notification-service/internal/svc"
|
||||||
|
|
||||||
|
"github.com/zeromicro/go-zero/core/logx"
|
||||||
|
)
|
||||||
|
|
||||||
|
type SendMailByTemplateIDLogic struct {
|
||||||
|
ctx context.Context
|
||||||
|
svcCtx *svc.ServiceContext
|
||||||
|
logx.Logger
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewSendMailByTemplateIDLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SendMailByTemplateIDLogic {
|
||||||
|
return &SendMailByTemplateIDLogic{
|
||||||
|
ctx: ctx,
|
||||||
|
svcCtx: svcCtx,
|
||||||
|
Logger: logx.WithContext(ctx),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SendMailByTemplateID 寄送模板信件
|
||||||
|
func (l *SendMailByTemplateIDLogic) SendMailByTemplateID(_ *notification.SendByTemplateIDReq) (*notification.OKResp, error) {
|
||||||
|
// todo: add your logic here and delete this line
|
||||||
|
|
||||||
|
return ¬ification.OKResp{}, nil
|
||||||
|
}
|
|
@ -1,29 +0,0 @@
|
||||||
package senderservicelogic
|
|
||||||
|
|
||||||
import (
|
|
||||||
"app-cloudep-notification-service/gen_result/pb/notification"
|
|
||||||
"app-cloudep-notification-service/internal/svc"
|
|
||||||
"context"
|
|
||||||
|
|
||||||
"github.com/zeromicro/go-zero/core/logx"
|
|
||||||
)
|
|
||||||
|
|
||||||
type SendMailByTemplateIdLogic struct {
|
|
||||||
ctx context.Context
|
|
||||||
svcCtx *svc.ServiceContext
|
|
||||||
logx.Logger
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewSendMailByTemplateIdLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SendMailByTemplateIdLogic {
|
|
||||||
return &SendMailByTemplateIdLogic{
|
|
||||||
ctx: ctx,
|
|
||||||
svcCtx: svcCtx,
|
|
||||||
Logger: logx.WithContext(ctx),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// SendMailByTemplateId 寄送模板信件
|
|
||||||
func (l *SendMailByTemplateIdLogic) SendMailByTemplateId(in *notification.SendByTemplateIDReq) (*notification.OKResp, error) {
|
|
||||||
|
|
||||||
return ¬ification.OKResp{}, nil
|
|
||||||
}
|
|
|
@ -9,22 +9,22 @@ import (
|
||||||
"github.com/zeromicro/go-zero/core/logx"
|
"github.com/zeromicro/go-zero/core/logx"
|
||||||
)
|
)
|
||||||
|
|
||||||
type SendSmsByTemplateIdLogic struct {
|
type SendSmsByTemplateIDLogic struct {
|
||||||
ctx context.Context
|
ctx context.Context
|
||||||
svcCtx *svc.ServiceContext
|
svcCtx *svc.ServiceContext
|
||||||
logx.Logger
|
logx.Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewSendSmsByTemplateIdLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SendSmsByTemplateIdLogic {
|
func NewSendSmsByTemplateIDLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SendSmsByTemplateIDLogic {
|
||||||
return &SendSmsByTemplateIdLogic{
|
return &SendSmsByTemplateIDLogic{
|
||||||
ctx: ctx,
|
ctx: ctx,
|
||||||
svcCtx: svcCtx,
|
svcCtx: svcCtx,
|
||||||
Logger: logx.WithContext(ctx),
|
Logger: logx.WithContext(ctx),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// SendSmsByTemplateId 寄送模板簡訊
|
// SendSmsByTemplateID 寄送模板簡訊
|
||||||
func (l *SendSmsByTemplateIdLogic) SendSmsByTemplateId(in *notification.SendByTemplateIDReq) (*notification.OKResp, error) {
|
func (l *SendSmsByTemplateIDLogic) SendSmsByTemplateID(_ *notification.SendByTemplateIDReq) (*notification.OKResp, error) {
|
||||||
// todo: add your logic here and delete this line
|
// todo: add your logic here and delete this line
|
||||||
|
|
||||||
return ¬ification.OKResp{}, nil
|
return ¬ification.OKResp{}, nil
|
|
@ -8,7 +8,6 @@ import (
|
||||||
|
|
||||||
"app-cloudep-notification-service/gen_result/pb/notification"
|
"app-cloudep-notification-service/gen_result/pb/notification"
|
||||||
senderservicelogic "app-cloudep-notification-service/internal/logic/senderservice"
|
senderservicelogic "app-cloudep-notification-service/internal/logic/senderservice"
|
||||||
|
|
||||||
"app-cloudep-notification-service/internal/svc"
|
"app-cloudep-notification-service/internal/svc"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -35,14 +34,14 @@ func (s *SenderServiceServer) SendSms(ctx context.Context, in *notification.Send
|
||||||
return l.SendSms(in)
|
return l.SendSms(in)
|
||||||
}
|
}
|
||||||
|
|
||||||
// SendMailByTemplateId 寄送模板信件
|
// SendMailByTemplateID 寄送模板信件
|
||||||
func (s *SenderServiceServer) SendMailByTemplateId(ctx context.Context, in *notification.SendByTemplateIDReq) (*notification.OKResp, error) {
|
func (s *SenderServiceServer) SendMailByTemplateID(ctx context.Context, in *notification.SendByTemplateIDReq) (*notification.OKResp, error) {
|
||||||
l := senderservicelogic.NewSendMailByTemplateIdLogic(ctx, s.svcCtx)
|
l := senderservicelogic.NewSendMailByTemplateIDLogic(ctx, s.svcCtx)
|
||||||
return l.SendMailByTemplateId(in)
|
return l.SendMailByTemplateID(in)
|
||||||
}
|
}
|
||||||
|
|
||||||
// SendSmsByTemplateId 寄送模板簡訊
|
// SendSmsByTemplateID 寄送模板簡訊
|
||||||
func (s *SenderServiceServer) SendSmsByTemplateId(ctx context.Context, in *notification.SendByTemplateIDReq) (*notification.OKResp, error) {
|
func (s *SenderServiceServer) SendSmsByTemplateID(ctx context.Context, in *notification.SendByTemplateIDReq) (*notification.OKResp, error) {
|
||||||
l := senderservicelogic.NewSendSmsByTemplateIdLogic(ctx, s.svcCtx)
|
l := senderservicelogic.NewSendSmsByTemplateIDLogic(ctx, s.svcCtx)
|
||||||
return l.SendSmsByTemplateId(in)
|
return l.SendSmsByTemplateID(in)
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,6 +21,7 @@ type ServiceContext struct {
|
||||||
|
|
||||||
func NewServiceContext(c config.Config) *ServiceContext {
|
func NewServiceContext(c config.Config) *ServiceContext {
|
||||||
errs.Scope = code.CloudEPNotification
|
errs.Scope = code.CloudEPNotification
|
||||||
|
|
||||||
return &ServiceContext{
|
return &ServiceContext{
|
||||||
Config: c,
|
Config: c,
|
||||||
MailSender: usecase.MustMailgunUseCase(usecase.MailUseCaseParam{Conf: c}),
|
MailSender: usecase.MustMailgunUseCase(usecase.MailUseCaseParam{Conf: c}),
|
||||||
|
|
|
@ -26,6 +26,7 @@ func (s *SMSUseCase) SendSMS(_ context.Context, req usecase.SMSReq) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,12 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"flag"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"app-cloudep-notification-service/gen_result/pb/notification"
|
"app-cloudep-notification-service/gen_result/pb/notification"
|
||||||
"app-cloudep-notification-service/internal/config"
|
"app-cloudep-notification-service/internal/config"
|
||||||
senderserviceServer "app-cloudep-notification-service/internal/server/senderservice"
|
senderserviceServer "app-cloudep-notification-service/internal/server/senderservice"
|
||||||
"app-cloudep-notification-service/internal/svc"
|
"app-cloudep-notification-service/internal/svc"
|
||||||
|
"flag"
|
||||||
|
"log"
|
||||||
|
|
||||||
"github.com/zeromicro/go-zero/core/conf"
|
"github.com/zeromicro/go-zero/core/conf"
|
||||||
"github.com/zeromicro/go-zero/core/service"
|
"github.com/zeromicro/go-zero/core/service"
|
||||||
|
@ -34,6 +33,6 @@ func main() {
|
||||||
})
|
})
|
||||||
defer s.Stop()
|
defer s.Stop()
|
||||||
|
|
||||||
fmt.Printf("Starting rpc server at %s...\n", c.ListenOn)
|
log.Printf("Starting rpc server at %s...\n", c.ListenOn)
|
||||||
s.Start()
|
s.Start()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue