diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java index d158b243d..23a5c244d 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java @@ -56,7 +56,7 @@ public class MmVoipIpLogController extends BaseController{ model.addAttribute("serviceList", serviceList); 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); Gson gson = new GsonBuilder().create(); @@ -72,10 +72,10 @@ public class MmVoipIpLogController extends BaseController{ setLogAction(l,serviceList); } model.addAttribute("page", page); - logger.info("查询VoipIp日志成功"); + logger.info("查询Voip日志成功"); } } catch (Exception e) { - logger.error("查询VoipIp日志失败", e); + logger.error("查询Voip日志失败", e); addMessageLog(model, e.getMessage()); } return "/log/ntc/mmVoipIpList"; diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index f500f4750..a29c34ed2 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -251,12 +251,12 @@ ntcFtpLog=ntcFtpLogs ntcAppLog=ntcAppLogs ntcDdosLog=ntcDdosLogs dkBehaviorLog=ntcAppLogs -mmVoipLog=mmVoipLogs +mmVoipLog=ntcVoipLogs mmAvIpLog=mmAvIpLogs mmAvUrlLog=mmAvUrlLogs mmPicIpLog=mmPicIpLogs mmPicUrlLog=mmPicUrlLogs -mmVoipIpLog=mmVoipIpLogs +mmVoipIpLog=ntcVoipLogs mmVoipAccountLog=mmVoipAccountLogs mmSampleAudioLog=mmSampleAudioLogs mmSampleVideoLog=mmSampleVideoLogs @@ -445,9 +445,9 @@ 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=java -jar /home/sampleTest.jar -video_sample_create_proc=java -jar /home/sampleTest.jar -picture_sample_create_proc=java -jar /home/sampleTest.jar +audio_sample_create_proc=/home/ceiec/av_feature_gen/audio_convert_proc +video_sample_create_proc=/home/ceiec/av_feature_gen/video_convert_proc +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=java -jar /home/sampleTest.jar face_sample_create_proc=java -jar /home/sampleTest.jar diff --git a/src/main/resources/sql/20181015/add_dictionary.sql b/src/main/resources/sql/20181015/add_dictionary.sql index 0a3ef7633..019cd0eed 100644 --- a/src/main/resources/sql/20181015/add_dictionary.sql +++ b/src/main/resources/sql/20181015/add_dictionary.sql @@ -11,9 +11,9 @@ VALUES INSERT INTO sys_data_dictionary_item (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES - (2704, '2', 'stronger_strong_intensity', 'ǿ', 0, 1, 1, 116); + (2704, '2', 'strong_intensity', 'ǿ', 0, 1, 1, 116); INSERT INTO sys_data_dictionary_item (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES - (2705, '3', 'strong_intensity', 'ǿ', 0, 1, 1, 116); \ No newline at end of file + (2705, '3', 'stronger_intensity', 'ǿ', 0, 1, 1, 116); \ No newline at end of file diff --git a/src/main/resources/sql/20181015/update_function_service.sql b/src/main/resources/sql/20181015/update_function_service.sql index d822b4894..3cea7eb0b 100644 --- a/src/main/resources/sql/20181015/update_function_service.sql +++ b/src/main/resources/sql/20181015/update_function_service.sql @@ -1,2 +1,3 @@ update function_service_dict set is_valid=0 where dict_id=137 ; -update function_service_dict set function_id=5 where dict_id=108 \ No newline at end of file +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 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp index 5112cc9df..f800d76ee 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -248,6 +248,7 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} + ${log.sceneFile} ${type.itemValue}