From 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 23 二月 2021 16:53:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master

---
 src/main/webapp/WEB-INF/config.properties |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/config.properties b/src/main/webapp/WEB-INF/config.properties
index 9179a8a..3c2647e 100644
--- a/src/main/webapp/WEB-INF/config.properties
+++ b/src/main/webapp/WEB-INF/config.properties
@@ -39,15 +39,16 @@
 emailSend.schedule.delay=60000
 
 #\uFFFD\uFFFD\uFFFD\uFFFD \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00F8\uFFFD
-message.url= http://sinanoaq.com:8095/api/sendmessage
+message.url= https://sinanoaq.com:8095/api/sendmessage
 message.signature= 4E85FE3F203915AC358A92205814D043
 message.head= \u667A\u6167\u5B9E\u9A8C\u5BA4\uFF08\u8BD5\u5242\uFF09\u5B89\u5168\u7BA1\u63A7\u7CFB\u7EDF
 message.enable= true
 
 #\uFFFD\uFFFD\uFFFD\uFFFD\u0524\uFFFD\uFFFD
 #\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00F2\uFFFD\uFFFD\uFFFD
-alarm.url = ${institute.url}/daping/sendWarnInfo.json
+#alarm.url = ${institute.url}/daping/sendWarnInfo.json
 alarm.type = smartlab
+alarm.url = ${alarm.url}
 
 
 institute.id = ${institute.id}

--
Gitblit v1.9.2