add picmax, pisub url

龙赣华

2019-05-28 e4c6d8bfcf5c698a459188fdc3d5aac95e451fa9

add picmax, pisub url

 andriodAlarmServer

Binary files differ

 esutil/EsClient.go

@@ -14,7 +14,7 @@
    log "github.com/long/test/log"
)

func GetEsDataReq(url string, parama string, isSource bool) (error, map[string]interface{}) {
func GetEsDataReq(url string, parama string, picurl string, isSource bool) (error, map[string]interface{}) {
    //log.Log.Infoln("es 查询请求路径" + url) //  配置信息 获取
    req, err := http.NewRequest("POST", url, strings.NewReader(parama))

@@ -63,6 +63,7 @@
            }

            source["id"] = value.(map[string]interface{})["_id"]

            sdkType := source["sdkType"]
            if sdkType != nil {
                sdk, err := strconv.Atoi(sdkType.(string))
@@ -72,6 +73,26 @@

                source["sdkType"] = sdkTypeToValue(sdk)
            }

            pmax, exist := source["picMaxUrl"].(string)
            if !exist {
                return errors.New("picMaxurl is not string"), nil
            }

            if !strings.HasPrefix(pmax, "http") {
                source["picMaxUrl"] = picurl + pmax

            }

            psm, exist := source["picSmUrl"].(string)
            if !exist {
                return errors.New("picSmUrl is not string"), nil
            }

            if !strings.HasPrefix(psm, "http") {
                source["picSmUrl"] = picurl + psm
            }

            sources = append(sources, source)
        }
        data["datalist"] = sources
@@ -88,16 +109,16 @@
    return value[i-1]
}

