m26508134
/
docklet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #191 from FirmlyReality/bug 

Fix some bugs
This commit is contained in:
Yujian Zhu 2016-09-26 09:34:02 +08:00 committed by GitHub
parent 2f5351693c dcb85ef739
commit 857434b85e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/httprest.py
View File

@ -998,7 +998,7 @@ if __name__ == '__main__':
master_collector.start()
logger.info("master_collector started")
G_applicationmgr = beansapplicationmgr.ApplicationMgr()
approvalrbt = beansapplicationmgr.ApprovalRobot(120)
approvalrbt = beansapplicationmgr.ApprovalRobot()
approvalrbt.start()
# server = http.server.HTTPServer((masterip, masterport), DockletHttpHandler)

4
src/model.py
View File

@ -75,7 +75,7 @@ class User(db.Model):
register_date = db.Column(db.String(10))
user_group = db.Column(db.String(50))
auth_method = db.Column(db.String(10))
# beans = db.Column(db.Integer)
beans = db.Column(db.Integer)
def __init__(self, username, password, avatar="default.png", nickname = "", description = "", status = "init",
e_mail = "" , student_number = "", department = "", truename = "", tel="", date = None, usergroup = "primary"
@ -95,7 +95,7 @@ class User(db.Model):
self.department = department
self.truename = truename
self.tel = tel
# self.beans = 1000
self.beans = 1000
if (date != None):
self.register_date = date
else: