From 5964eeca80da6136220ec93f0e156c1f7de652a1 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Thu, 9 Aug 2018 13:21:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E5=BF=BD=E7=95=A5=E5=A4=A7=E5=B0=8F=E5=86=99=20?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=88=B6=E8=A1=A8=E7=AC=A6=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E7=9A=84js=EF=BC=8C=E5=BD=B1=E5=93=8D=E4=BA=86ysp=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/interceptor/MultipartFileIntercepter.java    | 2 +-
 src/main/webapp/static/global/scripts/common.js               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/interceptor/MultipartFileIntercepter.java b/src/main/java/com/nis/interceptor/MultipartFileIntercepter.java
index ba269b20d..88160d174 100644
--- a/src/main/java/com/nis/interceptor/MultipartFileIntercepter.java
+++ b/src/main/java/com/nis/interceptor/MultipartFileIntercepter.java
@@ -135,7 +135,7 @@ public class MultipartFileIntercepter extends CommonsMultipartResolver{
 		for (String fileName : multipartFile.keySet()) {
 			MultipartFile file= multipartFile.getFirst(fileName);
 			//文件类型错误
-			if(fileTypes.indexOf(","+FileUtils.getSuffix(file.getOriginalFilename(), false)+",") == -1){
+			if(fileTypes.indexOf(","+FileUtils.getSuffix(file.getOriginalFilename().toLowerCase(), false)+",") == -1){
 				throw new MultiPartNewException(errorInfo,file.getOriginalFilename(),fileTypes.substring(0,fileTypes.length()-1).substring(1),prop,null);
 			}
 			if(file.getSize() > fileMaxSize){
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 1a965bf07..58cb12476 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -407,11 +407,11 @@ $(function(){
     	   form.submit();
        }
    });
-   $("#ipCfgFrom input, #cfgForm input, #cfgFrom input").change(function(){
+  /* $("#ipCfgFrom input, #cfgForm input, #cfgFrom input").change(function(){
 	  var s = $(this).val();
 	  var ns = s.replace(/\t|\r|\n/mg, "");
 	  $(this).val(ns);
-   });
+   });*/
 });
 window.onload=function(){
 	//日志查询IP类型增加格式提示