diff --git a/apollo-adminservice/src/main/resources/bootstrap.yml b/apollo-adminservice/src/main/resources/bootstrap.yml index b04fd2a5cc6624e3a55de681282d60b4a3f176c2..b61175175fb1d35bbd781829a067ad2a6a27a617 100644 --- a/apollo-adminservice/src/main/resources/bootstrap.yml +++ b/apollo-adminservice/src/main/resources/bootstrap.yml @@ -1,15 +1,9 @@ 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 diff --git a/apollo-biz/src/main/java/com/ctrip/apollo/biz/utils/ReleaseKeyGenerator.java b/apollo-biz/src/main/java/com/ctrip/apollo/biz/utils/ReleaseKeyGenerator.java index 95f7e6a5b0008654e4e9794d337ba73b0feb1a09..3f9b3edab1ebefdb6b6dd8b38c8f10577dcc4ed7 100644 --- a/apollo-biz/src/main/java/com/ctrip/apollo/biz/utils/ReleaseKeyGenerator.java +++ b/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("-"); /** diff --git a/apollo-configservice/src/main/resources/bootstrap.yml b/apollo-configservice/src/main/resources/bootstrap.yml index effd5190721a32dc32e8bee1375896d4129e02f5..b61175175fb1d35bbd781829a067ad2a6a27a617 100644 --- a/apollo-configservice/src/main/resources/bootstrap.yml +++ b/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