From 7c811247ecf143e08c576986a884bedadc57dd66 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 05 六月 2020 18:29:41 +0800
Subject: [PATCH] add refresh token to resp

---
 main.go |   75 ++++++++++++++++++++++++++-----------
 1 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/main.go b/main.go
index dbcf601..fda111d 100644
--- a/main.go
+++ b/main.go
@@ -1,40 +1,69 @@
 package main
 
 import (
-	"basic.com/dbapi.git"
 	"flag"
-	"github.com/golang/glog"
 	"strconv"
+	"webserver/cache"
 	"webserver/extend/config"
-	"webserver/models"
+	"webserver/extend/sys"
 	"webserver/router"
-	"webserver/service"
+
+	"basic.com/dbapi.git"
+	"basic.com/valib/logger.git"
+	"github.com/spf13/viper"
 )
-var envirment = flag.String("e", "dev", "")
-var dbIp = flag.String("dbIp","127.0.0.1","default dbIp=127.0.0.1")
-var dbPort = flag.String("dbPort","8001","default dbPort=8001")
-func main() {
+
+var envirment = flag.String("e", "pro", "")
+var dbIp = flag.String("dbIp", "127.0.0.1", "default dbIp=127.0.0.1")
+var dbPort = flag.String("dbPort", "8001", "default dbPort=8001")
+var surveyPort = flag.Int("surveyPort", 40007, "survey port") //蹇冭烦
+var pubPort = flag.Int("pubPort", 50007, "pubsub port")       //鏁版嵁鏇存柊
+var initchan = make(chan bool)
+
+func init() {
 	flag.Parse()
-	service.InitService()
 
 	p, err := strconv.Atoi(*dbPort)
-	if err !=nil {
+	if err != nil {
 		p = 8001
 	}
-	dbapi.Init(*dbIp,p)
-
-	flag.Usage = func() {
-		glog.Exit("flag parse usage !")
-	}
-
-	flag.Lookup("alsologtostderr").Value.Set("true")
-	flag.Lookup("log_dir").Value.Set("./log")
+	dbapi.Init(*dbIp, p)
 	config.Init(*envirment)
-	models.Init()
+
+	var logFile = "./logger/"
+	if viper.GetString("LogBasePath") != "" {
+		logFile = viper.GetString("LogBasePath")
+	}
+	logFile = logFile + "/webserver.log"
+	var logSaveDays = 15
+
+	// 鏃ュ織鍒濆鍖�
+	if viper.IsSet("LogLevel") &&
+		viper.GetInt("LogLevel") >= logger.PanicLevel &&
+		viper.GetInt("LogLevel") <= logger.DebugLevel {
+		logger.Config(logFile, viper.GetInt("LogLevel"))
+	} else {
+		logger.Config(logFile, logger.DebugLevel)
+	}
+	logger.SetSaveDays(logSaveDays)
+	logger.Info("loginit success !")
+}
+
+// @title Swagger API
+// @version 2.0
+// @description analysis webserver
+// @securityDefinitions.apikey ApiKeyAuth
+// @in header
+// @name Authorization
+// @BasePath /
+func main() {
+	flag.Parse()
+	go cache.Init(initchan, *dbIp, *surveyPort, *pubPort)
+	logger.Debug("heartBeat with db done!", <-initchan)
+
+	// 缁熻绯荤粺杩愯鐘舵��
+	go sys.GatherStat()
+
 	r := router.NewRouter()
-
 	r.Run("0.0.0.0:8000")
-
-	defer models.CloseDB()
-	//defer new(gorun.SimpleFaceDetect).FaceDetactClose()
 }

--
Gitblit v1.8.0