diff --git a/server/chat_handler.go b/server/chat_handler.go index a8184f61..bb540596 100644 --- a/server/chat_handler.go +++ b/server/chat_handler.go @@ -393,6 +393,17 @@ func (s *Server) GetChatHistoryHandle(c *gin.Context) { } session := s.ChatSession[sessionId] + user, err := GetUser(session.Username) + if err != nil { + c.JSON(http.StatusOK, types.BizVo{Code: types.Failed, Message: "Invalid args"}) + return + } + + if v, ok := user.ChatRoles[data.Role]; !ok || v != 1 { + c.JSON(http.StatusOK, types.BizVo{Code: types.Failed, Message: "No permission to access the history of role " + data.Role}) + return + } + history, err := GetChatHistory(session.Username, data.Role) if err != nil { c.JSON(http.StatusOK, types.BizVo{Code: types.Failed, Message: "No history message"}) diff --git a/server/config_handler.go b/server/config_handler.go index 6c09e4ba..19f939d3 100644 --- a/server/config_handler.go +++ b/server/config_handler.go @@ -2,16 +2,18 @@ package server import ( "encoding/json" + "fmt" "github.com/gin-gonic/gin" "net/http" "openai/types" "openai/utils" + "strings" ) func (s *Server) TestHandle(c *gin.Context) { roles := types.GetDefaultChatRole() for _, v := range roles { - PutChatRole(v) + _ = PutChatRole(v) } c.JSON(http.StatusOK, types.BizVo{Code: types.Success, Data: GetChatRoles()}) @@ -81,10 +83,11 @@ func (s *Server) SetDebugHandle(c *gin.Context) { // AddUserHandle 添加 Username func (s *Server) AddUserHandle(c *gin.Context) { var data struct { - Name string `json:"name"` - MaxCalls int `json:"max_calls"` - EnableHistory bool `json:"enable_history"` - Term int `json:"term"` // 有效期 + Name string `json:"name"` + MaxCalls int `json:"max_calls"` + EnableHistory bool `json:"enable_history"` + Term int `json:"term"` // 有效期 + ChatRoles []string `json:"chat_roles"` // 订阅角色 } err := json.NewDecoder(c.Request.Body).Decode(&data) if err != nil { @@ -105,12 +108,28 @@ func (s *Server) AddUserHandle(c *gin.Context) { return } + var chatRoles = make(map[string]int) + if len(data.ChatRoles) > 0 { + if data.ChatRoles[0] == "all" { // 所有的角色 + roles := GetChatRoles() + for key := range roles { + chatRoles[key] = 1 + } + } else { + for _, key := range data.ChatRoles { + chatRoles[key] = 1 + } + } + + } + user := types.User{ Name: data.Name, MaxCalls: data.MaxCalls, RemainingCalls: data.MaxCalls, EnableHistory: data.EnableHistory, Term: data.Term, + ChatRoles: chatRoles, Status: true} err = PutUser(user) if err != nil { @@ -124,10 +143,11 @@ func (s *Server) AddUserHandle(c *gin.Context) { // BatchAddUserHandle 批量生成 Username func (s *Server) BatchAddUserHandle(c *gin.Context) { var data struct { - Number int `json:"number"` - MaxCalls int `json:"max_calls"` - EnableHistory bool `json:"enable_history"` - Term int `json:"term"` + Number int `json:"number"` + MaxCalls int `json:"max_calls"` + EnableHistory bool `json:"enable_history"` + Term int `json:"term"` + ChatRoles []string `json:"chat_roles"` } err := json.NewDecoder(c.Request.Body).Decode(&data) if err != nil || data.MaxCalls <= 0 { @@ -135,6 +155,21 @@ func (s *Server) BatchAddUserHandle(c *gin.Context) { return } + var chatRoles = make(map[string]int) + if len(data.ChatRoles) > 0 { + if data.ChatRoles[0] == "all" { // 所有的角色 + roles := GetChatRoles() + for key := range roles { + chatRoles[key] = 1 + } + } else { + for _, key := range data.ChatRoles { + chatRoles[key] = 1 + } + } + + } + var users = make([]types.User, 0) for i := 0; i < data.Number; i++ { name := utils.RandString(12) @@ -148,6 +183,7 @@ func (s *Server) BatchAddUserHandle(c *gin.Context) { RemainingCalls: data.MaxCalls, EnableHistory: data.EnableHistory, Term: data.Term, + ChatRoles: chatRoles, Status: true} err = PutUser(user) if err == nil { @@ -204,6 +240,24 @@ func (s *Server) SetUserHandle(c *gin.Context) { if v, ok := data["api_key"]; ok { user.ApiKey = v.(string) } + if v, ok := data["chat_roles"]; ok { + if roles, ok := v.([]interface{}); ok { + chatRoles := make(map[string]int) + if roles[0] == "all" { + roles := GetChatRoles() + for key := range roles { + chatRoles[key] = 1 + } + } else { + for _, key := range roles { + key := strings.TrimSpace(fmt.Sprintf("%v", key)) + chatRoles[key] = 1 + } + } + user.ChatRoles = chatRoles + } + + } err = PutUser(*user) if err != nil { @@ -299,12 +353,24 @@ func (s *Server) ListApiKeysHandle(c *gin.Context) { // GetChatRoleListHandle 获取聊天角色列表 func (s *Server) GetChatRoleListHandle(c *gin.Context) { + sessionId := c.GetHeader(types.TokenName) + session := s.ChatSession[sessionId] + user, err := GetUser(session.Username) + if err != nil { + c.JSON(http.StatusOK, types.BizVo{Code: types.Failed, Message: "Hacker Access!!!"}) + return + } var rolesOrder = []string{"gpt", "teacher", "translator", "english_trainer", "weekly_report", "girl_friend", "kong_zi", "lu_xun", "steve_jobs", "elon_musk", "red_book", "dou_yin", "programmer", "seller", "good_comment", "psychiatrist", "artist"} var res = make([]interface{}, 0) var roles = GetChatRoles() for _, k := range rolesOrder { + // 确认当前用户是否订阅了当前角色 + if v, ok := user.ChatRoles[k]; !ok || v != 1 { + continue + } + if v, ok := roles[k]; ok && v.Enable { res = append(res, struct { Key string `json:"key"` diff --git a/types/config.go b/types/config.go index ff3a32fe..3012340f 100644 --- a/types/config.go +++ b/types/config.go @@ -14,15 +14,16 @@ type Config struct { } type User struct { - Name string `json:"name"` - MaxCalls int `json:"max_calls"` // 最多调用次数，如果为 0 则表示不限制 - RemainingCalls int `json:"remaining_calls"` // 剩余调用次数 - EnableHistory bool `json:"enable_history"` // 是否启用聊天记录 - Status bool `json:"status"` // 当前状态 - Term int `json:"term" default:"30"` // 会员有效期，单位：天 - ActiveTime int64 `json:"active_time"` // 激活时间 - ExpiredTime int64 `json:"expired_time"` // 到期时间 - ApiKey string `json:"api_key"` // OpenAI API KEY + Name string `json:"name"` + MaxCalls int `json:"max_calls"` // 最多调用次数，如果为 0 则表示不限制 + RemainingCalls int `json:"remaining_calls"` // 剩余调用次数 + EnableHistory bool `json:"enable_history"` // 是否启用聊天记录 + Status bool `json:"status"` // 当前状态 + Term int `json:"term" default:"30"` // 会员有效期，单位：天 + ActiveTime int64 `json:"active_time"` // 激活时间 + ExpiredTime int64 `json:"expired_time"` // 到期时间 + ApiKey string `json:"api_key"` // OpenAI API KEY + ChatRoles map[string]int `json:"chat_roles"` // 当前用户已订阅的聊天角色 map[role_key] => 0/1 } // Chat configs struct diff --git a/web/src/components/ChatReply.vue b/web/src/components/ChatReply.vue index 036a8fa0..3dd41586 100644 --- a/web/src/components/ChatReply.vue +++ b/web/src/components/ChatReply.vue @@ -6,7 +6,24 @@
-
+
+
+
+ + + + + + + +
+
+
@@ -14,9 +31,11 @@ @@ -510,8 +541,26 @@ export default defineComponent({ overflow hidden } + .btn { + //display none + + position absolute + right 0; + top 2px; + + .el-icon { + margin-left 5px; + color #9f9f9f + } + + .el-icon:hover { + color #ffffff + } + + } } + } li.active { @@ -521,11 +570,17 @@ export default defineComponent({ li.new-chat { border: 1px solid #4A4B4D; - .btn { - display none - position absolute - right -2px; - top -2px; + a { + .btn { + display none + right -2px; + top -2px; + + .el-icon { + margin-left 0; + color #ffffff + } + } } } @@ -678,6 +733,10 @@ export default defineComponent({ } } +.row-center { + justify-content center +} + /* 移动端适配 */ @media (max-width: 768px) { .chat-free-page { diff --git a/web/src/views/ChatPlus.vue b/web/src/views/ChatPlus.vue index fdbc39ca..ba9cdb91 100644 --- a/web/src/views/ChatPlus.vue +++ b/web/src/views/ChatPlus.vue @@ -439,8 +439,8 @@ export default defineComponent({ hl.highlightElement(block) }) }) - }).catch(() => { - // console.error(e.message) + }).catch((e) => { + console.error(e.message) }) },