Merge branch 'develop' into test1

Dockerfile

@@ -8,4 +8,5 @@ ADD ./duiba-deploy /root/duiba-deploy/
 
 ADD ./scripts /root/scripts
 #define entry point which will be run first when the container starts up
+
 ENTRYPOINT java $JAVA_OPS -jar /root/duiba-deploy/$appname.jar --spring.profiles.active=$SPRING_ENV --spring.cloud.config.uri=$CONFIG_SERVER
\ No newline at end of file

README.md

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

build.gradle

@@ -12,6 +12,7 @@ buildscript {
         maven { url 'http://repo.spring.io/plugins-release' }
         mavenCentral()
     }
+    
     dependencies {
         classpath "io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.5' //sonarqube
@@ -44,7 +45,6 @@ jar {
     archiveName = "miria-project-test.jar"
     manifest { attributes 'Main-Class': 'cn.com.duiba.miria.project.test.Application' }
 }
-
 configurations {
     all*.exclude group: 'log4j', module: 'log4j'
     all*.exclude group: 'org.slf4j', module: 'slf4j-log4j12'
@@ -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'
         }
@@ -134,8 +134,8 @@ uploadArchives {
             }
         }
     }
-}
     
+}
 task listJars(description: 'Display all compile jars.') << {
     configurations.compile.each { File file -> println file.name }
 }

settings.gradle

 rootProject.name = 'miria-project-test'
+
+
+
+

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 {
 
+
+
 }

test.txt

+git checkout -b dev
+git checkout -b dev