From 074c6c4389938fc38e82b6258b8ebab95fb5aff9 Mon Sep 17 00:00:00 2001 From: lyfO_o <764716047@qq.com> Date: 星期四, 16 九月 2021 15:54:46 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master --- src/main/webapp/WEB-INF/hws/hws.properties | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/hws/hws.properties b/src/main/webapp/WEB-INF/hws/hws.properties index 39cc81d..d298e1f 100644 --- a/src/main/webapp/WEB-INF/hws/hws.properties +++ b/src/main/webapp/WEB-INF/hws/hws.properties @@ -1,9 +1,12 @@ jdbc.url=jdbc:mysql://localhost:3306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true jdbc.username=root jdbc.password=Sinanoaq#415 -#�й���ѧԺ������ѧ�����о���test.properties + institute.id = 9 -institute.name = \u4e2d\u56fd\u79d1\u5b66\u9662\u5927\u8fde\u5316\u5b66\u7269\u7406\u7814\u7a76\u6240 +institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u5927\u8FDE\u5316\u5B66\u7269\u7406\u7814\u7A76\u6240 institute.url = http://hws.sinanoaq.com institute.app.id = wx7ab4d938ce5ce618 -institute.app.secret = c66b740b60220698570767c807361d3a \ No newline at end of file +institute.app.secret = c66b740b60220698570767c807361d3a +alarm.url = http://hws.sinanoaq.com/daping/sendWarnInfo.json +reagent.detail.price.api = +institute.copyright= Copyright\u00A92017 \u4E2D\u56FD\u79D1\u5B66\u9662\u5927\u8FDE\u5316\u5B66\u7269\u7406\u7814\u7A76\u6240\u00A0\u82CFICP\u590710220403\u53F7-6 -- Gitblit v1.9.2