BUG修复

@@ -22,21 +22,6 @@ type AdminUser struct {
 	Permission []AdminPermissionBase `json:"permission"`
 }
 
-//TODO
-func (adminUser *AdminUser) Update(data map[string]string) error {
-	return nil
-}
-
-//TODO
-func (adminUser *AdminUser) ChangePassword(data string) error {
-	return nil
-}
-
-//TODO
-func (admin *AdminUser) ChangeIsUsable(yesOrNo bool) error {
-	return nil
-}
-
 type AdminUserFindQuery struct {
 	AccountLike string
 	Offset      int

@@ -36,20 +36,6 @@ type PartnerInfo struct {
 	Salesman []Salesman `json:"salesman"`
 }
 
-//TODO
-func (partner *PartnerInfo) Update(data map[string]interface{}) error {
-	if v, ok := data["partnerName"]; ok {
-		partner.Partner.PartnerName = v.(string)
-	}
-	if v, ok := data["account"]; ok {
-		partner.Partner.Account = v.(string)
-	}
-	if v, ok := data["partnerCategory"]; ok {
-		partner.PartnerCategory = v.(int)
-	}
-	return nil
-}
-
 type PartnerFindOneQuery struct {
 	UserId       int64
 	AccountEqual string

@@ -38,7 +38,7 @@ func (mytoken *MyToken) CreateJWTToken() (string, error) {
 }
 
 //ValidJWTToken ...
-func (mytoken *MyToken) ValidJWTToken(tokenString string) error {
+func (mytoken *MyToken) ValidJWTToken(tokenString string) (*MyToken, error) {
 	token, err := jwt.ParseWithClaims(
 		tokenString,
 		&MyToken{},
@@ -46,15 +46,15 @@ func (mytoken *MyToken) ValidJWTToken(tokenString string) error {
 			return key, nil
 		})
 	if err != nil {
-		return err
+		return nil, err
 	}
-	mytoken, ok := token.Claims.(*MyToken)
+	getoken, ok := token.Claims.(*MyToken)
 	if ok && token.Valid {
 		// 验证成功，返回信息
-		return nil
+		return getoken, nil
 	}
 	// 验证失败
-	return fmt.Errorf("token Valid fail")
+	return nil, fmt.Errorf("token Valid fail")
 }
 
 func (mytoken *MyToken) IsJwtErrorExpired(err error) bool {

@@ -117,12 +117,9 @@ func (controller *BaseController) GetHeaderToken() string {
 }
 
 func (controller *BaseController) ValidJWTToken() bool {
-	// controller.setUserId(2)
-	// return true
-
 	headerToken := controller.GetHeaderToken()
 	mytoken := new(lib.MyToken)
-	err := mytoken.ValidJWTToken(headerToken)
+	tokenData, err := mytoken.ValidJWTToken(headerToken)
 	if err != nil {
 		logs.Error("校验token失败", err)
 		if mytoken.IsJwtErrorExpired(err) {
@@ -143,7 +140,7 @@ func (controller *BaseController) ValidJWTToken() bool {
 		}
 		return false
 	}
-	controller.setUserId(mytoken.UID)
+	controller.setUserId(tokenData.UID)
 	return true
 }
 
@@ -157,6 +154,10 @@ func (controller *BaseController) ValidAdminPermission(permissionCode string, ex
 	}
 	//权限校验
 	userId := controller.GetUserId()
+	if userId == 0 {
+		controller.ResponseError(errors.New("无操作权限"))
+		return false
+	}
 	newAdminuserquery := adminuserquery.GetAdminUserQuery{Id: userId}
 	newAdminUserService := adminuserservice.NewAdminUserService(nil)
 	adminuser, err := newAdminUserService.GetAdminUser(&newAdminuserquery)
@@ -178,6 +179,7 @@ func (controller *BaseController) ValidAdminPermission(permissionCode string, ex
 			return true
 		}
 	}
+	controller.ResponseError(errors.New("无操作权限"))
 	return false
 }
 

@@ -21,7 +21,7 @@ func (c *OrderController) Prepare() {
 	if ok := c.ValidJWTToken(); !ok {
 		return
 	}
-	if ok := c.ValidAdminPermission(domain.PERMINSSION_ADMIN_USER); !ok {
+	if ok := c.ValidAdminPermission(domain.PERMISSION_ORDER); !ok {
 		return
 	}
 }