xinyin025/geekai
1
0
Fork 0
mirror of https://github.com/yangjian102621/geekai.git synced 2025-09-21 18:56:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed conflicts

Browse Source
This commit is contained in:
RockYang 2024-03-20 20:40:22 +08:00
parent 9e42a334fa
commit 0cbc284e42
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/service/mj/plus/client.go
View File

@ -7,9 +7,8 @@ import (
"encoding/base64" "encoding/base64"
"errors" "errors"
"fmt" "fmt"
"io"
"github.com/imroc/req/v3" "github.com/imroc/req/v3"
"io"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
@ -91,10 +90,8 @@ func (c *Client) Imagine(task types.MjTask) (ImageRes, error) {
SetErrorResult(&errRes). SetErrorResult(&errRes).
Post(apiURL) Post(apiURL)
if err != nil { if err != nil {
if r.Body != nil {
errStr, _ := io.ReadAll(r.Body) errStr, _ := io.ReadAll(r.Body)
logger.Errorf("API 返回：%s, API URL: %s", string(errStr), apiURL) logger.Errorf("API 返回：%s, API URL: %s", string(errStr), apiURL)
}
return ImageRes{}, fmt.Errorf("请求 API 出错：%v", err) return ImageRes{}, fmt.Errorf("请求 API 出错：%v", err)
} }
@ -126,10 +123,6 @@ func (c *Client) Blend(task types.MjTask) (ImageRes, error) {
} }
} }
} }
if len(body.Base64Array) < 2 {
return ImageRes{}, errors.New("blend must use more than 2 images")
}
var res ImageRes var res ImageRes
var errRes ErrRes var errRes ErrRes
r, err := req.C().R(). r, err := req.C().R().
@ -155,19 +148,19 @@ func (c *Client) SwapFace(task types.MjTask) (ImageRes, error) {
apiURL := fmt.Sprintf("%s/mj-%s/mj/insight-face/swap", c.apiURL, c.Config.Mode) apiURL := fmt.Sprintf("%s/mj-%s/mj/insight-face/swap", c.apiURL, c.Config.Mode)
// 生成图片 Base64 编码 // 生成图片 Base64 编码
if len(task.ImgArr) != 2 { if len(task.ImgArr) != 2 {
return ImageRes{}, errors.New("invalid params, swap face must pass 2 images") return ImageRes{}, errors.New("参数错误，必须上传2张图片")
} }
var sourceBase64 string var sourceBase64 string
var targetBase64 string var targetBase64 string
imageData, err := utils.DownloadImage(task.ImgArr[0], "") imageData, err := utils.DownloadImage(task.ImgArr[0], "")
if err != nil { if err != nil {
return ImageRes{}, fmt.Errorf("error with download source image: %v", err) logger.Error("error with download image: ", err)
} else { } else {
sourceBase64 = "data:image/png;base64," + base64.StdEncoding.EncodeToString(imageData) sourceBase64 = "data:image/png;base64," + base64.StdEncoding.EncodeToString(imageData)
} }
imageData, err = utils.DownloadImage(task.ImgArr[1], "") imageData, err = utils.DownloadImage(task.ImgArr[1], "")
if err != nil { if err != nil {
return ImageRes{}, fmt.Errorf("error with download target image: %v", err) logger.Error("error with download image: ", err)
} else { } else {
targetBase64 = "data:image/png;base64," + base64.StdEncoding.EncodeToString(imageData) targetBase64 = "data:image/png;base64," + base64.StdEncoding.EncodeToString(imageData)
} }

4
web/src/views/admin/ChatList.vue
View File

@ -7,8 +7,6 @@
@keyup="searchChat($event)"></el-input> @keyup="searchChat($event)"></el-input>
<el-input v-model="data.chat.query.title" placeholder="对话标题" class="handle-input mr10" <el-input v-model="data.chat.query.title" placeholder="对话标题" class="handle-input mr10"
@keyup="searchChat($event)"></el-input> @keyup="searchChat($event)"></el-input>
<el-input v-model="data.chat.query.model" placeholder="模型" class="handle-input mr10"
@keyup="searchChat($event)"></el-input>
<el-date-picker <el-date-picker
v-model="data.chat.query.created_at" v-model="data.chat.query.created_at"
type="daterange" type="daterange"
@ -109,7 +107,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="token" label="消耗算力"/> <el-table-column prop="token" label="算力"/>
<el-table-column label="创建时间"> <el-table-column label="创建时间">
<template #default="scope"> <template #default="scope">