feat: add oliver elastic support; update db(sqlite)
This commit is contained in:
@ -37,7 +37,7 @@ func AuthLogin(c *nf.Ctx) error {
|
||||
return resp.Resp400(c, err.Error())
|
||||
}
|
||||
|
||||
if err = db.New(tool.Timeout(3)).
|
||||
if err = db.Default.Session(tool.Timeout(3)).
|
||||
Model(&model.User{}).
|
||||
Where("username = ?", req.Username).
|
||||
Where("deleted_at = 0").
|
||||
@ -170,7 +170,7 @@ func UserUpdate(c *nf.Ctx) error {
|
||||
return resp.Resp400(c, req, err.Error())
|
||||
}
|
||||
|
||||
if err = db.New(tool.Timeout(3)).
|
||||
if err = db.Default.Session(tool.Timeout(3)).
|
||||
Select("password").
|
||||
Model(&model.User{}).
|
||||
Where("username = ?", user.Username).
|
||||
@ -184,7 +184,7 @@ func UserUpdate(c *nf.Ctx) error {
|
||||
return resp.Resp400(c, nil, "原密码错误")
|
||||
}
|
||||
|
||||
if err = db.New(tool.Timeout(5)).
|
||||
if err = db.Default.Session(tool.Timeout(5)).
|
||||
Model(&model.User{}).
|
||||
Where("id = ?", user.Id).
|
||||
Update("password", tool.NewPassword(req.NewPassword)).
|
||||
@ -232,10 +232,10 @@ func ManageUserList(c *nf.Ctx) error {
|
||||
return resp.Resp400(c, nf.Map{"msg": "size over max", "max": opt.MaxSize})
|
||||
}
|
||||
|
||||
txList := op.Role.Where(db.New(tool.Timeout(10)).
|
||||
txList := op.Role.Where(db.Default.Session(tool.Timeout(10)).
|
||||
Model(&model.User{}).
|
||||
Where("deleted_at = 0"))
|
||||
txCount := op.Role.Where(db.New(tool.Timeout(5)).
|
||||
txCount := op.Role.Where(db.Default.Session(tool.Timeout(5)).
|
||||
Model(&model.User{}).
|
||||
Select("COUNT(id)").
|
||||
Where("deleted_at = 0"))
|
||||
@ -345,7 +345,7 @@ func ManageUserCreate(c *nf.Ctx) error {
|
||||
return resp.Resp403(c, newUser, "角色不符合")
|
||||
}
|
||||
|
||||
if err = db.New(tool.Timeout(5)).
|
||||
if err = db.Default.Session(tool.Timeout(5)).
|
||||
Create(newUser).
|
||||
Error; err != nil {
|
||||
return resp.Resp500(c, err.Error())
|
||||
@ -494,7 +494,7 @@ func ManageUserUpdate(c *nf.Ctx) error {
|
||||
}
|
||||
|
||||
updated := new(model.User)
|
||||
if err = db.New(tool.Timeout(5)).
|
||||
if err = db.Default.Session(tool.Timeout(5)).
|
||||
Model(updated).
|
||||
Clauses(clause.Returning{}).
|
||||
Where("id = ?", req.Id).
|
||||
|
Reference in New Issue
Block a user