guzijian / wvp-GB28181-pro · Commits

Commit bc82662e9023c6aa1012ad8aef2c8dff0c3abca7

Authored by 648540858
1 parent 0c10e8d9

升级invite+subscribe的cseq为递增

Inline Side-by-side
Showing 3 changed files with 7 additions and 4 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
  View file @bc82662
@@ -95,7 +95,7 @@ public class SIPRequestHeaderProvider { @@ -95,7 +95,7 @@ public class SIPRequestHeaderProvider {
95 MaxForwardsHeader maxForwards = sipFactory.createHeaderFactory().createMaxForwardsHeader(70); 95 MaxForwardsHeader maxForwards = sipFactory.createHeaderFactory().createMaxForwardsHeader(70);
96 96
97 //ceq 97 //ceq
98 - CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(1L, Request.INVITE); 98 + CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(redisCatchStorage.getCSEQ(Request.INVITE), Request.INVITE);
99 request = sipFactory.createMessageFactory().createRequest(requestLine, Request.INVITE, callIdHeader, cSeqHeader,fromHeader, toHeader, viaHeaders, maxForwards); 99 request = sipFactory.createMessageFactory().createRequest(requestLine, Request.INVITE, callIdHeader, cSeqHeader,fromHeader, toHeader, viaHeaders, maxForwards);
100 100
101 Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getIp()+":"+sipConfig.getPort())); 101 Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getIp()+":"+sipConfig.getPort()));
@@ -131,7 +131,7 @@ public class SIPRequestHeaderProvider { @@ -131,7 +131,7 @@ public class SIPRequestHeaderProvider {
131 MaxForwardsHeader maxForwards = sipFactory.createHeaderFactory().createMaxForwardsHeader(70); 131 MaxForwardsHeader maxForwards = sipFactory.createHeaderFactory().createMaxForwardsHeader(70);
132 132
133 //ceq 133 //ceq
134 - CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(1L, Request.INVITE); 134 + CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(redisCatchStorage.getCSEQ(Request.INVITE), Request.INVITE);
135 request = sipFactory.createMessageFactory().createRequest(requestLine, Request.INVITE, callIdHeader, cSeqHeader,fromHeader, toHeader, viaHeaders, maxForwards); 135 request = sipFactory.createMessageFactory().createRequest(requestLine, Request.INVITE, callIdHeader, cSeqHeader,fromHeader, toHeader, viaHeaders, maxForwards);
136 136
137 Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getIp()+":"+sipConfig.getPort())); 137 Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getIp()+":"+sipConfig.getPort()));
@@ -200,7 +200,7 @@ public class SIPRequestHeaderProvider { @@ -200,7 +200,7 @@ public class SIPRequestHeaderProvider {
200 MaxForwardsHeader maxForwards = sipFactory.createHeaderFactory().createMaxForwardsHeader(70); 200 MaxForwardsHeader maxForwards = sipFactory.createHeaderFactory().createMaxForwardsHeader(70);
201 201
202 // ceq 202 // ceq
203 - CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(1L, Request.SUBSCRIBE); 203 + CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(redisCatchStorage.getCSEQ(Request.SUBSCRIBE), Request.SUBSCRIBE);
204 204
205 request = sipFactory.createMessageFactory().createRequest(requestURI, Request.SUBSCRIBE, callIdHeader, cSeqHeader, fromHeader, 205 request = sipFactory.createMessageFactory().createRequest(requestURI, Request.SUBSCRIBE, callIdHeader, cSeqHeader, fromHeader,
206 toHeader, viaHeaders, maxForwards); 206 toHeader, viaHeaders, maxForwards);
src/main/resources/application.yml
  View file @bc82662
1 spring: 1 spring:
2 profiles: 2 profiles:
3 - active: dev 3 + active: local
web_src/src/components/dialog/deviceEdit.vue
  View file @bc82662
@@ -36,6 +36,9 @@ @@ -36,6 +36,9 @@
36 <el-option key="UTF-8" label="UTF-8" value="utf-8"></el-option> 36 <el-option key="UTF-8" label="UTF-8" value="utf-8"></el-option>
37 </el-select> 37 </el-select>
38 </el-form-item> 38 </el-form-item>
  39 + <el-form-item label="目录订阅周期" prop="subscribeCycleForCatalog" >
  40 + <el-input v-model="form.subscribeCycleForCatalog" clearable></el-input>
  41 + </el-form-item>
39 <el-form-item> 42 <el-form-item>
40 <div style="float: right;"> 43 <div style="float: right;">
41 <el-button type="primary" @click="onSubmit" >确认</el-button> 44 <el-button type="primary" @click="onSubmit" >确认</el-button>