From b8f449dca8e53bbd5c0e424befe07c8207c10032 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期二, 11 十二月 2018 13:48:50 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/Filters/LoginFilter.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/Filters/LoginFilter.java b/gx_tieta/src/com/fgkj/Filters/LoginFilter.java
index 8fbc13c..d555054 100644
--- a/gx_tieta/src/com/fgkj/Filters/LoginFilter.java
+++ b/gx_tieta/src/com/fgkj/Filters/LoginFilter.java
@@ -12,6 +12,7 @@
import javax.servlet.http.HttpServletRequest;
import com.fgkj.actions.ActionUtil;
+import com.fgkj.dao.CheckMobile;
import com.fgkj.dto.User;
import com.fgkj.dto.User_inf;
import com.fgkj.dto.Vip_user;
@@ -31,7 +32,7 @@
//System.out.println(source);
User_inf user=(User_inf)ActionUtil.getSession().getAttribute("user");
Vip_user vuser=(Vip_user)ActionUtil.getSession().getAttribute("vip");
- if(source.equals("login.jsp") || source.equals("fuguang") || source.equals("CheckClient.jsp")){
+ if(("login.jsp").equals(source)|| ("loginm.html").equals(source) || ("gx_tieta").equals(source) || ("CheckClient.jsp").equals(source)){
chain.doFilter(req, resp);
}else if(user!=null && !source.equals("navConfig.jsp")){
chain.doFilter(req, resp);
@@ -40,7 +41,12 @@
}else{
//System.out.println("杩樻湭鐧婚檰璇风櫥闄� LoginFilter");
PrintWriter out=ActionUtil.getOut();
- out.print("<script charset='UTF-8'>window.location.href='login.jsp'</script>");
+ //鍒ゆ柇褰撳墠鐧婚檰鐨勬槸鎵嬫満绔繕鏄痺eb绔�
+ if(CheckIsMobile(request)){
+ out.print("<script charset='UTF-8'>window.location.href='loginm.html'</script>");
+ }else{
+ out.print("<script charset='UTF-8'>window.location.href='login.jsp'</script>");
+ }
//out.print("<script charset='UTF-8'>alert('"+getText("You are not logged in, please log in")+"');window.location.href='login.jsp'</script>");
}
}
@@ -49,4 +55,12 @@
//System.out.println("鍒濆鍖栬繃婊ゅ櫒");
}
+
+ public static boolean CheckIsMobile(HttpServletRequest request){
+ String userAgent = getRequest().getHeader( "USER-AGENT" ).toLowerCase();
+ if(null == userAgent){
+ userAgent = "";
+ }
+ return CheckMobile.check(userAgent);
+ }
}
--
Gitblit v1.9.1