diff --git a/platformapi/q_bida/QBiDa_test.go b/platformapi/q_bida/QBiDa_test.go index 1a993a32..eb4fd3f5 100644 --- a/platformapi/q_bida/QBiDa_test.go +++ b/platformapi/q_bida/QBiDa_test.go @@ -17,7 +17,6 @@ func init() { logger, _ := zap.NewDevelopment() sugarLogger = logger.Sugar() baseapi.Init(sugarLogger) - globals.SugarLogger.Debug("加载配置") } // 获取登录 diff --git a/platformapi/q_bida/q_bida_client.go b/platformapi/q_bida/q_bida_client.go index e6fa544e..31fa2687 100644 --- a/platformapi/q_bida/q_bida_client.go +++ b/platformapi/q_bida/q_bida_client.go @@ -3,7 +3,6 @@ package q_bida import ( "errors" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" "net/http" "strings" "time" @@ -61,7 +60,6 @@ func (a *Api) GetExpressPrice(param *GetExpressPriceReq) (*GetExpressPriceRes, e return resultData, nil } - // CreateOrder 创建订单 func (a *Api) CreateOrder(param *MakeOrderReq) (string, error) { if err := a.CheckTokenExpiration(); err != nil { @@ -94,7 +92,6 @@ func (a *Api) CancelOrder(param *CancelOrderReq) error { } resultData := &PublicParams{} - globals.SugarLogger.Debug("resultData===================", resultData.Code, resultData.Msg) if err := utils.Map2StructByJson(result, resultData, false); err != nil { return err } diff --git a/platformapi/tiktok/tiktok.go b/platformapi/tiktok/tiktok.go index ffec9be8..5b1e46db 100644 --- a/platformapi/tiktok/tiktok.go +++ b/platformapi/tiktok/tiktok.go @@ -35,7 +35,6 @@ func (a *API) AccessAPI2(url string, params map[string]interface{}) (retVal map[ if err != nil { return nil, err } - globals.SugarLogger.Debug("进入AccessAPI2,DATA=================", data) err = platformapi.AccessPlatformAPIWithRetry(a.client, func() *http.Request { request, _ := http.NewRequest(http.MethodPost, url, strings.NewReader(string(data))) diff --git a/platformapi/tiktok/tiktok_pay.go b/platformapi/tiktok/tiktok_pay.go index 97f7e83a..c4c0095b 100644 --- a/platformapi/tiktok/tiktok_pay.go +++ b/platformapi/tiktok/tiktok_pay.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" "sort" "strings" "time" @@ -67,7 +66,6 @@ func (a *API) GetTiktokToken() error { //tokenReq["appid"] = TiktokAppId //tokenReq["secret"] = TiktokSecret tokenReq["grant_type"] = "client_credential" - globals.SugarLogger.Debug("=============", tokenReq) result, err := a.AccessAPI2(GetTiktokToken, tokenReq) if err != nil { return err diff --git a/platformapi/tiktok_shop/tiktok_api/afs_test.go b/platformapi/tiktok_shop/tiktok_api/afs_test.go index e2e12724..33c32c71 100644 --- a/platformapi/tiktok_shop/tiktok_api/afs_test.go +++ b/platformapi/tiktok_shop/tiktok_api/afs_test.go @@ -1,6 +1,9 @@ package tiktok_api -import "testing" +import ( + "fmt" + "testing" +) var token = `{"access_token":"60f530b2-9ab6-4723-b487-c094918f0d21","expires_in":1666257163,"scope":"SCOPE","shop_id":"","shop_name":"小时达开放平台对接专用店","refresh_token":"1220666a-5e88-458c-a8c0-06d949fbbd3f","authority_id":""}` var a = New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", token) @@ -13,4 +16,5 @@ func TestAfsOrder(t *testing.T) { // 同意/拒绝售后单 func TestAggreOrNotAggreAfs(t *testing.T) { //a.AfterSaleOperate() + fmt.Println("11", 8|16|32|1) } diff --git a/platformapi/tiktok_shop/tiktok_api/api.go b/platformapi/tiktok_shop/tiktok_api/api.go index 692a50c9..72fc3745 100644 --- a/platformapi/tiktok_shop/tiktok_api/api.go +++ b/platformapi/tiktok_shop/tiktok_api/api.go @@ -78,9 +78,6 @@ func (a *API) CreateToken(code string) (*doudian_sdk.CreateTokenData, error) { a.refreshToken = access.RefreshToken a.expiresIn = time.Now().Unix() + access.ExpiresIn a.accessTokenObj = access - // 不要 - strData, _ := json.Marshal(access) - globals.SugarLogger.Debug("=========", string(strData)) return &access.CreateTokenData, nil } @@ -102,13 +99,10 @@ func (a *API) RefreshToken() (*doudian_sdk.CreateTokenData, error) { a.accessToken = createToken.Data.AccessToken a.refreshToken = createToken.Data.RefreshToken a.expiresIn = time.Now().Unix() + createToken.Data.ExpiresIn - globals.SugarLogger.Debug("===============data", createToken.Data) a.accessTokenObj.CreateTokenData = createToken.Data // 不要 createToken.Data.ExpiresIn = a.expiresIn - strData, _ := json.Marshal(createToken.Data) - globals.SugarLogger.Debug("=========", string(strData)) return &createToken.Data, nil } diff --git a/platformapi/tiktok_shop/tiktok_api/logistics_express.go b/platformapi/tiktok_shop/tiktok_api/logistics_express.go index 97206d8a..fe028e2e 100644 --- a/platformapi/tiktok_shop/tiktok_api/logistics_express.go +++ b/platformapi/tiktok_shop/tiktok_api/logistics_express.go @@ -99,13 +99,10 @@ func (a *APIExpress) RefreshToken() (*doudian_sdk.CreateTokenData, error) { a.accessToken = createToken.Data.AccessToken a.refreshToken = createToken.Data.RefreshToken a.expiresIn = time.Now().Unix() + createToken.Data.ExpiresIn - globals.SugarLogger.Debug("===============data", createToken.Data) // 不要 createToken.Data.ExpiresIn = a.expiresIn - strData, _ := json.Marshal(createToken.Data) a.accessTokenObj.CreateTokenData = createToken.Data - globals.SugarLogger.Debug("=========", string(strData)) return &createToken.Data, nil } diff --git a/platformapi/tiktok_shop/tiktok_api/order.go b/platformapi/tiktok_shop/tiktok_api/order.go index ccf0640a..8516e606 100644 --- a/platformapi/tiktok_shop/tiktok_api/order.go +++ b/platformapi/tiktok_shop/tiktok_api/order.go @@ -325,8 +325,6 @@ func (a *API) LogisticsAdd(orderId string, companyCode string, isRefundReject bo // CreateOrderCallback 订单创建,抖店创建订单后,回调消息通知本服务器 func (a *API) CreateOrderCallback(orderStatus []byte) (map[string][]interface{}, *CallbackResponse) { - globals.SugarLogger.Debugf("88888888888888=%s", utils.Format4Output(string(orderStatus), false)) - var resp []*OrderCallback if err := json.Unmarshal(orderStatus, &resp); err != nil { baseapi.SugarLogger.Debugf("Tiktok Notify failed with err:%v", err) diff --git a/platformapi/tiktok_shop/tiktok_api/sku.go b/platformapi/tiktok_shop/tiktok_api/sku.go index 798011d5..c042d52b 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku.go +++ b/platformapi/tiktok_shop/tiktok_api/sku.go @@ -37,7 +37,6 @@ func (a *API) UpdateSkuStock(param *sku_syncStock_request.SkuSyncStockParam) err request := sku_syncStock_request.New() request.Param = param resp, err := request.Execute(a.accessTokenObj) - globals.SugarLogger.Debug("======/sku/syncStock:%s", utils.Format4Output(resp, false)) if err != nil { return err } @@ -101,6 +100,7 @@ func (a *API) GetCatePropertyV2(categoryLeftId int64) (*product_getCatePropertyV if err != nil { return nil, err } + globals.SugarLogger.Debugf("GetCatePropertyV2-------------api:=%s", utils.Format4Output(result, false)) if result.Code != RequestSuccessCode { return nil, errors.New(result.SubMsg) } @@ -117,7 +117,6 @@ func (a *API) CreateStoreCommodity(skuParam *product_addV2_request.ProductAddV2P return nil, err } - globals.SugarLogger.Debug("=========/product/addV2", utils.Format4Output(result, false)) if result.Code != RequestSuccessCode { return nil, errors.New(result.SubMsg) } diff --git a/platformapi/tiktok_shop/tiktok_api/sku_test.go b/platformapi/tiktok_shop/tiktok_api/sku_test.go index f885fab0..cd0c0ca5 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku_test.go +++ b/platformapi/tiktok_shop/tiktok_api/sku_test.go @@ -36,9 +36,7 @@ func TestCategory(t *testing.T) { } func TestGetCatePropertyV2(t *testing.T) { - token := `{"access_token":"a1746210-a8a3-4497-a87b-09d1f10dbb95","expires_in":1665652230,"scope":"SCOPE","shop_id":"","shop_name":"小时达开放平台对接专用店","refresh_token":"c1cf8d88-0983-4f2a-b969-3746fae6b0cd","authority_id":""}` - a := New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", token) - data, err := a.GetCatePropertyV2(23065) + data, err := a.GetCatePropertyV2(22531) fmt.Println("err=====", err) fmt.Println("data====", data) // 202209281558450102081001701D7B32C5 } diff --git a/platformapi/tiktok_shop/tiktok_api/store.go b/platformapi/tiktok_shop/tiktok_api/store.go index 78401fbd..273944a8 100644 --- a/platformapi/tiktok_shop/tiktok_api/store.go +++ b/platformapi/tiktok_shop/tiktok_api/store.go @@ -67,7 +67,6 @@ func (a *API) GetStoreDetail(param *shop_getStoreDetail_request.ShopGetStoreDeta //BatchCreateStore 批量创建门店 func (a *API) BatchCreateStore(param *shop_batchCreateStore_request.ShopBatchCreateStoreParam) (*shop_batchCreateStore_response.ShopBatchCreateStoreData, error) { - globals.SugarLogger.Debug("=========创建抖音门店api") globals.SugarLogger.Debugf("BatchCreateStore:%s", utils.Format4Output(param, true)) request := shop_batchCreateStore_request.New() request.Param = param @@ -78,13 +77,11 @@ func (a *API) BatchCreateStore(param *shop_batchCreateStore_request.ShopBatchCre if response.Code != RequestSuccessCode { return nil, errors.New(response.SubMsg) } - globals.SugarLogger.Debug("BatchCreateStore:response.Data============%v", response.Data) return response.Data, nil } // EditStore 编辑门店 func (a *API) EditStore(param *shop_editStore_request.ShopEditStoreParam) (*shop_editStore_response.ShopEditStoreData, error) { - globals.SugarLogger.Debug("=========EditStore") globals.SugarLogger.Debugf("EditStore EditStore:%s", utils.Format4Output(param, true)) request := shop_editStore_request.New() request.Param = param diff --git a/platformapi/wxpayapi/callback.go b/platformapi/wxpayapi/callback.go index 189a7ffa..488a12db 100644 --- a/platformapi/wxpayapi/callback.go +++ b/platformapi/wxpayapi/callback.go @@ -9,7 +9,6 @@ import ( "strings" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" "github.com/clbanning/mxj" "github.com/nanjishidu/gomini/gocrypto" ) @@ -176,7 +175,6 @@ func (a *API) getCallbackMsg(msgBody string) (msg *CallbackMsg, callbackResponse sign := utils.Interface2String(mapData[sigKey]) desiredSign := a.signParam(sigType, mapData) if desiredSign != sign { - globals.SugarLogger.Debugf("transactionID:%s, sigType:%s, desiredSign:%s <> sign:%s", transactionID, sigType, desiredSign, sign) return nil, Err2CallbackResponse(fmt.Errorf("desiredSign:%s <> sign:%s", desiredSign, sign), "") } } diff --git a/utils/routinepool/routinepool.go b/utils/routinepool/routinepool.go index 9d5fbcc0..7bce03e9 100644 --- a/utils/routinepool/routinepool.go +++ b/utils/routinepool/routinepool.go @@ -7,8 +7,6 @@ import ( "runtime/debug" "git.rosy.net.cn/baseapi" - "git.rosy.net.cn/jx-callback/globals" - "git.rosy.net.cn/baseapi/utils" ) @@ -71,22 +69,18 @@ func taskFun(taskChan chan *TaskParam, index int) { } func (p *Pool) callFun(func4Call func(), primaryID string, isAsync bool) (r interface{}) { - result := md5.Sum([]byte(primaryID+utils.GetUUID())) + result := md5.Sum([]byte(primaryID + utils.GetUUID())) resultInt64 := int64(binary.LittleEndian.Uint32(result[8:])) chanIndex := int(resultInt64 % int64(p.curRoutineCount)) - globals.SugarLogger.Debugf("callFun1 %v , %v", chanIndex, primaryID) chanParam := &TaskParam{ handler: func4Call, } if !isAsync { chanParam.resultChan = make(chan interface{}) } - globals.SugarLogger.Debugf("callFun2 %v , %v", chanIndex, primaryID) p.taskChans[chanIndex] <- chanParam - globals.SugarLogger.Debugf("callFun3 %v , %v", chanIndex, primaryID) if !isAsync { r = <-chanParam.resultChan - globals.SugarLogger.Debugf("callFun4 %v , %v", chanIndex, primaryID) close(chanParam.resultChan) } return r