From 210ca4aee5dd52020fc5575b155a91aec16b94e6 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 18 Aug 2020 09:25:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java | 2 +-
kidgrow-springcloud/kidgrow-springcloud-monitor/kidgrow-springcloud-monitor-admin/src/main/resources/application.yml | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java
index 751d23d..5eb2550 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java
@@ -65,6 +65,6 @@
/**
* 骨龄评价中心服务名
*/
- String EVALUATION_SERVER="evaluation-server";
+ String BONEAGE_EVALUATION_SERVER="boneage-evaluationcenter-server";
}
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..f57fc83 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
@@ -29,4 +29,22 @@
health:
show-details: ALWAYS
+ boot:
+ admin:
+ notify:
+ mail:
+ from: china365days@163.com
+ to: 4345453@kidgrow.com
+ mail:
+ host: smtp.163.com
+ password: adflks888
+ properties:
+ mail:
+ smtp:
+ auth: true
+ starttls:
+ enable: true
+ required: true
+ username: china365days@163.com
+
--
Gitblit v1.8.0