diff --git a/main.py b/main.py index 211e124..6a49a0e 100644 --- a/main.py +++ b/main.py @@ -35,6 +35,10 @@ models.Base.metadata.create_all(bind=engine) app = FastAPI() + +# 全局消息变量 +# globalMsgData=None + def is_chinese(char): """检查字符是否为中文字符。""" return '\u4e00' <= char <= '\u9fff' @@ -57,14 +61,7 @@ def convert_special_chars_to_emoji(input_string): # 将列表中的字符组合成一个字符串 return ''.join(output) -# 示例字符串 -input_string = "aaa取暖桌ᯤ⁵ᴳ" -# 调用函数 -output_string = convert_special_chars_to_emoji(input_string) - -print("输入字符串:", input_string) -print("输出字符串:", output_string) # 转换emoji字符串为[] @@ -93,6 +90,7 @@ def transOldemoji(oldEmoji=None): + # Dependency def get_db(): db = SessionLocal() @@ -246,6 +244,8 @@ def h5group(nickname, db: Session = Depends(get_db)): from_wxid=config.chatroomId, #异度星球群 new_wxid=new_wxid) print('new_wxid--', new_wxid) + # 发送小程序 + utils.sendminiProgram(globalMsgData, config.account_wxid, new_wxid, planetXml) return {"code": 200, "success": "ok", "message": "群聊邀请已发送"} else: return {"code": 200, "success": "ok", "message": "查不到nickname"} @@ -326,6 +326,8 @@ def kp(event_data): event_type = event_data.get('event_type') #事件类型 account_wxid = event_data.get('account_wxid') #机器人id data = event_data.get('data') + global globalMsgData + globalMsgData=event_data.get('data') msg_type = data.get('msgtype') #消息类型 msg = data.get('content') to_wxid = data.get('to_wxid') #发送给 @@ -427,22 +429,22 @@ def kp(event_data): # WXBotService.add_group_members_40_more(robot_wxid='wxid_sfvsru738v3122', # from_wxid='49187487591@chatroom', # new_wxid='wxid_4413224132412') - print("data", data) - if "emoji" in wx_name: - # 发送小程序 - utils.sendminiProgram(data, account_wxid, wxid, planetXml) - else: - # H5链接 - WXBotService.send_link_message( - account_wxid, - wxid, - title="欢迎加入微信群", - desc="请查看规则", - url= - f'https://link.hackrobot.cn#/pages/index/index?wxid={wxid}', - pic= - "https://www.hackrobot.cn/wp-content/uploads/2023/05/cropped-cropped-Screenshot-2023-05-22-at-17.26.38.png" - ) + # print("data", data) + # if "emoji" in wx_name: + # # 发送小程序 + # utils.sendminiProgram(data, account_wxid, wxid, planetXml) + # else: + # H5链接 + WXBotService.send_link_message( + account_wxid, + wxid, + title="欢迎加入微信群", + desc="请查看规则", + url= + f'https://link.hackrobot.cn#/pages/index/index?wxid={wxid}', + pic= + "https://www.hackrobot.cn/wp-content/uploads/2023/05/cropped-cropped-Screenshot-2023-05-22-at-17.26.38.png" + ) # if msg in ['腾讯云']: # # 发送小程序