From a11fd3a6454564589f8796cffe6f1c237cc9e300 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 25 Aug 2020 15:08:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=B8=8D=E8=B6=B3=E9=81=93=EF=BC=8C?=
 =?UTF-8?q?=E6=8C=89=E7=99=BB=E5=BD=95=E8=AE=BE=E5=A4=87=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E4=BC=9A=E8=AF=9D=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=9A=84=E4=BE=8B=E5=AD=90=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/src/main/resources/config/jeesite-core.yml      | 5 ++++-
 .../resources/views/themes/default/modules/sys/sysLogin.html | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index d96070fd..1839cfd9 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -431,8 +431,11 @@ session:
   # 注意：如果超时超过30m，你还需要同步修改当前配置文件的属性：j2cache.caffeine.region.sessionCache 超时时间，大于这个值。
   sessionTimeout: 1800000
   
+  # PC设备会话超时参数设置，登录请求参数加 param_deviceType=pc 时有效
+  #pcSessionTimeout: 1800000
+  
   # 手机APP设备会话超时参数设置，登录请求参数加 param_deviceType=mobileApp 时有效
-  mobileAppSessionTimeout: 43200000
+  #mobileAppSessionTimeout: 43200000
   
   # 定时清理失效会话，清理用户直接关闭浏览器造成的孤立会话
   sessionTimeoutClean: 1200000
diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html
index 2e221c96..060a8fc9 100644
--- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html
+++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html
@@ -53,6 +53,7 @@
 				</div>
 			</div>
 			<div class="form-group">
+				<!-- <input type="hidden" name="param_deviceType" value="pc"> -->
 				<input type="hidden" name="__url" value="${parameter.__url!}">
 				<button type="submit" class="btn btn-primary btn-block btn-flat"
 					id="btnSubmit" data-loading="${text('登录验证成功，正在进入...')}"