修复xss

WebRoot/opt/patrolplan/index.jsp

@@ -1,5 +1,6 @@
 <%@ page import="java.util.regex.Pattern" %>
 <%@ page import="java.util.regex.Matcher" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 		 pageEncoding="UTF-8"%>
 <%@ page session="true" %>
@@ -11,7 +12,7 @@
     String t = String.valueOf(System.currentTimeMillis());
     String theme = request.getParameter("theme");
     String css_name = "ext-all-access.css";
-    if(company_code=="null")
+      if(StringUtils.isBlank(company_code))
     	company_code="";
 	if (!myRegex(company_code)){
 		company_code = "";

WebRoot/view/czjl/index.jsp

@@ -1,5 +1,6 @@
 <%@ page import="java.util.regex.Pattern" %>
 <%@ page import="java.util.regex.Matcher" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 		 pageEncoding="UTF-8"%>
 <%@ page session="true" %>
@@ -11,7 +12,7 @@
     String t = String.valueOf(System.currentTimeMillis());
     String theme = request.getParameter("theme");
     String css_name = "ext-all-access.css";
-    if(company_code=="null")
+      if(StringUtils.isBlank(company_code))
     	company_code="";
 	if (!myRegex(company_code)){
 		company_code = "";

WebRoot/view/dataSearch/fireIndex.jsp

@@ -1,5 +1,6 @@
 <%@ page import="java.util.regex.Pattern" %>
 <%@ page import="java.util.regex.Matcher" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 		 pageEncoding="UTF-8"%>
 <%@ page session="true" %>
@@ -11,7 +12,7 @@
     String t = String.valueOf(System.currentTimeMillis());
     String theme = request.getParameter("theme");
     String css_name = "ext-all-access.css";
-    if(company_code=="null")
+    if(StringUtils.isBlank(company_code))
     	company_code="";
 	if (!myRegex(company_code)){
 		company_code = "";
@@ -34,7 +35,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }else
     	theme = "";

WebRoot/view/dataSearch/index.jsp

@@ -1,5 +1,6 @@
 <%@ page import="java.util.regex.Pattern" %>
 <%@ page import="java.util.regex.Matcher" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 		 pageEncoding="UTF-8"%>
 <%@ page session="true" %>
@@ -11,8 +12,8 @@
     String t = String.valueOf(System.currentTimeMillis());
     String theme = request.getParameter("theme");
     String css_name = "ext-all-access.css";
-    if(company_code=="null")
-    	company_code="";
+	if(StringUtils.isBlank(company_code))
+		company_code="";
 	if (!myRegex(company_code)){
 		company_code = "";
 	}
@@ -34,7 +35,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }else
     	theme = "";

WebRoot/view/dataSearch/rtuIndex.jsp

@@ -1,5 +1,6 @@
 <%@ page import="java.util.regex.Pattern" %>
 <%@ page import="java.util.regex.Matcher" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 		 pageEncoding="UTF-8"%>
 <%@ page session="true" %>
@@ -11,8 +12,9 @@
     String t = String.valueOf(System.currentTimeMillis());
     String theme = request.getParameter("theme");
     String css_name = "ext-all-access.css";
-    if(company_code=="null")
-    	company_code="";
+
+	if(StringUtils.isBlank(company_code))
+		company_code="";
 	if (!myRegex(company_code)){
 		company_code = "";
 	}
@@ -34,7 +36,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }else
     	theme = "";

WebRoot/view/efireAlarm/eFireDeviceIndex.jsp

@@ -34,7 +34,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }
 %>

WebRoot/view/efireAlarm/subeFireDevice.jsp

@@ -34,7 +34,7 @@
         else if (theme.equals("standard"))
             css_name = "ext-standard.css";
         else {
-            theme=null;
+            theme="";
 
 
 

WebRoot/view/efireAnalysis/index.jsp

@@ -26,7 +26,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }else
     	theme = "";

WebRoot/view/fireAlarm/subFireAlarm.jsp

