小程序一些功能更新
This commit is contained in:
@@ -140,7 +140,8 @@ func loginByOpenid(ctx context.Context, openid, sessionKey string) (*v1.WxLoginR
|
||||
); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
record, err := g.Model(consts.TableUsers).Where("openid", openid).One()
|
||||
// 软删除:已删用户 openid 已墓碑化,不会命中;同 openid 重新登录走上面的 INSERT 新建账号
|
||||
record, err := g.Model(consts.TableUsers).Where("openid", openid).WhereNull("deleted_at").One()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -163,7 +164,8 @@ func placeholderOpenid() string {
|
||||
|
||||
// Register H5 独立账号注册(注册即登录)
|
||||
func Register(ctx context.Context, username, password, nickname string) (*v1.WxLoginRes, error) {
|
||||
count, err := g.Model(consts.TableUsers).Where("username", username).Count()
|
||||
// 软删除:已删用户 username 已墓碑化,不占用新注册
|
||||
count, err := g.Model(consts.TableUsers).Where("username", username).WhereNull("deleted_at").Count()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -199,7 +201,7 @@ func AccountLogin(ctx context.Context, username, password string) (*v1.WxLoginRe
|
||||
}
|
||||
|
||||
func loginByUsername(ctx context.Context, username, password string) (*v1.WxLoginRes, error) {
|
||||
record, err := g.Model(consts.TableUsers).Where("username", username).One()
|
||||
record, err := g.Model(consts.TableUsers).Where("username", username).WhereNull("deleted_at").One()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -229,7 +231,7 @@ func BindAccount(ctx context.Context, username, password string) (*v1.BindAccoun
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
record, err := g.Model(consts.TableUsers).Where("username", username).One()
|
||||
record, err := g.Model(consts.TableUsers).Where("username", username).WhereNull("deleted_at").One()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -348,7 +350,7 @@ func loginResult(ctx context.Context, user *entity.Users) (*v1.WxLoginRes, error
|
||||
}
|
||||
|
||||
func getUserById(ctx context.Context, id int64) (*entity.Users, error) {
|
||||
record, err := g.Model(consts.TableUsers).Where("id", id).One()
|
||||
record, err := g.Model(consts.TableUsers).Where("id", id).WhereNull("deleted_at").One()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user