Skip to content

Commit

Permalink
v1.1
Browse files Browse the repository at this point in the history
v1.1
  • Loading branch information
Sniper970119 authored Mar 11, 2019
2 parents adc1a8d + 0ee77da commit 0badd09
Show file tree
Hide file tree
Showing 49 changed files with 868 additions and 130 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ API帮助文档请点[这里](http://www.sniper97.cn/MemoryAssist/API)

2019-2-21:v1.0.2发布。修复服务器可能返回错误的版本号的问题。

2019-3-05:开始第五次迭代。计划完成服务器端对用户的唯一标识,方便以后的个性化服务。

2019-3-11:完成第五次迭代。完成服务器对客户端的标识、登录数据统计以及定时的邮件回报。


## 动态展示(v0.2)

Expand Down
2 changes: 1 addition & 1 deletion VerifyTec/messageTransferTest/test11.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
server.bind(('0.0.0.0', 8000))
server.listen(10)
sock, addr = server.accept()

while True:
data = sock.recv(1024)
data = str(addr) + ':' + str(data)
print(data.decode('utf-8'))
returnData = raw_input()
sock.send(returnData.encode('utf-8'))
Expand Down
7 changes: 4 additions & 3 deletions VerifyTec/messageTransferTest/test12.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@

client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
client.connect(('127.0.0.1', 8000))
f = client.makefile(mode='r')
while True:
line = f.readline()
f.write(line)
message = raw_input()
client.send(message.encode('utf-8'))
data = client.recv(1024)
print(data.decode('utf-8'))

24 changes: 24 additions & 0 deletions VerifyTec/test16.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import random
import string
import re

# salt = ''.join(random.sample(string.ascii_letters + string.digits, 32))
# print(salt)
address = "('127.0.0.1', 63087)"
address = re.findall('\'(.*?)\'', address)[0]
address = address.replace('.', '\\')
print(address)


# import pymongo
#
# myclient = pymongo.MongoClient("localhost:27017")
# mydb = myclient["MemoryAssist"]
# totalCol = mydb["total_user"]
# weeklyCol = mydb["weekly_user"]
# dictInTotal = {
# 'user_code': '123456',
# 'total_time': '1',
# 'user_ip': {'127/0/0/1': '1'},
# }
# totalCol.insert_one(dictInTotal)
23 changes: 23 additions & 0 deletions VerifyTec/test17.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# coding=utf-8
import smtplib
from email.mime.text import MIMEText

msg_from = '[email protected]' # 发送方邮箱
passwd = 'ysqmxpfdkxhsbigd' # 填入发送方邮箱的授权码
msg_to = '[email protected]' # 收件人邮箱

subject = "python邮件测试" # 主题
content = "这是我使用python smtplib及\nemail模块发送的邮件1111"
msg = MIMEText(content)
msg['Subject'] = subject
msg['From'] = msg_from
msg['To'] = msg_to
try:
s = smtplib.SMTP_SSL("smtp.qq.com", 465)
s.login(msg_from, passwd)
s.sendmail(msg_from, msg_to, msg.as_string())
print("发送成功")
except s.SMTPException, e:
print("发送失败")
finally:
s.quit()
19 changes: 19 additions & 0 deletions VerifyTec/test18.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import requests
import json

import simplejson as simplejson

# url = 'http://ip.taobao.com/service/getIpInfo.php?ip=127.0.0.1'
# r = requests.get(url)
# mes = r.text
# # a = dict(r.text)
# a = json.loads(r.text)
# b = a['data']['country'] + a['data']['area'] + a['data']['region'] + a['data']['city']
# print(b)
# print(type(str(a['data']['city'])))
from src.Server.DatabaseSystem.Tools.areaStatistics import AreaStatistics

areaTools = AreaStatistics()
weeklyArea, totalArea = areaTools.statistics()
a = json.dumps(weeklyArea).encode('utf-8').decode('unicode_escape')
print(a)
6 changes: 5 additions & 1 deletion conf/main.ini
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[VERSION]
version = v0.1
version = v1.1

[USER_CODE]
user_code = uGzcgY2UeLOHq9Cj1lyDw8fMrvXRxJ4s
user_time = 0

6 changes: 5 additions & 1 deletion conf/server.ini
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
[VERSION]
lastest_version = v1.0.2
lastest_version = v1.0.2
[MESSAGE]
send_message = True
[USER]
last_week_user_account = 0
3 changes: 3 additions & 0 deletions data/userAction.dat
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@
{2019-02-19 11:34:45} add button has been pressed
{2019-02-19 11:34:50} edit button has been pressed
{2019-02-19 13:44:37} view button has been pressed
{2019-03-07 10:39:37} search button has been click,and the search text is 识别
{2019-03-07 10:39:45} search button has been click,and the search text is 统计
{2019-03-07 10:44:12} search button has been click,and the search text is 统计
44 changes: 5 additions & 39 deletions data/wrongMessage.dat
Original file line number Diff line number Diff line change
@@ -1,39 +1,5 @@
{'|file': 'VersionControlSystem-GetNewFile-doUpdate', '|currentTime': '2019-02-19 13:09:22', '|wrongMessage': error(10061, '')}
{'|file': 'VersionControlSystem-GetNewFile-doUpdate', '|currentTime': '2019-02-19 13:11:13', '|wrongMessage': error(10061, '')}
{'|file': 'VersionControlSystem-GetNewFile-doUpdate', '|currentTime': '2019-02-19 13:11:27', '|wrongMessage': error(10061, '')}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-19 13:12:32', '|wrongMessage': error(10061, '')}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 09:57:03', '|wrongMessage': gaierror(11001, 'getaddrinfo failed')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 09:57:03', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 09:57:49', '|wrongMessage': gaierror(11001, 'getaddrinfo failed')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 09:57:49', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 09:58:12', '|wrongMessage': gaierror(11001, 'getaddrinfo failed')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 09:58:12', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 09:58:50', '|wrongMessage': gaierror(11001, 'getaddrinfo failed')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 09:58:50', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 10:00:31', '|wrongMessage': error(10060, '')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 10:00:31', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 10:01:45', '|wrongMessage': error(10061, '')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 10:01:45', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 10:01:57', '|wrongMessage': error(10061, '')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 10:01:57', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 10:02:45', '|wrongMessage': error(10061, '')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 10:02:45', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 10:03:22', '|wrongMessage': error(10061, '')}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 10:05:07', '|wrongMessage': error(10061, '')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 10:05:07', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 10:05:29', '|wrongMessage': error(10061, '')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 10:05:29', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 10:05:37', '|wrongMessage': error(10061, '')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 10:05:37', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 10:06:11', '|wrongMessage': error(10061, '')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 10:06:11', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 10:07:13', '|wrongMessage': error(10061, '')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 10:07:13', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 10:08:36', '|wrongMessage': error(10061, '')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 10:08:36', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 10:08:40', '|wrongMessage': gaierror(11001, 'getaddrinfo failed')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 10:08:40', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 10:24:27', '|wrongMessage': gaierror(11001, 'getaddrinfo failed')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 10:24:27', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-02-20 10:28:11', '|wrongMessage': gaierror(11001, 'getaddrinfo failed')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-02-20 10:28:11', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'VersionControlSystem-GetNewFile-judgeNeedUpdate', '|currentTime': '2019-03-07 09:41:09', '|wrongMessage': error(10061, '')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-03-07 09:41:09', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
{'|file': 'MessageTransferSystem-MarkUser-markUser', '|currentTime': '2019-03-07 10:38:37', '|wrongMessage': error(10061, '')}
{'|file': 'MessageTransferSystem-MarkUser-markUser', '|currentTime': '2019-03-07 10:39:26', '|wrongMessage': error(10061, '')}
{'|file': 'VersionControlSystem-versionControl', '|currentTime': '2019-03-07 10:39:26', '|wrongMessage': error(10057, '\xd3\xc9\xd3\xda\xcc\xd7\xbd\xd3\xd7\xd6\xc3\xbb\xd3\xd0\xc1\xac\xbd\xd3\xb2\xa2\xc7\xd2(\xb5\xb1\xca\xb9\xd3\xc3\xd2\xbb\xb8\xf6 sendto \xb5\xf7\xd3\xc3\xb7\xa2\xcb\xcd\xca\xfd\xbe\xdd\xb1\xa8\xcc\xd7\xbd\xd3\xd7\xd6\xca\xb1)'), '|\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5|': '\xe6\xb2\xa1\xe6\x9c\x89\xe4\xba\x92\xe8\x81\x94\xe7\xbd\x91\xe8\xbf\x9e\xe6\x8e\xa5'}
8 changes: 7 additions & 1 deletion main.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# -*- coding:utf-8 -*-
from src.Client.View.MainFrame import mainFrame

