admin/MonkeyCode
1
0
Fork 0
mirror of https://github.com/chaitin/MonkeyCode.git synced 2026-02-04 15:53:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #334 from yokowu/feat-unlimit-user

Browse Source 
feat: 取消用户限制配置参数
This commit is contained in:
Yoko
2025-09-02 10:10:07 +08:00
committed by GitHub
parent 21d77b3feb 6f92119b90
commit b09dee515f
2 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/config/config.go
View File

@@ -30,7 +30,6 @@ type Config struct {
Admin struct {
User string `mapstructure:"user"`
Password string `mapstructure:"password"`
Limit int `mapstructure:"limit"`
} `mapstructure:"admin"`
Session struct {
@@ -128,7 +127,6 @@ func Init() (*Config, error) {
v.SetDefault("server.port", "")
v.SetDefault("admin.user", "admin")
v.SetDefault("admin.password", "")
v.SetDefault("admin.limit", 100)
v.SetDefault("session.expire_day", 30)
v.SetDefault("database.master", "")
v.SetDefault("database.slave", "")

21
backend/internal/user/repo/user.go
View File

@@ -139,9 +139,6 @@ func (r *UserRepo) innerValidateInviteCode(ctx context.Context, tx *db.Tx, code
func (r *UserRepo) CreateUser(ctx context.Context, us *db.User) (*db.User, error) {
var res *db.User
err := entx.WithTx(ctx, r.db, func(tx *db.Tx) error {
if err := r.checkLimit(ctx, tx); err != nil {
return err
}
n, err := tx.User.Query().Where(user.Email(us.Email)).Count(ctx)
if err != nil {
return err
@@ -371,10 +368,6 @@ func (r *UserRepo) DeleteAdmin(ctx context.Context, id string) error {
func (r *UserRepo) OAuthRegister(ctx context.Context, platform consts.UserPlatform, inviteCode string, req *domain.OAuthUserInfo) (*db.User, error) {
var u *db.User
err := entx.WithTx(ctx, r.db, func(tx *db.Tx) error {
if err := r.checkLimit(ctx, tx); err != nil {
return err
}
if _, err := r.innerValidateInviteCode(ctx, tx, inviteCode); err != nil {
return errcode.ErrInviteCodeInvalid.Wrap(err)
}
@@ -447,17 +440,6 @@ func (r *UserRepo) updateAvatar(ctx context.Context, tx *db.Tx, ui *db.UserIdent
return tx.User.UpdateOneID(ui.UserID).SetAvatarURL(avatar).Exec(ctx)
}
func (r *UserRepo) checkLimit(ctx context.Context, tx *db.Tx) error {
count, err := tx.User.Query().Count(ctx)
if err != nil {
return err
}
if count >= r.cfg.Admin.Limit {
return errcode.ErrUserLimit.Wrap(err)
}
return nil
}
func (r *UserRepo) SignUpOrIn(ctx context.Context, platform consts.UserPlatform, req *domain.OAuthUserInfo) (*db.User, error) {
var u *db.User
err := entx.WithTx(ctx, r.db, func(tx *db.Tx) error {
@@ -480,9 +462,6 @@ func (r *UserRepo) SignUpOrIn(ctx context.Context, platform consts.UserPlatform,
if !db.IsNotFound(err) {
return err
}
if err = r.checkLimit(ctx, tx); err != nil {
return err
}
user, err := tx.User.Create().
SetUsername(req.Name).
SetEmail(req.Email).