Jianghan 1 năm trước cách đây
mục cha
commit
fd72c28473

+ 1 - 0
api/internal/logic/sendmaillogic.go

@@ -26,6 +26,7 @@ func NewSendMailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SendMail
 }
 
 func (l *SendMailLogic) SendMail(req *types.ExportByDbReq) (resp *types.BiResp, err error) {
+	logx.Info(resp)
 	datas := []*biservice.FilesData{}
 	for _, v := range req.Datas {
 		data := &biservice.FilesData{

+ 9 - 7
rpc/internal/logic/sendmaillogic.go

@@ -7,6 +7,8 @@ import (
 	"bp.jydev.jianyu360.cn/BaseService/biService/rpc/pb"
 	"bp.jydev.jianyu360.cn/BaseService/biService/service"
 	"context"
+	"fmt"
+	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/tjfoc/gmsm/sm4"
 
 	"github.com/zeromicro/go-zero/core/logx"
@@ -34,13 +36,13 @@ func (l *SendMailLogic) SendMail(in *pb.ExportByDbReq) (*pb.BiReply, error) {
 			Data:      nil,
 		}, nil
 	}
-	//if RsaEncrypt([]byte(fmt.Sprintf("%s&%s&%s&%s", gconv.String(in.Content), gconv.String(in.Mails), gconv.String(in.FileName), gconv.String(in.Title)))) != in.Token {
-	//	return &pb.BiReply{
-	//		ErrorCode: 1,
-	//		ErrorMsg:  "token验证不通过",
-	//		Data:      nil,
-	//	}, nil
-	//}
+	if RsaEncrypt([]byte(fmt.Sprintf("%s&%s&%s&%s", gconv.String(in.Content), gconv.String(in.Mails), gconv.String(in.FileName), gconv.String(in.Title)))) != in.Token {
+		return &pb.BiReply{
+			ErrorCode: 1,
+			ErrorMsg:  "token验证不通过",
+			Data:      nil,
+		}, nil
+	}
 	res := (&service.ExportByDbReq{
 		Token:    in.Token,
 		Title:    in.Title,

+ 1 - 1
service/exprot.go

@@ -312,7 +312,7 @@ func (e *ExportByDbReq) ExportDataByDb() []byte {
 		var files []string
 		for _, s := range pathArr {
 			ss := strings.Split(s, "/")
-			files = append(files, fmt.Sprintf("%s/%s/%s/%s", ComFileUrl, stype, timeStr, ss[len(ss)-1]))
+			files = append(files, fmt.Sprintf("%s/%s/%s/%s.xlsx", ComFileUrl, stype, timeStr, ss[len(ss)-1]))
 		}
 		state := sendMailA(e.Title, e.Mails, e.Content, strings.Join(files, ","))
 		BiService.Insert("export_record", map[string]interface{}{