From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Fri, 28 Jun 2019 06:03:47 +0000 (+0800)
Subject: 增加了spring cloud consul 配置
X-Git-Tag: 1.0.0^2~137
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=ead9b1896699a4fc01b6dc96f8f196f397ce2825;p=epayment%2Ffood_payapi.git

增加了spring cloud consul 配置
---

diff --git a/build.gradle b/build.gradle
index 56858468..8146c485 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,6 +38,8 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-reflect'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 
+    implementation 'org.springframework.cloud:spring-cloud-starter-consul-discovery:2.1.2.RELEASE'
+
     implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5'
 
     implementation 'org.postgresql:postgresql:42.2.5'
diff --git a/config/application-devel-pg-local.properties b/config/application-devel-pg-local.properties
index 230ff23d..6f54ecf6 100644
--- a/config/application-devel-pg-local.properties
+++ b/config/application-devel-pg-local.properties
@@ -25,4 +25,7 @@ auth.password.bcrypt.seed=
 security.request.sign=false
 ##################################################
 ## quartz task scheduler
-shopbalance.updater.cron=-
\ No newline at end of file
+shopbalance.updater.cron=-
+#############################################
+spring.cloud.consul.host=172.28.201.70
+spring.cloud.consul.port=8500
diff --git a/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt b/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt
index 430a8bd4..944944fe 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt
@@ -4,6 +4,7 @@ import io.lettuce.core.ReadFrom
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.data.redis.connection.RedisConnectionFactory
@@ -67,6 +68,7 @@ class HttpSessionConfig {
 
 
 @SpringBootApplication
+@EnableDiscoveryClient
 @EnableScheduling
 class PayApiApplication
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4beb006e..f0ec1142 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,10 +1,13 @@
 #######################################springboot配置 start#################################
+spring.application.name=supwisdom.payapi
+spring.cloud.consul.discovery.health-check-path=${management.context-path}/health
+spring.cloud.consul.discovery.health-check-interval=10s
+spring.cloud.consul.discovery.instanceId=${spring.application.name}:${spring.application.instance_id:${random.value}}
 # 单库数据库配置
 spring.jpa.show-sql=true
 spring.datasource.hikari.connection-timeout=60000
 spring.datasource.hikari.maximum-pool-size=5
 spring.jpa.hibernate.ddl-auto=update
-
 spring.flyway.locations=classpath:db/migration
 spring.flyway.baseline-version=0
 spring.flyway.baseline-on-migrate=true
@@ -23,11 +26,10 @@ spring.thymeleaf.encoding=UTF-8
 spring.thymeleaf.mode=HTML5
 spring.thymeleaf.cache=false
 spring.thymeleaf.enabled=true
-
 ##################################################
 ## quartz task scheduler
-shopbalance.updater.cron = 10/* * * * *
-dayend.settletask.cron = 0 3/30 2-3 * * ?
+shopbalance.updater.cron=10/* * * * *
+dayend.settletask.cron=0 3/30 2-3 * * ?
 #dayend.settletask.cron = 0 0/2 * * * ?
 ################################################
 # user password