From ea5cbe91b94e48e9f63947d01decdf919848ae91 Mon Sep 17 00:00:00 2001 From: lyfO_o <764716047@qq.com> Date: 星期五, 11 六月 2021 17:35:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master --- src/main/webapp/WEB-INF/test/test.properties | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/test/test.properties b/src/main/webapp/WEB-INF/test/test.properties index ae8b1b9..15a5f91 100644 --- a/src/main/webapp/WEB-INF/test/test.properties +++ b/src/main/webapp/WEB-INF/test/test.properties @@ -1,10 +1,10 @@ -jdbc.url=jdbc:mysql://localhost:3306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true +jdbc.url=jdbc:mysql://139.196.181.203:3306/smartlabdb_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false jdbc.username=root -jdbc.password=123456 -#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD +jdbc.password=GKHY@root20201! + institute.id = 2 institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u82CF\u5DDE\u7EB3\u7C73\u6280\u672F\u4E0E\u7EB3\u7C73\u4EFF\u751F\u7814\u7A76\u6240 -institute.url = http://sinanoaq.com +institute.url = https://sinanoaq.cn:8002 institute.app.id = wx81a00e3350861b25 institute.app.secret = c307d394875af2cbbe25e01b9e43dcb2 -alarm.url = \ No newline at end of file +alarm.url = http://sinanoaq.com/daping/sendWarnInfo.json -- Gitblit v1.9.2