Merge branch 'master' into 'develop'

# Conflicts:
#   README.md

Dockerfile

-FROM registry.cn-hangzhou.aliyuncs.com/duiba/duiba-jdk8
+#FROM registry.cn-hangzhou.aliyuncs.com/duiba/duiba-jdk8
+FROM harbor.dui88.com/library/build_image:jdk131
 MAINTAINER op@duiba.com.cn
 ARG appname
 ARG environment

README.md

- # readmwwww
+# readme
           
\ No newline at end of file

build.gradle

@@ -63,7 +63,7 @@ dependencyManagement {
     dependencies {
 
         imports {
-            mavenBom 'cn.com.duiba.boot:spring-boot-ext-dependencies:1.2.112'
+            mavenBom 'cn.com.duiba.boot:spring-boot-ext-dependencies:1.2.224.log'
             mavenBom "org.springframework.boot:spring-boot-dependencies:${springBootVersion}"
             mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Edgware.RELEASE'
         }

src/main/java/cn/com/duiba/miria/project/test/controller/MonitorController.java

@@ -37,7 +37,7 @@ public class MonitorController {
     @ResponseBody
     public String test(){
         String res="ok";
-        log.info("连接{}",res);
+        log.info("连接12{}",res);
         return res;
     }
 

src/test/java/cn/com/duiba/miria/project/test/BaseTest.java

@@ -12,4 +12,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @AutoConfigureMockMvc
 public abstract class BaseTest {
 
+
+
 }