|
|
@@ -1,6 +1,6 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
|
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
|
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
|
|
<groupId>com.uas.eis</groupId>
|
|
|
@@ -41,72 +41,99 @@
|
|
|
<artifactId>spring-boot-starter-jdbc</artifactId>
|
|
|
</dependency>
|
|
|
|
|
|
- <!-- <dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>org.springframework.boot</groupId>
|
|
|
+ <artifactId>spring-boot-starter-jdbc</artifactId>
|
|
|
+ </dependency>
|
|
|
+
|
|
|
+ <dependency>
|
|
|
<groupId>org.springframework.boot</groupId>
|
|
|
- <artifactId>spring-boot-devtools</artifactId>
|
|
|
- </dependency> -->
|
|
|
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
|
|
|
+ </dependency>
|
|
|
|
|
|
- <dependency>
|
|
|
- <groupId>org.springframework.boot</groupId>
|
|
|
- <artifactId>spring-boot-starter-data-jpa</artifactId>
|
|
|
- </dependency>
|
|
|
<dependency>
|
|
|
<groupId>com.alibaba</groupId>
|
|
|
<artifactId>druid-spring-boot-starter</artifactId>
|
|
|
<version>1.2.6</version>
|
|
|
</dependency>
|
|
|
+
|
|
|
<dependency>
|
|
|
- <groupId>log4j</groupId>
|
|
|
- <artifactId>log4j</artifactId>
|
|
|
- <version>1.2.17</version>
|
|
|
+ <groupId>log4j</groupId>
|
|
|
+ <artifactId>log4j</artifactId>
|
|
|
+ <version>1.2.17</version>
|
|
|
</dependency>
|
|
|
-
|
|
|
+
|
|
|
<dependency>
|
|
|
<groupId>net.sf.json-lib</groupId>
|
|
|
<artifactId>json-lib</artifactId>
|
|
|
<version>2.4</version>
|
|
|
<classifier>jdk15</classifier>
|
|
|
</dependency>
|
|
|
-
|
|
|
+
|
|
|
<dependency>
|
|
|
<groupId>com.alibaba</groupId>
|
|
|
<artifactId>fastjson</artifactId>
|
|
|
<version>1.2.15</version>
|
|
|
</dependency>
|
|
|
-
|
|
|
+
|
|
|
+ <dependency>
|
|
|
+ <groupId>org.springframework.boot</groupId>
|
|
|
+ <artifactId>spring-boot-starter-data-redis</artifactId>
|
|
|
+ </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>axis</groupId>
|
|
|
+ <artifactId>axis</artifactId>
|
|
|
+ <version>1.4</version>
|
|
|
+ </dependency>
|
|
|
<dependency>
|
|
|
- <groupId>io.jsonwebtoken</groupId>
|
|
|
- <artifactId>jjwt</artifactId>
|
|
|
- <version>0.6.0</version>
|
|
|
+ <groupId>io.jsonwebtoken</groupId>
|
|
|
+ <artifactId>jjwt</artifactId>
|
|
|
+ <version>0.6.0</version>
|
|
|
</dependency>
|
|
|
|
|
|
<dependency>
|
|
|
- <groupId>org.codehaus.jackson</groupId>
|
|
|
- <artifactId>jackson-core-asl</artifactId>
|
|
|
- <version>1.9.13</version>
|
|
|
+ <groupId>org.codehaus.jackson</groupId>
|
|
|
+ <artifactId>jackson-core-asl</artifactId>
|
|
|
+ <version>1.9.13</version>
|
|
|
</dependency>
|
|
|
-
|
|
|
+
|
|
|
+ <dependency>
|
|
|
+ <groupId>org.codehaus.jackson</groupId>
|
|
|
+ <artifactId>jackson-mapper-asl</artifactId>
|
|
|
+ <version>1.9.13</version>
|
|
|
+ </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>com.squareup.okhttp3</groupId>
|
|
|
+ <artifactId>okhttp</artifactId>
|
|
|
+ <version>3.14.9</version>
|
|
|
+ </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>org.apache.commons</groupId>
|
|
|
+ <artifactId>commons-io</artifactId>
|
|
|
+ <version>1.3.2</version>
|
|
|
+ </dependency>
|
|
|
+
|
|
|
<dependency>
|
|
|
- <groupId>org.codehaus.jackson</groupId>
|
|
|
- <artifactId>jackson-mapper-asl</artifactId>
|
|
|
- <version>1.9.13</version>
|
|
|
+ <groupId>org.projectlombok</groupId>
|
|
|
+ <artifactId>lombok</artifactId>
|
|
|
+ <version>1.18.12</version>
|
|
|
</dependency>
|
|
|
-
|
|
|
+
|
|
|
<dependency>
|
|
|
- <groupId>net.sf.flexjson</groupId>
|
|
|
- <artifactId>flexjson</artifactId>
|
|
|
- <version>2.1</version>
|
|
|
+ <groupId>net.sf.flexjson</groupId>
|
|
|
+ <artifactId>flexjson</artifactId>
|
|
|
+ <version>2.1</version>
|
|
|
</dependency>
|
|
|
-
|
|
|
+
|
|
|
<dependency>
|
|
|
- <groupId>org.springframework.boot</groupId>
|
|
|
- <artifactId>spring-boot-starter-cache</artifactId>
|
|
|
+ <groupId>org.springframework.boot</groupId>
|
|
|
+ <artifactId>spring-boot-starter-cache</artifactId>
|
|
|
</dependency>
|
|
|
-
|
|
|
+
|
|
|
<dependency>
|
|
|
<groupId>org.apache.httpcomponents</groupId>
|
|
|
<artifactId>httpcore</artifactId>
|
|
|
- </dependency>
|
|
|
+ </dependency>
|
|
|
<dependency>
|
|
|
<groupId>org.apache.httpcomponents</groupId>
|
|
|
<artifactId>httpclient</artifactId>
|
|
|
@@ -123,62 +150,48 @@
|
|
|
<scope>system</scope>
|
|
|
<systemPath>${project.basedir}/lib/ojdbc7.jar</systemPath>
|
|
|
</dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>org.projectlombok</groupId>
|
|
|
- <artifactId>lombok</artifactId>
|
|
|
- <scope>provided</scope>
|
|
|
- </dependency>
|
|
|
- </dependencies>
|
|
|
+ </dependencies>
|
|
|
|
|
|
<build>
|
|
|
- <resources>
|
|
|
- <resource>
|
|
|
- <filtering>true</filtering>
|
|
|
- <directory>src/main/resources</directory>
|
|
|
- <includes>
|
|
|
- <include>**/*</include>
|
|
|
- </includes>
|
|
|
- </resource>
|
|
|
- </resources>
|
|
|
<plugins>
|
|
|
<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>
|
|
|
- <artifactId>maven-compiler-plugin</artifactId>
|
|
|
- <version>3.5.1</version>
|
|
|
- <configuration>
|
|
|
- <source>1.8</source>
|
|
|
- <target>1.8</target>
|
|
|
- <encoding>UTF-8</encoding>
|
|
|
- <compilerArgs>
|
|
|
- <arg>-Xlint:unchecked</arg>
|
|
|
- <arg>-Xlint:deprecation</arg>
|
|
|
- <arg>-bootclasspath</arg>
|
|
|
- <arg>${env.JAVA_HOME}/jre/lib/rt.jar</arg>
|
|
|
- <arg>-extdirs</arg>
|
|
|
- <!-- windows下用分号隔开 -->
|
|
|
- <arg>${env.JAVA_HOME}/jre/lib:${project.basedir}/lib</arg>
|
|
|
- </compilerArgs>
|
|
|
- </configuration>
|
|
|
- </plugin>
|
|
|
+ <configuration>
|
|
|
+ <includeSystemScope>true</includeSystemScope>
|
|
|
+ </configuration>
|
|
|
+ </plugin>
|
|
|
+ <plugin>
|
|
|
+ <groupId>org.apache.maven.plugins</groupId>
|
|
|
+ <artifactId>maven-compiler-plugin</artifactId>
|
|
|
+ <version>3.5.1</version>
|
|
|
+ <configuration>
|
|
|
+ <source>1.8</source>
|
|
|
+ <target>1.8</target>
|
|
|
+ <encoding>UTF-8</encoding>
|
|
|
+ <compilerArgs>
|
|
|
+ <arg>-Xlint:unchecked</arg>
|
|
|
+ <arg>-Xlint:deprecation</arg>
|
|
|
+ <arg>-bootclasspath</arg>
|
|
|
+ <arg>${env.JAVA_HOME}/jre/lib/rt.jar</arg>
|
|
|
+ <arg>-extdirs</arg>
|
|
|
+ <!-- windows下用分号隔开 -->
|
|
|
+ <arg>${env.JAVA_HOME}/jre/lib:${project.basedir}/lib</arg>
|
|
|
+ </compilerArgs>
|
|
|
+ </configuration>
|
|
|
+ </plugin>
|
|
|
<plugin>
|
|
|
<groupId>org.springframework.boot</groupId>
|
|
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
|
- <configuration>
|
|
|
- <compilerArgs>
|
|
|
- <arg>-Xlint:deprecation</arg>
|
|
|
- <arg>${env.JAVA_HOME}/jre/lib/rt.jar</arg>
|
|
|
- </compilerArgs>
|
|
|
- <compilerArguments>
|
|
|
- <bootclasspath>${env.JAVA_HOME}/jre/lib/rt.jar:${env.JAVA_HOME}/jre/lib/jce.jar</bootclasspath>
|
|
|
- </compilerArguments>
|
|
|
- </configuration>
|
|
|
+ <configuration>
|
|
|
+ <compilerArgs>
|
|
|
+ <arg>-Xlint:deprecation</arg>
|
|
|
+ <arg>${env.JAVA_HOME}/jre/lib/rt.jar</arg>
|
|
|
+ </compilerArgs>
|
|
|
+ <compilerArguments>
|
|
|
+ <bootclasspath>${env.JAVA_HOME}/jre/lib/rt.jar:${env.JAVA_HOME}/jre/lib/jce.jar</bootclasspath>
|
|
|
+ </compilerArguments>
|
|
|
+ </configuration>
|
|
|
</plugin>
|
|
|
</plugins>
|
|
|
</build>
|