test/geekai
1
0
Fork 0
mirror of https://gitee.com/blackfox/geekai.git synced 2024-12-02 04:07:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed conflicts

Browse Source
This commit is contained in:
RockYang 2024-01-19 18:21:49 +08:00
commit 51dcf642b3
20 changed files with 141 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
* 功能优化：恢复关闭注册系统配置项，管理员可以在后台关闭用户注册，只允许内部添加账号
* 功能优化：兼用旧版本微信收款消息解析
* 功能优化：优化订单扫码支付状态轮询功能，当关闭二维码时取消轮询，节约网络资源
* 功能新增：新增图片发布功能，画廊只显示用户已发布的图片
* 功能新增：后台新增配置微信客服二维码，可以上传自己的微信客服二维码
* 功能新增：新增网站公告，可以在管理后台自定义配置
* 功能新增：新增阿里通义千问大模型支持

31
api/handler/mj_handler.go
View File

@ -13,12 +13,13 @@ import (
"chatplus/utils/resp"
"encoding/base64"
"fmt"
"github.com/gin-gonic/gin"
"github.com/gorilla/websocket"
"gorm.io/gorm"
"net/http"
"strings"
"time"
"github.com/gin-gonic/gin"
"github.com/gorilla/websocket"
"gorm.io/gorm"
)
type MidJourneyHandler struct {
@ -294,6 +295,7 @@ func (h *MidJourneyHandler) JobList(c *gin.Context) {
userId := h.GetInt(c, "user_id", 0)
page := h.GetInt(c, "page", 0)
pageSize := h.GetInt(c, "page_size", 0)
publish := h.GetBool(c, "publish")
session := h.db.Session(&gorm.Session{})
if status == 1 {
@ -304,6 +306,9 @@ func (h *MidJourneyHandler) JobList(c *gin.Context) {
if userId > 0 {
session = session.Where("user_id = ?", userId)
}
if publish {
session = session.Where("publish = ?", publish)
}
if page > 0 && pageSize > 0 {
offset := (page - 1) * pageSize
session = session.Offset(offset).Limit(pageSize)
@ -396,3 +401,23 @@ func (h *MidJourneyHandler) Notify(c *gin.Context) {
resp.SUCCESS(c)
}
// Publish 发布图片到画廊显示
func (h *MidJourneyHandler) Publish(c *gin.Context) {
var data struct {
Id uint `json:"id"`
Action bool `json:"action"` // 发布动作，true => 发布，false => 取消分享
}
if err := c.ShouldBindJSON(&data); err != nil {
resp.ERROR(c, types.InvalidArgs)
return
}
res := h.db.Model(&model.MidJourneyJob{Id: data.Id}).UpdateColumn("publish", data.Action)
if res.Error != nil {
resp.ERROR(c, "更新数据库失败")
return
}
resp.SUCCESS(c)
}

24
api/handler/sd_handler.go
View File

@ -145,6 +145,7 @@ func (h *SdJobHandler) JobList(c *gin.Context) {
userId := h.GetInt(c, "user_id", 0)
page := h.GetInt(c, "page", 0)
pageSize := h.GetInt(c, "page_size", 0)
publish := h.GetBool(c, "publish")
session := h.db.Session(&gorm.Session{})
if status == 1 {
@ -155,6 +156,9 @@ func (h *SdJobHandler) JobList(c *gin.Context) {
if userId > 0 {
session = session.Where("user_id = ?", userId)
}
if publish {
session = session.Where("publish", publish)
}
if page > 0 && pageSize > 0 {
offset := (page - 1) * pageSize
session = session.Offset(offset).Limit(pageSize)
@ -224,3 +228,23 @@ func (h *SdJobHandler) Remove(c *gin.Context) {
resp.SUCCESS(c)
}
// Publish 发布/取消发布图片到画廊显示
func (h *SdJobHandler) Publish(c *gin.Context) {
var data struct {
Id uint `json:"id"`
Action bool `json:"action"` // 发布动作，true => 发布，false => 取消分享
}
if err := c.ShouldBindJSON(&data); err != nil {
resp.ERROR(c, types.InvalidArgs)
return
}
res := h.db.Model(&model.SdJob{Id: data.Id}).UpdateColumn("publish", true)
if res.Error != nil {
resp.ERROR(c, "更新数据库失败")
return
}
resp.SUCCESS(c)
}

2
api/main.go
View File

@ -240,12 +240,14 @@ func main() {
group.GET("jobs", h.JobList)
group.POST("remove", h.Remove)
group.POST("notify", h.Notify)
group.POST("publish", h.Publish)
}),
fx.Invoke(func(s *core.AppServer, h *handler.SdJobHandler) {
group := s.Engine.Group("/api/sd")
group.POST("image", h.Image)
group.GET("jobs", h.JobList)
group.POST("remove", h.Remove)
group.POST("publish", h.Publish)
}),
// 管理后台控制器

1
api/store/model/mj_job.go
View File

@ -16,6 +16,7 @@ type MidJourneyJob struct {
Progress int
Prompt string
UseProxy bool // 是否使用反代加载图片
Publish bool //是否发布图片到画廊
CreatedAt time.Time
}

1
api/store/model/sd_job.go
View File

@ -11,6 +11,7 @@ type SdJob struct {
Progress int
Prompt string
Params string
Publish bool //是否发布图片到画廊
CreatedAt time.Time
}

1
api/store/vo/mj_job.go
View File

@ -16,5 +16,6 @@ type MidJourneyJob struct {
Progress int `json:"progress"`
Prompt string `json:"prompt"`
UseProxy bool `json:"use_proxy"`
Publish bool `json:"publish"`
CreatedAt time.Time `json:"created_at"`
}

1
api/store/vo/sd_job.go
View File

@ -14,5 +14,6 @@ type SdJob struct {
Params types.SdTaskParams `json:"params"`
Progress int `json:"progress"`
Prompt string `json:"prompt"`
Publish bool `json:"publish"`
CreatedAt time.Time `json:"created_at"`
}

2
database/update-v3.2.6.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE `chatgpt_mj_jobs` ADD `publish` TINYINT(1) NOT NULL COMMENT '是否发布' AFTER `use_proxy`;
ALTER TABLE `chatgpt_sd_jobs` ADD `publish` TINYINT(1) NOT NULL COMMENT '是否发布' AFTER `progress`;

14
web/src/assets/iconfont/iconfont.css
View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 4125778 */
src: url('iconfont.woff2?t=1705313263366') format('woff2'),
url('iconfont.woff?t=1705313263366') format('woff'),
url('iconfont.ttf?t=1705313263366') format('truetype');
src: url('iconfont.woff2?t=1705615887594') format('woff2'),
url('iconfont.woff?t=1705615887594') format('woff'),
url('iconfont.ttf?t=1705615887594') format('truetype');
}
.iconfont {
@ -13,6 +13,14 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-share-bold:before {
content: "\e626";
}
.icon-cancel-share:before {
content: "\e682";
}
.icon-xls:before {
content: "\e678";
}

2
web/src/assets/iconfont/iconfont.js
View File

File diff suppressed because one or more lines are too long

14
web/src/assets/iconfont/iconfont.json
View File

@ -5,6 +5,20 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
{
"icon_id": "1132455",
"name": "share-bold",
"font_class": "share-bold",
"unicode": "e626",
"unicode_decimal": 58918
},
{
"icon_id": "7567359",
"name": "cancel-share",
"font_class": "cancel-share",
"unicode": "e682",
"unicode_decimal": 59010
},
{
"icon_id": "12600976",
"name": "xls",

BIN
web/src/assets/iconfont/iconfont.ttf
View File

Binary file not shown.

BIN
web/src/assets/iconfont/iconfont.woff
View File

Binary file not shown.

BIN
web/src/assets/iconfont/iconfont.woff2
View File

Binary file not shown.

14
web/src/components/FileSelect.vue
View File

@ -1,10 +1,12 @@
<template>
<el-container class="file-list-box">
<el-button class="file-upload-img" @click="fetchFiles">
<el-icon>
<PictureFilled/>
</el-icon>
</el-button>
<el-tooltip class="box-item" effect="dark" content="打开文件管理中心">
<el-button class="file-upload-img" @click="fetchFiles">
<el-icon>
<PictureFilled/>
</el-icon>
</el-button>
</el-tooltip>
<el-dialog
v-model="show"
@ -30,7 +32,7 @@
</el-upload>
</div>
</el-col>
<el-col :span="3" v-for="file in fileList">
<el-col :span="3" v-for="file in fileList" :key="file.url">
<div class="grid-content">
<el-tooltip
class="box-item"

23
web/src/views/ImageMj.vue
View File

@ -424,6 +424,12 @@
<div class="remove">
<el-button type="danger" :icon="Delete" @click="removeImage(scope.item)" circle/>
<el-button type="warning" v-if="scope.item.publish" @click="publishImage(scope.item, false)" circle>
<i class="iconfont icon-cancel-share"></i>
</el-button>
<el-button type="success" v-else @click="publishImage(scope.item, true)" circle>
<i class="iconfont icon-share-bold"></i>
</el-button>
</div>
</div>
</template>
@ -442,7 +448,8 @@
<script setup>
import {onMounted, ref} from "vue"
import {
ChromeFilled, Delete,
ChromeFilled,
Delete,
DeleteFilled,
DocumentCopy,
InfoFilled,
@ -744,6 +751,20 @@ const removeImage = (item) => {
})
}
// 发布图片到作品墙
const publishImage = (item, action) => {
let text = "图片发布"
if (action === false) {
text = "取消发布"
}
httpPost("/api/mj/publish", {id: item.id, action: action}).then(() => {
ElMessage.success(text + "成功")
item.publish = action
}).catch(e => {
ElMessage.error(text + "失败：" + e.message)
})
}
</script>
<style lang="stylus">

22
web/src/views/ImageSd.vue
View File

@ -374,6 +374,13 @@
<div class="remove">
<el-button type="danger" :icon="Delete" @click="removeImage($event,scope.item)" circle/>
<el-button type="warning" v-if="scope.item.publish" @click="publishImage($event,scope.item, false)"
circle>
<i class="iconfont icon-cancel-share"></i>
</el-button>
<el-button type="success" v-else @click="publishImage($event,scope.item, true)" circle>
<i class="iconfont icon-share-bold"></i>
</el-button>
</div>
</div>
</template>
@ -698,6 +705,21 @@ const removeImage = (event, item) => {
})
}
// 发布图片到作品墙
const publishImage = (event, item, action) => {
event.stopPropagation()
let text = "图片发布"
if (action === false) {
text = "取消发布"
}
httpPost("/api/sd/publish", {id: item.id, action: action}).then(() => {
ElMessage.success(text + "成功")
item.publish = action
}).catch(e => {
ElMessage.error(text + "失败：" + e.message)
})
}
</script>
<style lang="stylus">

3
web/src/views/ImagesWall.vue
View File

@ -274,8 +274,7 @@ const getNext = () => {
loading.value = true
page.value = page.value + 1
const url = imgType.value === "mj" ? "/api/mj/jobs" : "/api/sd/jobs"
// 获取运行中的任务
httpGet(`${url}?status=1&page=${page.value}&page_size=${pageSize.value}`).then(res => {
httpGet(`${url}?status=1&page=${page.value}&page_size=${pageSize.value}&publish=true`).then(res => {
loading.value = false
if (res.data.length === 0) {
isOver.value = true

2
web/src/views/Member.vue
View File

@ -60,7 +60,7 @@
<div class="info-line">
<span class="label">有效期：</span>
<span class="expire" v-if="scope.item.days > 0">{{ scope.item.days }}天</span>
<span class="expire" v-else>当月有效</span>
<span class="expire" v-else>长期有效</span>
</div>
<div class="pay-way">