From 11667526fb98142a90ee40c88705191588fea5ad Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Thu, 2 Aug 2018 16:48:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?NTC=5FSSL=5FLOG=E4=B8=AD=E5=AD=97=E6=AE=B5c?= =?UTF-8?q?a=E6=94=B9=E4=B8=BAcn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/domain/restful/NtcSslLog.java | 10 +++++----- src/main/java/com/nis/web/dao/DfLogSearchDao.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/nis/domain/restful/NtcSslLog.java b/src/main/java/com/nis/domain/restful/NtcSslLog.java index 2d666fb..1c88d06 100644 --- a/src/main/java/com/nis/domain/restful/NtcSslLog.java +++ b/src/main/java/com/nis/domain/restful/NtcSslLog.java @@ -21,7 +21,7 @@ public class NtcSslLog extends LogEntity { protected String san; @ApiModelProperty(value="证书授权机构", required=true) - protected String ca; + protected String cn; public String getVersion() { return version; @@ -47,11 +47,11 @@ 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; } } diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml index fb14f4e..864e989 100644 --- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml +++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml @@ -161,7 +161,7 @@ - + From e2f1cfc19467f62112493c4ccd5eeda320509235 Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Fri, 3 Aug 2018 10:32:18 +0800 Subject: [PATCH 2/6] =?UTF-8?q?DNS=E5=8E=9F=E5=A7=8B=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0searchQname=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=EF=BC=9B=20SSL=E5=8E=9F=E5=A7=8B=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0searchSni=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/domain/restful/NtcDnsLog.java | 20 +++++++++++++++++++ .../com/nis/domain/restful/NtcSslLog.java | 19 ++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/src/main/java/com/nis/domain/restful/NtcDnsLog.java b/src/main/java/com/nis/domain/restful/NtcDnsLog.java index 5ffdc46..35a1d55 100644 --- a/src/main/java/com/nis/domain/restful/NtcDnsLog.java +++ b/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; + } } diff --git a/src/main/java/com/nis/domain/restful/NtcSslLog.java b/src/main/java/com/nis/domain/restful/NtcSslLog.java index 1c88d06..238a7b9 100644 --- a/src/main/java/com/nis/domain/restful/NtcSslLog.java +++ b/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; @@ -23,6 +24,9 @@ public class NtcSslLog extends LogEntity { @ApiModelProperty(value="证书授权机构", required=true) protected String cn; + @ApiModelProperty(value="SNI", required=true) + protected String searchSni ; + public String getVersion() { return version; } @@ -54,4 +58,19 @@ public class NtcSslLog extends LogEntity { 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; + } } From be5d9edf463f85019fc8c58420f8f694673dcb37 Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Mon, 6 Aug 2018 09:24:40 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=9A=E5=8A=A10x209?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/applicationConfig-rule.properties | 7 ++++--- src/main/resources/maatXml/applicationConfig-maatRedis.xml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/resources/applicationConfig-rule.properties b/src/main/resources/applicationConfig-rule.properties index 556ea48..9af2180 100644 --- a/src/main/resources/applicationConfig-rule.properties +++ b/src/main/resources/applicationConfig-rule.properties @@ -20,7 +20,7 @@ ##回流 0x60 96 loop ##白名单 0x80 128 whitelist -service=1:128;2:128;16:16;17:16;18:16;19:16;20:16;21:16;22:16;23:16;24:16;26:16;27:16;30:16;31:16;32:16;33:16;34:16;128:1;129:1;130:1;131:1;132:1;133:1;134:1;135:1;136:1;137:1;138:1;139:1;140:1;141:1;142:1;143:1;144:1;145:1;256:16;257:16;258:16;259:16;260:16;384:1;385:1;386:1;387:1;388:1;512:1;513:1;528:48;544:2;560:80;576:16;592:1;750:128;768:96;1024:1;1026:1;1027:1;1028:1;1040:32;1056:64;1057:64;1058:64; +service=1:128;2:128;16:16;17:16;18:16;19:16;20:16;21:16;22:16;23:16;24:16;26:16;27:16;30:16;31:16;32:16;33:16;34:16;128:1;129:1;130:1;131:1;132:1;133:1;134:1;135:1;136:1;137:1;138:1;139:1;140:1;141:1;142:1;143:1;144:1;145:1;256:16;257:16;258:16;259:16;260:16;384:1;385:1;386:1;387:1;388:1;512:1;513:1;521:128;528:48;544:2;560:80;576:16;592:1;750:128;768:96;1024:1;1026:1;1027:1;1028:1;1040:32;1056:64;1057:64;1058:64; #0x1E 0x8E 有问题:14:NTC_XMPP_REGION,NTC_XMPP_CONT 无表结构 不确定表是不是字符串类 @@ -128,7 +128,8 @@ service=1:128;2:128;16:16;17:16;18:16;19:16;20:16;21:16;22:16;23:16;24:16;26:16; 512=10:PXY_INTERCEPT_COMPILE;11:PXY_INTERCEPT_GROUP;12:PXY_INTERCEPT_IP;18:NTC_IP_RANGE #0x201 PXY拦截域名 513=10:PXY_INTERCEPT_COMPILE;11:PXY_INTERCEPT_GROUP;14:PXY_INTERCEPT_DOMAIN;18:NTC_IP_RANGE - +#0x209 PXY拦截白名单 +521=10:PXY_INTERCEPT_COMPILE;11:PXY_INTERCEPT_GROUP;12:PXY_INTERCEPT_IP;14:PXY_INTERCEPT_DOMAIN #0x210 PXY HTTP重定向 528=10:PXY_CTRL_COMPILE;11:PXY_CTRL_GROUP;12:PXY_CTRL_IP;14:PXY_CTRL_HTTP_URL,PXY_CTRL_HTTP_REQ_BODY;15:PXY_CTRL_HTTP_REQ_HDR,PXY_CTRL_HTTP_RES_HDR;18:NTC_IP_RANGE #0x220 PXY HTTP 转发 @@ -240,7 +241,7 @@ unMaatService=3:32;4:96;5:32;25:32;28:32;64:16;65:16;261:16;262:16;263:16;264:16 #0x19 IPSec丢弃 25:7; #0x340 IP复用地址池配置（回调）832:2,4,5,7 ########## -serviceDBIndex=1:2,3,4,6,7;2:2,3,4,6,7;16:2;17:2;18:2;19:2;20:2;21:2;22:2;23:2;24:2;26:2;27:2;30:2;31:2;32:2;33:2,6,7;34:2;128:2;129:2;130:2;131:2;132:2;133:2;134:2;135:2;136:2;137:2;138:2;139:2;140:2;141:2;142:2;143:2;144:2;145:2,6,7;256:3;257:3;258:3;259:3;260:3;384:3;385:3;386:3;387:3;388:3;512:4,7;513:4,2,7;528:4;544:4;560:4;576:4;592:4;750:4;768:5;1024:2,6,7;1026:2,6,7;1027:2;1028:2,6,7;1040:2,6,7;1056:2,6,7;1057:6,7;1058:6,2,7;3:7;4:7;5:2;25:7;28:7;64:2;65:2;261:8;262:9;263:10;264:11;265:3;266:3;389:3;390:3;391:3;392:3;393:3;394:3;832:2,4,5,7 +serviceDBIndex=1:2,3,4,6,7;2:2,3,4,6,7;16:2;17:2;18:2;19:2;20:2;21:2;22:2;23:2;24:2;26:2;27:2;30:2;31:2;32:2;33:2,6,7;34:2;128:2;129:2;130:2;131:2;132:2;133:2;134:2;135:2;136:2;137:2;138:2;139:2;140:2;141:2;142:2;143:2;144:2;145:2,6,7;256:3;257:3;258:3;259:3;260:3;384:3;385:3;386:3;387:3;388:3;512:4,7;513:4,2,7;521:4;528:4;544:4;560:4;576:4;592:4;750:4;768:5;1024:2,6,7;1026:2,6,7;1027:2;1028:2,6,7;1040:2,6,7;1056:2,6,7;1057:6,7;1058:6,2,7;3:7;4:7;5:2;25:7;28:7;64:2;65:2;261:8;262:9;263:10;264:11;265:3;266:3;389:3;390:3;391:3;392:3;393:3;394:3;832:2,4,5,7 ##maat配置入阀门需要将编译中的部分参数写到域配置中，目前最多包含ACTION，SERVICE，USER_REGION三个属性 diff --git a/src/main/resources/maatXml/applicationConfig-maatRedis.xml b/src/main/resources/maatXml/applicationConfig-maatRedis.xml index 3d06a32..425e4ee 100644 --- a/src/main/resources/maatXml/applicationConfig-maatRedis.xml +++ b/src/main/resources/maatXml/applicationConfig-maatRedis.xml @@ -138,7 +138,7 @@ + service="1;2;16;17;18;19;20;21;22;23;24;26;27;30;31;32;33;34;128;129;130;131;132;133;134;135;136;137;138;139;140;141;142;143;144;145;256;257;258;259;260;384;385;386;387;388;512;513;521;528;544;560;576;592;750;768;848;1024;1025;1026;1027;1028;1040;1056;1057;1058"> EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id] [compile_id];\t;[service];\t;[action];\t;[do_blacklist];\t;[do_log];\t;[effective_range];\t;[user_region];\t;[is_valid];\t;[group_num];\t;[father_cfg_id];\t;[op_time]; 0;\n From 28e124721bbf3efe71aafc2eb7a90df08c69b98c Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Mon, 6 Aug 2018 14:56:49 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=90=91=E5=AE=9E=E6=97=B6=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=BA=93=E4=B8=AD=E7=9A=84=E9=85=8D=E7=BD=AE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=85=A5=E5=BA=93=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5,=E6=A0=BC=E5=BC=8FyyyyMMdd?= =?UTF-8?q?HHmmss,=E6=96=B9=E4=BE=BF=E7=9B=B4=E6=8E=A5=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/web/service/restful/ConfigJedisServiceimpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java b/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java index 0d36189..1a471af 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java +++ b/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; @@ -30,6 +31,8 @@ import redis.clients.jedis.exceptions.JedisConnectionException; 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>> configMap) { if (configMap != null && configMap.size() > 0) { @@ -382,6 +385,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,"); From bcd2620392ae4b86ad32b363fc6dd91fb3f2e10f Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Tue, 7 Aug 2018 09:37:37 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=B8=BAjdbc=E8=BF=9E=E6=8E=A5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/jdbc.properties | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties index 51f585a..9bceab2 100644 --- a/src/main/resources/jdbc.properties +++ b/src/main/resources/jdbc.properties @@ -1,7 +1,13 @@ #==========日志库 Mysql======================= jdbc.log.driver=com.mysql.jdbc.Driver +#元辰鑫内网 jdbc.log.url=jdbc:mysql://10.0.6.249:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull +#华严 +#jdbc.log.url=jdbc:mysql://192.168.11.242:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull +#元辰鑫外网 #jdbc.log.url=jdbc:mysql://192.168.10.204:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull +#亦庄 +#jdbc.log.url=jdbc:mysql://192.168.10.212:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull jdbc.log.username=root jdbc.log.key=9Pjh5K20Sho0lnWMClUXYA== jdbc.log.password=D3ptWYX8vx/GoEXaSrJycQ== @@ -34,7 +40,17 @@ bonecp.statementsCacheSize=100 #A版日志库 jdbc.hive.driver=org.apache.hive.jdbc.HiveDriver +#元辰鑫内网 jdbc.hive.url=jdbc:hive2://10.0.6.202:10000/maat +#华严 +#jdbc.hive.url=jdbc:hive2://192.168.11.243:10000/maat +#元辰鑫外网 +#jdbc.hive.url=jdbc:hive2://192.168.10.22:10000/maat +#亦庄 +#jdbc.hive.url=jdbc:hive2://192.168.10.216:10000/maat +#亦庄 +#高可用集群连接,注意使用此种方法需要配置hosts,主机名与ip的对应关系 +#jdbc.hive.url=jdbc:hive2://192.168.10.216:2181,192.168.10.217:2181,192.168.10.218:2181/maat;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2 jdbc.hive.username=xa_z2_mesa jdbc.hive.key=aC/8fTC9vfPVhCk+CDzbAQ== #加密后密码 @@ -53,8 +69,14 @@ bonecp.hive.statementsCacheSize=100 ##################################################################################################################################### ##redis连接 ##################################################################################################################################### +#元辰鑫内网 redis.host=10.0.6.249 +#华严 +#redis.host=192.168.11.243 +#元辰鑫外网 #redis.host=192.168.10.205 +#亦庄 +#redis.host=192.168.10.215 redis.port=6379 redis.pass= redis.maxIdle=5 From 17c2d936899cade05c4ad26df5ae8c9c9729d3cf Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Tue, 7 Aug 2018 09:47:33 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/persistence/interceptor/SQLHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/nis/persistence/interceptor/SQLHelper.java b/src/main/java/com/nis/persistence/interceptor/SQLHelper.java index 00ab46d..81e3545 100644 --- a/src/main/java/com/nis/persistence/interceptor/SQLHelper.java +++ b/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)) {