guzijian / wvp-GB28181-pro · Commits

Commit c3b47fa734f909ad2d21dcea43e030ae93736a21

Authored by 648540858
1 parent d42329a0

修复启动报错

Inline Side-by-side
Showing 3 changed files with 4 additions and 5 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
  View file @c3b47fa
@@ -72,7 +72,7 @@ public class SIPProcessorObserver implements ISIPProcessorObserver { @@ -72,7 +72,7 @@ public class SIPProcessorObserver implements ISIPProcessorObserver {
72 @Override 72 @Override
73 @Async 73 @Async
74 public void processRequest(RequestEvent requestEvent) { 74 public void processRequest(RequestEvent requestEvent) {
75 - logger.info("\n收到请求：\n{}", requestEvent.getRequest()); 75 + logger.debug("\n收到请求：\n{}", requestEvent.getRequest());
76 String method = requestEvent.getRequest().getMethod(); 76 String method = requestEvent.getRequest().getMethod();
77 ISIPRequestProcessor sipRequestProcessor = requestProcessorMap.get(method); 77 ISIPRequestProcessor sipRequestProcessor = requestProcessorMap.get(method);
78 if (sipRequestProcessor == null) { 78 if (sipRequestProcessor == null) {
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
  View file @c3b47fa
@@ -40,8 +40,7 @@ public class ZLMHttpHookSubscribe { @@ -40,8 +40,7 @@ public class ZLMHttpHookSubscribe {
40 private Map<HookType, Map<JSONObject, ZLMHttpHookSubscribe.Event>> allSubscribes = new ConcurrentHashMap<>(); 40 private Map<HookType, Map<JSONObject, ZLMHttpHookSubscribe.Event>> allSubscribes = new ConcurrentHashMap<>();
41 41
42 public void addSubscribe(HookType type, JSONObject hookResponse, ZLMHttpHookSubscribe.Event event) { 42 public void addSubscribe(HookType type, JSONObject hookResponse, ZLMHttpHookSubscribe.Event event) {
43 - allSubscribes.computeIfAbsent(type, k -> new ConcurrentHashMap<>())  
44 - .put(hookResponse, event); 43 + allSubscribes.computeIfAbsent(type, k -> new ConcurrentHashMap<>()).put(hookResponse, event);
45 } 44 }
46 45
47 public ZLMHttpHookSubscribe.Event getSubscribe(HookType type, JSONObject hookResponse) { 46 public ZLMHttpHookSubscribe.Event getSubscribe(HookType type, JSONObject hookResponse) {
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
  View file @c3b47fa
@@ -67,7 +67,7 @@ public class ZLMRunner implements CommandLineRunner { @@ -67,7 +67,7 @@ public class ZLMRunner implements CommandLineRunner {
67 } 67 }
68 mediaServerService.syncCatchFromDatabase(); 68 mediaServerService.syncCatchFromDatabase();
69 // 订阅 zlm启动事件, 新的zlm也会从这里进入系统 69 // 订阅 zlm启动事件, 新的zlm也会从这里进入系统
70 - hookSubscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_server_started,null, 70 + hookSubscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_server_started,new JSONObject(),
71 (MediaServerItem mediaServerItem, JSONObject response)->{ 71 (MediaServerItem mediaServerItem, JSONObject response)->{
72 ZLMServerConfig zlmServerConfig = JSONObject.toJavaObject(response, ZLMServerConfig.class); 72 ZLMServerConfig zlmServerConfig = JSONObject.toJavaObject(response, ZLMServerConfig.class);
73 if (zlmServerConfig !=null ) { 73 if (zlmServerConfig !=null ) {
@@ -79,7 +79,7 @@ public class ZLMRunner implements CommandLineRunner { @@ -79,7 +79,7 @@ public class ZLMRunner implements CommandLineRunner {
79 }); 79 });
80 80
81 // 订阅 zlm保活事件, 当zlm离线时做业务的处理 81 // 订阅 zlm保活事件, 当zlm离线时做业务的处理
82 - hookSubscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_server_keepalive,null, 82 + hookSubscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_server_keepalive,new JSONObject(),
83 (MediaServerItem mediaServerItem, JSONObject response)->{ 83 (MediaServerItem mediaServerItem, JSONObject response)->{
84 String mediaServerId = response.getString("mediaServerId"); 84 String mediaServerId = response.getString("mediaServerId");
85 if (mediaServerId !=null ) { 85 if (mediaServerId !=null ) {