From e56f52d625aa03e9293d00c1fe3736c1b089b12f Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Mon, 20 Sep 2021 22:17:25 +0800
Subject: [PATCH] added expiration datetimes to user table in database

---
 database/myems_user_db.sql        | 6 ++++--
 database/upgrade/upgrade1.2.4.sql | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/database/myems_user_db.sql b/database/myems_user_db.sql
index 8fe493f8..9c96ef78 100644
--- a/database/myems_user_db.sql
+++ b/database/myems_user_db.sql
@@ -22,6 +22,8 @@ CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_users` (
   `password` VARCHAR(256) NOT NULL,
   `is_admin` BOOL NOT NULL ,
   `privilege_id` BIGINT NULL,
+  `account_expiration_datetime_utc` DATETIME NOT NULL,
+  `password_expiration_datetime_utc` DATETIME NOT NULL,
   PRIMARY KEY (`id`));
 
   -- --------------------------------------------------------------------------------------------------------------------
@@ -31,9 +33,9 @@ START TRANSACTION;
 USE `myems_user_db`;
 -- default username: administrator
 -- default password: !MyEMS1
-INSERT INTO `myems_user_db`.`tbl_users`(`id`, `name`, `uuid`, `display_name`, `email`, `salt`, `password`, `is_admin`, `privilege_id`)
+INSERT INTO `myems_user_db`.`tbl_users`(`id`, `name`, `uuid`, `display_name`, `email`, `salt`, `password`, `is_admin`, `privilege_id`, `account_expiration_datetime_utc`, `password_expiration_datetime_utc`)
 VALUES
-(1, 'administrator', 'dcdb67d1-6116-4987-916f-6fc6cf2bc0e4', 'Administrator', 'administrator@myems.io', 'adfd6fb6d78d4e3780ebdd6afdec2c3a', 'bc00df65270b1a72b9ed37136fa95a695896edc8c114391821f5edc6b1bbdbabc3d449962f8d1c7a4ec3f2d0a1a79055623963d88ecb9b778423194ff7b6be42', 1, NULL);
+(1, 'administrator', 'dcdb67d1-6116-4987-916f-6fc6cf2bc0e4', 'Administrator', 'administrator@myems.io', 'adfd6fb6d78d4e3780ebdd6afdec2c3a', 'bc00df65270b1a72b9ed37136fa95a695896edc8c114391821f5edc6b1bbdbabc3d449962f8d1c7a4ec3f2d0a1a79055623963d88ecb9b778423194ff7b6be42', 1, NULL, '2099-12-31 16:00:00', '2099-12-31 16:00:00');
 COMMIT;
 
 -- ---------------------------------------------------------------------------------------------------------------------
diff --git a/database/upgrade/upgrade1.2.4.sql b/database/upgrade/upgrade1.2.4.sql
index 0c262461..d0706fd1 100644
--- a/database/upgrade/upgrade1.2.4.sql
+++ b/database/upgrade/upgrade1.2.4.sql
@@ -14,5 +14,9 @@ CREATE TABLE IF NOT EXISTS `myems_fdd_db`.`tbl_aliyun_sms_api` (
 
 DROP TABLE IF EXISTS `myems_fdd_db`.`tbl_gsm_modems` ;
 
+
+ALTER TABLE `myems_user_db`.`tbl_users` ADD `password_expiration_datetime_utc` DATETIME NOT NULL DEFAULT '2099-12-31 16:00:00' AFTER privilege_id;
+ALTER TABLE `myems_user_db`.`tbl_users` ADD `account_expiration_datetime_utc` DATETIME NOT NULL DEFAULT '2099-12-31 16:00:00' AFTER privilege_id;
+
 -- UPDATE VERSION NUMBER
 UPDATE myems_system_db.tbl_versions SET version='1.2.4', release_date='2021-09-11' WHERE id=1;