From 6beddd664dd90fc4a46a28fb4f58ebd948f09e12 Mon Sep 17 00:00:00 2001
From: boyce <boyce.duan@gmail.com>
Date: Thu, 7 Mar 2019 14:44:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sysmodule/DBModule.go | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sysmodule/DBModule.go b/sysmodule/DBModule.go
index 5009de2..da350f5 100644
--- a/sysmodule/DBModule.go
+++ b/sysmodule/DBModule.go
@@ -296,7 +296,17 @@ func (slf *SyncDBResult) Get(timeoutMs int) DBResult {
 
 // Query ...
 func (slf *DBModule) Query(query string, args ...interface{}) DBResult {
+	if slf.db == nil {
+		ret := DBResult{}
+		service.GetLogger().Printf(service.LEVER_ERROR, "cannot connect database:%s", query)
+		ret.Err = fmt.Errorf("cannot connect database!")
+		return ret
+	}
 	rows, err := slf.db.Query(query, args...)
+	if err != nil {
+		service.GetLogger().Printf(service.LEVER_ERROR, "Query:%s(%v)", query, err)
+	}
+
 	return DBResult{
 		Err:  err,
 		res:  rows,
@@ -331,11 +341,16 @@ func (slf *DBModule) SyncQuery(query string, args ...interface{}) SyncDBResult {
 func (slf *DBModule) Exec(query string, args ...interface{}) DBResult {
 	ret := DBResult{}
 	if slf.db == nil {
+		service.GetLogger().Printf(service.LEVER_ERROR, "cannot connect database:%s", query)
 		ret.Err = fmt.Errorf("cannot connect database!")
 		return ret
 	}
 
 	res, err := slf.db.Exec(query, args...)
+	if err != nil {
+		service.GetLogger().Printf(service.LEVER_ERROR, "Exec:%s(%v)", query, err)
+	}
+
 	ret.Err = err
 	ret.LastInsertID, _ = res.LastInsertId()
 	ret.RowsAffected, _ = res.RowsAffected()

From 967d8f388ffc5b0d70078ae29f2bd122ed8a81e5 Mon Sep 17 00:00:00 2001
From: learnmore2019 <772381604@qq.com>
Date: Thu, 7 Mar 2019 15:01:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sysmodule/DBModule.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sysmodule/DBModule.go b/sysmodule/DBModule.go
index da350f5..34ef2e5 100644
--- a/sysmodule/DBModule.go
+++ b/sysmodule/DBModule.go
@@ -347,11 +347,12 @@ func (slf *DBModule) Exec(query string, args ...interface{}) DBResult {
 	}
 
 	res, err := slf.db.Exec(query, args...)
+	ret.Err = err
 	if err != nil {
 		service.GetLogger().Printf(service.LEVER_ERROR, "Exec:%s(%v)", query, err)
+		return ret
 	}
 
-	ret.Err = err
 	ret.LastInsertID, _ = res.LastInsertId()
 	ret.RowsAffected, _ = res.RowsAffected()
 	return ret

From 451d756dc9bf8e0be2c0c7bac63849502fb3a6be Mon Sep 17 00:00:00 2001
From: boyce <boyce.duan@gmail.com>
Date: Mon, 11 Mar 2019 10:32:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 originnode/node.go             | 2 ++
 sysservice/httpserverervice.go | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/originnode/node.go b/originnode/node.go
index 8927931..60f6368 100644
--- a/originnode/node.go
+++ b/originnode/node.go
@@ -96,6 +96,7 @@ func (s *COriginNode) Start() {
 
 	//停止运行程序
 	s.Stop()
+	service.GetLogger().Printf(sysmodule.LEVER_INFO, "Node stop run...")
 }
 
 func (s *COriginNode) Stop() {
@@ -113,6 +114,7 @@ func NewOrginNode() *COriginNode {
 	//安装系统服务
 	syslogservice := &sysservice.LogService{}
 	syslogservice.InitLog("syslog", sysmodule.LEVER_INFO)
+
 	service.InstanceServiceMgr().Setup(syslogservice)
 
 	//初始化集群对象
diff --git a/sysservice/httpserverervice.go b/sysservice/httpserverervice.go
index 3a98d4a..d2ba39d 100644
--- a/sysservice/httpserverervice.go
+++ b/sysservice/httpserverervice.go
@@ -18,7 +18,8 @@ import (
 )
 
 type HttpRequest struct {
-	Body string
+	Header http.Header
+	Body   string
 }
 
 type HttpRespone struct {
@@ -111,7 +112,7 @@ func (slf *HttpServerService) httpHandler(w http.ResponseWriter, r *http.Request
 	}
 	strCallPath := "_" + vstr[1] + ".HTTP_" + vstr[2]
 
-	request := HttpRequest{string(msg)}
+	request := HttpRequest{r.Header, string(msg)}
 	var resp HttpRespone
 
 	cluster.InstanceClusterMgr().Call(strCallPath, &request, &resp)