Commit bc82662e9023c6aa1012ad8aef2c8dff0c3abca7
1 parent
0c10e8d9
升级invite+subscribe的cseq为递增
Showing
3 changed files
with
7 additions
and
4 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
| ... | ... | @@ -95,7 +95,7 @@ public class SIPRequestHeaderProvider { |
| 95 | 95 | MaxForwardsHeader maxForwards = sipFactory.createHeaderFactory().createMaxForwardsHeader(70); |
| 96 | 96 | |
| 97 | 97 | //ceq |
| 98 | - CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(1L, Request.INVITE); | |
| 98 | + CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(redisCatchStorage.getCSEQ(Request.INVITE), Request.INVITE); | |
| 99 | 99 | request = sipFactory.createMessageFactory().createRequest(requestLine, Request.INVITE, callIdHeader, cSeqHeader,fromHeader, toHeader, viaHeaders, maxForwards); |
| 100 | 100 | |
| 101 | 101 | Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getIp()+":"+sipConfig.getPort())); |
| ... | ... | @@ -131,7 +131,7 @@ public class SIPRequestHeaderProvider { |
| 131 | 131 | MaxForwardsHeader maxForwards = sipFactory.createHeaderFactory().createMaxForwardsHeader(70); |
| 132 | 132 | |
| 133 | 133 | //ceq |
| 134 | - CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(1L, Request.INVITE); | |
| 134 | + CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(redisCatchStorage.getCSEQ(Request.INVITE), Request.INVITE); | |
| 135 | 135 | request = sipFactory.createMessageFactory().createRequest(requestLine, Request.INVITE, callIdHeader, cSeqHeader,fromHeader, toHeader, viaHeaders, maxForwards); |
| 136 | 136 | |
| 137 | 137 | Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getIp()+":"+sipConfig.getPort())); |
| ... | ... | @@ -200,7 +200,7 @@ public class SIPRequestHeaderProvider { |
| 200 | 200 | MaxForwardsHeader maxForwards = sipFactory.createHeaderFactory().createMaxForwardsHeader(70); |
| 201 | 201 | |
| 202 | 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 | 205 | request = sipFactory.createMessageFactory().createRequest(requestURI, Request.SUBSCRIBE, callIdHeader, cSeqHeader, fromHeader, |
| 206 | 206 | toHeader, viaHeaders, maxForwards); | ... | ... |
src/main/resources/application.yml
web_src/src/components/dialog/deviceEdit.vue
| ... | ... | @@ -36,6 +36,9 @@ |
| 36 | 36 | <el-option key="UTF-8" label="UTF-8" value="utf-8"></el-option> |
| 37 | 37 | </el-select> |
| 38 | 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 | 42 | <el-form-item> |
| 40 | 43 | <div style="float: right;"> |
| 41 | 44 | <el-button type="primary" @click="onSubmit" >确认</el-button> | ... | ... |