From daa697719eb0ddfd170f1ab94c5422a4f5b93951 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 18 Sep 2020 14:36:54 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/src/main/resources/application.yml | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/src/main/resources/application.yml b/kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/src/main/resources/application.yml
index fdbeecb..932f536 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/src/main/resources/application.yml
@@ -8,6 +8,8 @@
hostname: ${kidgrow.eureka.instance.hostname}
instance-id: ${spring.cloud.client.ip-address}:${spring.application.name}:${server.port}
prefer-ip-address: true
+ leaseRenewalIntervalInSeconds: 10
+ health-check-url-path: /actuator/health
client:
serviceUrl:
defaultZone: ${kidgrow.eureka.client.serviceUrl.defaultZone}
@@ -20,6 +22,27 @@
spring:
application:
name: admin
+ boot:
+ admin:
+ ui:
+ title: KidgrowAdmin-Server
+ notify:
+ mail:
+ from: 4345453@qq.com
+ to: 64294050@kidgrow.com,4345453@kidgrow,1024030301@kidgrow.com
+ mail:
+ host: smtp.qq.com
+ default-encoding: utf-8
+ username: 4345453@qq.com
+ password: kqqgvhgskdrpbgia
+ properties:
+ mail:
+ smtp:
+ auth: true
+ starttls:
+ enable: true
+ required: true
+
management:
endpoints:
web:
@@ -28,5 +51,3 @@
endpoint:
health:
show-details: ALWAYS
-
-
--
Gitblit v1.8.0