日志检索-流量日志-新增的采集日志页面 国际化等问题修改

7 files changed, 35 insertions, 24 deletions

diff --git a/src/main/java/com/nis/web/controller/log/ntc/BgpRecordLogController.java b/src/main/java/com/nis/web/controller/log/ntc/BgpRecordLogController.java
index 048be5fb..c84fb00f 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/BgpRecordLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/BgpRecordLogController.java
@@ -24,12 +24,9 @@ import com.nis.domain.Page;
 import com.nis.domain.PageLog;

 import com.nis.domain.SysUser;

 import com.nis.domain.log.NtcBgpRecordLog;

-import com.nis.domain.log.NtcHttpRecordLog;

-import com.nis.domain.log.NtcHttpRecordLog;

 import com.nis.domain.maat.LogRecvData;

 import com.nis.util.Constants;

 import com.nis.util.DictUtils;

-import com.nis.util.Encodes;

 import com.nis.util.LogUtils;

 import com.nis.util.httpclient.HttpClientUtil;

 import com.nis.web.controller.BaseController;

diff --git a/src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java b/src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java
index 77db1921..ca733101 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java
@@ -91,7 +91,7 @@ public class SslRecordLogController extends BaseController {
 	@RequestMapping(value = "exportSsl")

 	public void exportSsl(@ModelAttribute("log") NtcSslRecordLog log, Model model, String hColumns, String type,

 			HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {

-		System.out.println("进来了ssl泛收");

+//		System.out.println("进来了ssl泛收");

 		try {

 			// export data info

 			List<String> titleList = new ArrayList<String>();

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 34b325cb..c4c6204a 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -618,10 +618,10 @@ host_cookie=Host Cookie
 mac=Message Authentication Code

 ex_protocol=Exchange Protocol 

 isakmp_mode=ISAKMP Mode

-req_hdr_file=Req-Hdr File

-req_body_file=Req-Body File

-res_hdr_file=Res-Hdr File

-res_body_file=Res-Body File

+req_hdr_file=Request Header File

+req_body_file=Request Body File

+res_hdr_file=Response Header File

+res_body_file=Response Body File

 qr=Request/Response

 rd=Recursion Desired

 ra=Recursion Available

@@ -1359,7 +1359,7 @@ radius_log=Radius Record
 code=Code

 nas_ip=NAS IP Address

 framed_ip=Framed IP Address

-log_user_name=User Name

+log_user_name=Account

 av_tips=The system does not support the index information of audio and video coding in the tail of the audio and video files. The system does not support video with resolution greater than 1080P.

 asn_ip_group_delete=\uff08IP configuration under this ASN group will also be deleted.)

 keyword_log_tips=Deduplicate http body keywords log,for the control status of http body keywords is not ideal, configure the http url of the hit keyword as URL control configuration.

@@ -1543,4 +1543,6 @@ http_obj_scan_result=HTTP OBJSCAN RESULT
 topic_name=TOPIC NAME

 malware_id=MALWARE ID

 malware_type=MALWARE TYPE

-malware_name=MALWARE NAME
\ No newline at end of file
+malware_name=MALWARE NAME

+http_seq=HTTP Seq

+proxy_flag=Proxy Flag
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 9977db6d..5d3cf94b 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -618,10 +618,10 @@ host_cookie=Cookie \u0445\u043e\u0441\u0442\u0430
 mac=\u041a\u043e\u0434 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f

 ex_protocol=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b \u043e\u0431\u043c\u0435\u043d\u0430

 isakmp_mode=\u0420\u0435\u0436\u0438\u043c ISAKMP

-req_hdr_file=\u0424\u0430\u0439\u043b \u0434\u0430\u043c\u043f\u0430 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0430 \u0437\u0430\u043f\u0440\u043e\u0441\u0430

-req_body_file=\u0424\u0430\u0439\u043b \u0434\u0430\u043c\u043f\u0430 \u0442\u0435\u043b\u0430 \u0437\u0430\u043f\u0440\u043e\u0441\u0430

-res_hdr_file=\u0424\u0430\u0439\u043b \u0434\u0430\u043c\u043f\u0430 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0430 \u043e\u0442\u0432\u0435\u0442\u0430

-res_body_file=\u0424\u0430\u0439\u043b \u0434\u0430\u043c\u043f\u0430 \u0442\u0435\u043b\u0430 \u043e\u0442\u0432\u0435\u0442\u0430

+req_hdr_file=Request Header File

+req_body_file=Request Body File

+res_hdr_file=Response Header File

+res_body_file=Response Body File

 qr=\u0417\u0430\u043f\u0440\u043e\u0441/\u043e\u0442\u0432\u0435\u0442

 rd=\u041e\u0436\u0438\u0434\u0430\u0435\u043c\u0430\u044f \u0440\u0435\u043a\u0443\u0440\u0441\u0438\u044f

 ra=\u0414\u043e\u0441\u0442\u0443\u043f\u043d\u0430\u044f \u0440\u0435\u043a\u0443\u0440\u0441\u0438\u044f

@@ -1001,10 +1001,10 @@ d_asn=ASN \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0438\u0435
 s_subscribe_id=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u043f\u043e\u0434\u043f\u0438\u0441\u0447\u0438\u043a\u0430

 d_subscribe_id=\u041d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u0430 \u043f\u043e\u0434\u043f\u0438\u0441\u0447\u0438\u043a\u0430

 scene_file=\u0424\u0430\u0439\u043b \u0441\u0446\u0435\u043d\u044b

-req_hdr_key=\u041a\u043b\u044e\u0447 \u0444\u0430\u0439\u043b\u0430 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0430 \u0437\u0430\u043f\u0440\u043e\u0441\u0430

-req_body_key=\u041a\u043b\u044e\u0447 \u0444\u0430\u0439\u043b\u0430 \u0442\u0435\u043b\u0430 \u0437\u0430\u043f\u0440\u043e\u0441\u0430

-res_hdr_key=\u041a\u043b\u044e\u0447 \u0444\u0430\u0439\u043b\u0430 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0430 \u043e\u0442\u0432\u0435\u0442\u0430

-res_body_key=\u041a\u043b\u044e\u0447 \u0444\u0430\u0439\u043b\u0430 \u0442\u0435\u043b\u0430 \u043e\u0442\u0432\u0435\u0442\u0430

+req_hdr_key=Request Header File Key

+req_body_key=Request Body File Key

+res_hdr_key=Response Header File Key

+res_body_key=Response Body File Key

 p2p_ip_config_type=\u0422\u0438\u043f IP-\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438

 p2p_hash_type=\u0422\u0438\u043f \u0445\u0435\u0448\u0430

 NTC_SUBSCRIBE_ID=\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u043f\u043e\u0434\u043f\u0438\u0441\u0447\u0438\u043a\u0430

@@ -1363,7 +1363,7 @@ radius_log=\u0417\u0430\u043f\u0438\u0441\u0438 Radius
 code=\u041a\u043e\u0434

 nas_ip=NAS IP-\u0430\u0434\u0440\u0435\u0441

 framed_ip=Framed IP-\u0430\u0434\u0440\u0435\u0441

-log_user_name=\u0418\u043c\u044f \u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f

+log_user_name=Account

 av_tips=\u0421\u0438\u0441\u0442\u0435\u043c\u0430 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0438\u043d\u0434\u0435\u043a\u0441\u043d\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u0430\u0443\u0434\u0438\u043e \u0438 \u0432\u0438\u0434\u0435\u043e \u043a\u043e\u0434\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0432 \u0445\u0432\u043e\u0441\u0442\u0435 \u0430\u0443\u0434\u0438\u043e \u0438 \u0432\u0438\u0434\u0435\u043e \u0444\u0430\u0439\u043b\u043e\u0432. \u0421\u0438\u0441\u0442\u0435\u043c\u0430 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0432\u0438\u0434\u0435\u043e \u0441 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0435\u043c \u0432\u044b\u0448\u0435 1080P.

 asn_ip_group_delete=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f IP \u0432 \u044d\u0442\u043e\u0439 \u0433\u0440\u0443\u043f\u043f\u0435 ASN \u0442\u0430\u043a\u0436\u0435 \u0431\u0443\u0434\u0435\u0442 \u0443\u0434\u0430\u043b\u0435\u043d\u0430.

 keyword_log_tips=\u041a\u043e\u0433\u0434\u0430 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043a\u043b\u044e\u0447\u0435\u0432\u044b\u043c\u0438 \u0441\u043b\u043e\u0432\u0430\u043c\u0438 \u0432\u0435\u0431-\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u043f\u043b\u043e\u0445\u0438\u043c, \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u043e\u0447\u0438\u0441\u0442\u043a\u0438 \u0436\u0443\u0440\u043d\u0430\u043b\u0430 \u0434\u0430\u043d\u043d\u043e\u0439 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u043e\u0434\u0430\u0432\u0448\u0438\u0439 \u0432\u0435\u0431-\u0441\u0430\u0439\u0442 \u043d\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e ''\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 URL''.

@@ -1546,4 +1546,6 @@ http_obj_scan_result=HTTP OBJSCAN RESULT
 topic_name=TOPIC NAME

 malware_id=MALWARE ID

 malware_type=MALWARE TYPE

-malware_name=MALWARE NAME
\ No newline at end of file
+malware_name=MALWARE NAME

+http_seq=HTTP Seq

+proxy_flag=Proxy Flag
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 2792a25d..0701a36c 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1544,4 +1544,6 @@ http_obj_scan_result=\u6587\u4ef6\u626b\u63cf\u7ed3\u679c
 topic_name=\u4e3b\u9898\u540d\u79f0

 malware_id=\u6076\u610f\u75c5\u6bd2ID

 malware_type=\u6076\u610f\u75c5\u6bd2\u7c7b\u578b

-malware_name=\u6076\u610f\u75c5\u6bd2\u540d\u79f0
\ No newline at end of file
+malware_name=\u6076\u610f\u75c5\u6bd2\u540d\u79f0

+http_seq=\u4f1a\u8bdd\u5e8f\u5217\u53f7

+proxy_flag=\u4ee3\u7406\u6807\u5fd7
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/voipRecordList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/voipRecordList.jsp
index 7835463c..9c78c8f4 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/voipRecordList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/voipRecordList.jsp
@@ -86,6 +86,7 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>

 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>

 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>

+						<input id="jboxtCustomValue"  type="hidden" value="true"/>

 						<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>

 						<!-- 筛选按钮展开状态-->

 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/><sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>

@@ -204,7 +205,7 @@
 									</div>

 								</div>

 								

-								<div class="col-md-2">

+								<%-- <div class="col-md-2">

 									<div class="form-group">

 									<label><spring:message code="voip_protocol"/>：</label>

 									<c:set var="select"><spring:message code='select'/></c:set>

@@ -215,7 +216,7 @@
 						             		</c:forEach>

 										</form:select>

 									</div>

-								</div>

+								</div> --%>

 								

 								<div class="col-md-2">

 									<div class="form-group">

diff --git a/src/main/webapp/static/global/scripts/jeesite.js b/src/main/webapp/static/global/scripts/jeesite.js
index fc3eb471..f517e353 100644
--- a/src/main/webapp/static/global/scripts/jeesite.js
+++ b/src/main/webapp/static/global/scripts/jeesite.js
@@ -403,7 +403,14 @@ function customColumnClick(){
 	})
 	html +="</div>";
 	var  cus=$("#tb_custom",parent.document).val();
-	top.$.jBox(html,{title:"<i class='fa fa-wrench'></i>"+cus ,showIcon:false,opacity:0.3,submit:submit});
+	var jboxtCustomValue=$("#jboxtCustomValue").val();
+	if(jboxtCustomValue == "true"){
+		top.$.jBox(html,{title:"<i class='fa fa-wrench'></i>"+cus ,showIcon:false,opacity:0.3,
+			width: $(document).width()*0.25,
+	    	height: $(document).height()*0.8,submit:submit});
+	}else{
+		top.$.jBox(html,{title:"<i class='fa fa-wrench'></i>"+cus ,showIcon:false,opacity:0.3,submit:submit});
+	}
 	
 }