Pre Merge pull request !38 from 好青年_GEILIVABLE/N/A

Signed-off-by: 好青年_GEILIVABLE <420050757@qq.com>

docker/docker-compose.yml

@@ -9,6 +9,16 @@ services:
     environment:
       TZ: "Asia/Shanghai"
     command: redis-server /etc/redis/redis_default.conf --appendonly yes
+  mysql:
+    image: mysql:5.7
+    volumes:
+      - ./mysql:/var/lib/mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: mysql@tafei
+      MYSQL_DATABASE: wvp2
+      LANG: C.UTF-8
+    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+    
   wvp:
     build:
       context: ./wvp
@@ -33,7 +43,7 @@ services:
     environment:
       TZ: "Asia/Shanghai"
       # [必须修改] 本机的IP
-      WVP_HOST: 172.18.0.61
+      WVP_HOST: 111.67.197.136
       WVP_PWD: aseqw_+hiy123
       WVP_DOMAIN: 6101130049
       WVP_ID: 61011300490000000001
@@ -45,5 +55,8 @@ services:
       WVP_JVM_CONFIG: -Xms128m -Xmx256m
       ASSIST_CONFIG:
       WVP_CONFIG:
+      DB_HOST: mysql
+      DB_PASSWORD: mysql@tafei
     depends_on:
       - redis
+      - mysql

src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

@@ -177,7 +177,7 @@ public class ZLMHttpHookListener {
             ret.put("code", 0);
             return ret;
         }
-        if (param.getStream().endsWith(mediaInfo.getTranscodeSuffix())) {
+        if (mediaInfo.getTranscodeSuffix() != null && param.getStream().endsWith(mediaInfo.getTranscodeSuffix())) {
             param.setStream(param.getStream().substring(0, param.getStream().lastIndexOf(mediaInfo.getTranscodeSuffix()) - 1));
         }
         if (!ObjectUtils.isEmpty(mediaInfo.getTranscodeSuffix())

src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManager.java

@@ -242,7 +242,9 @@ public class ZLMMediaServerStatusManager {
         if (mediaServerItem.getWsFlvSSLPort() == 0) {
             mediaServerItem.setWsFlvSSLPort(zlmServerConfig.getHttpSSLport());
         }
-        if (Objects.isNull(mediaServerItem.getTranscodeSuffix())) {
+        if (Objects.isNull(zlmServerConfig.getTranscodeSuffix())) {
+            mediaServerItem.setTranscodeSuffix(null);
+        }else {
             mediaServerItem.setTranscodeSuffix(zlmServerConfig.getTranscodeSuffix());
         }
         mediaServerItem.setHookAliveInterval(10F);

src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java

@@ -81,7 +81,7 @@ public interface MediaServerMapper {
 
     @Update(value = {" <script>" +
             "UPDATE wvp_media_server " +
-            "SET update_time=#{updateTime}" +
+            "SET update_time=#{updateTime}, transcode_suffix=#{transcodeSuffix} " +
             "<if test=\"ip != null\">, ip=#{ip}</if>" +
             "<if test=\"hookIp != null\">, hook_ip=#{hookIp}</if>" +
             "<if test=\"sdpIp != null\">, sdp_ip=#{sdpIp}</if>" +
@@ -106,7 +106,6 @@ public interface MediaServerMapper {
             "<if test=\"hookAliveInterval != null\">, hook_alive_interval=#{hookAliveInterval}</if>" +
             "<if test=\"recordDay != null\">, record_day=#{recordDay}</if>" +
             "<if test=\"recordPath != null\">, record_path=#{recordPath}</if>" +
-            "<if test=\"transcodeSuffix != null\">, transcode_suffix=#{transcodeSuffix}</if>" +
             "<if test=\"serverId != null\">, server_id=#{serverId}</if>" +
             "<if test=\"type != null\">, type=#{type}</if>" +
             "WHERE id=#{id}"+