xinyin025/new-api
1
0
Fork 0
mirror of https://github.com/linux-do/new-api.git synced 2025-09-27 04:16:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge b76dde7f3a into 9adefa80b9

Browse Source
This commit is contained in:
liuweiqing 2024-03-15 21:48:54 +08:00 committed by GitHub
commit 485ea6e15d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/constants.go
View File

@ -50,7 +50,7 @@ var PasswordLoginEnabled = true
var PasswordRegisterEnabled = true var PasswordRegisterEnabled = true
var EmailVerificationEnabled = false var EmailVerificationEnabled = false
var GitHubOAuthEnabled = false var GitHubOAuthEnabled = false
var LinuxDoOAuthEnabled = false var LinuxDoOAuthEnabled = true
var WeChatAuthEnabled = false var WeChatAuthEnabled = false
var TelegramOAuthEnabled = false var TelegramOAuthEnabled = false
var TurnstileCheckEnabled = false var TurnstileCheckEnabled = false
@ -83,8 +83,8 @@ var SMTPToken = ""
var GitHubClientId = "" var GitHubClientId = ""
var GitHubClientSecret = "" var GitHubClientSecret = ""
var LinuxDoClientId = "" var LinuxDoClientId = "cpgOEy7OYi0hKMx23zcioFe2VQUlgIF2"
var LinuxDoClientSecret = "" var LinuxDoClientSecret = "PKXwhPs9tPLRGbgItKacUizzZdwSQfBW"
var WeChatServerAddress = "" var WeChatServerAddress = ""
var WeChatServerToken = "" var WeChatServerToken = ""
@ -96,9 +96,12 @@ var TurnstileSecretKey = ""
var TelegramBotToken = "" var TelegramBotToken = ""
var TelegramBotName = "" var TelegramBotName = ""
var QuotaForNewUser = 0 var QuotaForNewUser = 500000 //1$
var QuotaForInviter = 0 var QuotaForInviter = 0
var QuotaForInvitee = 0 var QuotaForInvitee = 0
var QuotaForLinuxDoLevel1 = 10 //10$
var QuotaForLinuxDoLevel2 = 200 //200$
var QuotaForLinuxDoLevel3 = 1000 //1000$
var ChannelDisableThreshold = 5.0 var ChannelDisableThreshold = 5.0
var AutomaticDisableChannelEnabled = false var AutomaticDisableChannelEnabled = false
var AutomaticEnableChannelEnabled = false var AutomaticEnableChannelEnabled = false

18
controller/linuxdo.go
View File

@ -119,6 +119,7 @@ func LinuxDoOAuth(c *gin.Context) {
LinuxDoId: strconv.Itoa(linuxdoUser.ID), LinuxDoId: strconv.Itoa(linuxdoUser.ID),
} }
if model.IsLinuxDoIdAlreadyTaken(user.LinuxDoId) { if model.IsLinuxDoIdAlreadyTaken(user.LinuxDoId) {
//如果已经登录了，就查找用户信息填充到user中
err := user.FillUserByLinuxDoId() err := user.FillUserByLinuxDoId()
if err != nil { if err != nil {
c.JSON(http.StatusOK, gin.H{ c.JSON(http.StatusOK, gin.H{
@ -147,6 +148,23 @@ func LinuxDoOAuth(c *gin.Context) {
"message": err.Error(), "message": err.Error(),
}) })
return return
} else {
// 添加调试信息：记录用户等级和相应的配额
common.SysLog(fmt.Sprintf("Setting quota for user with trust level %d: %s", linuxdoUser.TrustLevel, user.Username))
switch linuxdoUser.TrustLevel {
case 1:
model.IncreaseUserQuota(user.Id, common.QuotaForLinuxDoLevel1*500000)
common.SysLog(fmt.Sprintf("User '%s' assigned quota: %d (Level 1)", user.Username, common.QuotaForLinuxDoLevel1))
case 2:
model.IncreaseUserQuota(user.Id, common.QuotaForLinuxDoLevel2*500000)
common.SysLog(fmt.Sprintf("User '%s' assigned quota: %d (Level 2)", user.Username, common.QuotaForLinuxDoLevel2))
case 3:
model.IncreaseUserQuota(user.Id, common.QuotaForLinuxDoLevel3*500000)
common.SysLog(fmt.Sprintf("User '%s' assigned quota: %d (Level 3)", user.Username, common.QuotaForLinuxDoLevel3))
default:
common.SysLog(fmt.Sprintf("WARNING: User '%s' has an unknown trust level: %d", user.Username, linuxdoUser.TrustLevel))
}
} }
} else { } else {
c.JSON(http.StatusOK, gin.H{ c.JSON(http.StatusOK, gin.H{

1
model/user.go
View File

@ -174,6 +174,7 @@ func (user *User) Insert(inviterId int) error {
} }
} }
user.Quota = common.QuotaForNewUser user.Quota = common.QuotaForNewUser
common.SysLog(fmt.Sprintf("普通用户注册中，应该在linuxdo之前 '%s'，额度：'%d'", user.Username, user.Quota))
user.AccessToken = common.GetUUID() user.AccessToken = common.GetUUID()
user.AffCode = common.GetRandomString(4) user.AffCode = common.GetRandomString(4)
result := DB.Create(user) result := DB.Create(user)