diff --git a/src/httprest.py b/src/httprest.py index f72970d..5458aa3 100755 --- a/src/httprest.py +++ b/src/httprest.py @@ -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) diff --git a/src/model.py b/src/model.py index 27ed4c8..606ff7e 100755 --- a/src/model.py +++ b/src/model.py @@ -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: