From 15ce51936897a0a844e9a5a8601fc1e2cc3756ee Mon Sep 17 00:00:00 2001 From: duandongmei Date: Fri, 8 Jun 2018 17:33:57 +0800 Subject: [PATCH] =?UTF-8?q?baseController=E5=8E=BB=E6=8E=89=E6=97=A0?= =?UTF-8?q?=E7=94=A8service=20=E4=BF=AE=E6=94=B9=E6=95=B0=E5=80=BC?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84region=EF=BC=8C=E6=8F=90=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/domain/maat/MaatCfg.java | 6 ++- .../com/nis/interceptor/LogInterceptor.java | 43 +++++++++++++++++++ src/main/java/com/nis/util/Constants.java | 1 + .../nis/web/controller/BaseController.java | 16 ------- .../java/com/nis/web/service/BaseService.java | 4 +- src/main/resources/nis.properties | 1 + 6 files changed, 52 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/nis/domain/maat/MaatCfg.java b/src/main/java/com/nis/domain/maat/MaatCfg.java index fa6cd668b..7ada49b4f 100644 --- a/src/main/java/com/nis/domain/maat/MaatCfg.java +++ b/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; diff --git a/src/main/java/com/nis/interceptor/LogInterceptor.java b/src/main/java/com/nis/interceptor/LogInterceptor.java index c490c8308..54a91ce2a 100644 --- a/src/main/java/com/nis/interceptor/LogInterceptor.java +++ b/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(); + } + } diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index fa98d1d51..b251fe255 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/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***"); } diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index d0df9c459..bfa4c6f74 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/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; diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index db80f076e..47865576f 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/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); } diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 66af0c485..6e1d9e0f7 100644 --- a/src/main/resources/nis.properties +++ b/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