From 99739810a0c760e9945f28efac6097539cf37753 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Tue, 29 Nov 2022 11:57:21 +0800
Subject: [PATCH] conn

---
 internal/msg_gateway/gate/callback.go  | 11 +++++------
 internal/msg_gateway/gate/logic.go     | 13 +++----------
 internal/msg_gateway/gate/ws_server.go |  2 +-
 pkg/call_back_struct/msg_gateway.go    |  9 ++++-----
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/internal/msg_gateway/gate/callback.go b/internal/msg_gateway/gate/callback.go
index b2f15035e..7f9cb4911 100644
--- a/internal/msg_gateway/gate/callback.go
+++ b/internal/msg_gateway/gate/callback.go
@@ -9,7 +9,7 @@ import (
 	"time"
 )
 
-func callbackUserOnline(operationID, userID string, platformID int, token string, isAppBackgroundStatusChanged bool) cbApi.CommonCallbackResp {
+func callbackUserOnline(operationID, userID string, platformID int, token string, isAppBackground bool) cbApi.CommonCallbackResp {
 	callbackResp := cbApi.CommonCallbackResp{OperationID: operationID}
 	if !config.Config.Callback.CallbackUserOnline.Enable {
 		return callbackResp
@@ -25,8 +25,8 @@ func callbackUserOnline(operationID, userID string, platformID int, token string
 			},
 			UserID: userID,
 		},
-		Seq:                          int(time.Now().UnixNano() / 1e6),
-		IsAppBackgroundStatusChanged: isAppBackgroundStatusChanged,
+		Seq:             int(time.Now().UnixNano() / 1e6),
+		IsAppBackground: isAppBackground,
 	}
 	callbackUserOnlineResp := &cbApi.CallbackUserOnlineResp{CommonCallbackResp: &callbackResp}
 	if err := http.CallBackPostReturn(config.Config.Callback.CallbackUrl, constant.CallbackUserOnlineCommand, callbackUserOnlineReq, callbackUserOnlineResp, config.Config.Callback.CallbackUserOnline.CallbackTimeOut); err != nil {
@@ -36,7 +36,7 @@ func callbackUserOnline(operationID, userID string, platformID int, token string
 	return callbackResp
 }
 
-func callbackUserOffline(operationID, userID string, platformID int, isAppBackgroundStatusChanged bool) cbApi.CommonCallbackResp {
+func callbackUserOffline(operationID, userID string, platformID int) cbApi.CommonCallbackResp {
 	callbackResp := cbApi.CommonCallbackResp{OperationID: operationID}
 	if !config.Config.Callback.CallbackUserOffline.Enable {
 		return callbackResp
@@ -51,8 +51,7 @@ func callbackUserOffline(operationID, userID string, platformID int, isAppBackgr
 			},
 			UserID: userID,
 		},
-		Seq:                          int(time.Now().UnixNano() / 1e6),
-		IsAppBackgroundStatusChanged: isAppBackgroundStatusChanged,
+		Seq: int(time.Now().UnixNano() / 1e6),
 	}
 	callbackUserOfflineResp := &cbApi.CallbackUserOfflineResp{CommonCallbackResp: &callbackResp}
 	if err := http.CallBackPostReturn(config.Config.Callback.CallbackUrl, constant.CallbackUserOfflineCommand, callbackOfflineReq, callbackUserOfflineResp, config.Config.Callback.CallbackUserOffline.CallbackTimeOut); err != nil {
diff --git a/internal/msg_gateway/gate/logic.go b/internal/msg_gateway/gate/logic.go
index cc795703d..aecf82238 100644
--- a/internal/msg_gateway/gate/logic.go
+++ b/internal/msg_gateway/gate/logic.go
@@ -403,16 +403,9 @@ func (ws *WServer) setUserDeviceBackground(conn *UserConn, m *Req) {
 	if isPass {
 		req := pData.(*sdk_ws.SetAppBackgroundStatusReq)
 		conn.IsBackground = req.IsBackground
-		if req.IsBackground {
-			callbackResp := callbackUserOffline(m.OperationID, conn.userID, int(conn.platformID), true)
-			if callbackResp.ErrCode != 0 {
-				log.NewError(m.OperationID, utils.GetSelfFuncName(), "callbackUserOffline failed", callbackResp)
-			}
-		} else {
-			callbackResp := callbackUserOnline(m.OperationID, conn.userID, int(conn.platformID), conn.token, true)
-			if callbackResp.ErrCode != 0 {
-				log.NewError(m.OperationID, utils.GetSelfFuncName(), "callbackUserOffline failed", callbackResp)
-			}
+		callbackResp := callbackUserOnline(m.OperationID, conn.userID, int(conn.platformID), conn.token, req.IsBackground)
+		if callbackResp.ErrCode != 0 {
+			log.NewError(m.OperationID, utils.GetSelfFuncName(), "callbackUserOffline failed", callbackResp)
 		}
 		log.NewInfo(m.OperationID, "SetUserDeviceBackground", "success", *conn, req.IsBackground)
 	}
diff --git a/internal/msg_gateway/gate/ws_server.go b/internal/msg_gateway/gate/ws_server.go
index 74252182a..ad09a28b6 100644
--- a/internal/msg_gateway/gate/ws_server.go
+++ b/internal/msg_gateway/gate/ws_server.go
@@ -386,7 +386,7 @@ func (ws *WServer) delUserConn(conn *UserConn) {
 	if err != nil {
 		log.Error(operationID, " close err", "", "uid", uid, "platform", platform)
 	}
-	callbackResp := callbackUserOffline(operationID, conn.userID, platform, false)
+	callbackResp := callbackUserOffline(operationID, conn.userID, platform)
 	if callbackResp.ErrCode != 0 {
 		log.NewError(operationID, utils.GetSelfFuncName(), "callbackUserOffline failed", callbackResp)
 	}
diff --git a/pkg/call_back_struct/msg_gateway.go b/pkg/call_back_struct/msg_gateway.go
index 87d07c19f..954a6a3af 100644
--- a/pkg/call_back_struct/msg_gateway.go
+++ b/pkg/call_back_struct/msg_gateway.go
@@ -2,9 +2,9 @@ package call_back_struct
 
 type CallbackUserOnlineReq struct {
 	UserStatusCallbackReq
-	Token                        string `json:"token"`
-	Seq                          int    `json:"seq"`
-	IsAppBackgroundStatusChanged bool   `json:"isAppBackgroundStatusChanged"`
+	Token           string `json:"token"`
+	Seq             int    `json:"seq"`
+	IsAppBackground bool   `json:"isAppBackground"`
 }
 
 type CallbackUserOnlineResp struct {
@@ -13,8 +13,7 @@ type CallbackUserOnlineResp struct {
 
 type CallbackUserOfflineReq struct {
 	UserStatusCallbackReq
-	Seq                          int  `json:"seq"`
-	IsAppBackgroundStatusChanged bool `json:"isAppBackgroundStatusChanged"`
+	Seq int `json:"seq"`
 }
 
 type CallbackUserOfflineResp struct {