From b92cff33389e0e78b0dcd350bcd672d4b46b4377 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 8 Jan 2020 10:38:55 +0800
Subject: [PATCH] =?UTF-8?q?!token=E6=94=B9=E4=B8=BA7=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/auth2/auth2.go           | 11 ++++++-----
 business/jxstore/cms/store_sku.go |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go
index da46bbc13..b023acaed 100644
--- a/business/auth2/auth2.go
+++ b/business/auth2/auth2.go
@@ -157,7 +157,7 @@ func getFixedTokenName(token string) *AuthInfo {
 }
 
 func createAuthInfo(user IUser, authBindInfo *AuthBindEx) (authInfo *AuthInfo) {
-	token, tokenType := createToken(user)
+	token, tokenType := createToken(user, authBindInfo)
 	expireDuration := DefTokenDuration
 	authInfo = &AuthInfo{
 		AuthBindInfo: authBindInfo,
@@ -378,9 +378,9 @@ func ClearUserToken(userID string) {
 
 /////////////
 
-func createToken(user IUser) (token string, tokenType int) {
+func createToken(user IUser, authBindInfo *AuthBindEx) (token string, tokenType int) {
 	userID := TokenUserEmpty
-	userName := TokenUserEmpty
+	userName := authBindInfo.AuthID
 	tokenType = TokenTypeOnlyAuth
 	if user != nil {
 		userID = user.GetID()
@@ -392,8 +392,9 @@ func createToken(user IUser) (token string, tokenType int) {
 		TokenVer,
 		userID,
 		time.Now().Format("20060102-150405"),
-		userName,
+		authBindInfo.Type,
 		utils.GetUUID(),
+		userName,
 	}, TokenTypeSep), tokenType
 }
 
@@ -404,7 +405,7 @@ func GetTokenType(token string) (tokenType int) {
 	tokenType = TokenTypeNone
 	if token != "" {
 		tokenPartList := strings.Split(token, TokenTypeSep)
-		if (len(tokenPartList) == 1) || (len(tokenPartList) == 6 && tokenPartList[2] != TokenUserEmpty) {
+		if (len(tokenPartList) == 1) || (len(tokenPartList) >= 6 && tokenPartList[2] != TokenUserEmpty) {
 			tokenType = TokenTypeNormal
 		} else {
 			tokenType = TokenTypeOnlyAuth
diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 65bd5c91b..446bd9ab9 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -1037,7 +1037,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 								}
 								setStoreSkuBindStatus(skuBind, model.SyncFlagNewMask)
 								dao.WrapAddIDCULDEntity(skuBind, userName)
-								globals.SugarLogger.Debug(utils.Format4Output(skuBind, false))
+								// globals.SugarLogger.Debug(utils.Format4Output(skuBind, false))
 								if deletedSku := dao.GetDeletedStoreSkuBind(db, skuBind.StoreID, skuBind.SkuID); deletedSku == nil {
 									if err = dao.CreateEntity(db, skuBind); err != nil {
 										dao.Rollback(db)