From 99d1bfe116054bc25534d6dbf023b0455f1e99f9 Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 12 Oct 2018 17:19:21 +0800 Subject: [PATCH] =?UTF-8?q?=EF=BC=881=EF=BC=89=E6=B5=81=E5=AA=92=E4=BD=93p?= =?UTF-8?q?rotocol=E5=AD=97=E6=AE=B5=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=EF=BC=882=EF=BC=89=E6=B5=81=E5=AA=92=E4=BD=93?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3url=E4=BF=AE=E6=94=B9=20=EF=BC=883=EF=BC=89ip?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E5=8A=A8=E4=BD=9C=E6=8D=A2=E6=88=90service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/Constants.java | 1 + .../nis/web/controller/log/ntc/MmAvUrlLogController.java | 2 +- src/main/resources/messages/message_en.properties | 3 ++- src/main/resources/messages/message_ru.properties | 1 + src/main/resources/messages/message_zh_CN.properties | 3 ++- src/main/resources/nis.properties | 9 +++++---- src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp | 2 +- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 0ed1cbe7d..07f7bf6a9 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -416,6 +416,7 @@ public final class Constants { public static final String NTC_MMSAMPLE_VOIP_LOG = Configurations.getStringProperty("mmSampleVoipLog", ""); public static final String NTC_MMAVIP_LOG = Configurations.getStringProperty("mmAvIpLog", ""); public static final String NTC_MMFILEDIGEST_LOG = Configurations.getStringProperty("mmFileDigestLog", ""); + public static final String NTC_STREAMMEDIA_LOG = Configurations.getStringProperty("ntcStreamMediaLog", ""); public static final String NTC_MMPORNAUDIOSAMPLE_LOG = Configurations.getStringProperty("mmPornAudioLevelLog", ""); public static final String NTC_MMPORNVIDEOSAMPLE_LOG = Configurations.getStringProperty("mmPornVideoLevelLog", ""); public static final String NTC_MMAVURL_LOG = Configurations.getStringProperty("mmAvUrlLog", ""); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java index b0b8fa217..73bf8e889 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java @@ -57,7 +57,7 @@ public class MmAvUrlLogController extends BaseController{ model.addAttribute("serviceList", serviceList); String url = ""; - url = Constants.LOG_BASE_URL+Constants.NTC_MMAVURL_LOG; + url = Constants.LOG_BASE_URL+Constants.NTC_STREAMMEDIA_LOG; String jsonString = HttpClientUtil.getMsg(url,params,request); Gson gson = new GsonBuilder().create(); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 0c7f2be89..35701ae3b 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1218,4 +1218,5 @@ NTC_STREAMING_MEDIA_URL=Streaming Media URL NTC_VOIP_ACCOUNT=VoIP Account user_manage=Client Account Manage ip_reuse_policy_object=IP Reuse Policy Object -area_group_manage=Group Area Manage \ No newline at end of file +area_group_manage=Group Area Manage +stream_media_protocol=Stream Media Protocol \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index ee5c4ee36..31ceb414b 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1217,3 +1217,4 @@ NTC_ASN_IP=ASN MM_FILE_DIGEST=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F \u0414\u0430\u0439\u0434\u0436\u0435\u0441\u0442\u0430 \u0424\u0430\u0439\u043B\u043E\u0432 NTC_STREAMING_MEDIA_URL=Streaming Media URL NTC_VOIP_ACCOUNT=VoIP \u0410\u043A\u043A\u0430\u0443\u043D\u0442 +stream_media_protocol=Stream Media Protocol \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 13e958dd3..48d14d248 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1212,4 +1212,5 @@ NTC_STREAMING_MEDIA_URL=Streaming Media URL NTC_VOIP_ACCOUNT=VoIP Account user_manage=\u5BA2\u6237\u7AEF\u8D26\u53F7\u7BA1\u7406 ip_reuse_policy_object=IP\u590D\u7528\u7B56\u7565\u5BF9\u8C61 -area_group_manage=\u5206\u7EC4\u5730\u7406\u4FE1\u606F\u7BA1\u7406 \ No newline at end of file +area_group_manage=\u5206\u7EC4\u5730\u7406\u4FE1\u606F\u7BA1\u7406 +stream_media_protocol=\u6D41\u5A92\u4F53\u534F\u8BAE \ No newline at end of file diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index be08925d4..9eba63dd5 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -219,14 +219,14 @@ clusterBStartTime=1503504000725 isCommit=true ############################################################################################################################################ ############################################################################################################################################ -httpUrl=http://192.168.10.204:7777/galaxy/service/cfg/v1/ +httpUrl=http://192.168.10.204:7777/galaxy-service/service/cfg/v1/ maatCfg=configSources fileUploadCfg=fileUploadSources callbackCfg=commonSources fileDigestCfg=fileDigestSources configIdSources=configPzIdSources #logBaseUrl=http://10.0.6.242:8080/galaxy/service/log/v1/ -logBaseUrl=http://192.168.10.204:7777/galaxy/service/log/v1/ +logBaseUrl=http://192.168.10.204:7777/galaxy-service/service/log/v1/ ntcPzReport=ntcPzReport ntcServiceReport=ntcServiceReport ntcTagReport=ntcTagReport @@ -270,7 +270,7 @@ mmLogoDetectionLog=mmLogoDetectionLogs mmFaceRecognizationLog=mmFaceRecognizationLogs ######################################## #\u5927\u5C4F\u56FE\u8868\u5C55\u793A\u670D\u52A1\u63A5\u53E3 -dashboardUrl=http://192.168.10.204:7777/galaxy/service/log/v1/ +dashboardUrl=http://192.168.10.204:7777/galaxy-service/service/log/v1/ trafficIpActive=trafficIpActive trafficProtocol=trafficProtocol trafficApp=trafficApp @@ -524,4 +524,5 @@ 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=mmFileDigestLogs \ No newline at end of file +mmFileDigestLog=mmFileDigestLogs +ntcStreamMediaLog=ntcStreamMediaLogs \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp index 8bd3bb8af..8a57e0b50 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp @@ -48,13 +48,13 @@
- + <%-- --%> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp index 99d040521..e3315b66f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp @@ -172,7 +172,7 @@ $(document).ready(function(){ - +