eric/gitlab-instance-0a899031_kunpengfalsk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
hackrobot
2024-04-28 21:39:54 +08:00
parent 55681445f4
commit c375dbf356
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
main.py
View File

@@ -50,12 +50,12 @@ def chatglmApi(msg, data, group, account_wxid, wxid, wx_name):
# chaglm api在本地8000端口 # chaglm api在本地8000端口
# winHookUrl='http://192.168.31.184:8000/img' # winHookUrl='http://192.168.31.184:8000/img'
winHookUrl = 'http://chatbot.hackrobot.cn/img' winHookUrl = 'http://chatbot.hackrobot.cn/img'
if "@异度世界" in msg: if "@异度世界" in msg:
newmsg = re.sub(r"@异度世界\[@emoji=\d+\]", "", msg) newmsg = re.sub(r"@异度世界\[@emoji=\d+\]", "", msg)
else: else:
newmsg=msg newmsg = msg
print("newmsg=====>", newmsg) print("newmsg=====>", newmsg)
payload = {'query': newmsg} payload = {'query': newmsg}
newPayload = json.loads(json.dumps(payload)) newPayload = json.loads(json.dumps(payload))
@@ -69,18 +69,20 @@ def chatglmApi(msg, data, group, account_wxid, wxid, wx_name):
# 群聊被@ # 群聊被@
if "@异度世界" in msg: if "@异度世界" in msg:
res = requests.post(winHookUrl, json=newPayload) res = requests.post(winHookUrl, json=newPayload)
rgroup = res.json() rgroup = res.json()
answer = rgroup.get("answer", "No answer provided") answer = rgroup.get("answer", "No answer provided")
groupanswer = f'@{wx_name} ,{answer} \n [本消息是机器人bot自动回复]' groupanswer = f'@{wx_name} ,{answer} \n [本消息是机器人bot自动回复]'
if "/img" in msg: if "/img" in msg:
newanswer = re.sub(r'#web_img\s+', '', answer) newanswer = re.sub(r'#web_img\s+', '', answer)
# 发送 @ 消息 # 发送 @ 消息
WXBotService.send_at_message(robot_wxid=account_wxid, WXBotService.send_at_message(
from_wxid=group, robot_wxid=account_wxid,
msg=f'@{wx_name} ,{newmsg}=>图片已生成 \n [本消息是机器人bot自动回复]', from_wxid=group,
wx_list=wxid) msg=
f'@{wx_name} ,{newmsg}=>图片已生成 \n [本消息是机器人bot自动回复]',
wx_list=wxid)
WXBotService.send_image_message( WXBotService.send_image_message(
robot_wxid=account_wxid, robot_wxid=account_wxid,
# from_wxid=wxid, # from_wxid=wxid,
@@ -290,9 +292,13 @@ def h5group(nickname, db: Session = Depends(get_db)):
groupList = WXBotService.get_group_members_list( groupList = WXBotService.get_group_members_list(
robot_wxid=config.account_wxid, from_wxid=config.chatroomId) robot_wxid=config.account_wxid, from_wxid=config.chatroomId)
# print('groupList', groupList) # print('groupList', groupList)
for groupItem in groupList['data']: if groupList['data'] is not None:
if groupItem['nickname'] == matchesString: for groupItem in groupList['data']:
inGroup = True if groupItem['nickname'] == matchesString:
inGroup = True
else:
print("Error: 'data' is None.")
if inGroup: if inGroup:
return {"code": 200, "success": "fail", "message": "已经在群聊中"} return {"code": 200, "success": "fail", "message": "已经在群聊中"}
else: else: