From 9773900d340669df019f3f67e934a5ee5a99f289 Mon Sep 17 00:00:00 2001 From: Rosy-zhudan Date: Mon, 19 Aug 2019 11:22:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=8F=E6=84=9F=E8=AF=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sync_store_sku.go | 11 +++++++---- business/partner/purchase/ebai/store_sku2.go | 3 ++- business/partner/purchase/mtwm/store_sku2.go | 6 +++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 70eeb2f2c..021de1b2f 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -19,6 +19,10 @@ import ( "git.rosy.net.cn/jx-callback/business/partner" ) +var ( + subSensitiveWordRegexp = regexp.MustCompile(`[^\[\]\"\}]`) +) + func CreateStoreCategoryByStoreSku(ctx *jxcontext.Context, vendorID, storeID int, vendorStoreID string, nameIDs, skuIDs []int) (err error) { db := dao.GetDB() dao.Begin(db) @@ -587,11 +591,10 @@ func ClearRemoteStoreStuffAndSetNew(ctx *jxcontext.Context, parentTask tasksch.I } func GetSensitiveWord(singleStoreHandler partner.ISingleStoreStoreSkuHandler, str string) string { - var regFindKeyWord = singleStoreHandler.GetSensitiveWordRegexp() - var subRegFindKeyWord = regexp.MustCompile(`[^\[\]\"\}]`) - findResult := regFindKeyWord.FindStringSubmatch(str) + sensitiveWordRegexp := singleStoreHandler.GetSensitiveWordRegexp() + findResult := sensitiveWordRegexp.FindStringSubmatch(str) if findResult != nil && len(findResult) > 1 { - findSubResult := subRegFindKeyWord.FindAllString(findResult[1], -1) + findSubResult := subSensitiveWordRegexp.FindAllString(findResult[1], -1) return strings.Join(findSubResult, "") } diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go index 99ed7b6ec..6a8f4bf1f 100644 --- a/business/partner/purchase/ebai/store_sku2.go +++ b/business/partner/purchase/ebai/store_sku2.go @@ -22,6 +22,7 @@ var ( 2: 15347484581335, // 蔬菜类 3: 15347484581339, // 其他蔬菜类休闲食品 } + sensitiveWordRegexp = regexp.MustCompile(`商品名称中含有敏感词(\[.*\])`) ) func (p *PurchaseHandler) GetStoreSkusBatchSize(funcID int) (batchSize int) { @@ -389,5 +390,5 @@ func vendorSkuList2Jx(vendorSkuList []*ebaiapi.SkuInfo) (skuNameList []*partner. } func (p *PurchaseHandler) GetSensitiveWordRegexp() *regexp.Regexp { - return regexp.MustCompile(`商品名称中含有敏感词(\[.*\])`) + return sensitiveWordRegexp } \ No newline at end of file diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go index 2cb5ddc50..706cd19d6 100644 --- a/business/partner/purchase/mtwm/store_sku2.go +++ b/business/partner/purchase/mtwm/store_sku2.go @@ -25,6 +25,10 @@ const ( defVendorCatID = 200001903 // 生菜 ) +var ( + sensitiveWordRegexp = regexp.MustCompile(`包含敏感词:(\[.*\])`) +) + func (p *PurchaseHandler) GetStoreSkusBatchSize(funcID int) (batchSize int) { switch funcID { case partner.FuncUpdateStoreSkusStock, partner.FuncUpdateStoreSkusStatus, partner.FuncUpdateStoreSkusPrice: @@ -368,5 +372,5 @@ func vendorSkuList2Jx(appFoodList []*mtwmapi.AppFood) (skuNameList []*partner.Sk } func (p *PurchaseHandler) GetSensitiveWordRegexp() *regexp.Regexp { - return regexp.MustCompile(`包含敏感词:(\[.*\])`) + return sensitiveWordRegexp } \ No newline at end of file