from src.Server.MessageReportSystem.Tools.sendEmail import SendEmail
# from src.Client.SystemTools.ConfFileRead.configFileRead import ConfigFileRead
#
# a = ConfigFileRead().readFile('USER_CODE', 'user_code')
# print(a == '')
# # print()
SendEmail().send()
25 changes: 24 additions & 1 deletion mainC.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,33 @@
# -*- coding:utf-8 -*-
from src.Client.View.MainFrame import mainFrame
from src.Client.SystemTools.ConfFileRead import configFileRead
from src.Client.MessageTransferSystem.MarkUser import markUser

# 主界面
if __name__ == '__main__':
"""
程序开始前的准备
"""
# 对登录次数进行更新
configFileReadTools = configFileRead.ConfigFileRead()
logTime = configFileReadTools.readFile('USER_CODE', 'user_time')
logTime = int(logTime)
logTime = str(logTime + 1)
configFileReadTools.saveFile('USER_CODE', 'user_time', logTime)
# 尝试向服务器请求用户识别码或者想服务器发送当前登录次数
markUserTools = markUser.MarkUser()
markUserTools.judge()
"""
调用主窗口
"""
mainFrame.MainFrame()
# f = open('./../data/mission.dat')
# print(f.read())

# sphinx-apidoc -o ./source ../src

# pyinstaller mainS.py -i ./images/icon.ico

# pyinstaller mainC.py -i ./images/icon.ico -w -n run

# sphinx-apidoc -o ./source ../src
#
7 changes: 5 additions & 2 deletions mainS.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# -*- coding:utf-8 -*-
from src.Server.Conf.config import *
from src.Server.MessageTransferSystem.VersionControlSystem import versionControl
from src.Server.MessageReportSystem.messageReportSystem import MessageReportSystem

import os

# 主界面
if __name__ == '__main__':
versionControl.VersionControl()


threading.Thread(target=MessageReportSystem().run()).start()
# schedule.every().monday.at("00:00").do(MessageReportSystem().run())
# while True:
10 changes: 8 additions & 2 deletions src/Client/Conf/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
"""
该类负责导入包、debug开关
"""
# 服务器ip
SERVER_IP = 'memoryassist.sniper97.cn'

# 服务器端口
SERVER_FILE_PORT = 9000
SERVER_MES_PORT = 9001
Expand All @@ -42,3 +41,10 @@
VERSION_CONTROL_DEBUG = True


if DEBUG:
# 服务器ip
SERVER_IP = '127.0.0.1'
else:
# 服务器ip
SERVER_IP = 'memoryassist.sniper97.cn'

Loading

0 comments on commit 0badd09

Please sign in to comment.