log delete

business/auth2/authprovider/alipay/alipay.go

@@ -4,7 +4,6 @@ import (
 	"git.rosy.net.cn/baseapi/platformapi/alipayapi"
 	"git.rosy.net.cn/jx-callback/business/auth2"
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider"
-	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
@@ -28,7 +27,6 @@ func init() {
 }
 
 func (a *Auther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthBindEx, err error) {
-	globals.SugarLogger.Debugf("VerifySecret dummy:%s, code:%s", dummy, code)
 	tokenInfo, err := api.AliPayAPI.SystemAuthToken(alipayapi.GrantTypeCode, code, "")
 	if err == nil {
 		//userInfo, err2 := api.AliPayAPI.UserInfoShare(tokenInfo.AccessToken)

business/auth2/authprovider/defauther.go

@@ -11,7 +11,6 @@ import (
 	"git.rosy.net.cn/jx-callback/business/auth2"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
-	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
@@ -36,7 +35,6 @@ func (a *DefAuther) AddAuthBind(authBindEx *auth2.AuthBindEx, userName string) (
 }
 
 func (a *DefAuther) UnbindAuth(userID, authType, authTypeID, userName string) (err error) {
-	//globals.SugarLogger.Debugf("DefAuther.UnbindAuth userID:%s, authType:%s, GetAuthTypeID:%s, userName:%s", userID, authType, authTypeID, userName)
 	condition := map[string]interface{}{
 		"UserID":             userID,
 		"Type":               authType,
@@ -64,8 +62,6 @@ func (a *DefAuther) GetUserType() (userType int8) {
 
 // 此函数用于联合（通过unionID）查找用户
 func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAuthTypeList []string, openID, unionID string, authDetail interface{}) (authBindEx *auth2.AuthBindEx, err error) {
-	globals.SugarLogger.Debugf("UnionFindAuthBind curAuthType:%s, curAuthTypeID:%s, unionAuthTypeList:%v, openID:%s, unionID:%s, authDetail:%s",
-		curAuthType, curAuthTypeID, unionAuthTypeList, openID, unionID, utils.Format4Output(authDetail, true))
 	db := dao.GetDB()
 	var authBind *model.AuthBind
 	if authBind, err = dao.GetAuthBind(db, model.AuthBindTypeAuth, curAuthType, openID); err == nil { // 直接找到了
@@ -146,7 +142,6 @@ func (a *DefAuther) GenerateVerifyCode(keyID string) (verifyCode string) {
 	if verifyCode == "" {
 		verifyCode = fmt.Sprintf("%06d", rand.Intn(1000000))
 	}
-	globals.SugarLogger.Debugf("GenerateVerifyCode keyID:%s verifyCode:%s", keyID, verifyCode)
 	return verifyCode
 }
 

business/auth2/authprovider/dingding/qrcode.go

@@ -4,7 +4,6 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/auth2"
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider"
-	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
@@ -34,7 +33,6 @@ func (a *QRCodeAuther) VerifySecret(dummy, code string) (*auth2.AuthBindEx, erro
 	if err != nil {
 		return nil, err
 	}
-	globals.SugarLogger.Debugf("dingding qrcode VerifySecret code:%s, userQRInfo:%s", code, utils.Format4Output(userQRInfo, false))
 	authBindEx, err := a.UnionFindAuthBind(AuthTypeQRCode, api.DingDingQRCodeAPI.GetAppID(), []string{AuthTypeStaff, AuthTypeQRCode}, userQRInfo.OpenID, userQRInfo.UnionID, userQRInfo)
 	if err != nil {
 		return nil, err

business/auth2/authprovider/dingding/staff.go

@@ -22,7 +22,10 @@ func init() {
 }
 
 func (a *StaffAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthBindEx, err error) {
+<<<<<<< HEAD
 
+=======
+>>>>>>> b751c9442459defeaf01c6881116e08f1d8f0b47
 	userID, err := api.DingDingAPI.GetUserID(code)
 	if err == nil {
 		userDetail, err2 := api.DingDingAPI.GetUserDetail(userID.UserID)

business/auth2/authprovider/douyin/tiktop_mini.go

@@ -30,13 +30,11 @@ func init() {
 }
 
 func (a *TiktopMiniAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthBindEx, err error) {
-	globals.SugarLogger.Debugf("toktok mini VerifySecret jsCode:%s", code)
 	appID, realCode := splitCode(code)
 	sessionInfo, err := getTikTokApp(appID).GetTiktokOauth(realCode)
 	if err != nil {
 		return nil, err
 	}
-	globals.SugarLogger.Debug("toktok mini VerifySecret sessionInfo:", sessionInfo)
 	sessionKey := sessionInfo.Data.SessionKey
 	if authBindEx, err = a.UnionFindAuthBind(AuthTypeTiktokMini, api.TiktokApi.GetAppID(), []string{AuthTypeTiktokMini}, sessionInfo.Data.OpenId, sessionInfo.Data.Unionid, sessionInfo); err == nil {
 		authBindEx.UserData = sessionKey
@@ -46,7 +44,6 @@ func (a *TiktopMiniAuther) VerifySecret(dummy, code string) (authBindEx *auth2.A
 
 // 特殊接口
 func (a *TiktopMiniAuther) DecryptData(authInfo *auth2.AuthInfo, jsCode, encryptedData, iv string) (decryptedDataBase64 string, err error) {
-	globals.SugarLogger.Debugf("weixin mini DecryptData jsCode:%s, encryptedData:%s, iv:%s", jsCode, encryptedData, iv)
 	var sessionKey string
 	appID, jsCode := weixin.SplitJsCode(jsCode)
 	if jsCode != "" {
@@ -106,6 +103,5 @@ func splitCode(code string) (appID, realCode string) {
 	} else {
 		globals.SugarLogger.Warnf("splitCode abnormal code:%s", code)
 	}
-	globals.SugarLogger.Debug("dayin realCode", realCode)
 	return appID, realCode
 }

business/auth2/authprovider/mobile/mobile.go

@@ -68,7 +68,6 @@ func (a *Auther) SendVerifyCode(mobileNumber string) (verifyCode string, err err
 }
 
 func (a *Auther) VerifySecret(mobileNumber, code string) (authBindEx *auth2.AuthBindEx, err error) {
-
 	err = ErrVerifyCodeIsWrong
 	if (code == auth2.InternalAuthSecret ||
 		auth2.TestMobileMap[mobileNumber] == 1 && code == TestVerifyCode) ||

business/auth2/authprovider/weixin/weixin_mini.go

@@ -34,7 +34,6 @@ func init() {
 }
 
 func (a *MiniAuther) VerifySecret(dummy, jsCode string) (authBindEx *auth2.AuthBindEx, err error) {
-
 	appID, jsCode := SplitJsCode(jsCode)
 	sessionInfo, err := getWxApp(appID).SNSCode2Session(jsCode)
 	if err == nil {