From 76d8aa5377d3f60500f97200be99f31c0c385203 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期六, 07 十一月 2020 22:02:17 +0800
Subject: [PATCH] 修正设备在线离线判断的错误
---
pom.xml | 52 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 31adf4f..b5e44c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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,17 +112,19 @@
<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>
- <version>1.3.0-91</version>
+ <version>1.3.0-92</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/libs/jain-sip-ri-1.3.0-92.jar</systemPath>
</dependency>
<dependency>
<groupId>org.dom4j</groupId>
@@ -157,8 +159,7 @@
<version>4.9.0</version>
</dependency>
-
- </dependencies>
+ </dependencies>
<build>
<plugins>
@@ -166,6 +167,9 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <configuration>
+ <includeSystemScope>true</includeSystemScope>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -173,6 +177,18 @@
<configuration>
<source>1.8</source>
<target>1.8</target>
+ <!--
+ <webResources>
+ <resource>
+ <directory>${project.basedir}/libs</directory>
+ <targetPath>WEB-INF/lib</targetPath>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.jar</include>
+ </includes>
+ </resource>
+ </webResources>
+ -->
</configuration>
</plugin>
--
Gitblit v1.8.0