|
@@ -25,6 +25,7 @@ type MobileWechatController struct {
|
|
|
// @Title 微信登录小助手接口
|
|
|
// @Description 微信登录小助手接口
|
|
|
// @Param Code query string true "微信唯一编码code"
|
|
|
+// @Param IsWechat query int true "是否微信内置浏览器打开 1是 ,0否 ,不传默认为0 "
|
|
|
// @Success 200 {object} models.UserDetailByUserLogin
|
|
|
// @router /login [get]
|
|
|
func (this *WechatCommonController) WechatLogin() {
|
|
@@ -34,6 +35,7 @@ func (this *WechatCommonController) WechatLogin() {
|
|
|
this.ServeJSON()
|
|
|
}()
|
|
|
code := this.GetString("Code")
|
|
|
+ isWechat, _ := this.GetInt("IsWechat")
|
|
|
if code == "" {
|
|
|
br.Msg = "参数错误"
|
|
|
br.ErrMsg = "Code 为空"
|
|
@@ -41,10 +43,16 @@ func (this *WechatCommonController) WechatLogin() {
|
|
|
}
|
|
|
var token string
|
|
|
resp := new(models.UserDetailByUserLogin)
|
|
|
- WxAccessToken, err := services.GetWxAccessOpenToken(code)
|
|
|
- if err != nil {
|
|
|
+ var WxAccessToken *services.WxAccessToken
|
|
|
+ var errWx error
|
|
|
+ if isWechat == 0 {
|
|
|
+ WxAccessToken, errWx = services.GetWxAccessOpenToken(code)
|
|
|
+ } else {
|
|
|
+ WxAccessToken, errWx = services.WxGetUserOpenIdByCode(code)
|
|
|
+ }
|
|
|
+ if errWx != nil {
|
|
|
br.Msg = "获取用户信息失败"
|
|
|
- br.ErrMsg = "获取access_token失败,err:" + err.Error()
|
|
|
+ br.ErrMsg = "获取access_token失败,err:" + errWx.Error()
|
|
|
return
|
|
|
}
|
|
|
if WxAccessToken.AccessToken == "" {
|
|
@@ -86,7 +94,11 @@ func (this *WechatCommonController) WechatLogin() {
|
|
|
items.City = wxUserInfo.City
|
|
|
items.Country = wxUserInfo.Country
|
|
|
items.Headimgurl = wxUserInfo.Headimgurl
|
|
|
- items.CreatePlatform = 7
|
|
|
+ if isWechat == 0 {
|
|
|
+ items.CreatePlatform = 7
|
|
|
+ } else {
|
|
|
+ items.CreatePlatform = 8
|
|
|
+ }
|
|
|
items.CreateTime = time.Now()
|
|
|
if total == 0 {
|
|
|
_, err = models.AddUserRecord(items)
|