Commit dee86712 by Yiming Liu

Move resource filter plugin into parent pom

parent 07227940
...@@ -9,7 +9,7 @@ eureka: ...@@ -9,7 +9,7 @@ eureka:
ctrip: ctrip:
eureka: eureka:
dev: http://${ctrip_eureka_dev:localhost}:8080/eureka/ dev: ${ctrip_eureka_dev}
fat: http://${ctrip_eureka_fat:localhost}:8080/eureka/ fat: ${ctrip_eureka_fat}
uat: http://${ctrip_eureka_uat:localhost}:8080/eureka/ uat: ${ctrip_eureka_uat}
pro: http://${ctrip_eureka_pro:localhost}:8080/eureka/ pro: ${ctrip_eureka_pro}
\ No newline at end of file \ No newline at end of file
...@@ -38,12 +38,4 @@ ...@@ -38,12 +38,4 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
</project> </project>
...@@ -10,16 +10,16 @@ import com.ctrip.framework.foundation.Foundation; ...@@ -10,16 +10,16 @@ import com.ctrip.framework.foundation.Foundation;
@Component @Component
public class CtripEurekaSettings { public class CtripEurekaSettings {
@Value("${ctrip.eureka.dev:localhost}") @Value("${ctrip.eureka.dev:http://localhost:8080/eureka}")
private String devEureka; private String devEureka;
@Value("${ctrip.eureka.fat:localhost}") @Value("${ctrip.eureka.fat:http://localhost:8080/eureka}")
private String fatEureka; private String fatEureka;
@Value("${ctrip.eureka.uat:localhost}") @Value("${ctrip.eureka.uat:http://localhost:8080/eureka}")
private String uatEureka; private String uatEureka;
@Value("${ctrip.eureka.pro:localhost}") @Value("${ctrip.eureka.pro:http://localhost:8080/eureka}")
private String proEureka; private String proEureka;
public String getDefaultEurekaUrl(String zone) { public String getDefaultEurekaUrl(String zone) {
......
...@@ -10,7 +10,7 @@ eureka: ...@@ -10,7 +10,7 @@ eureka:
ctrip: ctrip:
eureka: eureka:
dev: http://${ctrip_eureka_dev:localhost}:8080/eureka/ dev: ${ctrip_eureka_dev}
fat: http://${ctrip_eureka_fat:localhost}:8080/eureka/ fat: ${ctrip_eureka_fat}
uat: http://${ctrip_eureka_uat:localhost}:8080/eureka/ uat: ${ctrip_eureka_uat}
pro: http://${ctrip_eureka_pro:localhost}:8080/eureka/ pro: ${ctrip_eureka_pro}
\ No newline at end of file \ No newline at end of file
...@@ -325,8 +325,13 @@ ...@@ -325,8 +325,13 @@
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>travis</id> <id>travis</id>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment