merge v4.2.0

api/core/app_server.go

@@ -60,8 +60,6 @@ func (s *AppServer) Init(debug bool, client *redis.Client) {
 	s.Engine.Use(errorHandler)
 	// 添加静态资源访问
 	s.Engine.Static("/static", s.Config.StaticDir)
-	//启动服务
-
 }
 
 func (s *AppServer) Run(db *gorm.DB) error {

api/core/types/chat.go

@@ -95,6 +95,7 @@ const (
 	PowerInvite   = PowerType(4) // 邀请奖励
 	PowerRedeem   = PowerType(5) // 众筹
 	PowerGift     = PowerType(6) // 系统赠送
+	PowerSignIn   = PowerType(7) // 每日签到
 )
 
 func (t PowerType) String() string {
@@ -111,6 +112,8 @@ func (t PowerType) String() string {
 		return "赠送"
 	case PowerInvite:
 		return "邀请"
+	case PowerSignIn:
+		return "签到"
 	}
 	return "其他"
 }

api/handler/chat_handler.go

@@ -97,17 +97,19 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session *types.ChatSessio
 	}
 
 	var req = types.ApiRequest{
-		Model: session.Model.Value,
+		Model:       session.Model.Value,
+		Stream:      session.Stream,
+		Temperature: session.Model.Temperature,
 	}
-	// 兼容 GPT-O1 模型
-	if strings.HasPrefix(session.Model.Value, "o1-") {
+	// 兼容 OpenAI 模型
+	if strings.HasPrefix(session.Model.Value, "o1-") ||
+		strings.HasPrefix(session.Model.Value, "o3-") ||
+		strings.HasPrefix(session.Model.Value, "gpt") {
 		utils.SendChunkMsg(ws, "> AI 正在思考...\n")
-		req.Stream = session.Stream
+		req.MaxCompletionTokens = session.Model.MaxTokens
 		session.Start = time.Now().Unix()
 	} else {
 		req.MaxTokens = session.Model.MaxTokens
-		req.Temperature = session.Model.Temperature
-		req.Stream = session.Stream
 	}
 
 	if len(session.Tools) > 0 && !strings.HasPrefix(session.Model.Value, "o1-") {
@@ -275,17 +277,17 @@ func (h *ChatHandler) Tokens(c *gin.Context) {
 	}
 
 	// 如果没有传入 text 字段，则说明是获取当前 reply 总的 token 消耗（带上下文）
-	//if data.Text == "" && data.ChatId != "" {
-	//	var item model.ChatMessage
-	//	userId, _ := c.Get(types.LoginUserID)
-	//	res := h.DB.Where("user_id = ?", userId).Where("chat_id = ?", data.ChatId).Last(&item)
-	//	if res.Error != nil {
-	//		resp.ERROR(c, res.Error.Error())
-	//		return
-	//	}
-	//	resp.SUCCESS(c, item.Tokens)
-	//	return
-	//}
+	if data.Text == "" && data.ChatId != "" {
+		var item model.ChatMessage
+		userId, _ := c.Get(types.LoginUserID)
+		res := h.DB.Where("user_id = ?", userId).Where("chat_id = ?", data.ChatId).Last(&item)
+		if res.Error != nil {
+			resp.ERROR(c, res.Error.Error())
+			return
+		}
+		resp.SUCCESS(c, item.Tokens)
+		return
+	}
 
 	tokens, err := utils.CalcTokens(data.Text, data.Model)
 	if err != nil {

api/handler/user_handler.go

@@ -12,14 +12,16 @@ import (
 	"geekai/core"
 	"geekai/core/types"
 	"geekai/service"
+	"geekai/store"
 	"geekai/store/model"
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
-	"github.com/imroc/req/v3"
 	"strings"
 	"time"
 
+	"github.com/imroc/req/v3"
+
 	"github.com/go-redis/redis/v8"
 	"github.com/golang-jwt/jwt/v5"
 
@@ -32,6 +34,7 @@ type UserHandler struct {
 	BaseHandler
 	searcher       *xdb.Searcher
 	redis          *redis.Client
+	levelDB        *store.LevelDB
 	licenseService *service.LicenseService
 	captcha        *service.CaptchaService
 	userService    *service.UserService
@@ -42,6 +45,7 @@ func NewUserHandler(
 	db *gorm.DB,
 	searcher *xdb.Searcher,
 	client *redis.Client,
+	levelDB *store.LevelDB,
 	captcha *service.CaptchaService,
 	userService *service.UserService,
 	licenseService *service.LicenseService) *UserHandler {
@@ -49,6 +53,7 @@ func NewUserHandler(
 		BaseHandler:    BaseHandler{DB: db, App: app},
 		searcher:       searcher,
 		redis:          client,
+		levelDB:        levelDB,
 		captcha:        captcha,
 		licenseService: licenseService,
 		userService:    userService,
@@ -184,7 +189,7 @@ func (h *UserHandler) Register(c *gin.Context) {
 		if h.App.SysConfig.InvitePower > 0 {
 			err := h.userService.IncreasePower(int(inviteCode.UserId), h.App.SysConfig.InvitePower, model.PowerLog{
 				Type:   types.PowerInvite,
-				Model: "Invite",
+				Model:  "Invite",
 				Remark: fmt.Sprintf("邀请用户注册奖励，金额：%d，邀请码：%s，新用户：%s", h.App.SysConfig.InvitePower, inviteCode.Code, user.Username),
 			})
 			if err != nil {
@@ -712,3 +717,30 @@ func (h *UserHandler) BindEmail(c *gin.Context) {
 	_ = h.redis.Del(c, key) // 删除短信验证码
 	resp.SUCCESS(c)
 }
+
+// SignIn 每日签到
+func (h *UserHandler) SignIn(c *gin.Context) {
+	// 获取当前日期
+	date := time.Now().Format("2006-01-02")
+
+	// 检查是否已经签到
+	userId := h.GetLoginUserId(c)
+	key := fmt.Sprintf("signin/%d/%s", userId, date)
+	var signIn bool
+	err := h.levelDB.Get(key, &signIn)
+	if err == nil && signIn {
+		resp.ERROR(c, "今日已签到，请明日再来！")
+		return
+	}
+
+	// 签到
+	h.levelDB.Put(key, true)
+	if h.App.SysConfig.DailyPower > 0 {
+		h.userService.IncreasePower(int(userId), h.App.SysConfig.DailyPower, model.PowerLog{
+			Type:   types.PowerSignIn,
+			Model:  "SignIn",
+			Remark: fmt.Sprintf("每日签到奖励，金额：%d", h.App.SysConfig.DailyPower),
+		})
+	}
+	resp.SUCCESS(c)
+}

api/main.go

@@ -244,6 +244,7 @@ func main() {
 			group.POST("resetPass", h.ResetPass)
 			group.GET("clogin", h.CLogin)
 			group.GET("clogin/callback", h.CLoginCallback)
+			group.GET("signin", h.SignIn)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *handler.ChatHandler) {
 			group := s.Engine.Group("/api/chat/")