refactor: refactor chat model, replace mode value with mode id. refactored system config module, add seperate configration for every chat model

This commit is contained in:
RockYang 2023-09-04 16:32:20 +08:00
parent 0cc9cf8b45
commit 7ecd7eeba1
28 changed files with 714 additions and 276 deletions

View File

@ -8,8 +8,6 @@ import (
"chatplus/store/vo"
"chatplus/utils"
"chatplus/utils/resp"
"time"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
)
@ -27,21 +25,21 @@ func NewApiKeyHandler(app *core.AppServer, db *gorm.DB) *ApiKeyHandler {
func (h *ApiKeyHandler) Save(c *gin.Context) {
var data struct {
Id uint `json:"id"`
Value string `json:"value"`
LastUsedAt string `json:"last_used_at"`
CreatedAt int64 `json:"created_at"`
Id uint `json:"id"`
Platform string `json:"platform"`
Value string `json:"value"`
}
if err := c.ShouldBindJSON(&data); err != nil {
resp.ERROR(c, types.InvalidArgs)
return
}
apiKey := model.ApiKey{Value: data.Value, LastUsedAt: utils.Str2stamp(data.LastUsedAt)}
apiKey.Id = data.Id
if apiKey.Id > 0 {
apiKey.CreatedAt = time.Unix(data.CreatedAt, 0)
apiKey := model.ApiKey{}
if data.Id > 0 {
h.db.Find(&apiKey)
}
apiKey.Platform = data.Platform
apiKey.Value = data.Value
res := h.db.Save(&apiKey)
if res.Error != nil {
resp.ERROR(c, "更新数据库失败!")
@ -60,14 +58,9 @@ func (h *ApiKeyHandler) Save(c *gin.Context) {
}
func (h *ApiKeyHandler) List(c *gin.Context) {
userId := h.GetInt(c, "user_id", -1)
query := h.db.Session(&gorm.Session{})
if userId >= 0 {
query = query.Where("user_id", userId)
}
var items []model.ApiKey
var keys = make([]vo.ApiKey, 0)
res := query.Find(&items)
res := h.db.Find(&items)
if res.Error == nil {
for _, item := range items {
var key vo.ApiKey

View File

@ -0,0 +1,143 @@
package admin
import (
"chatplus/core"
"chatplus/core/types"
"chatplus/handler"
"chatplus/store/model"
"chatplus/store/vo"
"chatplus/utils"
"chatplus/utils/resp"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
"time"
)
type ChatModelHandler struct {
handler.BaseHandler
db *gorm.DB
}
func NewChatModelHandler(app *core.AppServer, db *gorm.DB) *ChatModelHandler {
h := ChatModelHandler{db: db}
h.App = app
return &h
}
func (h *ChatModelHandler) Save(c *gin.Context) {
var data struct {
Id uint `json:"id"`
Name string `json:"name"`
Value string `json:"value"`
Enabled bool `json:"enabled"`
SortNum int `json:"sort_num"`
Platform string `json:"platform"`
CreatedAt int64 `json:"created_at"`
}
if err := c.ShouldBindJSON(&data); err != nil {
resp.ERROR(c, types.InvalidArgs)
return
}
item := model.ChatModel{Platform: data.Platform, Name: data.Name, Value: data.Value, Enabled: data.Enabled}
item.Id = data.Id
if item.Id > 0 {
item.CreatedAt = time.Unix(data.CreatedAt, 0)
}
res := h.db.Save(&item)
if res.Error != nil {
resp.ERROR(c, "更新数据库失败!")
return
}
var itemVo vo.ChatModel
err := utils.CopyObject(item, &itemVo)
if err != nil {
resp.ERROR(c, "数据拷贝失败!")
return
}
itemVo.Id = item.Id
itemVo.CreatedAt = item.CreatedAt.Unix()
resp.SUCCESS(c, itemVo)
}
// List 模型列表
func (h *ChatModelHandler) List(c *gin.Context) {
session := h.db.Session(&gorm.Session{})
enable := h.GetBool(c, "enable")
if enable {
session = session.Where("enabled", enable)
}
var items []model.ChatModel
var cms = make([]vo.ChatModel, 0)
res := session.Order("sort_num ASC").Find(&items)
if res.Error == nil {
for _, item := range items {
var cm vo.ChatModel
err := utils.CopyObject(item, &cm)
if err == nil {
cm.Id = item.Id
cm.CreatedAt = item.CreatedAt.Unix()
cm.UpdatedAt = item.UpdatedAt.Unix()
cms = append(cms, cm)
} else {
logger.Error(err)
}
}
}
resp.SUCCESS(c, cms)
}
func (h *ChatModelHandler) Enable(c *gin.Context) {
var data struct {
Id uint `json:"id"`
Enabled bool `json:"enabled"`
}
if err := c.ShouldBindJSON(&data); err != nil {
resp.ERROR(c, types.InvalidArgs)
return
}
res := h.db.Model(&model.ChatModel{}).Where("id = ?", data.Id).Update("enabled", data.Enabled)
if res.Error != nil {
resp.ERROR(c, "更新数据库失败!")
return
}
resp.SUCCESS(c)
}
func (h *ChatModelHandler) Sort(c *gin.Context) {
var data struct {
Ids []uint `json:"ids"`
Sorts []int `json:"sorts"`
}
if err := c.ShouldBindJSON(&data); err != nil {
resp.ERROR(c, types.InvalidArgs)
return
}
for index, id := range data.Ids {
res := h.db.Model(&model.ChatModel{}).Where("id = ?", id).Update("sort_num", data.Sorts[index])
if res.Error != nil {
resp.ERROR(c, "更新数据库失败!")
return
}
}
resp.SUCCESS(c)
}
func (h *ChatModelHandler) Remove(c *gin.Context) {
id := h.GetInt(c, "id", 0)
if id > 0 {
res := h.db.Where("id = ?", id).Delete(&model.ChatModel{})
if res.Error != nil {
resp.ERROR(c, "更新数据库失败!")
return
}
}
resp.SUCCESS(c)
}

View File

@ -55,7 +55,7 @@ func (h *ChatRoleHandler) Save(c *gin.Context) {
func (h *ChatRoleHandler) List(c *gin.Context) {
var items []model.ChatRole
var roles = make([]vo.ChatRole, 0)
res := h.db.Order("sort ASC").Find(&items)
res := h.db.Order("sort_num ASC").Find(&items)
if res.Error != nil {
resp.ERROR(c, "No data found")
return
@ -75,24 +75,24 @@ func (h *ChatRoleHandler) List(c *gin.Context) {
resp.SUCCESS(c, roles)
}
// SetSort 更新角色排序
func (h *ChatRoleHandler) SetSort(c *gin.Context) {
// Sort 更新角色排序
func (h *ChatRoleHandler) Sort(c *gin.Context) {
var data struct {
Id uint `json:"id"`
Sort int `json:"sort"`
Ids []uint `json:"ids"`
Sorts []int `json:"sorts"`
}
if err := c.ShouldBindJSON(&data); err != nil {
resp.ERROR(c, types.InvalidArgs)
return
}
if data.Id <= 0 {
resp.HACKER(c)
return
}
res := h.db.Model(&model.ChatRole{}).Where("id = ?", data.Id).Update("sort", data.Sort)
if res.Error != nil {
resp.ERROR(c, "更新数据库失败!")
return
for index, id := range data.Ids {
res := h.db.Model(&model.ChatRole{}).Where("id = ?", id).Update("sort_num", data.Sorts[index])
if res.Error != nil {
resp.ERROR(c, "更新数据库失败!")
return
}
}
resp.SUCCESS(c)

View File

@ -0,0 +1,44 @@
package handler
import (
"chatplus/core"
"chatplus/store/model"
"chatplus/store/vo"
"chatplus/utils"
"chatplus/utils/resp"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
)
type ChatModelHandler struct {
BaseHandler
db *gorm.DB
}
func NewChatModelHandler(app *core.AppServer, db *gorm.DB) *ChatModelHandler {
h := ChatModelHandler{db: db}
h.App = app
return &h
}
// List 模型列表
func (h *ChatModelHandler) List(c *gin.Context) {
var items []model.ChatModel
var cms = make([]vo.ChatModel, 0)
res := h.db.Where("enabled = ?", true).Order("sort_num ASC").Find(&items)
if res.Error == nil {
for _, item := range items {
var cm vo.ChatModel
err := utils.CopyObject(item, &cm)
if err == nil {
cm.Id = item.Id
cm.CreatedAt = item.CreatedAt.Unix()
cm.UpdatedAt = item.UpdatedAt.Unix()
cms = append(cms, cm)
} else {
logger.Error(err)
}
}
}
resp.SUCCESS(c, cms)
}

View File

@ -25,7 +25,7 @@ func NewChatRoleHandler(app *core.AppServer, db *gorm.DB) *ChatRoleHandler {
// List get user list
func (h *ChatRoleHandler) List(c *gin.Context) {
var roles []model.ChatRole
res := h.db.Where("enable", true).Order("sort ASC").Find(&roles)
res := h.db.Where("enable", true).Order("sort_num ASC").Find(&roles)
if res.Error != nil {
resp.ERROR(c, "No roles found,"+res.Error.Error())
return

View File

@ -117,6 +117,7 @@ func main() {
fx.Provide(handler.NewRewardHandler),
fx.Provide(handler.NewCaptchaHandler),
fx.Provide(handler.NewMidJourneyHandler),
fx.Provide(handler.NewChatModelHandler),
fx.Provide(admin.NewConfigHandler),
fx.Provide(admin.NewAdminHandler),
@ -125,6 +126,7 @@ func main() {
fx.Provide(admin.NewChatRoleHandler),
fx.Provide(admin.NewRewardHandler),
fx.Provide(admin.NewDashboardHandler),
fx.Provide(admin.NewChatModelHandler),
// 创建服务
fx.Provide(service.NewAliYunSmsService),
@ -216,7 +218,7 @@ func main() {
group := s.Engine.Group("/api/admin/role/")
group.GET("list", h.List)
group.POST("save", h.Save)
group.POST("sort", h.SetSort)
group.POST("sort", h.Sort)
group.GET("remove", h.Remove)
}),
fx.Invoke(func(s *core.AppServer, h *admin.RewardHandler) {
@ -227,6 +229,18 @@ func main() {
group := s.Engine.Group("/api/admin/dashboard/")
group.GET("stats", h.Stats)
}),
fx.Invoke(func(s *core.AppServer, h *handler.ChatModelHandler) {
group := s.Engine.Group("/api/model/")
group.GET("list", h.List)
}),
fx.Invoke(func(s *core.AppServer, h *admin.ChatModelHandler) {
group := s.Engine.Group("/api/admin/model/")
group.POST("save", h.Save)
group.GET("list", h.List)
group.POST("enable", h.Enable)
group.POST("sort", h.Sort)
group.GET("remove", h.Remove)
}),
fx.Invoke(func(s *core.AppServer, db *gorm.DB) {
err := s.Run(db)

View File

@ -8,5 +8,5 @@ type ChatRole struct {
HelloMsg string // 打招呼的消息
Icon string // 角色聊天图标
Enable bool // 是否启用被启用
Sort int //排序数字
SortNum int //排序数字
}

View File

@ -10,5 +10,5 @@ type ChatRole struct {
HelloMsg string `json:"hello_msg"` // 打招呼的消息
Icon string `json:"icon"` // 角色聊天图标
Enable bool `json:"enable"` // 是否启用被启用
Sort int `json:"sort"` // 排序
SortNum int `json:"sort"` // 排序
}

View File

@ -1,3 +1,4 @@
TRUNCATE `chatgpt_plus`.`chatgpt_chat_items`;
ALTER TABLE `chatgpt_chat_items` CHANGE `model` `model_id` INT(11) NOT NULL DEFAULT '0' COMMENT '模型 ID';
ALTER TABLE `chatgpt_api_keys` ADD `platform` CHAR(20) DEFAULT NULL COMMENT '平台' AFTER id;
ALTER TABLE `chatgpt_users` CHANGE `tokens` `total_tokens` BIGINT NOT NULL DEFAULT '0' COMMENT '累计消耗 tokens';
@ -28,4 +29,8 @@ INSERT INTO `chatgpt_chat_models` (`id`, `platform`, `name`, `value`, `sort_num`
ALTER TABLE `chatgpt_users`
DROP `username`,
DROP `nickname`;
DROP `nickname`;
-- 2023/09/04
ALTER TABLE `chatgpt_chat_roles` CHANGE `sort` `sort_num` SMALLINT NOT NULL DEFAULT '0' COMMENT '角色排序';
ALTER TABLE `chatgpt_api_keys` DROP `user_id`;

View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 4125778 */
src: url('iconfont.woff2?t=1691463643989') format('woff2'),
url('iconfont.woff?t=1691463643989') format('woff'),
url('iconfont.ttf?t=1691463643989') format('truetype');
src: url('iconfont.woff2?t=1693316408040') format('woff2'),
url('iconfont.woff?t=1693316408040') format('woff'),
url('iconfont.ttf?t=1693316408040') format('truetype');
}
.iconfont {
@ -13,6 +13,30 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-image:before {
content: "\e7de";
}
.icon-order:before {
content: "\e600";
}
.icon-service:before {
content: "\e62d";
}
.icon-like:before {
content: "\e640";
}
.icon-recharge:before {
content: "\e637";
}
.icon-model:before {
content: "\e867";
}
.icon-plugin:before {
content: "\e69d";
}

File diff suppressed because one or more lines are too long

View File

@ -5,6 +5,48 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
{
"icon_id": "4766917",
"name": "image",
"font_class": "image",
"unicode": "e7de",
"unicode_decimal": 59358
},
{
"icon_id": "1375",
"name": "订单",
"font_class": "order",
"unicode": "e600",
"unicode_decimal": 58880
},
{
"icon_id": "6562297",
"name": "客服",
"font_class": "service",
"unicode": "e62d",
"unicode_decimal": 58925
},
{
"icon_id": "21598358",
"name": "喜欢",
"font_class": "like",
"unicode": "e640",
"unicode_decimal": 58944
},
{
"icon_id": "936873",
"name": "充值1",
"font_class": "recharge",
"unicode": "e637",
"unicode_decimal": 58935
},
{
"icon_id": "18991679",
"name": "model",
"font_class": "model",
"unicode": "e867",
"unicode_decimal": 59495
},
{
"icon_id": "5244045",
"name": "插件",

Binary file not shown.

View File

@ -1,8 +1,8 @@
<template>
<el-dialog
v-model="showDialog"
:close-on-click-modal="false"
:show-close="mobile !== ''"
:close-on-click-modal="true"
style="max-width: 600px"
:before-close="close"
:title="title"
>
@ -16,14 +16,8 @@
<el-input v-model="form.mobile"/>
</el-form-item>
<el-form-item label="手机验证码">
<el-row :gutter="10">
<el-col :span="12">
<el-input v-model.number="form.code" maxlength="6"/>
</el-col>
<el-col :span="12">
<send-msg size="" :mobile="form.mobile"/>
</el-col>
</el-row>
<el-input v-model.number="form.code" maxlength="6" style="max-width: 200px; margin-right: 10px;"/>
<send-msg size="" :mobile="form.mobile"/>
</el-form-item>
</el-form>
</div>
@ -64,10 +58,10 @@ const emits = defineEmits(['hide']);
const save = () => {
if (!validateMobile(form.value.mobile)) {
return ElMessage.error({message: "请输入正确的手机号码", appendTo: "#bind-mobile-form"});
return ElMessage.error("请输入正确的手机号码");
}
if (form.value.code === '') {
return ElMessage.error({message: "请输入短信验证码", appendTo: "#bind-mobile-form"});
return ElMessage.error("请输入短信验证码");
}
httpPost('/api/user/bind/mobile', form.value).then(() => {
@ -78,7 +72,7 @@ const save = () => {
onClose: () => emits('hide', false)
})
}).catch(e => {
ElMessage.error({message: "绑定失败:" + e.message, appendTo: "#bind-mobile-form"});
ElMessage.error("绑定失败:" + e.message);
})
}

View File

@ -4,12 +4,13 @@
v-model="showDialog"
:close-on-click-modal="true"
:before-close="close"
style="max-width: 600px"
title="用户设置"
>
<div class="user-info" id="user-info">
<el-form v-if="form.id" :model="form" label-width="120px">
<el-form-item label="昵称">
<el-input v-model="form.nickname"/>
<el-form-item label="账户">
<span>{{ form.mobile }}</span>
</el-form-item>
<el-form-item label="头像">
<el-upload
@ -24,45 +25,14 @@
</el-icon>
</el-upload>
</el-form-item>
<el-form-item label="用户名">
<el-input v-model="form.username" readonly disabled/>
</el-form-item>
<el-form-item label="绑定手机号">
<el-input v-model="form.mobile" readonly disabled/>
</el-form-item>
<el-form-item label="聊天上下文">
<el-switch v-model="form.chat_config.enable_context"/>
</el-form-item>
<el-form-item label="聊天记录">
<el-switch v-model="form.chat_config.enable_history"/>
</el-form-item>
<el-form-item label="默认模型">
<el-select v-model="form.chat_config.model" placeholder="默认会话模型">
<el-option
v-for="item in models"
:key="item"
:label="item.toUpperCase()"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="MaxTokens">
<el-input v-model.number="form.chat_config.max_tokens"/>
</el-form-item>
<el-form-item label="创意度">
<el-slider v-model="form.chat_config.temperature" :max="2" :step="0.1"/>
<div class="tip">值越大 AI 回答越发散值越小回答越保守建议保持默认值</div>
</el-form-item>
<el-form-item label="剩余对话次数">
<el-tag>{{ form['calls'] }}</el-tag>
</el-form-item>
<el-form-item label="剩余绘图次数">
<el-tag>{{ form['img_calls'] }}</el-tag>
</el-form-item>
<el-form-item label="消耗 Tokens">
<el-tag type="info">{{ form['tokens'] }}</el-tag>
<el-form-item label="累计消耗 Tokens">
<el-tag type="info">{{ form['total_tokens'] }}</el-tag>
</el-form-item>
<el-form-item label="API KEY">
<el-input v-model="form['chat_config']['api_key']"/>

View File

@ -4,6 +4,7 @@
v-model="showDialog"
:close-on-click-modal="true"
:show-close="true"
style="max-width: 600px"
:before-close="close"
title="修改密码"
>

View File

@ -74,11 +74,6 @@ const items = [
index: '/admin/dashboard',
title: '仪表盘',
},
{
icon: 'config',
index: '/admin/system',
title: '系统设置',
},
{
icon: 'user-fill',
@ -96,11 +91,21 @@ const items = [
index: '/admin/apikey',
title: 'API-KEY 管理',
},
{
icon: 'model',
index: '/admin/chat/model',
title: '语言模型',
},
{
icon: 'reward',
index: '/admin/reward',
title: '众筹管理',
},
{
icon: 'config',
index: '/admin/system',
title: '系统设置',
},
{
icon: 'log',
index: '/admin/loginLog',

View File

@ -75,6 +75,12 @@ const routes = [
meta: {title: 'API-KEY 管理'},
component: () => import('@/views/admin/ApiKey.vue'),
},
{
path: '/admin/chat/model',
name: 'admin-chat-model',
meta: {title: '语言模型'},
component: () => import('@/views/admin/ChatModel.vue'),
},
{
path: '/admin/reward',
name: 'admin-reward',

View File

@ -127,4 +127,4 @@ export function copyObj(origin) {
export function disabledDate(time) {
return time.getTime() < Date.now()
}
}

View File

@ -43,7 +43,7 @@
<el-dropdown :hide-on-click="true" class="user-info" trigger="click" v-if="isLogin">
<span class="el-dropdown-link">
<el-image :src="loginUser.avatar"/>
<span class="username">{{ loginUser.nickname }}</span>
<span class="username">{{ '极客学长@' + loginUser.mobile }}</span>
<el-icon><ArrowDown/></el-icon>
</span>
<template #dropdown>
@ -123,12 +123,12 @@
</el-option>
</el-select>
<el-select v-model="model" placeholder="模型">
<el-select v-model="modelID" placeholder="模型">
<el-option
v-for="item in models"
:key="item"
:label="item.toUpperCase()"
:value="item"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
<el-button type="primary" @click="newChat">
@ -158,7 +158,7 @@
:icon="item.icon"
:created-at="dateFormat(item['created_at'])"
:tokens="item['tokens']"
:model="model"
:model="modelID"
:content="item.content"/>
<chat-reply v-else-if="item.type==='reply'"
:icon="item.icon"
@ -287,7 +287,7 @@ const title = ref('ChatGPT-智能助手');
const logo = 'images/logo.png';
const rewardImg = ref('images/reward.png')
const models = ref([])
const model = ref('gpt-3.5-turbo-16k')
const modelID = ref(0)
const chatData = ref([]);
const allChats = ref([]); //
const chatList = ref(allChats.value);
@ -320,7 +320,7 @@ onMounted(() => {
loginUser.value = user
isLogin.value = true
if (user.chat_config?.model !== '') {
model.value = user.chat_config.model
modelID.value = user.chat_config.model
}
//
httpGet(`/api/role/list?user_id=${user.id}`).then((res) => {
@ -328,19 +328,18 @@ onMounted(() => {
roleId.value = roles.value[0]['id'];
//
loadChats();
//
newChat();
//
httpGet('/api/model/list?enable=1').then(res => {
models.value = res.data
modelID.value = models.value[0].id
//
newChat();
}).catch(e => {
ElMessage.error("加载模型失败: " + e.message)
})
}).catch((e) => {
ElMessage.error('获取聊天角色失败: ' + e.messages)
})
//
httpGet('/api/admin/config/get?key=system').then(res => {
title.value = res.data.title;
models.value = res.data.models;
}).catch(e => {
ElMessage.error("加载系统配置失败: " + e.message)
})
}).catch(() => {
router.push('login')
});
@ -401,7 +400,7 @@ const newChat = function () {
chat_id: "",
icon: icon,
role_id: roleId.value,
model: model.value,
model: modelID.value,
title: '',
edit: false,
removing: false,
@ -420,7 +419,7 @@ const changeChat = function (chat) {
activeChat.value = chat
newChatItem.value = null;
roleId.value = chat.role_id;
model.value = chat.model;
modelID.value = chat.model;
showStopGenerate.value = false;
showReGenerate.value = false;
connect(chat.chat_id, chat.role_id)
@ -511,7 +510,7 @@ const connect = function (chat_id, role_id) {
host = 'ws://' + location.host;
}
}
const _socket = new WebSocket(host + `/api/chat/new?session_id=${_sessionId}&role_id=${role_id}&chat_id=${chat_id}&model=${model.value}`);
const _socket = new WebSocket(host + `/api/chat/new?session_id=${_sessionId}&role_id=${role_id}&chat_id=${chat_id}&model_id=${modelID.value}`);
_socket.addEventListener('open', () => {
chatData.value = []; //
previousText.value = '';
@ -527,6 +526,7 @@ const connect = function (chat_id, role_id) {
content: _role['hello_msg'],
orgContent: _role['hello_msg'],
})
ElMessage.success("对话连接成功!")
} else { //
loadChatHistory(chat_id);
}
@ -592,7 +592,7 @@ const connect = function (chat_id, role_id) {
// token
const reply = chatData.value[chatData.value.length - 1]
httpGet(`/api/chat/tokens?text=${reply.orgContent}&model=${model.value}`).then(res => {
httpGet(`/api/chat/tokens?text=${reply.orgContent}&model=${modelID.value}`).then(res => {
reply['created_at'] = new Date().getTime();
reply['tokens'] = res.data;
//
@ -637,12 +637,8 @@ const connect = function (chat_id, role_id) {
checkSession().then(() => {
connect(chat_id, role_id)
}).catch(() => {
ElMessageBox({
title: '会话提示',
message: "当前会话已经失效,请重新登录",
confirmButtonText: 'OK',
callback: () => router.push('login')
});
loading.value = true
setTimeout(() => connect(chat_id, role_id), 3000)
});
});

View File

@ -6,8 +6,9 @@
</div>
<el-row>
<el-table :data="items" :row-key="row => row.id">
<el-table-column prop="value" label="API KEY"/>
<el-table :data="items" :row-key="row => row.id" table-layout="auto">
<el-table-column prop="platform" label="所属平台"/>
<el-table-column prop="value" label="KEY"/>
<el-table-column label="创建时间">
<template #default="scope">
@ -37,24 +38,20 @@
<el-dialog
v-model="showDialog"
title="编辑 API KEY"
:title="title"
style="width: 90%; max-width: 600px;"
>
<el-form :model="item" label-width="120px" ref="formRef" :rules="rules">
<el-form-item label="API KEY" prop="nickname">
<el-form-item label="所属平台:" prop="platform">
<el-select v-model="item.platform" placeholder="请选择平台">
<el-option v-for="item in platforms" :value="item" :key="item">{{ item }}</el-option>
</el-select>
</el-form-item>
<el-form-item label="API KEY" prop="value">
<el-input v-model="item.value" autocomplete="off"/>
</el-form-item>
<el-form-item label="最后使用时间:" prop="last_used_at">
<el-date-picker
v-model="item.last_used_at"
type="datetime"
placeholder="选择日期"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
:disabled-date="disabledDate"
/>
</el-form-item>
</el-form>
<template #footer>
@ -79,13 +76,16 @@ const items = ref([])
const item = ref({})
const showDialog = ref(false)
const rules = reactive({
key: [{required: true, message: '请输入 API KEY', trigger: 'change',}]
platform: [{required: true, message: '请选择平台', trigger: 'change',}],
value: [{required: true, message: '请输入 API KEY 值', trigger: 'change',}]
})
const loading = ref(true)
const formRef = ref(null)
const title = ref("")
const platforms = ref(["Azure", "OpenAI", "ChatGML"])
//
httpGet('/api/admin/apikey/list?user_id=0').then((res) => {
httpGet('/api/admin/apikey/list').then((res) => {
if (res.data) {
//
const arr = res.data;
@ -101,11 +101,13 @@ httpGet('/api/admin/apikey/list?user_id=0').then((res) => {
const add = function () {
showDialog.value = true
title.value = "新增 API KEY"
item.value = {}
}
const edit = function (row) {
showDialog.value = true
title.value = "修改 API KEY"
item.value = row
}
@ -115,7 +117,7 @@ const save = function () {
showDialog.value = false
httpPost('/api/admin/apikey/save', item.value).then((res) => {
ElMessage.success('操作成功!')
if (!item.id) {
if (!item.value['id']) {
const newItem = res.data
newItem.last_used_at = dateFormat(newItem.last_used_at)
items.value.push(newItem)

View File

@ -0,0 +1,211 @@
<template>
<div class="container list" v-loading="loading">
<div class="handle-box">
<el-button type="primary" :icon="Plus" @click="add">新增</el-button>
</div>
<el-row>
<el-table :data="items" :row-key="row => row.id" table-layout="auto">
<el-table-column prop="platform" label="所属平台">
<template #default="scope">
<span class="sort" :data-id="scope.row.id">{{scope.row.platform}}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="模型名称"/>
<el-table-column prop="value" label="模型值"/>
<el-table-column prop="enabled" label="启用状态">
<template #default="scope">
<el-switch v-model="scope.row['enabled']" @change="enable(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="创建时间">
<template #default="scope">
<span>{{ dateFormat(scope.row['created_at']) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="180">
<template #default="scope">
<el-button size="small" type="primary" @click="edit(scope.row)">编辑</el-button>
<el-popconfirm title="确定要删除当前记录吗?" @confirm="remove(scope.row)">
<template #reference>
<el-button size="small" type="danger">删除</el-button>
</template>
</el-popconfirm>
</template>
</el-table-column>
</el-table>
</el-row>
<el-dialog
v-model="showDialog"
:title="title"
style="width: 90%; max-width: 600px;"
>
<el-form :model="item" label-width="120px" ref="formRef" :rules="rules">
<el-form-item label="所属平台:" prop="platform">
<el-select v-model="item.platform" placeholder="请选择平台">
<el-option v-for="item in platforms" :value="item" :key="item">{{item}}</el-option>
</el-select>
</el-form-item>
<el-form-item label="模型名称:" prop="name">
<el-input v-model="item.name" autocomplete="off"/>
</el-form-item>
<el-form-item label="模型值:" prop="value">
<el-input v-model="item.value" autocomplete="off"/>
</el-form-item>
<el-form-item label="启用状态:" prop="enable">
<el-switch v-model="item.enabled"/>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="showDialog = false">取消</el-button>
<el-button type="primary" @click="save">提交</el-button>
</span>
</template>
</el-dialog>
</div>
</template>
<script setup>
import {onMounted, reactive, ref} from "vue";
import {httpGet, httpPost} from "@/utils/http";
import {ElMessage} from "element-plus";
import {dateFormat, removeArrayItem} from "@/utils/libs";
import {Plus} from "@element-plus/icons-vue";
import {Sortable} from "sortablejs";
//
const items = ref([])
const item = ref({})
const showDialog = ref(false)
const title = ref("")
const rules = reactive({
platform: [{required: true, message: '请选择平台', trigger: 'change',}],
name: [{required: true, message: '请输入模型名称', trigger: 'change',}],
value: [{required: true, message: '请输入模型值', trigger: 'change',}]
})
const loading = ref(true)
const formRef = ref(null)
const platforms = ref(["Azure","OpenAI","ChatGML"])
//
httpGet('/api/admin/model/list').then((res) => {
if (res.data) {
//
const arr = res.data;
for (let i = 0; i < arr.length; i++) {
arr[i].last_used_at = dateFormat(arr[i].last_used_at)
}
items.value = arr
}
loading.value = false
}).catch(() => {
ElMessage.error("获取数据失败");
})
onMounted(() => {
const drawBodyWrapper = document.querySelector('.el-table__body tbody')
//
Sortable.create(drawBodyWrapper, {
sort: true,
animation: 500,
onEnd({newIndex, oldIndex, from}) {
if (oldIndex === newIndex) {
return
}
const sortedData = Array.from(from.children).map(row => row.querySelector('.sort').getAttribute('data-id'));
const ids = []
const sorts = []
sortedData.forEach((id,index) => {
ids.push(parseInt(id))
sorts.push(index)
})
httpPost("/api/admin/model/sort", {ids: ids, sorts:sorts}).catch(e => {
ElMessage.error("排序失败:"+e.message)
})
}
})
})
const add = function () {
title.value = "新增模型"
showDialog.value = true
item.value = {}
}
const edit = function (row) {
title.value = "修改模型"
showDialog.value = true
item.value = row
}
const save = function () {
formRef.value.validate((valid) => {
if (valid) {
showDialog.value = false
httpPost('/api/admin/model/save', item.value).then((res) => {
ElMessage.success('操作成功!')
if (!item.value['id']) {
const newItem = res.data
items.value.push(newItem)
}
}).catch((e) => {
ElMessage.error('操作失败,' + e.message)
})
} else {
return false
}
})
}
const enable = (row) => {
httpPost('/api/admin/model/enable', {id: row.id, enabled: row.enabled}).then(() => {
ElMessage.success("操作成功!")
}).catch(e => {
ElMessage.error("操作失败:"+e.message)
})
}
const remove = function (row) {
httpGet('/api/admin/model/remove?id=' + row.id).then(() => {
ElMessage.success("删除成功!")
items.value = removeArrayItem(items.value, row, (v1, v2) => {
return v1.id === v2.id
})
}).catch((e) => {
ElMessage.error("删除失败:" + e.message)
})
}
</script>
<style lang="stylus" scoped>
.list {
.opt-box {
padding-bottom: 10px;
display flex;
justify-content flex-end
.el-icon {
margin-right: 5px;
}
}
.el-select {
width: 100%
}
}
</style>

View File

@ -3,7 +3,7 @@
<el-row>
<el-table :data="items" :row-key="row => row.id">
<el-table-column prop="username" label="用户"/>
<el-table-column prop="username" label="用户"/>
<el-table-column prop="tx_id" label="转账单号"/>
<el-table-column prop="amount" label="转账金额"/>
<el-table-column prop="remark" label="备注"/>

View File

@ -15,15 +15,12 @@
</div>
</template>
</el-table-column>
<el-table-column label="角色名称" prop="name"/>
<el-table-column label="角色标识" prop="key"/>
<el-table-column label="排序" prop="sort">
<el-table-column label="角色名称" prop="name">
<template #default="scope">
<el-input v-if="scope.row.id === editRow.id" v-model.number="scope.row.sort" @blur="updateSort(scope.row)"
size="small" autofocus/>
<span v-else @click="editSort($event,scope.row)">{{ scope.row.sort }}</span>
<span class="sort" :data-id="scope.row.id">{{ scope.row.name }}</span>
</template>
</el-table-column>
<el-table-column label="角色标识" prop="key"/>
<el-table-column label="启用状态">
<template #default="scope">
<el-tag v-if="scope.row.enable" type="success">启用</el-tag>
@ -126,9 +123,6 @@
<el-form-item label="启用状态">
<el-switch v-model="role.enable"/>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input v-model.number="role.sort"/>
</el-form-item>
</el-form>
<template #footer>
@ -186,25 +180,22 @@ onMounted(() => {
//
Sortable.create(drawBodyWrapper, {
sort: true,
onEnd({newIndex, oldIndex}) {
//console.log(oldIndex, newIndex);
animation: 500,
onEnd({newIndex, oldIndex, from}) {
if (oldIndex === newIndex) {
return
}
const curRow = sortedTableData.value[oldIndex]
const newRow = sortedTableData.value[newIndex]
sortedTableData.value.splice(oldIndex, 1)
sortedTableData.value.splice(newIndex, 0, curRow)
// console.log(currRow)
const sortedData = Array.from(from.children).map(row => row.querySelector('.sort').getAttribute('data-id'));
const ids = []
const sorts = []
sortedData.forEach((id, index) => {
ids.push(parseInt(id))
sorts.push(index)
})
if (newIndex > oldIndex) {
curRow.sort = curRow.sort === newRow.sort ? newRow.sort + 1 : newRow.sort
} else {
curRow.sort = curRow.sort === newRow.sort ? newRow.sort - 1 : newRow.sort
}
httpPost('/api/admin/role/sort', {"id": curRow.id, "sort": curRow.sort}).catch(() => {
ElMessage.error("移动失败!")
httpPost("/api/admin/role/sort", {ids: ids, sorts: sorts}).catch(e => {
ElMessage.error("排序失败:" + e.message)
})
}
})

View File

@ -2,84 +2,84 @@
<div class="system-config" v-loading="loading">
<div class="container">
<el-divider content-position="center">基本设置</el-divider>
<el-form :model="system" label-width="120px" label-position="left" ref="systemFormRef" :rules="rules">
<el-form :model="system" label-width="150px" label-position="right" ref="systemFormRef" :rules="rules">
<el-form-item label="网站标题" prop="title">
<el-input v-model="system['title']"/>
</el-form-item>
<el-form-item label="控制台标题" prop="admin_title">
<el-input v-model="system['admin_title']"/>
</el-form-item>
<el-form-item label="赠送对话次数" prop="init_calls">
<el-form-item label="注册赠送对话次数" prop="user_init_calls">
<el-input v-model.number="system['user_init_calls']" placeholder="新用户注册赠送对话次数"/>
</el-form-item>
<el-form-item label="赠送绘图次数" prop="init_calls">
<el-form-item label="注册赠送绘图次数" prop="init_img_calls">
<el-input v-model.number="system['init_img_calls']" placeholder="新用户注册赠送绘图次数"/>
</el-form-item>
<el-form-item label="开放注册服务" prop="enabled_register">
<el-switch v-model="system['enabled_register']"/>
</el-form-item>
<el-form-item label="短信验证服务" prop="enabled_msg_service">
<el-switch v-model="system['enabled_msg_service']"/>
</el-form-item>
<el-form-item label="开放用户注册" prop="enabled_register">
<el-switch v-model="system['enabled_register']"/>
</el-form-item>
<el-alert type="info" show-icon :closable="false">
<p>在这里维护前端聊天页面可用的 GPT 模型列表</p>
</el-alert>
<el-form-item label="GPT 模型" prop="models">
<div class="models">
<el-tag
v-for="item in system.models"
:key="item"
@close="removeModel(item)"
round
closable
>
{{ item }}
</el-tag>
<el-button type="success" :icon="Plus" @click="addModel" size="small" circle/>
</div>
<el-form-item label="开放AI绘画" prop="enabled_draw">
<el-switch v-model="system['enabled_draw']"/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="save('system')">保存</el-button>
</el-form-item>
</el-form>
<el-divider content-position="center">聊天设置</el-divider>
<el-alert type="info" show-icon :closable="false">
<p>以下配置为新用户注册默认初始化的聊天参数用户登录后还可以自己修改参数</p>
</el-alert>
<el-form :model="chat" label-position="left" label-width="120px">
<el-form-item label="OpenAI API 地址">
<el-input v-model="chat['api_url']" placeholder="gpt-3/gpt-3.5-turbo/gpt-4"/>
</el-form-item>
<el-form-item label="默认模型">
<el-select v-model="chat['model']" placeholder="默认会话模型">
<el-option
v-for="item in system.models"
:key="item"
:label="item.toUpperCase()"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="模型温度">
<el-input v-model.number="chat['temperature']" placeholder="0-1之间的小数"/>
</el-form-item>
<el-form-item label="Max Tokens">
<el-input v-model.number="chat['max_tokens']" placeholder="回复的最大字数最大4096"/>
</el-form-item>
<el-divider content-position="center">模型通用配置</el-divider>
<el-form :model="chat" label-position="right" label-width="150px" ref="chatFormRef" :rules="rules">
<el-form-item label="开启聊天上下文">
<el-switch v-model="chat['enable_context']"/>
</el-form-item>
<el-form-item label="保存聊天记录">
<el-switch v-model="chat['enable_history']"/>
</el-form-item>
<el-alert type="info" show-icon :closable="false">
<p>会话上下文深度在老会话中继续会话默认加载多少条聊天记录作为上下文如果设置为 0
则不加载聊天记录仅仅使用当前角色的上下文该配置参数最好设置为 2 的整数倍</p>
</el-alert>
<el-form-item label="会话上下文深度">
<el-input-number v-model="chat['context_deep']" :min="0" :max="10"/>
<div class="tip" style="margin-top: 10px;">会话上下文深度在老会话中继续会话默认加载多少条聊天记录作为上下文如果设置为
0
则不加载聊天记录仅仅使用当前角色的上下文该配置参数最好设置为 2 的整数倍
</div>
</el-form-item>
<el-divider content-position="center">OpenAI</el-divider>
<el-form-item label="API 地址" prop="open_ai.api_url">
<el-input v-model="chat['open_ai']['api_url']" placeholder="支持变量,{model} => 模型名称"/>
</el-form-item>
<el-form-item label="模型创意度">
<el-slider v-model="chat['open_ai']['temperature']" :max="2" :step="0.1"/>
<div class="tip">值越大 AI 回答越发散值越小回答越保守建议保持默认值</div>
</el-form-item>
<el-form-item label="最大响应长度">
<el-input v-model.number="chat['open_ai']['max_tokens']" placeholder="回复的最大字数最大4096"/>
</el-form-item>
<el-divider content-position="center">Azure</el-divider>
<el-form-item label="API 地址" prop="azure.api_url">
<el-input v-model="chat['azure']['api_url']" placeholder="支持变量,{model} => 模型名称"/>
</el-form-item>
<el-form-item label="模型创意度">
<el-slider v-model="chat['azure']['temperature']" :max="2" :step="0.1"/>
<div class="tip">值越大 AI 回答越发散值越小回答越保守建议保持默认值</div>
</el-form-item>
<el-form-item label="最大响应长度">
<el-input v-model.number="chat['azure']['max_tokens']" placeholder="回复的最大字数最大4096"/>
</el-form-item>
<el-divider content-position="center">ChatGLM</el-divider>
<el-form-item label="API 地址" prop="chat_gml.api_url">
<el-input v-model="chat['chat_gml']['api_url']" placeholder="支持变量,{model} => 模型名称"/>
</el-form-item>
<el-form-item label="模型创意度">
<el-slider v-model="chat['chat_gml']['temperature']" :max="2" :step="0.1"/>
<div class="tip">值越大 AI 回答越发散值越小回答越保守建议保持默认值</div>
</el-form-item>
<el-form-item label="最大响应长度">
<el-input v-model.number="chat['chat_gml']['max_tokens']" placeholder="回复的最大字数最大4096"/>
</el-form-item>
<el-form-item style="text-align: right">
@ -93,34 +93,44 @@
<script setup>
import {onMounted, reactive, ref} from "vue";
import {httpGet, httpPost} from "@/utils/http";
import {ElMessage, ElMessageBox} from "element-plus";
import {Plus} from "@element-plus/icons-vue";
import {removeArrayItem} from "@/utils/libs";
import {ElMessage} from "element-plus";
const system = ref({models: []})
const chat = ref({})
const chat = ref({
open_ai: {api_url: "", temperature: 1, max_tokens: 1024},
azure: {api_url: "", temperature: 1, max_tokens: 1024},
chat_gml: {api_url: "", temperature: 1, max_tokens: 1024},
context_deep: 0,
enable_context: true,
enable_history: true,
})
const loading = ref(true)
const systemFormRef = ref(null)
const models = ref([])
const chatFormRef = ref(null)
onMounted(() => {
//
httpGet('/api/admin/config/get?key=system').then(res => {
system.value = res.data
system.value['models'].forEach(model => {
models.value.push({
name: model,
edit: false
})
})
}).catch(e => {
ElMessage.error("加载系统配置失败: " + e.message)
})
//
httpGet('/api/admin/config/get?key=chat').then(res => {
chat.value = res.data
// chat.value = res.data
if (res.data.open_ai) {
chat.value.open_ai = res.data.open_ai
}
if (res.data.azure) {
chat.value.azure = res.data.azure
}
if (res.data.chat_gml) {
chat.value.chat_gml = res.data.chat_gml
}
chat.value.context_deep = res.data.context_deep
chat.value.enable_context = res.data.enable_context
chat.value.enable_history = res.data.enable_history
loading.value = false
}).catch(e => {
ElMessage.error("加载聊天配置失败: " + e.message)
@ -131,42 +141,37 @@ onMounted(() => {
const rules = reactive({
title: [{required: true, message: '请输入网站标题', trigger: 'blur',}],
admin_title: [{required: true, message: '请输入控制台标题', trigger: 'blur',}],
init_calls: [{required: true, message: '必须填入大于0的数组', trigger: 'blur',}],
models: [{required: true, message: '至少保留一个 GPT 模型', trigger: 'blur',}],
user_init_calls: [{required: true, message: '请输入赠送对话次数', trigger: 'blur'}],
user_img_calls: [{required: true, message: '请输入赠送绘图次数', trigger: 'blur'}],
open_ai: {api_url: [{required: true, message: '请输入 API URL', trigger: 'blur'}]},
azure: {api_url: [{required: true, message: '请输入 API URL', trigger: 'blur'}]},
chat_gml: {api_url: [{required: true, message: '请输入 API URL', trigger: 'blur'}]},
})
const save = function (key) {
systemFormRef.value.validate((valid) => {
if (valid) {
const data = key === 'system' ? system.value : chat.value
httpPost('/api/admin/config/update', {key: key, config: data}).then(() => {
ElMessage.success("操作成功!")
}).catch(e => {
ElMessage.error("操作失败:" + e.message)
})
}
})
}
const removeModel = function (model) {
system.value.models = removeArrayItem(system.value.models, model, (v1, v2) => {
return v1 === v2
})
}
// GPT
const addModel = function () {
ElMessageBox.prompt('请输入 GPT 模型名称', '新增模型', {
confirmButtonText: '保存',
cancelButtonText: '取消',
inputPattern:
/[\w+]/,
inputErrorMessage: '请输入模型名称',
}).then(({value}) => {
system.value.models.push(value)
})
if (key === 'system') {
systemFormRef.value.validate((valid) => {
if (valid) {
httpPost('/api/admin/config/update', {key: key, config: system.value}).then(() => {
ElMessage.success("操作成功!")
}).catch(e => {
ElMessage.error("操作失败:" + e.message)
})
}
})
} else if (key === 'chat') {
chatFormRef.value.validate((valid) => {
if (valid) {
httpPost('/api/admin/config/update', {key: key, config: chat.value}).then(() => {
ElMessage.success("操作成功!")
}).catch(e => {
ElMessage.error("操作失败:" + e.message)
})
}
})
}
}
</script>
<style lang="stylus" scoped>
@ -180,23 +185,16 @@ const addModel = function () {
.el-form {
.el-form-item__content {
.models {
.el-tag {
margin-right 10px;
.el-input {
max-width 100px;
}
}
.el-button--small {
font-size 16px;
}
}
.tip-text {
padding-left 10px;
}
.tip {
color #c1c1c1
font-size 12px;
line-height 1.5;
}
}
}

View File

@ -10,13 +10,12 @@
<el-row>
<el-table :data="users.items" border class="table" :row-key="row => row.id"
@selection-change="handleSelectionChange">
@selection-change="handleSelectionChange" table-layout="auto">
<el-table-column type="selection" width="38"/>
<el-table-column prop="username" label="用户名"/>
<el-table-column prop="mobile" label="手机号"/>
<el-table-column prop="nickname" label="昵称"/>
<el-table-column prop="calls" label="对话次数" width="100"/>
<el-table-column prop="img_calls" label="绘图次数" width="100"/>
<el-table-column prop="mobile" label="账号"/>
<el-table-column prop="calls" label="剩余对话次数"/>
<el-table-column prop="img_calls" label="剩余绘图次数"/>
<el-table-column prop="total_tokens" label="累计消耗tokens"/>
<el-table-column label="状态" width="80">
<template #default="scope">
<el-tag v-if="scope.row.status" type="success">正常</el-tag>