Merge branch 'dev3.4' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.4

udpcreateindex/src/biddingall.go

@@ -284,6 +284,9 @@ func biddingAllTask(data []byte, mapInfo map[string]interface{}) {
 						} else {
 							if v == "detail" {
 								detail, _ := tmp[v].(string)
+								if len([]rune(detail)) > detailLength {
+									detail = detail[:detailLength]
+								}
 								newTmp[v] = FilterDetail(detail)
 							} else {
 								newTmp[v] = tmp[v]

udpcreateindex/src/biddingindex.go

@@ -349,6 +349,9 @@ func doIndex(infos []map[string]interface{}, eMap map[string]map[string]interfac
 					} else {
 						if v == "detail" {
 							detail, _ := tmp[v].(string)
+							if len([]rune(detail)) > detailLength {
+								detail = detail[:detailLength]
+							}
 							newTmp[v] = FilterDetail(detail)
 						} else {
 							newTmp[v] = tmp[v]

udpcreateindex/src/bidingpurchasing.go

@@ -350,7 +350,7 @@ func getFileText(tmp map[string]interface{}) (filetext string) {
 					if resultMap, ok := result.(map[string]interface{}); resultMap != nil && ok {
 						if attach_url := util.ObjToString(resultMap["attach_url"]); attach_url != "" {
 							bs := u.OssGetObject(attach_url) //oss读数据
-							if utf8.RuneCountInString(filetext+bs) < util.IntAllDef(Sysconfig["filelength"], 100000) {
+							if utf8.RuneCountInString(filetext+bs) < fileLength {
 								filetext += bs + "\n"
 							} else {
 								break

udpcreateindex/src/config.json

@@ -43,7 +43,8 @@
         "purchasinglist":"itemname,model,unitname,number",
         "multiIndex": ""
     },
-    "filelength": 100000,
+    "filelength": 50000,
+    "detaillength": 50000,
     "project": {
         "db": "mxs",
         "collect": "test",

udpcreateindex/src/main.go

@@ -28,6 +28,8 @@ var (
 	multiIndex           []string
 	purchasinglistFields []string
 	BulkSize             = 400
+	detailLength         = 50000
+	fileLength           = 50000
 	//bidding_other连接信息
 	bidding_other_es *elastic.Elastic
 	other_index      string
@@ -40,6 +42,8 @@ func init() {
 	util.ReadConfig(&Sysconfig)
 	inits()
 	go checkMapJob()
+	detailLength = util.IntAllDef(Sysconfig["detaillength"], 50000)
+	fileLength = util.IntAllDef(Sysconfig["filelength"], 50000)
 	updport, _ = Sysconfig["updport"].(string)
 	winner, _ = Sysconfig["winner"].(map[string]interface{})
 	standard, _ = Sysconfig["standard"].(map[string]interface{})