feat: support wechat login function

api/handler/admin/captcha_handler.go

@@ -1,46 +0,0 @@
-package admin
-
-// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// * Copyright 2023 The Geek-AI Authors. All rights reserved.
-// * Use of this source code is governed by a Apache-2.0 license
-// * that can be found in the LICENSE file.
-// * @Author yangjian102621@163.com
-// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-import (
-	"geekai/core"
-	"geekai/handler"
-	"geekai/utils/resp"
-	"github.com/gin-gonic/gin"
-	"github.com/mojocn/base64Captcha"
-)
-
-type CaptchaHandler struct {
-	handler.BaseHandler
-}
-
-func NewCaptchaHandler(app *core.AppServer) *CaptchaHandler {
-	return &CaptchaHandler{BaseHandler: handler.BaseHandler{App: app}}
-}
-
-type CaptchaVo struct {
-	CaptchaId string `json:"captcha_id"`
-	PicPath   string `json:"pic_path"`
-}
-
-// GetCaptcha 获取验证码
-func (h *CaptchaHandler) GetCaptcha(c *gin.Context) {
-	var captchaVo CaptchaVo
-	driver := base64Captcha.NewDriverDigit(48, 130, 4, 0.4, 10)
-	cp := base64Captcha.NewCaptcha(driver, base64Captcha.DefaultMemStore)
-	// b64s是图片的base64编码
-	id, b64s, err := cp.Generate()
-	if err != nil {
-		resp.ERROR(c, "生成验证码错误!")
-		return
-	}
-	captchaVo.CaptchaId = id
-	captchaVo.PicPath = b64s
-
-	resp.SUCCESS(c, captchaVo)
-}

api/handler/admin/chat_model_handler.go

@@ -54,7 +54,6 @@ func (h *ChatModelHandler) Save(c *gin.Context) {
 		Name:        data.Name,
 		Value:       data.Value,
 		Enabled:     data.Enabled,
-		SortNum:     data.SortNum,
 		Open:        data.Open,
 		MaxTokens:   data.MaxTokens,
 		MaxContext:  data.MaxContext,
@@ -64,6 +63,7 @@ func (h *ChatModelHandler) Save(c *gin.Context) {
 	var res *gorm.DB
 	if data.Id > 0 {
 		item.Id = data.Id
+		item.SortNum = data.SortNum
 		res = h.DB.Select("*").Omit("created_at").Updates(&item)
 	} else {
 		res = h.DB.Create(&item)

api/handler/admin/user_handler.go

@@ -139,7 +139,6 @@ func (h *UserHandler) Save(c *gin.Context) {
 		salt := utils.RandString(8)
 		u := model.User{
 			Username:    data.Username,
-			Nickname:    fmt.Sprintf("极客学长@%d", utils.RandomNumber(6)),
 			Password:    utils.GenPassword(data.Password, salt),
 			Avatar:      "/images/avatar/user.png",
 			Salt:        salt,
@@ -149,6 +148,11 @@ func (h *UserHandler) Save(c *gin.Context) {
 			ChatModels:  utils.JsonEncode(data.ChatModels),
 			ExpiredTime: utils.Str2stamp(data.ExpiredTime),
 		}
+		if h.licenseService.GetLicense().Configs.DeCopy {
+			u.Nickname = fmt.Sprintf("用户@%d", utils.RandomNumber(6))
+		} else {
+			u.Nickname = fmt.Sprintf("极客学长@%d", utils.RandomNumber(6))
+		}
 		res = h.DB.Create(&u)
 		_ = utils.CopyObject(u, &userVo)
 		userVo.Id = u.Id

api/handler/chat_role_handler.go

@@ -65,7 +65,7 @@ func (h *ChatRoleHandler) List(c *gin.Context) {
 	}
 
 	for _, r := range roles {
-		if !utils.ContainsStr(roleKeys, r.Key) {
+		if !utils.Contains(roleKeys, r.Key) {
 			continue
 		}
 		var v vo.ChatRole

api/handler/chatimpl/openai_handler.go

@@ -74,6 +74,9 @@ func (h *ChatHandler) sendOpenAiMessage(
 			if len(responseBody.Choices) == 0 { // Fixed: 兼容 Azure API 第一个输出空行
 				continue
 			}
+			if responseBody.Choices[0].Delta.Content == nil {
+				continue
+			}
 
 			if responseBody.Choices[0].FinishReason == "stop" && len(contents) == 0 {
 				utils.ReplyMessage(ws, "抱歉😔😔😔，AI助手由于未知原因已经停止输出内容。")

api/handler/sms_handler.go

@@ -64,13 +64,13 @@ func (h *SmsHandler) SendCode(c *gin.Context) {
 	code := utils.RandomNumber(6)
 	var err error
 	if strings.Contains(data.Receiver, "@") { // email
-		if !utils.ContainsStr(h.App.SysConfig.RegisterWays, "email") {
+		if !utils.Contains(h.App.SysConfig.RegisterWays, "email") {
 			resp.ERROR(c, "系统已禁用邮箱注册！")
 			return
 		}
 		err = h.smtp.SendVerifyCode(data.Receiver, code)
 	} else {
-		if !utils.ContainsStr(h.App.SysConfig.RegisterWays, "mobile") {
+		if !utils.Contains(h.App.SysConfig.RegisterWays, "mobile") {
 			resp.ERROR(c, "系统已禁用手机号注册！")
 			return
 		}

api/handler/user_handler.go

@@ -16,6 +16,7 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
+	"github.com/imroc/req/v3"
 	"strings"
 	"time"
 
@@ -97,7 +98,7 @@ func (h *UserHandler) Register(c *gin.Context) {
 		}
 	}
 
-	// check if the username is exists
+	// check if the username is existing
 	var item model.User
 	res := h.DB.Where("username = ?", data.Username).First(&item)
 	if item.Id > 0 {
@@ -255,6 +256,40 @@ func (h *UserHandler) Logout(c *gin.Context) {
 	resp.SUCCESS(c)
 }
 
+// CLoginRequest 第三方登录请求二维码
+func (h *UserHandler) CLoginRequest(c *gin.Context) {
+	returnURL := h.GetTrim(c, "return_url")
+	var res types.BizVo
+	apiURL := fmt.Sprintf("%s/api/clogin/request", h.App.Config.ApiConfig.ApiURL)
+	r, err := req.C().R().SetBody(gin.H{"login_type": "wx", "return_url": returnURL}).
+		SetHeader("AppId", h.App.Config.ApiConfig.AppId).
+		SetHeader("Authorization", fmt.Sprintf("Bearer %s", h.App.Config.ApiConfig.Token)).
+		SetSuccessResult(&res).
+		Post(apiURL)
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+	if r.IsErrorState() {
+		resp.ERROR(c, "error with login http status: "+r.Status)
+		return
+	}
+
+	if res.Code != types.Success {
+		resp.ERROR(c, "error with http response: "+res.Message)
+		return
+	}
+
+	resp.SUCCESS(c, res.Data)
+}
+
+// CLoginCallback 第三方登录回调
+func (h *UserHandler) CLoginCallback(c *gin.Context) {
+	//platform := h.GetTrim(c, "type")
+	//code := h.GetTrim(c, "code")
+
+}
+
 // Session 获取/验证会话
 func (h *UserHandler) Session(c *gin.Context) {
 	user, err := h.GetLoginUser(c)