调整配置

pull/1/head
huangxinlu 5 years ago
parent 4bba01f255
commit 598e115bf9
  1. 2
      blockchain-server/blockchain-server-btc/src/main/resources/bootstrap.yml
  2. 2
      blockchain-server/blockchain-server-cct/src/main/resources/bootstrap.yml
  3. 2
      blockchain-server/blockchain-server-currency/src/main/resources/bootstrap.yml
  4. 2
      blockchain-server/blockchain-server-databot/src/main/resources/bootstrap.yml
  5. 2
      blockchain-server/blockchain-server-eos/src/main/resources/bootstrap.yml
  6. 2
      blockchain-server/blockchain-server-eth/src/main/resources/bootstrap.yml
  7. 2
      blockchain-server/blockchain-server-imJg/src/main/resources/bootstrap.yml
  8. 2
      blockchain-server/blockchain-server-otc/src/main/resources/bootstrap.yml
  9. 2
      blockchain-server/blockchain-server-sysconf/src/main/resources/bootstrap.yml
  10. 2
      blockchain-server/blockchain-server-user/src/main/resources/bootstrap.yml
  11. 1
      pom.xml
  12. 2
      spring-cloud/spring-cloud-config/src/main/resources/application.yml
  13. 12
      spring-cloud/spring-cloud-config/src/main/resources/properties/dbconf-dev.yml
  14. 4
      spring-cloud/spring-cloud-config/src/main/resources/properties/redisconf-dev.yml
  15. 11
      spring-cloud/spring-cloud-config/src/main/resources/properties/smsconf-dev.yml
  16. 2
      spring-cloud/spring-cloud-config/src/main/resources/properties/txconf-dev.yml
  17. 4
      tx-lcn/tx-manager/src/main/resources/application.properties

@ -17,7 +17,7 @@ spring:
eureka: eureka:
client: client:
service-url: service-url:
defaultZone: http://eureka:8001/eureka/ defaultZone: http://${eureka-host}:8001/eureka/
instance: instance:
prefer-ip-address: true prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port} instance-id: ${spring.cloud.client.ip-address}:${server.port}

@ -4,7 +4,7 @@ server:
eureka: eureka:
client: client:
service-url: service-url:
defaultZone: http://eureka:8001/eureka/ defaultZone: http://${eureka-host}:8001/eureka/
instance: instance:
prefer-ip-address: true prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port} instance-id: ${spring.cloud.client.ip-address}:${server.port}

@ -15,7 +15,7 @@ spring:
eureka: eureka:
client: client:
service-url: service-url:
defaultZone: http://eureka:8001/eureka/ defaultZone: http://${eureka-host}:8001/eureka/
instance: instance:
prefer-ip-address: true prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port} instance-id: ${spring.cloud.client.ip-address}:${server.port}

@ -4,7 +4,7 @@ server:
eureka: eureka:
client: client:
service-url: service-url:
defaultZone: http://eureka:8001/eureka/ defaultZone: http://${eureka-host}:8001/eureka/
instance: instance:
prefer-ip-address: true prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port} instance-id: ${spring.cloud.client.ip-address}:${server.port}

@ -4,7 +4,7 @@ server:
eureka: eureka:
client: client:
service-url: service-url:
defaultZone: http://eureka:8001/eureka/ defaultZone: http://${eureka-host}:8001/eureka/
instance: instance:
prefer-ip-address: true prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port} instance-id: ${spring.cloud.client.ip-address}:${server.port}

@ -4,7 +4,7 @@ server:
eureka: eureka:
client: client:
service-url: service-url:
defaultZone: http://eureka:8001/eureka/ defaultZone: http://${eureka-host}:8001/eureka/
instance: instance:
prefer-ip-address: true prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port} instance-id: ${spring.cloud.client.ip-address}:${server.port}

@ -4,7 +4,7 @@ server:
eureka: eureka:
client: client:
service-url: service-url:
defaultZone: http://eureka:8001/eureka/ defaultZone: http://${eureka-host}:8001/eureka/
instance: instance:
prefer-ip-address: true prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port} instance-id: ${spring.cloud.client.ip-address}:${server.port}

