Commit c3ee8ec4b289fc945e7d65b1a373e0a19760aa2a
1 parent
3469271e
补充sql默认用户
Showing
2 changed files
with
3 additions
and
1 deletions
sql/mysql.sql
| @@ -202,3 +202,5 @@ create table user | @@ -202,3 +202,5 @@ create table user | ||
| 202 | create_time varchar(50) not null | 202 | create_time varchar(50) not null |
| 203 | ); | 203 | ); |
| 204 | 204 | ||
| 205 | +insert into user (username, password, roleId, create_time) values ('admin', '21232f297a57a5a743894a0e4a801fc3', '0', '2021-04-13 14:14:57'); | ||
| 206 | + |
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
| @@ -55,7 +55,7 @@ public class ZLMRTPServerFactory { | @@ -55,7 +55,7 @@ public class ZLMRTPServerFactory { | ||
| 55 | case 0: | 55 | case 0: |
| 56 | result= newPort; | 56 | result= newPort; |
| 57 | break; | 57 | break; |
| 58 | - case -300: // id已经存在, 可能已经在其他端口推流, TODO 也可能是设备不等ack就直接推流了, 需要查询与设置的推流ip端口是否一致 | 58 | + case -300: // id已经存在, 可能已经在其他端口推流 |
| 59 | Map<String, Object> closeRtpServerParam = new HashMap<>(); | 59 | Map<String, Object> closeRtpServerParam = new HashMap<>(); |
| 60 | closeRtpServerParam.put("stream_id", streamId); | 60 | closeRtpServerParam.put("stream_id", streamId); |
| 61 | zlmresTfulUtils.closeRtpServer(mediaServerItem, closeRtpServerParam); | 61 | zlmresTfulUtils.closeRtpServer(mediaServerItem, closeRtpServerParam); |