guzijian / wvp-GB28181-pro · Commits

Commit 1d299721e31ac74b6e3dab19357b70968a3f3d74

Authored by 648540858
1 parent 89fba643

升级依赖包版本

Inline Side-by-side
Showing 1 changed file with 46 additions and 33 deletions
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <parent> 6 <parent>
7 <groupId>org.springframework.boot</groupId> 7 <groupId>org.springframework.boot</groupId>
8 <artifactId>spring-boot-starter-parent</artifactId> 8 <artifactId>spring-boot-starter-parent</artifactId>
9 - <version>1.5.10.RELEASE</version> 9 + <version>2.3.5.RELEASE</version>
10 </parent> 10 </parent>
11 11
12 <groupId>com.genersoft</groupId> 12 <groupId>com.genersoft</groupId>
@@ -16,20 +16,17 @@ @@ -16,20 +16,17 @@
16 <properties> 16 <properties>
17 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 17 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18 18
19 - <hystrix.version>1.5.12</hystrix.version>  
20 <!-- 依赖版本 --> 19 <!-- 依赖版本 -->
21 - <mapper.version>3.4.0</mapper.version>  
22 - <mybatis.version>3.3.1</mybatis.version>  
23 - <mybatis.spring.version>1.2.4</mybatis.spring.version>  
24 - <pagehelper.version>4.1.1</pagehelper.version> 20 + <mapper.version>4.1.5</mapper.version>
  21 + <mybatis.version>3.5.5</mybatis.version>
  22 + <mybatis.spring.version>2.0.5</mybatis.spring.version>
  23 + <pagehelper.version>5.2.0</pagehelper.version>
25 <snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory> 24 <snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
26 <asciidoctor.input.directory>${project.basedir}/docs/asciidoc</asciidoctor.input.directory> 25 <asciidoctor.input.directory>${project.basedir}/docs/asciidoc</asciidoctor.input.directory>
27 <generated.asciidoc.directory>${project.build.directory}/asciidoc</generated.asciidoc.directory> 26 <generated.asciidoc.directory>${project.build.directory}/asciidoc</generated.asciidoc.directory>
28 <asciidoctor.html.output.directory>${project.build.directory}/asciidoc/html</asciidoctor.html.output.directory> 27 <asciidoctor.html.output.directory>${project.build.directory}/asciidoc/html</asciidoctor.html.output.directory>
29 <asciidoctor.pdf.output.directory>${project.build.directory}/asciidoc/pdf</asciidoctor.pdf.output.directory> 28 <asciidoctor.pdf.output.directory>${project.build.directory}/asciidoc/pdf</asciidoctor.pdf.output.directory>
30 - <gson.version>2.8.0</gson.version>  
31 - <jedis.version>3.0.1</jedis.version>  
32 - <jsonlib.version>2.4</jsonlib.version> 29 + <gson.version>2.8.6</gson.version>
33 </properties> 30 </properties>
34 31
35 <dependencies> 32 <dependencies>
@@ -50,17 +47,29 @@ @@ -50,17 +47,29 @@
50 <artifactId>spring-context</artifactId> 47 <artifactId>spring-context</artifactId>
51 </dependency> 48 </dependency>
52 49
  50 + <!-- redis -->
  51 + <dependency>
  52 + <groupId>org.springframework.data</groupId>
  53 + <artifactId>spring-data-redis</artifactId>
  54 + </dependency>
  55 + <dependency>
  56 + <groupId>redis.clients</groupId>
  57 + <artifactId>jedis</artifactId>
  58 + <version>3.3.0</version>
  59 + </dependency>
53 60
54 - <!-- druid --> 61 + <!-- druid数据库连接池 -->
55 <dependency> 62 <dependency>
56 <groupId>com.alibaba</groupId> 63 <groupId>com.alibaba</groupId>
57 <artifactId>druid</artifactId> 64 <artifactId>druid</artifactId>
58 - <version>1.0.11</version> 65 + <version>1.2.3</version>
59 </dependency> 66 </dependency>
  67 +
  68 + <!-- mysql数据库 -->
