gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

（1）流媒体protocol字段国际化修改

Browse Source 
（2）流媒体接口url修改
（3）ip日志查询条件后台动作换成service
This commit is contained in:
wangxin
2018-10-12 17:19:21 +08:00
parent a70a3b6367
commit 99d1bfe116
8 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/nis/util/Constants.java
View File

@@ -416,6 +416,7 @@ public final class Constants {
public static final String NTC_MMSAMPLE_VOIP_LOG = Configurations.getStringProperty("mmSampleVoipLog", ""); 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_MMAVIP_LOG = Configurations.getStringProperty("mmAvIpLog", "");
public static final String NTC_MMFILEDIGEST_LOG = Configurations.getStringProperty("mmFileDigestLog", ""); 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_MMPORNAUDIOSAMPLE_LOG = Configurations.getStringProperty("mmPornAudioLevelLog", "");
public static final String NTC_MMPORNVIDEOSAMPLE_LOG = Configurations.getStringProperty("mmPornVideoLevelLog", ""); public static final String NTC_MMPORNVIDEOSAMPLE_LOG = Configurations.getStringProperty("mmPornVideoLevelLog", "");
public static final String NTC_MMAVURL_LOG = Configurations.getStringProperty("mmAvUrlLog", ""); public static final String NTC_MMAVURL_LOG = Configurations.getStringProperty("mmAvUrlLog", "");

2
src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java
View File

@@ -57,7 +57,7 @@ public class MmAvUrlLogController extends BaseController{
model.addAttribute("serviceList", serviceList); model.addAttribute("serviceList", serviceList);
String url = ""; 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); String jsonString = HttpClientUtil.getMsg(url,params,request);
Gson gson = new GsonBuilder().create(); Gson gson = new GsonBuilder().create();

3
src/main/resources/messages/message_en.properties
View File

@@ -1218,4 +1218,5 @@ NTC_STREAMING_MEDIA_URL=Streaming Media URL
NTC_VOIP_ACCOUNT=VoIP Account NTC_VOIP_ACCOUNT=VoIP Account
user_manage=Client Account Manage user_manage=Client Account Manage
ip_reuse_policy_object=IP Reuse Policy Object ip_reuse_policy_object=IP Reuse Policy Object
area_group_manage=Group Area Manage area_group_manage=Group Area Manage
stream_media_protocol=Stream Media Protocol

1
src/main/resources/messages/message_ru.properties
View File

@@ -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 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_STREAMING_MEDIA_URL=Streaming Media URL
NTC_VOIP_ACCOUNT=VoIP \u0410\u043A\u043A\u0430\u0443\u043D\u0442 NTC_VOIP_ACCOUNT=VoIP \u0410\u043A\u043A\u0430\u0443\u043D\u0442
stream_media_protocol=Stream Media Protocol

3
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1212,4 +1212,5 @@ NTC_STREAMING_MEDIA_URL=Streaming Media URL
NTC_VOIP_ACCOUNT=VoIP Account NTC_VOIP_ACCOUNT=VoIP Account
user_manage=\u5BA2\u6237\u7AEF\u8D26\u53F7\u7BA1\u7406 user_manage=\u5BA2\u6237\u7AEF\u8D26\u53F7\u7BA1\u7406
ip_reuse_policy_object=IP\u590D\u7528\u7B56\u7565\u5BF9\u8C61 ip_reuse_policy_object=IP\u590D\u7528\u7B56\u7565\u5BF9\u8C61
area_group_manage=\u5206\u7EC4\u5730\u7406\u4FE1\u606F\u7BA1\u7406 area_group_manage=\u5206\u7EC4\u5730\u7406\u4FE1\u606F\u7BA1\u7406
stream_media_protocol=\u6D41\u5A92\u4F53\u534F\u8BAE

9
src/main/resources/nis.properties
View File

@@ -219,14 +219,14 @@ clusterBStartTime=1503504000725
isCommit=true 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 maatCfg=configSources
fileUploadCfg=fileUploadSources fileUploadCfg=fileUploadSources
callbackCfg=commonSources callbackCfg=commonSources
fileDigestCfg=fileDigestSources fileDigestCfg=fileDigestSources
configIdSources=configPzIdSources configIdSources=configPzIdSources
#logBaseUrl=http://10.0.6.242:8080/galaxy/service/log/v1/ #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 ntcPzReport=ntcPzReport
ntcServiceReport=ntcServiceReport ntcServiceReport=ntcServiceReport
ntcTagReport=ntcTagReport ntcTagReport=ntcTagReport
@@ -270,7 +270,7 @@ mmLogoDetectionLog=mmLogoDetectionLogs
mmFaceRecognizationLog=mmFaceRecognizationLogs mmFaceRecognizationLog=mmFaceRecognizationLogs
######################################## ########################################
#\u5927\u5C4F\u56FE\u8868\u5C55\u793A\u670D\u52A1\u63A5\u53E3 #\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 trafficIpActive=trafficIpActive
trafficProtocol=trafficProtocol trafficProtocol=trafficProtocol
trafficApp=trafficApp trafficApp=trafficApp
@@ -524,4 +524,5 @@ log_time_start=2018-08-01 00:00:00
log_time_end=2018-10-01 00:00:00 log_time_end=2018-10-01 00:00:00
area_tag=location area_tag=location
isp_tag=isp isp_tag=isp
mmFileDigestLog=mmFileDigestLogs mmFileDigestLog=mmFileDigestLogs
ntcStreamMediaLog=ntcStreamMediaLogs

4
src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
View File

@@ -48,13 +48,13 @@
<!-- 搜索内容与操作按钮栏 --> <!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12"> <div class="col-md-12">
<div class="pull-left"> <div class="pull-left">
<form:select path="action" class="selectpicker select2 input-small"> <form:select path="service" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="action"/></form:option> <form:option value=""><spring:message code="action"/></form:option>
<c:forEach items="${serviceList}" var="service" <c:forEach items="${serviceList}" var="service"
varStatus="satus"> varStatus="satus">
<%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> --%> <%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> --%>
<c:if test="${(service.action ne 128) && (service.action ne 32) && (service.action ne 96)}"> <c:if test="${(service.action ne 128) && (service.action ne 32) && (service.action ne 96)}">
<form:option value="${service.action}"><spring:message code="${service.serviceName}"/></form:option> <form:option value="${service.serviceId}"><spring:message code="${service.serviceName}"/></form:option>
</c:if> </c:if>
<%-- </c:forEach> --%> <%-- </c:forEach> --%>
</c:forEach> </c:forEach>

2
src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
View File

@@ -172,7 +172,7 @@ $(document).ready(function(){
<th><spring:message code='found_time'/></th> <th><spring:message code='found_time'/></th>
<th><spring:message code='entrance'/></th> <th><spring:message code='entrance'/></th>
<th><spring:message code='access_url'/></th> <th><spring:message code='access_url'/></th>
<th><spring:message code='protocol'/></th> <th><spring:message code='stream_media_protocol'/></th>
<th><spring:message code='clj_ip'/></th> <th><spring:message code='clj_ip'/></th>
<th><spring:message code='transport_layer_protocol'/></th> <th><spring:message code='transport_layer_protocol'/></th>