Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade

YeeAmosFireAutoSysStart/src/main/resources/application.properties

-spring.application.name = AMOS-FIREAUTOSYS-SUHG
- 
-server.port = 8083
-
-spring.profiles.active=dev
-
-#spring.freemarker.cache=false 
-
-spring.devtools.restart.enabled=true
-spring.devtools.restart.additional-paths=src/main/java
-spring.devtools.restart.exclude=WEB-INF/**
-
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-
-#JPA Configuration:
-# Show or not log for each sql query
-spring.jpa.show-sql = true
-# Hibernate ddl auto (create, create-drop, update): with "update" the database
-# schema will be automatically updated accordingly to java entities found in
-# the project
-spring.jpa.hibernate.ddl-auto = none
-# Naming strategy
-#spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy
-# Allows Hibernate to generate SQL optimized for a particular DBMS
-spring.jpa.database-platform = org.hibernate.dialect.MySQLDialect
-spring.jpa.open-in-view = true
-
-#mybatis mapper file
-mybatis.mapper-locations = classpath:db/mapper/*.xml
-# mybatis entity package
-mybatis.type-aliases-package = com.yeejoin.amos.fas.business.entity.mybatis
-mybatis.configuration.mapUnderscoreToCamelCase=true
-logging.level.com.yeejoin.amos.fas.business.dao.mapper=debug
-
-#liquibase
-spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
-spring.liquibase.enabled= false
-param.system.online.date = 2020-02-12
-
-visual.fegin.name=maas-visual
-spring.http.multipart.maxFileSize = 10480000
-spring.http.multipart.MaxRequestSize = 50480000
-windows.img.path = D:\\
-linux.img.path = /
-
-dutyMode.fegin.name=AMOSDUTYMODE
-param.safetyIndexChange.cron = 0 0 2 * * ?
-
-
+spring.application.name = AMOS-AUTOSYS-XKQ1
+ 
+server.port = 8083
+
+spring.profiles.active=dev
+
+#spring.freemarker.cache=false 
+
+spring.devtools.restart.enabled=true
+spring.devtools.restart.additional-paths=src/main/java
+spring.devtools.restart.exclude=WEB-INF/**
+
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+
+#JPA Configuration:
+# Show or not log for each sql query
+spring.jpa.show-sql = true
+# Hibernate ddl auto (create, create-drop, update): with "update" the database
+# schema will be automatically updated accordingly to java entities found in
+# the project
+spring.jpa.hibernate.ddl-auto = none
+# Naming strategy
+#spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy
+# Allows Hibernate to generate SQL optimized for a particular DBMS
+spring.jpa.database-platform = org.hibernate.dialect.MySQLDialect
+spring.jpa.open-in-view = true
+
+#mybatis mapper file
+mybatis.mapper-locations = classpath:db/mapper/*.xml
+# mybatis entity package
+mybatis.type-aliases-package = com.yeejoin.amos.fas.business.entity.mybatis
+mybatis.configuration.mapUnderscoreToCamelCase=true
+logging.level.com.yeejoin.amos.fas.business.dao.mapper=debug
+
+#liquibase
+spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
+spring.liquibase.enabled= false
+param.system.online.date = 2020-02-12
+
+visual.fegin.name=maas-visual
+spring.http.multipart.maxFileSize = 10480000
+spring.http.multipart.MaxRequestSize = 50480000
+windows.img.path = D:\\
+linux.img.path = /
+
+
+Push.fegin.name=PPMESSAGEPUSHSERVICE15
+dutyMode.fegin.name=AMOSDUTYMODE
+param.safetyIndexChange.cron = 0 0 2 * * ?
+
+