Merge remote-tracking branch 'origin/master' into alter

# Conflicts:
#	main.go

main.go

@@ -4,37 +4,43 @@ import (
 	"flag"
 	"git.quantgroup.cn/DevOps/enoch/service"
 	"git.quantgroup.cn/DevOps/enoch/service/conf"
+	"git.quantgroup.cn/DevOps/enoch/service/data"
 	"git.quantgroup.cn/DevOps/enoch/service/job"
-	"git.quantgroup.cn/DevOps/enoch/service/log"
 	"log"
 	"net/http"
 	_ "net/http/pprof"
+	"os"
 	"strconv"
 )
 
 func main() {
-	var port string
 	var quartz bool
 	var denv string
 	var didc string
-	flag.StringVar(&port, "port", "10086", "端口")
 	flag.BoolVar(&quartz, "quartz", false, "quartz")
 	flag.StringVar(&denv, "env", "dev", "环境")
 	flag.StringVar(&didc, "idc", "local", "机房")
 	flag.Parse()
 	conf.Load(denv, didc)
 
-	logger.Info.Println(conf.GlobalConfig.AppName + "项目启动, port:" + port + ",环境:" + conf.GlobalConfig.Env)
-	defer logger.Info.Println("项目结束")
+	file, err := os.OpenFile("quantgroup.log", os.O_RDWR|os.O_CREATE, 0666)
+	defer func() { _ = file.Close() }()
+	if err != nil {
+		log.Fatalln("create file error", err)
+	}
 
-	//初始化redis连接池
-	//data.RedisPoolInit()
+	port := conf.GlobalConfig.Port
+
+	logger := log.New(file, "[Info]", log.LstdFlags|log.Llongfile)
 
-	//初始化alarm
+	logger.Println(conf.GlobalConfig.AppName + "项目启动, port:" + port + ",环境:" + conf.GlobalConfig.Env)
+	defer logger.Println("项目结束")
 
-	//初始化kafka 消费者
-	//go service.AgentClusterConsumer(conf.HealthTopic(), service.HealthMessageHandler{})
-	//go service.AgentClusterConsumer(conf.BraveTopic(), service.BraveMessageHandler{})
+	//初始化redis连接池
+	data.RedisPoolInit()
+
+	go service.AgentClusterConsumer(conf.HealthTopic(), service.HealthMessageHandler{})
+	go service.AgentClusterConsumer(conf.BraveTopic(), service.BraveMessageHandler{})
 	intPort, _ := strconv.Atoi(port)
 
 	if quartz {
@@ -48,11 +54,14 @@ func main() {
 	}()
 
 	http.HandleFunc("/duration", service.DurationInterface)
+	http.HandleFunc("/tech/health/check", func(writer http.ResponseWriter, request *http.Request) {
+		writer.WriteHeader(http.StatusOK)
+	})
 	http.HandleFunc("/counter", service.CounterInterface)
-	err := http.ListenAndServe(":"+port, nil)
+
+	err = http.ListenAndServe(":"+port, nil)
 	if err != nil {
-		logger.Error.Fatalln("服务启动失败", err)
+		log.Fatalln("服务启动失败", err)
 	}
 
-
 }