- ebai prod key added.

- TrimDecorationChar

business/jxutils/jxutils.go

@@ -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[]()【】（）-_——")
+}

business/jxutils/jxutils_cms.go

@@ -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 {

business/partner/purchase/ebai/store.go

@@ -253,6 +253,8 @@ func EbaiDeliveryType2Jx(deliveryType string) int8 {
 }
 
 func EbaiDeliveryRegion2Jx(deliveryRegion interface{}) string {
+	realDeliveryRegion := deliveryRegion.([]interface{})
+	if len(realDeliveryRegion) > 0 {
 		region := deliveryRegion.([]interface{})[0].(map[string]interface{})["region"].([]interface{})[0].([]interface{})
 		coords := make([]string, len(region))
 		for k, v := range region {
@@ -261,6 +263,8 @@ func EbaiDeliveryRegion2Jx(deliveryRegion interface{}) string {
 		}
 		return strings.Join(coords, ";")
 	}
+	return ""
+}
 
 func JxDeliveryRegion2Ebai(store *model.Store) interface{} {
 	rangeStr := store.DeliveryRange

conf/app.conf

@@ -25,9 +25,6 @@ qiniuAK = "bKWilgyrJlc8aXgLEpCUmRrYcxJ8OYhoKk5mO3jJ"
 qiniuSK = "3MNdU_lKnu22vrNtUELDcLBv23UOUWYKzc16Pmkj"
 qiniuBucket = "jingxistandardlib"
 
-ebaiSource = "62923"
-ebaiSecret = "aa4cdc6c1108486b"
-
 [dev]
 freshFoodServerURL = "http://portal.beta.jxc4.com"
 
@@ -40,6 +37,9 @@ elmToken  = "2d2b583447b04b6bba5a6f3faed3559b"
 elmAppKey = "RwT214gAsS"
 elmSecret = "56afff4b9ebd8a7eb532d18fa33f17be57f9b9db"
 
+ebaiSource = "62923"
+ebaiSecret = "aa4cdc6c1108486b"
+
 mtpsAppKey = "25e816550bc9484480642f19a95f13fd"
 mtpsSecret = "r4$HqrKx9~=7?2Jfo,$Z~a7%~k!Au&pEdI2)oPJvSbH2ao@2N0[8wSIvtuumh_J^"
 
@@ -64,6 +64,9 @@ elmToken  = ""
 elmAppKey = "KLRDcOZGrk"
 elmSecret = "1fc221f8265506531da36fb613d5f5ad673f2e9a"
 
+ebaiSource = "34665"
+ebaiSecret = "c3db75b754ea2d89"
+
 mtpsAppKey = "3c0a05d464c247c19d7ec13accc78605"
 mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE"
 
@@ -111,6 +114,9 @@ elmToken  = ""
 elmAppKey = "KLRDcOZGrk"
 elmSecret = "1fc221f8265506531da36fb613d5f5ad673f2e9a"
 
+ebaiSource = "34665"
+ebaiSecret = "c3db75b754ea2d89"
+
 mtpsAppKey = "3c0a05d464c247c19d7ec13accc78605"
 mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE"
 
@@ -136,6 +142,9 @@ elmToken  = "2d2b583447b04b6bba5a6f3faed3559b"
 elmAppKey = "RwT214gAsS"
 elmSecret = "56afff4b9ebd8a7eb532d18fa33f17be57f9b9db"
 
+ebaiSource = "62923"
+ebaiSecret = "aa4cdc6c1108486b"
+
 mtpsAppKey = "25e816550bc9484480642f19a95f13fd"
 mtpsSecret = "r4$HqrKx9~=7?2Jfo,$Z~a7%~k!Au&pEdI2)oPJvSbH2ao@2N0[8wSIvtuumh_J^"
 
@@ -161,6 +170,9 @@ elmToken  = ""
 elmAppKey = "KLRDcOZGrk"
 elmSecret = "1fc221f8265506531da36fb613d5f5ad673f2e9a"
 
+ebaiSource = "34665"
+ebaiSecret = "c3db75b754ea2d89"
+
 mtpsAppKey = "3c0a05d464c247c19d7ec13accc78605"
 mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE"