From 6f21f50cab09162b666bb436b7f347af8f913a30 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Mon, 27 Aug 2018 15:30:44 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=9C=AA=E5=81=9A=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/report/list.jsp | 78 ++++++++++++-------
 1 file changed, 50 insertions(+), 28 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index e393f3941..025b48826 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -66,32 +66,7 @@
 				}
 			}
 		});
-		$(".service").each(function(){
-			var target=$(this).find("span");
-			var action=$(this).data("action");
-			$.ajax({
-				type:'post',
-				url:'${ctx}/report/ajaxNtcServiceReport',
-				data:{
-					"action":action,
-					"functionId":$("#functionId").val(),
-					"reportType":$('[name="reportType"]').val(),
-					"reportTime":$('[name="reportTime"]').val()
-				},
-				dataType:'json',
-				async:true,
-				success:function(data,textStatus){//处理返回结果
-					if(textStatus=="success"){
-						target.html(data[action]);
-					}
-				},
-				complete:function(XMLHttpRequest,status){//超时设置
-					if(status=="timeout"){
-						target.html(timeout);
-					}
-				}
-			});
-		});
+		ajaxServiceLogTotal();
 		$("#export-btn").click(function(){
 			var te = $(".in table").tableExport({
 				headings:true,
@@ -126,7 +101,54 @@
 			$("#reportTypeDiv").append('<input id="intype" name="reportTime" class="form-control input-medium Wdate" type="text" value="' + reportTime.substring(0, 4) + '" readonly="readonly" onclick=WdatePicker({dateFmt:"yyyy",isShowClear:true});>');
 		}
 	}
-	
+var ajaxServiceLogTotal=function(){
+	var services=[];
+	var objs=[];
+	$(".service").each(function(){
+		objs.push($(this));
+		services.push($(this).data("service"));
+	});
+	var timeout=$.validator.messages.timeout;
+	var failed=$.validator.messages.failed;
+	$.ajax({
+		type:'post',
+		timeout:10000,//超时时间设置，查询接口时间过长超时
+		url:'${ctx}/report/ajaxNtcServiceReport',
+		data:{
+			"services":services.join(","),
+			"functionId":$("#functionId").val(),
+			"reportType":$('[name="reportType"]').val(),
+			"reportTime":$('[name="reportTime"]').val()
+		},
+		dataType:'json',
+		async:true,
+		success:function(data,textStatus){//处理返回结果
+			if(textStatus=="success"){
+				for(var i=0;i<services.length;i++){
+					var target=objs[i].find("span");
+					for(var da in data){
+						if(data[da].service==services[i]){
+							target.html(data[da].sum);
+						}
+					}
+				}
+			}
+		},
+		complete:function(XMLHttpRequest,status){//超时设置
+			if(status=="timeout"){
+				for(var i=0;i<services.length;i++){
+					var target=objs[i].find("span");
+					target.html(timeout);
+				}
+			}else if(status !="success"){
+				for(var i=0;i<services.length;i++){
+					var target=objs[i].find("span");
+					target.html(failed);
+				}
+			}
+		}
+	});
+}	
 var ajaxReport=function(url,target){
 	loading('<spring:message code="onloading"/>');
 	$.ajax({
@@ -193,7 +215,7 @@ function customColumnClick(){
 		<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
 			<c:forEach items="${serviceList}" var="service" varStatus="status">
 				<c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}">
-					<div data-action="${service.action}" class="service btn 
+					<div data-service="${service.serviceId}" class="service btn 
 					<c:if test="${status.index%2==0}">btn-primary</c:if>
 					<c:if test="${status.index%2!=0}">btn-default</c:if>">
 						<spring:message code="${action.itemValue}"/>

From c5e83214f269686772d0d66b59749a502f9ac040 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Mon, 27 Aug 2018 15:33:04 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89appType=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96item=5Fvalue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
index cea10deeb..9161fca19 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
@@ -53,9 +53,6 @@ $(function(){
 </head>
 <body>
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<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>
 	<h3 class="page-title">
@@ -93,7 +90,7 @@ $(function(){
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
 												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" enableAddBtn="true"
 												 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 												 cssClass="form-control required"/>
 								            </div>
 								            <div for="parent.specServiceName"></div>

From ed5a25afdcb8087e8c03e0a9b9b56e396e524e43 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Mon, 27 Aug 2018 16:27:33 +0800
Subject: [PATCH 3/5] =?UTF-8?q?APP=20session=20=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 09886961e..f7401cd13 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1096,8 +1096,8 @@ APP_SUBSCRIBE_ID=Certification Mark Configuration
 reply_file=Reply File
 app_topic_domain_cfg=Topic Website
 #=====================about app Tcp=================================
-min_tcp=Minimum Session Number
-max_tcp=Maximum Session Number
+min_tcp=Minimum Session Size
+max_tcp=Maximum Session Size
 tcp_unit=Unit / byte
 app_tcp_config=APP TCP Session Feature
 app_tcp_max_min=Maximum Session Should Not Exceed 4294967295

From 5f93a39d3fc434aa90f3d63121de6f9fb3ed9c4e Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Mon, 27 Aug 2018 16:31:42 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=95=8C=E9=9D=A2=E5=8F=96=E6=B6=88=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp    | 3 ---
 src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp            | 3 ---
 src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp        | 3 ---
 .../webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp     | 3 ---
 src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp     | 3 ---
 src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp  | 3 ---
 src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp     | 3 ---
 src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp   | 4 +---
 .../webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp    | 3 ---
 src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp     | 3 ---
 src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp          | 3 ---
 .../webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp    | 6 +-----
 src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp         | 3 ---
 src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp          | 3 ---
 .../WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp   | 3 ---
 .../WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp  | 3 ---
 src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp       | 4 +---
 src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp         | 3 ---
 src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp        | 3 ---
 .../WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp  | 3 ---
 .../WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp  | 3 ---
 .../webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp    | 4 ----
 src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp       | 3 ---
 23 files changed, 3 insertions(+), 72 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
index e5cf8fc94..ec9e5fa6f 100644
--- a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
index bab476265..c415a7073 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
@@ -49,9 +49,6 @@ $(function(){
 		$("#cfgFrom").attr("action","${ctx}/cfg/app/saveOrUpdateCfg");
 		$("#save").submit();
 	});
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$("#cfgFrom").validate({
 		submitHandler: function(form){
 			//loading('onloading...');
diff --git a/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp b/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
index f573fcd0a..029463b9f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
@@ -7,9 +7,6 @@
 <script type="text/javascript">
 $(function(){
 	$("#cfgFrom").find("input,select,radio").attr("disabled",true);
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 
 });
 </script>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
index 6af43eeb0..6fdb70057 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$("input[name='cfgKeywords']").addClass("url");
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
index 3f1bb6832..025447f74 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
@@ -52,9 +52,6 @@ $(function(){
 			$("#areaIp").addClass("hidden");
 		}
 	});
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change",function(){
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
index e3543b643..eae0cc0b9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
index 1a156fede..c2113764e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
@@ -42,9 +42,6 @@ $(function(){
 			$("#areaIp").addClass("hidden");
 		}
 	});
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change",function(){
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
index dea5c1b2d..6f06d1f13 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
@@ -25,9 +25,7 @@ $(function(){
 		},
 		errorContainer: "#messageBox",
 	});
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
+
 });
 </script>
 </head>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp
index 1dc0c6a4b..993f7e945 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp
@@ -13,9 +13,6 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
-							window.history.back();
-						});
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
index 4e13ef004..e7152f5f0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
@@ -13,9 +13,6 @@
 			$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());
 			$("#cfgType").val($("#cfgTypeMaat").val());
 		} */
-		$("#cancel").on("click", function() {
-			window.history.back();
-		});
 		$(".action").on("change", function() {
 			$("#serviceId").val($(this).attr("serviceId"));
 			$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
index 9fc26d8e4..f63d58057 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 		$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
index 0ef46a3b9..1a98a2cb2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
@@ -13,11 +13,7 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
-							window.history.back();
-						});
-						
-						 $(".action").on("change", function() {
+						$(".action").on("change", function() {
 								 switchAction($("input[name=action]:checked").val());
 							   	//拦截根据action切换动作部分
 							   	setInterceptDefaultInfo("");
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp
index 214971208..a78ef53c0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp
@@ -48,9 +48,6 @@
 				$("#areaIp").addClass("hidden");
 			}
 		});
-		$("#cancel").on("click", function() {
-			window.history.back();
-		});
 		$("select[name$='ipType']").on("change", function() {
 			switchIpType($(this));
 		});
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp
index 3b86fa109..4dfdea7c2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp
@@ -12,9 +12,6 @@ $(function(){
 		$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());	
 		$("#cfgType").val($("#cfgTypeMaat").val());	
 	}
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 		$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
index f5160759d..5f6932316 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
index c44a8b6e1..1d75997ce 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
index 7577582a5..81e66f99c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
@@ -172,9 +172,7 @@ $(function(){
 		var tableName=$(this).attr("name").replace(".ipType","");
 		switchIpType($(".ipType"));
 	}); 		
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
+
 });
 </script>
 </head>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
index 2135334a9..c2d9e962a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
@@ -13,9 +13,6 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
-							window.history.back();
-						});
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
index 55e8643e0..548f97c89 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
@@ -13,9 +13,6 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
-							window.history.back();
-						});
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp
index 868b0f21e..937fcf997 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp
index 7742d6587..16967272e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp
index c7d8eca78..dd6292cd4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp
@@ -18,10 +18,6 @@
 		$("#cfgFile").on('change',function(){
 			$("#urlInfo").val($("#cfgFile").val());
 		});
