Merge pull request #31 from nobodyiam/integration

apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Version.java

@@ -22,7 +22,8 @@ public class Version {
 
     private long appId;
     private long releaseId;
-    private long parentVersion;
+    //parent version could be null
+    private Long parentVersion;
     private boolean isDeleted;
 
     public Version() {
@@ -60,14 +61,6 @@ public class Version {
         this.releaseId = releaseId;
     }
 
-    public long getParentVersion() {
-        return parentVersion;
-    }
-
-    public void setParentVersion(long parentVersion) {
-        this.parentVersion = parentVersion;
-    }
-
     public boolean isDeleted() {
         return isDeleted;
     }
@@ -75,4 +68,12 @@ public class Version {
     public void setDeleted(boolean deleted) {
         isDeleted = deleted;
     }
+
+    public Long getParentVersion() {
+        return parentVersion;
+    }
+
+    public void setParentVersion(Long parentVersion) {
+        this.parentVersion = parentVersion;
+    }
 }

apollo-client/src/main/java/com/ctrip/apollo/client/ApolloConfigManager.java

@@ -135,6 +135,7 @@ public class ApolloConfigManager implements BeanDefinitionRegistryPostProcessor,
 
         if (this.scope == null) {
             logger.error("Could not get refresh scope object, skip refresh beans");
+            return;
         }
 
         this.scope.refreshAll();

apollo-client/src/main/resources/apollo.properties

 app.id=101
 version=1.0
-env=local
\ No newline at end of file

apollo-core/src/main/java/com/ctrip/apollo/core/MetaDomainConsts.java

@@ -12,7 +12,7 @@ public class MetaDomainConsts {
   public static final String LOCAL = "http://localhost" + "/" + DEFAULT_PORT;
 
   public static final String DEV =
-      "http://ws.meta.apollo.fx.dev.nt.ctripcorp.com" + "/" + DEFAULT_PORT;
+      "http://10.3.2.56" + "/" + DEFAULT_PORT;
 
   public static final String FAT =
       "http://ws.meta.apollo.fx.fat.nt.ctripcorp.com" + "/" + DEFAULT_PORT;

apollo-demo/src/main/resources/apollo.properties

-appId=102
+app.id=102
 version=1.0
+env=dev