From ba3aeb199f823f394897fdb3033b7c2d7799c595 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 22 Feb 2019 11:08:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1app?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B6=8B=E5=8A=BF=E7=BB=9F=E8=AE=A1=E5=9B=BE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0Gbps=E3=80=81PPS=E5=8D=95=E4=BD=8D=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=AF=BC=E5=87=BA=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=A2=9E=E5=8A=A0=E6=A0=87=E9=A2=98=E4=B8=8E=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Conflicts: src/main/resources/nis.properties --- src/main/java/com/nis/util/Constants.java | 3 + .../TrafficStatisticsInfoController.java | 13 +- src/main/resources/nis.properties | 628 ++++++++++++++++ .../views/dashboard/trafficAppTrendList.jsp | 674 ++++++++++++++---- 4 files changed, 1172 insertions(+), 146 deletions(-) diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 177a8944f..2a50e3833 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -719,6 +719,9 @@ public final class Constants { public static final String TREND_TOTAL_REPORT=Configurations.getStringProperty("trendTotalReport","trendTotalReport"); public static final String TRAFFIC_APP_TREND=Configurations.getStringProperty("trafficAppTrend","trafficAppTrend"); public static final String APPCONN_RECORD_TOP100=Configurations.getStringProperty("appConnRecordTop100","appConnRecordTop100"); + public static final String TRAFFIC_APP_PPS_TREND=Configurations.getStringProperty("trafficAppPpsTrend","trafficAppPpsTrend"); + public static final String TRAFFIC_APP_BPS_TREND=Configurations.getStringProperty("trafficAppBpsTrend","trafficAppBpsTrend"); + /** * httpclient 工具超时时间设置 */ diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java index 45804829d..4c4ce263a 100644 --- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java +++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java @@ -481,11 +481,20 @@ public class TrafficStatisticsInfoController extends BaseController { } @RequestMapping("ajaxAppTrend") @ResponseBody - public Map ajaxAppTrend(String beginDate,String endDate,Integer appType,Integer entranceId,Integer[] searchIspCode,Model model){ + public Map ajaxAppTrend(String beginDate,String endDate,Integer appType,Integer entranceId,String searchQuotaType,Integer[] searchIspCode,Model model){ Map fromJsonList = new HashMap(); Map list = new HashMap(); try { - String url=Constants.DASHBOARD_URL+Constants.TRAFFIC_APP_TREND; + //TRAFFIC_APP_PPS_TREND + String trafficApp=Constants.TRAFFIC_APP_TREND; + if("Unique Ip".equals(searchQuotaType)){ + trafficApp=Constants.TRAFFIC_APP_TREND; + }else if("Gbps".equals(searchQuotaType)){ + trafficApp=Constants.TRAFFIC_APP_BPS_TREND; + }else if("pps".equals(searchQuotaType)){ + trafficApp=Constants.TRAFFIC_APP_PPS_TREND; + } + String url=Constants.DASHBOARD_URL+trafficApp; URIBuilder uriBuilder = new URIBuilder(url); uriBuilder.addParameter("searchStartTime",beginDate); uriBuilder.addParameter("searchEndTime",endDate); diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 77cd7c1a7..856343ee8 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -1,3 +1,4 @@ +<<<<<<< develop_no_common_group #\u7ba1\u7406\u57fa\u7840\u8def\u5f84, \u9700\u540c\u6b65\u4fee\u6539\uff1aweb.xml adminPath=/nis @@ -618,3 +619,630 @@ appConnRecordTop100=v1/appConnRecordTop100 ntcSslRecordLog=v1/ntcSslRecordLogs #Http\u6cdb\u6536 ntcHttpRecordLog=v1/ntcHttpRecordLogs +======= +#\u7ba1\u7406\u57fa\u7840\u8def\u5f84, \u9700\u540c\u6b65\u4fee\u6539\uff1aweb.xml +adminPath=/nis + +#Restful\u670d\u52a1\u9ed8\u8ba4\u8def\u5f84\ufffd +servicePath=/service + +#\u5206\u9875\u914d\u7f6e +page.pageSize=20 +#\u5206\u9875\u914d\u7f6e +page.count=0 + +#\u7d22\u5f15\u9875\u8def\u5f84 +web.view.index=/nis/index + +#\u7f13\u5b58\u8bbe\u7f6e +ehcache.configFile=cache/ehcache-local.xml +#ehcache.configFile=cache/ehcache-rmi.xml + +#\u4f1a\u8bdd\u8d85\u65f6\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c 20m=1200000ms, 30m=1800000ms, 60m=3600000ms +session.sessionTimeout=1800000 +#\u4f1a\u8bdd\u6e05\u7406\u95f4\u9694\u65f6\u95f4\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c2m=120000ms\u3002 +session.sessionTimeoutClean=120000 + +#\u9759\u6001\u6587\u4ef6\u540e\u7f00 +web.staticFile=.css,.js,.png,.jpg,.gif,.jpeg,.bmp,.ico,.swf,.psd,.htc,.htm,.html,.crx,.xpi,.exe,.ipa,.apk + +#\u7f51\u7ad9URL\u540e\u7f00 +urlSuffix=.jsp + +#\u89c6\u56fe\u6587\u4ef6\u5b58\u653e\u8def\u5f84 +web.view.prefix=/WEB-INF/views/ +web.view.suffix=.jsp + +#\u662f\u5426\u4e0d\u5141\u8bb8\u5237\u65b0\u4e3b\u9875\uff0c\u4e0d\u5141\u8bb8\u60c5\u51b5\u4e0b\uff0c\u5237\u65b0\u4e3b\u9875\u4f1a\u5bfc\u81f4\u91cd\u65b0\u767b\u5f55 +notAllowRefreshIndex=false + +#\u524d\u7aef\u57fa\u7840\u8def\u5f84 +frontPath=/f + +#\u662f\u5426\u8fd0\u884c\u591a\u8d26\u6237\u540c\u65f6\u767b\u5f55? +user.multiAccountLogin=true + +#\u7855\u6b63\u7ec4\u4ef6\u662f\u5426\u4f7f\u7528\u7f13\u5b58 +supcan.useCache=false + +#\u901a\u77e5\u95f4\u9694\u65f6\u95f4\u8bbe\u7f6e, \u5355\u4f4d\uff1a\u6beb\u79d2, 30s=30000ms, 60s=60000ms +work.notify.remind.interval=60000 + + +#============================# +#===== System settings ======# +#============================# + +#\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e +productName=National Traffic Control System +copyrightYear=2015 +version=V1.0.0 + + +#\u4e0a\u4f20\u6587\u4ef6\u7edd\u5bf9\u8def\u5f84, \u8def\u5f84\u4e2d\u4e0d\u5141\u8bb8\u5305\u542b\u201cuserfiles\u201d +userfiles.basedir=upload + + +#============================# +#===== webservice settings ======# +#============================# + +#ESB\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u1e69\ufffd\ufffd\u0373\u04bb\ufffd\ufffd\u05b7 +webservice.esb.endpoint=http://10.55.0.197:7879/TongServiceProxy_doprocess/services/WebService1/ +#webservice RID +webservice.rid=XFBL + +#webservice user SID +webservice.yh.sid=s_2016_x2000 + +#webservice office SID +webservice.jg.sid=s_2015_x2000 + +#webservice data dict SID +webservice.data.dict.sid=s_2031_x2000 + +#webservice data dict bm SID +webservice.data.dict.bm.sid=s_2032_x2000 + +#webservice data dict code SID +webservice.data.dict.code.sid=s_2042_0660BD17-35E4-4482-AA3A-556F2C024902 + +#webservice request timeout for seconds +webservice.request.timeout=30 + +#\ufffd\ufffd\ufffd\ufffd\ufffdURL +webservice.jg.service.url=http://10.55.0.155:8080/jgService + +#\ufffd\u00fb\ufffd\ufffd\ufffd\ufffd\ufffdURL +webservice.yh.service.url=http://10.55.0.155:8080/ryService + +#\ufffd\ufffd\ufffd\ufffd\u05b5\ufffdURL +webservice.data.dict.service.url=http://10.55.0.155:8080/sjzdService + +#\ufffd\ufffd\ufffd\ufffd\u05b5\ufffd\ufffd\ufffd\ufffdURL +webservice.data.dict.bm.url=http://10.55.0.155:8080/sjzdbmService + +#\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdURL +webservice.data.code.url=http://10.55.0.155:8080/sjmbService + +#webservice\ufffd\u04ff\ufffd\ufffd\ufffd\ufffd\u00ff\u04b3\ufffd\ufffd\ufffd\ufffd +webservice.data.pagesize = 2000 +#webservice\ufffd\ufffd\u01f0\u012c\ufffd\ufffd\u04b3 +webservice.data.currentpage = 1 + +#webservice \ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd +webservice.jgmb.name=CK_T_JC_RY +#webservice \ufffd\u00fb\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd +webservice.yhmb.name=CK_T_YH_RY +#webservice\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd \u022b\ufffd\ufffd +webservice.method.name.ql=getData +# webservice\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd\ufffd\ufffd +webservice.method.name.zl=getDataZL + +# redis\u914d\u7f6e\u6587\u4ef6 +#redis \u5404\u4e2a\u5206\u7247\u7684 IP\u7aef\u53e3 +redis.cluster.host_port=10.0.6.32:6379,10.0.6.32:6380,10.0.6.32:6381,10.0.6.33:6379,10.0.6.33:6380,10.0.6.33:6381 + + +#\u4e2d\u5fc3\u73b0\u573aredis\u5730\u5740\u548c\u7aef\u53e3 +#redis.cluster.host_port=10.174.196.33:6379,10.174.196.33:6380,10.174.196.33:6381,10.174.196.34:6379,10.174.196.34:6380,10.174.196.34:6381,10.174.196.35:6379,10.174.196.35:6380,10.174.196.35:6381,10.174.196.36:6379,10.174.196.36:6380,10.174.196.36:6381,10.174.196.37:6379,10.174.196.37:6380,10.174.196.37:6381,10.174.196.38:6379,10.174.196.38:6380,10.174.196.38:6381,10.174.196.39:6379,10.174.196.39:6380,10.174.196.39:6381 + +redis.cluster.connectiontimeout=5000 +redis.cluster.sotimeout=5000 +redis.cluster.maxattempts=3 +#redis\u8fde\u63a5\u6c60\u76f8\u5173\u914d\u7f6e + +redis.pool.maxtotal=500 + +redis.pool.maxidle=500 +redis.pool.maxwaitmillis=-1 +redis.pool.blockwhenexhausted=true +redis.pool.numtestsperevictionrun=60000 +redis.pool.testonborrow=true +redis.pool.testonreturn=false +redis.pool.testwhileidle=true +redis.pool.timebetweenevictionrunsmillis=60000 +redis.pool.minevictableidletimemillis=60000 +#oracle\u6570\u636eredis\u5b58\u50a8\u65f6\u95f4(\u79d2\u4e3a\u5355\u4f4d \u9ed8\u8ba43\u5206\u949f\u5373180s) +oracleExpire=180 +#hive\u6570\u636e\u4e2d\u5fc3\u6570\u636eredis\u5b58\u50a8\u65f6\u95f4(\u79d2\u4e3a\u5355\u4f4d \u9ed8\u8ba420\u5206\u949f\u53731200s) +hiveExpire=300 +#redis\u5f00\u5173 +isOpenRedis=false +#\u662f\u5426\u5c06\u6570\u636e\u4e2d\u5fc3\u7684\u65e5\u5fd7\u52a0\u5165\u5230redis\u4e2d +dataCenterOpenRedis=true +#\u8de8\u57df\u95ee\u9898\u5141\u8bb8 \u7684url Access-Control-Allow-Origin *\u5141\u8bb8\u6240\u6709\uff0c\u8bbe\u7f6e\u6210\u5176\u4ed6url\u53ea\u5141\u8bb8\u8be5url.\u4e0d\u80fd\u8bbe\u7f6e\u591a\u4e2aurl +target_url=* +#\u8de8\u57df\u95ee\u9898 3600\uff1a\u8868\u660e\u57283600\u79d2\u5185\uff0c\u4e0d\u9700\u8981\u518d\u53d1\u9001\u9884\u8bf7\u6c42\uff0c\u53ef\u4ee5\u7f13\u5b58\u8be5\u7ed3\u679c +ACCESS_CONTROL_MAX_AGE=3600 +##########HTTPCLIENT POOL START################### +#\u4ece\u8fde\u63a5\u6c60\u4e2d\u83b7\u53d6\u5230\u8fde\u63a5\u7684\u6700\u957f\u65f6\u95f4 +http.request.connectionRequestTimeout=500 +#5000 +http.request.connectTimeout=5000 +#\u6570\u636e\u4f20\u8f93\u7684\u6700\u957f\u65f6\u95f4 +http.request.socketTimeout=30000 +#\u63d0\u4ea4\u8bf7\u6c42\u524d\u6d4b\u8bd5\u8fde\u63a5\u662f\u5426\u53ef\u7528 +http.request.staleConnectionCheckEnabled=true + +#\u8bbe\u7f6e\u8fde\u63a5\u603b\u6570 +http.pool.maxTotal=200 +#\u8bbe\u7f6e\u6bcf\u4e2a\u5730\u5740\u7684\u5e76\u53d1\u6570 +http.pool.defaultMaxPerRoute=100 +##########HTTPCLIENT POOL END################### +search.dateformat=yyyy-MM-dd HH:mm:ss +search.eshostandport_A=10.0.6.115:9200 +search.eshostandport_B=10.0.6.115:9200 +search.eshostandport_C=10.0.6.115:9200 + +#search.eshostandport=10.174.196.135:9200 + + +#\u65e5\u5fd7\u662f\u5426\u4ecehive\u4e2d\u67e5\u8be2 +selFromHive=false + +#\u662f\u5426\u83b7\u53d6\u6570\u636e\u4e2d\u5fc3\u67e5\u8be2\u8bb0\u5f55\u7684\u603b\u6761\u6570 +isGetHiveCount=false + +#\u6bcf\u6b21\u83b7\u53d6\u6570\u636e\u4e2d\u5fc3\u591a\u5c11\u6761\u6570\u636e,\u54b1\u4eec\u5728\u5bf9\u83b7\u53d6\u7684\u6570\u636e\u8fdb\u884c\u5206\u9875\u5904\u7406 +everyGetHiveDataNum=10000 + +#oracle\u6570\u636e\u5e93\u6709\u95ee\u9898\u4e0d\u4eceoracle\u67e5\u8be2\u6570\u636e,\u6240\u6709\u65e5\u5fd7\u6570\u636e\u5747\u4ece\u6570\u636e\u4e2d\u5fc3\u67e5\u8be2 +onlySelFromHive=false + +#\u662f\u5426\u67e5\u8be2\u795e\u901a\u6570\u636e\u5e93 +isSelectCluster=true + +#\u7528\u6237\u67e5\u8be2\u65e5\u5fd7\u8d85\u8fc7\u591a\u5c11\u5c0f\u65f6\u53bb\u6570\u636e\u4e2d\u5fc3\u67e5\u8be2 +dataCenterTime=48 + +#\u662f\u5426\u5f00\u542f\u57fa\u7840\u9a8c\u8bc1 +baseValidate=true + +#\u662f\u5426\u5f00\u542f\u4e1a\u52a1\u9a8c\u8bc1 +serviceValidate=true + + + +#\u65e5\u5fd7\u5b58\u50a8\u672c\u5730\u65f6\u95f4(\u5355\u4f4d\u5c0f\u65f6) +logLocalTime=48 +#\u5b9e\u65f6\u7edf\u8ba1\u9ed8\u8ba4\u67e5\u8be2\u672c\u5730\u4e00\u4e2a\u5c0f\u65f6\u7684\u6570\u636e(\u5355\u4f4d\uff1a\u5c0f\u65f6) +reportLocalTime=1 + +#\u795e\u901a\u6570\u636e\u5e93\u6700\u65e9\u65e5\u5fd7\u65f6\u95f4(A\u7248\u6beb\u79d2) +#2017-08-13 10:07:25 +clusterAStartTime=1503504000725 +#\u795e\u901a\u6570\u636e\u5e93\u6700\u65e9\u7ed3\u675f\u65f6\u95f4(B\u7248\u6beb\u79d2) +#2017-08-13 10:07:25 +clusterBStartTime=1503504000725 +############################################################################################################################################ +#\u8bbe\u7f6e\u914d\u7f6e\u662f\u5426\u5165\u5e93 +############################################################################################################################################ +isCommit=true +############################################################################################################################################ +############################################################################################################################################ +httpUrl=http://192.168.10.204: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/ +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.11.64:8080/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 +log_time_interval=300000 +logsearch_menu_id=152 +#use elasticsearch or not# +isUseES=false + +#httpclient \u5de5\u5177\u8bbe\u7f6e\u8d85\u65f6\u65f6\u95f4 +http_socket_timeout=300000 +http_connect_timeout=10000 +http_connect_request_timeout=50000 +http_connect_retry_times=3 + + +#\u6570\u636e\u4e2d\u5fc3A\u7248\u6570\u636e\u5e93\u540d\u79f0,\u7a0b\u5e8f\u4e2d\u6bcf\u6b21\u67e5\u8be2\u65f6\u4f7f\u7528\u7684\u6570\u636e\u5e93\u540d\u79f0 use dbA +jdbc.hive.AName=xa_dfbhit_hive +#\u6570\u636e\u4e2d\u5fc3B\u7248\u6570\u636e\u5e93\u540d\u79f0 +jdbc.hive.BName=xa_z2_mesalog_hive + +maxPageSize=100000 +#\u5bfc\u51fa\u6700\u5927\u6761\u6570 +maxExportSize=5000 +#\u5141\u8bb8\u914d\u7f6e\u6700\u5927\u5c42\u7ea7 +maxLevelNo=4 +#\u4e0a\u4e0b\u7ea7\u663e\u793a\u95f4\u9694\u6807\u8bc6\u7b26 +childrenMark=. +#\u4e1a\u52a1\u5b57\u5178\u5728\u8bcd\u5178\u4e2d\u7684\u6807\u8bc6 +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=NTC_UNIVERSAL_IP +http_req_hdr_region=NTC_HTTP_REQ_HDR +http_req_body_region=NTC_HTTP_REQ_BODY +http_res_hdr_region=NTC_HTTP_RES_HDR +http_res_body_region=NTC_HTTP_RES_BODY +ntc_subscribe_id=NTC_SUBSCRIBE_ID +http_url_region=NTC_HTTP_URL +http_redirect_url_region=PXY_CTRL_HTTP_URL +http_redirect_req_hdr_region=PXY_CTRL_HTTP_REQ_HDR +http_redirect_res_hdr_region=PXY_CTRL_HTTP_RES_HDR +http_redirect_req_body_region=PXY_CTRL_HTTP_REQ_BODY +http_redirect_res_body_region=PXY_CTRL_HTTP_RES_BODY +http_redirect_ip_region=PXY_CTRL_IP +p2p_hash_bin_region=NTC_P2P_HASH_BIN +p2p_keywords_region=NTC_P2P_KEYWORDS +voip_ip=av_voip_ip +voip_account=av_voip_account +ssl_sni_region=ssl_sni +ssl_san_region=ssl_san +ssl_ca_region=ssl_ca +ssl_ip_region=ssl_ip +bgp_ip_region=bgp_ip +behav_id_region=BEHAV_ID +rate_limit_region=Droprate +#\u5b58\u5728\u4e0e\u8868\u8fbe\u5f0f\u7684\u5173\u952e\u5b57\u7279\u6b8a\u5206\u9694\u7b26 +keyword_expr=***and*** +#\u65f6\u533a +time_zone=8 +#\u9700\u8981\u7279\u6b8a\u5904\u7406\u7684\u4e1a\u52a1\u7c7b\u578b +service_pxy_domain_intercept=513 +service_ip_mulitiplex=768 +service_ip_ratelimit=1057 +service_domain_ratelimit=1058 +#\u7528\u6237\u81ea\u5b9a\u4e49\u57df +userregion_rate_limit=Droprate +userregion_ir_strategy=IR_STRATEGY +userregion_ir_type=IR_TYPE +userregion_domain_id=DOMAIN_ID +userregion_domain_str=DOMAIN_STR +userregion_replace_type_key=zone +userregion_replace_req_key_value=http_req_body +userregion_replace_res_key_value=http_res_body +userregion_replace_regex_key=regex +#\u7528\u6237\u81ea\u5b9a\u4e49\u57df\u5360\u4f4d\u7b26 +user_region_placeholder=0 +#\u7528\u6237\u81ea\u5b9a\u4e49\u57df\u5206\u9694\u7b26 +user_region_split=; +#IP\u76f8\u5173\u9a8c\u8bc1\u6b63\u5219 +ipv4_ip_subnet_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|1[6-9]|2[0-9])$ +ipv6_ip_subnet_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))/([2-9]|[1-9][0-9]|1[0-2][0-8])$ +ipv4_ip_range_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)-(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$ +ipv6_ip_range_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))-((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))$ +ipv4_ip_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$ +ipv6_ip_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))$ +#\u91cd\u5b9a\u5411\u4e1a\u52a1\u81ea\u5b9a\u4e49\u57df\u76f8\u5173\u53c2\u6570 +redirect_response_code_key=code +redirect_url_key=url +redirect_content_key=content +redirect_response_code_startwith=30 +replace_zone_key=zone +replace_substitute_key=substitute +#\u6837\u4f8b\u6587\u4ef6\u4e0a\u4f20\u7684uri\u5173\u952e\u8bcd +sample_upload_url_keyword=/av +digest_upload_url_keyword=/filetransfer +cert_upload_url_keyword=/intercept/strateagy + +#sample File Size 100M +sample_total_file_max_size=104857600 +#audio File Types +audio_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,wav,mp3, +#audio File Size 100M 10485760\uff08single\uff09 +audio_single_file_max_size=0 +#speaker File Types \u8bf4\u8bdd\u4eba\u8bc6\u522b\u6587\u4ef6\u7c7b\u578b +speaker_file_type= +#audio File Size 100M 10485760\uff08single\uff09 +speaker_single_file_max_size=0 +#video File Types +video_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv, +#video File Size 10M 10485760\uff08single\uff09 +video_single_file_max_size=0 +#face File Types \u4eba\u8138\u8bc6\u522b +face_file_type= +#face File Size 10M 10485760\uff08single\uff09 +face_single_file_max_size=0 +#picture File Types +picture_file_type= +#picture File Size 100M 10485760\uff08single\uff09 +picture_single_file_max_size=104857600 +#logo File Types \u53f0\u6807\u8bc6\u522b +logo_file_type= +#logo File Size 100M 10485760\uff08single\uff09 +logo_single_file_max_size=104857600 +#voip File Types +voip_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,wav,mp3, +#voip File Size 10M 10485760\uff08single\uff09 +voip_single_file_max_size=0 + +#digest File Types +digest_file_type= +#digest File Size 100M 10485760\uff08single\uff09 +digest_single_file_max_size=104857600 +#digest File Size 100M 12582912\uff08total\uff09 +digest_total_file_max_size=104857600 +#cert File Size 100M 12582912\uff08total\uff09 +cert_total_file_max_size=104857600 +#public File Types +public_file_type= +#public File Size 100M 10485760\uff08single\uff09 +public_single_file_max_size=104857600 +#private File Types +private_file_type= +#private File Size 100M 10485760\uff08single\uff09 +private_single_file_max_size=104857600 +#YSP\u6587\u4ef6\u4fdd\u5b58\u8def\u5f84 +av_file_path=/home/ysp/ +#av_file_path=D\:\\ysp\\ +#YSP\u6587\u4ef6\u7279\u5f81\u7c7b\u578b +av_sample_audio_region=av_sample_audio +av_sample_video_region=av_sample_video +av_sample_picture_region=av_sample_picture +av_sample_voip_region=av_sample_voip +mm_speaker_recognization_region=MM_SPEAKER_RECOGNIZATION +mm_logo_detection_region=MM_LOGO_DETECTION +mm_face_recognization_region=MM_FACE_RECOGNIZATION + +#\u6837\u4f8b\u6587\u4ef6\u751f\u6210\u7a0b\u5e8f +audio_sample_create_proc=/home/ceiec/av_feature_gen/audio_convert_proc +video_sample_create_proc=/home/ceiec/av_feature_gen/extract_frame_feature +picture_sample_create_proc=/home/ceiec/av_feature_gen/picture_convert_proc +speaker_sample_create_proc=java -jar /home/sampleTest.jar +logo_sample_create_proc=/home/ceiec/av_feature_gen/logo_convert_proc +face_sample_create_proc=/home/ceiec/av_feature_gen/face_convert_proc +audio_sample_proc_param_is_quotation=true +video_sample_proc_param_is_quotation=true +picture_sample_proc_param_is_quotation=true +speaker_sample_proc_param_is_quotation=true +logo_sample_proc_param_is_quotation=true +face_sample_proc_param_is_quotation=true +audio_sample_proc_param_is_translation=false +video_sample_proc_param_is_translation=false +picture_sample_proc_param_is_translation=false +speaker_sample_proc_param_is_translation=false +logo_sample_proc_param_is_translation=false +face_sample_proc_param_is_translation=false +#\u672c\u5730\u6d4b\u8bd5 +#audio_sample_create_proc=java -jar D\:\\sampleTest.jar +#video_sample_create_proc=java -jar D\:\\sampleTest.jar +#picture_sample_create_proc=java -jar D\:\\sampleTest.jar +#speaker_sample_create_proc=java -jar D\:\\sampleTest.jar +#logo_sample_create_proc=java -jar D\:\\sampleTest.jar +#face_sample_create_proc=java -jar D\:\\sampleTest.jar +#audio_sample_proc_param_is_quotation=false +#video_sample_proc_param_is_quotation=false +#picture_sample_proc_param_is_quotation=false +#speaker_sample_proc_param_is_quotation=false +#logo_sample_proc_param_is_quotation=false +#face_sample_proc_param_is_quotation=false +#audio_sample_proc_param_is_translation=true +#video_sample_proc_param_is_translation=true +#picture_sample_proc_param_is_translation=true +#speaker_sample_proc_param_is_translation=true +#logo_sample_proc_param_is_translation=true +#face_sample_proc_param_is_translation=true +#http\u81ea\u5b9a\u4e49\u57df\u76f8\u5173\u53c2\u6570 +http_header_user_region_key=HTTP_HEADER +http_header_dict_module=HTTP_HEADER_DISTRICT +#dns\u81ea\u5b9a\u4e49\u57df\u53c2\u6570key +dns_strategy_user_region_key=DNS_STRATEGY +#p2p\u81ea\u5b9a\u4e49\u57dfkey +p2p_ip_type_user_region_key=P2P_IP_TYPE +p2p_hash_type_user_region_key=P2P_HASH_TYPE +#\u7279\u5b9a\u670d\u52a1\u7c7b\u522b +specific_service_cfg_type_app=social_app +specific_service_cfg_type_encrypted_tunnel_behavior=encrypted_tunnel_behavior +specific_service_cfg_type_basic_protocol=basic_protocol +#\u57fa\u7840\u534f\u8bae\u81ea\u5b9a\u4e49\u57df +proto_id_region=PROTO_ID +#\u62e6\u622aIP\u81ea\u5b9a\u4e49\u57dfkey +keyring_id=keyring_id +droprate=Droprate +bandwidth=Bandwidth +intercept_domain_intensity=DOMAIN_INTENSITY +#IP\u9ed8\u8ba4\u503c +ipv4_default_ip_value=0.0.0.0 +ipv6_default_ip_value=\:\: +ipv4_default_ip_subnet_value=0.0.0.0/16 +ipv6_default_ip_subnet_value=::/128 +ipv4_default_ip_range_value=0.0.0.0-1 +ipv6_default_ip_range_value=::-:: +#\u7aef\u53e3\u9ed8\u8ba4\u503c +port_default=0 +port_mask_default=0/65535 +#MAAT CFG \u4e00\u4e9b\u9ed8\u8ba4\u503c +maat_cfg_dolog_default=2 +maat_cfg_dolog_doblacklist_default=1 +maat_cfg_dolog_configpercent_default=100 +maat_cfg_dolog_configoption_default=1 +#app\uff0c\u57fa\u7840\u534f\u8bae\uff0c\u7279\u5b9a\u670d\u52a1\u7684userregion\u5206\u9694\u7b26 +app_cfg_userregion_splitor=& +app_id_region=APP_ID +#application spec service code scope +app_spec_service_code_max_val=310000 +app_spec_service_code_min_val=300001 +groupReuseSources=v1/groupReuseSources +log_time_range=300000 +log_time_start=2018-08-01 00:00:00 +log_time_end=2018-10-01 00:00:00 +area_tag=location +isp_tag=isp +mmFileDigestLog=v1/mmFileDigestLogs +ntcStreamMediaLog=v1/ntcStreamMediaLogs +#\u97f3\u89c6\u9891\u6837\u4f8b\u9650\u5236\u65f6\u957f\uff0c\u5355\u4f4d\u79d2 +av_duration_limit=120 +video_to_picture_proc=/home/ceiec/av_feature_gen/save_video_frame +#\u8bc1\u4e66\u6587\u4ef6\u8def\u5f84 +cert_file_path=/home/cert/ +#\u8bc1\u4e66\u6821\u9a8c\u5de5\u5177\u540d\u79f0 +cert_validate_file=x509 +#\u8bc1\u4e66\u6821\u9a8c\u6210\u529f\u7684\u5173\u952e\u4fe1\u606f +cert_validate_success_info=Successful +#ipv4 range\u65b0\u683c\u5f0f0.0.0.1-2 +ipv4_ip_range_regexp_new=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)-(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$ +ipv4_ip_subnet_regexp_original=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|1[0-9]|2[0-9]|[0-9])$ +#\u57df\u540d\u9a8c\u8bc1\u6b63\u5219 +domain_regexp=^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$ +#IP\u590d\u7528maat json\u4e2d\u7684ip region\u5355\u6b21send \u6700\u5927\u4e2a\u6570 +maat_json_send_size=20000 +#\u5bfc\u5165\u9a8c\u8bc1\u7684\u7ebf\u7a0b\u6570\u91cf +mulity_thread_size=5 +ntcRadiusReport=v2/ntcRadiusReport +ntcCollectVoipLog=v1/ntcCollectVoipLogs +ntcKeywordsUrlLog=v1/ntcKeywordsUrlLogs +save_and_del_thread_size=20 +#mysql \u5355\u4e2asql\u5927\u5c0f\u9650\u5236,\u6839\u636emariadb\u76f8\u5173\u53c2\u6570\u914d\u7f6e +max_allowed_packet=1048576 +#http client\u8fde\u63a5\u6c60\u76f8\u5173\u53c2\u6570\uff0chttp_max_connection:\u6700\u5927\u8fde\u63a5\u6570\uff0cdefault_max_perroute:\u6bcf\u4e2a\u4e3b\u673a\u5730\u5740\u7684\u5e76\u53d1\u6570\uff0cpoolcm_socket_timeout:socket\u8d85\u65f6\u65f6\u95f4 +http_max_connection=1000 +default_max_perroute=100 +poolcm_socket_timeout=3000 +app_vignore_user_region_key=DKC +#policies\u83dc\u5355\u7684\u83dc\u5355ID +policies_menu_id=86 +userCreate=UserCreate +userPasswordSet=UserPasswordSet +userDelete=UserDelete +userGet=UserGet +userList=UserList +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=v1/trafficBandwidthTrans +trafficProtocolList=v1/trafficProtocolList +irSnatLog=v1/irSnatLogs +irDnatLog=v1/irDnatLogs +trafficBandwidthTrans=v1/trafficBandwidthTrans +trafficProtocolList=v1/trafficProtocolList +trafficAppList=v1/trafficAppList +ntcActionEntranceReport=v1/ntcActionEntranceReport +redis.host=192.168.10.192:6379 +redis.expire=1800 +redis.timeout=10000 +dns_spoofing_ip_desc=Default Spoofing IP +dns_spoofing_ip_ip=1.1.1.1 +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=v1/ntcAsnRecord +ntcURLReport=v1/ntcURLReport +ntcIpRangeReport=v1/ntcIpRangeReport +trafficWebsiteListNoTime=v1/trafficWebsiteListNoTime +trafficTopicList=v1/trafficTopicList +trafficDomainTrans=v1/trafficDomainTrans +#maximum number to import +import_limit=10000 +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://192.168.10.204:9999/galaxy-service/service/log/v2/ +trafficAreaStat=v1/trafficAreaStat +logServiceTopn=v1/logServiceTopn +blockAndDropStat=v1/blockAndDropStat +#\u914d\u7f6e\u542f\u505c\u63a5\u53e3 +configStartStop=v2/configStartStop +trafficAppTrend=v1/trafficAppTrend +appConnRecordTop100=v1/appConnRecordTop100 +#SSL\u6cdb\u6536 +ntcSslRecordLog=v1/ntcSslRecordLogs +ntc_asn_number=NTC_ASN_NUMBER +addRegionToCommonGroup=v1/addRegionToCommonGroup +updateRegionToCommonGroup=v1/updateCommonGroupRegion +deleteRegionToCommonGroup=v1/delCommonGroupRegion +#\u6d41\u91cf\u7edf\u8ba1app\u8be6\u60c5\u8d8b\u52bf\u56feGbps.pps\u63a5\u53e3 +trafficAppPpsTrend=v1/trafficAppPpsTrend +trafficAppBpsTrend=v1/trafficAppBpsTrend +>>>>>>> 2dd73ad 流量统计app详情趋势统计图增加Gbps、PPS单位切换统计，导出图片增加标题与时间 diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp index 3a9554a21..0fe4f69ad 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp @@ -14,7 +14,6 @@ -
+ +
+
+
+ +
+
+ +
+ + + @@ -230,10 +245,11 @@ var entranceId2=$("#entranceId2").val(); var isp1=$("#isp1").val(); var isp2=$("#isp2").val(); + var unitType=$("#unitType").val(); var searchQuota=$(".searchQuota[class~='active']").val(); - showRealTimeTransChart(appType,entranceId1,isp1);// 实时折线 - appTransAjax(starth,endh,appType,entranceId2,isp2); - appTop100List(starth,endh,appType,entranceId2,searchQuota,isp2); + showRealTimeTransChart(appType,entranceId1,isp1,unitType);// 实时折线 + appTransAjax(starth,endh,appType,entranceId2,isp2,unitType); + appTop100List(starth,endh,appType,entranceId2,searchQuota,isp2,unitType); //筛选功能初始化 $("#resetBtn1").on("click",function() { $("#searchForm1 select.selectpicker").each(function() { @@ -242,6 +258,12 @@ // $(this).find("option:first").attr("selected",true); }); $("#searchForm1")[0].reset(); + $("#appSelect select.selectpicker").each(function() { + $(this).selectpicker('val',"Unique Ip"); + $(this).find("option").attr("selected",false); + $(this).find("option:first").attr("selected",true); + }); + }); //筛选功能初始化 $("#resetBtn2").on("click",function() { @@ -251,10 +273,14 @@ // $(this).find("option:first").attr("selected",true); }); // $(".Wdate").attr("value", ''); + $("#appSelect select.selectpicker").each(function() { + $(this).selectpicker('val',"Unique Ip"); + $(this).find("option").attr("selected",false); + }); + var deftime=(new Date().getTime())-(1000 * 60 * 60); var defbegin=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(deftime)); // 默认一小时 var defend=dateFtt("yyyy-MM-dd hh:mm:ss",new Date()); - $("#searchForm2")[0].reset(); $("#beginDate").val(defbegin); $("#endDate").val(defend); @@ -265,32 +291,82 @@ }) $(".chart-history").addClass("hidden"); $(".chart-realTime").removeClass("hidden"); + $(".changeData").on("click",function(){ + loading(); $(".changeData").removeClass("active"); $(this).addClass("active"); + $("#appSelect select.selectpicker").each(function() { + $(this).selectpicker('val',"Unique Ip"); + $(this).find("option").attr("selected",false); + }); + + var starth = $("#beginDateh").val(); + var endh = $("#endDateh").val(); + $("#beginDate").val(starth); + $("#endDate").val(endh); + var appType=$("#appType").val(); + var entranceId1=$("#entranceId1").val(); + var entranceId2=$("#entranceId2").val(); + var isp1=$("#isp1").val(); + var isp2=$("#isp2").val(); + var unitType=$("#unitType").val(); + var searchQuota=$(".searchQuota[class~='active']").val(); if($(this).val()==1){ + showRealTimeTransChart(appType,entranceId1,isp1,unitType);// 实时折线 $(".chart-realTime").removeClass("hidden"); $(".chart-history").addClass("hidden"); }else{ + appTransAjax(starth,endh,appType,entranceId2,isp2,unitType); $(".chart-realTime").addClass("hidden"); $(".chart-history").removeClass("hidden"); } + /* if($(this).val()==1){ + $(".chart-realTime").removeClass("hidden"); + $(".chart-history").addClass("hidden"); + + }else{ + $(".chart-realTime").addClass("hidden"); + $(".chart-history").removeClass("hidden"); + + } */ }) $('.pageView').hide(); + + $("#unitType").on("change",function(){ + loading(); + var starth = $("#beginDateh").val(); + var endh = $("#endDateh").val(); + $("#beginDate").val(starth); + $("#endDate").val(endh); + var appType=$("#appType").val(); + var entranceId1=$("#entranceId1").val(); + var entranceId2=$("#entranceId2").val(); + var isp1=$("#isp1").val(); + var isp2=$("#isp2").val(); + var unitType=$("#unitType").val(); + var searchQuota=$(".searchQuota[class~='active']").val(); + showRealTimeTransChart(appType,entranceId1,isp1,unitType);// 实时折线 + appTransAjax(starth,endh,appType,entranceId2,isp2,unitType); + }); + }); + // 改变排序字段 function changeOrderby(searchQuota) { loading(); - appTop100List($("#beginDate").val(),$("#endDate").val(),$("#appType").val(),$("#entranceId2").val(),searchQuota,$("#isp2").val()); + appTop100List($("#beginDate").val(),$("#endDate").val(),$("#appType").val(),$("#entranceId2").val(),searchQuota,$("#isp2").val(),unitType=$("#unitType").val()); } function searchList1() { loading(); + var unitType=$("#unitType").val(); var appType=$("#appType").val(); var entranceId1=$("#entranceId1").val(); var isp1=$("#isp1").val(); - showRealTimeTransChart(appType,entranceId1,isp1);// 折线 + showRealTimeTransChart(appType,entranceId1,isp1,unitType);// 折线 } function searchList2() { + var unitType=$("#unitType").val(); var start = $("#beginDate").val(); var end = $("#endDate").val(); $("#beginDateh").val(start); @@ -302,7 +378,7 @@ var entranceId2=$("#entranceId2").val(); var isp2=$("#isp2").val(); var searchQuota=$(".searchQuota[class~='active']").val(); - appTransAjax(start,end,appType,entranceId2,isp2);// 折线 + appTransAjax(start,end,appType,entranceId2,isp2,unitType);// 折线 appTop100List(start,end,appType,entranceId2,searchQuota,isp2);// 列表 } } @@ -318,7 +394,7 @@ "appType" : appType, "entranceId" : entranceId, "searchQuota":searchQuota, - "searchIspCode":isp + "searchIspCode":isp, }, async : true, timeout : 50000, @@ -403,7 +479,7 @@ } // app曲线图 - function appTransAjax(beginDate, endDate,appType,entranceId,isp) { + function appTransAjax(beginDate, endDate,appType,entranceId,isp,unitType) { loading(); $.ajax({ url : "${ctx}/dashboard/traffic/ajaxAppTrend", type : "get", @@ -414,18 +490,29 @@ "endDate" : endDate, "appType" : appType, "entranceId" : entranceId, - "searchIspCode":isp + "searchIspCode":isp, + "searchQuotaType":unitType }, traditional:true, success : function(rs) { var series=new Array(); var sipResult=new Array(); var dipResult=new Array(); + + var c2sResult=new Array(); + var s2cResult=new Array(); + var totalResult=new Array(); + var sipData=new Array(); var dipData=new Array(); var timeData=new Array(); + + var c2sData=new Array(); + var s2cData=new Array(); + var totalData=new Array(); var total=[]; if(rs!=null&&Object.keys(rs).length>0){ + if(unitType=='Unique Ip'){ sipResult=rs.sipResult; dipResult=rs.dipResult total.push(rs.sipSum,rs.dipSum); @@ -437,15 +524,41 @@ $(dipResult).each(function(i,d){ dipData.push(d[1]) }) - - }else{ - total.push(0,0); - } - showActionHistoryChart(sipResult,dipResult); + }else{ + c2sResult=rs.c2sResult + s2cResult=rs.s2cResult + totalResult=rs.totalResult + + // 图表导出用列 + $(c2sResult).each(function(i,d){ + c2sData.push(d[1]) + timeData.push(d[0]) + }) + $(s2cResult).each(function(i,d){ + s2cData.push(d[1]) + }) + $(totalResult).each(function(i,d){ + totalData.push(d[1]) + }) + total.push('--','--','--'); + } + }else{ + if(unitType=='Unique Ip'){ + total.push(0,0); + }else{ + total.push('--','--','--'); + } + } + showActionHistoryChart(sipResult,dipResult,c2sResult,s2cResult,totalResult); $("#total").val(JSON.stringify(total)); $("#sipData").val(JSON.stringify(sipData)); $("#dipData").val(JSON.stringify(dipData)); $("#timeData").val(JSON.stringify(timeData)); + + $("#c2sData").val(JSON.stringify(c2sData)); + $("#s2cData").val(JSON.stringify(s2cData)); + $("#totalData").val(JSON.stringify(totalData)); + closeTip(); }, error : function(data, textStatus, errorThrown) { @@ -571,7 +684,8 @@ $(".pageNum").text(Math.ceil(totalData/10)); } } - function realTimeTrendAjax(beginDate, endDate,appType,entranceId,isp){ + + function realTimeTrendAjax(beginDate, endDate,appType,entranceId,isp,unitType){ var result={}; $.ajax({ url : "${ctx}/dashboard/traffic/ajaxAppTrend", @@ -582,7 +696,8 @@ "endDate" : endDate, "appType" : appType, "entranceId" : entranceId, - "searchIspCode":isp + "searchIspCode":isp, + "searchQuotaType":unitType }, async : false, traditional:true, @@ -601,16 +716,207 @@ } var timer=null; // 局点信息 - function showRealTimeTransChart(appType,entranceId,isp) { + function showRealTimeTransChart(appType,entranceId,isp,unitType) { var time1=(new Date().getTime())-(1000 * 60 * 10+1000 * 60 * 5); var time2=(new Date().getTime())-(1000 * 60 * 5);//推迟五分钟 var beginDate=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(time1)); //获取十个点 var endDate=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(time2)); // 少算一分钟 var sipResult=new Array(); var dipResult=new Array(); - var intData = realTimeTrendAjax(beginDate, endDate,appType,entranceId,isp); //初始化数据 为10个点 - sipResult=intData.sipResult; - dipResult=intData.dipResult; + + var c2sResult=new Array(); + var s2cResult=new Array(); + var totalResult=new Array(); + var unitType=$("#unitType").val(); + var intData = realTimeTrendAjax(beginDate, endDate,appType,entranceId,isp,unitType); //初始化数据 为10个点 + var zxchart=null; + if(unitType=='Unique Ip'){ + sipResult=intData.sipResult; + dipResult=intData.dipResult; + + zxchart=[{ + name: '', + lineColor:'#a9d4cf', + lineWidth:1, + marker: { + enabled: false + }, + data: (function () { + var data = []; + if(sipResult!=null&&sipResult.length>0){ + var count=10; + if(sipResult.length<10){ + count=sipResult.length; + } + for (var i = 0; i < count; i++) { + var d =sipResult[i]; + var x = d[0], // 时间 + y = d[1]; + data.push({ + x: x, + y: y + }); + } + } else{ + var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5); + for (var i = 0; i <10; i++) { + data.push({ + x: time + i * 1000*60, + y: 0 + }); + } + } + return data; + }()) + }, + { + name: '', + lineColor:'#eecf8d', + lineWidth:1, + marker: { + enabled: false + }, + data: (function () { + var data = []; + if(dipResult!=null&&dipResult.length>0){ + var count=10; + if(dipResult.length<10){ + count=dipResult.length; + } + for (var i = 0; i < count; i++) { + var d =dipResult[i]; + var x = d[0], // 当前时间 + y = d[1]; + data.push({ + x: x, + y: y + }); + } + }else{ + var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5); + for (var i = 0; i <10; i++) { + data.push({ + x: time + i * 1000*60, + y: 0 + }); + } + } + return data; + }()) + }] + + }else{ + c2sResult=intData.c2sResult; + s2cResult=intData.s2cResult; + totalResult=intData.totalResult; + + zxchart=[{ + name: 'c2s', + lineColor:'#a9d4cf', + lineWidth:1, + marker: { + enabled: false + }, + data: (function () { + var data = []; + if(c2sResult!=null&&c2sResult.length>0){ + var count=10; + if(c2sResult.length<10){ + count=c2sResult.length; + } + for (var i = 0; i < count; i++) { + var d =c2sResult[i]; + var x = d[0], // 时间 + y = d[1]; + data.push({ + x: x, + y: y + }); + } + } else{ + var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5); + for (var i = 0; i <10; i++) { + data.push({ + x: time + i * 1000*60, + y: 0 + }); + } + } + return data; + }()) + }, + { + name: 's2c', + lineColor:'#eecf8d', + lineWidth:1, + marker: { + enabled: false + }, + data: (function () { + var data = []; + if(s2cResult!=null&&s2cResult.length>0){ + var count=10; + if(s2cResult.length<10){ + count=s2cResult.length; + } + for (var i = 0; i < count; i++) { + var d =s2cResult[i]; + var x = d[0], // 当前时间 + y = d[1]; + data.push({ + x: x, + y: y + }); + } + }else{ + var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5); + for (var i = 0; i <10; i++) { + data.push({ + x: time + i * 1000*60, + y: 0 + }); + } + } + return data; + }()) + }, + { + name: 'total', + lineColor:'#ebb093', + lineWidth:1, + marker: { + enabled: false + }, + data: (function () { + var data = []; + if(totalResult!=null&&totalResult.length>0){ + var count=10; + if(totalResult.length<10){ + count=totalResult.length; + } + for (var i = 0; i < count; i++) { + var d =totalResult[i]; + var x = d[0], // 当前时间 + y = d[1]; + data.push({ + x: x, + y: y + }); + } + }else{ + var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5); + for (var i = 0; i <10; i++) { + data.push({ + x: time + i * 1000*60, + y: 0 + }); + } + } + return data; + }()) + }] + } + var nowDate=new Date(); Highcharts.setOptions({ global: { useUTC: false } }); var num=0; @@ -650,9 +956,18 @@ } } }, - colors:['#a9d4cf','#eecf8d'], + colors:['#a9d4cf','#eecf8d','#ebb093'], title : { - text : null + text : (function () { + var timebe=(new Date().getTime())-(1000 * 60 * 6); + var start=(new Date().getTime())-(1000 * 60 * 10+1000 * 60 * 5); + var begin=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(start)); //获取1个点少算一分钟 + var end=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(timebe)); + var tlt=' '+begin+'--'+end+'' + return tlt; + }()) + + }, xAxis: { type:'datetime', @@ -707,85 +1022,24 @@ } } }, - series: [{ - name: '', - lineColor:'#a9d4cf', - lineWidth:1, - marker: { - enabled: false - }, - data: (function () { - var data = []; - if(sipResult!=null&&sipResult.length>0){ - var count=10; - if(sipResult.length<10){ - count=sipResult.length; - } - for (var i = 0; i < count; i++) { - var d =sipResult[i]; - var x = d[0], // 时间 - y = d[1]; - data.push({ - x: x, - y: y - }); - } - } else{ - var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5); - for (var i = 0; i <10; i++) { - data.push({ - x: time + i * 1000*60, - y: 0 - }); - } - } - return data; - }()) - }, - { - name: '', - lineColor:'#a9d4cf', - lineWidth:1, - marker: { - enabled: false - }, - data: (function () { - var data = []; - if(dipResult!=null&&dipResult.length>0){ - var count=10; - if(dipResult.length<10){ - count=dipResult.length; - } - for (var i = 0; i < count; i++) { - var d =dipResult[i]; - var x = d[0], // 当前时间 - y = d[1]; - data.push({ - x: x, - y: y - }); - } - }else{ - var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5); - for (var i = 0; i <10; i++) { - data.push({ - x: time + i * 1000*60, - y: 0 - }); - } - } - return data; - }()) - }] + series: zxchart }); var series = chart.series[0]; var series1 = chart.series[1]; + if(unitType!='Unique Ip'){ + var series2 = chart.series[2]; + } window.clearInterval(timer); // if(sipResult!=null&&sipResult.length>0){ + var nu=0; + var unitType=$("#unitType").val(); timer=setInterval(function() { var time3=(new Date().getTime())-(1000 * 60 * 5); var time4=(new Date().getTime())-(1000 * 60 * 4); + var c2sResult=new Array(); + var s2cResult=new Array(); + var totalResult=new Array(); var begin=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(time3)); //获取1个点少算一分钟 var end=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(time4)); $.ajax({ @@ -798,26 +1052,53 @@ "endDate" : end, "appType" : appType, "entranceId" : entranceId, - "searchIspCode":isp + "searchIspCode":isp, + "searchQuotaType":unitType }, async : true, traditional:true, success : function(rs) { var realTimeData=rs; if(realTimeData!=null&&Object.keys(realTimeData).length>0){ - var sipReal=realTimeData.sipResult; - var dipReal=realTimeData.dipResult; - var d =sipReal[0]; + if(unitType=='Unique Ip'){ + var sipReal=realTimeData.sipResult; + var dipReal=realTimeData.dipResult; + + var d =sipReal[0]; series.addPoint([d[0], d[1]], true, true); - var t =dipReal[0]; + var t =dipReal[0]; series1.addPoint([t[0], t[1]], true, true); + }else{ + var c2sRes=realTimeData.c2sResult; + var s2cRes=realTimeData.s2cResult; + var totalRes=realTimeData.totalResult; + + var d =c2sRes[0]; + series.addPoint([d[0], d[1]], true, true); + var t =s2cRes[0]; + series1.addPoint([t[0], t[1]], true, true); + var s =totalRes[0]; + series2.addPoint([s[0], s[1]], true, true); + } + }else{ var x=(new Date()).getTime()-(1000 * 60 * 5); var y=0; - series.addPoint([x, y], true, true); - series1.addPoint([x, y], true, true); + if(unitType=='Unique Ip'){ + series.addPoint([x, y], true, true); + series1.addPoint([x, y], true, true); + }else{ + series.addPoint([x, y], true, true); + series1.addPoint([x, y], true, true); + series2.addPoint([x, y], true, true); + } + } - + var start=(new Date().getTime())-(1000 * 60 * 10+1000 * 60 * 5); + var startTime=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(start)); + var ends=(new Date().getTime())-(1000 * 60 * 5); + var endTime=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(ends)); + chart.title.update({ text: ' '+startTime+'--'+endTime+''}); closeTip(); }, error : function(data, textStatus, errorThrown) { @@ -833,10 +1114,61 @@ // } } // 历史信息 - function showActionHistoryChart(sipResult,dipResult) { + function showActionHistoryChart(sipResult,dipResult,c2sResult,s2cResult,totalResult) { var nowDate=new Date(); Highcharts.setOptions({ global: { useUTC: false } }); var num=0; + var lsChart=null; + var unitType=$("#unitType").val(); + if(unitType=='Unique Ip'){ + lsChart= [{ + name: '', + data: sipResult, + lineColor:'#a9d4cf', + lineWidth:1, + marker: { + enabled: false + } + }, + { + name: '', + data: dipResult, + lineColor:'#eecf8d', + lineWidth:1, + marker: { + enabled: false + } + }] + }else{ + lsChart= [{ + name: 'c2s', + data: c2sResult, + lineColor:'#a9d4cf', + lineWidth:1, + marker: { + enabled: false + } + }, + { + name: 's2c', + data: s2cResult, + lineColor:'#eecf8d', + lineWidth:1, + marker: { + enabled: false + } + }, + { + name: 'total', + data: totalResult, + lineColor:'#ebb093', + lineWidth:1, + marker: { + enabled: false + } + }] + } + var chart = Highcharts.chart('chart-history', { chart: { @@ -867,9 +1199,9 @@ } } }, - colors:['#a9d4cf','#eecf8d'], + colors:['#a9d4cf','#eecf8d','#ebb093'], title : { - text : null + text : ' '+$("#beginDateh").val()+'--'+$("#endDateh").val()+'' }, xAxis: { type:'datetime', @@ -924,24 +1256,7 @@ } } }, - series: [{ - name: '', - data: sipResult, - lineColor:'#a9d4cf', - lineWidth:1, - marker: { - enabled: false - } - }, - { - name: '', - data: dipResult, - lineColor:'#eecf8d', - lineWidth:1, - marker: { - enabled: false - } - }] + series:lsChart }); } (function(H) { @@ -954,6 +1269,7 @@ rows.shift(); // 删除一个重复行 var total=[]; var map={}; + var unitType=$("#unitType").val(); if(heard[0].indexOf("History") != -1){ rows = []; /* 调用后台接口导出 */ @@ -961,13 +1277,27 @@ var timeData = JSON.parse($("#timeData").val()); var sipData = JSON.parse($("#sipData").val()); var dipData = JSON.parse($("#dipData").val()); - for(var i=0;i'); rows.push(total) @@ -1005,6 +1340,7 @@ var total=[]; var start = ""; var end = ""; + var unitType=$("#unitType").val(); if(heard[0].indexOf("History") != -1){ start = $("#beginDateh").val(); end = $("#endDateh").val(); @@ -1012,27 +1348,68 @@ var timeData = JSON.parse($("#timeData").val()); var sipData = JSON.parse($("#sipData").val()); var dipData = JSON.parse($("#dipData").val()); - for(var i=0;i', + num3:'', }) - } + + }else{ + for(var i=0;i0){ if(i==1){ start=d[0]; @@ -1045,17 +1422,26 @@ } } }) - total.push(siptotal,diptotal); + if(unitType=='Unique Ip'){ + total.push(siptotal,diptotal); + }else{ + total.push('--','--','--'); + } } data.push({ num1:"", num2:total }) - + var titleKey=null; + if(unitType=='Unique Ip'){ + titleKey=["num1","num2","num3"]; + }else{ + titleKey=["num1","num2","num3","num4"]; + } exportCsv({ title:["",start+"--"+end], - titleForKey:["num1","num2","num3"], + titleForKey:titleKey, data:data }); };