-		
-		$("#cancel").on("click", function() {
-			window.history.back();
-		});
 
 		$("#cfgFrom") .validate( {
 			submitHandler : function(form) {
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
index b984969b6..0e9e7468a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
@@ -13,9 +13,6 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
-							window.history.back();
-						});
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));

From a231611c394fbf22c862dba35130ea6851916f81 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Mon, 27 Aug 2018 16:39:23 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=80=BB=E8=BE=91=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=97=B6=E6=A0=B7=E4=BE=8B=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=88=90=E5=8A=9F=E5=90=8E=E7=AB=8B=E5=88=BB?=
 =?UTF-8?q?=E5=B0=86=E6=BA=90=E6=96=87=E4=BB=B6=E5=92=8C=E6=A0=B7=E4=BE=8B?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E8=87=B3=E4=B8=AD=E9=97=B4?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangwei <zhangwei@intranet.com>
---
 .../configuration/ntc/AvController.java       | 20 +++---
 .../service/configuration/AvCfgService.java   | 62 ++++++++++++++++---
 2 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
index 5763bc857..3b08b6883 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
@@ -131,9 +131,11 @@ public class AvController extends BaseController  {
 				entity.setResultPath(resultFileAllPath);
 				
 				File uploadSrcFile = new File(srcFileAllPath);
-				File uploadSampleFile = new File(sampleFileAllPath);
+//				File uploadSampleFile = new File(sampleFileAllPath);
 				FileCopyUtils.copy(srcFile.getBytes(), uploadSrcFile);//保存源文件
-				String host = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath();
+				entity.setSrcUrl("");
+				entity.setSampleUrl("");
+				/*String host = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath();
 				String srcUrl = host+srcFilePath.substring(srcFilePath.indexOf(Constants.AV_FILE_PATH)+Constants.AV_FILE_PATH.length()-1)+sep+uploadSrcFile.getName();
 				String sampleUrl = host+sampleFilePath.substring(sampleFilePath.indexOf(Constants.AV_FILE_PATH)+Constants.AV_FILE_PATH.length()-1)+sep+uploadSampleFile.getName();
 				srcUrl = srcUrl.replace("\\", "/");
@@ -141,7 +143,7 @@ public class AvController extends BaseController  {
 				logger.info("srcUrl:"+srcUrl);
 				logger.info("sampleUrl:"+sampleUrl);
 				entity.setSrcUrl(srcUrl);
-				entity.setSampleUrl(sampleUrl);
+				entity.setSampleUrl(sampleUrl);*/
 				
 //				File uploadSrcFile = new File(srcFilePath);
 //				FileCopyUtils.copy(srcFile.getBytes(), uploadSrcFile);
@@ -209,10 +211,10 @@ public class AvController extends BaseController  {
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
 			entity.setAuditTime(new Date());
-			String oldSrcUrl = entity.getSrcPath();
-			String oldSampleUrl = entity.getSamplePath();
+//			String oldSrcUrl = entity.getSrcPath();
+//			String oldSampleUrl = entity.getSamplePath();
 			try {
-				if(isAudit==1){	
+				/*if(isAudit==1){	
 					Date creatTime = entity.getCreateTime();
 					//音视频文件上传接口调用
 					File srcFile = new File(oldSrcUrl);
@@ -254,15 +256,15 @@ public class AvController extends BaseController  {
 //							entity.setSamplePath("");
 						
 					}
-				}
+				}*/
 				avCfgService.auditAvFileSample(entity,isAudit);	
 				//删除本地源文件和样例文件
-				if(!oldSrcUrl.equals(entity.getSrcUrl())){
+				/*if(!oldSrcUrl.equals(entity.getSrcUrl())){
 					FileUtils.deleteFile(oldSrcUrl);
 				}
 				if(!oldSampleUrl.equals(entity.getSampleUrl())){
 					FileUtils.deleteFile(oldSampleUrl);
-				}
+				}*/
 			}catch(Exception e){
 				e.printStackTrace();
 				if(e instanceof MaatConvertException) {
diff --git a/src/main/java/com/nis/web/service/configuration/AvCfgService.java b/src/main/java/com/nis/web/service/configuration/AvCfgService.java
index 5a68dd1e0..1bde1abd0 100644
--- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java
@@ -20,11 +20,13 @@ import com.nis.domain.Page;
 import com.nis.domain.configuration.AvFileSampleCfg;
 import com.nis.domain.configuration.AvSignSampleCfg;
 import com.nis.domain.maat.ToMaatResult;
+import com.nis.domain.maat.ToMaatResult.ResponseData;
 import com.nis.exceptions.CallExternalProceduresException;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
 import com.nis.util.FileUtils;
+import com.nis.util.JsonMapper;
 import com.nis.util.StringUtil;
 import com.nis.web.dao.configuration.AvCfgDao;
 import com.nis.web.security.UserUtils;
@@ -181,16 +183,62 @@ public class AvCfgService extends BaseService{
 				Integer fileId = resObject.getInt("fileId");
 				if(state==1 && fileSize>0){//成功
 					entity.setIsSampleCreated(1);//样例文件创建成功
+					if(fileId.equals(entity.getCfgId().intValue())){
+						File uploadSampleFile = new File(entity.getSamplePath());
+						String sampleMd5 = FileUtils.getFileMD5(uploadSampleFile);				
+						entity.setSampleMd5(sampleMd5);
+					}else{
+						logger.error("调用外部程序返回fileId错误,输入的fileId为："+entity.getCfgId()+",输出的fileId为："+fileId);
+						throw new CallExternalProceduresException();
+					}
+					//文件上传至综合服务
+					Date creatTime = entity.getCreateTime();
+					//音视频文件上传接口调用
+					File srcFile = new File(entity.getSrcPath());
+					Map<String,Object> srcMap = new HashMap();
+					srcMap.put("filetype", FileUtils.getSuffix(srcFile.getName(), false));
+					srcMap.put("datatype", "dbSystem");//源文件存入数据中心
+					
+					srcMap.put("createTime",creatTime);
+					srcMap.put("key",FileUtils.getPrefix(srcFile.getName(), false));
+					srcMap.put("fileName", srcFile.getName());
+					srcMap.put("checksum", entity.getSrcMd5());
+					ToMaatResult result1 = ConfigServiceUtil.postFileCfg(null, srcFile, JsonMapper.toJsonString(srcMap));
+					logger.info("音视频源文件上传响应信息："+result1.toString());
+					//获取文件上传响应信息（新的文件访问路径）
+					String srcAccessUrl = null;
+					if(!StringUtil.isEmpty(result1)){
+						ResponseData data = result1.getData();
+						srcAccessUrl=data.getAccessUrl();
+						entity.setSrcUrl(srcAccessUrl);
+					}
+					File sampleFile = new File(entity.getSamplePath());
+					Map<String,Object> sampleMap = new HashMap();
+					sampleMap.put("filetype", FileUtils.getSuffix(sampleFile.getName(), false));
+					sampleMap.put("datatype", "fileSystem");//样例文件存入fastdfs
+					sampleMap.put("createTime", creatTime);
+					sampleMap.put("key",FileUtils.getPrefix(sampleFile.getName(), false));
+					sampleMap.put("fileName", sampleFile.getName());
+					sampleMap.put("checksum", entity.getSampleMd5());
+					ToMaatResult result2 = ConfigServiceUtil.postFileCfg(null, sampleFile, JsonMapper.toJsonString(sampleMap));
+					logger.info("音视频样例文件上传响应信息："+result2.toString());					
+					//获取文件上传响应信息（新的文件访问路径）
+					String sampleAccessUrl = null;
+					if(!StringUtil.isEmpty(result2)){
+						ResponseData data = result2.getData();
+						sampleAccessUrl = data.getAccessUrl();
+						entity.setSampleUrl(sampleAccessUrl);
+						
+					}
+					//删除本地源文件和样例文件
+					FileUtils.deleteFile(entity.getSrcPath());
+					FileUtils.deleteFile(entity.getSamplePath());
 				}else{
 					entity.setIsSampleCreated(-1);//样例文件创建失败
+					logger.error("样例文件生成失败");
+					throw new CallExternalProceduresException();
 				}
-				if(fileId.equals(entity.getCfgId().intValue())){
-					File uploadSampleFile = new File(entity.getSamplePath());
-					String sampleMd5 = FileUtils.getFileMD5(uploadSampleFile);				
-					entity.setSampleMd5(sampleMd5);
-				}else{
-					logger.info("调用外部程序返回fileId错误,输入的fileId为："+entity.getCfgId()+",输出的fileId为："+fileId);
-				}
+				
 			}else{
 				throw new CallExternalProceduresException();
 			}