From c7de89ae0c2999d9d2585dc63df28eac36a443e1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 04 九月 2024 19:09:09 +0800
Subject: [PATCH] 10249 【越南】【砍树】仙宫（增加累计消耗货币值同步；）
---
Tool/RemoteTool/RemoteServer/webapp.py | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/Tool/RemoteTool/RemoteServer/webapp.py b/Tool/RemoteTool/RemoteServer/webapp.py
index 5f5f2bc..8152336 100644
--- a/Tool/RemoteTool/RemoteServer/webapp.py
+++ b/Tool/RemoteTool/RemoteServer/webapp.py
@@ -165,7 +165,7 @@
mailText = "错误类型:%s 服务器组:%s, dbname:%s 异常信息:%s" % (stateType,
dataDict.get("groupID", 0),
dataDict.get("userDBName", 0),
- urllib.unquote_plus(dataDict.get("MsgInfo", 0)))
+ urllib.unquote_plus(dataDict.get("MsgInfo", "")))
SendEmail(mailText, dataDict.get("userDBName", 0))
return
elif stateType == "MapDisconnect":
@@ -182,7 +182,7 @@
dataDict.get("groupID", 0),
dataDict.get("userDBName", 0),
dataDict.get("mapID", 0),
- urllib.unquote_plus(dataDict.get("MsgInfo", 0)))
+ urllib.unquote_plus(dataDict.get("MsgInfo", "")))
SendEmail(mailText, dataDict.get("userDBName", 0))
return
elif stateType == "GameWarning":
@@ -190,7 +190,7 @@
mailText = "游戏警报:服务器组:%s, dbname:%s, 警告信息:%s" % (
dataDict.get("groupID", 0),
dataDict.get("userDBName", 0),
- urllib.unquote_plus(dataDict.get("MsgInfo", 0)))
+ urllib.unquote_plus(dataDict.get("MsgInfo", "")))
SendEmail(mailText, dataDict.get("userDBName", 0))
elif stateType == "QueryMapOK":
@@ -237,10 +237,16 @@
serverInfo = dbname.split('GameUser_')[1]
- message = MIMEText('%s' % mailText, 'plain', 'gbk')
- message['From'] = Header("%s %s" % (serverInfo, subject), 'gbk')
- message['To'] = Header("运维", 'gbk') # 不发送的话会被记录为垃圾邮件
- message['Subject'] = Header(subject, 'gbk')
+ if SMTPServer == "qq":
+ message = MIMEText('%s' % mailText, 'plain', 'gbk')
+ message['From'] = mail_user
+ message['To'] = Header("运维", 'gbk') # 不发送的话会被记录为垃圾邮件
+ message['Subject'] = Header("%s%s" % (serverInfo, subject), 'gbk')
+ else:
+ message = MIMEText('%s' % mailText, 'plain', 'gbk')
+ message['From'] = Header("%s %s" % (serverInfo, subject), 'gbk')
+ message['To'] = Header("运维", 'gbk') # 不发送的话会被记录为垃圾邮件
+ message['Subject'] = Header(subject, 'gbk')
if SSL == 1:
smtpObj = smtplib.SMTP_SSL(mail_host)
--
Gitblit v1.8.0