新增登录接口

controllers/user.go

@@ -239,13 +239,12 @@ func (this *UserCommonController) CheckEmailCode() {
 	br.Msg = "验证码正确"
 }
 
-
 // @Title 登录
 // @Description 登录接口
 // @Param	request	body models.LoginReq true "type json string"
 // @Success 200 {object} models.LoginResp
 // @router /login [post]
-func (this *UserCommonController) Login() {
+func (this *UserController) Login() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -258,72 +257,78 @@ func (this *UserCommonController) Login() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
+	user := this.User
+	if user == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录"
+		br.Ret = 408
+		return
+	}
+
+	openId := user.OpenId
+	if openId == "" {
+		br.Msg = "参数错误"
+		br.ErrMsg = "参数错误，openid 为空"
+		return
+	}
+	userId := user.UserId
+	newUserId := 0
+	if req.LoginType == 1 {
+		//BindMobile(openId, mobile string, userId, loginType int) (err error) {
+		newUserId, err = models.BindMobile(openId, req.Mobile, userId, req.LoginType)
+	} else if req.LoginType == 2 {
+		if req.Email == "" {
+			br.ErrMsg = "邮箱不能为空,请输入邮箱"
+			br.Msg = "邮箱不能为空,请输入邮箱"
+			return
+		}
+		if !utils.ValidateEmailFormatat(req.Email) {
+			br.ErrMsg = "邮箱格式错误，请重新输入"
+			br.Msg = "邮箱格式错误，请重新输入"
+			return
+		}
+		newUserId, err = models.BindMobile(openId, req.Email, userId, req.LoginType)
+	} else {
+		br.Msg = "无效的登录方式"
+		br.ErrMsg = "无效的登录方式,Err:" + err.Error()
+		return
+	}
+	timeUnix := time.Now().Unix()
+	timeUnixStr := strconv.FormatInt(timeUnix, 10)
+	token := utils.MD5(strconv.Itoa(userId)) + utils.MD5(timeUnixStr)
+	//新增session
+	{
+		session := new(models.Session)
+		session.OpenId = openId
+		session.UserId = userId
+		session.CreatedTime = time.Now()
+		session.LastUpdatedTime = time.Now()
+		session.ExpireTime = time.Now().AddDate(1, 0, 0)
+		session.AccessToken = token
+		err = models.AddSession(session)
+		if err != nil {
+			br.Msg = "登录失败"
+			br.ErrMsg = "登录失败，新增用户session信息失败:" + err.Error()
+			return
+		}
+	}
+
+	userPermission, err := services.CheckUserPermission(newUserId)
+	if err != nil {
+		br.Msg = "登录失败"
+		br.ErrMsg = "登录失败，判断权限失败:" + err.Error()
+		return
+	}
+	resp := new(models.LoginResp)
+	resp.UserId = newUserId
+	resp.UserPermission = userPermission
+	resp.Authorization = token
 	br.Ret = 200
 	br.Success = true
+	br.Data = resp
 	br.Msg = "登录成功"
 }
 
-
-/*
-
-   //登录
-   function login()
-   {
-
-       $openId =$this->request->open_id;
-       if(empty($openId)){
-           return response()->json(['code'=>'1','msg'=>'参数错误']);
-       }
-       $user = UserModel::getUserByOpenid($openId);
-       if(empty($user))
-       {
-           return response()->json(['code'=>'40001','msg'=>'请重新登陆']);
-       }
-       $loginTypeStr='';
-       $userId=$user->user_id;
-
-       $userData=array(
-           'company_id'=>1,
-       );
-       if ($loginType==1){
-           $mobile = ExpressUtil::checkStringArrayValue('mobile',$request_data);
-           if(!preg_match("/^1\d{10}$/",$mobile)){
-               return response()->json(['code'=>'3','msg'=>'请输入正确的手机号（1开头的11位数字）']);
-           }
-           app('log')->info("start bindMobile");
-           $userId=UserModel::bindMobile($openId,$userId,$mobile);
-           $loginTypeStr='MOBILE';
-       }else if ($loginType==2){
-           $email = ExpressUtil::checkStringArrayValue('email',$request_data);
-           $preg_email='/^[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*@([a-zA-Z0-9]+[-.])+([a-z]{2,5})$/ims';
-           if(!preg_match($preg_email,$email)){
-               return response()->json(['code'=>'4','msg'=>'请输入正确的邮箱']);
-           }
-           $userId=UserModel::bindMobile($openId,$userId,$email);
-           $loginTypeStr='EMAIL';
-       }else{
-           return response()->json(['code'=>'5','msg'=>'无效的登录方式']);
-       }
-
-       //判断是否有权限访问
-       $userPermission = ExpressUtil::checkUserPermission($userId);
-
-       SessionModel::addSession($openId,$userId);
-       $session = SessionModel::getSessionByUserId($userId);
-       $rddpAccessToken=$session->access_token;
-       $response = new Response(['code'=>'0','msg'=>'登录成功','data'=>array(
-           'user_id'=>$userId,
-           'rddp_access_token'=>$rddpAccessToken,
-           'user_permission'=>$userPermission,
-       )]);
-       UserModel::editUserFirstLogin($openId);
-       $result=json_encode($response);
-       app('log')->info("login result:".$result);
-       return $response;
-   }
-
- */
-
 // @Title 申请试用
 // @Description 申请试用接口
 // @Param	request	body models.ApplyReq true "type json string"

