Merge branch '1.0.0.M7' into 1.0.x

hellojavaer · hellojavaer · commit 53da6dcfd88c · 2018-01-06T21:21:34.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,24 @@
+*.java.hsp
+*.sonarj
+*.sw*
+jxl.log
+jmx.log
+.settings
+.DS_Store
+.springBeans
+
+classes/
+target/
+
+# Eclipse
+.classpath
+.project
+
+# IDEA
+*.iml
+*.ipr
+*.iws
+.idea
+out
+test-output
+atlassian-ide-plugin.xml
