From 936be93b83a8799a8400b2f1b49f1710eef6ce51 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 05 七月 2019 19:15:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
main.go | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/main.go b/main.go
index 0f66a94..b2bbcd3 100644
--- a/main.go
+++ b/main.go
@@ -1,27 +1,37 @@
package main
import (
+ "basic.com/dbapi.git"
"flag"
"github.com/golang/glog"
+ "strconv"
"webserver/extend/config"
- "webserver/models"
"webserver/router"
+ "webserver/service"
)
-
+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() {
+ flag.Parse()
+ service.InitService()
- envirment := flag.String("e", "dev", "")
+ p, err := strconv.Atoi(*dbPort)
+ if err !=nil {
+ p = 8001
+ }
+ dbapi.Init(*dbIp,p)
+
flag.Usage = func() {
glog.Exit("flag parse usage !")
}
- flag.Parse()
+
flag.Lookup("alsologtostderr").Value.Set("true")
flag.Lookup("log_dir").Value.Set("./log")
config.Init(*envirment)
- models.Init()
r := router.NewRouter()
+
r.Run("0.0.0.0:8000")
- defer models.CloseDB()
//defer new(gorun.SimpleFaceDetect).FaceDetactClose()
}
--
Gitblit v1.8.0