Redeem 16 órája
szülő
commit
ebfc6f4707

+ 2 - 2
src/main/java/com/steerinfo/abnormalHandler/scheduler/StatusSyncScheduler.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
  */
 @Component
 @Slf4j
-@ConditionalOnProperty(name = "meter.sync.enabled", havingValue = "true", matchIfMissing = false)
+@ConditionalOnProperty(name = "meter.status.sync.enabled", havingValue = "true", matchIfMissing = false)
 public class StatusSyncScheduler {
 
     @Autowired
@@ -22,7 +22,7 @@ public class StatusSyncScheduler {
     /**
      * 每分钟执行一次状态同步
      */
-    @Scheduled(cron = "0 */3 * * * ?")
+    @Scheduled(cron = "${meter.status.sync.cron:0 */3 * * * ?}")
     public void scheduledSync() {
         log.info("========== 开始执行状态同步定时任务 ==========");
         statusSyncService.doSync();

+ 15 - 3
src/main/resources/application-prod.properties

@@ -1,4 +1,4 @@
-server.port=9005
+server.port=${SERVER_PORT:9005}
 #\u5FAE\u670D\u52A1\u7AEF\u53E3
 spring.jmx.default-domain=project1
 #\u6307\u5B9A\u7248\u672C
@@ -27,8 +27,6 @@ shiro.chains=/auth/login/**;/ktr/;/${api.version}/sys/**/export;/${api.version}/
 shiro.chains.append=/swagger**;/idmg/**;/ktr/;/${api.version}/sysposts/list/user**;/webjars/**;/v2/api**;/images/**;/configuration/**;
 
 # TODO[TEMP-AUTH-OFF] 测试完成后改回 true
-security.verification.enabled=false
-
 # Redis\u7F13\u5B58\u914D\u7F6E
 cache.level=1
 #Redis\u7F13\u5B58\u914D\u7F6E
@@ -141,3 +139,17 @@ server.tomcat.max-threads=400
 server.connection-timeout=20000
 
 logging.level.com=debug
+rtdb.host=10.99.200.86
+rtdb.port=2101
+rtdb.username=guest
+rtdb.password=
+rtdb.pool.size=8
+rtdb.pool.borrow-timeout-ms=3000
+rtdb.monitor.enabled=true
+rtdb.monitor.fallback-oracle = true
+rtdb.monitor.bootstrap-enabled = false
+meter.monitor.sync.enabled = true
+meter.monitor.sync.cron = * * * * * ?
+meter.status.sync.enabled = true
+meter.status.sync.cron = 0 */3 * * * ?
+security.verification.enabled=true

+ 3 - 1
src/main/resources/application.properties

@@ -150,5 +150,7 @@ rtdb.monitor.enabled=true
 rtdb.monitor.fallback-oracle = true
 rtdb.monitor.bootstrap-enabled = false
 meter.monitor.sync.enabled = true
-meter.monitor.sync.cron=* * * * * ?
+meter.monitor.sync.cron = * * * * * ?
+meter.status.sync.enabled = true
+meter.status.sync.cron = 0 */3 * * * ?
 security.verification.enabled=true

+ 1 - 4
src/main/resources/bootstrap.yml

@@ -37,7 +37,4 @@ ribbon:
 #新版配置,否则后面dashboard无法找到hystrix.stream
 management:
   server:
-    port: -1
-meter:
-  sync:
-    enabled: true
+    port: -1