Merge branch 'master' of http://47.113.125.203:3000/root/springboot-demo

.gitignore

@@ -0,0 +1,14 @@
+# ---> Java
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+

README.md

@@ -0,0 +1,3 @@
+# springboot-demo
+
+springboot集成各种框架