Merge branch 'dev3.2' of ssh://192.168.3.207:10022/qmx/jy-data-extract into dev3.2

src/jy/admin/distribution/distribution.go

@@ -61,11 +61,10 @@ func init() {
 		cluster.DeleteInstance(InstanceId)
 		c.JSON(200, gin.H{"rep": true})
 	})
-	//释放ecs实例
+	//数据库删除ecs实例
 	Admin.POST("/distribution/deleteInstancedb", func(c *gin.Context) {
 		InstanceId, _ := c.GetPostForm("InstanceId")
-		log.Println(InstanceId)
-		b := db.Mgo.Del("ecs",`{"InstanceId":"`+InstanceId+`"}`)
+		b := db.Mgo.Del("ecs", `{"InstanceId":"`+InstanceId+`"}`)
 		c.JSON(200, gin.H{"rep": b})
 	})
 

src/jy/extract/score_jsondata.go

@@ -19,7 +19,7 @@ func JsonDataMergeProcessing(j *util.Job, e *ExtractTask) map[string][]*util.Ext
 	for _, v := range util.JsonData {
 		tmp := make([]*util.ExtField, 0)
 		//jsondata没有值跳过
-		if (*j.Jsondata)[v] == nil || (*j.Jsondata)[v] == "" {
+		if j.Jsondata == nil || (*j.Jsondata)[v] == nil || (*j.Jsondata)[v] == "" {
 			continue
 		}
 		//jsondata有值，res没有值，取jsondata值
@@ -74,7 +74,7 @@ func JsonDataMergeProcessing(j *util.Job, e *ExtractTask) map[string][]*util.Ext
 		lockscore.Lock()
 		scoreRule := SoreConfig[k]
 		lockscore.Unlock()
-		if k == "projectname" || k == "projectcode" || k == "buyer" || k == "winner" || k == "agency" || k == "buyerperson" || k == "buyertel"{
+		if k == "projectname" || k == "projectcode" || k == "buyer" || k == "winner" || k == "agency" || k == "buyerperson" || k == "buyertel" {
 			for i, tmpsvalue := range v {
 				//1.长度打分
 				valueLen := utf8.RuneCountInString(fmt.Sprint(tmpsvalue.Value))