Commit 36170df3f4e9e48a20539d2ec697570f9e6f43bf
1 parent
a8097c35
修复打包优化pom
Showing
3 changed files
with
20 additions
and
3 deletions
pom.xml
| @@ -256,6 +256,7 @@ | @@ -256,6 +256,7 @@ | ||
| 256 | <plugin> | 256 | <plugin> |
| 257 | <groupId>org.springframework.boot</groupId> | 257 | <groupId>org.springframework.boot</groupId> |
| 258 | <artifactId>spring-boot-maven-plugin</artifactId> | 258 | <artifactId>spring-boot-maven-plugin</artifactId> |
| 259 | + <version>2.3.5.RELEASE</version> | ||
| 259 | <configuration> | 260 | <configuration> |
| 260 | <includeSystemScope>true</includeSystemScope> | 261 | <includeSystemScope>true</includeSystemScope> |
| 261 | </configuration> | 262 | </configuration> |
| @@ -263,6 +264,7 @@ | @@ -263,6 +264,7 @@ | ||
| 263 | <plugin> | 264 | <plugin> |
| 264 | <groupId>org.apache.maven.plugins</groupId> | 265 | <groupId>org.apache.maven.plugins</groupId> |
| 265 | <artifactId>maven-compiler-plugin</artifactId> | 266 | <artifactId>maven-compiler-plugin</artifactId> |
| 267 | + <version>3.8.1</version> | ||
| 266 | <configuration> | 268 | <configuration> |
| 267 | <source>1.8</source> | 269 | <source>1.8</source> |
| 268 | <target>1.8</target> | 270 | <target>1.8</target> |
| @@ -272,6 +274,7 @@ | @@ -272,6 +274,7 @@ | ||
| 272 | <plugin> | 274 | <plugin> |
| 273 | <groupId>pl.project13.maven</groupId> | 275 | <groupId>pl.project13.maven</groupId> |
| 274 | <artifactId>git-commit-id-plugin</artifactId> | 276 | <artifactId>git-commit-id-plugin</artifactId> |
| 277 | + <version>3.0.1</version> | ||
| 275 | <configuration> | 278 | <configuration> |
| 276 | <offline>true</offline> | 279 | <offline>true</offline> |
| 277 | </configuration> | 280 | </configuration> |
| @@ -280,6 +283,7 @@ | @@ -280,6 +283,7 @@ | ||
| 280 | <plugin> | 283 | <plugin> |
| 281 | <groupId>org.apache.maven.plugins</groupId> | 284 | <groupId>org.apache.maven.plugins</groupId> |
| 282 | <artifactId>maven-surefire-plugin</artifactId> | 285 | <artifactId>maven-surefire-plugin</artifactId> |
| 286 | + <version>2.22.2</version> | ||
| 283 | <configuration> | 287 | <configuration> |
| 284 | <skipTests>true</skipTests> | 288 | <skipTests>true</skipTests> |
| 285 | </configuration> | 289 | </configuration> |
src/main/java/com/genersoft/iot/vmp/domain/req/PresetQuerySipReq.java
| 1 | package com.genersoft.iot.vmp.domain.req; | 1 | package com.genersoft.iot.vmp.domain.req; |
| 2 | 2 | ||
| 3 | -import lombok.Data; | ||
| 4 | 3 | ||
| 5 | /** | 4 | /** |
| 6 | * @author chenjialing | 5 | * @author chenjialing |
| 7 | */ | 6 | */ |
| 8 | -@Data | ||
| 9 | public class PresetQuerySipReq { | 7 | public class PresetQuerySipReq { |
| 10 | 8 | ||
| 11 | private String presetId; | 9 | private String presetId; |
| 12 | 10 | ||
| 13 | private String presetName; | 11 | private String presetName; |
| 12 | + | ||
| 13 | + public String getPresetId() { | ||
| 14 | + return presetId; | ||
| 15 | + } | ||
| 16 | + | ||
| 17 | + public void setPresetId(String presetId) { | ||
| 18 | + this.presetId = presetId; | ||
| 19 | + } | ||
| 20 | + | ||
| 21 | + public String getPresetName() { | ||
| 22 | + return presetName; | ||
| 23 | + } | ||
| 24 | + | ||
| 25 | + public void setPresetName(String presetName) { | ||
| 26 | + this.presetName = presetName; | ||
| 27 | + } | ||
| 14 | } | 28 | } |
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java
| @@ -4,7 +4,6 @@ import com.genersoft.iot.vmp.conf.SipConfig; | @@ -4,7 +4,6 @@ import com.genersoft.iot.vmp.conf.SipConfig; | ||
| 4 | import com.genersoft.iot.vmp.conf.UserSetting; | 4 | import com.genersoft.iot.vmp.conf.UserSetting; |
| 5 | import com.genersoft.iot.vmp.domain.req.PresetQuerySipReq; | 5 | import com.genersoft.iot.vmp.domain.req.PresetQuerySipReq; |
| 6 | import com.genersoft.iot.vmp.gb28181.bean.*; | 6 | import com.genersoft.iot.vmp.gb28181.bean.*; |
| 7 | -import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector; | ||
| 8 | import com.genersoft.iot.vmp.gb28181.event.EventPublisher; | 7 | import com.genersoft.iot.vmp.gb28181.event.EventPublisher; |
| 9 | import com.genersoft.iot.vmp.gb28181.session.CatalogDataCatch; | 8 | import com.genersoft.iot.vmp.gb28181.session.CatalogDataCatch; |
| 10 | import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; | 9 | import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; |