guzijian / wvp-GB28181-pro · Commits

Commit 8b6449ce3ac8eb4a0f59f3a6e3974d9190dcd133

Authored by 648540858
1 parent 9f680a2e

升级版本号

Inline Side-by-side
Showing 3 changed files with 2 additions and 86 deletions
... ... @@ -11,7 +11,7 @@
11 11  
12 12 <groupId>com.genersoft</groupId>
13 13 <artifactId>wvp-pro</artifactId>
14   - <version>2.3.1</version>
  14 + <version>2.3.2</version>
15 15 <name>web video platform</name>
16 16 <description>国标28181视频平台</description>
17 17  
... ...
sql/update.sql
  View file @8b6449c
1   -alter table stream_push
2   - add serverId varchar(50) not null;
3   -
4   -alter table device
5   - add geoCoordSys varchar(50) not null;
6   -alter table device
7   - add treeType varchar(50) not null;
8   -update device set device.geoCoordSys='WGS84';
9   -update device set device.treeType='CivilCode';
10   -
11   -alter table device_channel
12   - add longitudeGcj02 double default null;
13   -alter table device_channel
14   - add latitudeGcj02 double default null;
15   -alter table device_channel
16   - add longitudeWgs84 double default null;
17   -alter table device_channel
18   - add latitudeWgs84 double default null;
19   -alter table device_channel
20   - add businessGroupId varchar(50) default null;
21   -alter table device_channel
22   - add gpsTime varchar(50) default null;
23   -
24   -
25   -alter table device_mobile_position
26   - change cnLng longitudeGcj02 double default null;
27   -alter table device_mobile_position
28   - change cnLat latitudeGcj02 double default null;
29   -alter table device_mobile_position
30   - add longitudeWgs84 double default null;
31   -alter table device_mobile_position
32   - add latitudeWgs84 double default null;
33   -alter table device_mobile_position
34   - drop geodeticSystem;
35   -alter table device_mobile_position
36   - add createTime varchar(50) default null;
37   -
38   -alter table device_alarm
39   - add createTime varchar(50) default null;
40   -
41   -alter table gb_stream
42   - change createStamp createTime varchar(50) default null;
43   -
44   -alter table parent_platform
45   - add createTime varchar(50) default null;
46   -alter table parent_platform
47   - add updateTime varchar(50) default null;
48   -
49   -alter table stream_proxy
50   - add updateTime varchar(50) default null;
51   -
52   -alter table stream_push
53   - add pushTime varchar(50) default null;
54   -alter table stream_push
55   - add status int DEFAULT NULL;
56   -alter table stream_push
57   - add updateTime varchar(50) default null;
58   -alter table stream_push
59   - add pushIng int DEFAULT NULL;
60   -alter table stream_push
61   - change createStamp createTime varchar(50) default null;
62   -
63   -alter table gb_stream
64   - drop column status;
65   -
66   -alter table user
67   - add pushKey varchar(50) default null;
68   -update user set pushKey='453df297a57a5a7438934sda801fc3' where id=1;
69   -
70   -alter table parent_platform
71   - add treeType varchar(50) not null;
72   -update parent_platform set parent_platform.treeType='BusinessGroup';
73   -alter table parent_platform drop shareAllLiveStream;
74   -
75   -alter table platform_catalog
76   - add civilCode varchar(50) default null;
77   -alter table platform_catalog
78   - add businessGroupId varchar(50) default null;
79   -
80   -/********************* ADD ***************************/
81   -alter table stream_push
82   - add self int DEFAULT NULL;
83   -
84   -
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
  View file @8b6449c
... ... @@ -112,7 +112,7 @@ public class SIPProcessorObserver implements ISIPProcessorObserver {
112 112 } else if ((status >= 100) && (status < 200)) {
113 113 // 增加其它无需回复的响应，如101、180等
114 114 } else {
115   - logger.warn("接收到失败的response响应！status：" + status + ",message:" + response.getReasonPhrase()/* .getContent().toString()*/);
  115 + logger.warn("接收到失败的response响应！status：" + status + ",message:" + response.getReasonPhrase());
116 116 if (responseEvent.getResponse() != null && sipSubscribe.getErrorSubscribesSize() > 0 ) {
117 117 CallIdHeader callIdHeader = (CallIdHeader)responseEvent.getResponse().getHeader(CallIdHeader.NAME);
118 118 if (callIdHeader != null) {
... ...