refactor: 管理后台用户编辑功能 is ready

api/go/handler/admin/user_handler.go

@@ -2,11 +2,13 @@ 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"
 )
@@ -49,3 +51,50 @@ func (h *UserHandler) List(c *gin.Context) {
 	pageVo := vo.NewPage(total, page, pageSize, users)
 	resp.SUCCESS(c, pageVo)
 }
+
+func (h *UserHandler) Update(c *gin.Context) {
+	var data struct {
+		Id          uint     `json:"id"`
+		Nickname    string   `json:"nickname"`
+		Calls       int      `json:"calls"`
+		ChatRoles   []string `json:"chat_roles"`
+		ExpiredTime string   `json:"expired_time"`
+		Status      bool     `json:"status"`
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+	var user = model.User{
+		Nickname:    data.Nickname,
+		Calls:       data.Calls,
+		Status:      data.Status,
+		ChatRoles:   utils.JsonEncode(data.ChatRoles),
+		ExpiredTime: utils.Str2stamp(data.ExpiredTime),
+	}
+	user.Id = data.Id
+	res := h.db.Updates(&user)
+	if res.Error != nil {
+		resp.ERROR(c, "更新数据库失败")
+		return
+	}
+
+	resp.SUCCESS(c)
+}
+
+func (h *UserHandler) InitUser(c *gin.Context) {
+	var users []model.User
+	h.db.Find(&users)
+	for _, u := range users {
+		var m map[string]int
+		var roleKeys = make([]string, 0)
+		utils.JsonDecode(u.ChatRoles, &m)
+		for k, _ := range m {
+			roleKeys = append(roleKeys, k)
+		}
+		u.ChatRoles = utils.JsonEncode(roleKeys)
+		h.db.Updates(&u)
+
+	}
+	resp.SUCCESS(c, "SUCCESS")
+}

api/go/handler/chat_role_handler.go

@@ -6,6 +6,7 @@ import (
 	"chatplus/store/vo"
 	"chatplus/utils"
 	"chatplus/utils/resp"
+
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
 )
@@ -33,11 +34,11 @@ func (h *ChatRoleHandler) List(c *gin.Context) {
 	if userId > 0 {
 		var user model.User
 		h.db.First(&user, userId)
-		var roleMap map[string]int
+		var roleKeys []string
-		err := utils.JsonDecode(user.ChatRoles, &roleMap)
+		err := utils.JsonDecode(user.ChatRoles, &roleKeys)
 		if err == nil {
 			for index, r := range roles {
-				if _, ok := roleMap[r.Key]; !ok {
+				if utils.ContainsStr(roleKeys, r.Key) {
 					roles = append(roles[:index], roles[index+1:]...)
 				}
 			}

api/go/handler/user_handler.go

@@ -62,9 +62,9 @@ func (h *UserHandler) Register(c *gin.Context) {
 	// 默认订阅所有角色
 	var chatRoles []model.ChatRole
 	h.db.Find(&chatRoles)
-	var roleMap = make(map[string]int)
+	var roleKeys = make([]string, 0)
 	for _, r := range chatRoles {
-		roleMap[r.Key] = 1
+		roleKeys = append(roleKeys, r.Key)
 	}
 
 	salt := utils.RandString(8)
@@ -75,7 +75,7 @@ func (h *UserHandler) Register(c *gin.Context) {
 		Avatar:    "images/avatar/user.png",
 		Salt:      salt,
 		Status:    true,
-		ChatRoles: utils.JsonEncode(roleMap),
+		ChatRoles: utils.JsonEncode(roleKeys),
 		ChatConfig: utils.JsonEncode(types.ChatConfig{
 			Temperature:   h.App.ChatConfig.Temperature,
 			MaxTokens:     h.App.ChatConfig.MaxTokens,
@@ -145,14 +145,10 @@ func (h *UserHandler) Login(c *gin.Context) {
 	h.App.ChatSession.Put(sessionId, types.ChatSession{ClientIP: c.ClientIP(), UserId: user.Id, Username: data.Username, SessionId: sessionId})
 
 	// 加载用户订阅的聊天角色
-	var roleMap map[string]int
+	var roleKeys []string
-	err = utils.JsonDecode(user.ChatRoles, &roleMap)
+	err = utils.JsonDecode(user.ChatRoles, &roleKeys)
 	var chatRoles interface{}
 	if err == nil {
-		roleKeys := make([]string, 0)
-		for key := range roleMap {
-			roleKeys = append(roleKeys, key)
-		}
 		var roles []model.ChatRole
 		res = h.db.Where("marker IN ?", roleKeys).Find(&roles)
 		if res.Error == err {

api/go/main.go

@@ -134,6 +134,8 @@ func main() {
 		fx.Invoke(func(s *core.AppServer, h *admin.UserHandler) {
 			group := s.Engine.Group("/api/admin/user/")
 			group.GET("list", h.List)
+			group.POST("update", h.Update)
+			group.GET("test", h.InitUser)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *admin.ChatRoleHandler) {
 			group := s.Engine.Group("/api/admin/role/")

api/go/store/vo/user.go

@@ -11,7 +11,7 @@ type User struct {
 	Tokens      int64            `json:"tokens"`        // 剩余tokens
 	Calls       int              `json:"calls"`         // 剩余对话次数
 	ChatConfig  types.ChatConfig `json:"chat_config"`   // 聊天配置
-	ChatRoles   map[string]int   `json:"chat_roles"`    // 聊天角色集合
+	ChatRoles   []string         `json:"chat_roles"`    // 聊天角色集合
 	ExpiredTime int64            `json:"expired_time"`  // 账户到期时间
 	Status      bool             `json:"status"`        // 当前状态
 	LastLoginAt int64            `json:"last_login_at"` // 最后登录时间

web/src/views/admin/SysConfig.vue

@@ -43,7 +43,14 @@
           <el-input v-model="chat['api_url']" placeholder="gpt-3/gpt-3.5-turbo/gpt-4"/>
         </el-form-item>
         <el-form-item label="默认模型">
-          <el-input v-model="chat['model']" placeholder="用户默认使用的 GPT 模型"/>
+          <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之间的小数"/>

web/src/views/admin/UserList.vue

@@ -45,12 +45,14 @@
       </el-table>
 
       <div class="pagination">
-        <el-pagination background
+        <el-pagination v-if="users.total > 0" background
                        layout="prev, pager, next"
                        :hide-on-single-page="true"
                        v-model:current-page="users.page"
-                       v-model:page-size="users['page_size']"
+                       v-model:page-size="users.page_size"
-                       :total="1000"/>
+                       @update:current-change="fetchUserList(users.page, users.page_size)"
+                       :page-count="users.total_page"/>
+
       </div>
     </el-row>
 
@@ -68,40 +70,35 @@
           <el-input v-model.number="user.calls" autocomplete="off" placeholder="0"/>
         </el-form-item>
 
-        <el-form-item label="有效期：" prop="term">
+        <el-form-item label="有效期：" prop="expired_time">
           <el-date-picker
-              v-model="form2.expired_time"
+              v-model="user.expired_time"
               type="datetime"
-              placeholder="选择时间"
+              placeholder="选择日期"
               format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
+              :disabled-date="disabledDate"
           />
         </el-form-item>
 
         <el-form-item label="聊天角色" prop="chat_roles">
           <el-select
-              v-model="form2.chat_roles"
+              v-model="user.chat_roles"
               multiple
               :filterable="true"
               placeholder="选择聊天角色，多选"
-              @change="selectRole"
           >
             <el-option
                 v-for="item in roles"
                 :key="item.key"
                 :label="item.name"
                 :value="item.key"
-                :disabled="item.disabled"
             />
           </el-select>
         </el-form-item>
 
-        <el-form-item label="聊天记录">
-          <el-switch v-model="form2.enable_history"/>
-        </el-form-item>
-
         <el-form-item label="启用状态">
-          <el-switch v-model="form2.status"/>
+          <el-switch v-model="user.status"/>
         </el-form-item>
       </el-form>
 
@@ -119,48 +116,28 @@
 import {nextTick, onMounted, reactive, ref} from "vue";
 import {httpGet, httpPost} from "@/utils/http";
 import {ElMessage} from "element-plus";
-import {arrayContains, dateFormat, removeArrayItem} from "@/utils/libs";
+import {dateFormat, removeArrayItem} from "@/utils/libs";
 
 // 变量定义
 const users = ref({})
 
 const user = ref({chat_roles: []})
 const roles = ref([])
-const showUserDialog = ref(false)
 const showUserEditDialog = ref(false)
 const rules = reactive({
-  name: [{required: true, message: '请输入口令名称', trigger: 'change',}],
+  nickname: [{required: true, message: '请输入昵称', trigger: 'change',}],
-  max_calls: [
+  calls: [
     {required: true, message: '请输入提问次数'},
     {type: 'number', message: '请输入有效数字'},
   ],
-  remaining_calls: [
-    {required: true, message: '请输入提问次数'},
-    {type: 'number', message: '请输入有效数字'},
-  ],
-  term: [
-    {required: true, message: '请输入有效期', trigger: 'change'},
-    {type: 'number', message: '请输入有效数字'},
-  ],
-  number: [
-    {required: true, message: '请输入口令数量', trigger: 'change'},
-    {type: 'number', message: '请输入有效数字'},
-  ],
   chat_roles: [{required: true, message: '请选择聊天角色', trigger: 'change'}],
 })
 const loading = ref(true)
 
-const userAddFormRef = ref(null)
 const userEditFormRef = ref(null)
 
 onMounted(() => {
-// 获取口令列表
+  fetchUserList(1, 20)
-  httpGet('/api/admin/user/list', {page: 1, page_size: 20}).then((res) => {
-    users.value = res.data;
-  }).catch(() => {
-    ElMessage.error('加载用户列表失败')
-  })
-
   // 获取角色列表
   httpGet('/api/admin/role/list').then((res) => {
     roles.value = res.data;
@@ -173,27 +150,16 @@ onMounted(() => {
   })
 })
 
-// 选择角色事件
+const fetchUserList = function (page, pageSize) {
-const selectRole = function (items) {
+  httpGet('/api/admin/user/list', {page: page, page_size: pageSize}).then((res) => {
-  if (arrayContains(items, 'all')) {
+    users.value = res.data;
-    for (let i = 0; i < roles.value.length; i++) {
+  }).catch(() => {
-      if (roles.value[i].key === 'all') {
+    ElMessage.error('加载用户列表失败')
-        continue
+  })
-      }
+}
-      roles.value[i].disabled = true
-      form1.value.chat_roles = ['all']
-      form2.value.chat_roles = ['all']
-      form3.value.chat_roles = ['all']
-    }
-  } else {
-    for (let i = 0; i < roles.value.length; i++) {
-      if (roles.value[i].key === 'all') {
-        continue
-      }
-      roles.value[i].disabled = false
-    }
-  }
 
+const disabledDate = (time) => {
+  return time.getTime() < Date.now()
 }
 
 // 删除用户
@@ -209,6 +175,7 @@ const removeUser = function (user) {
 }
 
 const userEdit = function (_user) {
+  _user.expired_time = dateFormat(_user.expired_time)
   user.value = _user
   showUserEditDialog.value = true
 }
@@ -218,9 +185,7 @@ const updateUser = function () {
   userEditFormRef.value.validate((valid) => {
     if (valid) {
       showUserEditDialog.value = false
-      form2.value.term = parseInt(form2.value.term)
+      httpPost('/api/admin/user/update', user.value).then(() => {
-      form2.value.remaining_calls = parseInt(form2.value.remaining_calls)
-      httpPost('/api/admin/user/update', form2.value).then(() => {
         ElMessage.success('操作成功！')
       }).catch((e) => {
         ElMessage.error('操作失败，' + e.message)