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

src/jy/cluster/ssh.go

@@ -46,6 +46,12 @@ func ssHConnect(user, password, host string, port int) (*ssh.Session, error) {
 //wget https://www.jianyu360.com/upload/extract_v3.tgz
 var sshstr = `
 #!/bin/bash
+curl -fsSL get.docker.com -o get-docker.sh
+sudo sh get-docker.sh --mirror Aliyun
+sudo systemctl start docker
+sudo docker pull registry-vpc.cn-beijing.aliyuncs.com/file2text/gocv:v1 
+sudo docker run -itd --name gocv registry-vpc.cn-beijing.aliyuncs.com/file2text/gocv:v1  /bin/bash 
+sudo docker exec -it gocv /bin/bash
 cd /opt
 kill -9 $(pidof extract_v3)
 rm -rf extract_v3*

src/jy/extract/score_jsondata.go

@@ -23,7 +23,7 @@ func JsonDataMergeProcessing(j *util.Job, e *ExtractTask) map[string][]*util.Ext
 			continue
 		}
 		//jsondata有值，res没有值，取jsondata值
-		if j.Result[v] == nil {
+		if j.Result[v] == nil || len(j.Result[v]) == 0 {
 			if v == "budget" || v == "bidamount" {
 				lockclear.Lock()
 				cfn := e.ClearFn[v]