murmur/tt-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

据新版协议更新当前包和总包数的判断

Browse Source 
修复信息推送失败的判断失误的bug
This commit is contained in:
CSSC-WORK\murmur 2023-06-19 16:59:26 +08:00
parent 380586931b
commit 0ab35a657d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
run_tt_server.sh
View File

@ -16,7 +16,7 @@ echo "Now run new service."
cur_dateTime=$(date +%Y-%m-%d_%H-%M) cur_dateTime=$(date +%Y-%m-%d_%H-%M)
#cur_dateTime=$(date +%Y-%m-%d_%H-%m-%s) #cur_dateTime=$(date +%Y-%m-%d_%H-%m-%s)
echo ${cur_dateTime} echo ${cur_dateTime}
cd /root/tt/tt-tcp cd ~/tt/tt-tcp
#mv log.txt "./log-"${cur_dateTime}".txt" #mv log.txt "./log-"${cur_dateTime}".txt"
f="./log-"${cur_dateTime}".txt" f="./log-"${cur_dateTime}".txt"
mv rxlog.txt "./rxlog-"${cur_dateTime}".txt" mv rxlog.txt "./rxlog-"${cur_dateTime}".txt"

7
server.py
View File

@ -41,7 +41,6 @@ def s2wx(title="",description="", content=""):
# return # return
# 受API限制，频繁发送会失败 # 受API限制，频繁发送会失败
# 拟合并发送，满3条已发送，超时时间10s # 拟合并发送，满3条已发送，超时时间10s
if len(content): if len(content):
t=f""" t=f"""
*时戳：* *时戳：*
@ -65,7 +64,7 @@ _{datetime.datetime.now()}_
"token": "tt"}) "token": "tt"})
print("nmhd",res) print("nmhd",res)
try: try:
res = res.json()["success"] res = res.json()
except: except:
s="https://msgpusher.com/push/test111" s="https://msgpusher.com/push/test111"
# s="http://47.108.213.155:11722/push/murmur" # s="http://47.108.213.155:11722/push/murmur"
@ -295,8 +294,8 @@ def get_info(data):
return str(x) return str(x)
pass pass
sn = "-".join(list(map(h2s,data[12:17]))) sn = "-".join(list(map(h2s,data[12:17])))
index=int.from_bytes(data[19:20],byteorder="big") index=int.from_bytes(data[20:21],byteorder="big")
cnt=int.from_bytes(data[20:21],byteorder="big") cnt=int.from_bytes(data[21:22],byteorder="big")
t=f"流水号20{sn} \n序号\[{index}/{cnt}]" t=f"流水号20{sn} \n序号\[{index}/{cnt}]"
print(t) print(t)
s2wx("","",t) s2wx("","",t)