@@ -1,5 +1,7 @@
+<%@ page import="java.util.regex.Pattern" %>
+<%@ page import="java.util.regex.Matcher" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
+		 pageEncoding="UTF-8"%>
 <%@ page session="true" %>
 <%
     String path = request.getContextPath();
@@ -32,7 +34,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }else
     	theme="";

WebRoot/view/fireAlarm/subFireDevice.jsp

@@ -34,7 +34,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }
 %>

WebRoot/view/frontpage/index.jsp

@@ -26,7 +26,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }else
     	theme = "";

WebRoot/view/inspectionrecord/index.jsp

@@ -1,5 +1,6 @@
 <%@ page import="java.util.regex.Pattern" %>
 <%@ page import="java.util.regex.Matcher" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 		 pageEncoding="UTF-8"%>
 <%@ page session="true" %>
@@ -11,7 +12,7 @@
     String t = String.valueOf(System.currentTimeMillis());
     String theme = request.getParameter("theme");
     String css_name = "ext-all-access.css";
-    if(company_code=="null")
+      if(StringUtils.isBlank(company_code))
     	company_code="";
 	if (!myRegex(company_code)){
 		company_code = "";
@@ -34,7 +35,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }
 %>

WebRoot/view/inspectors/index.jsp

@@ -34,7 +34,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }
 %>

WebRoot/view/liftAlarm/subliftAlarm.jsp

@@ -34,7 +34,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }else
     	theme="";

WebRoot/view/liftAlarm/subliftDevice.jsp

@@ -34,7 +34,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }
 %>

WebRoot/view/maintenance/index.jsp

@@ -1,5 +1,6 @@
 <%@ page import="java.util.regex.Pattern" %>
 <%@ page import="java.util.regex.Matcher" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 		 pageEncoding="UTF-8"%>
 <%@ page session="true" %>
@@ -11,7 +12,7 @@
     String t = String.valueOf(System.currentTimeMillis());
     String theme = request.getParameter("theme");
     String css_name = "ext-all-access.css";
-    if(company_code=="null")
+      if(StringUtils.isBlank(company_code))
     	company_code="";
 	if (!myRegex(company_code)){
 		company_code = "";

WebRoot/view/maintenanceperson/index.jsp

@@ -34,7 +34,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }
 %>

WebRoot/view/maintenanceplan/index.jsp

@@ -1,5 +1,6 @@
 <%@ page import="java.util.regex.Pattern" %>
 <%@ page import="java.util.regex.Matcher" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 		 pageEncoding="UTF-8"%>
 <%@ page session="true" %>
@@ -11,7 +12,7 @@
     String t = String.valueOf(System.currentTimeMillis());
     String theme = request.getParameter("theme");
     String css_name = "ext-all-access.css";
-    if(company_code=="null")
+      if(StringUtils.isBlank(company_code))
     	company_code="";
 	if (!myRegex(company_code)){
 		company_code = "";
@@ -34,7 +35,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }
 %>

WebRoot/view/maintenancerecord/index.jsp

@@ -1,5 +1,6 @@
 <%@ page import="java.util.regex.Pattern" %>
 <%@ page import="java.util.regex.Matcher" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 		 pageEncoding="UTF-8"%>
 <%@ page session="true" %>
@@ -11,7 +12,7 @@
     String t = String.valueOf(System.currentTimeMillis());
     String theme = request.getParameter("theme");
     String css_name = "ext-all-access.css";
-    if(company_code=="null")
+      if(StringUtils.isBlank(company_code))
     	company_code="";
 	if (!myRegex(company_code)){
 		company_code = "";
@@ -34,7 +35,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }
 %>

WebRoot/view/patrolAnalysis/index.jsp

@@ -26,7 +26,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }else
     	theme = "";

WebRoot/view/patrolAnalysis2/index.jsp

@@ -26,7 +26,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }else
     	theme = "";

WebRoot/view/projectWoker/index.jsp

@@ -26,7 +26,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }else
     	theme = "";

WebRoot/view/qrcodeanalysis/index.jsp

@@ -34,7 +34,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }
 %>

WebRoot/view/qrcodeanalysis2/index.jsp

@@ -34,7 +34,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }
 %>

WebRoot/view/route/index.jsp

