From b2671b5a7cea821ddc740855bf68326b27989fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B9=B3=E5=87=A1=E6=A2=A6?= Date: Mon, 13 Jul 2020 13:52:14 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9UpdateSensitiveWord?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/dao/sensitive_words.go | 12 +++++++++--- controllers/cms_sku.go | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/business/model/dao/sensitive_words.go b/business/model/dao/sensitive_words.go index e7e5f893f..367bbb571 100644 --- a/business/model/dao/sensitive_words.go +++ b/business/model/dao/sensitive_words.go @@ -46,7 +46,7 @@ func DeleteSensitiveWord(wordList *model.SensitiveWord, id int, userName string, return wordList, nil } -func UpdateSensitiveWord(wordList *model.SensitiveWord, vendorID int, id int, userName string, params ...string) (word *model.SensitiveWord, err error) { +func UpdateSensitiveWord(wordList *model.SensitiveWord, vendorID int, id int, userName string) (word *model.SensitiveWord, err error) { if vendorID == 0 { vendorID = -2 } @@ -56,8 +56,14 @@ func UpdateSensitiveWord(wordList *model.SensitiveWord, vendorID int, id int, us wordList.VendorID = vendorID wordList.UpdatedAt = time.Now() wordList.LastOperator = userName - if _, err := UpdateEntity(nil, wordList, params...); err != nil { - return nil, err + if id != 0 { + if _, err := UpdateEntity(nil, wordList, "id", "word", "vendor_id", "last_operator"); err != nil { + return nil, err + } + } else { + if _, err := UpdateEntity(nil, wordList, "word", "vendor_id", "last_operator"); err != nil { + return nil, err + } } return wordList, err } diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go index d25127852..e4b64b3cc 100644 --- a/controllers/cms_sku.go +++ b/controllers/cms_sku.go @@ -391,7 +391,7 @@ func (c *SkuController) UpdateSensitiveWord() { if params.Status == 1 { retVal, err = dao.DeleteSensitiveWord(word, params.ID, params.Ctx.GetUserName(), params.VendorID) } else { - retVal, err = dao.UpdateSensitiveWord(word, params.VendorID, params.ID, params.Ctx.GetUserName(), "id", "word", "vendor_id", "last_operator") + retVal, err = dao.UpdateSensitiveWord(word, params.VendorID, params.ID, params.Ctx.GetUserName()) } return retVal, "", err }) From 5fb37179dfa37096fcc7689512498c980e117f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B9=B3=E5=87=A1=E6=A2=A6?= Date: Mon, 13 Jul 2020 14:12:19 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9UpdateSensitiveWord?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/cms_sku.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go index e4b64b3cc..7d05fa1fd 100644 --- a/controllers/cms_sku.go +++ b/controllers/cms_sku.go @@ -381,12 +381,15 @@ func (c *SkuController) InsertSensitiveWord() { // @router /UpdateSensitiveWord [put] func (c *SkuController) UpdateSensitiveWord() { c.callUpdateSensitiveWord(func(params *tSkuUpdateSensitiveWordParams) (retVal interface{}, errCode string, err error) { - word := &model.SensitiveWord{ - VendorID: params.VendorID, - Word: params.Word, - ModelIDCULD: model.ModelIDCULD{ - ID: params.ID, - }, + //word := &model.SensitiveWord{ + // VendorID: params.VendorID, + // Word: params.Word, + //} + words, err := dao.GetSensitiveWordList(params.VendorID) + word := words[0] + word.Word = params.Word + if params.ID != 0 { + word.ModelIDCULD.ID = params.ID } if params.Status == 1 { retVal, err = dao.DeleteSensitiveWord(word, params.ID, params.Ctx.GetUserName(), params.VendorID) From e2efc743ab93bfc033b2e56a5f7f26c8eb74e35b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B9=B3=E5=87=A1=E6=A2=A6?= Date: Mon, 13 Jul 2020 14:24:11 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95UpdateSensitiveWord?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/dao/sensitive_words.go | 2 ++ controllers/cms_sku.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/business/model/dao/sensitive_words.go b/business/model/dao/sensitive_words.go index 367bbb571..1b75629b4 100644 --- a/business/model/dao/sensitive_words.go +++ b/business/model/dao/sensitive_words.go @@ -3,6 +3,7 @@ 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" ) @@ -56,6 +57,7 @@ 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/controllers/cms_sku.go b/controllers/cms_sku.go index 7d05fa1fd..c175d0d97 100644 --- a/controllers/cms_sku.go +++ b/controllers/cms_sku.go @@ -7,6 +7,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils" "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" ) @@ -385,6 +386,7 @@ 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 From 47b9a6f4dcdc6a58ce651ca49cb375946f3baaa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B9=B3=E5=87=A1=E6=A2=A6?= Date: Mon, 13 Jul 2020 14:38:25 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95UpdateSensitiveWord?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/cms_sku.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go index c175d0d97..79b183b6b 100644 --- a/controllers/cms_sku.go +++ b/controllers/cms_sku.go @@ -358,8 +358,8 @@ func (c *SkuController) GetSensitiveWordList() { // @Title 插入敏感词列表 // @Description 插入敏感词列表 // @Param token header string true "认证token" -// @Param word query string true "关键词名字" -// @Param vendorID query int false "VendorID" +// @Param word formData string true "关键词名字" +// @Param vendorID formData int false "VendorID" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /InsertSensitiveWord [post] @@ -373,10 +373,10 @@ func (c *SkuController) InsertSensitiveWord() { // @Title 修改敏感词列表 // @Description 修改敏感词列表 // @Param token header string true "认证token" -// @Param word query string true "关键词名字" -// @Param vendorID query int false "VendorID" -// @Param ID query int false "关键词ID" -// @Param Status query int false "状态，0为修改默认，1为删除" +// @Param word formData string true "关键词名字" +// @Param vendorID formData int false "VendorID" +// @Param ID formData int false "关键词ID" +// @Param Status formData int false "状态，0为修改默认，1为删除" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /UpdateSensitiveWord [put] From e5d685e749b9cd59c153af0de82c158401f6f7cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B9=B3=E5=87=A1=E6=A2=A6?= Date: Mon, 13 Jul 2020 15:32:58 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9A=84=E6=97=B6=E5=80=99=20UpdateSensitive?= =?UTF-8?q?Word=20=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sync_store_sku.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index bae773bcb..5cd0adb5b 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -679,6 +679,10 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag //handle error for sensitive words, if find, then insert to table sensitive_words if sensitiveWord := GetSensitiveWord(singleStoreHandler, err.Error()); sensitiveWord != "" { dao.InsertSensitiveWord(sensitiveWord, vendorID, ctx.GetUserName()) + words, _ := dao.GetSensitiveWordList(vendorID) + word := words[0] + word.Word = word.Word + "," + sensitiveWord + dao.UpdateSensitiveWord(word, vendorID, 0, ctx.GetUserName()) } } successList := putils.UnselectStoreSkuSyncListByVendorSkuIDs(batchedStoreSkuList, GetVendorSkuIDList(failedList)) From c2431b605fd39c5abefbd66321418fce7999d023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B9=B3=E5=87=A1=E6=A2=A6?= Date: Mon, 13 Jul 2020 16:42:51 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=20=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index a3c2effa1..adbf210ff 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -731,7 +731,7 @@ func IsSensitiveWordInList(str string) (bool, string) { if err == nil { for _, value := range wordList { keyWord := value.Word - checkHas := strings.Contains(str, keyWord) + checkHas := strings.Contains(keyWord, str) if checkHas { return true, keyWord } From 84e41455f8bb4313458038716c71440e65de4fba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B9=B3=E5=87=A1=E6=A2=A6?= Date: Mon, 13 Jul 2020 16:45:46 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=20=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index adbf210ff..fa9b01c8b 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -733,7 +733,7 @@ func IsSensitiveWordInList(str string) (bool, string) { keyWord := value.Word checkHas := strings.Contains(keyWord, str) if checkHas { - return true, keyWord + return true, str } } }