From f1217682a9d1726b5b5673343dfe9b035e1180d4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 05 十一月 2021 18:27:41 +0800
Subject: [PATCH] 重构28181信令结构,解决循环依赖导致的无法直接注入

---
 src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/utils/SipUtils.java b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
similarity index 72%
rename from src/main/java/com/genersoft/iot/vmp/utils/SipUtils.java
rename to src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
index b889be2..9dd0271 100644
--- a/src/main/java/com/genersoft/iot/vmp/utils/SipUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
@@ -1,4 +1,4 @@
-package com.genersoft.iot.vmp.utils;
+package com.genersoft.iot.vmp.gb28181.utils;
 
 import gov.nist.javax.sip.address.AddressImpl;
 import gov.nist.javax.sip.address.SipUri;
@@ -9,15 +9,20 @@
 /**
  * @author panlinlin
  * @version 1.0.0
- * @Description JAIN SIP鐨勫伐鍏风被
+ * @description JAIN SIP鐨勫伐鍏风被
  * @createTime 2021骞�09鏈�27鏃� 15:12:00
  */
 public class SipUtils {
 
     public static String getUserIdFromFromHeader(Request request) {
         FromHeader fromHeader = (FromHeader)request.getHeader(FromHeader.NAME);
+        return getUserIdFromFromHeader(fromHeader);
+    }
+
+    public static String getUserIdFromFromHeader(FromHeader fromHeader) {
         AddressImpl address = (AddressImpl)fromHeader.getAddress();
         SipUri uri = (SipUri) address.getURI();
         return uri.getUser();
     }
+
 }

--
Gitblit v1.8.0