@@ -1,5 +1,6 @@
 <%@ page import="java.util.regex.Pattern" %>
 <%@ page import="java.util.regex.Matcher" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 		 pageEncoding="UTF-8"%>
 <%@ page session="true" %>
@@ -11,7 +12,7 @@
     String t = String.valueOf(System.currentTimeMillis());
     String theme = request.getParameter("theme");
     String css_name = "ext-all-access.css";
-    if(company_code=="null")
+      if(StringUtils.isBlank(company_code))
     	company_code="";
 	if (!myRegex(company_code)){
 		company_code = "";

WebRoot/view/route2/index.jsp

@@ -1,5 +1,6 @@
 <%@ page import="java.util.regex.Pattern" %>
 <%@ page import="java.util.regex.Matcher" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 		 pageEncoding="UTF-8"%>
 <%@ page session="true" %>
@@ -11,7 +12,7 @@
     String t = String.valueOf(System.currentTimeMillis());
     String theme = request.getParameter("theme");
     String css_name = "ext-all-access.css";
-    if(company_code=="null")
+      if(StringUtils.isBlank(company_code))
     	company_code="";
 	if (!myRegex(company_code)){
 		company_code = "";

WebRoot/view/rtuAlarm/RtuDeviceIndex.jsp

@@ -34,7 +34,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }
 %>

WebRoot/view/rtuAlarm/subRtuAlarm.jsp

@@ -34,7 +34,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }else
     	theme="";

WebRoot/view/rtuAlarm/window.jsp

@@ -34,7 +34,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }else
     	theme = "";

WebRoot/view/springhandle/index.jsp

@@ -26,7 +26,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }
 %>

WebRoot/view/videoAlarm/index.jsp

@@ -1,5 +1,6 @@
 <%@ page import="java.util.regex.Pattern" %>
 <%@ page import="java.util.regex.Matcher" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 		 pageEncoding="UTF-8"%>
 <%@ page session="true" %>
@@ -11,7 +12,7 @@
     String t = String.valueOf(System.currentTimeMillis());
     String theme = request.getParameter("theme");
     String css_name = "ext-all-access.css";
-    if(company_code=="null")
+      if(StringUtils.isBlank(company_code))
     	company_code="";
 	if (!myRegex(company_code)){
 		company_code = "";

WebRoot/view/videoAlarm/window.jsp

@@ -34,7 +34,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }else
     	theme = "";

WebRoot/view/videoCam/index.jsp

@@ -1,5 +1,6 @@
 <%@ page import="java.util.regex.Pattern" %>
 <%@ page import="java.util.regex.Matcher" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 		 pageEncoding="UTF-8"%>
 <%@ page session="true" %>
@@ -12,7 +13,7 @@
     String t = String.valueOf(System.currentTimeMillis());
     String theme = request.getParameter("theme");
     String css_name = "ext-all-access.css";
-    if(company_code=="null")
+      if(StringUtils.isBlank(company_code))
     	company_code="";
 	if (!myRegex(company_code)){
 		company_code = "";
@@ -35,7 +36,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }else
     	theme = "";

WebRoot/view/videoTest/index.jsp

@@ -27,7 +27,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }else
     	theme = "";

WebRoot/view/waterAnalysis/index.jsp

@@ -26,7 +26,7 @@
     	else if(theme.equals("standard"))
     		css_name = "ext-standard.css";
     	else {
-    		theme=null;
+    		theme="";
 		}
     }else
     	theme = "";

WebRoot/view/xhxx/index.jsp

@@ -1,5 +1,6 @@
 <%@ page import="java.util.regex.Pattern" %>
 <%@ page import="java.util.regex.Matcher" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 		 pageEncoding="UTF-8"%>
 <%@ page session="true" %>
@@ -11,7 +12,7 @@
     String t = String.valueOf(System.currentTimeMillis());
     String theme = request.getParameter("theme");
     String css_name = "ext-all-access.css";
-    if(company_code=="null")
+      if(StringUtils.isBlank(company_code))
     	company_code="";
 	if (!myRegex(company_code)){
 		company_code = "";