smartlab_promote.git

智慧实验室优化版本

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

gdg

2020-11-26 ea1e5a454efe4531085b467ccac9c7b57d1024d7

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

已修改1个文件

已添加1个文件

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

 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>

 src/main/webapp/WEB-INF/shgjs/shgjs.properties

对比新文件
@@ -0,0 +1,10 @@
jdbc.url=jdbc:mysql://210.72.9.174:3306/smartlabdb?useUnicode=true&amp;characterEncoding=utf-8&amp;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 =

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

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