merge v4.2.3

api/service/dalle/service.go

@@ -132,7 +132,11 @@ func (s *Service) Image(task types.DallTask, sync bool) (string, error) {
 	}
 
 	var chatModel model.ChatModel
-	s.db.Where("id = ?", task.ModelId).First(&chatModel)
+	if task.ModelId > 0 {
+		s.db.Where("id", task.ModelId).First(&chatModel)
+	} else {
+		s.db.Where("value", task.ModelName).First(&chatModel)
+	}
 
 	// get image generation API KEY
 	var apiKey model.ApiKey
@@ -242,7 +246,7 @@ func (s *Service) CheckTaskStatus() {
 				if err != nil {
 					continue
 				}
-				err = s.userService.IncreasePower(int(job.UserId), job.Power, model.PowerLog{
+				err = s.userService.IncreasePower(job.UserId, job.Power, model.PowerLog{
 					Type:   types.PowerRefund,
 					Model:  task.ModelName,
 					Remark: fmt.Sprintf("任务失败，退回算力。任务ID：%d，Err: %s", job.Id, job.ErrMsg),

api/service/license_service.go

@@ -91,7 +91,7 @@ func (s *LicenseService) SyncLicense() {
 			if err != nil {
 				retryCounter++
 				if retryCounter < 5 {
-					logger.Warn(err)
+					logger.Debug(err)
 				}
 				s.license.IsActive = false
 			} else {

api/service/user_service.go

@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"geekai/core/types"
 	"geekai/store/model"
-	"gorm.io/gorm"
 	"sync"
 	"time"
+
+	"gorm.io/gorm"
 )
 
 type UserService struct {
@@ -19,7 +20,7 @@ func NewUserService(db *gorm.DB) *UserService {
 }
 
 // IncreasePower 增加用户算力
-func (s *UserService) IncreasePower(userId int, power int, log model.PowerLog) error {
+func (s *UserService) IncreasePower(userId uint, power int, log model.PowerLog) error {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
@@ -51,7 +52,7 @@ func (s *UserService) IncreasePower(userId int, power int, log model.PowerLog) e
 }
 
 // DecreasePower 减少用户算力
-func (s *UserService) DecreasePower(userId int, power int, log model.PowerLog) error {
+func (s *UserService) DecreasePower(userId uint, power int, log model.PowerLog) error {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 

api/service/xxl_job_service.go

@@ -9,14 +9,11 @@ package service
 
 import (
 	"context"
-	"fmt"
 	"geekai/core/types"
 	logger2 "geekai/logger"
-	"geekai/store/model"
-	"geekai/utils"
+
 	"github.com/xxl-job/xxl-job-executor-go"
 	"gorm.io/gorm"
-	"time"
 )
 
 var logger = logger2.GetLogger()
@@ -46,97 +43,13 @@ func NewXXLJobExecutor(config *types.AppConfig, db *gorm.DB) *XXLJobExecutor {
 
 func (e *XXLJobExecutor) Run() error {
 	e.executor.RegTask("ClearOrders", e.ClearOrders)
-	e.executor.RegTask("ResetVipPower", e.ResetVipPower)
-	e.executor.RegTask("ResetUserPower", e.ResetUserPower)
 	return e.executor.Run()
 }
 
 // ClearOrders 清理未支付的订单，如果没有抛出异常则表示执行成功
 func (e *XXLJobExecutor) ClearOrders(cxt context.Context, param *xxl.RunReq) (msg string) {
 	logger.Info("执行清理未支付订单...")
-	var sysConfig model.Config
-	res := e.db.Where("marker", "system").First(&sysConfig)
-	if res.Error != nil {
-		return "error with get system config: " + res.Error.Error()
-	}
-
-	var config types.SystemConfig
-	err := utils.JsonDecode(sysConfig.Config, &config)
-	if err != nil {
-		return "error with decode system config: " + err.Error()
-	}
-
-	if config.OrderPayTimeout == 0 { // 默认未支付订单的生命周期为 30 分钟
-		config.OrderPayTimeout = 1800
-	}
-	timeout := time.Now().Unix() - int64(config.OrderPayTimeout)
-	start := utils.Stamp2str(timeout)
-	// 这里不是用软删除，而是永久删除订单
-	res = e.db.Unscoped().Where("status IN ? AND created_at < ?", []types.OrderStatus{types.OrderNotPaid, types.OrderScanned}, start).Delete(&model.Order{})
-	logger.Infof("Clear order successfully, affect rows: %d", res.RowsAffected)
-	return "success"
-}
-
-// ResetVipPower 重置VIP会员算力
-// 自动将 VIP 会员的算力补充到每月赠送的最大值
-func (e *XXLJobExecutor) ResetVipPower(cxt context.Context, param *xxl.RunReq) (msg string) {
-	logger.Info("开始进行月底账号盘点...")
-	return "success"
-}
-
-func (e *XXLJobExecutor) ResetUserPower(cxt context.Context, param *xxl.RunReq) (msg string) {
-	logger.Info("今日算力派发开始：", time.Now())
-	var users []model.User
-	res := e.db.Where("status", 1).Find(&users)
-	if res.Error != nil {
-		return "No matching users"
-	}
-
-	var sysConfig model.Config
-	res = e.db.Where("marker", "system").First(&sysConfig)
-	if res.Error != nil {
-		return "error with get system config: " + res.Error.Error()
-	}
-
-	var config types.SystemConfig
-	err := utils.JsonDecode(sysConfig.Config, &config)
-	if err != nil {
-		return "error with decode system config: " + err.Error()
-	}
-
-	if config.DailyPower <= 0 {
-		return "success"
-	}
-
-	var counter = 0
-	var totalPower = 0
-	for _, u := range users {
-		if u.Power >= config.DailyPower {
-			continue
-		}
-		var power = config.DailyPower - u.Power
-		// update user
-		tx := e.db.Model(&model.User{}).Where("id", u.Id).UpdateColumn("power", gorm.Expr("power + ?", power))
-		// 记录算力充值日志
-		if tx.Error == nil {
-			var user model.User
-			e.db.Where("id", u.Id).First(&user)
-			e.db.Create(&model.PowerLog{
-				UserId:    u.Id,
-				Username:  u.Username,
-				Type:      types.PowerGift,
-				Amount:    power,
-				Mark:      types.PowerAdd,
-				Balance:   user.Power,
-				Model:     "系统赠送",
-				Remark:    fmt.Sprintf("系统每日算力派发，今日额度：%d", config.DailyPower),
-				CreatedAt: time.Now(),
-			})
-		}
-		counter++
-		totalPower += power
-	}
-	logger.Infof("今日派发算力结束！累计派发 %d 人，累计派发算力：%d", counter, totalPower)
+	
 	return "success"
 }