From ed31c23644c5271b0d62c7fde21a699b8f5f2a97 Mon Sep 17 00:00:00 2001
From: Janie <109517022+Janie06@users.noreply.github.com>
Date: Fri, 10 Mar 2023 16:25:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?Login=20API=20=E6=99=82=E6=95=88=E5=8A=A0?=
 =?UTF-8?q?=E9=95=B7=E8=87=B330=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs
index 96d25a4..68770dc 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs
@@ -163,15 +163,15 @@ namespace EasyBL.WEBAPP.SYS
                         // LoginIp = i_crm.ClientIP,
                         LoginTime = DateTime.Now
                     };
-                    var iExpireTime = 43200;   
-                    var sExpireTime = Common.GetSystemSetting(db, oUser.OrgID, @"ExpireTime");
+                    var iExpireTime = 240;   
+                    var sExpireTime = Common.GetSystemSetting(db, oUser.OrgID, @"SEexpireTime");
                     if (!string.IsNullOrEmpty(sExpireTime))
                     {
                         iExpireTime = int.Parse(sExpireTime);
                     }
                     else
                     {
-                        iExpireTime = int.Parse(Common.GetAppSettings(@"ExpireTime"));
+                        iExpireTime = int.Parse(Common.GetAppSettings(@"SEexpireTime"));
                     }
                     ticket.ExpireTime = DateTime.Now.AddMinutes(iExpireTime); //30天過期
                     ticket.IsVerify = @"Y";

From f079c8e6f266026ab92eb97cbdc78194762c75ed Mon Sep 17 00:00:00 2001
From: Janie <109517022+Janie06@users.noreply.github.com>
Date: Fri, 10 Mar 2023 16:38:18 +0800
Subject: [PATCH 2/3] Update SystemService.cs

---
 EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs
index 68770dc..c8579c0 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs
@@ -164,14 +164,14 @@ namespace EasyBL.WEBAPP.SYS
                         LoginTime = DateTime.Now
                     };
                     var iExpireTime = 240;   
-                    var sExpireTime = Common.GetSystemSetting(db, oUser.OrgID, @"SEexpireTime");
+                    var sExpireTime = Common.GetSystemSetting(db, oUser.OrgID, @"ExpireTime");
                     if (!string.IsNullOrEmpty(sExpireTime))
                     {
                         iExpireTime = int.Parse(sExpireTime);
                     }
                     else
                     {
-                        iExpireTime = int.Parse(Common.GetAppSettings(@"SEexpireTime"));
+                        iExpireTime = int.Parse(Common.GetAppSettings(@"ExpireTime"));
                     }
                     ticket.ExpireTime = DateTime.Now.AddMinutes(iExpireTime); //30天過期
                     ticket.IsVerify = @"Y";

From 9c99793754959703a36f9f1e1caecbc9d516401b Mon Sep 17 00:00:00 2001
From: Janie <109517022+Janie06@users.noreply.github.com>
Date: Fri, 10 Mar 2023 16:46:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?Login=20API=20=E6=99=82=E6=95=88=E5=8A=A0?=
 =?UTF-8?q?=E9=95=B7=E8=87=B330=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs
index c8579c0..8ef3531 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs
@@ -164,14 +164,14 @@ namespace EasyBL.WEBAPP.SYS
                         LoginTime = DateTime.Now
                     };
                     var iExpireTime = 240;   
-                    var sExpireTime = Common.GetSystemSetting(db, oUser.OrgID, @"ExpireTime");
+                    var sExpireTime = Common.GetSystemSetting(db, oUser.OrgID, @"SEexpireTime");
                     if (!string.IsNullOrEmpty(sExpireTime))
                     {
                         iExpireTime = int.Parse(sExpireTime);
                     }
                     else
                     {
-                        iExpireTime = int.Parse(Common.GetAppSettings(@"ExpireTime"));
+                        iExpireTime = int.Parse(Common.GetAppSettings(@"SEexpireTime"));
                     }
                     ticket.ExpireTime = DateTime.Now.AddMinutes(iExpireTime); //30天過期
                     ticket.IsVerify = @"Y";
@@ -199,7 +199,7 @@ namespace EasyBL.WEBAPP.SYS
                     HttpContext.Current.Session.Add(@"userid", ticket.UserID);
                     HttpCookie cookie = new HttpCookie("EURO_COOKIE");//初始化並設置Cookie的名稱
                     DateTime dt = DateTime.Now;
-                    TimeSpan ts = new TimeSpan(0, 0, 1, 0, 0);//過期時間為1分鐘
+                    TimeSpan ts = new TimeSpan(30, 0, 0, 0, 0);//過期時間為1分鐘
                     cookie.Expires = dt.Add(ts);//設置過期時間
                     cookie.Values.Add("orgid", ticket.OrgID);
                     cookie.Values.Add("userid", ticket.UserID);