merge

2018-05-09 22:49:17 +08:00
parent 2bad94abcf
commit 87cd64e466
1 changed files with 22 additions and 8 deletions
@@ -1,19 +1,33 @@
 ### springboot多模块 #####################

-logs
-*/target
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+*/.project
+*/.classpath
+*/.settings
+
 ### IntelliJ IDEA ###
 .idea
-*.iml
 *.iws
+*.iml
 *.ipr
 */*.iml
+
 ### maven ###
 mvnw
 mvnw.cmd
 .mvn
-### eclipse ###
-.settings
-*/.project
-*/.classpath
-*/.settings
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/