Merge branch 'Release-1.1' into develop

src/main/java/com/nis/domain/restful/NtcDnsLog.java

@@ -1,5 +1,6 @@
 package com.nis.domain.restful;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nis.domain.LogEntity;
 import com.wordnik.swagger.annotations.ApiModelProperty;
 
@@ -41,6 +42,10 @@ public class NtcDnsLog extends LogEntity {
 
     @ApiModelProperty(value="DNS_SUB", required=true)
     protected Integer dnsSub ;
+    
+    @ApiModelProperty(value="查询内容", required=true)
+    protected String searchQname ;
+    
 
     public Integer getRd() {
         return rd;
@@ -121,4 +126,19 @@ public class NtcDnsLog extends LogEntity {
     public void setDnsSub(Integer dnsSub) {
         this.dnsSub = dnsSub;
     }
+    
+    /**
+	 * @param searchQName the searchQName to set
+	 */
+	public void setSearchQname(String searchQname) {
+		this.searchQname = searchQname;
+	}
+	
+	/**
+	 * @return the searchQName
+	 */
+	@JsonIgnore
+	public String getSearchQname() {
+		return searchQname;
+	}
 }

src/main/java/com/nis/domain/restful/NtcSslLog.java

@@ -1,5 +1,6 @@
 package com.nis.domain.restful;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nis.domain.LogEntity;
 import com.wordnik.swagger.annotations.ApiModelProperty;
 
@@ -21,8 +22,11 @@ public class NtcSslLog extends LogEntity {
     protected String san;
 
     @ApiModelProperty(value="证书授权机构", required=true)
-    protected String ca;
+    protected String cn;
 
+    @ApiModelProperty(value="SNI", required=true)
+    protected String searchSni ;
+    
     public String getVersion() {
         return version;
     }
@@ -47,11 +51,26 @@ public class NtcSslLog extends LogEntity {
         this.san = san;
     }
 
-    public String getCa() {
-        return ca;
+    public String getCn() {
+        return cn;
     }
 
-    public void setCa(String ca) {
-        this.ca = ca;
+    public void setCn(String cn) {
+        this.cn = cn;
     }
+    
+    /**
+	 * @param searchSni the searchSni to set
+	 */
+	public void setSearchSni(String searchSni) {
+		this.searchSni = searchSni;
+	}
+	
+	/**
+	 * @return the searchSni
+	 */
+	@JsonIgnore
+	public String getSearchSni() {
+		return searchSni;
+	}
 }

src/main/java/com/nis/persistence/interceptor/SQLHelper.java

@@ -153,7 +153,7 @@ public class SQLHelper {
 	 */
 	public static Long getCount(final String sql, final Connection connection, final MappedStatement mappedStatement,
 			final Object parameterObject, final BoundSql boundSql, Log log) throws SQLException {
-		logger.info("oracle查询count开始----"+System.currentTimeMillis());
+		logger.info("count查询开始----"+System.currentTimeMillis());
 		String dbName = getDBType();
 		final String countSql;
 		if ("oracle".equals(dbName)) {

src/main/java/com/nis/web/dao/DfLogSearchDao.xml

@@ -161,7 +161,7 @@
 		<result column="version" jdbcType="VARCHAR" property="version" />
 		<result column="sni" jdbcType="VARCHAR" property="sni" />
 		<result column="san" jdbcType="VARCHAR" property="san" />
-		<result column="ca" jdbcType="VARCHAR" property="ca" />
+		<result column="cn" jdbcType="VARCHAR" property="cn" />
 	</resultMap>
 
 

src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java

@@ -1,5 +1,6 @@
 package com.nis.web.service.restful;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -32,6 +33,8 @@ import com.nis.util.ServiceAndRDBIndexReal;
 public class ConfigJedisServiceimpl implements ConfigRedisService {
 	private static Logger logger = LoggerFactory.getLogger(ConfigJedisServiceimpl.class);
 	private static final int TAPREDISDB = Configurations.getIntProperty("tapRedisDb", 7);
+	// 用于在实时统计配置后面添加时间,方便读取入库时间
+	private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
 
 	public boolean saveUnMaatConfig(Map<Integer, List<Map<String, String>>> configMap) {
 		if (configMap != null && configMap.size() > 0) {
@@ -384,6 +387,9 @@ public class ConfigJedisServiceimpl implements ConfigRedisService {
 												valBF.append(valStr.trim());
 											}
 										}
+										//向实时统计库中添加时间标识,方便人眼直观识别入库时间
+										valBF.append("\t");
+										valBF.append(sdf.format(new Date()));
 										String maatKey = keyBF.toString();
 										transaction.set(maatKey.toUpperCase(), valBF.toString());
 										String zset = maatKey.replace("EFFECTIVE_RULE:", "ADD,");