Merge remote-tracking branch 'origin/master'

c8aef1c3 · zhangzhenglong · b634d0a8 · 7b7388c0 · c8aef1c3 · c8aef1c3
Commit c8aef1c3 authored Oct 11, 2018 by zhangzhenglong
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

Dockerfile Dockerfile +2 -1

README.md README.md +1 -1

MonitorController.java ...uiba/miria/project/test/controller/MonitorController.java +1 -1

No files found.
--- a/Dockerfile
+++ b/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

--- a/README.md
+++ b/README.md
 # readme
-  
\ No newline at end of file
+          
\ No newline at end of file
--- a/src/main/java/cn/com/duiba/miria/project/test/controller/MonitorController.java
+++ b/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;
    }