规整配置文件

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FileController.java

@@ -32,7 +32,6 @@ import java.util.Map;
 
 @RestController
 @RequestMapping(value = "/file")
-//@Authorization(ingore = true)
 public class FileController extends BaseController {
 
     private static final transient Logger log = LoggerFactory.getLogger(FileController.class);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyInstanceImpl.java

@@ -58,10 +58,6 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
 	private RedisTemplate redisTemplate;
 	@Autowired
 	private FireEquipPointMapper fireEquipPointMapper;
-
-
-    @Value("${params.remoteRuleUrl}")
-    private String remoteRuleUrl;
     
     @Autowired
     private IContingencyInstance iContingencyInstance;

YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties

+#系统服务账号，用户后端服务调用
 security.password=a1234560
 security.loginId=fas_autosys
-security.productWeb=STUDIO_APP_WEB
-security.appKeyWeb=studio_normalapp_2668446
-
 #environment
 #spring.profiles.active = dev
 eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
@@ -20,12 +18,9 @@ spring.datasource.hikari.maxLifetime = 1765000
 spring.datasource.hikari.maximum-pool-size = 10
 spring.datasource.testWhileIdle = true
 spring.datasource.validationQuery = SELECT 1
-
-#rule
-#params.remoteRuleUrl=http://172.16.3.3:8080/
-params.remoteRuleUrl=http://magintursh.xicp.net:18080/
+#ws 
 params.remoteWebsocketUrl=http://172.16.11.36:10600/
-
+#redis
 spring.redis.database=0
 spring.redis.host=172.16.10.85
 spring.redis.port=6379
@@ -35,53 +30,22 @@ spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=10
 spring.redis.jedis.pool.min-idle=0
 spring.redis.timeout=1000
-
 #picture upload
+windows.img.path = E:\\
+linux.img.path = /
 file.uploadUrl=E:\\upload\\files\\
 #picture read
 file.readUrl=http://172.16.3.89:8083/file/getFile?in=
 params.isPush=true
-
 ## emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.85:1883
 emqx.user-name=super
 emqx.password=a123456
-# 只用于初始化
-emqx.defaultTopic=mqtt_topic
-
-
-Push.fegin.name=APPMESSAGEPUSHSERVICE-36
-
-dutyMode.fegin.name=AMOSDUTYMODE
-
-##\u89C4\u5219\u5BF9\u8C61\u81EA\u52A8\u626B\u63CF
-rule.definition.load=true
-rule.definition.model-package=com.yeejoin.amos.fas.business.action.model
-rule.definition.default-agency=STATE_GRID
-
-#Fegin service config
-amos.feign.gennerator.use-gateway=true
-
-autoSys.push.type=mqtt
-
 #�ļ�����
 file.downLoad.url=http://39.98.246.31:8888/
-
-
 #站端名称使用全拼
 station.name = yinan
-
-#查询装备分类
-#消防车：2101
-#灭火器：3104
-#消火栓：3105
-#探测器：8501
-#消防小室：9301
-#消防水池：9302
-#消防泡沫间：9305
-#消防视频：xfsp
-station.equipment.code=2101,3104,3105,8501,9301,9302,9305,xfsp
-
-
+#是否开启将风险区域同步至仓库货位true开启，false关闭。默认关闭。
+equipManage.fegin.isSyn=false

YeeAmosFireAutoSysStart/src/main/resources/application-docker.properties

+#系统服务账号，用户后端服务调用
 security.password=a1234560
 security.loginId=fas_autosys
-security.productWeb=STUDIO_APP_WEB
-security.appKeyWeb=studio_normalapp_2668446
- 
 #environment
 #spring.profiles.active = dev
 eureka.client.serviceUrl.defaultZone=http://amos-eurka:10001/eureka/
@@ -11,7 +9,6 @@ eureka.client.fetch-registry = true
 eureka.client.healthcheck.enabled = true
 eureka.client.fetchRegistry = true
 eureka.instance.prefer-ip-address=true
-
 #DB properties:
 spring.datasource.url=jdbc:mysql://amos-mysql:3306/yeejoin_safety_business?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
@@ -23,8 +20,6 @@ spring.datasource.testWhileIdle = true
 spring.datasource.validationQuery = SELECT 1
 
 #rule
-#params.remoteRuleUrl=http://172.16.3.3:8080/
-params.remoteRuleUrl=http://station-rule:8080/
 params.remoteWebsocketUrl=http://station-websocket:10600/
 
 spring.redis.database=1
@@ -38,6 +33,8 @@ spring.redis.jedis.pool.min-idle=0
 spring.redis.timeout=1000
 
 #picture upload
+windows.img.path = E:\\
+linux.img.path = /
 file.uploadUrl=D:\\upload\\files\\
 #picture read
 file.readUrl=http://station-fireautosys:8083/file/getFile?in=
@@ -50,6 +47,8 @@ emqx.broker=tcp://172.16.10.85:1883
 emqx.user-name=super
 emqx.password=a123456
 
-
 #\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 file.downLoad.url=http://172.16.10.175:8888/
+#是否开启将风险区域同步至仓库货位true开启，false关闭。默认关闭。
+equipManage.fegin.isSyn=false
+

YeeAmosFireAutoSysStart/src/main/resources/application-test.properties

-security.password=tw123456
-security.loginId=tw3
-security.productWeb=CONVERTER_STATION_WEB
-security.appKeyWeb=CONVERTER_STATION
- 
+#系统服务账号，用户后端服务调用
+security.password=a1234560
+security.loginId=fas_autosys
 #environment
-#spring.profiles.active = dev
 eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
 eureka.client.register-with-eureka = true
 eureka.client.fetch-registry = true
 eureka.client.healthcheck.enabled = true
 eureka.client.fetchRegistry = true
 eureka.instance.prefer-ip-address=true
-
 #DB properties:
 spring.datasource.url=jdbc:mysql://47.103.14.66:3306/91-safety-business?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
@@ -21,12 +17,9 @@ spring.datasource.hikari.maxLifetime = 1765000
 spring.datasource.hikari.maximum-pool-size = 10
 spring.datasource.testWhileIdle = true
 spring.datasource.validationQuery = SELECT 1
-
-#rule
-#params.remoteRuleUrl=http://172.16.3.3:8080/
-params.remoteRuleUrl=http://magintursh.xicp.net:18080/
+#ws
 params.remoteWebsocketUrl=http://172.16.10.91:10600/
-
+#redis
 spring.redis.database=1
 spring.redis.host=127.0.0.1
 spring.redis.port=6379
@@ -36,12 +29,12 @@ spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=10
 spring.redis.jedis.pool.min-idle=0
 spring.redis.timeout=1000
-
 #picture upload
+windows.img.path = E:\\
+linux.img.path = /
 file.uploadUrl=D:\\upload\\files\\
 #picture read
 file.readUrl=http://172.16.3.89:8083/file/getFile?in=
-
 ## emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
@@ -49,6 +42,5 @@ emqx.broker=tcp://172.16.10.85:1883
 emqx.user-name=super
 emqx.password=a123456
 
-
 #\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 file.downLoad.url=http://172.16.10.175:8888/

YeeAmosFireAutoSysStart/src/main/resources/application.properties

 spring.application.name = AMOS-AUTOSYS
 server.port = 8083
 spring.profiles.active=dev
+#应用product appkey
+security.productWeb=STUDIO_APP_WEB
+security.appKeyWeb=studio_normalapp_2668446
 
 #spring.freemarker.cache=false 
 spring.devtools.restart.enabled=true
@@ -43,26 +46,21 @@ spring.servlet.multipart.max-request-size=20MB
 
 #feginName
 visual.fegin.name=maas-visual
-dutyMode.fegin.name=AMOSDUTYMODE
+#值班系统
+dutyMode.fegin.name=AMOS-DUTYMODE
 #队站装备管理名称，主要用于风险区域同步至仓库货位和订阅装备信息系统
 equipManage.fegin.name=AMOS-EQUIPMANAGE
 
-#是否开启将风险区域同步至仓库货位true开启，false关闭。默认关闭。
-equipManage.fegin.isSyn=false
 
 #jpush 服务名称
-Push.fegin.name=APPMESSAGEPUSHSERVICE
-
+Push.fegin.name=AMOS-JPUSH
 
 spring.http.multipart.maxFileSize = 10480000
 spring.http.multipart.MaxRequestSize = 50480000
-windows.img.path = E:\\
-linux.img.path = /
 
 param.safetyIndexChange.cron = 0 0 2 * * ?
 param.weather.url = http://wthrcdn.etouch.cn/weather_mini?citykey=
 
-
 # 只用于初始化
 emqx.defaultTopic=mqtt_topic
 
@@ -76,3 +74,14 @@ amos.feign.gennerator.use-gateway=true
 # 消息推送类型
 autoSys.push.type=mqtt
 
+#查询装备分类
+#消防车：2101
+#灭火器：3104
+#消火栓：3105
+#探测器：8501
+#消防小室：9301
+#消防水池：9302
+#消防泡沫间：9305
+#消防视频：xfsp
+station.equipment.code=2101,3104,3105,8501,9301,9302,9305,xfsp
+