|
|
@@ -1,13 +1,13 @@
|
|
|
<?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>BI</groupId>
|
|
|
<artifactId>BI</artifactId>
|
|
|
<version>1.0.3-SNAPSHOT</version>
|
|
|
- <packaging>war</packaging>
|
|
|
+ <packaging>jar</packaging>
|
|
|
|
|
|
<name>BI Maven Webapp</name>
|
|
|
<!-- FIXME change it to the project's website -->
|
|
|
@@ -34,7 +34,6 @@
|
|
|
</repositories>
|
|
|
|
|
|
|
|
|
-
|
|
|
<!-- Spring boot 父引用-->
|
|
|
<parent>
|
|
|
<groupId>org.springframework.boot</groupId>
|
|
|
@@ -68,11 +67,11 @@
|
|
|
</dependency>
|
|
|
|
|
|
<!--dao -->
|
|
|
- <dependency>
|
|
|
- <groupId>org.mybatis.spring.boot</groupId>
|
|
|
- <artifactId>mybatis-spring-boot-starter</artifactId>
|
|
|
- <version>1.3.1</version>
|
|
|
- </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>org.mybatis.spring.boot</groupId>
|
|
|
+ <artifactId>mybatis-spring-boot-starter</artifactId>
|
|
|
+ <version>1.3.1</version>
|
|
|
+ </dependency>
|
|
|
|
|
|
<!-- 分页插件 -->
|
|
|
<dependency>
|
|
|
@@ -80,12 +79,11 @@
|
|
|
<artifactId>pagehelper</artifactId>
|
|
|
<version>4.1.0</version>
|
|
|
</dependency>
|
|
|
-
|
|
|
- <dependency>
|
|
|
- <groupId>org.springframework.boot</groupId>
|
|
|
- <artifactId>spring-boot-starter-test</artifactId>
|
|
|
- </dependency>
|
|
|
|
|
|
+ <dependency>
|
|
|
+ <groupId>org.springframework.boot</groupId>
|
|
|
+ <artifactId>spring-boot-starter-test</artifactId>
|
|
|
+ </dependency>
|
|
|
|
|
|
|
|
|
<!--mysql 驱动-->
|
|
|
@@ -99,6 +97,8 @@
|
|
|
<groupId>com.oracle</groupId>
|
|
|
<artifactId>ojdbc7</artifactId>
|
|
|
<version>12.2.0.1.0</version>
|
|
|
+ <scope>system</scope>
|
|
|
+ <systemPath>${basedir}/additional_jars/ojdbc7.jar</systemPath>
|
|
|
</dependency>
|
|
|
|
|
|
<!-- 引入json处理包 -->
|
|
|
@@ -125,17 +125,17 @@
|
|
|
<artifactId>spring-boot-starter-aop</artifactId>
|
|
|
</dependency>
|
|
|
|
|
|
- <dependency>
|
|
|
+ <dependency>
|
|
|
<groupId>com.alibaba</groupId>
|
|
|
<artifactId>druid</artifactId>
|
|
|
<version>0.2.26</version>
|
|
|
- </dependency>
|
|
|
+ </dependency>
|
|
|
|
|
|
- <dependency>
|
|
|
- <groupId>org.springframework.boot</groupId>
|
|
|
- <artifactId>spring-boot-starter-tomcat</artifactId>
|
|
|
- <scope>provided</scope>
|
|
|
- </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>org.springframework.boot</groupId>
|
|
|
+ <artifactId>spring-boot-starter-tomcat</artifactId>
|
|
|
+ <scope>compile</scope>
|
|
|
+ </dependency>
|
|
|
|
|
|
|
|
|
</dependencies>
|
|
|
@@ -144,23 +144,23 @@
|
|
|
<finalName>BI</finalName>
|
|
|
|
|
|
<!--<resources>-->
|
|
|
- <!--<resource>-->
|
|
|
- <!--<directory>src/main/java</directory>-->
|
|
|
- <!--<includes>-->
|
|
|
- <!--<include>**/*.properties</include>-->
|
|
|
- <!--<include>**/*.xml</include>-->
|
|
|
- <!--</includes>-->
|
|
|
- <!--<filtering>false</filtering>-->
|
|
|
- <!--</resource>-->
|
|
|
- <!--<resource>-->
|
|
|
- <!--<directory>src/main/resources</directory>-->
|
|
|
- <!--<includes>-->
|
|
|
- <!--<include>application.properties</include>-->
|
|
|
- <!--<!–<include>config/dao-config.xml</include>–>-->
|
|
|
- <!--<include>config/mybatis/*.xml</include>-->
|
|
|
- <!--</includes>-->
|
|
|
- <!--<filtering>false</filtering>-->
|
|
|
- <!--</resource>-->
|
|
|
+ <!--<resource>-->
|
|
|
+ <!--<directory>src/main/java</directory>-->
|
|
|
+ <!--<includes>-->
|
|
|
+ <!--<include>**/*.properties</include>-->
|
|
|
+ <!--<include>**/*.xml</include>-->
|
|
|
+ <!--</includes>-->
|
|
|
+ <!--<filtering>false</filtering>-->
|
|
|
+ <!--</resource>-->
|
|
|
+ <!--<resource>-->
|
|
|
+ <!--<directory>src/main/resources</directory>-->
|
|
|
+ <!--<includes>-->
|
|
|
+ <!--<include>application.properties</include>-->
|
|
|
+ <!--<!–<include>config/dao-config.xml</include>–>-->
|
|
|
+ <!--<include>config/mybatis/*.xml</include>-->
|
|
|
+ <!--</includes>-->
|
|
|
+ <!--<filtering>false</filtering>-->
|
|
|
+ <!--</resource>-->
|
|
|
<!--</resources>-->
|
|
|
|
|
|
<pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
|
|
|
@@ -196,26 +196,26 @@
|
|
|
</plugin>
|
|
|
|
|
|
<!--<plugin>-->
|
|
|
- <!--<groupId>org.mybatis.generator</groupId>-->
|
|
|
- <!--<artifactId>mybatis-generator-maven-plugin</artifactId>-->
|
|
|
- <!--<version>1.3.6</version>-->
|
|
|
- <!--<executions>-->
|
|
|
- <!--<execution>-->
|
|
|
- <!--<id>Generate MyBatis Artifacts</id>-->
|
|
|
- <!--<phase>package</phase>-->
|
|
|
- <!--<goals>-->
|
|
|
- <!--<goal>generate</goal>-->
|
|
|
- <!--</goals>-->
|
|
|
- <!--</execution>-->
|
|
|
- <!--</executions>-->
|
|
|
- <!--<configuration>-->
|
|
|
- <!--<!– generator 工具配置文件的位置 –>-->
|
|
|
- <!--<configurationFile>src/main/resources/config/generatorConfig.xml</configurationFile>-->
|
|
|
- <!--<!–允许移动生成的文件 –>-->
|
|
|
- <!--<verbose>true</verbose>-->
|
|
|
- <!--<!– 是否覆盖 –>-->
|
|
|
- <!--<overwrite>true</overwrite>-->
|
|
|
- <!--</configuration>-->
|
|
|
+ <!--<groupId>org.mybatis.generator</groupId>-->
|
|
|
+ <!--<artifactId>mybatis-generator-maven-plugin</artifactId>-->
|
|
|
+ <!--<version>1.3.6</version>-->
|
|
|
+ <!--<executions>-->
|
|
|
+ <!--<execution>-->
|
|
|
+ <!--<id>Generate MyBatis Artifacts</id>-->
|
|
|
+ <!--<phase>package</phase>-->
|
|
|
+ <!--<goals>-->
|
|
|
+ <!--<goal>generate</goal>-->
|
|
|
+ <!--</goals>-->
|
|
|
+ <!--</execution>-->
|
|
|
+ <!--</executions>-->
|
|
|
+ <!--<configuration>-->
|
|
|
+ <!--<!– generator 工具配置文件的位置 –>-->
|
|
|
+ <!--<configurationFile>src/main/resources/config/generatorConfig.xml</configurationFile>-->
|
|
|
+ <!--<!–允许移动生成的文件 –>-->
|
|
|
+ <!--<verbose>true</verbose>-->
|
|
|
+ <!--<!– 是否覆盖 –>-->
|
|
|
+ <!--<overwrite>true</overwrite>-->
|
|
|
+ <!--</configuration>-->
|
|
|
<!--</plugin>-->
|
|
|
|
|
|
<plugin>
|
|
|
@@ -224,6 +224,7 @@
|
|
|
<configuration>
|
|
|
<!--fork : 如果没有该项配置,devtools不会起作用,即应用不会restart加载器 -->
|
|
|
<fork>true</fork>
|
|
|
+ <includeSystemScope>true</includeSystemScope>
|
|
|
</configuration>
|
|
|
</plugin>
|
|
|
|