Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth
This commit is contained in:
6
server/render/Dockerfile
Executable file
6
server/render/Dockerfile
Executable file
@@ -0,0 +1,6 @@
|
||||
FROM alpine
|
||||
|
||||
WORKDIR /www/fusenapi/
|
||||
COPY ./bin/api-render-srv /www/fusenapi/
|
||||
COPY ./etc /www/fusenapi/etc
|
||||
CMD ["/www/fusenapi/api-render-srv"]
|
||||
238
server/render/consumer/assemble_render_data.go
Normal file
238
server/render/consumer/assemble_render_data.go
Normal file
@@ -0,0 +1,238 @@
|
||||
package consumer
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"fusenapi/model/gmodel"
|
||||
"fusenapi/utils/websocket_data"
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
"gorm.io/gorm"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"time"
|
||||
)
|
||||
|
||||
// 这里请求的py接口返回数据
|
||||
type pythonApiRsp struct {
|
||||
Code int `json:"code"`
|
||||
Msg string `json:"msg"`
|
||||
Data []struct {
|
||||
Tid int64 `json:"tid"`
|
||||
Imgurl string `json:"imgurl"`
|
||||
Costtime int64 `json:"costtime"`
|
||||
} `json:"data"`
|
||||
}
|
||||
|
||||
// 消费渲染需要组装的数据
|
||||
type MqConsumerRenderAssemble struct {
|
||||
}
|
||||
|
||||
func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error {
|
||||
logx.Info("收到需要组装的消息:", string(data))
|
||||
var parseInfo websocket_data.AssembleRenderData
|
||||
if err := json.Unmarshal(data, &parseInfo); err != nil {
|
||||
logx.Error("MqConsumerRenderAssemble数据格式错误:", err)
|
||||
return nil //不返回错误就删除消息
|
||||
}
|
||||
val := ctx.Value("allmodels")
|
||||
if val == nil {
|
||||
return errors.New("allmodels is nil")
|
||||
}
|
||||
allmodels, ok := val.(*gmodel.AllModelsGen)
|
||||
if !ok {
|
||||
return errors.New("allmodels is nil!!")
|
||||
}
|
||||
timeSearchBegin := time.Now().UnixMilli()
|
||||
//获取模板
|
||||
templateInfo, err := allmodels.FsProductTemplateV2.FindOneByProductIdTagIdWithSizeTable(ctx, parseInfo.RenderData.ProductId, fmt.Sprintf("%d", parseInfo.RenderData.TemplateTagId))
|
||||
if err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
logx.Error("template info is not found")
|
||||
return nil
|
||||
}
|
||||
logx.Error("failed to get template info:", err)
|
||||
return err
|
||||
}
|
||||
renderLogTime := time.Now().UnixMilli() - timeSearchBegin
|
||||
now := time.Now().Unix()
|
||||
title := "1-组装模板数据"
|
||||
//云渲染日志
|
||||
err = allmodels.FsCloudRenderLog.Create(ctx, &gmodel.FsCloudRenderLog{
|
||||
UserId: &parseInfo.RenderData.UserId,
|
||||
Title: &title,
|
||||
Time: &renderLogTime,
|
||||
Tag: &parseInfo.RenderId,
|
||||
Ctime: &now,
|
||||
})
|
||||
if err != nil {
|
||||
logx.Error(err)
|
||||
}
|
||||
pyapiBeginTime := time.Now().UnixMilli()
|
||||
//这里curl post请求数据。获取处理好的贴图数据,用于贴model的贴图
|
||||
pythonPostData := map[string]interface{}{
|
||||
"tids": templateInfo.Id,
|
||||
"data": parseInfo.RenderData.Data,
|
||||
}
|
||||
pyPostBytes, _ := json.Marshal(pythonPostData)
|
||||
url := "http://110.41.19.98:8867/imgRender"
|
||||
pyRsp, err := http.Post(url, "application/json;charset=UTF-8", bytes.NewReader(pyPostBytes))
|
||||
if err != nil {
|
||||
logx.Error("request python render api err:", err)
|
||||
return err
|
||||
}
|
||||
defer pyRsp.Body.Close()
|
||||
pyRspBytes, err := ioutil.ReadAll(pyRsp.Body)
|
||||
if err != nil {
|
||||
logx.Error("failed to read python api rsp body,err=", err)
|
||||
return err
|
||||
}
|
||||
var rspInfo pythonApiRsp
|
||||
if err = json.Unmarshal(pyRspBytes, &rspInfo); err != nil {
|
||||
logx.Error("failed to unmarshal python api rsp:", err)
|
||||
return err
|
||||
}
|
||||
if rspInfo.Code != 200 {
|
||||
logx.Error("python api 接口请求错误:", rspInfo.Msg)
|
||||
return err
|
||||
}
|
||||
if len(rspInfo.Data) == 0 {
|
||||
logx.Error("python api 接口没有数据:")
|
||||
return err
|
||||
}
|
||||
//云渲染日志
|
||||
title = "2-请求->接收python合成刀版图接口"
|
||||
now = time.Now().Unix()
|
||||
pyRequestTime := time.Now().UnixMilli() - pyapiBeginTime
|
||||
err = allmodels.FsCloudRenderLog.Create(ctx, &gmodel.FsCloudRenderLog{
|
||||
UserId: &parseInfo.RenderData.UserId,
|
||||
Title: &title,
|
||||
Time: &pyRequestTime,
|
||||
Tag: &parseInfo.RenderId,
|
||||
Ctime: &now,
|
||||
})
|
||||
if err != nil {
|
||||
logx.Error(err)
|
||||
}
|
||||
incTime := int64(0)
|
||||
mapCurlData := make(map[int64]int)
|
||||
for k, v := range rspInfo.Data {
|
||||
mapCurlData[v.Tid] = k
|
||||
incTime += v.Costtime
|
||||
}
|
||||
//云渲染日志
|
||||
title = "3-python合成刀版图"
|
||||
now = time.Now().Unix()
|
||||
postData := string(pyPostBytes)
|
||||
pyRspStr := string(pyRspBytes)
|
||||
err = allmodels.FsCloudRenderLog.Create(ctx, &gmodel.FsCloudRenderLog{
|
||||
UserId: &parseInfo.RenderData.UserId,
|
||||
PostUrl: &url,
|
||||
PostData: &postData,
|
||||
Result: &pyRspStr,
|
||||
Title: &title,
|
||||
Time: &incTime,
|
||||
Tag: &parseInfo.RenderId,
|
||||
Ctime: &now,
|
||||
})
|
||||
if err != nil {
|
||||
logx.Error(err)
|
||||
}
|
||||
//获取渲染设置信息
|
||||
//element, err := allmodels.FsProductTemplateElement
|
||||
/*
|
||||
|
||||
$element = ProductTemplateElement::find()
|
||||
->andFilterWhere(['in', 'product_template_id', $mids])
|
||||
->asArray()
|
||||
->all();
|
||||
|
||||
$element = array_column($element, null, 'product_template_id');
|
||||
$elementTitles = array_column($element, 'title');
|
||||
|
||||
$result = [];
|
||||
|
||||
$time_pinjie_begin = $render->getMillisecond();
|
||||
foreach ($templates as $key => $val) {
|
||||
if(!isset($element[$val['model_id']]) || !isset($imageData[$val['id']])){
|
||||
continue;
|
||||
}
|
||||
//数据拼装
|
||||
$item = [];
|
||||
|
||||
$item['light'] = $element[$val['model_id']]['light'];
|
||||
$item['refletion'] = $element[$val['model_id']]['refletion'] == '' ? -1 : (int)$element[$val['model_id']]['refletion'];
|
||||
$item['scale'] = $element[$val['model_id']]['scale'];
|
||||
$item['sku_id'] = $val['product_id'];
|
||||
$item['tid'] = $element[$val['model_id']]['title'];
|
||||
$item['rotation'] = $element[$val['model_id']]['rotation'];
|
||||
$item['filePath'] = '';//todo 文件路径,针对千人千面
|
||||
|
||||
//组装data数据
|
||||
$tempData = [];
|
||||
//获取材质模式对应关系
|
||||
$mode = $element[$val['model_id']]['mode'] ? json_decode($element[$val['model_id']]['mode'], true) : [];
|
||||
// $base_img = (new ImageService())->base64EncodeImageNoHeader(\Yii::$app->params['baseurl'].$imageData[$val['id']]['imgurl']);
|
||||
$base_img = \Yii::$app->params['h5Url'].'/storage'.$imageData[$val['id']]['imgurl'];
|
||||
//判断是否包含base数据 即对应建模那边的model
|
||||
if($element[$val['model_id']]['base']){
|
||||
$tempData[] = [
|
||||
'name' => 'model',
|
||||
'data' => '0,'.$base_img.','.$element[$val['model_id']]['base'],
|
||||
'type' => 'other',
|
||||
'layer' => '0',
|
||||
'is_update' => 1,
|
||||
'mode' => $mode['model'],
|
||||
];
|
||||
}
|
||||
if($element[$val['model_id']]['shadow']){
|
||||
$tempData[] = [
|
||||
'name' => 'shadow',
|
||||
'data' => $element[$val['model_id']]['shadow'],
|
||||
'type' => 'other',
|
||||
'layer' => '0',
|
||||
'is_update' => 0,
|
||||
'mode' => $mode['shadow'],
|
||||
];
|
||||
}
|
||||
if($element[$val['model_id']]['model_p']){
|
||||
$tempData[] = [
|
||||
'name' => 'model_P',
|
||||
'data' => '0,'.$element[$val['model_id']]['model_p'],
|
||||
'type' => 'other',
|
||||
'layer' => '0',
|
||||
'is_update' => 0,
|
||||
'mode' => $mode['model_P'],
|
||||
];
|
||||
}
|
||||
$item['data'] = $tempData;
|
||||
$result[] = $item;
|
||||
|
||||
}
|
||||
$log = new CloudRenderLog();
|
||||
$log->title = '接收到python刀版图 -> 3-组装MQ渲染任务队列';
|
||||
$log->time = $render->getMillisecond() - $time_pinjie_begin;
|
||||
$log->user_id = $user_id;
|
||||
$log->post_data = '';
|
||||
$log->post_url = '';
|
||||
$log->result = $res;
|
||||
$log->tag = $inputData['id'];
|
||||
$log->ctime = time();
|
||||
$log->save(false);
|
||||
}
|
||||
|
||||
$sendData = [
|
||||
'id' => $inputData['id'],
|
||||
'order_id' => 0,
|
||||
'user_id' => \Yii::$app->user->id,
|
||||
'sku_ids' => $inputData['sku_ids'],
|
||||
'tids' => $elementTitles,
|
||||
'data' => $result,
|
||||
'is_thousand_face' => 0,
|
||||
'folder' => '',//todo 千人千面需要使用
|
||||
];
|
||||
return $sendData;*/
|
||||
return nil
|
||||
}
|
||||
@@ -1,9 +1,9 @@
|
||||
Name: render
|
||||
Host: localhost
|
||||
Port: 8888
|
||||
ReplicaId: 55
|
||||
Host: 0.0.0.0
|
||||
Port: 9919
|
||||
SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest
|
||||
Auth:
|
||||
AccessSecret: fusen2023
|
||||
AccessExpire: 2592000
|
||||
RefreshAfter: 1592000
|
||||
RefreshAfter: 1592000
|
||||
SourceRabbitMq: amqp://rabbit001:rabbit001129@110.41.19.98:5672
|
||||
@@ -8,7 +8,8 @@ import (
|
||||
|
||||
type Config struct {
|
||||
rest.RestConf
|
||||
SourceMysql string
|
||||
Auth types.Auth
|
||||
ReplicaId uint64
|
||||
SourceMysql string
|
||||
Auth types.Auth
|
||||
ReplicaId uint64
|
||||
SourceRabbitMq string
|
||||
}
|
||||
|
||||
@@ -11,22 +11,22 @@ import (
|
||||
"fusenapi/server/render/internal/types"
|
||||
)
|
||||
|
||||
func ToUnityHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
func GetFaceSliceHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
var req types.RequestToUnity
|
||||
var req types.Request
|
||||
userinfo, err := basic.RequestParse(w, r, svcCtx.SharedState, &req)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
// 创建一个业务逻辑层实例
|
||||
l := logic.NewToUnityLogic(r.Context(), svcCtx)
|
||||
l := logic.NewGetFaceSliceLogic(r.Context(), svcCtx)
|
||||
|
||||
rl := reflect.ValueOf(l)
|
||||
basic.BeforeLogic(w, r, rl)
|
||||
|
||||
resp := l.ToUnity(&req, userinfo)
|
||||
resp := l.GetFaceSlice(&req, userinfo)
|
||||
|
||||
if !basic.AfterLogic(w, r, rl, resp) {
|
||||
basic.NormalAfterLogic(w, r, resp)
|
||||
@@ -11,22 +11,22 @@ import (
|
||||
"fusenapi/server/render/internal/types"
|
||||
)
|
||||
|
||||
func ReadImagesHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
func RenderNotifyHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
var req types.RequestReadImages
|
||||
var req types.RenderNotifyReq
|
||||
userinfo, err := basic.RequestParse(w, r, svcCtx.SharedState, &req)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
// 创建一个业务逻辑层实例
|
||||
l := logic.NewReadImagesLogic(r.Context(), svcCtx)
|
||||
l := logic.NewRenderNotifyLogic(r.Context(), svcCtx)
|
||||
|
||||
rl := reflect.ValueOf(l)
|
||||
basic.BeforeLogic(w, r, rl)
|
||||
|
||||
resp := l.ReadImages(&req, userinfo)
|
||||
resp := l.RenderNotify(&req, userinfo)
|
||||
|
||||
if !basic.AfterLogic(w, r, rl, resp) {
|
||||
basic.NormalAfterLogic(w, r, resp)
|
||||
@@ -13,14 +13,14 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
|
||||
server.AddRoutes(
|
||||
[]rest.Route{
|
||||
{
|
||||
Method: http.MethodGet,
|
||||
Path: "/api/render/to-unity",
|
||||
Handler: ToUnityHandler(serverCtx),
|
||||
Method: http.MethodPost,
|
||||
Path: "/api/render/render_notify",
|
||||
Handler: RenderNotifyHandler(serverCtx),
|
||||
},
|
||||
{
|
||||
Method: http.MethodGet,
|
||||
Path: "/api/render/read-images",
|
||||
Handler: ReadImagesHandler(serverCtx),
|
||||
Method: http.MethodPost,
|
||||
Path: "/api/render/get_face_slice",
|
||||
Handler: GetFaceSliceHandler(serverCtx),
|
||||
},
|
||||
},
|
||||
)
|
||||
|
||||
69
server/render/internal/logic/getfaceslicelogic.go
Normal file
69
server/render/internal/logic/getfaceslicelogic.go
Normal file
@@ -0,0 +1,69 @@
|
||||
package logic
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fusenapi/constants"
|
||||
"fusenapi/utils/auth"
|
||||
"fusenapi/utils/basic"
|
||||
"gorm.io/gorm"
|
||||
"strings"
|
||||
|
||||
"context"
|
||||
|
||||
"fusenapi/server/render/internal/svc"
|
||||
"fusenapi/server/render/internal/types"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
type GetFaceSliceLogic struct {
|
||||
logx.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewGetFaceSliceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetFaceSliceLogic {
|
||||
return &GetFaceSliceLogic{
|
||||
Logger: logx.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
// 处理进入前逻辑w,r
|
||||
// func (l *GetFaceSliceLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) {
|
||||
// }
|
||||
|
||||
// 处理逻辑后 w,r 如:重定向, resp 必须重新处理
|
||||
// func (l *GetFaceSliceLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
|
||||
// // httpx.OkJsonCtx(r.Context(), w, resp)
|
||||
// }
|
||||
|
||||
func (l *GetFaceSliceLogic) GetFaceSlice(req *types.Request, userinfo *auth.UserInfo) (resp *basic.Response) {
|
||||
if !userinfo.IsUser() && !userinfo.IsGuest() {
|
||||
return resp.SetStatusWithMessage(basic.CodeUnAuth, "please login or access cookie")
|
||||
}
|
||||
//获取用户素材信息
|
||||
materialInfo, err := l.svcCtx.AllModels.FsUserMaterial.FindLatestOne(l.ctx, userinfo.UserId, userinfo.GuestId)
|
||||
if err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "user material info is not exists")
|
||||
}
|
||||
return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get user material info")
|
||||
}
|
||||
if materialInfo.Metadata == nil || *materialInfo.Metadata == "" {
|
||||
return resp.SetStatusWithMessage(basic.CodeServiceErr, "user material info`Metadata is empty")
|
||||
}
|
||||
var info map[string]interface{}
|
||||
if err = json.Unmarshal([]byte(*materialInfo.Metadata), &info); err != nil {
|
||||
logx.Error(err)
|
||||
return resp.SetStatusWithMessage(basic.CodeJsonErr, "invalid json format of metadata")
|
||||
}
|
||||
str := strings.ReplaceAll(constants.RENDER_FACE_SLICE_TEMPLATE_JSON, "{{MainColorFill}}", info["main_color_fill"].(string))
|
||||
str = strings.ReplaceAll(str, "{{SecondaryColorFill}}", info["secondary_color_fill"].(string))
|
||||
str = strings.ReplaceAll(str, "{{LogoMaterial}}", info["logo_material"].(string))
|
||||
var rspInfo interface{}
|
||||
_ = json.Unmarshal([]byte(str), &rspInfo)
|
||||
return resp.SetStatusWithMessage(basic.CodeOK, "success", rspInfo)
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
package logic
|
||||
|
||||
import (
|
||||
"fusenapi/utils/auth"
|
||||
"fusenapi/utils/basic"
|
||||
|
||||
"context"
|
||||
|
||||
"fusenapi/server/render/internal/svc"
|
||||
"fusenapi/server/render/internal/types"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
type ReadImagesLogic struct {
|
||||
logx.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewReadImagesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ReadImagesLogic {
|
||||
return &ReadImagesLogic{
|
||||
Logger: logx.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
// 处理进入前逻辑w,r
|
||||
// func (l *ReadImagesLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) {
|
||||
// }
|
||||
|
||||
// 处理逻辑后 w,r 如:重定向
|
||||
// func (l *ReadImagesLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
|
||||
// }
|
||||
|
||||
func (l *ReadImagesLogic) ReadImages(req *types.RequestReadImages, userinfo *auth.UserInfo) (resp *basic.Response) {
|
||||
// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
|
||||
// userinfo 传入值时, 一定不为null
|
||||
|
||||
return resp.SetStatus(basic.CodeOK)
|
||||
}
|
||||
72
server/render/internal/logic/rendernotifylogic.go
Normal file
72
server/render/internal/logic/rendernotifylogic.go
Normal file
@@ -0,0 +1,72 @@
|
||||
package logic
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fusenapi/constants"
|
||||
"fusenapi/utils/auth"
|
||||
"fusenapi/utils/basic"
|
||||
"fusenapi/utils/websocket_data"
|
||||
|
||||
"fusenapi/server/render/internal/svc"
|
||||
"fusenapi/server/render/internal/types"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
type RenderNotifyLogic struct {
|
||||
logx.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewRenderNotifyLogic(ctx context.Context, svcCtx *svc.ServiceContext) *RenderNotifyLogic {
|
||||
return &RenderNotifyLogic{
|
||||
Logger: logx.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
// 处理进入前逻辑w,r
|
||||
// func (l *RenderNotifyLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) {
|
||||
// }
|
||||
|
||||
// 处理逻辑后 w,r 如:重定向, resp 必须重新处理
|
||||
// func (l *RenderNotifyLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
|
||||
// // httpx.OkJsonCtx(r.Context(), w, resp)
|
||||
// }
|
||||
|
||||
func (l *RenderNotifyLogic) RenderNotify(req *types.RenderNotifyReq, userinfo *auth.UserInfo) (resp *basic.Response) {
|
||||
/*if time.Now().Unix()-120 > req.Time || req.Time > time.Now().Unix() {
|
||||
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "invalid param time")
|
||||
}*/
|
||||
if req.Info.TaskId == "" {
|
||||
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "invalid param task_id")
|
||||
}
|
||||
if req.Info.Image == "" {
|
||||
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "invalid param image")
|
||||
}
|
||||
/* if req.Sign == "" {
|
||||
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "invalid param sign")
|
||||
}*/
|
||||
//验证签名 sha256
|
||||
/*notifyByte, _ := json.Marshal(req.Info)
|
||||
h := sha256.New()
|
||||
h.Write([]byte(fmt.Sprintf(constants.RENDER_NOTIFY_SIGN_KEY, string(notifyByte), req.Time)))
|
||||
signHex := h.Sum(nil)
|
||||
sign := hex.EncodeToString(signHex)
|
||||
if req.Sign != sign {
|
||||
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "invalid sign")
|
||||
}*/
|
||||
data := websocket_data.RenderImageNotify{
|
||||
TaskId: req.Info.TaskId,
|
||||
Image: req.Info.Image,
|
||||
}
|
||||
d, _ := json.Marshal(data)
|
||||
if err := l.svcCtx.RabbitMq.SendMsg(constants.RABBIT_MQ_RENDER_RESULT_DATA, d); err != nil {
|
||||
logx.Error(err)
|
||||
return resp.SetStatus(basic.CodeServiceErr, "failed to send data")
|
||||
}
|
||||
return resp.SetStatus(basic.CodeOK)
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
package logic
|
||||
|
||||
import (
|
||||
"fusenapi/utils/auth"
|
||||
"fusenapi/utils/basic"
|
||||
|
||||
"context"
|
||||
|
||||
"fusenapi/server/render/internal/svc"
|
||||
"fusenapi/server/render/internal/types"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
type ToUnityLogic struct {
|
||||
logx.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewToUnityLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ToUnityLogic {
|
||||
return &ToUnityLogic{
|
||||
Logger: logx.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
// 处理进入前逻辑w,r
|
||||
// func (l *ToUnityLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) {
|
||||
// }
|
||||
|
||||
// 处理逻辑后 w,r 如:重定向
|
||||
// func (l *ToUnityLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
|
||||
// }
|
||||
|
||||
func (l *ToUnityLogic) ToUnity(req *types.RequestToUnity, userinfo *auth.UserInfo) (resp *basic.Response) {
|
||||
// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
|
||||
// userinfo 传入值时, 一定不为null
|
||||
|
||||
return resp.SetStatus(basic.CodeOK)
|
||||
}
|
||||
@@ -21,6 +21,7 @@ type ServiceContext struct {
|
||||
|
||||
MysqlConn *gorm.DB
|
||||
AllModels *gmodel.AllModelsGen
|
||||
RabbitMq *initalize.RabbitMqHandle
|
||||
}
|
||||
|
||||
func NewServiceContext(c config.Config) *ServiceContext {
|
||||
@@ -32,6 +33,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
|
||||
MysqlConn: conn,
|
||||
SharedState: StateServer,
|
||||
AllModels: gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)),
|
||||
RabbitMq: initalize.InitRabbitMq(c.SourceRabbitMq, nil),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,17 @@ type RequestToUnity struct {
|
||||
type RequestReadImages struct {
|
||||
}
|
||||
|
||||
type RenderNotifyReq struct {
|
||||
Sign string `json:"sign"`
|
||||
Time int64 `json:"time"`
|
||||
Info NotifyInfo `json:"info"`
|
||||
}
|
||||
|
||||
type NotifyInfo struct {
|
||||
TaskId string `json:"task_id"` //任务id
|
||||
Image string `json:"image"`
|
||||
}
|
||||
|
||||
type Request struct {
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"fusenapi/constants"
|
||||
"fusenapi/server/render/consumer"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
@@ -29,8 +32,13 @@ func main() {
|
||||
defer server.Stop()
|
||||
|
||||
ctx := svc.NewServiceContext(c)
|
||||
//消费渲染前组装数据队列
|
||||
ctx1 := context.Background()
|
||||
ctx2, cancel := context.WithCancel(ctx1)
|
||||
ctx2 = context.WithValue(ctx2, "allmodels", ctx.AllModels)
|
||||
defer cancel()
|
||||
go ctx.RabbitMq.Consume(ctx2, constants.RABBIT_MQ_ASSEMBLE_RENDER_DATA, &consumer.MqConsumerRenderAssemble{})
|
||||
handler.RegisterHandlers(server, ctx)
|
||||
|
||||
fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port)
|
||||
server.Start()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user