From 399b78dcf3470331bcd554cd8aad47eee25ffb9c Mon Sep 17 00:00:00 2001 From: Jason Song Date: Mon, 19 Sep 2016 18:41:28 +0800 Subject: [PATCH] change back to server.properties --- .../main/java/com/ctrip/framework/apollo/util/ConfigUtil.java | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java index 494d0d9d7b0..6d316fd0093 100644 --- a/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java +++ b/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java @@ -82,7 +82,7 @@ private void initCluster() { } private boolean isToolingZone() { - if ("true".equalsIgnoreCase(Foundation.deployment().getProperty("tooling", "false").trim())) { + if ("true".equalsIgnoreCase(Foundation.server().getProperty("tooling", "false").trim())) { return true; } return false; diff --git a/pom.xml b/pom.xml index 9b8ded67be2..7f24b802511 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ com.ctrip.framework framework-foundation - 1.1.8-SNAPSHOT + 1.1.7 com.dianping.cat