From b7949e100f6e153ca48838a3b62f6b51baa2c773 Mon Sep 17 00:00:00 2001
From: link <a624669980@163.com>
Date: Fri, 18 Mar 2022 11:40:38 +0800
Subject: [PATCH] Merge Branches

---
 route/route.go   |  2 ++
 route/v1/user.go | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/route/route.go b/route/route.go
index 7b5804e..04671dd 100644
--- a/route/route.go
+++ b/route/route.go
@@ -57,6 +57,8 @@ func InitRouter() *gin.Engine {
 			v1UserGroup.PUT("/changuserpwd", v1.PutUserPwd)
 			//edit user info
 			v1UserGroup.POST("/info", v1.PostUserChangeInfo)
+			v1UserGroup.PUT("/nick", v1.PutUserChangeNick)
+			v1UserGroup.PUT("/desc", v1.PutUserChangeDesc)
 
 		}
 
diff --git a/route/v1/user.go b/route/v1/user.go
index 4b35cfc..a4d3a42 100644
--- a/route/v1/user.go
+++ b/route/v1/user.go
@@ -190,7 +190,7 @@ func PostUserChangeInfo(c *gin.Context) {
 		return
 	}
 	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["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})
 }
 
+// @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
 // @Produce  application/json
 // @Accept mapplication/json
@@ -206,7 +249,7 @@ func PostUserChangeInfo(c *gin.Context) {
 // @Success 200 {string} string "ok"
 // @Router /user/info [get]
 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["head"] = config.UserInfo.Head
 	u["email"] = config.UserInfo.Email