更新README

648540858
1 parent 72a1f122
Showing 10 changed files with 88 additions and 117 deletions
README.md
doc/_media/2.png
doc/_media/3-1.png
doc/_media/3-2.png
doc/_media/3-3.png
doc/_media/3.png
doc/_media/index.png
src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
src/main/java/com/genersoft/iot/vmp/utils/redis/RedisUtil.java
-![logo](https://raw.githubusercontent.com/648540858/wvp-GB28181-pro/wvp-28181-2.0/web_src/static/logo.png)
+![logo](doc/_media/logo.png)
 # 撘蝞勗28181悅閫像
 [![Build Status](https://travis-ci.org/xia-chu/ZLMediaKit.svg?branch=master)](https://travis-ci.org/xia-chu/ZLMediaKit)
@@ -17,7 +17,7 @@ WEB VIDEO PLATFORM銝銝芸鈭B28181-2016蝞勗
 # 摨嚗
 辣仍閫  
 像VR蝑挽憭 
-漣  
+漣像蝥扯楊蝵
 tsp/rtmp蝑蓮像  
 tsp/rtmp蝑瘚蓮像  
@@ -31,62 +31,49 @@ WEB VIDEO PLATFORM銝銝芸鈭B28181-2016蝞勗
 https://gitee.com/pan648540858/wvp-GB28181-pro.git
 # 
-![build_1.png](https://images.gitee.com/uploads/images/2022/0304/101513_79632720_1018729.png "2022-03-04_09-51.png")
-![build_1.png](https://images.gitee.com/uploads/images/2022/0304/103025_5df016f9_1018729.png "2022-03-04_10-27.png")
-![build_1.png](https://images.gitee.com/uploads/images/2022/0304/101706_088fbafa_1018729.png "2022-03-04_09-52_1.png")
-![build_1.png](https://images.gitee.com/uploads/images/2022/0304/101756_3d662828_1018729.png "2022-03-04_10-00_1.png")
-![build_1.png](https://images.gitee.com/uploads/images/2022/0304/101823_19050c66_1018729.png "2022-03-04_10-12_1.png")
-![build_1.png](https://images.gitee.com/uploads/images/2022/0304/101848_e5a39557_1018729.png "2022-03-04_10-12_2.png")
-![build_1.png](https://images.gitee.com/uploads/images/2022/0304/101919_ee5b8c79_1018729.png "2022-03-04_10-13.png")
-
-# 1.0 蝖  
-1. 閫;  
-2. 鈭嚗憬嚗;  
-3. 閫挽憭縑郊;   
-4. 蝳餃蝥輻;  
-5. 敶霂Ｖ嚗鈭VR\DVR嚗翰餈eek;  
-6. 犖閫瘚;    
-7. DPCP銝斤縑隞支芋撘; 
-8. eb, 銝閬蝵脣垢, wvp蔭辣蝵, vp銝韏琿蝵;   
-9. 像, 笆憭批像憭折挽憭餈;  
-10. 蝝,;  
-11. 蔭ZLM慦, 蔭憸憸;  
-12. udp憭垢璅∪, dp璅∪扯;  
-13. 憸挽蝵;  
-14. 敶霂;  
-15. dp/tcp芋撘;  
-16. 颲RTSPTMPTTP-FLVebsocket-FLVLS憭悅瘚  
-17.   
-18. 蝵蝵, vp銝lm蝵   
-19. h265, g.711撘(閬loseWaitRTPInfo霈曆蛹false)
-20. 霅虫縑憭垢霅虫縑
-
-# 1.0   
-1. eb, 銝閬蝵脣垢, wvp蔭辣蝵, vp銝韏琿蝵;   
-2. 像, 笆憭批像憭折挽憭餈;  
-3. 蝝,;  
-4. 蔭ZLM慦, 蔭憸憸;  
-5. udp憭垢璅∪, dp璅∪扯;  
-6. 憸挽蝵;  
-7. 敶霂;  
-8. dp/tcp芋撘;  
-9. 颲RTSPTMPTTP-FLVebsocket-FLVLS憭悅瘚  
-10.   
-11. 蝵蝵, vp銝lm蝵   
-12. h265, g.711撘   
-13. 摰嚗瘚嚗誨絲.  ( [IKI](https://github.com/648540858/wvp-GB28181-pro/wiki/%E5%A6%82%E4%BD%95%E4%BD%BF%E7%94%A8%E5%9B%BA%E5%AE%9A%E6%92%AD%E6%94%BE%E5%9C%B0%E5%9D%80%E4%B8%8E%E8%87%AA%E5%8A%A8%E7%82%B9%E6%92%AD)嚗
-14. 霅虫縑憭垢霅虫縑
-15. 恥瘜
-   -  [X] 蝘餃雿蔭霈ａ
-   -  [X] 蝘餃雿蔭憭
-   -  [X] 霅虫辣霈ａ
-   -  [X] 霅虫辣憭
-   -  [X] 霈曉敶恥
-   -  [X] 霈曉敶憭
-16. 蝘餃雿蔭霂Ｗ蝷綽蔭辣霈曄蔭蝘餃雿蔭摮
-
-# 2.0 
-- [X] 漣
+![index](doc/_media/index.png "index.png")
+![2](doc/_media/2.png "2.png")
+![3](doc/_media/3.png "3.png")
+![3-1](doc/_media/3-1.png "3-1.png")
+![3-2](doc/_media/3-2.png "3-2.png")
+![3-3](doc/_media/3-3.png "3-3.png")
+![build_1](https://images.gitee.com/uploads/images/2022/0304/101919_ee5b8c79_1018729.png "2022-03-04_10-13.png")
+
+#  
+-  [X] eb
+-  [X] 摰寞扯憟
+-  [X] 摮嚗WGS84CJ02銝斤頂嚗僎銝頧砍蛹頂餈內
+-  [X] 霈曉
+  -  [X] 閫
+  -  [X] 頝舀嚗憭挽憭鈭扯
+  -  [X] 鈭嚗霈曉蓮
+  -  [X] 憸蔭雿霂ｇ蝙銝挽蝵
+  -  [X] 霂﹫VR/IPC銝嚗銝蝸
+  -  [X] 犖閫瘚
+  -  [X] 閫挽憭縑郊
+  -  [X] 蝳餃蝥輻
+  -  [X] 颲RTSPTMPTTP-FLVebsocket-FLVLS憭悅瘚
+  -  [X] 銝芣閫仍嚗敶誑隞颱
+  -  [X] DPCP銝斤縑隞支芋撘
+  -  [X] DPCP銝斤芋撘
+  -  [X] 蝝,
+  -  [X] 敶霂
+  -  [X] 誘憸甇Ｘ敶勗
+  -  [X] 
+  -  [X] H264265
+  -  [X] 霅虫縑憭垢霅虫縑
+  -  [X] 恥瘜
+    -  [X] 蝘餃雿蔭霈ａ
+    -  [X] 蝘餃雿蔭憭
+    -  [X] 霅虫辣霈ａ
+    -  [X] 霅虫辣憭
+    -  [X] 霈曉敶恥
+    -  [X] 霈曉敶憭
+  -  [X] 蝘餃雿蔭霂Ｗ蝷
+  - [X] 瘛餃挽憭挽憭挽蝵桀
+-  [X] 像撖寞
+-  [X] 漣
+  - [X] 漣
     - [X] WEB瘛餃漣撟喳
     - [X] 瘜典
     - [X] 敹歲靽暑
@@ -101,61 +88,33 @@ https://gitee.com/pan648540858/wvp-GB28181-pro.git
     - [X] 敶恥
     - [X] 敶
     - [X] GPS霈ａ嚗瘚
-- [X] 瘛餃挽憭挽憭挽蝵桀
-- [X] 瘛餃TSP閫
-- [X] 瘛餃
-- [X] 瘛餃TMP閫
-- [X] 鈭垢敶閬蝵脣蝙嚗
-- [X] 憭嚗韐蝸雿雿輻
-- [X] WEB蝡舀H264銝265嚗憸.711A/G.711U/AAC,閬虜蝻撘
-- [X] 摮
-- [X] WGS84CJ02銝斤頂
-
-[//]: # (# docker敹恍)
-
-[//]: # (ocker-compose蛹輕銝嚗洵銝之摰嗡蝙嚗輕銝之摰嗉扇敺撈銝泅tar  )
-
-[//]: # (https://github.com/SaltFish001/wvp_pro_compose)
-
-[//]: # ([https://github.com/SaltFish001/wvp_pro_compose]&#40;https://github.com/SaltFish001/wvp_pro_compose&#41;)
-
-[//]: # (餈雿輕銝芷摮銝憸)
-
-[//]: # (```shell)
-
-[//]: # (docker pull 648540858/wvp_pro)
-
-[//]: # ()
-[//]: # (docker run  --env WVP_IP="雿P" -it -p 18080:18080 -p 30000-30500:30000-30500/udp -p 30000-30500:30000-30500/tcp -p 80:80 -p 5060:5060 -p 5060:5060/udp 648540858/wvp_pro)
-
-[//]: # (```)
-
-[//]: # (docker雿輻霂行https://hub.docker.com/r/648540858/wvp_pro]&#40;https://hub.docker.com/r/648540858/wvp_pro&#41;)
-
-# gitee郊隞
-https://gitee.com/pan648540858/wvp-GB28181-pro.git  
-
-# 憸
+-  [X] 蔭ZLM慦, 蔭憸憸;  
+-  [X] 憭嚗韐蝸雿雿輻
+-  [X] udp憭垢璅∪, dp璅∪扯;
+-  [X] 蝵蝵莎 
+-  [X] vp銝lm蝵莎像撟嗅
+-  [X] TSP/RTMP嚗蛹撘隞像
+-  [X] 瘚TSP/RTMP嚗蛹撘隞像
+-  [X] 瘚
+-  [X] 
+-  [X] 鈭垢敶瘚/隞/隞亙鈭垢嚗蝸
+
+
+# 憸圾
 暻餌鈭挽憭摰寞改隞仿閬之挽憭瘚挽憭偌撟單隞仿憸
 1. iki嚗粉隞亙葬雿憸
 2. 揣issues嚗之
-3. Q蝢歹之敹撈嚗撣歇蝏粉鈭iki揣鈭ssues
+3. Q蝢歹901799015嚗之敹撈嚗撣歇蝏粉鈭iki揣鈭ssues
 4. 雿隞亥窈雿蛹雿圾蝑晶
 5. 雿隞交憸挽憭隞交摰寞憸
-
-# 
-蝘摰之摰嗅之銝瓷移憸隞乩晶圾蝑隞交R
-嚗笆隞遣霈桀隞交SSUE嚗隞亙黎銝韏瑁賑甈Ｚ頞憿寧銝剜犖
-
-
-
 # 雿輻撣桀
 QQ蝢: 901799015, ZLM雿輻﹝[https://github.com/ZLMediaKit/ZLMediaKit](https://github.com/ZLMediaKit/ZLMediaKit)  
 QQ蝘縑銝銝, 蝎曉.甈Ｚ之摰嗅蝢日悄霈.閫★撖嫣葬嚗洽餈tar漱pr
 # 悅
 憿寧誨蝙摰賣IT悅嚗靽縑銝隞亥摨鈭★ 雿憿寧銋蝣蝙鈭鈭隞皞誨銝窈銵隞嚗 鈭蝙憿寧漣熒噩蛹銝璁憿寧嚗窈銵 雿輻憿寧隞嚗砲悅銝剖銵冽憿寧靘洵銝摨悅
+
 # 靚
 陝雿憭(https://github.com/xia-chu) 皞獢,撟嗅撘葉蝏葬     
 陝雿dexter langhuihui](https://github.com/langhuihui) 撘皞末EB     
@@ -70,7 +70,7 @@ public class VideoStreamSessionManager {
 			stream ="*";
 		}
 		String key = VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId() + "_" + deviceId + "_" + channelId + "_" + callId+ "_" + stream;
-		List<Object> scanResult = RedisUtil.scan(key);
+		List<Object> scanResult = RedisUtil.scan(key, 1);
 		if (scanResult.size() == 0) {
 			return null;
 		}
@@ -75,7 +75,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
     @Override
     public void resetAllSN() {
         String scanKey = VideoManagerConstants.SIP_SN_PREFIX  + userSetting.getServerId() + "_*";
-        List<Object> keys = RedisUtil.scan(scanKey);
+        List<Object> keys = RedisUtil.scan(scanKey, null);
         for (Object o : keys) {
             String key = (String) o;
             RedisUtil.set(key, 1);
@@ -129,7 +129,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
     }
     @Override
     public StreamInfo queryPlayByStreamId(String streamId) {
-        List<Object> playLeys = RedisUtil.scan(String.format("%S_%s_*_%s_*", VideoManagerConstants.PLAYER_PREFIX, userSetting.getServerId(), streamId));
+        List<Object> playLeys = RedisUtil.scan(String.format("%S_%s_*_%s_*", VideoManagerConstants.PLAYER_PREFIX, userSetting.getServerId(), streamId), 1);
         if (playLeys == null || playLeys.size() == 0) {
             return null;
         }
@@ -141,7 +141,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
         List<Object> playLeys = RedisUtil.scan(String.format("%S_%s_*_*_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
                 userSetting.getServerId(),
                 deviceId,
-                channelId));
+                channelId), 1);
         if (playLeys == null || playLeys.size() == 0) {
             return null;
         }
@@ -278,7 +278,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
                 stream,
                 callId
         );
-        List<Object> streamInfoScan = RedisUtil.scan(key);
+        List<Object> streamInfoScan = RedisUtil.scan(key, 1);
         if (streamInfoScan.size() > 0) {
             return (StreamInfo) RedisUtil.get((String) streamInfoScan.get(0));
         }else {
@@ -310,7 +310,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
                 stream,
                 callId
         );
-        List<Object> streamInfoScan = RedisUtil.scan(key);
+        List<Object> streamInfoScan = RedisUtil.scan(key, 1);
         return (String) streamInfoScan.get(0);
     }
@@ -399,7 +399,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
                 + channelId + "_"
                 + streamId + "_"
                 + callId;
-        List<Object> scan = RedisUtil.scan(key);
+        List<Object> scan = RedisUtil.scan(key, 1);
         if (scan.size() > 0) {
             return (SendRtpItem)RedisUtil.get((String)scan.get(0));
         }else {
@@ -521,7 +521,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
         String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX
                 + userSetting.getServerId() + "_*_*_"
                 + channelId + "*_" + "*_";
-        List<Object> RtpStreams = RedisUtil.scan(key);
+        List<Object> RtpStreams = RedisUtil.scan(key, 1);
         if (RtpStreams.size() > 0) {
             return true;
         } else {
@@ -613,7 +613,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
                 stream,
                 callId
         );
-        List<Object> streamInfoScan = RedisUtil.scan(key);
+        List<Object> streamInfoScan = RedisUtil.scan(key, 1);
         if (streamInfoScan.size() > 0) {
             return (StreamInfo) RedisUtil.get((String) streamInfoScan.get(0));
         }else {
@@ -732,7 +732,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
         String scanKey = VideoManagerConstants.WVP_SERVER_STREAM_PREFIX  + userSetting.getServerId() + "_*_" + app + "_" + streamId + "_" + mediaServerId;
         OnStreamChangedHookParam result = null;
-        List<Object> keys = RedisUtil.scan(scanKey);
+        List<Object> keys = RedisUtil.scan(scanKey, 1);
         if (keys.size() > 0) {
             String key = (String) keys.get(0);
             result = (OnStreamChangedHookParam)RedisUtil.get(key);
 package com.genersoft.iot.vmp.utils.redis;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
 import com.alibaba.fastjson2.JSONObject;
 import com.genersoft.iot.vmp.utils.SpringBeanFactory;
-import gov.nist.javax.sip.stack.UDPMessageChannel;
 import org.springframework.data.redis.core.*;
 import org.springframework.util.CollectionUtils;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
 /**    
  * Redis工具类
  * @author swwheihei
@@ -865,12 +864,16 @@ public class RedisUtil {
      * @param query 查询参数
      * @return
      */
-    public static List<Object> scan(String query) {
+    public static List<Object> scan(String query, Integer count) {
         if (redisTemplate == null) {
             redisTemplate = SpringBeanFactory.getBean("redisTemplate");
         }
         Set<String> resultKeys = (Set<String>) redisTemplate.execute((RedisCallback<Set<String>>) connection -> {
-            ScanOptions scanOptions = ScanOptions.scanOptions().match("*" + query + "*").count(1000).build();
+            ScanOptions.ScanOptionsBuilder match = ScanOptions.scanOptions().match("*" + query + "*");
+            if (count != null) {
+                match.count(count);
+            }
+            ScanOptions scanOptions = match.build();
             Cursor<byte[]> scan = connection.scan(scanOptions);
             Set<String> keys = new HashSet<>();
             while (scan.hasNext()) {
@@ -883,6 +886,15 @@ public class RedisUtil {
         return new ArrayList<>(resultKeys);
     }
+    /**
+     * 模糊查询
+     * @param query 查询参数
+     * @return
+     */
+    public static List<Object> scan(String query) {
+        return scan(query, null);
+    }
+
     //    ============================== 消息发送与订阅 ==============================
     public static void convertAndSend(String channel, JSONObject msg) {
         if (redisTemplate == null) {