beenull/CasaOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge Branches

Browse source
This commit is contained in:
link 2022-03-18 11:40:38 +08:00
parent a7d15a896e
commit b7949e100f
2 changed files with 47 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
route/route.go
View file

@ -57,6 +57,8 @@ func InitRouter() *gin.Engine {
v1UserGroup.PUT("/changuserpwd", v1.PutUserPwd) v1UserGroup.PUT("/changuserpwd", v1.PutUserPwd)
//edit user info //edit user info
v1UserGroup.POST("/info", v1.PostUserChangeInfo) v1UserGroup.POST("/info", v1.PostUserChangeInfo)
v1UserGroup.PUT("/nick", v1.PutUserChangeNick)
v1UserGroup.PUT("/desc", v1.PutUserChangeDesc)
} }

47
route/v1/user.go
View file

@ -190,7 +190,7 @@ func PostUserChangeInfo(c *gin.Context) {
return return
} }
user_service.SetUser(username, pwd, "", email, description, nickName) user_service.SetUser(username, pwd, "", email, description, nickName)
data := make(map[string]string, 2) data := make(map[string]string, 4)
data["token"] = jwt2.GetToken(username, pwd) data["token"] = jwt2.GetToken(username, pwd)
data["user_name"] = username data["user_name"] = username
@ -199,6 +199,49 @@ func PostUserChangeInfo(c *gin.Context) {
c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: data}) c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: data})
} }
// @Summary edit user info
// @Produce application/json
// @Accept multipart/form-data
// @Tags user
// @Param nick_name formData string false "nick name"
// @Security ApiKeyAuth
// @Success 200 {string} string "ok"
// @Router /user/nick [put]
func PutUserChangeNick(c *gin.Context) {
nickName := c.PostForm("nick_name")
if len(nickName) > 0 {
c.JSON(http.StatusOK, model.Result{Success: oasis_err2.PWD_INVALID, Message: oasis_err2.GetMsg(oasis_err2.PWD_INVALID)})
return
}
user_service.SetUser("", "", "", "", "", nickName)
data := make(map[string]string, 1)
data["nick_name"] = config.UserInfo.NickName
c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: data})
}
// @Summary edit user info
// @Produce application/json
// @Accept multipart/form-data
// @Tags user
// @Param description formData string false "Description"
// @Security ApiKeyAuth
// @Success 200 {string} string "ok"
// @Router /user/desc [put]
func PutUserChangeDesc(c *gin.Context) {
desc := c.PostForm("description")
if len(desc) > 0 {
c.JSON(http.StatusOK, model.Result{Success: oasis_err2.PWD_INVALID, Message: oasis_err2.GetMsg(oasis_err2.PWD_INVALID)})
return
}
user_service.SetUser("", "", "", "", desc, "")
data := make(map[string]string, 1)
data["description"] = config.UserInfo.Description
c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: data})
}
// @Summary get user info // @Summary get user info
// @Produce application/json // @Produce application/json
// @Accept mapplication/json // @Accept mapplication/json
@ -206,7 +249,7 @@ func PostUserChangeInfo(c *gin.Context) {
// @Success 200 {string} string "ok" // @Success 200 {string} string "ok"
// @Router /user/info [get] // @Router /user/info [get]
func GetUserInfo(c *gin.Context) { func GetUserInfo(c *gin.Context) {
var u = make(map[string]string, 2) var u = make(map[string]string, 5)
u["user_name"] = config.UserInfo.UserName u["user_name"] = config.UserInfo.UserName
u["head"] = config.UserInfo.Head u["head"] = config.UserInfo.Head
u["email"] = config.UserInfo.Email u["email"] = config.UserInfo.Email