diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..6d60e09
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,3 @@
+language: java
+services:
+- docker
diff --git a/angle-bus/bus-rabbitmq/.gitignore b/angle-bus/bus-rabbitmq/.gitignore
new file mode 100644
index 0000000..d815164
--- /dev/null
+++ b/angle-bus/bus-rabbitmq/.gitignore
@@ -0,0 +1,26 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+*.properties
\ No newline at end of file
diff --git a/angle-bus/src/main/resources/application.properties b/angle-bus/src/main/resources/application.properties
deleted file mode 100644
index b80e629..0000000
--- a/angle-bus/src/main/resources/application.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-server.port=8022
-spring.application.name=service-bus
-
-eureka.client.serviceUrl.defaultZone=http://localhost:8010/eureka/
-
-#rabbitmq
-spring.rabbitmq.host=118.24.*.*
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=*
-spring.rabbitmq.password=*
-
-## \u5237\u65B0\u65F6\uFF0C\u5173\u95ED\u5B89\u5168\u9A8C\u8BC1
-management.security.enabled=false
-## \u5F00\u542F\u6D88\u606F\u8DDF\u8E2A
-spring.cloud.bus.trace.enabled=true
-
-swagger.base-package=com.github
-swagger.exclude-path=/error**
diff --git a/angle-business/business-auth/.gitignore b/angle-business/business-auth/.gitignore
new file mode 100644
index 0000000..d5dba20
--- /dev/null
+++ b/angle-business/business-auth/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
diff --git a/angle-business/business-feign/.gitignore b/angle-business/business-feign/.gitignore
new file mode 100644
index 0000000..1a8cb12
--- /dev/null
+++ b/angle-business/business-feign/.gitignore
@@ -0,0 +1,26 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
diff --git a/angle-gateway/.gitignore b/angle-common/common-core/.gitignore
similarity index 100%
rename from angle-gateway/.gitignore
rename to angle-common/common-core/.gitignore
diff --git a/angle-common/common-mapper/.gitignore b/angle-common/common-mapper/.gitignore
new file mode 100644
index 0000000..82eca33
--- /dev/null
+++ b/angle-common/common-mapper/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
\ No newline at end of file
diff --git a/angle-common/common-model/.gitignore b/angle-common/common-model/.gitignore
new file mode 100644
index 0000000..82eca33
--- /dev/null
+++ b/angle-common/common-model/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
\ No newline at end of file
diff --git a/angle-common/common-service/.gitignore b/angle-common/common-service/.gitignore
new file mode 100644
index 0000000..82eca33
--- /dev/null
+++ b/angle-common/common-service/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
\ No newline at end of file
diff --git a/angle-config/config-client/src/main/java/com/github/configclient/ConfigClientApplication.java b/angle-config/config-client/src/main/java/com/github/configclient/ConfigClientApplication.java
index 0bd4d8a..c49cb75 100644
--- a/angle-config/config-client/src/main/java/com/github/configclient/ConfigClientApplication.java
+++ b/angle-config/config-client/src/main/java/com/github/configclient/ConfigClientApplication.java
@@ -23,7 +23,7 @@ public static void main(String[] args) {
System.out.println(new StringBuffer(line).append("\n http://localhost:8015 \n").append(line));
}
- @Value("${name}")
+// @Value("${name}")
private String name;
@GetMapping("/name")
diff --git a/angle-consul/.gitignore b/angle-consul/.gitignore
new file mode 100644
index 0000000..82eca33
--- /dev/null
+++ b/angle-consul/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
\ No newline at end of file
diff --git a/angle-zuul/README.md b/angle-gateway/gateway-zuul/README.md
similarity index 100%
rename from angle-zuul/README.md
rename to angle-gateway/gateway-zuul/README.md
diff --git a/angle-zuul/pom.xml b/angle-gateway/gateway-zuul/pom.xml
similarity index 97%
rename from angle-zuul/pom.xml
rename to angle-gateway/gateway-zuul/pom.xml
index e87ed97..8408bed 100644
--- a/angle-zuul/pom.xml
+++ b/angle-gateway/gateway-zuul/pom.xml
@@ -5,7 +5,7 @@
4.0.0
com.github
- angle-zuul
+ gateway-zuul
0.0.1-SNAPSHOT
jar
@@ -14,7 +14,7 @@
com.github
- angle-cloud
+ angle-gateway
1.0-SNAPSHOT
diff --git a/angle-zuul/src/main/java/com/github/zuul/ZuulApplication.java b/angle-gateway/gateway-zuul/src/main/java/com/github/zuul/ZuulApplication.java
similarity index 100%
rename from angle-zuul/src/main/java/com/github/zuul/ZuulApplication.java
rename to angle-gateway/gateway-zuul/src/main/java/com/github/zuul/ZuulApplication.java
diff --git a/angle-zuul/src/main/java/com/github/zuul/config/CorsConfig.java b/angle-gateway/gateway-zuul/src/main/java/com/github/zuul/config/CorsConfig.java
similarity index 100%
rename from angle-zuul/src/main/java/com/github/zuul/config/CorsConfig.java
rename to angle-gateway/gateway-zuul/src/main/java/com/github/zuul/config/CorsConfig.java
diff --git a/angle-zuul/src/main/java/com/github/zuul/config/FilterConfig.java b/angle-gateway/gateway-zuul/src/main/java/com/github/zuul/config/FilterConfig.java
similarity index 100%
rename from angle-zuul/src/main/java/com/github/zuul/config/FilterConfig.java
rename to angle-gateway/gateway-zuul/src/main/java/com/github/zuul/config/FilterConfig.java
diff --git a/angle-zuul/src/main/java/com/github/zuul/handler/ClientFallback.java b/angle-gateway/gateway-zuul/src/main/java/com/github/zuul/handler/ClientFallback.java
similarity index 100%
rename from angle-zuul/src/main/java/com/github/zuul/handler/ClientFallback.java
rename to angle-gateway/gateway-zuul/src/main/java/com/github/zuul/handler/ClientFallback.java
diff --git a/angle-zuul/src/main/java/com/github/zuul/handler/MyFilter.java b/angle-gateway/gateway-zuul/src/main/java/com/github/zuul/handler/MyFilter.java
similarity index 100%
rename from angle-zuul/src/main/java/com/github/zuul/handler/MyFilter.java
rename to angle-gateway/gateway-zuul/src/main/java/com/github/zuul/handler/MyFilter.java
diff --git a/angle-zuul/src/test/java/com/github/zuul/ZuulApplicationTests.java b/angle-gateway/gateway-zuul/src/test/java/com/github/zuul/ZuulApplicationTests.java
similarity index 100%
rename from angle-zuul/src/test/java/com/github/zuul/ZuulApplicationTests.java
rename to angle-gateway/gateway-zuul/src/test/java/com/github/zuul/ZuulApplicationTests.java
diff --git a/angle-gateway/gateway/pom.xml b/angle-gateway/gateway/pom.xml
new file mode 100644
index 0000000..e0fe143
--- /dev/null
+++ b/angle-gateway/gateway/pom.xml
@@ -0,0 +1,56 @@
+
+
+ 4.0.0
+
+ com.github
+ gateway
+ 0.0.1-SNAPSHOT
+ jar
+
+ gateway
+ gateway
+
+
+ com.github
+ angle-gateway
+ 1.0-SNAPSHOT
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+
+
+ org.springframework.cloud
+ spring-cloud-starter-gateway
+
+
+ org.springframework.cloud
+ spring-cloud-starter-netflix-eureka-client
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+ org.springframework.cloud
+ spring-cloud-starter-netflix-hystrix
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
diff --git a/angle-gateway/src/main/java/com/github/gateway/GatewayApplication.java b/angle-gateway/gateway/src/main/java/com/github/gateway/GatewayApplication.java
similarity index 100%
rename from angle-gateway/src/main/java/com/github/gateway/GatewayApplication.java
rename to angle-gateway/gateway/src/main/java/com/github/gateway/GatewayApplication.java
diff --git a/angle-gateway/src/main/resources/application-dev.yml b/angle-gateway/gateway/src/main/resources/application-dev.yml
similarity index 100%
rename from angle-gateway/src/main/resources/application-dev.yml
rename to angle-gateway/gateway/src/main/resources/application-dev.yml
diff --git a/angle-gateway/src/test/java/com/github/gateway/GatewayApplicationTests.java b/angle-gateway/gateway/src/test/java/com/github/gateway/GatewayApplicationTests.java
similarity index 100%
rename from angle-gateway/src/test/java/com/github/gateway/GatewayApplicationTests.java
rename to angle-gateway/gateway/src/test/java/com/github/gateway/GatewayApplicationTests.java
diff --git a/angle-gateway/pom.xml b/angle-gateway/pom.xml
index e0d2ee5..0910e07 100644
--- a/angle-gateway/pom.xml
+++ b/angle-gateway/pom.xml
@@ -1,56 +1,41 @@
-
- 4.0.0
+
+
+
- com.github
angle-cloud
+ com.github
1.0-SNAPSHOT
-
-
- org.springframework.boot
- spring-boot-starter
-
-
- org.springframework.boot
- spring-boot-starter-test
-
-
- org.springframework.cloud
- spring-cloud-starter-gateway
-
-
- org.springframework.cloud
- spring-cloud-starter-netflix-eureka-client
-
-
- org.springframework.boot
- spring-boot-starter-actuator
-
-
- org.springframework.cloud
- spring-cloud-starter-netflix-hystrix
-
-
+ 4.0.0
+ pom
+
+ angle-gateway
+ angle-gateway
+
+
+ gateway
+ gateway-zuul
+
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
diff --git a/angle-sleuth/sleuth-zipkin/.gitignore b/angle-sleuth/sleuth-zipkin/.gitignore
new file mode 100644
index 0000000..82eca33
--- /dev/null
+++ b/angle-sleuth/sleuth-zipkin/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
\ No newline at end of file
diff --git a/angle-turbine/.gitignore b/angle-turbine/.gitignore
new file mode 100644
index 0000000..82eca33
--- /dev/null
+++ b/angle-turbine/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
\ No newline at end of file
diff --git a/angle-zuul/src/main/resources/application.properties b/angle-zuul/src/main/resources/application.properties
deleted file mode 100644
index 57f20eb..0000000
--- a/angle-zuul/src/main/resources/application.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-eureka.client.serviceUrl.defaultZone=http://localhost:8010/eureka/
-server.port=8013
-spring.application.name=service-zuul
-#\uFFFD\uFFFD\u02BE\u05BB\u04AA\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD/api-a/\uFFFD\uFFFD\u0377\uFFFD\u0136\uFFFD\uFFFD\u013F\u00BC\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\u0275\uFFFD id\u03AAcompute-service1\uFFFD\u0137\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-#zuul.routes.compute-service1=/api-a/**
-#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04BB\uFFFD\u0435\uFFFD\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-#zuul.routes.api-a.path=/api-a/**
-#serviceId\uFFFD\u01F7\uFFFD\uFFFD\uFFFD\uFFFD\u1E69\uFFFD\u0335\uFFFDapplication name
-#zuul.routes.api-a.serviceId=compute-service1
-##\uFFFD\uFFFD\uFFFD\uFFFD\u04BB\u00B7\uFFFD\uFFFD
-zuul.routes.service-eureka-client=/api-a/**
-##\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
-zuul.routes.service-eureka-client2=/api-b/**
-#######\uFFFD\uFFFD\uFFFD\u0535\uFFFDURl#####################
-filter.ignores=/api-b/auth,/api-b/login,/api-a/hello
-#
-#######################swagger #########################
-##################Spring boot admin \uFFFD\uFFFD\u0639\uFFFD\uFFFD\uFFFD###########
-# \uFFFD\u0631\u0570\uFFFD\u022B\uFFFD\uFFFD\uFFFD\uFFFD
-management.security.enabled=false
-
-#\u662F\u5426\u5F00\u542F\u91CD\u8BD5\u529F\u80FD
-zuul.retryable=true
-#\u5BF9\u5F53\u524D\u670D\u52A1\u7684\u91CD\u8BD5\u6B21\u6570
-ribbon.MaxAutoRetries=2
-#\u5207\u6362\u76F8\u540CServer\u7684\u6B21\u6570
-ribbon.MaxAutoRetriesNextServer=0
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 719ad62..0e82526 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,6 @@
angle-eureka
- angle-zuul
angle-common
angle-config
angle-admin