Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/java/com/nis/util/Constants.java

@@ -450,7 +450,7 @@ public final class Constants {
 	
 	//HTTP自定义域相关参数
 	public static String HTTP_HEADER_USER_REGION_KEY=Configurations.getStringProperty("http_header_user_region_key", "HTTP_HEADER");
-	public static String HTTP_HEADER_DICT_MODULE=Configurations.getStringProperty("http_header_dict_module", "REQUEST_HEADER_DISTRICT");
+	public static String HTTP_HEADER_DICT_MODULE=Configurations.getStringProperty("http_header_dict_module", "HTTP_HEADER_DISTRICT");
 	//DNS自定义域参数
 	public static String DNS_STRATEGY_USER_REGION_KEY=Configurations.getStringProperty("dns_strategy_user_region_key", "DNS_STRATEGY");
 }

src/main/java/com/nis/web/controller/BaseController.java

@@ -343,6 +343,9 @@ public class BaseController {
 		if (StringUtils.isBlank(report.getReportTime())) {
 			report.setReportTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd"));
 		}
+		if (report.getReportType() == null) {
+			report.setReportType(1);
+		}
 	}
 	protected void initFormCondition(Model model){
 		List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();

src/main/resources/nis.properties

@@ -306,6 +306,10 @@ userregion_replace_type_key=zone
 userregion_replace_req_key_value=http_req_body
 userregion_replace_res_key_value=http_res_body
 userregion_replace_regex_key=regex
+#用户自定义域占位符
+user_region_placeholder=
+#用户自定义域分隔符
+user_region_split=;
 #IP相关验证正则
 ipv4_ip_subnet_regexp=^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}/(3[0-2]|[1-2][0-9]|[0-9])$
 ipv6_ip_subnet_regexp=^\\s*((([0-9A-Fa-f]{1,4}\:){7}(([0-9A-Fa-f]{1,4})|\:))|(([0-9A-Fa-f]{1,4}\:){6}(\:|(\:[0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}\:){5}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:){4}(\:[0-9A-Fa-f]{1,4}){0,1}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:){3}(\:[0-9A-Fa-f]{1,4}){0,2}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:){2}(\:[0-9A-Fa-f]{1,4}){0,3}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}\:)(\:[0-9A-Fa-f]{1,4}){0,4}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2})))|(\:(\:[0-9A-Fa-f]{1,4}){0,5}((\:?)|((\:[0-9A-Fa-f]{1,4}){1,2}))))(%.+)?\\s*/(0|2|4|8|16|32|64|128)$
@@ -322,12 +326,12 @@ redirect_response_code_startwith=30
 sample_upload_url_keyword=/av
 digest_upload_url_keyword=/fileTransfer
 #样例和摘要文件大小类型设置
-sample_file_type=,mp4,flv,ivf,mp2v,jpg,
+sample_file_type=,mp3,mp4,flv,ivf,mp2v,jpg,
 #10M 10485760
 sample_single_file_max_size=10485760
 #12M 12582912
 sample_total_file_max_size=12582912
-digest_file_type=,txt,doc,img,
+digest_file_type=,txt,doc,img,docx,pptx,xlsx,xls,ppt,
 #10M10485760
 digest_single_file_max_size=10485760
 #12M12582912
@@ -361,6 +365,6 @@ picture_sample_proc_param_is_translation=false
 #picture_sample_proc_param_is_translation=true
 #http自定义域相关参数
 http_header_user_region_key=HTTP_HEADER
-http_header_dict_module=REQUEST_HEADER_DISTRICT
+http_header_dict_module=HTTP_HEADER_DISTRICT
 #dns自定义域参数key
 dns_strategy_user_region_key=DNS_STRATEGY

src/main/webapp/WEB-INF/views/report/list.jsp

@@ -8,9 +8,9 @@
 		//筛选功能初始化
 		filterActionInit();
 		//日期类型初始化
-		changeReportType("${bean.reportType}", true);
+		changeReportType("${bean.reportType}");
 		$("#reportType").change(function(){
-			changeReportType($("#reportType", false).val());
+			changeReportType($("#reportType").val());
 		});
 		//reset
 		$("#resetBtn").on("click",function(){
@@ -89,29 +89,25 @@
 		});
 	});
 	
-	function changeReportType(reportType, init) {
+	function changeReportType(reportType) {
 		$("#intype").remove();
-		var reportTime = "";
+		var	reportTime = "${bean.reportTime }";
-		if (init) {
-			reportTime = "${bean.reportTime }";
-		}
 		if(reportType == 1){//需删除元素后重新添加，直接更改onclick会出现缓存问题
 			$("#reportTypeDiv").append('<input id="intype" name="reportTime" class="form-control input-medium Wdate" type="text" value="' + reportTime + '" readonly="readonly" onclick=WdatePicker({dateFmt:"yyyy-MM-dd",isShowClear:true});>');
 		} else if(reportType == 2){
-			$("#reportTypeDiv").append('<input id="intype" name="reportTime" class="form-control input-medium Wdate" type="text" value="' + reportTime + '" readonly="readonly" onclick=WdatePicker({dateFmt:"yyyy-MM",isShowClear:true});>');
+			$("#reportTypeDiv").append('<input id="intype" name="reportTime" class="form-control input-medium Wdate" type="text" value="' + reportTime.substring(0, 7) + '" readonly="readonly" onclick=WdatePicker({dateFmt:"yyyy-MM",isShowClear:true});>');
 		} else if(reportType == 3){
-			$("#reportTypeDiv").append('<input id="intype" name="reportTime" class="form-control input-medium Wdate" type="text" value="' + reportTime + '" readonly="readonly" onclick=WdatePicker({dateFmt:"yyyy",isShowClear:true});>');
+			$("#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 ajaxReport=function(url,target){
-	var random=new Date().getTime();
 	loading('<spring:message code="onloading"/>');
 	$.ajax({
 		type:'post',
 		async:false,
 		cache:false,
-		url:'${ctx}'+url+"?random="+random,///report/ajaxNtcTagReport
+		url:'${ctx}'+url,// /report/ajaxNtcTagReport
 		data:{
 			"action":$('[name="action"]').val(),
 			"reportType":$('[name="reportType"]').val(),

src/main/webapp/static/global/css/components.css

@@ -22545,6 +22545,7 @@ transition: background-color .1s ease-in-out;
 	border-bottom: 0px;
 	cursor:pointer;
 	display: inline;
+	width:auto;
 }
 .content {
 	width: 80%;