Compare commits

...

No commits in common. 'dev' and 'prod' have entirely different histories.
dev ... prod

  1. 3
      README.md
  2. 1
      src/main/java/cn/wolfcode/SpringBootDockerServer.java
  3. 1
      src/main/java/cn/wolfcode/controller/UserController.java

3
README.md

@ -0,0 +1,3 @@
# springboot-demo
springboot-demo

1
src/main/java/cn/wolfcode/SpringBootDockerServer.java

@ -3,6 +3,7 @@ package cn.wolfcode;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
//生产分支
@SpringBootApplication @SpringBootApplication
public class SpringBootDockerServer { public class SpringBootDockerServer {

1
src/main/java/cn/wolfcode/controller/UserController.java

@ -16,7 +16,6 @@ public class UserController {
HashMap<Object, Object> map = new HashMap<>(); HashMap<Object, Object> map = new HashMap<>();
map.put("id", Math.random() + 1); map.put("id", Math.random() + 1);
map.put("name", name); map.put("name", name);
map.put("test", "test");
return map; return map;
} }
} }

Loading…
Cancel
Save