controllers/wechat.go

@@ -138,7 +138,9 @@ func (this *WechatCommonController) WechatLogin() {
 	}
 	permission, err := services.CheckUserPermission(userId)
 	if err != nil {
-		utils.FileLog.Info("%s", err.Error())
+		br.Msg = "登录失败"
+		br.ErrMsg = "登录失败，判断权限失败:" + err.Error()
+		return
 	}
 	resp := new(models.WxLoginResp)
 	resp.UserId = userId
@@ -149,11 +151,10 @@ func (this *WechatCommonController) WechatLogin() {
 	resp.UserPermission = permission
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "获取数据成功"
+	br.Msg = "登录成功"
 	br.Data = resp
 }
 
-
 // @Title 微信登录接口
 // @Description 微信登录接口
 // @Param   Url   query   string  true       "url地址"
@@ -181,31 +182,29 @@ func (this *WechatController) GetWxSign() {
 		AppID:     utils.WxAppId,
 		AppSecret: utils.WxAppSecret,
 		Token:     accessToken,
-		Cache: memory,
+		Cache:     memory,
 	}
 	oa := wc.GetOfficialAccount(cfg)
-	j:=oa.GetJs()
-	config,err:=j.GetConfig(getUrl)
-	if err!=nil {
-		fmt.Println("获取失败：Err:"+err.Error())
+	j := oa.GetJs()
+	config, err := j.GetConfig(getUrl)
+	if err != nil {
+		fmt.Println("获取失败：Err:" + err.Error())
 		return
 	}
 	fmt.Println(config)
 	resp := new(models.WechatSign)
-	resp.AppId=config.AppID
-	resp.NonceStr=config.NonceStr
-	resp.Timestamp=config.Timestamp
-	resp.Url=getUrl
-	resp.Signature=config.Signature
+	resp.AppId = config.AppID
+	resp.NonceStr = config.NonceStr
+	resp.Timestamp = config.Timestamp
+	resp.Url = getUrl
+	resp.Signature = config.Signature
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取签名成功"
 	br.Data = resp
 }
 
-
-
 /*
 $app->bag('api/wechat/getWxSign',"WechatController@getWxSign");
 $app->bag('api/wechat/check', "WechatController@check");
-*/
+*/

models/wx_user.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"hongze/hongze_api/utils"
 	"rdluck_tools/orm"
 	"time"
 )
@@ -168,4 +169,56 @@ func Apply(userId, applyMethod int, mobile, email, companyName, realName, openId
 type LoginReq struct {
 	LoginType int    `description:"登录方式:1:手机，2:邮箱"`
 	Mobile    string `description:"手机号"`
+	Email     string `description:"邮箱"`
+}
+
+type LoginResp struct {
+	UserId         int `description:"用户id"`
+	UserPermission int `description:"手机号"`
+	Authorization  string
+}
+
+func BindMobile(openId, mobile string, userId, loginType int) (wxUserId int, err error) {
+	//loginType  登录方式:1:手机，2:邮箱
+	sql := ``
+	if loginType == 1 {
+		sql = `SELECT * FROM wx_user WHERE mobile = ? `
+	} else {
+		sql = "SELECT * FROM wx_user WHERE email = ? "
+	}
+	user := new(WxUser)
+	o := orm.NewOrm()
+	err = o.Raw(sql, mobile).QueryRow(&user)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		return
+	}
+	if user == nil || (err != nil && err.Error() == utils.ErrNoRow()) {
+		msql := ``
+		if loginType == 1 {
+			msql = "UPDATE wx_user SET mobile = ?,bind_account = ? where open_id = ? "
+		} else {
+			msql = "UPDATE wx_user SET email = ?,bind_account = ? where open_id = ?  "
+		}
+		_, err = o.Raw(msql, mobile, mobile, openId).Exec()
+		wxUserId = userId
+	} else {
+		if user.OpenId == "" {
+			wxUserId = user.UserId
+			dsql := ` DELETE FROM wx_user WHERE open_id = ? `
+			_, err = o.Raw(dsql, openId).Exec()
+			if err != nil {
+				return wxUserId, err
+			}
+			msql := ``
+			if loginType == 1 {
+				msql = ` UPDATE wx_user SET open_id = ?,bind_account = ?,created_time=NOW() WHERE mobile = ? `
+			} else {
+				msql = ` UPDATE wx_user SET open_id = ?,bind_account = ?,created_time=NOW() WHERE email = ? `
+			}
+			_, err = o.Raw(msql, openId, mobile, mobile).Exec()
+		} else {
+			wxUserId = userId
+		}
+	}
+	return
 }