diff --git a/app/DataBase/msg.py b/app/DataBase/msg.py index 1d9b807..8288987 100644 --- a/app/DataBase/msg.py +++ b/app/DataBase/msg.py @@ -221,7 +221,7 @@ class Msg: sql = ''' select localId,TalkerId,Type,SubType,IsSender,CreateTime,Status,StrContent,strftime('%Y-%m-%d %H:%M:%S',CreateTime,'unixepoch','localtime') as StrTime,MsgSvrID,BytesExtra,CompressContent,DisplayContent from MSG - where StrTalker = ? and localId < ? + where StrTalker = ? and localId < ? and (Type=1 or Type=3) order by CreateTime desc limit 20 ''' diff --git a/app/decrypt/get_wx_info.py b/app/decrypt/get_wx_info.py index d9c0a40..4571ba5 100644 --- a/app/decrypt/get_wx_info.py +++ b/app/decrypt/get_wx_info.py @@ -349,7 +349,7 @@ def read_info(version_list, is_logging=False): wechat_process = [] result = [] error = "" - for process in psutil.process_iter(['name', 'exe', 'pid', 'cmdline']): + for process in psutil.process_iter(['name', 'exe', 'pid']): if process.name() == 'WeChat.exe': wechat_process.append(process) diff --git a/app/resources/data/template.html b/app/resources/data/template.html index 5d5e9bf..8bf2d1a 100644 --- a/app/resources/data/template.html +++ b/app/resources/data/template.html @@ -16,8 +16,8 @@ body { height: 100vh; align-items: center; justify-content: center; - background-color: #E4E6C5; - background-image: url("data:image/svg+xml,%3Csvg width='52' height='26' viewBox='0 0 52 26' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Cg fill='%2394AB85' fill-opacity='0.4'%3E%3Cpath d='M10 10c0-2.21-1.79-4-4-4-3.314 0-6-2.686-6-6h2c0 2.21 1.79 4 4 4 3.314 0 6 2.686 6 6 0 2.21 1.79 4 4 4 3.314 0 6 2.686 6 6 0 2.21 1.79 4 4 4v2c-3.314 0-6-2.686-6-6 0-2.21-1.79-4-4-4-3.314 0-6-2.686-6-6zm25.464-1.95l8.486 8.486-1.414 1.414-8.486-8.486 1.414-1.414z' /%3E%3C/g%3E%3C/g%3E%3C/svg%3E"); + background-color: #F5F5F5; + //background-image: url("data:image/svg+xml,%3Csvg width='52' height='26' viewBox='0 0 52 26' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Cg fill='%2394AB85' fill-opacity='0.4'%3E%3Cpath d='M10 10c0-2.21-1.79-4-4-4-3.314 0-6-2.686-6-6h2c0 2.21 1.79 4 4 4 3.314 0 6 2.686 6 6 0 2.21 1.79 4 4 4 3.314 0 6 2.686 6 6 0 2.21 1.79 4 4 4v2c-3.314 0-6-2.686-6-6 0-2.21-1.79-4-4-4-3.314 0-6-2.686-6-6zm25.464-1.95l8.486 8.486-1.414 1.414-8.486-8.486 1.414-1.414z' /%3E%3C/g%3E%3C/g%3E%3C/svg%3E"); } ::-webkit-scrollbar { @@ -698,6 +698,13 @@ input {