diff --git a/CHANGELOG.md b/CHANGELOG.md index fffe36ea..cf3082f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## v4.0.9 * Bug修复:修复前端页面菜单把页面撑开,底部留白问题 * 功能优化:聊天页面自动根据内容调整输入框的高度 +* Bug修复:修复Dalle绘图失败退回算力的问题 +* 功能优化:邀请码注册时被邀请人也可以获得赠送的算力 +* 功能优化:允许设置邮件验证码的抬头 +* Bug修复:修复免费模型不会记录聊天记录的bug +* Bug修复:修复聊天输入公式显示异常的Bug ## v4.0.8 * 功能优化:升级 mathjax 公式解析插件,修复公式因为图片访问限制而无法显示的问题 * 功能优化:当数据库更新失败的时候记录错误日志 diff --git a/api/handler/chatimpl/chat_handler.go b/api/handler/chatimpl/chat_handler.go index 9c78f30d..bd6ab8d3 100644 --- a/api/handler/chatimpl/chat_handler.go +++ b/api/handler/chatimpl/chat_handler.go @@ -651,26 +651,25 @@ func (h *ChatHandler) saveChatHistory( logger.Error("failed to save reply history message: ", res.Error) } + // 更新用户算力 if session.Model.Power > 0 { - // 更新用户算力 h.subUserPower(userVo, session, promptToken, replyTokens) - - // 保存当前会话 - var chatItem model.ChatItem - res = h.DB.Where("chat_id = ?", session.ChatId).First(&chatItem) - if res.Error != nil { - chatItem.ChatId = session.ChatId - chatItem.UserId = session.UserId - chatItem.RoleId = role.Id - chatItem.ModelId = session.Model.Id - if utf8.RuneCountInString(prompt) > 30 { - chatItem.Title = string([]rune(prompt)[:30]) + "..." - } else { - chatItem.Title = prompt - } - chatItem.Model = req.Model - h.DB.Create(&chatItem) + } + // 保存当前会话 + var chatItem model.ChatItem + res = h.DB.Where("chat_id = ?", session.ChatId).First(&chatItem) + if res.Error != nil { + chatItem.ChatId = session.ChatId + chatItem.UserId = session.UserId + chatItem.RoleId = role.Id + chatItem.ModelId = session.Model.Id + if utf8.RuneCountInString(prompt) > 30 { + chatItem.Title = string([]rune(prompt)[:30]) + "..." + } else { + chatItem.Title = prompt } + chatItem.Model = req.Model + h.DB.Create(&chatItem) } } diff --git a/api/handler/chatimpl/openai_handler.go b/api/handler/chatimpl/openai_handler.go index fb953b79..86089410 100644 --- a/api/handler/chatimpl/openai_handler.go +++ b/api/handler/chatimpl/openai_handler.go @@ -142,7 +142,7 @@ func (h *ChatHandler) sendOpenAiMessage( } if toolCall { // 调用函数完成任务 - var params map[string]interface{} + params := make(map[string]interface{}) _ = utils.JsonDecode(strings.Join(arguments, ""), ¶ms) logger.Debugf("函数名称: %s, 函数参数:%s", function.Name, params) params["user_id"] = userVo.Id diff --git a/api/handler/user_handler.go b/api/handler/user_handler.go index 2718d15e..84e9da48 100644 --- a/api/handler/user_handler.go +++ b/api/handler/user_handler.go @@ -109,7 +109,6 @@ func (h *UserHandler) Register(c *gin.Context) { user := model.User{ Username: data.Username, Password: utils.GenPassword(data.Password, salt), - Nickname: fmt.Sprintf("极客学长@%d", utils.RandomNumber(6)), Avatar: "/images/avatar/user.png", Salt: salt, Status: true, @@ -118,6 +117,16 @@ func (h *UserHandler) Register(c *gin.Context) { Power: h.App.SysConfig.InitPower, } + // 被邀请人也获得赠送算力 + if data.InviteCode != "" { + user.Power += h.App.SysConfig.InvitePower + } + if h.licenseService.GetLicense().Configs.DeCopy { + user.Username = fmt.Sprintf("用户@%d", utils.RandomNumber(6)) + } else { + user.Nickname = fmt.Sprintf("极客学长@%d", utils.RandomNumber(6)) + } + res = h.DB.Create(&user) if res.Error != nil { resp.ERROR(c, "保存数据失败") diff --git a/api/service/smtp_sms_service.go b/api/service/smtp_sms_service.go index e93e9265..025ffa39 100644 --- a/api/service/smtp_sms_service.go +++ b/api/service/smtp_sms_service.go @@ -28,8 +28,8 @@ func NewSmtpService(appConfig *types.AppConfig) *SmtpService { } func (s *SmtpService) SendVerifyCode(to string, code int) error { - subject := "Geek-AI 注册验证码" - body := fmt.Sprintf("您正在注册 Geek-AI 助手账户,注册验证码为 %d,请不要告诉他人。如非本人操作,请忽略此邮件。", code) + subject := fmt.Sprintf("%s 注册验证码", s.config.AppName) + body := fmt.Sprintf("您正在注册 %s 账户,注册验证码为 %d,请不要告诉他人。如非本人操作,请忽略此邮件。", s.config.AppName, code) auth := smtp.PlainAuth("", s.config.From, s.config.Password, s.config.Host) if s.config.UseTls { diff --git a/web/src/components/LoginDialog.vue b/web/src/components/LoginDialog.vue index 426561dd..60bb42d0 100644 --- a/web/src/components/LoginDialog.vue +++ b/web/src/components/LoginDialog.vue @@ -221,7 +221,7 @@ diff --git a/web/src/views/Invitation.vue b/web/src/views/Invitation.vue index 13542e40..fc695cc6 100644 --- a/web/src/views/Invitation.vue +++ b/web/src/views/Invitation.vue @@ -5,9 +5,8 @@