From 4579712dbef6eeb940a9e26409dab745313b5e8a Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 31 七月 2020 14:41:53 +0800
Subject: [PATCH] use yuying env
---
server.go | 7 +--
extend/config/config.go | 70 +++++++++++++++++-----------------
2 files changed, 37 insertions(+), 40 deletions(-)
diff --git a/extend/config/config.go b/extend/config/config.go
index 54b3bf9..bd52bb4 100644
--- a/extend/config/config.go
+++ b/extend/config/config.go
@@ -1,37 +1,37 @@
package config
-import (
- "github.com/spf13/viper"
- "log"
-)
-
-type server []ServerInfo
-
-type ServerInfo struct {
- ServerId string `mapstructure: "serverId"`
- ServerIp string `mapstructure: "serverIp"`
- VideoPort string `mapstructure: "videoPort"`
- NgxIp string `mapstructure: "ngxIp"`
- NgxPort string `mapstructure: "ngxPort"`
-}
-
-var serverList = &server{}
-
-var ServerMap = make(map[string]string,0)
-var NgxMap = make(map[string]string,0)
-func Init(env string, configPath string) {
- var err error
- viper.SetConfigType("yaml")
- viper.SetConfigName(env)
- viper.AddConfigPath(configPath)
- err = viper.ReadInConfig()
- if err != nil {
- log.Fatal("error on parsing configuration file",err)
- }
- viper.UnmarshalKey("server", serverList)
- for _,s :=range *serverList {
- si := s
- ServerMap[si.ServerId] = "http://"+si.ServerIp+":"+si.VideoPort+"/getRecordVideoPath"
- NgxMap[si.ServerId] = "http://"+si.NgxIp+":"+si.NgxPort+"/videosource"
- }
-}
\ No newline at end of file
+//import (
+// "github.com/spf13/viper"
+// "log"
+//)
+//
+//type server []ServerInfo
+//
+//type ServerInfo struct {
+// ServerId string `mapstructure: "serverId"`
+// ServerIp string `mapstructure: "serverIp"`
+// VideoPort string `mapstructure: "videoPort"`
+// NgxIp string `mapstructure: "ngxIp"`
+// NgxPort string `mapstructure: "ngxPort"`
+//}
+//
+//var serverList = &server{}
+//
+//var ServerMap = make(map[string]string,0)
+//var NgxMap = make(map[string]string,0)
+//func Init(env string, configPath string) {
+// var err error
+// viper.SetConfigType("yaml")
+// viper.SetConfigName(env)
+// viper.AddConfigPath(configPath)
+// err = viper.ReadInConfig()
+// if err != nil {
+// log.Fatal("error on parsing configuration file",err)
+// }
+// viper.UnmarshalKey("server", serverList)
+// for _,s :=range *serverList {
+// si := s
+// ServerMap[si.ServerId] = "http://"+si.ServerIp+":"+si.VideoPort+"/getRecordVideoPath"
+// NgxMap[si.ServerId] = "http://"+si.NgxIp+":"+si.NgxPort+"/videosource"
+// }
+//}
\ No newline at end of file
diff --git a/server.go b/server.go
index 41bf3ef..eac0482 100644
--- a/server.go
+++ b/server.go
@@ -9,13 +9,12 @@
"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://192.168.20.10: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")
@@ -25,17 +24,15 @@
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", "192.168.20.10", "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
--
Gitblit v1.8.0