diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java index 9dbbe6dd3..c86306af7 100644 --- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java +++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java @@ -38,6 +38,7 @@ import com.nis.domain.configuration.DnsResStrategy; import com.nis.domain.configuration.FileDigestCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.PxyObjKeyring; +import com.nis.domain.configuration.PxyObjSpoofingIpPool; import com.nis.domain.configuration.PxyObjTrustedCaCert; import com.nis.domain.configuration.PxyObjTrustedCaCrl; import com.nis.domain.configuration.WebsiteDomainTopic; @@ -1737,6 +1738,9 @@ public class ConfigSynchronizationService extends BaseService{ IpPortCfg cfg = (IpPortCfg) list.get(i); newList.add(convertCallBackIp(cfg,cfg.getGroupId())); } + }else if(className.equals("PxyObjSpoofingIpPool")){ + list = configSynchronizationDao.getSpoofingIpPoolList(entity); + newList.addAll(list); } } diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 8e50734bb..2e68a553d 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -219,75 +219,72 @@ clusterBStartTime=1503504000725 isCommit=true ############################################################################################################################################ ############################################################################################################################################ -httpUrl=http://192.168.10.204:9999/galaxy-service/service/cfg/v1/ -maatCfg=configSources -fileUploadCfg=fileUploadSources -callbackCfg=commonSources -fileDigestCfg=fileDigestSources -configIdSources=configPzIdSources +httpUrl=http://10.0.7.14:9999/galaxy-service/service/cfg/ +maatCfg=v1/configSources +fileUploadCfg=v1/fileUploadSources +callbackCfg=v1/commonSources +fileDigestCfg=v1/fileDigestSources +configIdSources=v1/configPzIdSources #logBaseUrl=http://10.0.6.242:8080/galaxy-service/service/log/v1/ -logBaseUrl=http://192.168.10.204:9999/galaxy-service/service/log/v1/ -ntcPzReport=ntcPzReport -ntcServiceReport=ntcServiceReport -ntcTagReport=ntcTagReport -ntcAttrTypeReport=ntcAttrTypeReport -ntcLwhhReport=ntcLwhhReport -ntcSrcipDomesticReport=ntcSrcipDomesticReport -ntcDestipCountryReport=ntcDestipCountryReport -ntcEntranceReport=ntcEntranceReport -ntcIpLog=ntcIpLogs -ntcBgpLog=ntcBgpLogs -ntcP2pLog=ntcP2pLogs -ntcHttpLog=ntcHttpLogs -ntcDnsLog=ntcDnsLogs -ntcSslLog=ntcSslLogs -ntcPptpLog=ntcPptpLogs -ntcL2tpLog=ntcL2tpLogs -ntcOpenvpnLog=ntcOpenvpnLogs -ntcIpsecLog=ntcIpsecLogs -ntcSshLog=ntcSshLogs -ntcMailLog=ntcMailLogs -ntcFtpLog=ntcFtpLogs -ntcAppLog=ntcAppLogs -ntcDdosLog=ntcDdosLogs -dkBehaviorLog=ntcAppLogs -mmVoipLog=ntcVoipLogs -mmAvIpLog=mmAvIpLogs -mmAvUrlLog=mmAvUrlLogs -mmPicIpLog=mmPicIpLogs -mmPicUrlLog=mmPicUrlLogs -mmVoipIpLog=ntcVoipLogs -mmVoipAccountLog=mmVoipAccountLogs -mmSampleAudioLog=mmSampleAudioLogs -mmSampleVideoLog=mmSampleVideoLogs -mmPornAudioLevelLog=mmPornAudioLevelLogs -mmPornVideoLevelLog=mmPornVideoLevelLogs -mmSamplePicLog=mmSamplePicLogs -mmSampleVoipLog=mmSampleVoipLogs -pxyHttpLog=pxyHttpLogs -mmSpeakerRecognizationLog=mmSpeakerRecognizationLogs -mmLogoDetectionLog=mmLogoDetectionLogs -mmFaceRecognizationLog=mmFaceRecognizationLogs -trafficAreaStat=trafficAreaStat -logServiceTopn=logServiceTopn -blockAndDropStat=blockAndDropStat +logBaseUrl=http://10.0.7.14:9999/galaxy-service/service/log/ +ntcPzReport=v1/ntcPzReport +ntcServiceReport=v1/ntcServiceReport +ntcTagReport=v1/ntcTagReport +ntcAttrTypeReport=v1/ntcAttrTypeReport +ntcLwhhReport=v1/ntcLwhhReport +ntcSrcipDomesticReport=v1/ntcSrcipDomesticReport +ntcDestipCountryReport=v1/ntcDestipCountryReport +ntcEntranceReport=v1/ntcEntranceReport +ntcIpLog=v1/ntcIpLogs +ntcBgpLog=v1/ntcBgpLogs +ntcP2pLog=v1/ntcP2pLogs +ntcHttpLog=v1/ntcHttpLogs +ntcDnsLog=v1/ntcDnsLogs +ntcSslLog=v1/ntcSslLogs +ntcPptpLog=v1/ntcPptpLogs +ntcL2tpLog=v1/ntcL2tpLogs +ntcOpenvpnLog=v1/ntcOpenvpnLogs +ntcIpsecLog=v1/ntcIpsecLogs +ntcSshLog=v1/ntcSshLogs +ntcMailLog=v1/ntcMailLogs +ntcFtpLog=v1/ntcFtpLogs +ntcAppLog=v1/ntcAppLogs +ntcDdosLog=v1/ntcDdosLogs +dkBehaviorLog=v1/ntcAppLogs +mmVoipLog=v1/ntcVoipLogs +mmAvIpLog=v1/mmAvIpLogs +mmAvUrlLog=v1/mmAvUrlLogs +mmPicIpLog=v1/mmPicIpLogs +mmPicUrlLog=v1/mmPicUrlLogs +mmVoipIpLog=v1/ntcVoipLogs +mmVoipAccountLog=v1/mmVoipAccountLogs +mmSampleAudioLog=v1/mmSampleAudioLogs +mmSampleVideoLog=v1/mmSampleVideoLogs +mmPornAudioLevelLog=v1/mmPornAudioLevelLogs +mmPornVideoLevelLog=v1/mmPornVideoLevelLogs +mmSamplePicLog=v1/mmSamplePicLogs +mmSampleVoipLog=v1/mmSampleVoipLogs +pxyHttpLog=v1/pxyHttpLogs +mmSpeakerRecognizationLog=v1/mmSpeakerRecognizationLogs +mmLogoDetectionLog=v1/mmLogoDetectionLogs +mmFaceRecognizationLog=v1/mmFaceRecognizationLogs ######################################## #\u5927\u5c4f\u56fe\u8868\u5c55\u793a\u670d\u52a1\u63a5\u53e3 -dashboardUrl=http://192.168.10.204:9999/galaxy-service/service/log/v1/ -trafficIpActive=trafficIpActive -trafficProtocol=trafficProtocol -trafficApp=trafficApp -trafficOsList=trafficOsList -trafficBrowserChart=trafficBrowserChart -trafficBsList=trafficBsList -trafficSystemChart=trafficSystemChart -trafficWebsiteList=trafficWebsiteList -trafficWebTypeChart=trafficWebTypeChart -trafficPortActive=trafficPortActive -trafficTopicAndDomainChart=trafficTopicAndDomainChart -ntcTotalReport=ntcTotalReport -trafficIpActiveFiveMinute=trafficIpActiveFiveMinute -trafficIpActiveOneHour=trafficIpActiveOneHour +dashboardUrl=http://10.0.7.14:9999/galaxy-service/service/log/ +trafficIpActive=v1/trafficIpActive +trafficProtocol=v1/trafficProtocol +trafficApp=v1/trafficApp +trafficOsList=v1/trafficOsList +trafficBrowserChart=v1/trafficBrowserChart +trafficBsList=v1/trafficBsList +trafficSystemChart=v1/trafficSystemChart +trafficWebsiteList=v1/trafficWebsiteList +trafficWebTypeChart=v1/trafficWebTypeChart +trafficPortActive=v1/trafficPortActive +trafficTopicAndDomainChart=v1/trafficTopicAndDomainChart +ntcTotalReport=v1/ntcTotalReport +trafficIpActiveFiveMinute=v1/trafficIpActiveFiveMinute +trafficIpActiveOneHour=v1/trafficIpActiveOneHour client_connect_timeout=300000 client_read_timeout=300000 @@ -310,7 +307,7 @@ jdbc.hive.BName=xa_z2_mesalog_hive maxPageSize=100000 #\u5bfc\u51fa\u6700\u5927\u6761\u6570 -maxExportSize=100000 +maxExportSize=5000 #\u5141\u8bb8\u914d\u7f6e\u6700\u5927\u5c42\u7ea7 maxLevelNo=4 #\u4e0a\u4e0b\u7ea7\u663e\u793a\u95f4\u9694\u6807\u8bc6\u7b26 @@ -550,9 +547,9 @@ domain_regexp=^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA- maat_json_send_size=20000 #\u5bfc\u5165\u9a8c\u8bc1\u7684\u7ebf\u7a0b\u6570\u91cf mulity_thread_size=5 -ntcRadiusReport=ntcRadiusReport -ntcCollectVoipLog=ntcCollectVoipLogs -ntcKeywordsUrlLog=ntcKeywordsUrlLogs +ntcRadiusReport=v2/ntcRadiusReport +ntcCollectVoipLog=v1/ntcCollectVoipLogs +ntcKeywordsUrlLog=v1/ntcKeywordsUrlLogs save_and_del_thread_size=5 #mysql \u5355\u4e2asql\u5927\u5c0f\u9650\u5236,\u6839\u636emariadb\u76f8\u5173\u53c2\u6570\u914d\u7f6e max_allowed_packet=1048576 @@ -568,38 +565,50 @@ userPasswordSet=UserPasswordSet userDelete=UserDelete userGet=UserGet userList=UserList -ip_reuse_call_cgi_url=http://192.168.11.137:8090/command +ip_reuse_call_cgi_url=http://10.4.10.32:8090/command ipNumGet=IpNumGet allIpGet=AllIpGet #\u6d41\u91cf\u7edf\u8ba1\u5e26\u5bbd\u8be6\u60c5 -trafficBandwidthTrans=trafficBandwidthTrans -trafficProtocolList=trafficProtocolList +trafficBandwidthTrans=v1/trafficBandwidthTrans +trafficProtocolList=v1/trafficProtocolList irSnatLog=irSnatLogs irDnatLog=irDnatLogs -trafficBandwidthTrans=trafficBandwidthTrans -trafficProtocolList=trafficProtocolList -trafficAppList=trafficAppList -ntcActionEntranceReport=ntcActionEntranceReport -redis.host=192.168.10.192:6379 +trafficBandwidthTransv1/=trafficBandwidthTrans +trafficProtocolList=v1/trafficProtocolList +trafficAppList=v1/trafficAppList +ntcActionEntranceReport=v1/ntcActionEntranceReport +redis.host=10.0.4.2:6379 redis.expire=1800 redis.timeout=10000 dns_spoofing_ip_desc=Default Spoofing IP dns_spoofing_ip_ip=1.1.1.1 -trafficBandwidthTransTwo=trafficBandwidthTransTwo -trafficBandwidthTransThree=trafficBandwidthTransThree -trafficBandwidthTransFour=trafficBandwidthTransFour -ntcCollectRadiusLog=ntcCollectRadiusLogs -ntcConnRecordLog=ntcConnRecordLogs -ntcConnRecordPercent=ntcConnRecordPercent +trafficBandwidthTransTwo=v1/trafficBandwidthTransTwo +trafficBandwidthTransThree=v1/trafficBandwidthTransThree +trafficBandwidthTransFour=v1/trafficBandwidthTransFour +ntcCollectRadiusLog=v1/ntcCollectRadiusLogs +ntcConnRecordLog=v1/ntcConnRecordLogs +ntcConnRecordPercent=v1/ntcConnRecordPercent #\u5bfc\u51fa\u6700\u5927\u6761\u6570 maxLogExportSize=2000 pxy_crtl_subscribe_id_region=PXY_CTRL_SUBSCRIBE_ID ntc_subscribe_id_region=NTC_SUBSCRIBE_ID -ntcAsnRecord=ntcAsnRecord -ntcURLReport=ntcURLReport -ntcIpRangeReport=ntcIpRangeReport -trafficWebsiteListNoTime=trafficWebsiteListNoTime -trafficTopicList=trafficTopicList -trafficDomainTrans=trafficDomainTrans +ntcAsnRecord=v1/ntcAsnRecord +ntcURLReport=v1/ntcURLReport +ntcIpRangeReport=v1/ntcIpRangeReport +trafficWebsiteListNoTime=v1/trafficWebsiteListNoTime +trafficTopicList=v1/trafficTopicList +trafficDomainTrans=v1/trafficDomainTrans #maximum number to import -import_limit=10 \ No newline at end of file +import_limit=10 +trafficPortActiveFiveMinute=v1/trafficPortActiveFiveMinute +trendTotalReport=v1/trendTotalReport +#\u4e8b\u4ef6\u76d1\u6d4b/\u5c01\u5835 +ntcEventsMonitorOrBlock=v1/ntcEventsMonitorOrBlock +#\u91cd\u70b9\u4fdd\u969c\u4e8b\u4ef6 +ntcEventKeyProtection=v1/ntcEventKeyProtection +dashboardUrlV2=http://10.0.7.14:9999/galaxy-service/service/log/v2/ +trafficAreaStat=v1/trafficAreaStat +logServiceTopn=v1/logServiceTopn +blockAndDropStat=v1/blockAndDropStat +#配置启停接口 +configStartStop=v2/configStartStop \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index b4ec2e83d..0592efb96 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -26,27 +26,27 @@ - + - + - + - + - + @@ -400,7 +400,7 @@ function cancelPassOpt(url){ return flag; } //导出 - function exportData(url,maxRow,searchUrl){ + function exportData(url,maxRow,searchUrl,exType){ var column=[]; var hColumn=[]; //隐藏列名 $("#${id} ${value} thead tr th").each(function(){ @@ -428,7 +428,7 @@ function cancelPassOpt(url){ //导出检索条件下所有数据 }else{ var totalCount = $("#showTotalCount").html() == undefined ? '' : $("#showTotalCount").html().trim(); - if (!confirmEnding(url,"excel")&&!confirmEnding(url,"csv")) { + if (exType!='log') { if(totalCount > maxRow){ top.$.jBox.confirm(""+maxRow+"!","",function(v,h,f){ if(v=="ok"){ @@ -453,12 +453,5 @@ function cancelPassOpt(url){ } } - function confirmEnding(str, target) { - var result=true; - var num=str.indexOf(target); - if (-1==num) { - result=false; - } - return result; - } + \ No newline at end of file