From 89559f0b716ec4a19410f36919fb9113e86d5e10 Mon Sep 17 00:00:00 2001
From: jau1jz <95550641@163.com>
Date: Mon, 11 Mar 2019 14:54:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E5=86=99=E7=BB=93=E6=9E=84=E4=BD=93=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sysservice/httpserverervice.go | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/sysservice/httpserverervice.go b/sysservice/httpserverervice.go
index d2ba39d..7e8d6e3 100644
--- a/sysservice/httpserverervice.go
+++ b/sysservice/httpserverervice.go
@@ -1,7 +1,10 @@
 package sysservice
 
 import (
+	"Server/common"
+	"encoding/json"
 	"fmt"
+	"github.com/duanhf2012/origin/sysmodule"
 	"io/ioutil"
 	"net/http"
 	"reflect"
@@ -141,3 +144,16 @@ func (slf *HttpServerService) SetHttps(certfile string, keyfile string) bool {
 
 	return true
 }
+
+//序列化后写入Respone
+func (slf *HttpRespone) WriteRespne(v interface{}) error {
+	StrRet, retErr := json.Marshal(v)
+	if retErr == nil {
+		slf.Respone = []byte(`{"Code": 2,"Message":"service error"}`)
+		common.LogPrintf(sysmodule.LEVER_ERROR, "Json Marshal Error")
+	} else {
+		slf.Respone = StrRet
+	}
+
+	return retErr
+}

From c99ec970b0d1138350a4785e27e2360502e39758 Mon Sep 17 00:00:00 2001
From: jau1jz <95550641@163.com>
Date: Mon, 11 Mar 2019 15:21:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?WriteRespne=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sysservice/httpserverervice.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysservice/httpserverervice.go b/sysservice/httpserverervice.go
index 7e8d6e3..838b4e0 100644
--- a/sysservice/httpserverervice.go
+++ b/sysservice/httpserverervice.go
@@ -148,7 +148,7 @@ func (slf *HttpServerService) SetHttps(certfile string, keyfile string) bool {
 //序列化后写入Respone
 func (slf *HttpRespone) WriteRespne(v interface{}) error {
 	StrRet, retErr := json.Marshal(v)
-	if retErr == nil {
+	if retErr != nil {
 		slf.Respone = []byte(`{"Code": 2,"Message":"service error"}`)
 		common.LogPrintf(sysmodule.LEVER_ERROR, "Json Marshal Error")
 	} else {