From d88ba9cde019a9b5984ac961057715fb4704677d Mon Sep 17 00:00:00 2001
From: hzwy23 <hzwy23@163.com>
Date: Wed, 6 Dec 2017 21:34:39 +0800
Subject: [PATCH] remove dbobj.conf, add config to app.conf

---
 conf/app.conf      | 20 +++++++++++++++++++-
 conf/dbobj.conf    | 27 ---------------------------
 utils/logs/logs.go |  2 +-
 3 files changed, 20 insertions(+), 29 deletions(-)
 delete mode 100644 conf/dbobj.conf

diff --git a/conf/app.conf b/conf/app.conf
index 01a6e3d..432503b 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -12,4 +12,22 @@ httpscertfile = "./conf/rui.crt"
 httpskeyfile = "./conf/rui.key"
 enablefcgi =  false
 graceful = false
-enablehttp = false
\ No newline at end of file
+enablehttp = false
+
+###日志级别
+## debug
+## info
+Hauth.log.level = debug
+
+#database configuration:
+#   mysql
+DB.type=mysql
+DB.tns = "tcp(118.31.46.174:3306)/test"
+DB.user = root
+DB.passwd="xzPEh+SfFL3aimN0zGNB9w=="
+
+### oracle
+#DB.type= oracle
+#DB.tns = "172.168.171.200/bigdata"
+#DB.user = ca
+#DB.passwd="wJAolGiEoiiF5Ll7yvPKqA=="
\ No newline at end of file
diff --git a/conf/dbobj.conf b/conf/dbobj.conf
deleted file mode 100644
index d0541e0..0000000
--- a/conf/dbobj.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-#database configuration:
-#   mysql
-DB.type=mysql
-DB.tns = "tcp(localhost:3306)/test"
-DB.user = root
-DB.passwd="xzPEh+SfFL3aimN0zGNB9w=="
-
-
-
-
-### oracle
-#DB.type= oracle
-#DB.tns = "172.168.171.200/bigdata"
-#DB.user = ca
-#DB.passwd="wJAolGiEoiiF5Ll7yvPKqA=="
-
-###日志级别
-## debug
-## info
-Hauth.log.level = debug
-
-### 将80端口的http请求，转发到443端口上的https请求
-## true 表示开启
-## false 表示关闭
-PortMap = false
-## 80 转发 的目标地址，如果非443端口，请在TargetHost中带上端口号
-TargetHost="https://localhost"
diff --git a/utils/logs/logs.go b/utils/logs/logs.go
index d211f6d..ab2211f 100644
--- a/utils/logs/logs.go
+++ b/utils/logs/logs.go
@@ -79,7 +79,7 @@ func init() {
 	//GetDetails log dir from environment
 	logpath := os.Getenv("HBIGDATA_HOME")
 
-	conf, err := config.GetConfig(path.Join(logpath, "conf", "asofdate.conf"))
+	conf, err := config.GetConfig(path.Join(logpath, "conf", "app.conf"))
 	if err != nil {
 		fmt.Errorf("%v", err)
 		log = back_emc