From ea1e5a454efe4531085b467ccac9c7b57d1024d7 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期四, 26 十一月 2020 10:45:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
pom.xml | 6 ++++++
src/main/webapp/WEB-INF/shgjs/shgjs.properties | 10 ++++++++++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3c30b08..8be307c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -458,6 +458,12 @@
<profile.active>zkysh</profile.active>
</properties>
</profile>
+ <profile>
+ <id>shgjs</id>
+ <properties>
+ <profile.active>shgjs</profile.active>
+ </properties>
+ </profile>
</profiles>
<build>
<finalName>smartlab</finalName>
diff --git a/src/main/webapp/WEB-INF/shgjs/shgjs.properties b/src/main/webapp/WEB-INF/shgjs/shgjs.properties
new file mode 100644
index 0000000..3bc2ee9
--- /dev/null
+++ b/src/main/webapp/WEB-INF/shgjs/shgjs.properties
@@ -0,0 +1,10 @@
+jdbc.url=jdbc:mysql://210.72.9.174:3306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+jdbc.username=root
+jdbc.password=SHGJS@uss20201!
+
+institute.id = 27
+institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u4E0A\u6D77\u5149\u5B66\u7CBE\u5BC6\u673A\u68B0\u7814\u7A76\u6240
+institute.url = http://210.72.9.173:8001/
+institute.app.id =
+institute.app.secret =
+alarm.url =
--
Gitblit v1.9.2