|
@@ -1,19 +1,14 @@
|
|
|
package logic
|
|
|
|
|
|
import (
|
|
|
- "bp.jydev.jianyu360.cn/BaseService/biService/entity"
|
|
|
IC "bp.jydev.jianyu360.cn/BaseService/biService/rpc/internal/config"
|
|
|
"bp.jydev.jianyu360.cn/BaseService/biService/rpc/internal/svc"
|
|
|
"bp.jydev.jianyu360.cn/BaseService/biService/rpc/pb"
|
|
|
"bp.jydev.jianyu360.cn/BaseService/biService/service"
|
|
|
- fpb "bp.jydev.jianyu360.cn/BaseService/fileCenter/rpc/pb"
|
|
|
"context"
|
|
|
"fmt"
|
|
|
- "github.com/gogf/gf/v2/util/gconv"
|
|
|
"github.com/zeromicro/go-zero/core/logx"
|
|
|
"log"
|
|
|
- "path"
|
|
|
- "strings"
|
|
|
)
|
|
|
|
|
|
type MaterialSaveLogic struct {
|
|
@@ -53,8 +48,8 @@ func (l *MaterialSaveLogic) MaterialSave(in *pb.MaterialSaveReq) (*pb.MaterialSa
|
|
|
UserIdArr: userIdArr,
|
|
|
}, nil
|
|
|
}
|
|
|
- positionArr := strings.Split(in.ReceiveUserId, ",")
|
|
|
- for k, v := range strings.Split(in.ReceiveUserName, ",") {
|
|
|
+ //positionArr := strings.Split(in.ReceiveUserId, ",")
|
|
|
+ /*for k, v := range strings.Split(in.ReceiveUserName, ",") {
|
|
|
if len(strings.Split(in.FileUrl, ",")) == 0 {
|
|
|
break
|
|
|
}
|
|
@@ -65,6 +60,7 @@ func (l *MaterialSaveLogic) MaterialSave(in *pb.MaterialSaveReq) (*pb.MaterialSa
|
|
|
log.Println("合成图片出错:", err)
|
|
|
return
|
|
|
}
|
|
|
+ log.Println("图片名称", path.Base(fileUrl))
|
|
|
up, err := entity.FileCenterRpc.Upload(l.ctx, &fpb.UploadReq{
|
|
|
File: imgByte,
|
|
|
OssBucketName: entity.OssBucketName,
|
|
@@ -78,10 +74,7 @@ func (l *MaterialSaveLogic) MaterialSave(in *pb.MaterialSaveReq) (*pb.MaterialSa
|
|
|
}
|
|
|
//key := up.Key
|
|
|
//ossAddr = gconv.String(Ret["downUrl"])
|
|
|
- /*log.Println("url", up.Url)
|
|
|
- fileName := filepath.Base(up.Url)
|
|
|
- downUrl := fmt.Sprintf("%s/jyoss/ml/attachment/%s", IC.IC.JyWebDomain, fileName)
|
|
|
- log.Println("downUrl:", downUrl)*/
|
|
|
+
|
|
|
ok := service.PersonImageSave(up.Url, msgId, positionId, mid)
|
|
|
if !ok {
|
|
|
log.Println("合成图片存库失败")
|
|
@@ -89,7 +82,7 @@ func (l *MaterialSaveLogic) MaterialSave(in *pb.MaterialSaveReq) (*pb.MaterialSa
|
|
|
}
|
|
|
}(val, v, gconv.Int64(positionArr[k]))
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
return &pb.MaterialSaveResp{
|
|
|
ErrorCode: 1,
|