From ad99b0d01634e263b963dd6b9dfa13b4a473c25c Mon Sep 17 00:00:00 2001
From: hackrobot <xiaoshuang.eric@gmail.com>
Date: Sun, 28 Apr 2024 14:30:31 +0800
Subject: [PATCH] sdvd

---
 main.py | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/main.py b/main.py
index 3ae912a..5263ff4 100644
--- a/main.py
+++ b/main.py
@@ -51,7 +51,7 @@ def chatglmApi(msg, data, group, account_wxid, wxid, wx_name):
         # winHookUrl='http://192.168.31.184:8000/img'
         winHookUrl = 'http://chatbot.hackrobot.cn/img'
         payload = {'query': msg}
-        print("msg=====>",msg)
+        print("msg=====>", msg)
         newPayload = json.loads(json.dumps(payload))
         res = requests.post(winHookUrl, json=newPayload)
         r = res.json()
@@ -70,11 +70,11 @@ def chatglmApi(msg, data, group, account_wxid, wxid, wx_name):
                             from_wxid=wxid,
                             msg=newanswer)
                     else:
-                    # 发送 @ 消息
+                        # 发送 @ 消息
                         WXBotService.send_at_message(robot_wxid=account_wxid,
-                                                    from_wxid=group,
-                                                    msg=groupanswer,
-                                                    wx_list=wxid)
+                                                     from_wxid=group,
+                                                     msg=groupanswer,
+                                                     wx_list=wxid)
             else:
                 # 其他群组消息,不做响应
                 pass
@@ -484,18 +484,7 @@ def kp(event_data):
             # 收到群聊消息
             if group:
                 # 异度世界交流群2 48357370389@chatroom  | 小号群18507867712@chatroom
-                if group == "18507867712@chatroom" or group == "48357370389@chatroom":
-                    # 群聊被@
-                    if "@异度世界" in msg:
-                        # 发送 @ 消息
-                        WXBotService.send_at_message(
-                            robot_wxid=account_wxid,
-                            from_wxid=group,
-                            msg=f'@{wx_name} testgroup',
-                            wx_list=wxid)
-                else:
-                    # 其他群组消息,不做响应
-                    pass
+                chatglmApi(msg, data, group, account_wxid, wxid, wx_name)
             else:
                 # pass
                 if msg in ['工具箱']: