From 8beaf701a900ddd5a0a482f425080635ff55166d Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:16:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/webapp/WEB-INF/test/test.properties |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/test/test.properties b/src/main/webapp/WEB-INF/test/test.properties
index 36ee8bd..15a5f91 100644
--- a/src/main/webapp/WEB-INF/test/test.properties
+++ b/src/main/webapp/WEB-INF/test/test.properties
@@ -2,10 +2,9 @@
 jdbc.username=root
 jdbc.password=GKHY@root20201!
 
-#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 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:8050
+institute.url  = https://sinanoaq.cn:8002
 institute.app.id = wx81a00e3350861b25
 institute.app.secret = c307d394875af2cbbe25e01b9e43dcb2
 alarm.url = http://sinanoaq.com/daping/sendWarnInfo.json

--
Gitblit v1.9.2