From f34c966b68f73f0335fef19dcb31e4d23860d13a Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期二, 24 十一月 2020 14:57:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master --- src/main/webapp/WEB-INF/gcs/gcs.properties | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/gcs/gcs.properties b/src/main/webapp/WEB-INF/gcs/gcs.properties index f6cf2ea..78f58e9 100644 --- a/src/main/webapp/WEB-INF/gcs/gcs.properties +++ b/src/main/webapp/WEB-INF/gcs/gcs.properties @@ -1,9 +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.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 -- Gitblit v1.9.2