统一用户中心修改

@@ -29,7 +29,7 @@ type ModulePermission struct {
 	Menus []*ModulePermission `json:"-"`    //子模块权限
 	Menus []*ModulePermission `json:"-"`    //子模块权限
 }
 }
 
 
-/*UCenterGetUser */
+/*获取用户信息 UCenterGetUser */
 type UCenterGetUserRequest struct {
 type UCenterGetUserRequest struct {
 }
 }
 type UCenterGetUserResponse struct {
 type UCenterGetUserResponse struct {
@@ -41,3 +41,13 @@ type UCenterGetUserResponse struct {
 	Accid           string `json:"accid"`
 	Accid           string `json:"accid"`
 	CustomerAccount string `json:"customerAccount"`
 	CustomerAccount string `json:"customerAccount"`
 }
 }
+
+/*修改用户信息  UCenterPutUser */
+type UCenterPutUserRequest struct {
+	Phone    string `json:"phone"`
+	PassWord string `json:"password"`
+	NickName string `json:"nickname"`
+	Avatar   string `json:"avatar"`
+}
+type UCenterPutUserResponse struct {
+}

@@ -11,7 +11,7 @@ var nsV1 *beego.Namespace
 
 
 func init() {
 func init() {
 	nsV1 := beego.NewNamespace("v1",
 	nsV1 := beego.NewNamespace("v1",
-		beego.NSNamespace("ucenter", beego.NSBefore(controllers.FilterComm), beego.NSInclude(&v1.UcenterController{})),
+		beego.NSNamespace("ucenter", beego.NSInclude(&v1.UcenterController{})),
 		beego.NSNamespace("auth", beego.NSBefore(controllers.FilterComm), beego.NSInclude(&v1.AuthController{})),
 		beego.NSNamespace("auth", beego.NSBefore(controllers.FilterComm), beego.NSInclude(&v1.AuthController{})),
 		beego.NSNamespace("upload", beego.NSBefore(controllers.FilterComm), beego.NSInclude(&v1.UploadController{})),
 		beego.NSNamespace("upload", beego.NSBefore(controllers.FilterComm), beego.NSInclude(&v1.UploadController{})),
 		beego.NSNamespace("version", beego.NSBefore(controllers.FilterComm), beego.NSInclude(&v1.VersionController{})),
 		beego.NSNamespace("version", beego.NSBefore(controllers.FilterComm), beego.NSInclude(&v1.VersionController{})),

@@ -46,6 +46,7 @@ func RequestUserCenter(method string, httpMethod, request interface{}, rsponse i
 		return
 		return
 	}
 	}
 	if err = json.Unmarshal(data, rsponse); err != nil {
 	if err = json.Unmarshal(data, rsponse); err != nil {
+		log.Debug(method, "response:", string(data))
 		log.Error(err)
 		log.Error(err)
 		return
 		return
 	}
 	}

 package user
 package user
 
 
 import (
 import (
+	"fmt"
 	"gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
 	"gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
 	"net/http"
 	"net/http"
 	"opp/internal/repository"
 	"opp/internal/repository"
@@ -106,10 +107,10 @@ func ChangePassword(header *protocol.RequestHeader, request *protocol.ChangePass
 		log.Error(err)
 		log.Error(err)
 		return
 		return
 	}
 	}
-	if !strings.EqualFold(request.OldPwd, user.Passwd) {
-		err = protocol.NewErrWithMessage(2028)
-		return
-	}
+	//if !strings.EqualFold(request.OldPwd, user.Passwd) {
+	//	err = protocol.NewErrWithMessage(2028)
+	//	return
+	//}
 
 
 	//new
 	//new
 	var message protocol.Message
 	var message protocol.Message
@@ -126,17 +127,20 @@ func ChangePassword(header *protocol.RequestHeader, request *protocol.ChangePass
 			return
 			return
 		}
 		}
 		if loginResponse.Id != user.UserCenterId {
 		if loginResponse.Id != user.UserCenterId {
+			log.Error(fmt.Sprintf("用户中心uid不一致 input:%v want:%v", loginResponse.Id, user.UserCenterId))
 			err = protocol.NewErrWithMessage(1)
 			err = protocol.NewErrWithMessage(1)
 			return
 			return
 		}
 		}
-
+		log.Debug(fmt.Sprintf("修改密码 simnum:%v ucenter_id:%v pwd:%v", user.Phone, user.UserCenterId, request.NewPwd))
 		//修改密码
 		//修改密码
-		if _, err = agg.RequestUserCenter(protocol.MethodGetUser, http.MethodPut, nil, &message); err != nil {
-
+		if _, err = agg.RequestUserCenter(fmt.Sprintf("%v%v", protocol.MethodGetUser, loginResponse.Id), http.MethodPut, &protocol.UCenterPutUserRequest{
+			PassWord: request.NewPwd,
+		}, &message); err != nil {
+			log.Error(err)
+			return
 		}
 		}
 	}
 	}
-
-	err = utils.UpdateTableByMap(&models.User{Id: user.Id}, map[string]interface{}{"Passwd": request.NewPwd})
+	//err = utils.UpdateTableByMap(&models.User{Id: user.Id}, map[string]interface{}{"Passwd": request.NewPwd})
 	return
 	return
 }
 }