func PostAction(sec int, Eurl string) []byte {
func PostAction(sec int, Eurl string, picurl string) []byte {
    index := "videopersons,personaction"
    url := fmt.Sprintf("%s%s%s", Eurl, index, "/_search")

    seccond := strconv.Itoa(sec)

    prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"personIsHub\":\"1\"}},{\"range\":{\"picDate\":{\"gte\":\"now+8h-" + seccond + "s\",\"lt\":\"now+8h\"}}}]}},\"size\":\"1000\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"_source\":[\"baseInfo\",\"gender\",\"indeviceName\",\"sdkType\",\"ageDescription\",\"content\",\"ID\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"IDCard\",\"videoIp\",\"videoReqNum\"]" +
        "\"_source\":[\"baseInfo\",\"gender\",\"indeviceName\",\"imageKey\",\"sdkType\",\"ageDescription\",\"indeviceid\",\"content\",\"ID\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"IDCard\",\"videoIp\",\"videoReqNum\"]" +
        "}"
    err, tokenRes := GetEsDataReq(url, prama, true)
    err, tokenRes := GetEsDataReq(url, prama, picurl, true)
    if err != nil {
        log.Log.Errorln(err)
        return nil

 log/log.go

@@ -21,7 +21,7 @@
        return Log
    }

    infopath := "log/log_record/info.log"
    infopath := "logs/info.log"
    infowriter, _ := rotatelogs.New(
        infopath+".%Y%m%d%H%M",
        rotatelogs.WithLinkName(infopath),
@@ -29,7 +29,7 @@
        rotatelogs.WithRotationTime(24*time.Hour),
    )

    errorpath := "log/log_record/error.log"
    errorpath := "logs/error.log"
    errorwriter, _ := rotatelogs.New(
        errorpath+".%Y%m%d%H%M",
        rotatelogs.WithLinkName(errorpath),

 logs/error.log

New file
@@ -0,0 +1 @@
logs/error.log.201905280000

 logs/error.log.201905270000

New file
@@ -0,0 +1,13 @@
{"level":"error","msg":"EOF remoteAddr  192.168.1.109:40660  close","time":"2019-05-27T17:34:24+08:00"}
{"level":"error","msg":"EOF remoteAddr  192.168.1.103:55980  close","time":"2019-05-27T17:36:40+08:00"}
{"level":"error","msg":"EOF remoteAddr  192.168.1.103:55984  close","time":"2019-05-27T17:36:52+08:00"}
{"level":"error","msg":"EOF remoteAddr  192.168.1.109:40664  close","time":"2019-05-27T17:36:53+08:00"}
{"level":"error","msg":"EOF remoteAddr  192.168.1.103:55988  close","time":"2019-05-27T17:37:05+08:00"}
{"level":"error","msg":"EOF remoteAddr  192.168.1.103:55990  close","time":"2019-05-27T17:37:17+08:00"}
{"level":"error","msg":"EOF remoteAddr  192.168.1.103:55992  close","time":"2019-05-27T17:37:29+08:00"}
{"level":"error","msg":"EOF remoteAddr  192.168.1.103:55994  close","time":"2019-05-27T17:37:41+08:00"}
{"level":"error","msg":"EOF remoteAddr  192.168.1.103:55996  close","time":"2019-05-27T17:37:48+08:00"}
{"level":"error","msg":"read tcp 192.168.1.124:6006-\u003e192.168.1.109:40720: read: connection reset by peer remoteAddr  192.168.1.109:40720  close","time":"2019-05-27T17:38:00+08:00"}
{"level":"error","msg":"EOF remoteAddr  192.168.1.103:56016  close","time":"2019-05-27T17:38:51+08:00"}
{"level":"error","msg":"EOF remoteAddr  192.168.1.109:40722  close","time":"2019-05-27T17:38:56+08:00"}
{"level":"error","msg":"EOF remoteAddr  192.168.1.103:56020  close","time":"2019-05-27T17:39:13+08:00"}

 logs/error.log.201905280000

New file
@@ -0,0 +1,5 @@
{"level":"error","msg":"EOF remoteAddr  192.168.1.109:46082  close","time":"2019-05-28T09:56:18+08:00"}
{"level":"error","msg":"EOF remoteAddr  192.168.1.109:46086  close","time":"2019-05-28T09:58:22+08:00"}
{"level":"error","msg":"EOF remoteAddr  192.168.1.109:42530  close","time":"2019-05-28T10:50:35+08:00"}
{"level":"error","msg":"EOF remoteAddr  192.168.1.109:43806  close","time":"2019-05-28T11:49:25+08:00"}
{"level":"error","msg":"EOF remoteAddr  192.168.1.109:45052  close","time":"2019-05-28T11:58:15+08:00"}

 server.go

@@ -2,6 +2,7 @@

import (
    "flag"
    "fmt"
    "net"
    "strconv"
    "time"
@@ -10,8 +11,9 @@
    log "github.com/long/test/log"
)

var addr = flag.String("addr", "192.168.1.124", "The address to listen to;")
var addr = flag.String("addr", "0.0.0.0", "The address to listen to;")
var Eurl = flag.String("eurl", "http://192.168.1.182:9200/", "The port to listen on; ")
var Picurl = flag.String("picurl", "http://58.118.225.79:41242/", "picture url ")

var port = flag.Int("port", 6000, "The port to listen on; ")
var sec = flag.Int("sec", 10, "the second for query data. ")
@@ -19,8 +21,7 @@
func main() {
    flag.Parse()

    log.Log.Infoln("starting server...")

    fmt.Println(*port)
    src := *addr + ":" + strconv.Itoa(*port)
    listener, err := net.Listen("tcp", src)
    if err != nil {
@@ -29,6 +30,7 @@
    }
    log.Log.Infof("Listening on %s.\n", src)

    fmt.Println("starting server success.")
    defer listener.Close()

    for {
@@ -68,7 +70,7 @@
}

func handleMessage(conn net.Conn) {
    jsonstring := esutil.PostAction(*sec, *Eurl)
    jsonstring := esutil.PostAction(*sec, *Eurl, *Picurl)
    if jsonstring == nil {
        log.Log.Infoln("the data is nil")
        return

 test

Binary files differ