Merge branch 'feature/manage-user' into 'develop'

conf/config.go

@@ -17,5 +17,5 @@ const (
 	// RSA Private File
 	AppRsaPrivateFile = "rsa/private.pem"
 
-	PASSWORD_DEFAULT = 1
+	PASSWORD_DEFAULT = 13
 )

models/manager.go

@@ -95,6 +95,7 @@ func AddManager(data map[string]interface{}) (error) {
 		RegIp:         data["reg_ip"].(uint32),
 		LastLoginIp:   data["last_login_ip"].(uint32),
 		Group:         data["group"].(string),
+		Status:        1,
 		PlatformId:    data["platform_id"].(int32),
 	}
 

routers/api/backend/manager.go

@@ -117,6 +117,61 @@ func GetManagers(c *gin.Context) {
 	handler.SendResponse(c, nil, data)
 }
 
+func EditManager(c *gin.Context) {
+	manager_params := validate_service.EditManager{}
+	c.ShouldBindJSON(&manager_params)
+
+	if ok, errors := validate_service.ValidateInputs(manager_params); !ok {
+		for _, err := range errors {
+			handler.SendResponse(c, errno.ErrBind, strings.Join(err, " "))
+			return
+		}
+	}
+	token := c.Request.Header.Get("Token")
+	user, _ := util.ParseToken(token)
+	group := user.UserInfo.Group
+
+	if int32(user.UserInfo.Uid) == manager_params.Uid {
+		handler.SendResponse(c, errno.ErrDeleteSelf, nil)
+		return
+	}
+
+	if ("general" == group) {
+		handler.SendResponse(c, errno.ErrUserAuthIncorrect, nil)
+		return
+	}
+
+	manager_service := manager_service.Manager{Uid: manager_params.Uid}
+	manager, err := manager_service.GetManager()
+	if err != nil {
+		handler.SendResponse(c, errno.ErrValidation, nil)
+		return
+	}
+
+	var platform_id int32
+	platform_id = int32(user.UserInfo.PlatformId)
+
+
+	if "admin" == group && platform_id != manager.PlatformId {
+		handler.SendResponse(c, errno.ErrUserAuthIncorrect, nil)
+		return
+	}
+
+	if "administrator" == manager.Group {
+		handler.SendResponse(c, errno.ErrUserAuthIncorrect, nil)
+		return
+	}
+
+	manager_service.Status = manager_params.Status
+	err = manager_service.Edit()
+	if err != nil {
+		handler.SendResponse(c, errno.ErrDeleteUser, nil)
+		return
+	}
+
+	handler.SendResponse(c, nil, nil)
+}
+
 func DeleteManager(c *gin.Context) {
 	id := int32(com.StrTo(c.DefaultQuery("uid", "0")).MustInt())
 	valid := validation.Validation{}

routers/router.go

@@ -136,7 +136,7 @@ func InitRouter() *gin.Engine {
 		api.GET("/managers", backend.GetManagers)
 		//api.GET("/user", backend.GetUser)
 		api.POST("/manager", backend.AddManager)
-		//api.PUT("/user", backend.EditUser)
+		api.PUT("/manager", backend.EditManager)
 		api.DELETE("/manager", backend.DeleteManager)
 	}
 

service/manager_service/manager.go

@@ -80,13 +80,7 @@ func (m *Manager) Add() error {
 
 func (m *Manager) Edit() error {
 	return models.EditManager(m.Uid, map[string]interface{}{
-		"username":      m.UserName,
-		"password":      m.Password,
-		"reg_ip":        m.RegIp,
-		"last_login_ip": m.LastLoginIp,
-		"status":        m.Status,
-		"group":         m.Group,
-		"platform_id":   m.PlatformId,
+		"status": m.Status,
 	})
 }
 

validate_service/manager.go

@@ -6,6 +6,7 @@ type Manager struct {
 	PlatformId int32  `json:"platform_id" validate:"required"`
 }
 
-func (m Manager) Unique(val string) bool {
-	return len(val) == 4
+type EditManager struct {
+	Uid    int32 `json:"uid" validate:"required"`
+	Status uint8 `json:"status" validate:"required,min=1,max=2"`
 }