- ebai prod key added.

- TrimDecorationChar
This commit is contained in:
gazebo
2018-11-13 09:29:06 +08:00
parent 4d459380aa
commit 49b9d07153
4 changed files with 34 additions and 14 deletions

View File

@@ -253,8 +253,8 @@ func SplitSkuName(skuName string) (prefix, name, comment, specUnit, unit string,
} else if searchResult[8] != "" {
comment = searchResult[8]
}
comment = strings.Trim(comment, " ()")
name = strings.Trim(searchResult[2], " ")
comment = TrimDecorationChar(comment)
name = TrimDecorationChar(searchResult[2])
if comment != "" {
if utf8.RuneCountInString(comment) <= 5 {
name += "-" + comment
@@ -271,7 +271,7 @@ func SplitSkuName(skuName string) (prefix, name, comment, specUnit, unit string,
unit = searchResult[7]
}
specQuality = float32(utils.Str2Float64(searchResult[4]))
prefix = strings.Trim(searchResult[1], " []()【】()")
prefix = TrimDecorationChar(searchResult[1])
}
return prefix, name, comment, specUnit, unit, specQuality
}
@@ -347,3 +347,7 @@ func ComposeQiniuResURL(key string) string {
func IsLegalMobileNumber(num int64) bool {
return num >= 13000000000 && num <= 19999999999
}
func TrimDecorationChar(value string) string {
return strings.Trim(value, " \t\n[]()【】()-_——")
}

View File

@@ -62,11 +62,11 @@ func SplitStoreName(fullName, separator, defaultPrefix string) (prefix, bareName
bareName = strings.Trim(strings.Trim(fullName, defaultPrefix), separator)
}
return utils.TrimBlankChar(defaultPrefix), utils.TrimBlankChar(bareName)
return TrimDecorationChar(defaultPrefix), TrimDecorationChar(bareName)
}
func ComposeStoreName(bareName, separator, prefix string) (fullName string) {
return prefix + separator + utils.TrimBlankChar(strings.Trim(bareName, separator))
return prefix + separator + TrimDecorationChar(strings.Trim(bareName, separator))
}
func StrTime2JxOperationTime(strTime string, defValue int16) int16 {