# Conflicts:
#	pom.xml
#	src/main/java/cn/quantgroup/xyqb/Bootstrap.java
#	src/main/resources/META-INF/app.properties
#	src/test/java/demo/MockMvcTests.java
#	src/test/java/demo/MvcTests.java
#	src/test/java/demo/ParametersJunit5Tests.java
#	src/test/java/demo/RepsitoryJpaTests.java
#	src/test/java/demo/RepsitoryTests.java
#	src/test/java/demo/ServiceTests.java
#	src/test/java/demo/WebTests.java
#	src/test/resources/META-INF/app.properties

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/Bootstrap.java

# Conflicts:
#	pom.xml
#	src/main/java/cn/quantgroup/xyqb/Bootstrap.java

提交单元测试用例

Merge branch 'feature/201801041612' of http://git.quantgroup.cn/head_group/xyqb-user2 into feature/201801041612

security.sessions=if_required
spring.aop.proxy-target-class=true
因此删除废弃的配置文件

# Conflicts:
#	src/main/resources/config/test/logback.xml