分支切换

@@ -64,3 +64,34 @@ func RequestUCenterAddUser(phone string, nickname string, avatar string) (*Respo
 	}
 	}
 	return ucenterReturn, nil
 	return ucenterReturn, nil
 }
 }
+
+//发送短信验证码
+func RequestUCenterSmsCode(phone string) error {
+	if len(phone) == 0 {
+		return protocol.NewErrWithMessage("1")
+	}
+	param := RequestSmsCodeSend{
+		Phone: phone,
+	}
+	uclient := NewUCenterClient()
+	btBody, err := uclient.Call(param)
+	if err != nil {
+		log.Error("统一用户中心请求失败 err:%s", err)
+		return protocol.NewErrWithMessage("1")
+	}
+	var ucenterReturn CommResponse
+	err = json.Unmarshal(btBody, &ucenterReturn)
+	if err != nil {
+		log.Error("解析统一用户中心响应失败 err:%s", err)
+		return protocol.NewErrWithMessage("1")
+	}
+	if !(ucenterReturn.Code == ResponseCode0 &&
+		ucenterReturn.Msg == ResponseMsgOk) {
+		return protocol.NewErrWithMessage("10040")
+	}
+	return nil
+}
+
+func RequestUCenterLoginSms(phone string, captcha string) (*ResponseLoginSms, error) {
+	return nil, nil
+}

@@ -137,17 +137,37 @@ type RequestSmsCodeSend struct {
 	Phone string `json:"phone"`
 	Phone string `json:"phone"`
 }
 }
 
 
-func (r *RequestSmsCodeSend) Format() []byte {
+func (r RequestSmsCodeSend) Format() []byte {
 	var bt []byte
 	var bt []byte
 	bt, _ = json.Marshal(r)
 	bt, _ = json.Marshal(r)
 	return bt
 	return bt
 }
 }
 
 
 //GetPath 实现IUCenterParam接口
 //GetPath 实现IUCenterParam接口
-func (r *RequestSmsCodeSend) GetPath() (string, string) {
+func (r RequestSmsCodeSend) GetPath() (string, string) {
 	return "/sendSms", "POST"
 	return "/sendSms", "POST"
 }
 }
 
 
-//短信验正码 登录
+//RequestLoginSms 短信验正码 登录
 type RequestLoginSms struct {
 type RequestLoginSms struct {
+	Phone     string `json:"phone"`
+	Captcha   string `json:"captcha"`
+	GrantType string `json:"grantType"` //登陆方式（signInCaptcha验证码)
+}
+
+//ResponseLoginSms 短信验证码登录 响应
+type ResponseLoginSms struct {
+	CommResponse
+	Data LoginSmsData `json:"data"`
+}
+
+type LoginSmsData struct {
+	Cuid  int64  `json:"cuid"`
+	Uname string `json:"uname"`
+	Phone string `json:"phone"`
+	Image struct {
+		Path string `json:"path"`
+	} `json:"image"`
+	ImToken     string `json:"imtoken"`
+	CsAccountID int64  `json:"csAccountID"`
 }
 }