From fbd735311c87cc171980bda9902820d39d29b8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 24 Oct 2022 20:57:13 +0800 Subject: [PATCH 1/9] 1 --- controllers/tiktok_store.go | 53 ++++++++++++++++++++++++++++++------- globals/globals.go | 2 ++ 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/controllers/tiktok_store.go b/controllers/tiktok_store.go index b2517fdf9..df4a3c287 100644 --- a/controllers/tiktok_store.go +++ b/controllers/tiktok_store.go @@ -1,7 +1,11 @@ package controllers import ( + "crypto/aes" + "crypto/cipher" + "encoding/base64" "encoding/json" + "errors" "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxstore/common" @@ -11,6 +15,7 @@ import ( "github.com/astaxie/beego/server/web" "io/ioutil" "net/http" + "strings" "time" ) @@ -18,6 +23,39 @@ type TiktokShopController struct { web.Controller } +func AesDecrypt(msgSecret, appSecret string) (string, error) { + var appSecretArr = []byte(strings.ReplaceAll(appSecret, "-", "")) + bytesPass, err := base64.StdEncoding.DecodeString(msgSecret) + if err != nil { + return "", errors.New("解密失败！！！") + } + sourceMsg, err := DoAesDecrypt(bytesPass, appSecretArr) + if err != nil { + return "", errors.New("解密失败！！！") + } + return string(sourceMsg), nil +} + +func DoAesDecrypt(encryptedMsg, key []byte) ([]byte, error) { + block, err := aes.NewCipher(key) + if err != nil { + return nil, err + } + //AES分组长度为128位，所以blockSize=16，单位字节 + blockSize := block.BlockSize() + blockMode := cipher.NewCBCDecrypter(block, key[:blockSize]) //初始向量的长度必须等于块block的长度16字节 + origData := make([]byte, len(encryptedMsg)) + blockMode.CryptBlocks(origData, encryptedMsg) + origData = PKCS5UnPadding(origData) + return origData, nil +} + +func PKCS5UnPadding(origData []byte) []byte { + length := len(origData) + unfilledNum := int(origData[length-1]) + return origData[:(length - unfilledNum)] +} + func (c *TiktokShopController) TokenMsg() { req := c.Ctx.Request var code []string @@ -25,34 +63,28 @@ func (c *TiktokShopController) TokenMsg() { case http.MethodPost: data, err := ioutil.ReadAll(req.Body) if err != nil { - globals.SugarLogger.Debugf("MethodPost=====err%s", utils.Format4Output(err, false)) c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} c.ServeJSON() return } - globals.SugarLogger.Debugf("data=====err%s", string(data)) - if err := json.Unmarshal(data, &code); err != nil { - globals.SugarLogger.Debugf("Unmarshal=====err%s", utils.Format4Output(err, false)) + codeToken, err := AesDecrypt(string(data), globals.TiktokShopAppSecret) + if err != nil { c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} c.ServeJSON() - return } + code = append(code, codeToken) case http.MethodGet: codeValues := req.URL.Query() - globals.SugarLogger.Debugf("codeValues=====%s", utils.Format4Output(codeValues, false)) codeList := codeValues.Get("code") - globals.SugarLogger.Debugf("codeList=====%s", utils.Format4Output(codeList, false)) - globals.SugarLogger.Debugf("codeValues.Get(code)===%s", utils.Format4Output(codeValues.Get("Code"), false)) if err := json.Unmarshal([]byte(string(codeList)), &code); err != nil { - globals.SugarLogger.Debugf("codeList=====err%s", utils.Format4Output(err, false)) c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} c.ServeJSON() return } } - globals.SugarLogger.Debugf("code ==================%s", utils.Format4Output(code, false)) + globals.SugarLogger.Debugf("code ==================%s", utils.Format4Output(code, false)) if len(code) == 0 { c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} c.ServeJSON() @@ -66,6 +98,7 @@ func (c *TiktokShopController) TokenMsg() { c.ServeJSON() return } + globals.SugarLogger.Debugf("result=====%s", utils.Format4Output(result, false)) result.ExpiresIn += time.Now().Unix() diff --git a/globals/globals.go b/globals/globals.go index 158606505..3131c4774 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -82,6 +82,7 @@ var ( IsAddEvent bool OutputDebugMsgLevel int + TiktokShopAppSecret string ) func init() { @@ -164,6 +165,7 @@ func Init() { JdLoginName = web.AppConfig.DefaultString("jdLoginName", "") IsAddEvent = web.AppConfig.DefaultBool("addEvent", false) TictokpayNotifyURL = web.AppConfig.DefaultString("tiktokNotifyUrl", "") + TiktokShopAppSecret = web.AppConfig.DefaultString("tiktokShopAppSecret", "") IsStoreSkuAct = !IsProductEnv() From 79a71573904b7a52e6c4f2ae395d64e15c10f294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 24 Oct 2022 21:24:35 +0800 Subject: [PATCH 2/9] 1 --- controllers/tiktok_store.go | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/controllers/tiktok_store.go b/controllers/tiktok_store.go index df4a3c287..ff1cf7626 100644 --- a/controllers/tiktok_store.go +++ b/controllers/tiktok_store.go @@ -56,6 +56,17 @@ func PKCS5UnPadding(origData []byte) []byte { return origData[:(length - unfilledNum)] } +type Code struct { + MsgType int64 `json:"msg_type"` + msg struct { + ActionType int64 `json:"action_type"` + AppId int64 `json:"app_id"` + ShopId int64 `json:"shop_id"` + Code string `json:"code"` + CodeGenerateTime string `json:"code_generate_time"` + } +} + func (c *TiktokShopController) TokenMsg() { req := c.Ctx.Request var code []string @@ -77,11 +88,16 @@ func (c *TiktokShopController) TokenMsg() { case http.MethodGet: codeValues := req.URL.Query() codeList := codeValues.Get("code") - if err := json.Unmarshal([]byte(string(codeList)), &code); err != nil { + + codeResult := make([]Code, 0, 0) + if err := json.Unmarshal([]byte(string(codeList)), &codeResult); err != nil { c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} c.ServeJSON() return } + for _, v := range codeResult { + code = append(code, v.msg.Code) + } } globals.SugarLogger.Debugf("code ==================%s", utils.Format4Output(code, false)) From 8682734c9ca666755eea69f683601e8bd90d6389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 24 Oct 2022 21:28:45 +0800 Subject: [PATCH 3/9] 1 --- controllers/tiktok_store.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/controllers/tiktok_store.go b/controllers/tiktok_store.go index ff1cf7626..e3062e230 100644 --- a/controllers/tiktok_store.go +++ b/controllers/tiktok_store.go @@ -84,13 +84,9 @@ func (c *TiktokShopController) TokenMsg() { c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} c.ServeJSON() } - code = append(code, codeToken) - case http.MethodGet: - codeValues := req.URL.Query() - codeList := codeValues.Get("code") codeResult := make([]Code, 0, 0) - if err := json.Unmarshal([]byte(string(codeList)), &codeResult); err != nil { + if err := json.Unmarshal([]byte(codeToken), &codeResult); err != nil { c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} c.ServeJSON() return @@ -98,6 +94,15 @@ func (c *TiktokShopController) TokenMsg() { for _, v := range codeResult { code = append(code, v.msg.Code) } + case http.MethodGet: + codeValues := req.URL.Query() + codeList := codeValues.Get("code") + + if err := json.Unmarshal([]byte(string(codeList)), &code); err != nil { + c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} + c.ServeJSON() + return + } } globals.SugarLogger.Debugf("code ==================%s", utils.Format4Output(code, false)) From b7f0dfb2800e0ea0a9f3eb863d5a8317bb744b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 24 Oct 2022 21:32:43 +0800 Subject: [PATCH 4/9] 1 --- controllers/tiktok_store.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/controllers/tiktok_store.go b/controllers/tiktok_store.go index e3062e230..a75fc78d7 100644 --- a/controllers/tiktok_store.go +++ b/controllers/tiktok_store.go @@ -85,12 +85,16 @@ func (c *TiktokShopController) TokenMsg() { c.ServeJSON() } + globals.SugarLogger.Debugf("codeToken============%s", utils.Format4Output(codeToken, false)) codeResult := make([]Code, 0, 0) if err := json.Unmarshal([]byte(codeToken), &codeResult); err != nil { + globals.SugarLogger.Debugf("err============%s", utils.Format4Output(codeToken, false)) c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} c.ServeJSON() return } + globals.SugarLogger.Debugf("codeResult============%s", utils.Format4Output(codeResult, false)) + for _, v := range codeResult { code = append(code, v.msg.Code) } From 5148b9d97754c7b1a5081e94b17436bc84c03846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 24 Oct 2022 21:37:45 +0800 Subject: [PATCH 5/9] 1 --- controllers/tiktok_store.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/controllers/tiktok_store.go b/controllers/tiktok_store.go index a75fc78d7..574650d5c 100644 --- a/controllers/tiktok_store.go +++ b/controllers/tiktok_store.go @@ -86,7 +86,7 @@ func (c *TiktokShopController) TokenMsg() { } globals.SugarLogger.Debugf("codeToken============%s", utils.Format4Output(codeToken, false)) - codeResult := make([]Code, 0, 0) + var codeResult Code if err := json.Unmarshal([]byte(codeToken), &codeResult); err != nil { globals.SugarLogger.Debugf("err============%s", utils.Format4Output(codeToken, false)) c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} @@ -94,10 +94,7 @@ func (c *TiktokShopController) TokenMsg() { return } globals.SugarLogger.Debugf("codeResult============%s", utils.Format4Output(codeResult, false)) - - for _, v := range codeResult { - code = append(code, v.msg.Code) - } + code = append(code, codeResult.msg.Code) case http.MethodGet: codeValues := req.URL.Query() codeList := codeValues.Get("code") From 42eda07e55964dcc46cbac7e45a87e86233b0983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 24 Oct 2022 21:38:09 +0800 Subject: [PATCH 6/9] 1 --- controllers/tiktok_store.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/tiktok_store.go b/controllers/tiktok_store.go index 574650d5c..3662242bd 100644 --- a/controllers/tiktok_store.go +++ b/controllers/tiktok_store.go @@ -141,8 +141,8 @@ func (c *TiktokShopController) TokenMsg() { EmpowerURL: "https://fuwu.jinritemai.com/detail?from=open_partner_svcList&service_id=24070", StoreBrandName: result.ShopName, Token: string(data), - AppKey: "", // web.AppConfig.DefaultString("tiktokShopAppId", "7136048270014416392"), - AppSecret: "", // web.AppConfig.DefaultString("tiktokShopAppSecret", "c397aa9f-3927-47c4-8cfe-4d84e02602e0") + AppKey: "hhhh", // web.AppConfig.DefaultString("tiktokShopAppId", "7136048270014416392"), + AppSecret: "heihei", // web.AppConfig.DefaultString("tiktokShopAppSecret", "c397aa9f-3927-47c4-8cfe-4d84e02602e0") } if err := common.AddVendorOrgCode(nil, param); err != nil { c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} From 475044fd4b102e4aef30862b0526a90d0e825ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 24 Oct 2022 21:45:35 +0800 Subject: [PATCH 7/9] 1 --- business/jxstore/common/common.go | 4 +++- controllers/tiktok_store.go | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/business/jxstore/common/common.go b/business/jxstore/common/common.go index e11d5cebc..94fc81b71 100644 --- a/business/jxstore/common/common.go +++ b/business/jxstore/common/common.go @@ -280,7 +280,9 @@ func AddVendorOrgCode(ctx *jxcontext.Context, vendorOrgCode *model.VendorOrgCode return err } if len(list) > 0 { - return fmt.Errorf("库里有这个账号了，[%v]", vendorOrgCode.VendorOrgCode) + vendorOrgCode.ID = list[0].ID + _, err = dao.UpdateEntity(db, vendorOrgCode, "token", "updated_at", "app_key", "app_secret") + return err } var userName string diff --git a/controllers/tiktok_store.go b/controllers/tiktok_store.go index 3662242bd..c26b711d5 100644 --- a/controllers/tiktok_store.go +++ b/controllers/tiktok_store.go @@ -16,7 +16,6 @@ import ( "io/ioutil" "net/http" "strings" - "time" ) type TiktokShopController struct { @@ -123,7 +122,6 @@ func (c *TiktokShopController) TokenMsg() { globals.SugarLogger.Debugf("result=====%s", utils.Format4Output(result, false)) - result.ExpiresIn += time.Now().Unix() data, err := json.Marshal(result) if err != nil { c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} @@ -145,6 +143,7 @@ func (c *TiktokShopController) TokenMsg() { AppSecret: "heihei", // web.AppConfig.DefaultString("tiktokShopAppSecret", "c397aa9f-3927-47c4-8cfe-4d84e02602e0") } if err := common.AddVendorOrgCode(nil, param); err != nil { + globals.SugarLogger.Debugf("AddVendorOrgCode=====err%s", err) c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} c.ServeJSON() return From 6bb26fed160eca0da4bee7bf40775097fc6f6978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 24 Oct 2022 21:53:59 +0800 Subject: [PATCH 8/9] 1 --- controllers/tiktok_store.go | 99 ++++++++++++++++++++----------------- 1 file changed, 53 insertions(+), 46 deletions(-) diff --git a/controllers/tiktok_store.go b/controllers/tiktok_store.go index c26b711d5..1064416c4 100644 --- a/controllers/tiktok_store.go +++ b/controllers/tiktok_store.go @@ -56,19 +56,21 @@ func PKCS5UnPadding(origData []byte) []byte { } type Code struct { - MsgType int64 `json:"msg_type"` - msg struct { - ActionType int64 `json:"action_type"` - AppId int64 `json:"app_id"` - ShopId int64 `json:"shop_id"` - Code string `json:"code"` - CodeGenerateTime string `json:"code_generate_time"` - } + MsgType int64 `json:"msg_type"` + Msg string `json:"msg"` +} + +type MsgDetail struct { + ActionType int `json:"action_type"` + AppId int64 `json:"app_id"` + ShopId int `json:"shop_id"` + Code string `json:"code"` + CodeGenerateTime string `json:"code_generate_time"` } func (c *TiktokShopController) TokenMsg() { req := c.Ctx.Request - var code []string + var code string switch req.Method { case http.MethodPost: data, err := ioutil.ReadAll(req.Body) @@ -85,15 +87,22 @@ func (c *TiktokShopController) TokenMsg() { } globals.SugarLogger.Debugf("codeToken============%s", utils.Format4Output(codeToken, false)) - var codeResult Code - if err := json.Unmarshal([]byte(codeToken), &codeResult); err != nil { + var codeMsg Code + if err := json.Unmarshal([]byte(codeToken), &codeMsg); err != nil { globals.SugarLogger.Debugf("err============%s", utils.Format4Output(codeToken, false)) c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} c.ServeJSON() return } - globals.SugarLogger.Debugf("codeResult============%s", utils.Format4Output(codeResult, false)) - code = append(code, codeResult.msg.Code) + + var msg MsgDetail + if err := json.Unmarshal([]byte(codeMsg.Msg), &msg); err != nil { + globals.SugarLogger.Debugf("err============%s", utils.Format4Output(codeToken, false)) + c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} + c.ServeJSON() + return + } + code = msg.Code case http.MethodGet: codeValues := req.URL.Query() codeList := codeValues.Get("code") @@ -112,42 +121,40 @@ func (c *TiktokShopController) TokenMsg() { return } - for _, v := range code { - result, err := api.TiktokStore.CreateToken(v) - if err != nil { - c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} - c.ServeJSON() - return - } + result, err := api.TiktokStore.CreateToken(code) + if err != nil { + c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} + c.ServeJSON() + return + } - globals.SugarLogger.Debugf("result=====%s", utils.Format4Output(result, false)) + globals.SugarLogger.Debugf("result=====%s", utils.Format4Output(result, false)) - data, err := json.Marshal(result) - if err != nil { - c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} - c.ServeJSON() - return - } + data, err := json.Marshal(result) + if err != nil { + c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} + c.ServeJSON() + return + } - param := &model.VendorOrgCode{ - VendorID: model.VendorIDDD, - VendorOrgCode: utils.Int64ToStr(result.ShopId), - Comment: "抖音授权", - VendorType: "platform", - IsJxCat: 1, - IsOpen: 1, - EmpowerURL: "https://fuwu.jinritemai.com/detail?from=open_partner_svcList&service_id=24070", - StoreBrandName: result.ShopName, - Token: string(data), - AppKey: "hhhh", // web.AppConfig.DefaultString("tiktokShopAppId", "7136048270014416392"), - AppSecret: "heihei", // web.AppConfig.DefaultString("tiktokShopAppSecret", "c397aa9f-3927-47c4-8cfe-4d84e02602e0") - } - if err := common.AddVendorOrgCode(nil, param); err != nil { - globals.SugarLogger.Debugf("AddVendorOrgCode=====err%s", err) - c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} - c.ServeJSON() - return - } + param := &model.VendorOrgCode{ + VendorID: model.VendorIDDD, + VendorOrgCode: utils.Int64ToStr(result.ShopId), + Comment: "抖音授权", + VendorType: "platform", + IsJxCat: 1, + IsOpen: 1, + EmpowerURL: "https://fuwu.jinritemai.com/detail?from=open_partner_svcList&service_id=24070", + StoreBrandName: result.ShopName, + Token: string(data), + AppKey: "hhhh", // web.AppConfig.DefaultString("tiktokShopAppId", "7136048270014416392"), + AppSecret: "heihei", // web.AppConfig.DefaultString("tiktokShopAppSecret", "c397aa9f-3927-47c4-8cfe-4d84e02602e0") + } + if err := common.AddVendorOrgCode(nil, param); err != nil { + globals.SugarLogger.Debugf("AddVendorOrgCode=====err%s", err) + c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} + c.ServeJSON() + return } c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackSuccessCode, Msg: tiktok_api.CallbackSuccess} c.ServeJSON() From 1f9cea6966852f936aae5bb4baeece546e676fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 24 Oct 2022 22:03:50 +0800 Subject: [PATCH 9/9] 1 --- business/jxstore/common/common.go | 2 +- controllers/tiktok_store.go | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/business/jxstore/common/common.go b/business/jxstore/common/common.go index 94fc81b71..12b9136e7 100644 --- a/business/jxstore/common/common.go +++ b/business/jxstore/common/common.go @@ -281,7 +281,7 @@ func AddVendorOrgCode(ctx *jxcontext.Context, vendorOrgCode *model.VendorOrgCode } if len(list) > 0 { vendorOrgCode.ID = list[0].ID - _, err = dao.UpdateEntity(db, vendorOrgCode, "token", "updated_at", "app_key", "app_secret") + _, err = dao.UpdateEntity(db, vendorOrgCode, "token", "updated_at", "app_key", "app_secret", "comment", "vendor_org_code") return err } diff --git a/controllers/tiktok_store.go b/controllers/tiktok_store.go index 1064416c4..bdfa95fd0 100644 --- a/controllers/tiktok_store.go +++ b/controllers/tiktok_store.go @@ -86,10 +86,8 @@ func (c *TiktokShopController) TokenMsg() { c.ServeJSON() } - globals.SugarLogger.Debugf("codeToken============%s", utils.Format4Output(codeToken, false)) var codeMsg Code if err := json.Unmarshal([]byte(codeToken), &codeMsg); err != nil { - globals.SugarLogger.Debugf("err============%s", utils.Format4Output(codeToken, false)) c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} c.ServeJSON() return @@ -97,7 +95,6 @@ func (c *TiktokShopController) TokenMsg() { var msg MsgDetail if err := json.Unmarshal([]byte(codeMsg.Msg), &msg); err != nil { - globals.SugarLogger.Debugf("err============%s", utils.Format4Output(codeToken, false)) c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} c.ServeJSON() return @@ -114,7 +111,6 @@ func (c *TiktokShopController) TokenMsg() { } } - globals.SugarLogger.Debugf("code ==================%s", utils.Format4Output(code, false)) if len(code) == 0 { c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} c.ServeJSON() @@ -128,8 +124,6 @@ func (c *TiktokShopController) TokenMsg() { return } - globals.SugarLogger.Debugf("result=====%s", utils.Format4Output(result, false)) - data, err := json.Marshal(result) if err != nil { c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} @@ -140,18 +134,17 @@ func (c *TiktokShopController) TokenMsg() { param := &model.VendorOrgCode{ VendorID: model.VendorIDDD, VendorOrgCode: utils.Int64ToStr(result.ShopId), - Comment: "抖音授权", + Comment: result.ShopName, VendorType: "platform", IsJxCat: 1, IsOpen: 1, EmpowerURL: "https://fuwu.jinritemai.com/detail?from=open_partner_svcList&service_id=24070", StoreBrandName: result.ShopName, Token: string(data), - AppKey: "hhhh", // web.AppConfig.DefaultString("tiktokShopAppId", "7136048270014416392"), - AppSecret: "heihei", // web.AppConfig.DefaultString("tiktokShopAppSecret", "c397aa9f-3927-47c4-8cfe-4d84e02602e0") + AppKey: "", // web.AppConfig.DefaultString("tiktokShopAppId", "7136048270014416392"), + AppSecret: "", // web.AppConfig.DefaultString("tiktokShopAppSecret", "c397aa9f-3927-47c4-8cfe-4d84e02602e0") } if err := common.AddVendorOrgCode(nil, param); err != nil { - globals.SugarLogger.Debugf("AddVendorOrgCode=====err%s", err) c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} c.ServeJSON() return