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

voip日志接口修改为ntcVoipLogs

Browse Source 
音视频外部程序目录固定
bgp日志缺少scene file属性更改
This commit is contained in:
duandongmei
2018-10-16 11:04:21 +08:00
parent 35e0446279
commit bc0b5cf850
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java
View File

@@ -56,7 +56,7 @@ public class MmVoipIpLogController extends BaseController{
model.addAttribute("serviceList", serviceList); model.addAttribute("serviceList", serviceList);
String url = ""; String url = "";
url = Constants.LOG_BASE_URL+Constants.NTC_MMVOIP_IP_LOG; url = Constants.LOG_BASE_URL+Constants.NTC_MMVOIP_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();
@@ -72,10 +72,10 @@ public class MmVoipIpLogController extends BaseController{
setLogAction(l,serviceList); setLogAction(l,serviceList);
} }
model.addAttribute("page", page); model.addAttribute("page", page);
logger.info("查询VoipIp日志成功"); logger.info("查询Voip日志成功");
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("查询VoipIp日志失败", e); logger.error("查询Voip日志失败", e);
addMessageLog(model, e.getMessage()); addMessageLog(model, e.getMessage());
} }
return "/log/ntc/mmVoipIpList"; return "/log/ntc/mmVoipIpList";

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

@@ -251,12 +251,12 @@ ntcFtpLog=ntcFtpLogs
ntcAppLog=ntcAppLogs ntcAppLog=ntcAppLogs
ntcDdosLog=ntcDdosLogs ntcDdosLog=ntcDdosLogs
dkBehaviorLog=ntcAppLogs dkBehaviorLog=ntcAppLogs
mmVoipLog=mmVoipLogs mmVoipLog=ntcVoipLogs
mmAvIpLog=mmAvIpLogs mmAvIpLog=mmAvIpLogs
mmAvUrlLog=mmAvUrlLogs mmAvUrlLog=mmAvUrlLogs
mmPicIpLog=mmPicIpLogs mmPicIpLog=mmPicIpLogs
mmPicUrlLog=mmPicUrlLogs mmPicUrlLog=mmPicUrlLogs
mmVoipIpLog=mmVoipIpLogs mmVoipIpLog=ntcVoipLogs
mmVoipAccountLog=mmVoipAccountLogs mmVoipAccountLog=mmVoipAccountLogs
mmSampleAudioLog=mmSampleAudioLogs mmSampleAudioLog=mmSampleAudioLogs
mmSampleVideoLog=mmSampleVideoLogs mmSampleVideoLog=mmSampleVideoLogs
@@ -445,9 +445,9 @@ mm_logo_detection_region=MM_LOGO_DETECTION
mm_face_recognization_region=MM_FACE_RECOGNIZATION mm_face_recognization_region=MM_FACE_RECOGNIZATION
#\u6837\u4f8b\u6587\u4ef6\u751f\u6210\u7a0b\u5e8f #\u6837\u4f8b\u6587\u4ef6\u751f\u6210\u7a0b\u5e8f
audio_sample_create_proc=java -jar /home/sampleTest.jar audio_sample_create_proc=/home/ceiec/av_feature_gen/audio_convert_proc
video_sample_create_proc=java -jar /home/sampleTest.jar video_sample_create_proc=/home/ceiec/av_feature_gen/video_convert_proc
picture_sample_create_proc=java -jar /home/sampleTest.jar picture_sample_create_proc=/home/ceiec/av_feature_gen/picture_convert_proc
speaker_sample_create_proc=java -jar /home/sampleTest.jar speaker_sample_create_proc=java -jar /home/sampleTest.jar
logo_sample_create_proc=java -jar /home/sampleTest.jar logo_sample_create_proc=java -jar /home/sampleTest.jar
face_sample_create_proc=java -jar /home/sampleTest.jar face_sample_create_proc=java -jar /home/sampleTest.jar

4
src/main/resources/sql/20181015/add_dictionary.sql
View File

@@ -11,9 +11,9 @@ VALUES
INSERT INTO sys_data_dictionary_item INSERT INTO sys_data_dictionary_item
(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`)
VALUES VALUES
(2704, '2', 'stronger_strong_intensity', '<EFBFBD><EFBFBD>ǿ', 0, 1, 1, 116); (2704, '2', 'strong_intensity', 'ǿ', 0, 1, 1, 116);
INSERT INTO sys_data_dictionary_item INSERT INTO sys_data_dictionary_item
(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`)
VALUES VALUES
(2705, '3', 'strong_intensity', 'ǿ', 0, 1, 1, 116); (2705, '3', 'stronger_intensity', '<EFBFBD><EFBFBD>ǿ', 0, 1, 1, 116);

3
src/main/resources/sql/20181015/update_function_service.sql
View File

@@ -1,2 +1,3 @@
update function_service_dict set is_valid=0 where dict_id=137 ; update function_service_dict set is_valid=0 where dict_id=137 ;
update function_service_dict set function_id=5 where dict_id=108 update function_service_dict set function_id=5,region_code=4 where dict_id=108
update function_region_dict set function_id=5,config_region_value='PXY_INTERCEPT_IP' where dict_id=228

1
src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
View File

@@ -248,6 +248,7 @@
<td>${log.dAsn}</td> <td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td> <td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td> <td>${log.dSubscribeId}</td>
<td>${log.sceneFile}</td>
<td> <td>
<c:forEach items="${fns:getDictList('BGP_MESSAGE_TYPE')}" var="type"> <c:forEach items="${fns:getDictList('BGP_MESSAGE_TYPE')}" var="type">
<c:if test="${type.itemCode eq log.type}">${type.itemValue}</c:if> <c:if test="${type.itemCode eq log.type}">${type.itemValue}</c:if>