|
|
@@ -1,5 +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"
|
|
|
+<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/maven-v4_0_0.xsd">
|
|
|
|
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
@@ -20,35 +21,35 @@
|
|
|
<org.aspectj-version>1.6.10</org.aspectj-version>
|
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
|
</properties>
|
|
|
- <profiles>
|
|
|
- <profile>
|
|
|
- <id>aft_local</id>
|
|
|
- <activation>
|
|
|
- <activeByDefault>true</activeByDefault>
|
|
|
- </activation>
|
|
|
- <properties>
|
|
|
- <profiles.activation>local</profiles.activation>
|
|
|
- </properties>
|
|
|
- </profile>
|
|
|
- <profile>
|
|
|
- <id>aft_dev</id>
|
|
|
- <properties>
|
|
|
- <profiles.activation>dev</profiles.activation>
|
|
|
- </properties>
|
|
|
- </profile>
|
|
|
- <profile>
|
|
|
- <id>aft_prod</id>
|
|
|
- <properties>
|
|
|
- <profiles.activation>prod</profiles.activation>
|
|
|
- </properties>
|
|
|
- </profile>
|
|
|
- <profile>
|
|
|
- <id>aft_test</id>
|
|
|
- <properties>
|
|
|
- <profiles.activation>test</profiles.activation>
|
|
|
- </properties>
|
|
|
- </profile>
|
|
|
- </profiles>
|
|
|
+ <profiles>
|
|
|
+ <profile>
|
|
|
+ <id>aft_local</id>
|
|
|
+ <activation>
|
|
|
+ <activeByDefault>true</activeByDefault>
|
|
|
+ </activation>
|
|
|
+ <properties>
|
|
|
+ <profiles.activation>local</profiles.activation>
|
|
|
+ </properties>
|
|
|
+ </profile>
|
|
|
+ <profile>
|
|
|
+ <id>aft_dev</id>
|
|
|
+ <properties>
|
|
|
+ <profiles.activation>dev</profiles.activation>
|
|
|
+ </properties>
|
|
|
+ </profile>
|
|
|
+ <profile>
|
|
|
+ <id>aft_prod</id>
|
|
|
+ <properties>
|
|
|
+ <profiles.activation>prod</profiles.activation>
|
|
|
+ </properties>
|
|
|
+ </profile>
|
|
|
+ <profile>
|
|
|
+ <id>aft_test</id>
|
|
|
+ <properties>
|
|
|
+ <profiles.activation>test</profiles.activation>
|
|
|
+ </properties>
|
|
|
+ </profile>
|
|
|
+ </profiles>
|
|
|
|
|
|
<dependencies>
|
|
|
<!-- spring -->
|
|
|
@@ -70,27 +71,28 @@
|
|
|
<version>${org.springframework-version}</version>
|
|
|
</dependency>
|
|
|
|
|
|
- <dependency>
|
|
|
- <groupId>javax.annotation</groupId>
|
|
|
- <artifactId>jsr250-api</artifactId>
|
|
|
- <version>1.0</version>
|
|
|
- </dependency>
|
|
|
- <!-- hibernate-validator -->
|
|
|
- <dependency>
|
|
|
- <groupId>org.hibernate</groupId>
|
|
|
- <artifactId>hibernate-validator</artifactId>
|
|
|
- <version>5.4.0.Final</version>
|
|
|
- </dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>javax.xml.bind</groupId>
|
|
|
- <artifactId>jaxb-api</artifactId>
|
|
|
- <version>2.3.0</version>
|
|
|
- </dependency>
|
|
|
-<dependency>
|
|
|
- <groupId>de.dfki.cos.basys.platform.wrapper-bundle-settings</groupId>
|
|
|
- <artifactId>javax.websocket-api</artifactId>
|
|
|
- <version>0.2.6</version>
|
|
|
-</dependency>
|
|
|
+
|
|
|
+ <dependency>
|
|
|
+ <groupId>javax.annotation</groupId>
|
|
|
+ <artifactId>jsr250-api</artifactId>
|
|
|
+ <version>1.0</version>
|
|
|
+ </dependency>
|
|
|
+ <!-- hibernate-validator -->
|
|
|
+ <dependency>
|
|
|
+ <groupId>org.hibernate</groupId>
|
|
|
+ <artifactId>hibernate-validator</artifactId>
|
|
|
+ <version>5.4.0.Final</version>
|
|
|
+ </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>javax.xml.bind</groupId>
|
|
|
+ <artifactId>jaxb-api</artifactId>
|
|
|
+ <version>2.3.0</version>
|
|
|
+ </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>de.dfki.cos.basys.platform.wrapper-bundle-settings</groupId>
|
|
|
+ <artifactId>javax.websocket-api</artifactId>
|
|
|
+ <version>0.2.6</version>
|
|
|
+ </dependency>
|
|
|
<dependency>
|
|
|
<groupId>org.springframework</groupId>
|
|
|
<artifactId>spring-webmvc</artifactId>
|
|
|
@@ -117,28 +119,28 @@
|
|
|
<artifactId>spring-messaging</artifactId>
|
|
|
<version>${org.springframework-version}</version>
|
|
|
</dependency>
|
|
|
-
|
|
|
+
|
|
|
<dependency>
|
|
|
- <groupId>org.springframework.data</groupId>
|
|
|
- <artifactId>spring-data-redis</artifactId>
|
|
|
- <version>1.8.3.RELEASE</version>
|
|
|
+ <groupId>org.springframework.data</groupId>
|
|
|
+ <artifactId>spring-data-redis</artifactId>
|
|
|
+ <version>1.8.3.RELEASE</version>
|
|
|
</dependency>
|
|
|
-
|
|
|
+
|
|
|
<dependency>
|
|
|
- <groupId>org.thymeleaf</groupId>
|
|
|
- <artifactId>thymeleaf-spring4</artifactId>
|
|
|
- <version>3.0.5.RELEASE</version>
|
|
|
+ <groupId>org.thymeleaf</groupId>
|
|
|
+ <artifactId>thymeleaf-spring4</artifactId>
|
|
|
+ <version>3.0.5.RELEASE</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
- <groupId>nz.net.ultraq.thymeleaf</groupId>
|
|
|
- <artifactId>thymeleaf-layout-dialect</artifactId>
|
|
|
- <version>2.2.1</version>
|
|
|
+ <groupId>nz.net.ultraq.thymeleaf</groupId>
|
|
|
+ <artifactId>thymeleaf-layout-dialect</artifactId>
|
|
|
+ <version>2.2.1</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
- <groupId>com.github.theborakompanioni</groupId>
|
|
|
- <artifactId>thymeleaf-extras-shiro</artifactId>
|
|
|
- <version>2.0.0</version>
|
|
|
- </dependency>
|
|
|
+ <groupId>com.github.theborakompanioni</groupId>
|
|
|
+ <artifactId>thymeleaf-extras-shiro</artifactId>
|
|
|
+ <version>2.0.0</version>
|
|
|
+ </dependency>
|
|
|
<!-- spring end -->
|
|
|
|
|
|
<!-- redis begin -->
|
|
|
@@ -341,33 +343,33 @@
|
|
|
<artifactId>classmate</artifactId>
|
|
|
<version>1.1.0</version>
|
|
|
</dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>com.googlecode.json-simple</groupId>
|
|
|
- <artifactId>json-simple</artifactId>
|
|
|
- <version>1.1.1</version>
|
|
|
+ <dependency>
|
|
|
+ <groupId>com.googlecode.json-simple</groupId>
|
|
|
+ <artifactId>json-simple</artifactId>
|
|
|
+ <version>1.1.1</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
- <groupId>org.apache.poi</groupId>
|
|
|
- <artifactId>poi-ooxml</artifactId>
|
|
|
- <version>3.17</version>
|
|
|
+ <groupId>org.apache.poi</groupId>
|
|
|
+ <artifactId>poi-ooxml</artifactId>
|
|
|
+ <version>3.17</version>
|
|
|
</dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>com.aliyun</groupId>
|
|
|
- <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
|
|
|
- <version>1.0.0</version>
|
|
|
+ <dependency>
|
|
|
+ <groupId>com.aliyun</groupId>
|
|
|
+ <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
|
|
|
+ <version>1.0.0</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>com.aliyun</groupId>
|
|
|
<artifactId>aliyun-java-sdk-core</artifactId>
|
|
|
<version>3.5.0</version>
|
|
|
</dependency>
|
|
|
- <dependency>
|
|
|
+ <dependency>
|
|
|
<groupId>org.apache.httpcomponents</groupId>
|
|
|
<artifactId>httpasyncclient</artifactId>
|
|
|
<version>4.1.3</version>
|
|
|
</dependency>
|
|
|
-
|
|
|
- <!-- jpush -->
|
|
|
+
|
|
|
+ <!-- jpush -->
|
|
|
<dependency>
|
|
|
<groupId>cn.jpush.api</groupId>
|
|
|
<artifactId>jiguang-common</artifactId>
|
|
|
@@ -386,9 +388,9 @@
|
|
|
</dependency>
|
|
|
<!-- javaMail -->
|
|
|
<dependency>
|
|
|
- <groupId>javax.mail</groupId>
|
|
|
- <artifactId>mail</artifactId>
|
|
|
- <version>1.4.7</version>
|
|
|
+ <groupId>javax.mail</groupId>
|
|
|
+ <artifactId>mail</artifactId>
|
|
|
+ <version>1.4.7</version>
|
|
|
</dependency>
|
|
|
</dependencies>
|
|
|
<build>
|
|
|
@@ -425,45 +427,45 @@
|
|
|
<skip>true</skip>
|
|
|
</configuration>
|
|
|
</plugin>
|
|
|
- <plugin>
|
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
|
|
- <artifactId>maven-surefire-plugin</artifactId>
|
|
|
- <version>2.5</version>
|
|
|
- <configuration>
|
|
|
- <skip>true</skip>
|
|
|
- </configuration>
|
|
|
- </plugin>
|
|
|
- <plugin>
|
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
|
|
- <artifactId>maven-war-plugin</artifactId>
|
|
|
- <version>3.1.0</version>
|
|
|
- <configuration>
|
|
|
- <warName>${profiles.activation}</warName>
|
|
|
- <!-- 激活spring profile -->
|
|
|
- <webResources>
|
|
|
- <resource>
|
|
|
- <filtering>true</filtering>
|
|
|
- <directory>src/main/webapp</directory>
|
|
|
- <includes>
|
|
|
- <include>**/**</include>
|
|
|
- </includes>
|
|
|
- </resource>
|
|
|
- <resource>
|
|
|
- <filtering>true</filtering>
|
|
|
- <directory>src/main/resources</directory>
|
|
|
- <targetPath>WEB-INF/classes</targetPath>
|
|
|
- <includes>
|
|
|
- <include>**/**</include>
|
|
|
- </includes>
|
|
|
- </resource>
|
|
|
- </webResources>
|
|
|
- <warSourceDirectory>src/main/webapp</warSourceDirectory>
|
|
|
- <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
|
|
|
- </configuration>
|
|
|
+ <plugin>
|
|
|
+ <groupId>org.apache.maven.plugins</groupId>
|
|
|
+ <artifactId>maven-surefire-plugin</artifactId>
|
|
|
+ <version>2.5</version>
|
|
|
+ <configuration>
|
|
|
+ <skip>true</skip>
|
|
|
+ </configuration>
|
|
|
+ </plugin>
|
|
|
+ <plugin>
|
|
|
+ <groupId>org.apache.maven.plugins</groupId>
|
|
|
+ <artifactId>maven-war-plugin</artifactId>
|
|
|
+ <version>3.1.0</version>
|
|
|
+ <configuration>
|
|
|
+ <warName>${profiles.activation}</warName>
|
|
|
+ <!-- 激活spring profile -->
|
|
|
+ <webResources>
|
|
|
+ <resource>
|
|
|
+ <filtering>true</filtering>
|
|
|
+ <directory>src/main/webapp</directory>
|
|
|
+ <includes>
|
|
|
+ <include>**/**</include>
|
|
|
+ </includes>
|
|
|
+ </resource>
|
|
|
+ <resource>
|
|
|
+ <filtering>true</filtering>
|
|
|
+ <directory>src/main/resources</directory>
|
|
|
+ <targetPath>WEB-INF/classes</targetPath>
|
|
|
+ <includes>
|
|
|
+ <include>**/**</include>
|
|
|
+ </includes>
|
|
|
+ </resource>
|
|
|
+ </webResources>
|
|
|
+ <warSourceDirectory>src/main/webapp</warSourceDirectory>
|
|
|
+ <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
|
|
|
+ </configuration>
|
|
|
</plugin>
|
|
|
</plugins>
|
|
|
</build>
|
|
|
-
|
|
|
+
|
|
|
<repositories>
|
|
|
<repository>
|
|
|
<id>aliyun-repos</id>
|
|
|
@@ -475,7 +477,7 @@
|
|
|
</repositories>
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
<pluginRepositories>
|
|
|
<pluginRepository>
|
|
|
<id>aliyun-plugin</id>
|