feat: allow edit user remark (Close #343)

Author: Kerwin

service/src/chatgpt/index.ts

@@ -5,10 +5,10 @@ import { ChatGPTAPI, ChatGPTUnofficialProxyAPI } from 'chatgpt'
 import { SocksProxyAgent } from 'socks-proxy-agent'
 import httpsProxyAgent from 'https-proxy-agent'
 import fetch from 'node-fetch'
-import type { AuditConfig, CHATMODEL, KeyConfig, UserInfo } from '../storage/model'
-import { Status } from '../storage/model'
 import jwt_decode from 'jwt-decode'
 import dayjs from 'dayjs'
+import type { AuditConfig, CHATMODEL, KeyConfig, UserInfo } from '../storage/model'
+import { Status } from '../storage/model'
 import type { TextAuditService } from '../utils/textAudit'
 import { textAuditServices } from '../utils/textAudit'
 import { getCacheApiKeys, getCacheConfig, getOriginConfig } from '../storage/config'
@@ -355,12 +355,13 @@ async function getMessageById(id: string): Promise<ChatMessage | undefined> {
       return parentMessageId
         ? getMessageById(parentMessageId)
         : undefined
-    } else {
+    }
+    else {
       if (isPrompt) { // prompt
         return {
           id,
           conversationId: chatInfo.options.conversationId,
-          parentMessageId: parentMessageId,
+          parentMessageId,
           role: 'user',
           text: chatInfo.prompt,
         }
@@ -369,7 +370,7 @@ async function getMessageById(id: string): Promise<ChatMessage | undefined> {
         return { // completion
           id,
           conversationId: chatInfo.options.conversationId,
-          parentMessageId: parentMessageId,
+          parentMessageId,
           role: 'assistant',
           text: chatInfo.response,
         }

service/src/index.ts

@@ -763,13 +763,13 @@ router.post('/user-status', rootAuth, async (req, res) => {
 
 router.post('/user-edit', rootAuth, async (req, res) => {
   try {
-    const { userId, email, password, roles } = req.body as { userId?: string; email: string; password: string; roles: UserRole[] }
+    const { userId, email, password, roles, remark } = req.body as { userId?: string; email: string; password: string; roles: UserRole[]; remark?: string }
     if (userId) {
-      await updateUser(userId, roles, password)
+      await updateUser(userId, roles, password, remark)
     }
     else {
       const newPassword = md5(password)
-      const user = await createUser(email, newPassword, roles)
+      const user = await createUser(email, newPassword, roles, remark)
       await updateUserStatus(user._id.toString(), Status.Normal)
     }
     res.send({ status: 'Success', message: '更新成功 | Update successfully' })

service/src/storage/model.ts

@@ -36,6 +36,7 @@ export class UserInfo {
   updateTime?: string
   config?: UserConfig
   roles?: UserRole[]
+  remark?: string
   constructor(email: string, password: string) {
     this.name = email
     this.email = email
@@ -45,6 +46,7 @@ export class UserInfo {
     this.verifyTime = null
     this.updateTime = new Date().toLocaleString()
     this.roles = [UserRole.User]
+    this.remark = null
   }
 }
 

service/src/storage/mongo.ts

@@ -201,12 +201,13 @@ export async function deleteChat(roomId: number, uuid: number, inversion: boolea
   await chatCol.updateOne(query, update)
 }
 
-export async function createUser(email: string, password: string, roles?: UserRole[]): Promise<UserInfo> {
+export async function createUser(email: string, password: string, roles?: UserRole[], remark?: string): Promise<UserInfo> {
   email = email.toLowerCase()
   const userInfo = new UserInfo(email, password)
   if (roles && roles.includes(UserRole.Admin))
     userInfo.status = Status.Normal
   userInfo.roles = roles
+  userInfo.remark = remark
   await userCol.insertOne(userInfo)
   return userInfo
 }
@@ -277,15 +278,15 @@ export async function updateUserStatus(userId: string, status: Status) {
   return await userCol.updateOne({ _id: new ObjectId(userId) }, { $set: { status, verifyTime: new Date().toLocaleString() } })
 }
 
-export async function updateUser(userId: string, roles: UserRole[], password: string) {
+export async function updateUser(userId: string, roles: UserRole[], password: string, remark?: string) {
   const user = await getUserById(userId)
   const query = { _id: new ObjectId(userId) }
   if (user.password !== password && user.password) {
     const newPassword = md5(password)
-    return await userCol.updateOne(query, { $set: { roles, verifyTime: new Date().toLocaleString(), password: newPassword } })
+    return await userCol.updateOne(query, { $set: { roles, verifyTime: new Date().toLocaleString(), password: newPassword, remark } })
   }
   else {
-    return await userCol.updateOne(query, { $set: { roles, verifyTime: new Date().toLocaleString() } })
+    return await userCol.updateOne(query, { $set: { roles, verifyTime: new Date().toLocaleString(), remark } })
   }
 }
 

src/api/index.ts

@@ -140,7 +140,7 @@ export function fetchUpdateUserStatus<T = any>(userId: string, status: Status) {
 export function fetchUpdateUser<T = any>(userInfo: UserInfo) {
   return post<T>({
     url: '/user-edit',
-    data: { userId: userInfo._id, roles: userInfo.roles, email: userInfo.email, password: userInfo.password },
+    data: { userId: userInfo._id, roles: userInfo.roles, email: userInfo.email, password: userInfo.password, remark: userInfo.remark },
   })
 }
 

src/components/common/Setting/User.vue

@@ -65,6 +65,11 @@ const columns = [
       return Status[row.status]
     },
   },
+  {
+    title: 'Remark',
+    key: 'remark',
+    width: 220,
+  },
   {
     title: 'Action',
     key: '_id',
@@ -259,6 +264,15 @@ onMounted(async () => {
             />
           </div>
         </div>
+        <div class="flex items-center space-x-4">
+          <span class="flex-shrink-0 w-[100px]">{{ $t('setting.remark') }}</span>
+          <div class="flex-1">
+            <NInput
+              v-model:value="userRef.remark" type="textarea"
+              :autosize="{ minRows: 1, maxRows: 2 }" placeholder=""
+            />
+          </div>
+        </div>
         <div class="flex items-center space-x-4">
           <span class="flex-shrink-0 w-[100px]" />
           <NButton type="primary" :loading="handleSaving" @click="handleUpdateUser()">

src/components/common/Setting/model.ts

@@ -125,6 +125,7 @@ export class UserInfo {
   email?: string
   password?: string
   roles: UserRole[]
+  remark?: string
   constructor(roles: UserRole[]) {
     this.roles = roles
   }