From 0b36cae1d52077376b6bf99fcf8ba0fed8081bdc Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 01 十二月 2020 17:52:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/webapp/WEB-INF/zkyshs/zkyshs.properties | 10 ++++++++++
pom.xml | 6 ++++++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8be307c..97e0a98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -464,6 +464,12 @@
<profile.active>shgjs</profile.active>
</properties>
</profile>
+ <profile>
+ <id>zkyshs</id>
+ <properties>
+ <profile.active>zkyshs</profile.active>
+ </properties>
+ </profile>
</profiles>
<build>
<finalName>smartlab</finalName>
diff --git a/src/main/webapp/WEB-INF/zkyshs/zkyshs.properties b/src/main/webapp/WEB-INF/zkyshs/zkyshs.properties
new file mode 100644
index 0000000..b09d7c6
--- /dev/null
+++ b/src/main/webapp/WEB-INF/zkyshs/zkyshs.properties
@@ -0,0 +1,10 @@
+jdbc.url=jdbc:mysql://localhost:3306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+jdbc.username=root
+jdbc.password=ZKYSHS@uss20201!
+
+institute.id = 37
+institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u6C34\u751F\u751F\u7269\u7814\u7A76\u6240
+institute.url = http://159.226.163.234:8001
+institute.app.id =
+institute.app.secret =
+alarm.url =
--
Gitblit v1.9.2