From b805858ea0341e13f6213c3a9b01da6a13d22f83 Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期四, 10 十二月 2020 10:39:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master --- src/main/webapp/WEB-INF/gcs/gcs.properties | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/gcs/gcs.properties b/src/main/webapp/WEB-INF/gcs/gcs.properties index 78f58e9..e608d09 100644 --- a/src/main/webapp/WEB-INF/gcs/gcs.properties +++ b/src/main/webapp/WEB-INF/gcs/gcs.properties @@ -1,10 +1,10 @@ jdbc.url=jdbc:mysql://localhost:3306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true jdbc.username=root jdbc.password=Sinanoaq#415 -#\uFFFD\u0439\uFFFD\uFFFD\uFFFD\u0467\u053A\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0339\uFFFD\uFFFD\uFFFD\uFFFD\u043E\uFFFD\uFFFD\uFFFD + institute.id = 11 institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u5317\u4EAC\u8FC7\u7A0B\u5DE5\u7A0B\u7814\u7A76\u6240 institute.url = http://gcs.sinanoaq.com institute.app.id = wx7ab4d938ce5ce618 institute.app.secret = c66b740b60220698570767c807361d3a -alarm.url = \ No newline at end of file +alarm.url = http://gcs.sinanoaq.com/daping/sendWarnInfo.json -- Gitblit v1.9.2