From 187ada0f10dcdcbe48f4b50f63cad3230b67be1d Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 25 Aug 2023 10:43:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=B4=A6=E6=88=B7=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handle/api/req_cmca_login_alarm.go | 12 +++---------
 handle/api/req_login_alarm.go      | 12 +++---------
 handle/api/req_sync_alarm_msg.go   |  2 +-
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/handle/api/req_cmca_login_alarm.go b/handle/api/req_cmca_login_alarm.go
index 7fc462b..fbf8c31 100644
--- a/handle/api/req_cmca_login_alarm.go
+++ b/handle/api/req_cmca_login_alarm.go
@@ -54,10 +54,7 @@ func (*ReqCMCALoginAlarm) Handle(request ziface.IRequest) {
 	// 检查判断是否对应随机码
 	if err := service.CMCALogin(username, cert, content, key); err != nil {
 		zlog.Ins().ErrorF("LoginFail %s", err)
-		request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.Result(ReqLoginAlarmMsgName, map[string]string{
-			"result":  "autherror",
-			"resDesc": err.Error(),
-		}))
+		request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.ResultError(ReqLoginAlarmMsgName, err.Error(), ""))
 		// 已登录的，登录错误超过3次,断开连接
 		if uid != nil || uid != "" {
 			isClose, _ := m.LoginFail(uid.(string))
@@ -73,14 +70,11 @@ func (*ReqCMCALoginAlarm) Handle(request ziface.IRequest) {
 	err = m.LoginSuccess(uid.(string), username, tp)
 	if err != nil {
 		zlog.Ins().ErrorF("manager:%s", err)
-		request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.Result(ReqLoginAlarmMsgName, map[string]string{
-			"result":  "autherror",
-			"resDesc": err.Error(),
-		}))
+		request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.ResultError(ReqLoginAlarmMsgName, err.Error(), ""))
 		return
 	}
 
 	zlog.Ins().InfoF("user login loginSuccess,username:%s, type:%s, channel:%s", username, tp, request.GetConnection().GetName())
-	request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.ResultSuccess(ReqLoginAlarmMsgName, "ok", ""))
+	request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.ResultSuccess(ReqLoginAlarmMsgName, "null", ""))
 
 }
diff --git a/handle/api/req_login_alarm.go b/handle/api/req_login_alarm.go
index 5f74e9c..acb8e52 100644
--- a/handle/api/req_login_alarm.go
+++ b/handle/api/req_login_alarm.go
@@ -52,10 +52,7 @@ func (s *ReqLoginAlarm) Handle(request ziface.IRequest) {
 	err = service.UserLogin(username, key)
 	if err != nil {
 		zlog.Ins().ErrorF("LoginFail %s", err)
-		request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.Result(ReqLoginAlarmMsgName, map[string]string{
-			"result":  "autherror",
-			"resDesc": err.Error(),
-		}))
+		request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.ResultError(ReqLoginAlarmMsgName, err.Error(), ""))
 		// 已登录的，登录错误超过3次,断开连接
 		if uid != nil || uid != "" {
 			isClose, _ := m.LoginFail(uid.(string))
@@ -71,12 +68,9 @@ func (s *ReqLoginAlarm) Handle(request ziface.IRequest) {
 	err = m.LoginSuccess(uid.(string), username, tp)
 	if err != nil {
 		zlog.Ins().ErrorF("manager:%s", err)
-		request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.Result(ReqLoginAlarmMsgName, map[string]string{
-			"result":  "autherror",
-			"resDesc": err.Error(),
-		}))
+		request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.ResultError(ReqLoginAlarmMsgName, err.Error(), ""))
 		return
 	}
 	zlog.Ins().InfoF("user login loginSuccess,username:%s, type:%s, channel:%s", username, tp, request.GetConnection().GetName())
-	request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.ResultSuccess(ReqLoginAlarmMsgName, "ok", ""))
+	request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.ResultSuccess(ReqLoginAlarmMsgName, "null", ""))
 }
diff --git a/handle/api/req_sync_alarm_msg.go b/handle/api/req_sync_alarm_msg.go
index 5d7bf6a..8a2f08a 100644
--- a/handle/api/req_sync_alarm_msg.go
+++ b/handle/api/req_sync_alarm_msg.go
@@ -65,7 +65,7 @@ func (s *ReqSyncAlarmMsg) Handle(request ziface.IRequest) {
 		} else {
 			// 发送更新上报的alarm seq
 			m.UpdateAlarmSeq(int64(alarmSeq))
-			request.GetConnection().SendMsg(ReqSyncAlarmMsgType, core.ResultSuccess(ReqSyncAlarmMsgName, "ok", reqId))
+			request.GetConnection().SendMsg(ReqSyncAlarmMsgType, core.ResultSuccess(ReqSyncAlarmMsgName, "", reqId))
 		}
 		return
 	}