From ee0e4c362e299f9be9a3859d0c142f26871cacf6 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 15:12:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2
---
pom.xml | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4a7576c..cc12fb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,8 +5,8 @@
<groupId>com.moral</groupId>
<artifactId>screen_api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <version>1.0.0</version>
+ <packaging>war</packaging>
<name>screen_api</name>
<description>Screen API</description>
@@ -95,11 +95,11 @@
<artifactId>mysql-connector-java</artifactId>
<version>5.1.44</version>
</dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -110,9 +110,40 @@
<artifactId>fastjson</artifactId>
<version>1.2.39</version>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>net.sourceforge.jexcelapi</groupId>
+ <artifactId>jxl</artifactId>
+ <version>2.6.12</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.json-lib</groupId>
+ <artifactId>json-lib</artifactId>
+ <version>2.4</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.16.18</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.github.pagehelper</groupId>
+ <artifactId>pagehelper</artifactId>
+ <version>4.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>tk.mybatis</groupId>
+ <artifactId>mapper</artifactId>
+ <version>3.3.9</version>
+ </dependency>
+ </dependencies>
<build>
+ <finalName>screen_api_v2</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
--
Gitblit v1.8.0