@ -21,7 +21,7 @@ server:
eureka: eureka:
client: client:
service-url: service-url:
defaultZone: http://eureka:8001/eureka/ defaultZone: http://${eureka-host}:8001/eureka/
instance: instance:
prefer-ip-address: true prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port} instance-id: ${spring.cloud.client.ip-address}:${server.port}

@ -4,7 +4,7 @@ server:
eureka: eureka:
client: client:
service-url: service-url:
defaultZone: http://eureka:8001/eureka/ defaultZone: http://${eureka-host}:8001/eureka/
instance: instance:
prefer-ip-address: true prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port} instance-id: ${spring.cloud.client.ip-address}:${server.port}

@ -4,7 +4,7 @@ server:
eureka: eureka:
client: client:
service-url: service-url:
defaultZone: http://eureka:8001/eureka/ defaultZone: http://${eureka-host}:8001/eureka/
instance: instance:
prefer-ip-address: true prefer-ip-address: true
instance-id: ${spring.cloud.client.ip-address}:${server.port} instance-id: ${spring.cloud.client.ip-address}:${server.port}

@ -34,6 +34,7 @@
<!-- 配置信息 --> <!-- 配置信息 -->
<eureka-host>zhixinlian-eureka</eureka-host> <eureka-host>zhixinlian-eureka</eureka-host>
<redis-host>127.0.0.1</redis-host>
</properties> </properties>
<dependencies> <dependencies>

@ -15,6 +15,6 @@ spring:
eureka: eureka:
client: client:
service-url: service-url:
defaultZone: http://eureka:8001/eureka/ defaultZone: http://${eureka-host}:8001/eureka/
instance: instance:
prefer-ip-address: true prefer-ip-address: true

@ -1,14 +1,8 @@
spring: spring:
datasource: datasource:
# url: jdbc:mysql://47.74.158.47:3306/yanhuo?useUnicode=true&characterEncoding=UTF-8&useSSL=false url: jdbc:mysql://127.0.0.1:3306/zhixinlian?useUnicode=true&characterEncoding=UTF-8&useSSL=false
# username: yanhuo username: zhixinlian
# password: Skjbi8Fd6t7BdFa8 password: zhixinlian123coin!678
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
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
druid: druid:
initial-size: 1 initial-size: 1

@ -1,7 +1,7 @@
spring: spring:
redis: redis:
database: 2 database: 0
host: 172.20.0.1 host: ${redis-host}
port: 6379 port: 6379
password: password:
timeout: 10000ms timeout: 10000ms

@ -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: aliyunsms:
closed: true closed: true
timeout: 5 timeout: 5

@ -1,4 +1,4 @@
#分布式事务配置 #分布式事务配置
tm: tm:
manager: manager:
url: http://tx:7000/tx/manager/ url: http://${redis-host}:7000/tx/manager/

@ -16,7 +16,7 @@ spring.resources.static-locations=classpath:/static/
#spring.cloud.zookeeper.discovery.preferIpAddress = true #spring.cloud.zookeeper.discovery.preferIpAddress = true
#eureka \u5730\u5740 #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 eureka.instance.prefer-ip-address=true
#######################################redis-start################################################# #######################################redis-start#################################################
@ -30,7 +30,7 @@ eureka.instance.prefer-ip-address=true
##redis \u5355\u70B9\u73AF\u5883\u914D\u7F6E ##redis \u5355\u70B9\u73AF\u5883\u914D\u7F6E
#redis #redis
#redis\u4E3B\u673A\u5730\u5740 #redis\u4E3B\u673A\u5730\u5740
spring.redis.host=172.20.0.1 spring.redis.host=${redis-host}
#redis\u4E3B\u673A\u7AEF\u53E3 #redis\u4E3B\u673A\u7AEF\u53E3
spring.redis.port=6379 spring.redis.port=6379
#redis\u94FE\u63A5\u5BC6\u7801 #redis\u94FE\u63A5\u5BC6\u7801

Loading…
Cancel
Save