Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

business/auth2/auth2.go

@@ -9,6 +9,8 @@ import (
 	"strings"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/globals"
+
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
@@ -309,6 +311,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string
 				if appID == model.JXC4ClientAppID && authInfo.AuthBindInfo.UserID != "" {
 					binds, err := dao.GetUserBindAuthInfo(dao.GetDB(), authInfo.AuthBindInfo.UserID, 0, nil, "", "", []string{model.JXC4ClientAppID})
 					if err != nil {
+						globals.SugarLogger.Debugf("AuthTypeWXApp authInfo=%s,err=%v", utils.Format4Output(authInfo, false), err)
 						return authInfo, err
 					}
 					if len(binds) == 0 {
@@ -324,6 +327,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string
 	} else {
 		err = ErrIllegalAuthType
 	}
+	globals.SugarLogger.Debugf("LoginInternal authInfo=%s", utils.Format4Output(authInfo, false))
 	return authInfo, err
 }
 

controllers/auth2.go

@@ -3,10 +3,12 @@ package controllers
 import (
 	"encoding/base64"
 	"fmt"
-	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"net/http"
 	"strings"
 
+	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
+	"git.rosy.net.cn/jx-callback/globals"
+
 	"git.rosy.net.cn/jx-callback/globals/api"
 
 	"git.rosy.net.cn/baseapi/platformapi/weixinapi"
@@ -153,7 +155,12 @@ func (c *Auth2Controller) Login() {
 		}
 		if params.CId != "" && authInfo != nil {
 			err = cms.SetUserCId(authInfo.UserID, params.CId)
+			if dao.IsNoRowsError(err) {
+				err = nil
+			}
+			globals.SugarLogger.Debugf("SetUserCId err=%v", err)
 		}
+		globals.SugarLogger.Debugf("Login retVal=%s,err=%v", utils.Format4Output(retVal, false), err)
 		return retVal, "", err
 	})
 }