Merge remote-tracking branch 'origin/master'

datav-manager/pom.xml

@@ -105,6 +105,29 @@
 				<skipDeploy>false</skipDeploy>
 			</properties>
 		</profile>
+
+		<profile>
+			<id>yanyuan</id>
+			<properties>
+				<profiles.active>yanyuan</profiles.active>
+				<profiles.server.port>17003</profiles.server.port>
+				<profiles.datasource.uri>
+					<![CDATA[jdbc:mysql://172.16.30.249:3306/datav_platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
+				<profiles.datasource.username>root</profiles.datasource.username>
+				<profiles.datasource.password>xhx@2022</profiles.datasource.password>
+				<profiles.redis.uri>172.16.30.248</profiles.redis.uri>
+				<profiles.redis.port>6379</profiles.redis.port>
+				<profiles.redis.username></profiles.redis.username>
+				<profiles.redis.password>hotel@2020</profiles.redis.password>
+				<profiles.redis.database>13</profiles.redis.database>
+				<profiles.filepath>/mortals/app/data/datav</profiles.filepath>
+				<profiles.publish.path>/home/publish</profiles.publish.path>
+				<profiles.log.level>info</profiles.log.level>
+				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
+				<package.environment>build</package.environment>
+				<skipDeploy>false</skipDeploy>
+			</properties>
+		</profile>
 	</profiles>
 
 	<dependencies>