Move resource filter plugin into parent pom

apollo-adminservice/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ eureka:
       
 ctrip:
   eureka:
-    dev: http://${ctrip_eureka_dev:localhost}:8080/eureka/
-    fat: http://${ctrip_eureka_fat:localhost}:8080/eureka/
-    uat: http://${ctrip_eureka_uat:localhost}:8080/eureka/
-    pro: http://${ctrip_eureka_pro:localhost}:8080/eureka/
\ No newline at end of file
+    dev: ${ctrip_eureka_dev}
+    fat: ${ctrip_eureka_fat}
+    uat: ${ctrip_eureka_uat}
+    pro: ${ctrip_eureka_pro}
\ No newline at end of file

apollo-biz/pom.xml

@@ -38,12 +38,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-	</build>
 </project>

apollo-biz/src/main/java/com/ctrip/apollo/biz/eureka/CtripEurekaSettings.java

@@ -10,16 +10,16 @@ import com.ctrip.framework.foundation.Foundation;
 @Component
 public class CtripEurekaSettings {
 
-  @Value("${ctrip.eureka.dev:localhost}")
+  @Value("${ctrip.eureka.dev:http://localhost:8080/eureka}")
   private String devEureka;
 
-  @Value("${ctrip.eureka.fat:localhost}")
+  @Value("${ctrip.eureka.fat:http://localhost:8080/eureka}")
   private String fatEureka;
 
-  @Value("${ctrip.eureka.uat:localhost}")
+  @Value("${ctrip.eureka.uat:http://localhost:8080/eureka}")
   private String uatEureka;
 
-  @Value("${ctrip.eureka.pro:localhost}")
+  @Value("${ctrip.eureka.pro:http://localhost:8080/eureka}")
   private String proEureka;
 
   public String getDefaultEurekaUrl(String zone) {

apollo-configservice/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ eureka:
       
 ctrip:
   eureka:
-    dev: http://${ctrip_eureka_dev:localhost}:8080/eureka/
-    fat: http://${ctrip_eureka_fat:localhost}:8080/eureka/
-    uat: http://${ctrip_eureka_uat:localhost}:8080/eureka/
-    pro: http://${ctrip_eureka_pro:localhost}:8080/eureka/
\ No newline at end of file
+    dev: ${ctrip_eureka_dev}
+    fat: ${ctrip_eureka_fat}
+    uat: ${ctrip_eureka_uat}
+    pro: ${ctrip_eureka_pro}
\ No newline at end of file

pom.xml

@@ -325,8 +325,13 @@
 				</configuration>
 			</plugin>
 		</plugins>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
 	</build>
-
 	<profiles>
 		<profile>
 			<id>travis</id>