mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-12 02:45:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

[v1.1] 新增自动续签并修复了一些 bug

Browse source 
修复后端可能会 panic 的问题
修复前端逻辑问题，新增证书自动续签
This commit is contained in:
0xJacky 2022-01-27 15:04:27 +08:00
parent 27c4b82d54
commit 882fe8c074
121 changed files with 1656 additions and 798 deletions
Download patch file Download diff file Expand all files Collapse all files

32
server/api/user.go
View file

@ -16,7 +16,7 @@ func GetUsers(c *gin.Context) {
err := curd.GetList(&list)
if err != nil {
ErrorHandler(c, err)
ErrHandler(c, err)
return
}
c.JSON(http.StatusOK, gin.H{
@ -32,7 +32,7 @@ func GetUser(c *gin.Context) {
err := curd.First(&user, id)
if err != nil {
ErrorHandler(c, err)
ErrHandler(c, err)
return
}
c.JSON(http.StatusOK, user)
@ -47,16 +47,16 @@ func AddUser(c *gin.Context) {
var json UserJson
ok := BindAndValid(c, &json)
if !ok {
return
return
}
curd := model.NewCurd(&model.Auth{})
pwd, err := bcrypt.GenerateFromPassword([]byte(json.Password), bcrypt.DefaultCost)
if err != nil {
ErrorHandler(c, err)
return
}
json.Password = string(pwd)
pwd, err := bcrypt.GenerateFromPassword([]byte(json.Password), bcrypt.DefaultCost)
if err != nil {
ErrHandler(c, err)
return
}
json.Password = string(pwd)
user := model.Auth{
Name: json.Name,
@ -66,7 +66,7 @@ func AddUser(c *gin.Context) {
err = curd.Add(&user)
if err != nil {
ErrorHandler(c, err)
ErrHandler(c, err)
return
}
@ -78,7 +78,7 @@ func EditUser(c *gin.Context) {
var json UserJson
ok := BindAndValid(c, &json)
if !ok {
return
return
}
curd := model.NewCurd(&model.Auth{})
@ -87,7 +87,7 @@ func EditUser(c *gin.Context) {
err := curd.First(&user, c.Param("id"))
if err != nil {
ErrorHandler(c, err)
ErrHandler(c, err)
return
}
edit.Name = json.Name
@ -97,7 +97,7 @@ func EditUser(c *gin.Context) {
var pwd []byte
pwd, err = bcrypt.GenerateFromPassword([]byte(json.Password), bcrypt.DefaultCost)
if err != nil {
ErrorHandler(c, err)
ErrHandler(c, err)
return
}
edit.Password = string(pwd)
@ -106,7 +106,7 @@ func EditUser(c *gin.Context) {
err = curd.Edit(&user, &edit)
if err != nil {
ErrorHandler(c, err)
ErrHandler(c, err)
return
}
@ -117,13 +117,13 @@ func DeleteUser(c *gin.Context) {
id := c.Param("id")
if cast.ToInt(id) == 1 {
ErrorHandler(c, errors.New("不允许删除默认账户"))
ErrHandler(c, errors.New("不允许删除默认账户"))
return
}
curd := model.NewCurd(&model.Auth{})
err := curd.Delete(&model.Auth{}, "id", id)
if err != nil {
ErrorHandler(c, err)
ErrHandler(c, err)
return
}
c.JSON(http.StatusNoContent, gin.H{})