From 4202cfb88fe3ab437b8764c388869d159d8d6ce3 Mon Sep 17 00:00:00 2001 From: swwheihei <swwheihei@163.com> Date: 星期四, 16 七月 2020 15:59:57 +0800 Subject: [PATCH] 修改名称 --- src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java index 1c7a957..7f07406 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java @@ -25,10 +25,10 @@ import com.genersoft.iot.vmp.conf.SipConfig; import com.genersoft.iot.vmp.gb28181.SipLayer; import com.genersoft.iot.vmp.gb28181.auth.DigestServerAuthenticationHelper; +import com.genersoft.iot.vmp.gb28181.auth.RegisterLogicHandler; import com.genersoft.iot.vmp.gb28181.bean.Device; import com.genersoft.iot.vmp.gb28181.bean.Host; import com.genersoft.iot.vmp.gb28181.event.EventPublisher; -import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; import com.genersoft.iot.vmp.gb28181.transmit.request.ISIPRequestProcessor; import com.genersoft.iot.vmp.storager.IVideoManagerStorager; @@ -38,17 +38,17 @@ /** * @Description:鏀跺埌娉ㄥ唽璇锋眰 澶勭悊 - * @author: songww + * @author: swwheihei * @date: 2020骞�5鏈�3鏃� 涓嬪崍4:47:25 */ @Component public class RegisterRequestProcessor implements ISIPRequestProcessor { @Autowired - private SipConfig config; + private SipConfig sipConfig; @Autowired - private SIPCommander cmder; + private RegisterLogicHandler handler; @Autowired private IVideoManagerStorager storager; @@ -63,7 +63,7 @@ * 璇锋眰娑堟伅 */ @Override - public void process(RequestEvent evt, SipLayer layer, ServerTransaction transaction) { + public void process(RequestEvent evt, SipLayer layer) { try { System.out.println("鏀跺埌娉ㄥ唽璇锋眰锛屽紑濮嬪鐞�"); Request request = evt.getRequest(); @@ -77,7 +77,7 @@ // 鏍¢獙瀵嗙爜鏄惁姝g‘ if (authorhead != null) { passwordCorrect = new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request, - config.getSipPassword()); + sipConfig.getSipPassword()); } // 鏈惡甯︽巿鏉冨ご鎴栬�呭瘑鐮侀敊璇� 鍥炲401 @@ -89,7 +89,7 @@ System.out.println("瀵嗙爜閿欒 鍥炲401"); } response = layer.getMessageFactory().createResponse(Response.UNAUTHORIZED, request); - new DigestServerAuthenticationHelper().generateChallenge(layer.getHeaderFactory(), response, config.getSipDomain()); + new DigestServerAuthenticationHelper().generateChallenge(layer.getHeaderFactory(), response, sipConfig.getSipDomain()); } // 鎼哄甫鎺堟潈澶村苟涓斿瘑鐮佹纭� else if (passwordCorrect) { @@ -141,7 +141,7 @@ device.setTransport(isTcp ? "TCP" : "UDP"); } } - transaction.sendResponse(response); + layer.getServerTransaction(evt).sendResponse(response); // 娉ㄥ唽鎴愬姛 // 淇濆瓨鍒皉edis // 涓嬪彂catelog鏌ヨ鐩綍 @@ -149,7 +149,7 @@ System.out.println("娉ㄥ唽鎴愬姛! deviceId:" + device.getDeviceId()); storager.update(device); publisher.onlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_ONLINE_REGISTER); - cmder.deviceInfoQuery(device); + handler.onRegister(device); } else if (registerFlag == 2) { System.out.println("娉ㄩ攢鎴愬姛! deviceId:" + device.getDeviceId()); publisher.outlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_OUTLINE_UNREGISTER); -- Gitblit v1.8.0