Commit 04af6de363b8d420eb244e289817277ea2bcc5d4
1 parent
b559b73b
修改默认参数与ZLM统一
Showing
2 changed files
with
8 additions
and
8 deletions
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java
| ... | ... | @@ -26,7 +26,7 @@ public class ZLMUtils { |
| 26 | 26 | Map<String, Object> param = new HashMap<>(); |
| 27 | 27 | int newPort = getPortFromUdpPortRange(); |
| 28 | 28 | param.put("port", newPort); |
| 29 | - param.put("enable_tcp", 0); | |
| 29 | + param.put("enable_tcp", 1); | |
| 30 | 30 | param.put("stream_id", streamId); |
| 31 | 31 | JSONObject jsonObject = zlmresTfulUtils.openRtpServer(param); |
| 32 | 32 | if (jsonObject.getInteger("code") == 0) { | ... | ... |
src/main/resources/application.yml
| ... | ... | @@ -7,17 +7,17 @@ spring: |
| 7 | 7 | communicate: http |
| 8 | 8 | redis: |
| 9 | 9 | # Redis服务器IP |
| 10 | - host: 192.168.1.141 | |
| 10 | + host: 127.0.0.1 | |
| 11 | 11 | #端口号 |
| 12 | 12 | port: 6379 |
| 13 | 13 | database: 6 |
| 14 | 14 | #访问密码,若你的redis服务器没有设置密码,就不需要用密码去连接 |
| 15 | - password: 4767cb971b40a1300fa09b7f87b09d1c | |
| 15 | + password: | |
| 16 | 16 | #超时时间 |
| 17 | 17 | timeout: 10000 |
| 18 | 18 | datasource: |
| 19 | 19 | name: eiot |
| 20 | - url: jdbc:mysql://192.168.1.141:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true | |
| 20 | + url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true | |
| 21 | 21 | username: |
| 22 | 22 | password: |
| 23 | 23 | type: com.alibaba.druid.pool.DruidDataSource |
| ... | ... | @@ -25,7 +25,7 @@ spring: |
| 25 | 25 | server: |
| 26 | 26 | port: 18080 |
| 27 | 27 | sip: |
| 28 | - ip: 192.168.1.20 | |
| 28 | + ip: 192.168.1.44 | |
| 29 | 29 | port: 5060 |
| 30 | 30 | # 根据国标6.1.2中规定,domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码(由省级、市级、区级、基层编号组成,参照GB/T 2260-2007) |
| 31 | 31 | # 后两位为行业编码,定义参照附录D.3 |
| ... | ... | @@ -40,12 +40,12 @@ auth: #32位小写md5加密(默认密码为admin) |
| 40 | 40 | password: 21232f297a57a5a743894a0e4a801fc3 |
| 41 | 41 | |
| 42 | 42 | media: #zlm服务器的ip与http端口, 重点: 这是http端口 |
| 43 | - ip: 192.168.1.20 | |
| 44 | - port: 9080 | |
| 43 | + ip: 192.168.1.44 | |
| 44 | + port: 80 | |
| 45 | 45 | secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc |
| 46 | 46 | streamNoneReaderDelayMS: 1800000 # 无人观看多久自动关闭流 |
| 47 | 47 | rtp: # 启用udp多端口模式 |
| 48 | - enable: false | |
| 48 | + enable: true | |
| 49 | 49 | udpPortRange: 30000,300500 # 端口范围 |
| 50 | 50 | |
| 51 | 51 | ... | ... |