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/sin/sin.properties |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/sin/sin.properties b/src/main/webapp/WEB-INF/sin/sin.properties
index 1637aa3..9849c07 100644
--- a/src/main/webapp/WEB-INF/sin/sin.properties
+++ b/src/main/webapp/WEB-INF/sin/sin.properties
@@ -1,10 +1,12 @@
-jdbc.url=jdbc:mysql://120.77.153.67:3306/smartlabdb?useUnicode=true&amp;characterEncoding=utf-8&amp;autoReconnect=true
-jdbc.username=wzjy
-jdbc.password=!wzjy#01
-#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
+jdbc.url=jdbc:mysql://139.196.181.203:3306/smartlabdb?useUnicode=true&amp;characterEncoding=utf-8&amp;autoReconnect=true&amp;useSSL=false
+jdbc.username=root
+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.app.id = wx81a00e3350861b25
 institute.app.secret = c307d394875af2cbbe25e01b9e43dcb2
 alarm.url = http://sinanoaq.com/daping/sendWarnInfo.json
+reagent.detail.price.api =
+institute.copyright= Copyright\u00A92017 \u4E2D\u56FD\u79D1\u5B66\u9662\u82CF\u5DDE\u7EB3\u7C73\u6280\u672F\u4E0E\u7EB3\u7C73\u4EFF\u751F\u7814\u7A76\u6240\u00A0\u82CFICP\u590710220403\u53F7-6

--
Gitblit v1.9.2