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