diff --git a/database/myems_user_db.sql b/database/myems_user_db.sql index a65c6799..c23aacb2 100644 --- a/database/myems_user_db.sql +++ b/database/myems_user_db.sql @@ -97,10 +97,10 @@ DROP TABLE IF EXISTS `myems_user_db`.`tbl_action_logs` ; CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_action_logs` ( `id` BIGINT NOT NULL AUTO_INCREMENT, `user_name` VARCHAR(256) NOT NULL, - `date_time` DATETIME NOT NULL, + `date_time_utc` DATETIME NOT NULL, `action` VARCHAR(256) NOT NULL, `class` VARCHAR(256) NOT NULL, `record_id` BIGINT NULL, `record_text` JSON NULL, PRIMARY KEY (`id`)); -CREATE INDEX `tbl_action_logs_index_1` ON `myems_user_db`.`tbl_action_logs` (`user_name`, `date_time`, `action`); +CREATE INDEX `tbl_action_logs_index_1` ON `myems_user_db`.`tbl_action_logs` (`user_name`, `date_time_utc`, `action`); diff --git a/myems-api/log.py b/myems-api/log.py index d89903c4..dc3e89e0 100644 --- a/myems-api/log.py +++ b/myems-api/log.py @@ -15,7 +15,7 @@ def write_log(user_uuid, action, _class, record_id, record_text): :param record_id: int :param record_text: str """ - now = datetime.now() + now = datetime.utcnow() cnx = None cursor = None try: @@ -35,7 +35,7 @@ def write_log(user_uuid, action, _class, record_id, record_text): cnx = mysql.connector.connect(**config.myems_user_db) cursor = cnx.cursor() add_row = (" INSERT INTO tbl_action_logs " - " (user_name, date_time, action, class, record_id, record_text) " + " (user_name, date_time_utc, action, class, record_id, record_text) " " VALUES (%s, %s, %s, %s, %s , %s) ") cursor.execute(add_row, (user['name'], now, @@ -47,10 +47,6 @@ def write_log(user_uuid, action, _class, record_id, record_text): cnx.commit() except Exception as e: print(str(e)) - if cnx: - cnx.disconnect() - if cursor: - cursor.close() finally: if cnx: cnx.disconnect() @@ -77,10 +73,6 @@ def judge_admin(user_uuid): return user["admin"] except Exception as e: print(str(e)) - if cnx: - cnx.disconnect() - if cursor: - cursor.close() return False finally: if cnx: