From fe15155400f6b12b99cb6657b481cdfa5289627f Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Fri, 7 Mar 2025 15:43:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/GoUtil/feishu.go | 22 +++++++---------------
 src/server/game/Gm.go       | 10 +++++-----
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/server/GoUtil/feishu.go b/src/server/GoUtil/feishu.go
index 62f000e8..ba7170cd 100644
--- a/src/server/GoUtil/feishu.go
+++ b/src/server/GoUtil/feishu.go
@@ -6,30 +6,22 @@ import (
 	"fmt"
 	"net/http"
 	"server/conf"
+	"time"
 )
 
 const (
-	FEISHU_WEBHOOK = "https://open.feishu.cn/open-apis/bot/v2/hook/70e24a79-b019-434a-b4d1-4592bbf7c311"
+	FEISHU_WEBHOOK = "https://gadmin.bywaystudios.com/api/feishu/notify"
 )
 
 // AAqFpbuPhFSEx
 func SendFeishuFatal(PlayerId int, FuncName string, msg string) error {
 	// 创建请求体
 	payload := map[string]interface{}{
-		"msg_type": "interactive",
-		"card": map[string]interface{}{
-			"type": "template",
-			"data": map[string]interface{}{
-				"template_id":           "AAqFpbuPhFSEx",
-				"template_version_name": "1.0.0",
-				"template_variable": map[string]interface{}{
-					"appName":   conf.Server.GameName,
-					"playerId":  PlayerId,
-					"funcName":  FuncName,
-					"fatal_msg": msg,
-				},
-			},
-		},
+		"notify_msg": fmt.Sprintf("游戏接口出错 %s:%d", conf.Server.GameName, PlayerId),
+		"host":       FuncName,
+		"event_name": msg,
+		"severity":   "High",
+		"alarm_time": time.Unix(time.Now().Unix(), 0).Format("2006-01-02 15:04:05"),
 	}
 	payloadBytes, err := json.Marshal(payload)
 	if err != nil {
diff --git a/src/server/game/Gm.go b/src/server/game/Gm.go
index 79e13e95..749f0fe7 100644
--- a/src/server/game/Gm.go
+++ b/src/server/game/Gm.go
@@ -31,11 +31,11 @@ func ReqGmCommand(player *Player, buf []byte) error {
 	return ReqGmCommand_(player, detail.Command)
 }
 func ReqGmCommand_(player *Player, Command string) error {
-	defer func() {
-		if err := recover(); err != nil {
-			log.Error("ReqGmCommand panic: %v", err)
-		}
-	}()
+	// defer func() {
+	// 	if err := recover(); err != nil {
+	// 		log.Error("ReqGmCommand panic: %v", err)
+	// 	}
+	// }()
 	arg := strings.Split(Command, " ")
 	switch arg[0] {
 	case "additem":