|  | @@ -1,5 +1,5 @@
 | 
	
		
			
				|  |  |  <?xml version="1.0"?>
 | 
	
		
			
				|  |  | -<project
 | 
	
		
			
				|  |  | +<project 
 | 
	
		
			
				|  |  |  	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
 | 
	
		
			
				|  |  |  	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 | 
	
		
			
				|  |  |  	<modelVersion>4.0.0</modelVersion>
 | 
	
	
		
			
				|  | @@ -12,7 +12,7 @@
 | 
	
		
			
				|  |  |  	<groupId>com.genersoft</groupId>
 | 
	
		
			
				|  |  |  	<artifactId>wvp</artifactId>
 | 
	
		
			
				|  |  |  	<name>web video platform</name>
 | 
	
		
			
				|  |  | -	
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  	<properties>
 | 
	
		
			
				|  |  |  		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -42,15 +42,15 @@
 | 
	
		
			
				|  |  |  			<artifactId>spring-boot-starter-tomcat</artifactId>
 | 
	
		
			
				|  |  |  		</dependency>
 | 
	
		
			
				|  |  |  		<dependency>
 | 
	
		
			
				|  |  | -	        <groupId>org.springframework.boot</groupId>
 | 
	
		
			
				|  |  | -	        <artifactId>spring-boot-starter-web</artifactId>
 | 
	
		
			
				|  |  | -	    </dependency>
 | 
	
		
			
				|  |  | +			<groupId>org.springframework.boot</groupId>
 | 
	
		
			
				|  |  | +			<artifactId>spring-boot-starter-web</artifactId>
 | 
	
		
			
				|  |  | +		</dependency>
 | 
	
		
			
				|  |  |  		<dependency>
 | 
	
		
			
				|  |  | -	        <groupId>org.springframework</groupId>
 | 
	
		
			
				|  |  | -	        <artifactId>spring-context</artifactId>
 | 
	
		
			
				|  |  | -	    </dependency>
 | 
	
		
			
				|  |  | -	    
 | 
	
		
			
				|  |  | -		
 | 
	
		
			
				|  |  | +			<groupId>org.springframework</groupId>
 | 
	
		
			
				|  |  | +			<artifactId>spring-context</artifactId>
 | 
	
		
			
				|  |  | +		</dependency>
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  		<!-- druid -->
 | 
	
		
			
				|  |  |  		<dependency>
 | 
	
		
			
				|  |  |  			<groupId>com.alibaba</groupId>
 | 
	
	
		
			
				|  | @@ -62,7 +62,7 @@
 | 
	
		
			
				|  |  |  			<artifactId>mysql-connector-java</artifactId>
 | 
	
		
			
				|  |  |  			<version>5.1.30</version>
 | 
	
		
			
				|  |  |  		</dependency>
 | 
	
		
			
				|  |  | -		
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  		<!--Mybatis -->
 | 
	
		
			
				|  |  |  		<dependency>
 | 
	
		
			
				|  |  |  			<groupId>org.mybatis</groupId>
 | 
	
	
		
			
				|  | @@ -74,7 +74,7 @@
 | 
	
		
			
				|  |  |  			<artifactId>mybatis-spring</artifactId>
 | 
	
		
			
				|  |  |  			<version>${mybatis.spring.version}</version>
 | 
	
		
			
				|  |  |  		</dependency>
 | 
	
		
			
				|  |  | -		
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  		<!--分页插件 -->
 | 
	
		
			
				|  |  |  		<dependency>
 | 
	
		
			
				|  |  |  			<groupId>com.github.pagehelper</groupId>
 | 
	
	
		
			
				|  | @@ -99,7 +99,7 @@
 | 
	
		
			
				|  |  |  			<artifactId>fastjson</artifactId>
 | 
	
		
			
				|  |  |  			<version>1.2.33</version>
 | 
	
		
			
				|  |  |  		</dependency>
 | 
	
		
			
				|  |  | -		
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  		<!--Swagger2 -->
 | 
	
		
			
				|  |  |  		<!--在线文档 -->
 | 
	
		
			
				|  |  |  		<dependency>
 | 
	
	
		
			
				|  | @@ -112,13 +112,13 @@
 | 
	
		
			
				|  |  |  			<artifactId>springfox-swagger-ui</artifactId>
 | 
	
		
			
				|  |  |  			<version>2.6.1</version>
 | 
	
		
			
				|  |  |  		</dependency>
 | 
	
		
			
				|  |  | -		
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  		<!-- 日志相关 -->
 | 
	
		
			
				|  |  |  		<dependency>
 | 
	
		
			
				|  |  |  			<groupId>org.springframework.boot</groupId>
 | 
	
		
			
				|  |  |  			<artifactId>spring-boot-starter-aop</artifactId>
 | 
	
		
			
				|  |  |  		</dependency>
 | 
	
		
			
				|  |  | -		
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  		<dependency>
 | 
	
		
			
				|  |  |  			<groupId>javax.sip</groupId>
 | 
	
		
			
				|  |  |  			<artifactId>jain-sip-ri</artifactId>
 |