diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index 17a25cda2..995de21f0 100644 --- a/business/auth2/authprovider/defauther.go +++ b/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" ) @@ -64,8 +63,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 +143,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 } diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 7a0625401..62baf7732 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1675,7 +1675,6 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor var beforeStoreMap = *storeMap syncStatus := model.SyncFlagModifiedMask valid := dao.StrictMakeMapByStructObject(payload, storeMap, userName) - globals.SugarLogger.Debug("==============validvalidvalidvalidvalid", utils.Format4Output(valid, false)) if valid["status"] != nil { syncStatus |= model.SyncFlagStoreStatus } diff --git a/business/jxstore/cms/store_acct.go b/business/jxstore/cms/store_acct.go index 7b5383abd..2c3f7cb2c 100644 --- a/business/jxstore/cms/store_acct.go +++ b/business/jxstore/cms/store_acct.go @@ -55,7 +55,6 @@ func InsertStoreAcctIncome(ctx *jxcontext.Context, storeID, price, acctType int, storeAcctIncome.ExpID = expendID } err = dao.CreateEntity(db, storeAcctIncome) - globals.SugarLogger.Debugf("InsertStoreAcctIncome orderID: [%v] , price :[%v] , type :[%v]", vendorOrderID, price, acctType) return err } @@ -96,7 +95,6 @@ func (s *StoreAcctManager) UpdateStoreAcctBalance(ctx *jxcontext.Context, storeI var ( db = dao.GetDB() ) - globals.SugarLogger.Debugf("UpdateStoreAcctBalance storeID: [%v] , price :[%v] ,", storeID, price) if ctx == nil { ctx = jxcontext.AdminCtx } @@ -130,7 +128,6 @@ func (s *StoreAcctManager) UpdateStoreAcctBalance(ctx *jxcontext.Context, storeI dao.Rollback(db, txDB) return err } - globals.SugarLogger.Debugf("UpdateStoreAcctBalance2 storeID: [%v] , balance :[%v] ,", storeID, storeAcct.AccountBalance) } dao.Commit(db, txDB) return err diff --git a/business/jxstore/cms/storeman.go b/business/jxstore/cms/storeman.go index 8ad0be8cb..faa1d1fc3 100644 --- a/business/jxstore/cms/storeman.go +++ b/business/jxstore/cms/storeman.go @@ -26,7 +26,6 @@ func init() { func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int, storeStatus int) (err error) { //return err - globals.SugarLogger.Debugf("OnStoreStatusChanged venvendorStoreID:%s, storeStatus:%d", vendorStoreID, storeStatus) db := dao.GetDB() storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, vendorStoreID, vendorID, "") if err == nil { diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index eaec64f93..68c0cfcf0 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -559,7 +559,6 @@ func (c *ComparePlatform) CompareStoreWithOperator(ctx *jxcontext.Context, db *d } func (v *VendorSync) FullSyncStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs []int, storeIDs []int, syncDisabled bool, excludeSkuIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) { - globals.SugarLogger.Debug("FullSyncStoresSkus") hint, err = v.LoopStoresMap(ctx, db, fmt.Sprintf("初始化门店商品信息:%v", storeIDs), isAsync, true, vendorIDs, storeIDs, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { loopMapInfo := batchItemList[0].(*LoopStoreMapInfo) @@ -588,7 +587,6 @@ func (v *VendorSync) FullSyncStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, v } func (v *VendorSync) DeleteRemoteStoreSkus(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs []int, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) { - globals.SugarLogger.Debug("DeleteRemoteStoreSkus") hint, err = v.LoopStoresMap(ctx, db, fmt.Sprintf("删除远程门店商品信息:%v", storeIDs), isAsync, true, vendorIDs, storeIDs, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { loopMapInfo := batchItemList[0].(*LoopStoreMapInfo) @@ -612,7 +610,6 @@ func (v *VendorSync) DeleteRemoteStoreSkus(ctx *jxcontext.Context, db *dao.DaoDB // 将平台有,但本地没有的门店商品清除 // todo,京东到家也应该支持 func (v *VendorSync) PruneMissingStoreSkus(ctx *jxcontext.Context, vendorIDs []int, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) { - globals.SugarLogger.Debug("PruneMissingStoreSkus") hint, err = v.LoopStoresMap(ctx, dao.GetDB(), fmt.Sprintf("删除远程无关联的门店商品信息:%v", storeIDs), isAsync, true, vendorIDs, storeIDs, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { loopMapInfo := batchItemList[0].(*LoopStoreMapInfo) @@ -637,7 +634,6 @@ func (v *VendorSync) PruneMissingStoreSkus(ctx *jxcontext.Context, vendorIDs []i // 把京西有,平台无且没有待创建标记的商品加上待创建标记 // todo,京东到家也应该支持 func (v *VendorSync) AddCreateFlagForJxStoreSku(ctx *jxcontext.Context, vendorIDs []int, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) { - globals.SugarLogger.Debug("AddCreateFlagForJxStoreSku") hint, err = v.LoopStoresMap(ctx, dao.GetDB(), fmt.Sprintf("处理京西有,平台无且没有待创建标记的商品加上待创建标记:%v", storeIDs), isAsync, true, vendorIDs, storeIDs, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { loopMapInfo := batchItemList[0].(*LoopStoreMapInfo) @@ -688,7 +684,6 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.I if storeMapList, err = dao.GetStoresMapList2(db, vendorIDs, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "", "", mustDirty); err != nil { return nil, "", err } - globals.SugarLogger.Debug("===============len(storeMapList)", len(storeMapList)) if len(storeMapList) == 0 { return nil, "", nil } @@ -705,13 +700,10 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.I } index++ } - globals.SugarLogger.Debug("===============len(storeMapList)1111111111", vendorStoreMap) if len(loopInfoList) == 1 { - globals.SugarLogger.Debug("===============len(storeMapList)22222") taskName = fmt.Sprintf("%s,处理平台%s", taskName, model.VendorChineseNames[loopInfoList[0].VendorID]) } - globals.SugarLogger.Debug("===============len(storeMapList)3333") task = tasksch.NewParallelTask(taskName, tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, handler, loopInfoList) if isAsync { diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go index 596375bd5..bf547e6c2 100644 --- a/business/jxstore/cms/sync2.go +++ b/business/jxstore/cms/sync2.go @@ -92,7 +92,6 @@ func syncCategories(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch.IT } func SyncCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int, appOrgCodes []string, catIDs []int, isAsync bool) (hint string, err error) { - globals.SugarLogger.Debugf("SyncCategories vendorIDs:%v, appOrgCodes:%v, catIDs:%v", vendorIDs, appOrgCodes, catIDs) db := dao.GetDB() catList, err := dao.GetSkuCategoryWithVendor(db, vendorIDs, appOrgCodes, -1, catIDs, true) globals.SugarLogger.Debugf("SyncCategories catListLenght:%v", len(catList)) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 17d41ee95..8bd533b36 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -38,7 +38,6 @@ var ( ) func CreateStoreCategoryByStoreSku(ctx *jxcontext.Context, vendorID, storeID int, vendorStoreID string, nameIDs, skuIDs []int) (err error) { - globals.SugarLogger.Debugf("CreateStoreCategoryByStoreSku vendorID:%d, storeID:%d", vendorID, storeID) db := dao.GetDB() txDB, _ := dao.Begin(db) defer func() { @@ -513,10 +512,8 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } else { deleteList = append(deleteList, bareSku) } - globals.SugarLogger.Debug("2.stockList,deleteList==============", stockList, deleteList) } else { updateItems = append(updateItems, sku2Update(vendorID, sku, model.SyncFlagDeletedMask)) - globals.SugarLogger.Debug("3.updateItems==============", updateItems) } } else if model.IsSyncStatusNew(sku.SkuSyncStatus) { globals.SugarLogger.Debug("4.进入model.IsSyncStatusNew(sku.SkuSyncStatus)") @@ -579,12 +576,10 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag isAdded2Update = true updateList = append(updateList, calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage))) } - globals.SugarLogger.Debug("13.updateList================", updateList) } if model.IsSyncStatusPrice(sku.SkuSyncStatus) { bareSku = storeSkuSyncInfo2Bare(calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage))) priceList = append(priceList, bareSku) - globals.SugarLogger.Debug("14. priceList=====================", priceList) } if !isAdded2Update { globals.SugarLogger.Debug("15.进入!isAdded2Update") @@ -696,7 +691,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { step := batchItemList[0].(int) - globals.SugarLogger.Debugf("17.deleteList,createList,updateList,stockList===============", deleteList, createList, updateList, stockList) switch step { case 0: if len(deleteList) > 0 { @@ -747,10 +741,8 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag globals.SugarLogger.Debug("31.sth wrong on err2: %v", err2) failedList = append(failedList, putils.GetErrMsg2FailedSingleList(batchedStoreSkuList, err2, storeID, model.VendorChineseNames[vendorID], "查询是否有该商品")...) } - globals.SugarLogger.Debug("33.updateList|| failedList=============", updateList, failedList) } failedList, err = buildFailedListAndErr(failedList, err, nil, batchedStoreSkuList, storeID, vendorID, "创建门店商品") - globals.SugarLogger.Debug("18.updateList,failedList=========================", updateList, failedList) if len(failedList) > 0 { task.AddFailedList(failedList) } @@ -851,7 +843,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } case 6: if len(priceList) > 0 { - globals.SugarLogger.Debugf("================更新门店商品价格%s", utils.Format4Output(priceList, true)) _, err = putils.FreeBatchStoreSkuInfo("更新门店商品价格", func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, successCount int, err error) { if isNeedHandleAct(causeFlag) { cancelStoreSkuActs(ctx, task, vendorID, storeDetail.VendorOrgCode, storeID, vendorStoreID, batchedStoreSkuList, true) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 1accba870..9d9ad8b59 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -682,7 +682,6 @@ func ScheduleTimerFuncOnce(name string, handler func(interface{}), timeStr strin now := time.Now() nextTime := jxutils.GetNextTimeFromList(now, []string{timeStr}) duration := nextTime.Sub(now) + 1*time.Second - globals.SugarLogger.Debugf("ScheduleTimerFuncOnce, func:%s, duration:%v", name, duration) utils.AfterFuncWithRecover(duration, func() { globals.SugarLogger.Debugf("ScheduleTimerFuncOnce func:%s", name) handler(param) @@ -690,7 +689,6 @@ func ScheduleTimerFuncOnce(name string, handler func(interface{}), timeStr strin } func ScheduleTimerFuncByInterval(handler func(), delay, inerval time.Duration) { - globals.SugarLogger.Debugf("ScheduleTimerFuncByInterval, delay:%v, inerval:%v", delay, inerval) utils.AfterFuncWithRecover(delay, func() { beginTime := time.Now() handler() diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go index f59a7aaef..35024db63 100644 --- a/business/jxutils/jxutils.go +++ b/business/jxutils/jxutils.go @@ -136,7 +136,6 @@ func GetPossibleVendorIDFromVendorOrderID(vendorOrderID string) (vendorID int) { vendorID = model.VendorIDUnknown //if vendorOrderIDInt64 := utils.Str2Int64WithDefault(vendorOrderID, 0); vendorOrderIDInt64 > 0 { orderIDLen := len(vendorOrderID) - globals.SugarLogger.Debugf("GetPossibleVendorIDFromVendorOrderID, orderIDLen: %v", orderIDLen) // 5287873015048 13 wsc // 15380342248732 14 old ebai order // 800402581000221 15,16 jd order diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go index dccbd3449..8b78a5485 100644 --- a/business/jxutils/netprinter/netprinter.go +++ b/business/jxutils/netprinter/netprinter.go @@ -72,7 +72,6 @@ func getStore4Print(db *dao.DaoDB, storeID int) (store *model.Store, err error) // PrintOrderByOrder4Store 打印订单信息 func PrintOrderByOrder4Store(ctx *jxcontext.Context, order *model.GoodsOrder, storeID int, printType string, afs *model.AfsOrder) (printResult *partner.PrinterStatus, err error) { - globals.SugarLogger.Debugf("PrintOrderByOrder4Store orderID:%s", order.VendorOrderID) db := dao.GetDB() store, err := getStore4Print(db, storeID) if err == nil { @@ -242,7 +241,6 @@ func RebindAllPrinters(ctx *jxcontext.Context, isForce, isAsync bool) (hint stri store := batchItemList[0].(*model.Store) if handler := partner.GetPrinterPlatformFromVendorID(store.PrinterVendorID); handler != nil { bindResult, err2 := handler.RebindPrinter(ctx, bindResultMap[store.ID]) - globals.SugarLogger.Debugf("RebindAllPrinters storeID:%d, result:%s, err:%v", store.ID, utils.Format4Output(bindResult, true), err2) if err = err2; err == nil { store.PrinterSN = bindResult.PrinterSN store.PrinterKey = bindResult.PrinterKey diff --git a/business/jxutils/smsmsg/smsmsg.go b/business/jxutils/smsmsg/smsmsg.go index 44382bf04..8b8f2f231 100644 --- a/business/jxutils/smsmsg/smsmsg.go +++ b/business/jxutils/smsmsg/smsmsg.go @@ -64,13 +64,11 @@ func SendVoiceMsg(mobileList []string, templateCode string, templateParam map[st TtsCode: tea.String(templateCode), TtsParam: tea.String(string(utils.MustMarshal(templateParam))), } - globals.SugarLogger.Debugf("SendVoiceMsg mobile: %s,template: %s ", mobileNum, templateCode) res, _err := api.VoiceClient.SingleCallByTts(request) if _err != nil { errList.AddErr(err) } if *res.Body.Code != "OK" { - globals.SugarLogger.Debugf("SendVoiceMsg mobileNum:%s failed with response:%s", mobileNum, utils.Format4Output(res, true)) errList.AddErr(fmt.Errorf(*res.Body.Message)) } else { globals.SugarLogger.Debugf("SendVoiceMsg mobileNum:%s success with response:%s", mobileNum, utils.Format4Output(res, true)) @@ -135,7 +133,6 @@ func NotifyPickOrder(order *model.GoodsOrder) (err error) { } balance, _ := partner.CurStoreAcctManager.GetBrandBalance(store.BrandID) if order.NotifyType == 0 && store.SMSNotify != 0 && store.IsOrder == model.NO && store.ID != model.MatterStoreID && store.ID != model.JdShopMainStoreID && len(mobileList) > 0 { - globals.SugarLogger.Debugf("NotifyPickOrder orderID: %s , smsNotify :%d", order.VendorOrderID, store.SMSNotify) switch store.SMSNotify { case model.NotifyTypeSMS: if store.BrandIsOpen&model.BrandOpenSMS != 0 && balance >= model.BrandBalanceLimit { diff --git a/business/jxutils/storeskulock/storeskulock.go b/business/jxutils/storeskulock/storeskulock.go index 920dfe91a..b25526a07 100644 --- a/business/jxutils/storeskulock/storeskulock.go +++ b/business/jxutils/storeskulock/storeskulock.go @@ -4,7 +4,6 @@ import ( "fmt" "time" - "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" ) @@ -14,7 +13,6 @@ const ( func LockJdStoreSku(jdStoreID string, jdSkuID int64, expire time.Time) { return - globals.SugarLogger.Debug(expire, " ", time.Now()) duration := expire.Sub(time.Now()) if duration > 0 { api.Cacher.Set(genCacheKey(jdStoreID, jdSkuID), 1, duration) diff --git a/business/jxutils/tasks/configrefresh.go b/business/jxutils/tasks/configrefresh.go index b26e1c8d5..780904622 100644 --- a/business/jxutils/tasks/configrefresh.go +++ b/business/jxutils/tasks/configrefresh.go @@ -140,7 +140,6 @@ func RefreshWeixinToken() (err error) { func RefreshFnToken() (err error) { if api.FnAPI != nil { err = RefreshConfig("fn", fnTokenExpires, func() (token string, expireTimeStr string, refreshToken string) { - globals.SugarLogger.Debugf("RefreshFnToken RunMode:%s", beego.BConfig.RunMode) //if globals.IsMainProductEnv() { curConfig := &legacymodel.Config{ Thirdparty: "fn", @@ -181,7 +180,6 @@ func RefreshFnToken() (err error) { func RefreshQywxToken() (err error) { if api.QywxAPI != nil { err = RefreshConfig("qywx", weixinTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) { - globals.SugarLogger.Debugf("RefreshQywxToken RunMode:%s", beego.BConfig.RunMode) if globals.IsMainProductEnv() { if tokenInfo, err := api.QywxAPI.GetToken(); err == nil { token = tokenInfo @@ -191,7 +189,6 @@ func RefreshQywxToken() (err error) { } return token, expireTimeStr, "" }, func(value, v2 string) { - globals.SugarLogger.Debugf("RefreshQywxToken setter value:%s", value) api.QywxAPI.SetToken(value) }) } @@ -204,7 +201,6 @@ func RefreshWeixin2Token() (err error) { globals.SugarLogger.Debugf("RefreshWeixin2Token RunMode:%s", beego.BConfig.RunMode) if globals.IsMainProductEnv() { if tokenInfo, err := api.WeixinMiniAPI2.CBRetrieveToken(); err == nil { - globals.SugarLogger.Debugf("RefreshWeixin2Token tokenInfo:%s", utils.Format4Output(tokenInfo, true)) token = tokenInfo.AccessToken } else { globals.SugarLogger.Errorf("RefreshWeixin2Token RefreshToken failed with error:%v", err) @@ -217,7 +213,6 @@ func RefreshWeixin2Token() (err error) { } return token, expireTimeStr, "" }, func(value, v2 string) { - globals.SugarLogger.Debugf("RefreshWeixinToken setter value:%s", value) syseventhub.SysEventHub.OnNewWX2Token(value) api.WeixinMiniAPI2.CBSetToken(value) }) @@ -228,7 +223,6 @@ func RefreshWeixin2Token() (err error) { func RefreshPushToken() (err error) { if api.PushAPI != nil { err = RefreshConfig("push", pushTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) { - globals.SugarLogger.Debugf("RefreshPushToken RunMode:%s", beego.BConfig.RunMode) if globals.IsMainProductEnv() { if tokenInfo, err := api.PushAPI.CBRetrieveToken(); err == nil { globals.SugarLogger.Debugf("RefreshPushToken tokenInfo:%s", utils.Format4Output(tokenInfo, true)) @@ -244,7 +238,6 @@ func RefreshPushToken() (err error) { } return token, expireTimeStr, "" }, func(value, v2 string) { - globals.SugarLogger.Debugf("RefreshPushToken setter value:%s", value) syseventhub.SysEventHub.OnNewPushToken(value) api.PushAPI.CBSetToken(value) }) @@ -282,7 +275,6 @@ func RefreshWeixin3Token() (err error) { func RefreshWeimobToken() (err error) { if api.WeimobAPI != nil { err = RefreshConfig("weimob", weimobTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) { - globals.SugarLogger.Debugf("RefreshWeimobToken RunMode:%s", beego.BConfig.RunMode) if globals.IsMainProductEnv() { if tokenInfo, err := api.WeimobAPI.RefreshTokenByRefreshToken(); err == nil { return string(utils.MustMarshal(tokenInfo)), utils.Time2Str(time.Now().Add((time.Duration(tokenInfo.ExpiresIn) - weimobTokenExpires/time.Second) * time.Second)), "" @@ -315,7 +307,6 @@ func RefreshWeimobToken() (err error) { func RefreshDingDingToken() (err error) { api.DingDingAPI.RetrieveToken() return RefreshConfig("dingding", dingdingTokenExpires, func() (string, string, string) { - globals.SugarLogger.Debugf("RefreshDingDingToken RunMode:%s", beego.BConfig.RunMode) if true { //globals.IsProductEnv() { if token, err := api.DingDingAPI.RetrieveToken(); err == nil { globals.SugarLogger.Debugf("RefreshDingDingToken tokenInfo:%s", token) @@ -343,7 +334,6 @@ func SaveWeimobToken(token *weimobapi.TokenInfo) (err error) { func RefreshYilianyunToken() (err error) { return RefreshConfig("yilianyun", yilianyunTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) { - globals.SugarLogger.Debugf("RefreshYilianyunToken RunMode:%s", beego.BConfig.RunMode) if globals.IsMainProductEnv() { // 只有京西菜市刷新易联云key if tokenInfo, err := api.YilianyunAPI.RetrieveToken(); err == nil { token = string(utils.MustMarshal(tokenInfo)) @@ -377,9 +367,7 @@ func PollingRemotEvent(remoteURL string, waitSecond int, params map[string]inter "waitSecond": waitSecond, }) for { - globals.SugarLogger.Debugf("PollingRemotEvent %s", remoteURL) response, err := http.Get(utils.GenerateGetURL(remoteURL, "", params2)) - globals.SugarLogger.Debugf("PollingRemotEvent2 %s error:%v", remoteURL, err) if err == nil { defer response.Body.Close() if response.StatusCode == http.StatusOK { diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index dc9a61f27..53cd04e77 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -1076,8 +1076,6 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat sqlParams = append(sqlParams, pageSize, offset) txDB, _ := Begin(db) defer Commit(db, txDB) - globals.SugarLogger.Debugf("===orderEX==sql=%s", sql) - globals.SugarLogger.Debugf("===orderEX==param=%s", utils.Format4Output(sqlParams, false)) if err = GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil { totalCount = GetLastTotalRowCount2(db, txDB) } diff --git a/business/model/dao/sensitive_words.go b/business/model/dao/sensitive_words.go index 1b75629b4..367bbb571 100644 --- a/business/model/dao/sensitive_words.go +++ b/business/model/dao/sensitive_words.go @@ -3,7 +3,6 @@ package dao import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/globals" "time" ) @@ -57,7 +56,6 @@ func UpdateSensitiveWord(wordList *model.SensitiveWord, vendorID int, id int, us wordList.VendorID = vendorID wordList.UpdatedAt = time.Now() wordList.LastOperator = userName - globals.SugarLogger.Debug("wordList:", wordList) if id != 0 { if _, err := UpdateEntity(nil, wordList, "id", "word", "vendor_id", "last_operator"); err != nil { return nil, err diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index b45794c00..4fb1da590 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -686,8 +686,6 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo // } sql = fmt.Sprintf(sql, fmtParams...) sql += " ORDER BY t1.price" - globals.SugarLogger.Debug("sql======", sql) - globals.SugarLogger.Debug("sqlparam======", sqlParams) if err = GetRows(db, &skus, sql, sqlParams...); err != nil { return nil, err @@ -702,7 +700,6 @@ func GetStoreSkus(db *DaoDB, vendorID, storeID int, skuIDs []int) (skus []*Store // 以sku为基础来做全同步, // 多门店模式厂商适用 func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInfo, err error) { - globals.SugarLogger.Debugf("GetFullStoreSkus, storeID:%d, vendorID:%d", storeID, vendorID) // 对于多门店平台,商品库删除后,不需要操作门店商品,所以sku_name用JOIN, sku与sku_name也可以直接排除下架的 sql := ` @@ -833,8 +830,6 @@ func SetStoreSkuSyncStatus(db *DaoDB, vendorID int, storeIDs []int, skuIDs []int } func SetStoreCategorySyncStatus(db *DaoDB, vendorID int, storeIDs []int, catIDs []int, syncStatus int) (num int64, err error) { - globals.SugarLogger.Debugf("SetStoreCategorySyncStatus, storeIDs:%v, vendorID:%d", storeIDs, vendorID) - isSingleStorePF := model.MultiStoresVendorMap[vendorID] != 1 fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID]) sql := ` diff --git a/business/model/dao/thing_map.go b/business/model/dao/thing_map.go index 8445a1f69..d1080f5d7 100644 --- a/business/model/dao/thing_map.go +++ b/business/model/dao/thing_map.go @@ -3,7 +3,6 @@ package dao import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/globals" ) func GetThingMapList(db *DaoDB, thingType int, vendorIDs, thingIDs []int, vendorOrgCodes []string) (cats []*model.ThingMap, err error) { @@ -75,7 +74,6 @@ func SetSkuNameSyncStatus(db *DaoDB, vendorIDs []int, vendorOrgCodes []string, n } func SetSkuSyncStatus(db *DaoDB, vendorID int, skuIDs []int, syncStatus int8) (num int64, err error) { - globals.SugarLogger.Debugf("SetSkuSyncStatus, vendorID:%d", vendorID) num, err = SetThingMapSyncStatus(db, []int{vendorID}, nil, model.ThingTypeSku, skuIDs, syncStatus) return num, err } diff --git a/business/partner/purchase/doudian/store_test.go b/business/partner/purchase/doudian/store_test.go index 73a39137f..322a29aca 100644 --- a/business/partner/purchase/doudian/store_test.go +++ b/business/partner/purchase/doudian/store_test.go @@ -32,8 +32,6 @@ func TestCreateStore(t *testing.T) { StoreList: storeLists, } resp, err := a.BatchCreateStore(param) - t.Fatal("err===========", err) - t.Fatalf("resp===========:%v", resp) } // diff --git a/business/partner/purchase/tiktok_store/order_afs_utils.go b/business/partner/purchase/tiktok_store/order_afs_utils.go index aae864bea..ff5431fbb 100644 --- a/business/partner/purchase/tiktok_store/order_afs_utils.go +++ b/business/partner/purchase/tiktok_store/order_afs_utils.go @@ -41,7 +41,6 @@ func (c *PurchaseHandler) isAfsMsg(msg string) bool { func (c *PurchaseHandler) OnAfsOrderMsg(msgId, orderId string, msg interface{}) (retVal *tiktokShop.CallbackResponse) { //jxutils.CallMsgHandlerAsync(func() { retVal = c.onAfsOrderMsg(msgId, msg) - globals.SugarLogger.Debugf("============%s===", utils.Format4Output(retVal, false)) //}, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDDD)) return retVal } diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 5503e6833..da8b358c1 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -650,7 +650,6 @@ func (P *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo if err != nil { return nil, err } - globals.SugarLogger.Debugf("AddAuthBind user================:%s", utils.Format4Output(vendorStore, true)) retVal := &dao.StoreDetail{ Store: model.Store{ Address: vendorStore.StoreDetail.Store.Address, diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 5d42f3f9b..72665faf3 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -270,7 +270,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI Supply7dayReturn: 0, Mobile: storeDetail.Tel1, Commit: true, - Specs: "净重|" + fmt.Sprintf("%f", storeSku.SpecQuality) + storeSku.SpecUnit, + Specs: "净重|" + utils.Float64ToStr(float64(storeSku.SpecQuality)) + storeSku.SpecUnit, NeedRechargeMode: false, SellChannel: []int64{0}, StartSaleType: 0, @@ -313,11 +313,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI return nil, err } - globals.SugarLogger.Debugf("本地商品详情============%s,", utils.Format4Output(param, false)) // 根据本地商品id获取线上商品是否存在,存在则只创建子商品 var tiktokResultProductId int64 = 0 skuMain, err := api.GetSkuDetailLocalID("", param.OuterProductId) - globals.SugarLogger.Debugf("线上商品详情(主)============%s,", utils.Format4Output(skuMain, false)) if err != nil { // 线上不存在创建 tiktokResult, err := api.CreateStoreCommodity(param) // 创建主商品 if err != nil { @@ -462,7 +460,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI //param.SaleLimitId = saleLimitId //param.StoreId = utils.Str2Int64(vendorStoreID) // 抖店创建商品 - globals.SugarLogger.Debugf("更新子商品=============%s", utils.Format4Output(param, false)) if err := api.EditStoreCommodity(param); err != nil { failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType) storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID) diff --git a/controllers/auth2.go b/controllers/auth2.go index 69a6a79f9..ba18faf51 100644 --- a/controllers/auth2.go +++ b/controllers/auth2.go @@ -24,7 +24,6 @@ import ( func GetComposedCode(c *web.Controller, code string) (composedCode string) { composedCode = code referer := c.Ctx.Request.Referer() - globals.SugarLogger.Debugf("GetComposedCode referer:%s", referer) index := strings.Index(referer, "//") if index > 0 { list := strings.Split(referer[index+2:], "/") @@ -38,7 +37,6 @@ func GetComposedCode(c *web.Controller, code string) (composedCode string) { func GetComposedCode2(c *web.Controller, code string) (composedCode string) { composedCode = code referer := c.Ctx.Request.UserAgent() - globals.SugarLogger.Debugf("GetComposedCode referer:%s", referer) index := strings.Index(referer, "//") if index > 0 { list := strings.Split(referer[index+2:], "/") @@ -133,17 +131,14 @@ func (c *Auth2Controller) Login() { params.AuthSecret = GetComposedCode2(&c.Controller, params.AuthSecret) } ctx := auth2.NewContext(c.Ctx.ResponseWriter, c.Ctx.Request) - globals.SugarLogger.Debug("params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret==============", params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret) authInfo, err := auth2.Login(ctx, params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret) // TODO 兼容没有取到authid2的错误 if err == nil && authInfo.AuthBindInfo != nil { if authInfo.AuthBindInfo.AuthID2 == "" { - globals.SugarLogger.Debug("fgfggggggg") authInfo.AuthBindInfo.AuthID2 = authInfo.AuthBindInfo.AuthID } retVal = authInfo } - globals.SugarLogger.Debug("retVal==============", retVal) return retVal, "", err }) } @@ -248,7 +243,6 @@ func (c *Auth2Controller) WeixinMPOAuth2() { redirectURL = fmt.Sprintf("%s?info=%s", params.Block, base64.StdEncoding.EncodeToString(utils.MustMarshal(callResult))) return retVal, model.ErrorCodeIgnore, err }) - globals.SugarLogger.Debugf("WeixinMPOAuth2, callResult:%s, redirectURL:%s", utils.Format4Output(callResult, true), redirectURL) c.Redirect(redirectURL, http.StatusTemporaryRedirect) } @@ -289,7 +283,6 @@ func (c *Auth2Controller) DingDingOAuth2() { } return retVal, model.ErrorCodeIgnore, err }) - globals.SugarLogger.Debugf("DingDingOAuth2, callResult:%s, redirectURL:%s", utils.Format4Output(callResult, true), redirectURL) if redirectURL != "" { c.Redirect(redirectURL, http.StatusTemporaryRedirect) } diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go index ea421343a..c87b394f1 100644 --- a/controllers/cms_sku.go +++ b/controllers/cms_sku.go @@ -8,7 +8,6 @@ import ( "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store" - "git.rosy.net.cn/jx-callback/globals" "github.com/astaxie/beego/server/web" ) @@ -401,7 +400,6 @@ func (c *SkuController) UpdateSensitiveWord() { // VendorID: params.VendorID, // Word: params.Word, //} - globals.SugarLogger.Debug("UpdateSensitiveWord入参params:", params) words, err := dao.GetSensitiveWordList(params.VendorID) word := words[0] word.Word = params.Word diff --git a/controllers/cms_sync.go b/controllers/cms_sync.go index 4edcdb18e..6444747fe 100644 --- a/controllers/cms_sync.go +++ b/controllers/cms_sync.go @@ -3,7 +3,6 @@ package controllers import ( "fmt" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" - "git.rosy.net.cn/jx-callback/globals" "github.com/panjf2000/ants" "io" "sync" @@ -144,7 +143,6 @@ func (c *SyncController) CompareStoreWithOperator() { if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.VendorIDs, &vendorIDs); err != nil { return retVal, "", err } - globals.SugarLogger.Debug(params.StoreIDs, params.VendorIDs) p, _ := ants.NewPoolWithFunc(10, func(data interface{}) { task := data.(*CompareTask) task.Do() diff --git a/controllers/dada_order.go b/controllers/dada_order.go index 85c07ff2d..0458e9692 100644 --- a/controllers/dada_order.go +++ b/controllers/dada_order.go @@ -6,7 +6,6 @@ import ( "git.rosy.net.cn/baseapi/platformapi/dadaapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/partner/delivery/dada" - "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" ) @@ -41,7 +40,6 @@ func (c *DadaDeliveryController) Notify() { if err != nil { notifyResponse = dadaapi.FailedNotifyResponse } - globals.SugarLogger.Debugf("dada notify, obj:%s, err:%v", utils.Format4Output(obj, false), err) } if notifyResponse == nil { notifyResponse = dadaapi.SuccessNotifyResponse diff --git a/controllers/dingding_callback.go b/controllers/dingding_callback.go index 4962af2db..a4dc24a50 100644 --- a/controllers/dingding_callback.go +++ b/controllers/dingding_callback.go @@ -5,7 +5,6 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxstore/cms" - "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" ) @@ -19,12 +18,10 @@ func init() { } func (c *DingDingController) Msg() { - globals.SugarLogger.Debugf("dingding msg:%s", string(c.Ctx.Input.RequestBody)) if c.Ctx.Input.Method() == http.MethodPost { dataMap := utils.URLValues2Map(c.Ctx.Request.Form) obj, callbackResponse := api.DingDingAPI.GetCallbackMsg(dataMap, c.Ctx.Input.RequestBody) if callbackResponse == nil { - globals.SugarLogger.Debugf("dingding msg, obj:%s", utils.Format4Output(obj, false)) callbackResponse = cms.OnDingDingMsg(obj) if callbackResponse == nil { callbackResponse = api.DingDingAPI.Err2CallbackResponse(nil) diff --git a/controllers/enterprise_callback.go b/controllers/enterprise_callback.go index f0f8f06c3..4caf092fc 100644 --- a/controllers/enterprise_callback.go +++ b/controllers/enterprise_callback.go @@ -35,7 +35,6 @@ func (e *EnterpriseController) EnterpriseCallback() { wxcpt := call.NewWXBizMsgCrypt(call.Token, call.EncodingAeskey, call.ReceiverId, call.JsonType) msg, err_ := wxcpt.DecryptMsg(msg_signature, timestamp, nonce, body) - globals.SugarLogger.Debug("==============企业微信通知回调String", string(msg)) if err_ != nil { e.Abort("404") return @@ -62,9 +61,7 @@ func (e *EnterpriseController) EnterpriseCallback() { //} // if strings.Contains(string(msg), "SuiteTicket") { - globals.SugarLogger.Debug("==============企业微信通知回调SuiteTicket") data, err := api.EnterpriseChatHeadApi.GetEnterpriseMsg(msg) - globals.SugarLogger.Debug("==============企业微信通知回调SuiteTicket->data", data.SuiteTicket) if err != nil { globals.SugarLogger.Debug("Unmarshal SuiteTicket err : ", err) } else { diff --git a/controllers/event.go b/controllers/event.go index cd1f63051..96c05c40b 100644 --- a/controllers/event.go +++ b/controllers/event.go @@ -172,7 +172,6 @@ func (c *EventController) TestWebsocket() { //接收客户端的消息 err := ws.ReadJSON(&s) if err != nil { - globals.SugarLogger.Debugf("页面可能断开啦 ws.ReadJSON error: %v", err.Error()) index := 0 for k, v := range clients[vendorOrderID] { if v == ws { @@ -205,15 +204,12 @@ func handleMessages() { for { //读取通道中的消息 msg := <-broadcast - globals.SugarLogger.Debugf("clients len %v", len(clients)) //循环map客户端 for vendorOrderID, mmsg := range msg { for _, client := range clients[vendorOrderID] { //把通道中的消息发送给客户端 - globals.SugarLogger.Debugf("msg %v", utils.Format4Output(mmsg, false)) err := client.WriteJSON(mmsg) if err != nil { - globals.SugarLogger.Debugf("client.WriteJSON error: %v", err) client.Close() //关闭 index := 0 for k, v := range clients[vendorOrderID] { diff --git a/controllers/jd2_callback.go b/controllers/jd2_callback.go index 4a0ad163a..c178cb5ba 100644 --- a/controllers/jd2_callback.go +++ b/controllers/jd2_callback.go @@ -19,7 +19,6 @@ type Djsw2Controller struct { func (c *Djsw2Controller) handleMsg(handler func(*jdapi.API, interface{}) *jdapi.CallbackResponse) (callbackResponse *jdapi.CallbackResponse) { callbackMsg, _, callbackResponse := jdapi.GetCallbackMsg(getUsefulRequest(c.Ctx)) - globals.SugarLogger.Debug(utils.Format4Output(callbackMsg, true)) if callbackResponse == nil { callbackResponse = handler(api.FakeJdAPI, callbackMsg.Param) } @@ -130,7 +129,6 @@ func (c *Djsw2Controller) transferResponse(funcName string, inCallbackResponse * if inCallbackResponse == nil { return jdapi.SuccessResponse } - globals.SugarLogger.Debugf("%s callbackResponse:%s", funcName, utils.Format4Output(inCallbackResponse, true)) return inCallbackResponse } diff --git a/controllers/jd_callback.go b/controllers/jd_callback.go index 2c87f9d77..b483e7ddb 100644 --- a/controllers/jd_callback.go +++ b/controllers/jd_callback.go @@ -22,7 +22,6 @@ type DjswController struct { func (c *DjswController) handleMsg(handler func(*jdapi.API, interface{}) *jdapi.CallbackResponse) (callbackResponse *jdapi.CallbackResponse) { callbackMsg, mapData, callbackResponse := jdapi.GetCallbackMsg(getUsefulRequest(c.Ctx)) - globals.SugarLogger.Debug(utils.Format4Output(callbackMsg, true)) if callbackResponse == nil { if jdAPI := jd.GetAPIbyKey(callbackMsg.AppKey); jdAPI != nil { if callbackResponse = jdAPI.CheckCallbackValidation(mapData, callbackMsg.Sign); callbackResponse == nil { @@ -166,7 +165,6 @@ func (c *DjswController) transferResponse(funcName string, inCallbackResponse *j if inCallbackResponse == nil { return jdapi.SuccessResponse } - globals.SugarLogger.Debugf("%s callbackResponse:%s", funcName, utils.Format4Output(inCallbackResponse, true)) return inCallbackResponse } diff --git a/controllers/jx_order.go b/controllers/jx_order.go index 010db0d65..4dcfbe9e4 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -15,7 +15,6 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" - "git.rosy.net.cn/jx-callback/globals" "github.com/astaxie/beego/server/web" ) @@ -266,7 +265,6 @@ func (c *OrderController) ExportMTWaybills() { toDate = fromDate } content, err = orderman.FixedOrderManager.ExportMTWaybills(params.Ctx, params.FromDate, params.ToDate) - globals.SugarLogger.Debug(err) return retVal, model.ErrorCodeIgnore, err }) if content != nil { diff --git a/controllers/tictok_callback.go b/controllers/tictok_callback.go index 3dee7a2a8..da304653e 100644 --- a/controllers/tictok_callback.go +++ b/controllers/tictok_callback.go @@ -8,9 +8,6 @@ import ( "git.rosy.net.cn/jx-callback/globals/api" - "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" - "github.com/astaxie/beego/server/web" "github.com/astaxie/beego/server/web/context" ) @@ -40,7 +37,6 @@ func MsgFail() *TicktockRes { func (c *TicTocController) TiktokMsg() { call, refund, payType, err := api.TiktokApi.GetCallbackMsg(getPayInfo(c.Ctx)) - globals.SugarLogger.Debugf("tictok callback callbackResponse:%s", utils.Format4Output(call, true)) if err != nil || call == nil { c.Data["json"] = MsgFail() c.ServeJSON() diff --git a/controllers/tiktok_delivery.go b/controllers/tiktok_delivery.go index 519dceb3b..dd0927b34 100644 --- a/controllers/tiktok_delivery.go +++ b/controllers/tiktok_delivery.go @@ -37,7 +37,6 @@ func (c *LogisticsController) LogisticsRegister() { register := &LogisticsRegisterReq{} if err := json.Unmarshal(body, register); err != nil { - globals.SugarLogger.Debugf("小时达订阅接口类型转换异常:%s", err) c.Data["json"] = LogisticsRegisterResp{ Result: false, ReturnCode: "1007", @@ -61,7 +60,6 @@ func (c *LogisticsController) LogisticsRegister() { globals.SugarLogger.Debugf("根据单号查询运单数据错误:%s", err) } if len(data) <= 0 { - globals.SugarLogger.Debugf("单号存在但是本地数据不存,推送平台运单号错误,或者运单错误:%s", err) c.Data["json"] = LogisticsRegisterResp{ Result: false, ReturnCode: "1002", @@ -158,7 +156,6 @@ func (c *LogisticsController) LogisticsQuery() { globals.SugarLogger.Debugf("根据单号查询运单数据错误:%s", err) } if len(data) <= 0 { - globals.SugarLogger.Debugf("单号存在但是本地数据不存,推送平台运单号错误,或者运单错误:%s", err) c.Data["json"] = LogisticsRegisterResp{ Result: false, ReturnCode: "1002", diff --git a/controllers/tiktok_order.go b/controllers/tiktok_order.go index 946a89b9e..2a1eecdcb 100644 --- a/controllers/tiktok_order.go +++ b/controllers/tiktok_order.go @@ -3,7 +3,6 @@ package controllers import ( "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" "git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store" - "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" "strings" @@ -29,9 +28,7 @@ func (t *TiktokController) CallbackTiktokOrderMsg() { } // 2.参数解析 - globals.SugarLogger.Debug("抖音订单回调数据参数打印===========", string(byteList)) orderStatus, resp := api.TiktokStore.CreateOrderCallback(byteList) - globals.SugarLogger.Debug("抖音订单回调数据打印测试===========", orderStatus) if resp.Code != 0 { t.Data["json"] = resp t.ServeJSON() diff --git a/controllers/tiktok_store.go b/controllers/tiktok_store.go index adedb2865..af48d1bf1 100644 --- a/controllers/tiktok_store.go +++ b/controllers/tiktok_store.go @@ -18,7 +18,6 @@ type TiktokShopController struct { // TokenMsg 抖音用户授权 func (c *TiktokShopController) TokenMsg() { code := c.Ctx.Request.URL.Query().Get("code") - globals.SugarLogger.Debugf("tictok callback callbackResponse:%s", code) result, err := api.TiktokStore.CreateToken(code) if err != nil { globals.SugarLogger.Debugf("tictok callback create token:%s", err) @@ -30,7 +29,6 @@ func (c *TiktokShopController) TokenMsg() { result.ExpiresIn += time.Now().Unix() data, err := json.Marshal(result) if err != nil { - globals.SugarLogger.Debugf("tictok callback Marshal token:%s", err) c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} c.ServeJSON() return @@ -50,7 +48,6 @@ func (c *TiktokShopController) TokenMsg() { AppSecret: "", // web.AppConfig.DefaultString("tiktokShopAppSecret", "c397aa9f-3927-47c4-8cfe-4d84e02602e0") } if err := common.AddVendorOrgCode(nil, param); err != nil { - globals.SugarLogger.Debugf("tictok callback insert token:%s", err) c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} c.ServeJSON() return diff --git a/controllers/weixin_callback.go b/controllers/weixin_callback.go index edf705c54..b8c154299 100644 --- a/controllers/weixin_callback.go +++ b/controllers/weixin_callback.go @@ -2,10 +2,10 @@ package controllers import ( "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/globals" "io/ioutil" "net/http" - "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" ) @@ -21,7 +21,7 @@ func (c *WeixinController) Msg() { nonce := c.GetString("nonce") echostr := c.GetString("echostr") isValid := api.WeixinAPI.ValidateWXCallbackURL(signature, timestamp, nonce) - globals.SugarLogger.Debugf("weixin URL check is:%t", isValid) + globals.SugarLogger.Debugf("isvaild %s", utils.Format4Output(isValid, false)) c.Ctx.WriteString(echostr) } else { c.Data["json"] = "ok" @@ -33,7 +33,7 @@ func (c *WeixinController) WifiMsg() { data, _ := ioutil.ReadAll(c.Ctx.Request.Body) values, _ := utils.HTTPBody2Values(data, false) mapData := utils.URLValues2Map(values) - globals.SugarLogger.Debugf("weixin URL check is:%v", mapData) + globals.SugarLogger.Debugf("mapData %s", utils.Format4Output(mapData, false)) c.Data["json"] = "ok" c.ServeJSON() } diff --git a/globals/refutil/refutil.go b/globals/refutil/refutil.go index f5bc50f9b..e450c3981 100644 --- a/globals/refutil/refutil.go +++ b/globals/refutil/refutil.go @@ -76,8 +76,6 @@ func FilterMapByStructObject(mapData map[string]interface{}, obj interface{}, ob globals.SugarLogger.Warnf("FilterMapByStructObject failed with err:%v, mapData:%s", err, utils.Format4Output(mapData, true)) } } - globals.SugarLogger.Debugf("m[valid]====%s", utils.Format4Output(valid, false)) - globals.SugarLogger.Debugf("m[invalid]====%s", utils.Format4Output(invalid, false)) return valid, invalid }