60 <dependency> 69 <dependency>
61 <groupId>mysql</groupId> 70 <groupId>mysql</groupId>
62 <artifactId>mysql-connector-java</artifactId> 71 <artifactId>mysql-connector-java</artifactId>
63 - <version>5.1.30</version> 72 + <version>8.0.22</version>
64 </dependency> 73 </dependency>
65 74
66 <!--Mybatis --> 75 <!--Mybatis -->
@@ -91,13 +100,7 @@ @@ -91,13 +100,7 @@
91 <dependency> 100 <dependency>
92 <groupId>org.apache.commons</groupId> 101 <groupId>org.apache.commons</groupId>
93 <artifactId>commons-lang3</artifactId> 102 <artifactId>commons-lang3</artifactId>
94 - <version>3.4</version>  
95 - </dependency>  
96 - <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->  
97 - <dependency>  
98 - <groupId>com.alibaba</groupId>  
99 - <artifactId>fastjson</artifactId>  
100 - <version>1.2.33</version> 103 + <version>3.11</version>
101 </dependency> 104 </dependency>
102 105
103 <!--Swagger2 --> 106 <!--Swagger2 -->
@@ -105,13 +108,17 @@ @@ -105,13 +108,17 @@
105 <dependency> 108 <dependency>
106 <groupId>io.springfox</groupId> 109 <groupId>io.springfox</groupId>
107 <artifactId>springfox-swagger2</artifactId> 110 <artifactId>springfox-swagger2</artifactId>
108 - <version>2.6.1</version> 111 + <version>2.9.2</version>
109 </dependency> 112 </dependency>
110 <dependency> 113 <dependency>
111 <groupId>io.springfox</groupId> 114 <groupId>io.springfox</groupId>
112 <artifactId>springfox-swagger-ui</artifactId> 115 <artifactId>springfox-swagger-ui</artifactId>
113 <version>2.6.1</version> 116 <version>2.6.1</version>
114 </dependency> 117 </dependency>
  118 + <dependency>
  119 + <groupId>javax.validation</groupId>
  120 + <artifactId>validation-api</artifactId>
  121 + </dependency>
115 122
116 <!-- 日志相关 --> 123 <!-- 日志相关 -->
117 <dependency> 124 <dependency>
@@ -119,6 +126,7 @@ @@ -119,6 +126,7 @@
119 <artifactId>spring-boot-starter-aop</artifactId> 126 <artifactId>spring-boot-starter-aop</artifactId>
120 </dependency> 127 </dependency>
121 128
  129 + <!-- sip协议栈 -->
122 <dependency> 130 <dependency>
123 <groupId>javax.sip</groupId> 131 <groupId>javax.sip</groupId>
124 <artifactId>jain-sip-ri</artifactId> 132 <artifactId>jain-sip-ri</artifactId>
@@ -127,29 +135,35 @@ @@ -127,29 +135,35 @@
127 <systemPath>${project.basedir}/libs/jain-sip-ri-1.3.0-92.jar</systemPath> 135 <systemPath>${project.basedir}/libs/jain-sip-ri-1.3.0-92.jar</systemPath>
128 </dependency> 136 </dependency>
129 <dependency> 137 <dependency>
130 - <groupId>org.dom4j</groupId>  
131 - <artifactId>dom4j</artifactId>  
132 - <version>2.1.3</version> 138 + <groupId>log4j</groupId>
  139 + <artifactId>log4j</artifactId>
  140 + <version>1.2.17</version>
133 </dependency> 141 </dependency>
  142 +
  143 + <!-- xml解析库 -->
134 <dependency> 144 <dependency>
135 - <groupId>com.google.code.gson</groupId>  
136 - <artifactId>gson</artifactId> 145 + <groupId>org.dom4j</groupId>
  146 + <artifactId>dom4j</artifactId>
  147 + <version>2.1.3</version>
137 </dependency> 148 </dependency>
  149 +
  150 + <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
138 <dependency> 151 <dependency>
139 - <groupId>org.springframework.data</groupId>  
140 - <artifactId>spring-data-redis</artifactId>  
141 - <version>1.8.4.RELEASE</version> 152 + <groupId>com.alibaba</groupId>
  153 + <artifactId>fastjson</artifactId>
  154 + <version>1.2.73</version>
142 </dependency> 155 </dependency>
  156 + <!-- google json库 -->
143 <dependency> 157 <dependency>
144 - <groupId>redis.clients</groupId>  
145 - <artifactId>jedis</artifactId>  
146 - <version>2.9.0</version> 158 + <groupId>com.google.code.gson</groupId>
  159 + <artifactId>gson</artifactId>
147 </dependency> 160 </dependency>
148 161
  162 + <!--Guava是一种基于开源的Java库-->
149 <dependency> 163 <dependency>
150 <groupId>com.google.guava</groupId> 164 <groupId>com.google.guava</groupId>
151 <artifactId>guava</artifactId> 165 <artifactId>guava</artifactId>
152 - <version>18.0</version> 166 + <version>30.0-jre</version>
153 </dependency> 167 </dependency>
154 168
155 <!-- okhttp --> 169 <!-- okhttp -->
@@ -158,7 +172,6 @@ @@ -158,7 +172,6 @@
158 <artifactId>okhttp</artifactId> 172 <artifactId>okhttp</artifactId>
159 <version>4.9.0</version> 173 <version>4.9.0</version>
160 </dependency> 174 </dependency>
161 -  
162 </dependencies> 175 </dependencies>
163 176
164 <build> 177 <build>