From 13e9c1adcd14067bf3e349eff0ea1f435a8c0d23 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Fri, 8 Jun 2018 14:30:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E4=BF=AE=E6=94=B9push?=
 =?UTF-8?q?=E8=87=B3=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/configuration/ntc/FileTransferCfgController.java | 2 +-
 src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml    | 2 +-
 .../com/nis/web/service/configuration/AvContentCfgService.java  | 2 +-
 .../nis/web/service/configuration/FileTransferCfgService.java   | 2 +-
 .../com/nis/web/service/configuration/WebsiteCfgService.java    | 2 +-
 src/main/webapp/WEB-INF/include/form/stringInfo.jsp             | 2 +-
 .../webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
index 648acce1f..8a691af48 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
@@ -156,7 +156,7 @@ public class FileTransferCfgController  extends BaseController{
 	@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
 	public String saveFileDigestCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,
 			FileDigestCfg entity,MultipartFile file,@ModelAttribute("areaCfgIds")String areaCfgIds) {
-		try {
+		try {  
 			Date fileTime=null;
 			Date date=new Date();
 			if(!StringUtil.isEmpty(entity.getCfgId())){
diff --git a/src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml
index d4d0f686d..2e5cc4590 100644
--- a/src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml
@@ -233,7 +233,7 @@
   	delete from area_ip_cfg where compile_id=#{compileId} and function_id=#{functionId}
   </delete>
   <update id="updateAreaIpCfgValid" parameterType="com.nis.domain.configuration.BaseCfg">
-    update area_ip_cfg 
+    update area_ip_cfg
     <set>
     	<if test="isValid != null" >
         	is_valid =  #{isValid,jdbcType=INTEGER},
diff --git a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
index c983fb5ae..82a6a68fc 100644
--- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
@@ -373,7 +373,7 @@ public class AvContentCfgService extends BaseService{
 				strRegionList=accountMap.get("dstList");
 			}
 			if(!StringUtil.isEmpty(areaIpCfgList)){
-				//TODO DELETE后期删除
+				//TODO DELETE后期删除 
 				for (AreaIpCfg areaIpCfga : areaIpCfgList) {
 					areaIpCfga.setCfgType("NTC_IP_RANGE");
 				}
diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
index de454a183..8923ad4c6 100644
--- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
@@ -319,7 +319,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 	}
 	
 	public void saveOrUpdateFileDigestCfg(FileDigestCfg entity,ToMaatResult result,String areaCfgIds){
-		//设置区域运营商信息
+		//设置区域运营商信息 
 		setAreaEffectiveIds(entity);
 		
 		entity.setIsValid(0);
diff --git a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
index d20ce716f..256563206 100644
--- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
@@ -831,7 +831,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 				strRegionList=map.get("dstList");
 			}
 		}
-		//保存区域IP信息
+		//保存区域IP信息 
 		if(entity.getAreaCfg()!=null && entity.getAreaCfg().size()>0){
 			AreaIpCfg cfg = new AreaIpCfg();
 			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
index ef8af1639..8bdfb0a1f 100644
--- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
@@ -4,7 +4,7 @@
 <div class="row stringInfo">
 <span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
 <span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
-	<div class="row">
+	<div class="row"> 
 		<div class="col-md-6">
 	        <div class="form-group ">
 	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
index af1e98169..98b5802b7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
@@ -125,7 +125,7 @@ $(function(){
 										<label class="control-label col-md-3"><font color="red">*</font>
 										<spring:message code="cfds_level" /></label>
 										<div class="col-md-6">
-											<input class="form-control required digits" type="text" range="[1,10]"
+		 									<input class="form-control required digits" type="text" range="[1,10]"
 												name="cfdsLevel"
 												value="${_cfg.cfdsLevel}">
 										</div>