合并分支 'bug' 到 'master'

dev-union/pom.xml

@@ -54,6 +54,24 @@
                 <activatedProperties>prod</activatedProperties>
             </properties>
         </profile>
+
+        <!--生产环境正式-->
+        <profile>
+            <id>prodM</id>
+            <properties>
+                <pom.package>war</pom.package>
+                <activatedProperties>prodM</activatedProperties>
+            </properties>
+        </profile>
+
+        <!--生产环境测试-->
+        <profile>
+            <id>prodT</id>
+            <properties>
+                <pom.package>war</pom.package>
+                <activatedProperties>prodT</activatedProperties>
+            </properties>
+        </profile>
     </profiles>
 
     <dependencies>

dev-union/src/main/resources/application-prodM.properties

+spring.datasource.driver-class-name=com.oscar.Driver
+spring.datasource.url=jdbc:oscar://10.153.4.10:2003/OSRDB
+#spring.datasource.url=jdbc:oscar://192.168.0.80:2003/OSRDB?useSSL=false&rewriteBatchedStatements=TRUE
+spring.datasource.username=SYSDBA
+spring.datasource.password=szoscar55
+spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
+file.path=/opt/zb/
+preview.path=http://10.153.4.11:8088/equip/file/
+#preview.path=http://192.168.0.80:8088/equip/file/
\ No newline at end of file

dev-union/src/main/resources/application-prodT.properties

+spring.datasource.driver-class-name=com.oscar.Driver
+spring.datasource.url=jdbc:oscar://10.153.6.10:2003/OSRDB
+spring.datasource.username=SYSDBA
+spring.datasource.password=szoscar55
+spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
+file.path=/opt/zb/
+preview.path=http://10.153.4.11:8088/equipTest/file/
+spring.jmx.enabled=false