liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SensitiveWord相关修改测试

Browse Source
This commit is contained in:
平凡梦
2020-07-10 09:17:35 +08:00
parent a6fdadebb6
commit 68adbed883
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/cms/sku.go
View File

@@ -727,7 +727,7 @@ func CheckHasSensitiveWord(word string) (bool, error) {
} }
func IsSensitiveWordInList(str string) (bool, string) { func IsSensitiveWordInList(str string) (bool, string) {
wordList, err := dao.GetSensitiveWordList(2) wordList, err := dao.GetSensitiveWordList(3)
if err == nil { if err == nil {
for _, value := range wordList { for _, value := range wordList {
keyWord := value.Word keyWord := value.Word

13
business/model/dao/sensitive_words.go
View File

@@ -7,13 +7,18 @@ import (
"time" "time"
) )
/*VendorID = 2 的时候是通用，保留之前的1，看后面会不会有扩展*/ /*VendorID = 2 的时候是通用,3 查询所有，保留之前的1，看后面会不会有扩展*/
func GetSensitiveWordList(vendorID int) (wordList []*model.SensitiveWord, err error) { func GetSensitiveWordList(vendorID int) (wordList []*model.SensitiveWord, err error) {
if vendorID == 0 { if vendorID == 0 {
vendorID = 2 vendorID = 2
} }
sql := `SELECT * FROM sensitive_word WHERE deleted_at = ? AND vendor_id = ?` if vendorID == 3 {
err = GetRows(nil, &wordList, sql, utils.DefaultTimeValue, vendorID) sql := `SELECT * FROM sensitive_word WHERE deleted_at = ?`
err = GetRows(nil, &wordList, sql, utils.DefaultTimeValue)
} else {
sql := `SELECT * FROM sensitive_word WHERE deleted_at = ? AND vendor_id = ?`
err = GetRows(nil, &wordList, sql, utils.DefaultTimeValue, vendorID)
}
return wordList, err return wordList, err
} }
@@ -34,6 +39,7 @@ func DeleteSensitiveWord(wordList *model.SensitiveWord, id int, userName string,
vendorID = 2 vendorID = 2
} }
wordList.ID = id wordList.ID = id
wordList.VendorID = id
wordList.DeletedAt = time.Now() wordList.DeletedAt = time.Now()
wordList.LastOperator = userName wordList.LastOperator = userName
if _, err := UpdateEntity(nil, wordList, "deleted_at", "id", "last_operator", "vendor_id"); err != nil { if _, err := UpdateEntity(nil, wordList, "deleted_at", "id", "last_operator", "vendor_id"); err != nil {
@@ -50,6 +56,7 @@ func UpdateSensitiveWord(wordList *model.SensitiveWord, vendorID int, id int, us
vendorID = 2 vendorID = 2
} }
wordList.ID = id wordList.ID = id
wordList.VendorID = vendorID
wordList.UpdatedAt = time.Now() wordList.UpdatedAt = time.Now()
wordList.LastOperator = userName wordList.LastOperator = userName
if _, err := UpdateEntity(nil, wordList, params...); err != nil { if _, err := UpdateEntity(nil, wordList, params...); err != nil {

2
controllers/cms_sku.go
View File

@@ -344,7 +344,7 @@ func (c *SkuController) SyncSku() {
// @router /GetSensitiveWordList [get] // @router /GetSensitiveWordList [get]
func (c *SkuController) GetSensitiveWordList() { func (c *SkuController) GetSensitiveWordList() {
c.callGetSensitiveWordList(func(params *tSkuGetSensitiveWordListParams) (retVal interface{}, errCode string, err error) { c.callGetSensitiveWordList(func(params *tSkuGetSensitiveWordListParams) (retVal interface{}, errCode string, err error) {
sensitiveWordList, err := dao.GetSensitiveWordList(2) sensitiveWordList, err := dao.GetSensitiveWordList(params.VendorID)
var wordList []string var wordList []string
for _, value := range sensitiveWordList { for _, value := range sensitiveWordList {
wordList = append(wordList, value.Word) wordList = append(wordList, value.Word)