Merge branch 'feature-181031' into develop

This commit is contained in:
doufenghu
2018-11-09 15:09:34 +08:00
8 changed files with 88 additions and 92 deletions

View File

@@ -0,0 +1,47 @@
#由于数据中心hive日志表的表名会变动,所以本系统中将日志的表名提取到配置文件中方便后期修改,key是bean的名称+HiveTable,value是hive的实际表名
NtcIpLogHiveTable=singhand_NTC_IP_LOG
NtcHttpLogHiveTable=singhand_NTC_HTTP_LOG
NtcDnsLogHiveTable=singhand_NTC_DNS_LOG
NtcMailLogHiveTable=singhand_NTC_MAIL_LOG
NtcSslLogHiveTable=singhand_NTC_SSL_LOG
NtcPptpLogHiveTable=singhand_NTC_PPTP_LOG
NtcL2tpLogHiveTable=singhand_NTC_L2TP_LOG
NtcOpenvpnLogHiveTable=singhand_NTC_OPENVPN_LOG
NtcIpsecLogHiveTable=singhand_NTC_IPSEC_LOG
NtcSshLogHiveTable=singhand_NTC_SSH_LOG
NtcFtpLogHiveTable=singhand_NTC_FTP_LOG
NtcAppLogHiveTable=singhand_NTC_APP_LOG
NtcDdosLogHiveTable=singhand_NTC_DDOS_LOG
NtcP2pLogHiveTable=singhand_NTC_P2P_LOG
NtcBgpLogHiveTable=singhand_NTC_BGP_LOG
DkBehaviorLogHiveTable=singhand_DK_BEHAVIOR_LOG
MmAvIpLogHiveTable=singhand_MM_AV_IP_LOG
MmAvUrlLogHiveTable=singhand_MM_AV_URL_LOG
MmPicIpLogHiveTable=singhand_MM_PIC_IP_LOG
MmPicUrlLogHiveTable=singhand_MM_PIC_URL_LOG
MmVoipIpLogHiveTable=singhand_MM_VOIP_IP_LOG
MmVoipAccountLogHiveTable=singhand_MM_VOIP_ACCOUNT_LOG
MmSampleAudioLogHiveTable=singhand_MM_SAMPLE_AUDIO_LOG
MmSampleVideoLogHiveTable=singhand_MM_SAMPLE_VIDEO_LOG
MmPornAudioLevelLogHiveTable=singhand_MM_PORN_AUDIO_LEVEL_LOG
MmPornVideoLevelLogHiveTable=singhand_MM_PORN_VIDEO_LEVEL_LOG
MmSamplePicLogHiveTable=singhand_MM_SAMPLE_PIC_LOG
MmSampleVoipLogHiveTable=singhand_MM_SAMPLE_VOIP_LOG
PxyHttpLogHiveTable=singhand_PXY_HTTP_LOG
MmFaceRecognizationLogHiveTable=singhand_MM_FACE_RECOGNIZATION_LOG
MmLogoDetectionLogHiveTable=singhand_MM_LOGO_DETECTION_LOG
MmSpeakerRecognizationLogHiveTable=singhand_MM_SPEAKER_RECOGNIZATION_LOG
NtcVoipLogHiveTable=singhand_NTC_VOIP_LOG
NtcStreamingMediaLogHiveTable=singhand_NTC_STREAMING_MEDIA_LOG
MmFileDigestLogHiveTable=singhand_MM_FILE_DIGEST_LOG
NtcKeywordsUrlLogHiveTable=singhand_NTC_KEYWORDS_URL_LOG
NtcCollectVoipLogHiveTable=singhand_NTC_COLLECT_VOIP_LOG

View File

@@ -40,7 +40,7 @@ bonecp.statementsCacheSize=100
#数据中心hive接口配置
############################################################################################################################################
#数据中心hive日志库数据库名称,程序中每次查询时使用的数据库名称 use dbName
jdbc.hive.DBName=maat
#jdbc.hive.DBName=maat
#A版日志库
jdbc.hive.driver=org.apache.hive.jdbc.HiveDriver
#元辰鑫内网
@@ -48,16 +48,27 @@ jdbc.hive.driver=org.apache.hive.jdbc.HiveDriver
#华严
#jdbc.hive.url=jdbc:hive2://192.168.11.243:2181,192.168.10.76:2181,192.168.10.77:2181/maat;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
#元辰鑫外网
jdbc.hive.url=jdbc:hive2://192.168.10.22:10000/maat
#jdbc.hive.url=jdbc:hive2://192.168.10.22:10000/maat
#亦庄演示环境高可用集群连接,注意使用此种方法需要配置hosts,主机名与ip的对应关系
#jdbc.hive.url=jdbc:hive2://10.3.48.2:2181,10.3.48.3:2181,10.3.48.4:2181/maat;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2
jdbc.hive.username=xa_z2_mesa
jdbc.hive.key=aC/8fTC9vfPVhCk+CDzbAQ==
#jdbc.hive.username=xa_z2_mesa
#jdbc.hive.key=aC/8fTC9vfPVhCk+CDzbAQ==
#加密后密码
jdbc.hive.password=V3GyFlG8Mg01bTt8ykFVaA==
#jdbc.hive.password=V3GyFlG8Mg01bTt8ykFVaA==
#实际密码
#jdbc.hiveA.password=123!@#qwe
#星汉hive数据源
jdbc.hive.DBName=singhand_ntcstore
jdbc.hive.url=jdbc:hive2://218.76.55.165:30000/singhand_ntcstore
jdbc.hive.username=singhand
jdbc.hive.key=uKYTzWsRN1+X5Tt3W+CA4A==
jdbc.hive.password=f+IYYX73TPEqUp3fxLzxow==
bonecp.hive.idleMaxAgeInMinutes=60
bonecp.hive.idleConnectionTestPeriodInMinutes=240
bonecp.hive.maxConnectionsPerPartition=20