Merge pull request #160 from nobodyiam/misc-improvement

Misc improvement

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

 eureka:
   instance:
     hostname: ${hostname:localhost}
+    preferIpAddress: true
   client:
     serviceUrl:
       defaultZone: http://${eureka.instance.hostname}:8080/eureka/
     healthcheck:
       enabled: true
-      
-ctrip:
-  eureka:
-    dev: ${ctrip_eureka_dev}
-    fat: ${ctrip_eureka_fat}
-    uat: ${ctrip_eureka_uat}
-    pro: ${ctrip_eureka_pro}
\ No newline at end of file

apollo-biz/src/main/java/com/ctrip/apollo/biz/utils/ReleaseKeyGenerator.java

@@ -6,6 +6,7 @@ import com.ctrip.apollo.biz.entity.Namespace;
 import com.ctrip.apollo.core.utils.ByteUtil;
 import com.ctrip.apollo.core.utils.MachineUtil;
 
+import java.security.SecureRandom;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -17,7 +18,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 public class ReleaseKeyGenerator {
   private static final DateFormat TIMESTAMP_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss");
-  private static final AtomicInteger releaseCounter = new AtomicInteger();
+  private static final AtomicInteger releaseCounter = new AtomicInteger(new SecureRandom().nextInt());
   private static final Joiner KEY_JOINER = Joiner.on("-");
 
   /**

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

@@ -7,10 +7,3 @@ eureka:
       defaultZone: http://${eureka.instance.hostname}:8080/eureka/
     healthcheck:
       enabled: true
-      
-ctrip:
-  eureka:
-    dev: ${ctrip_eureka_dev}
-    fat: ${ctrip_eureka_fat}
-    uat: ${ctrip_eureka_uat}
-    pro: ${ctrip_eureka_pro}
\ No newline at end of file