Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
caopu16
whatsmars
提交
339aa8b7
W
whatsmars
项目概览
caopu16
/
whatsmars
与 Fork 源项目一致
Fork自
武汉红喜 / whatsmars
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
W
whatsmars
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
339aa8b7
编写于
12月 23, 2017
作者:
武汉红喜
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mybatis相关jar包版本一致化
上级
f9003a25
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
12 addition
and
53 deletion
+12
-53
pom.xml
pom.xml
+6
-5
whatsmars-dbrouter/pom.xml
whatsmars-dbrouter/pom.xml
+0
-4
whatsmars-earth/whatsmars-earth-dao/pom.xml
whatsmars-earth/whatsmars-earth-dao/pom.xml
+1
-0
whatsmars-earth/whatsmars-earth-support-web/pom.xml
whatsmars-earth/whatsmars-earth-support-web/pom.xml
+4
-5
whatsmars-spring-boot/pom.xml
whatsmars-spring-boot/pom.xml
+1
-37
whatsmars-spring-boot/src/main/java/com/whatsmars/spring/boot/App.java
...ing-boot/src/main/java/com/whatsmars/spring/boot/App.java
+0
-2
未找到文件。
pom.xml
浏览文件 @
339aa8b7
...
...
@@ -29,11 +29,11 @@
</modules>
<properties>
<
spring-boot.version>
1.5.9.RELEASE
</spring-boot.version
>
<spring
.version>
4.3.13.RELEASE
</spring
.version>
<
mybatis.version>
3.4.0
</mybatis
.version>
<
servlet.version>
3.1.0
</servlet
.version>
<mybatis-spring.version>
1.
2.2
</mybatis-spring.version>
<
!-- 重要:各依赖之间,版本尽量对应 --
>
<spring
-boot.version>
1.5.6.RELEASE
</spring-boot
.version>
<
spring.version>
4.3.10.RELEASE
</spring
.version>
<
mybatis.version>
3.4.5
</mybatis
.version>
<mybatis-spring.version>
1.
3.1
</mybatis-spring.version>
<commons-dbcp.version>
1.4
</commons-dbcp.version>
<mysql-connector-java.version>
5.1.32
</mysql-connector-java.version>
<commons-lang.version>
2.6
</commons-lang.version>
...
...
@@ -41,6 +41,7 @@
<commons-codec.version>
1.10
</commons-codec.version>
<commons-fileupload.version>
1.3.1
</commons-fileupload.version>
<log4j.version>
1.2.17
</log4j.version>
<servlet.version>
3.1.0
</servlet.version>
<velocity.version>
1.7
</velocity.version>
<velocity-tools.version>
2.0
</velocity-tools.version>
<json-lib.version>
2.4
</json-lib.version>
...
...
whatsmars-dbrouter/pom.xml
浏览文件 @
339aa8b7
...
...
@@ -55,10 +55,6 @@
<artifactId>
aspectjtools
</artifactId>
</dependency>
<dependency>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-api
</artifactId>
</dependency>
<dependency>
<groupId>
log4j
</groupId>
<artifactId>
log4j
</artifactId>
...
...
whatsmars-earth/whatsmars-earth-dao/pom.xml
浏览文件 @
339aa8b7
...
...
@@ -32,6 +32,7 @@
<dependency>
<groupId>
org.mybatis
</groupId>
<artifactId>
mybatis
</artifactId>
<version>
3.2.7
</version>
</dependency>
</dependencies>
...
...
whatsmars-earth/whatsmars-earth-support-web/pom.xml
浏览文件 @
339aa8b7
...
...
@@ -22,11 +22,6 @@
<artifactId>
whatsmars-earth-service
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>
com.whatsmars
</groupId>
<artifactId>
whatsmars-common
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
...
...
@@ -45,6 +40,10 @@
<artifactId>
spring-jdbc
</artifactId>
</dependency>
<dependency>
<groupId>
org.mybatis
</groupId>
<artifactId>
mybatis
</artifactId>
</dependency>
<dependency>
<groupId>
org.mybatis
</groupId>
<artifactId>
mybatis-spring
</artifactId>
...
...
whatsmars-spring-boot/pom.xml
浏览文件 @
339aa8b7
...
...
@@ -38,12 +38,6 @@
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-web
</artifactId>
<exclusions>
<exclusion>
<groupId>
ch.qos.logback
</groupId>
<artifactId>
logback-classic
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
...
...
@@ -53,12 +47,6 @@
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-actuator
</artifactId>
<exclusions>
<exclusion>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-logging
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
...
...
@@ -75,21 +63,7 @@
<dependency>
<groupId>
org.mybatis.spring.boot
</groupId>
<artifactId>
mybatis-spring-boot-starter
</artifactId>
<version>
1.3.0
</version>
<exclusions>
<exclusion>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-logging
</artifactId>
</exclusion>
<exclusion>
<groupId>
ch.qos.logback
</groupId>
<artifactId>
logback-classic
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
commons-dbcp
</groupId>
<artifactId>
commons-dbcp
</artifactId>
<version>
1.3.1
</version>
</dependency>
<dependency>
<groupId>
mysql
</groupId>
...
...
@@ -110,12 +84,6 @@
<groupId>
io.springfox
</groupId>
<artifactId>
springfox-swagger2
</artifactId>
<version>
2.5.0
</version>
<exclusions>
<exclusion>
<groupId>
com.google.guava
</groupId>
<artifactId>
guava
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
io.springfox
</groupId>
...
...
@@ -128,10 +96,6 @@
<groupId>
com.google.code.gson
</groupId>
<artifactId>
gson
</artifactId>
</dependency>
<dependency>
<groupId>
com.google.guava
</groupId>
<artifactId>
guava
</artifactId>
</dependency>
</dependencies>
<build>
...
...
whatsmars-spring-boot/src/main/java/com/whatsmars/spring/boot/App.java
浏览文件 @
339aa8b7
...
...
@@ -9,8 +9,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@EnableScheduling
@SpringBootApplication
// 加上exclude=DataSource..后,不会连接数据库,同时@Mapper也不会起作用
//@EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class})
@EnableConfigurationProperties
({
UserConfig
.
class
})
@ImportResource
(
locations
={
"classpath*:spring/*.xml"
})
public
class
App
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录