From ea5cbe91b94e48e9f63947d01decdf919848ae91 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 11 六月 2021 17:35:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/webapp/WEB-INF/gslab/gslab.properties | 10 ++++++++++
pom.xml | 6 ++++++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/pom.xml b/pom.xml
index 63e613a..9786c9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -474,6 +474,12 @@
<profile.active>zkyshs</profile.active>
</properties>
</profile>
+ <profile>
+ <id>gslab</id>
+ <properties>
+ <profile.active>gslab</profile.active>
+ </properties>
+ </profile>
</profiles>
<build>
<finalName>smartlab</finalName>
diff --git a/src/main/webapp/WEB-INF/gslab/gslab.properties b/src/main/webapp/WEB-INF/gslab/gslab.properties
new file mode 100644
index 0000000..5960294
--- /dev/null
+++ b/src/main/webapp/WEB-INF/gslab/gslab.properties
@@ -0,0 +1,10 @@
+jdbc.url=jdbc:mysql://139.196.181.203:3306/gslab_smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=GKHY@root20201!
+
+institute.id = 38
+institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u6750\u6599\u79D1\u5B66\u59D1\u82CF\u5B9E\u9A8C\u5BA4
+institute.url = http://gslab.sinanoaq.cn:8003
+institute.app.id =
+institute.app.secret =
+alarm.url =
--
Gitblit v1.9.2