From ed8c09655a43d9ec44142fb968e5abfbb69416cb Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期三, 19 五月 2021 15:48:14 +0800
Subject: [PATCH] fix
---
server.go | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/server.go b/server.go
index e4ec3ee..da4c36b 100644
--- a/server.go
+++ b/server.go
@@ -1,40 +1,41 @@
package main
import (
+ "andriodServer/controllers"
+ "andriodServer/router"
"flag"
"fmt"
"strconv"
"time"
"andriodServer/esutil"
- "andriodServer/extend/config"
"andriodServer/log"
"github.com/streadway/amqp"
)
var addr = flag.String("addr", "0.0.0.0", "The address to listen to")
-var Eurl = flag.String("eurl", "http://172.16.50.241:9200/", "The port to listen on")
+var Eurl = flag.String("eurl", "http://172.16.50.57: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")
+var sec = flag.Int("sec", 20, "the second for query data")
var Level = flag.String("level","ErrorLevel","log level")
var IsHub = flag.String("hub", "hub", "hub is personIsHub=1")
var Size = flag.Int("size", 100, "size default is 100")
var env = flag.String("env", "config", "env set")
-var mqIp = flag.String("mqIp", "172.17.50.245", "default mq ip")
+var mqIp = flag.String("mqIp", "172.16.50.57", "default mq ip")
var mqPort = flag.Int("mqPort", 5672, "default mq port")
var mqUser = flag.String("mqUser", "basic", "default rabbitmq user")
var mqPass = flag.String("mqPass", "basic", "default rabbitmq pass")
-var confPath = flag.String("confPath", "/home/basic/Apps/go/AndroidAlarmServer/config/","default config path")
func main() {
flag.Parse()
log.SetLogLevel(*Level)
- config.Init(*env, *confPath)
fmt.Println(*port)
+
+ controllers.EsUrl = *Eurl
mqAddr := "amqp://" + *mqUser + ":" + *mqPass + "@" + *mqIp + ":" + strconv.Itoa(*mqPort)+"/"
@@ -52,6 +53,21 @@
}
defer ch.Close()
+ ////濡傛灉鏈夊涓鎴风鎺ユ敹锛岄渶瑕佹敼涓哄箍鎾ā寮�
+ //exErr := ch.ExchangeDeclare(
+ // "alarmExchange",
+ // "fanout",
+ // false,
+ // false,
+ // false,
+ // false,
+ // nil,
+ //)
+ //if exErr != nil {
+ // log.Log.Infof("Failed to declare a exchange,err:", exErr)
+ // return
+ //}
+
q, err := ch.QueueDeclare(
"alarm2Android", // name
false, // durable
@@ -64,6 +80,8 @@
log.Log.Infof("Failed to declare a queue,err:",err)
return
}
+ r := router.NewRouter()
+ go r.Run("0.0.0.0:"+strconv.Itoa(*port))
handleAlarmData2MQ(q, ch)
}
@@ -94,4 +112,4 @@
lastTime = curTime
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0