diff --git a/blockchain-server/blockchain-server-btc/src/main/resources/bootstrap.yml b/blockchain-server/blockchain-server-btc/src/main/resources/bootstrap.yml
index 9254db5..0019a24 100644
--- a/blockchain-server/blockchain-server-btc/src/main/resources/bootstrap.yml
+++ b/blockchain-server/blockchain-server-btc/src/main/resources/bootstrap.yml
@@ -17,7 +17,7 @@ spring:
eureka:
client:
service-url:
- defaultZone: http://eureka:8001/eureka/
+ defaultZone: http://${eureka-host}:8001/eureka/
instance:
prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port}
diff --git a/blockchain-server/blockchain-server-cct/src/main/resources/bootstrap.yml b/blockchain-server/blockchain-server-cct/src/main/resources/bootstrap.yml
index 56bba98..37a5036 100644
--- a/blockchain-server/blockchain-server-cct/src/main/resources/bootstrap.yml
+++ b/blockchain-server/blockchain-server-cct/src/main/resources/bootstrap.yml
@@ -4,7 +4,7 @@ server:
eureka:
client:
service-url:
- defaultZone: http://eureka:8001/eureka/
+ defaultZone: http://${eureka-host}:8001/eureka/
instance:
prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port}
diff --git a/blockchain-server/blockchain-server-currency/src/main/resources/bootstrap.yml b/blockchain-server/blockchain-server-currency/src/main/resources/bootstrap.yml
index d7860ea..c9da9c0 100644
--- a/blockchain-server/blockchain-server-currency/src/main/resources/bootstrap.yml
+++ b/blockchain-server/blockchain-server-currency/src/main/resources/bootstrap.yml
@@ -15,7 +15,7 @@ spring:
eureka:
client:
service-url:
- defaultZone: http://eureka:8001/eureka/
+ defaultZone: http://${eureka-host}:8001/eureka/
instance:
prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port}
diff --git a/blockchain-server/blockchain-server-databot/src/main/resources/bootstrap.yml b/blockchain-server/blockchain-server-databot/src/main/resources/bootstrap.yml
index b92e1c1..6bc139f 100644
--- a/blockchain-server/blockchain-server-databot/src/main/resources/bootstrap.yml
+++ b/blockchain-server/blockchain-server-databot/src/main/resources/bootstrap.yml
@@ -4,7 +4,7 @@ server:
eureka:
client:
service-url:
- defaultZone: http://eureka:8001/eureka/
+ defaultZone: http://${eureka-host}:8001/eureka/
instance:
prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port}
diff --git a/blockchain-server/blockchain-server-eos/src/main/resources/bootstrap.yml b/blockchain-server/blockchain-server-eos/src/main/resources/bootstrap.yml
index 8dda277..50e064d 100644
--- a/blockchain-server/blockchain-server-eos/src/main/resources/bootstrap.yml
+++ b/blockchain-server/blockchain-server-eos/src/main/resources/bootstrap.yml
@@ -4,7 +4,7 @@ server:
eureka:
client:
service-url:
- defaultZone: http://eureka:8001/eureka/
+ defaultZone: http://${eureka-host}:8001/eureka/
instance:
prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port}
diff --git a/blockchain-server/blockchain-server-eth/src/main/resources/bootstrap.yml b/blockchain-server/blockchain-server-eth/src/main/resources/bootstrap.yml
index 7fa595c..379462a 100644
--- a/blockchain-server/blockchain-server-eth/src/main/resources/bootstrap.yml
+++ b/blockchain-server/blockchain-server-eth/src/main/resources/bootstrap.yml
@@ -4,7 +4,7 @@ server:
eureka:
client:
service-url:
- defaultZone: http://eureka:8001/eureka/
+ defaultZone: http://${eureka-host}:8001/eureka/
instance:
prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port}
diff --git a/blockchain-server/blockchain-server-imJg/src/main/resources/bootstrap.yml b/blockchain-server/blockchain-server-imJg/src/main/resources/bootstrap.yml
index ca3f99d..8e5c7d2 100644
--- a/blockchain-server/blockchain-server-imJg/src/main/resources/bootstrap.yml
+++ b/blockchain-server/blockchain-server-imJg/src/main/resources/bootstrap.yml
@@ -4,7 +4,7 @@ server:
eureka:
client:
service-url:
- defaultZone: http://eureka:8001/eureka/
+ defaultZone: http://${eureka-host}:8001/eureka/
instance:
prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port}
diff --git a/blockchain-server/blockchain-server-otc/src/main/resources/bootstrap.yml b/blockchain-server/blockchain-server-otc/src/main/resources/bootstrap.yml
index 59ac1c6..ead95f8 100644
--- a/blockchain-server/blockchain-server-otc/src/main/resources/bootstrap.yml
+++ b/blockchain-server/blockchain-server-otc/src/main/resources/bootstrap.yml
@@ -21,7 +21,7 @@ server:
eureka:
client:
service-url:
- defaultZone: http://eureka:8001/eureka/
+ defaultZone: http://${eureka-host}:8001/eureka/
instance:
prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port}
diff --git a/blockchain-server/blockchain-server-sysconf/src/main/resources/bootstrap.yml b/blockchain-server/blockchain-server-sysconf/src/main/resources/bootstrap.yml
index 872e651..49a5283 100644
--- a/blockchain-server/blockchain-server-sysconf/src/main/resources/bootstrap.yml
+++ b/blockchain-server/blockchain-server-sysconf/src/main/resources/bootstrap.yml
@@ -4,7 +4,7 @@ server:
eureka:
client:
service-url:
- defaultZone: http://eureka:8001/eureka/
+ defaultZone: http://${eureka-host}:8001/eureka/
instance:
prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port}
diff --git a/blockchain-server/blockchain-server-user/src/main/resources/bootstrap.yml b/blockchain-server/blockchain-server-user/src/main/resources/bootstrap.yml
index 8429233..d983557 100644
--- a/blockchain-server/blockchain-server-user/src/main/resources/bootstrap.yml
+++ b/blockchain-server/blockchain-server-user/src/main/resources/bootstrap.yml
@@ -4,7 +4,7 @@ server:
eureka:
client:
service-url:
- defaultZone: http://eureka:8001/eureka/
+ defaultZone: http://${eureka-host}:8001/eureka/
instance:
prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port}
diff --git a/pom.xml b/pom.xml
index 286ee6d..148e93d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
zhixinlian-eureka
+ 127.0.0.1
diff --git a/spring-cloud/spring-cloud-config/src/main/resources/application.yml b/spring-cloud/spring-cloud-config/src/main/resources/application.yml
index 1c1ccac..2a9a8bb 100644
--- a/spring-cloud/spring-cloud-config/src/main/resources/application.yml
+++ b/spring-cloud/spring-cloud-config/src/main/resources/application.yml
@@ -15,6 +15,6 @@ spring:
eureka:
client:
service-url:
- defaultZone: http://eureka:8001/eureka/
+ defaultZone: http://${eureka-host}:8001/eureka/
instance:
prefer-ip-address: true
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-config/src/main/resources/properties/dbconf-dev.yml b/spring-cloud/spring-cloud-config/src/main/resources/properties/dbconf-dev.yml
index aedda40..85cf5d1 100644
--- a/spring-cloud/spring-cloud-config/src/main/resources/properties/dbconf-dev.yml
+++ b/spring-cloud/spring-cloud-config/src/main/resources/properties/dbconf-dev.yml
@@ -1,14 +1,8 @@
spring:
datasource:
-# url: jdbc:mysql://47.74.158.47:3306/yanhuo?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-# username: yanhuo
-# password: Skjbi8Fd6t7BdFa8
- url: jdbc:mysql://127.0.0.1:3306/yanhuo?useUnicode=true&characterEncoding=UTF-8&useSSL=false
- username: root
- password:
-# url: jdbc:mysql://161.117.192.37:3306/yanhuo_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-# username: yanhuo_test
-# password: yanhuo_test
+ url: jdbc:mysql://127.0.0.1:3306/zhixinlian?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+ username: zhixinlian
+ password: zhixinlian123coin!678
driver-class-name: com.mysql.jdbc.Driver
druid:
initial-size: 1
diff --git a/spring-cloud/spring-cloud-config/src/main/resources/properties/redisconf-dev.yml b/spring-cloud/spring-cloud-config/src/main/resources/properties/redisconf-dev.yml
index 3d9bb6b..1c2f192 100644
--- a/spring-cloud/spring-cloud-config/src/main/resources/properties/redisconf-dev.yml
+++ b/spring-cloud/spring-cloud-config/src/main/resources/properties/redisconf-dev.yml
@@ -1,7 +1,7 @@
spring:
redis:
- database: 2
- host: 172.20.0.1
+ database: 0
+ host: ${redis-host}
port: 6379
password:
timeout: 10000ms
diff --git a/spring-cloud/spring-cloud-config/src/main/resources/properties/smsconf-dev.yml b/spring-cloud/spring-cloud-config/src/main/resources/properties/smsconf-dev.yml
index dfe93cc..052586a 100644
--- a/spring-cloud/spring-cloud-config/src/main/resources/properties/smsconf-dev.yml
+++ b/spring-cloud/spring-cloud-config/src/main/resources/properties/smsconf-dev.yml
@@ -1,14 +1,3 @@
-#aliyunsms:
-# closed: false
-# timeout: 5
-# SginName: 焰火网
-# TemplateCode: SMS_10465107
-# ACCESS_KEY_ID: LTAIR0MJ0WtQJbLj
-# ACCESS_SECRET: nhVRtuw5JaRBRXrk96DkB7Las4NjCb
-# ENGLISH_MSG: "【FLAME】Your verification code is: ${code}, which is valid within 5 minutes. Please do not disclose it to others."
-# BIG5_MSG: 【焰火網】您的驗證碼為:${code},該驗證碼5分鐘內有效,請勿泄漏於他人。
-
-
aliyunsms:
closed: true
timeout: 5
diff --git a/spring-cloud/spring-cloud-config/src/main/resources/properties/txconf-dev.yml b/spring-cloud/spring-cloud-config/src/main/resources/properties/txconf-dev.yml
index b07a8bd..3bd6f8e 100644
--- a/spring-cloud/spring-cloud-config/src/main/resources/properties/txconf-dev.yml
+++ b/spring-cloud/spring-cloud-config/src/main/resources/properties/txconf-dev.yml
@@ -1,4 +1,4 @@
#分布式事务配置
tm:
manager:
- url: http://tx:7000/tx/manager/
\ No newline at end of file
+ url: http://${redis-host}:7000/tx/manager/
\ No newline at end of file
diff --git a/tx-lcn/tx-manager/src/main/resources/application.properties b/tx-lcn/tx-manager/src/main/resources/application.properties
index f81122e..4e391eb 100644
--- a/tx-lcn/tx-manager/src/main/resources/application.properties
+++ b/tx-lcn/tx-manager/src/main/resources/application.properties
@@ -16,7 +16,7 @@ spring.resources.static-locations=classpath:/static/
#spring.cloud.zookeeper.discovery.preferIpAddress = true
#eureka \u5730\u5740
-eureka.client.service-url.defaultZone=http://eureka:8001/eureka/
+eureka.client.service-url.defaultZone=http://${eureka-host}:8001/eureka/
eureka.instance.prefer-ip-address=true
#######################################redis-start#################################################
@@ -30,7 +30,7 @@ eureka.instance.prefer-ip-address=true
##redis \u5355\u70B9\u73AF\u5883\u914D\u7F6E
#redis
#redis\u4E3B\u673A\u5730\u5740
-spring.redis.host=172.20.0.1
+spring.redis.host=${redis-host}
#redis\u4E3B\u673A\u7AEF\u53E3
spring.redis.port=6379
#redis\u94FE\u63A5\u5BC6\u7801