baseController去掉无用service

修改数值类型的region，提取值配置文件

src/main/java/com/nis/domain/maat/MaatCfg.java

@@ -18,6 +18,7 @@ import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.ComplexkeywordCfg;
 import com.nis.domain.configuration.NumBoundaryCfg;
+import com.nis.util.Constants;
 import com.nis.util.DateUtils;
 
 /**
@@ -358,7 +359,7 @@ public class MaatCfg implements Serializable {
 		private Integer groupId;
 		@Expose
 		@SerializedName("tableName")
-		private String cfgType;
+		private String cfgType="";
 		@Expose
 		private Integer lowBoundary;
 		@Expose
@@ -410,6 +411,9 @@ public class MaatCfg implements Serializable {
 		public void setAuditTime(Date auditTime) {
 			this.auditTime = auditTime;
 		}
+		public void initDefaultValue() {
+			this.cfgType=Constants.PROTOCOL_NUM_REGION;
+		}
 	}public static class DigestCfg{	
 		@Expose
 		private Integer regionId;

src/main/java/com/nis/interceptor/LogInterceptor.java

@@ -1,7 +1,13 @@
 package com.nis.interceptor;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -70,5 +76,42 @@ public class LogInterceptor extends BaseService implements HandlerInterceptor{
 				
 		
 	}
+	/**
+	 * 获取非get请求的参数内容
+	 * @param request
+	 * @return
+	 */
+	private static String getBodyString(ServletRequest request) {
+		ServletInputStream inputStream = null;
+		StringBuffer sb = new StringBuffer();
+		BufferedReader reader = null;
+		try {
+			inputStream = request.getInputStream();
+			reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
+			String line = "";
+			while ((line = reader.readLine()) != null) {
+				sb.append(line);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			if (inputStream != null) {
+				try {
+					inputStream.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			if (reader != null) {
+				try {
+					reader.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return sb.toString();
+	}
+
 
 }

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

@@ -314,6 +314,7 @@ public final class Constants {
 	public static final String SSL_SNI_REGION = Configurations.getStringProperty("ssl_sni_region","ssl_sni"); 
 	public static final String SSL_SAN_REGION = Configurations.getStringProperty("ssl_san_region","ssl_san");
 	public static final String SSL_CA_REGION = Configurations.getStringProperty("ssl_ca_region","ssl_ca"); 
+	public static final String PROTOCOL_NUM_REGION = Configurations.getStringProperty("protocol_num_region","protocol_num"); 
 
 	public static final String KEYWORD_EXPR = Configurations.getStringProperty("keyword_expr","***and***"); 
 }

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

@@ -61,13 +61,9 @@ import com.nis.web.service.configuration.DnsIpCfgService;
 import com.nis.web.service.configuration.FileTransferCfgService;
 import com.nis.web.service.configuration.IpCfgService;
 import com.nis.web.service.configuration.MailCfgService;
-import com.nis.web.service.configuration.MediaCfgService;
 import com.nis.web.service.configuration.NumCfgService;
 import com.nis.web.service.configuration.RequestInfoService;
-import com.nis.web.service.configuration.SslCfgService;
 import com.nis.web.service.configuration.StringCfgService;
-import com.nis.web.service.configuration.TunnelCfgService;
-import com.nis.web.service.configuration.WebCfgService;
 import com.nis.web.service.configuration.WebsiteCfgService;
 import com.nis.web.service.specific.SpecificServiceCfgService;
 import com.nis.web.service.specific.SpecificServiceHostCfgService;
@@ -108,24 +104,12 @@ public class BaseController {
 	@Autowired 
 	protected DnsIpCfgService dnsIpCfgService;
 	
-	@Autowired 
-	protected WebCfgService webCfgService;
-	
 	@Autowired 
 	protected MailCfgService mailCfgService;
 	
 	@Autowired 
 	protected FileTransferCfgService fileTransferCfgService;
 	
-	@Autowired 
-	protected TunnelCfgService tunnCfgService;
-	
-	@Autowired 
-	protected SslCfgService sslCfgService;
-	
-	@Autowired 
-	protected MediaCfgService mediaCfgService;
-	
 	@Autowired 
 	protected AppCfgService appCfgService;
 	

src/main/java/com/nis/web/service/BaseService.java

@@ -306,13 +306,13 @@ public abstract class BaseService {
 					group1.setIsValid(baseCfg.getIsValid());
 					groupRelationList.add(group1);
 					NumBoundaryCfg numCfg = new NumBoundaryCfg();
+					numCfg.initDefaultValue();
 					numCfg.setLowBoundary(baseIpCfg.getProtocolId());
 					numCfg.setUpBoundary(baseIpCfg.getProtocolId());
 					numCfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0));
 					numCfg.setAuditTime(baseCfg.getAuditTime());
 					numCfg.setGroupId(group1.getGroupId());
-					numCfg.setCfgType(baseIpCfg.getCfgType());
-					cfg.setIsValid(baseCfg.getIsValid());
+					numCfg.setIsValid(baseCfg.getIsValid());
 					numRegionList.add(numCfg);
 					map.put("numRegionList",numRegionList);
 				}

src/main/resources/nis.properties

@@ -264,6 +264,7 @@ SERVICE_DICT_ITM_TYPE=SERVICE_DICT_ITM_TYPE
 #\u7cfb\u7edf\u5b57\u5178\u5728\u8bcd\u5178\u4e2d\u7684\u6807\u8bc6
 SYS_DICT_ITM_TYPE=SYS_DICT_ITM_TYPE
 area_region=NTC_IP_RANGE
+protocol_num_region=NTC_UNIVERSAL_PROTO_TYPE
 http_ip_region=http_ip
 http_req_hdr_region=http_req_hdr
 http_req_body_region=http_req_body