smartlab_promote.git

智慧实验室优化版本

Merge remote-tracking branch 'origin/master' into master

lyfO_o

2021-06-11 ea5cbe91b94e48e9f63947d01decdf919848ae91

Merge remote-tracking branch 'origin/master' into master

已修改1个文件

已添加1个文件

	pom.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/WEB-INF/gslab/gslab.properties	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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>

 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&amp;characterEncoding=utf-8&amp;autoReconnect=true&amp;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 =

			@@ -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>

对比新文件
			@@ -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 =