From 1c7f7ef7b7a080f06f6bd2ddf4670394edfc9245 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 07 五月 2021 17:23:14 +0800
Subject: [PATCH] 优化mysql建库脚本
---
src/main/java/com/genersoft/iot/vmp/conf/ApplicationCheckRunner.java | 42 +++++++++---------------------------------
1 files changed, 9 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/ApplicationCheckRunner.java b/src/main/java/com/genersoft/iot/vmp/conf/ApplicationCheckRunner.java
index faa9ef1..626aff1 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ApplicationCheckRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ApplicationCheckRunner.java
@@ -2,6 +2,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
@@ -17,46 +18,21 @@
private Logger logger = LoggerFactory.getLogger("ApplicationCheckRunner");
- @Value("${sip.ip}")
- private String sipIp;
+ @Autowired
+ private MediaConfig mediaConfig;
- @Value("${media.ip}")
- private String mediaIp;
-
- @Value("${media.wanIp}")
- private String mediaWanIp;
-
- @Value("${media.hookIp}")
- private String mediaHookIp;
-
- @Value("${media.port}")
- private int mediaPort;
-
- @Value("${media.secret}")
- private String mediaSecret;
-
- @Value("${media.streamNoneReaderDelayMS}")
- private String streamNoneReaderDelayMS;
-
- @Value("${sip.ip}")
- private String sipIP;
-
- @Value("${server.port}")
- private String serverPort;
-
- @Value("${media.autoConfig}")
- private boolean autoConfig;
-
+ @Autowired
+ private SipConfig sipConfig;
@Override
public void run(String... args) throws Exception {
- if (sipIP.equals("localhost") || sipIP.equals("127.0.0.1")) {
- logger.error("sip.ip涓嶈兘浣跨敤 {} ,璇蜂娇鐢ㄧ被浼�192.168.1.44杩欐牱鐨勬潵鑷綉鍗＄殑IP!!!", sipIP );
+ if (sipConfig.getSipIp().equals("localhost") || sipConfig.getSipIp().equals("127.0.0.1")) {
+ logger.error("sip.ip涓嶈兘浣跨敤 {} ,璇蜂娇鐢ㄧ被浼�192.168.1.44杩欐牱鐨勬潵鑷綉鍗＄殑IP!!!", sipConfig.getSipIp() );
System.exit(1);
}
- if (mediaIp.equals("localhost") || mediaIp.equals("127.0.0.1")) {
- logger.warn("mediaIp.ip浣跨敤 {} ,灏嗘棤娉曟敹鍒扮綉缁滃唴鍏朵粬璁惧鐨勬帹娴�!!!", mediaIp );
+ if (mediaConfig.getIp().equals("localhost") || (mediaConfig.getIp().equals("127.0.0.1") && mediaConfig.getWanIp() == null)) {
+ logger.warn("mediaIp.ip浣跨敤 {} ,灏嗘棤娉曟敹鍒扮綉缁滃唴鍏朵粬璁惧鐨勬帹娴�!!!", mediaConfig.getIp() );
}
}
--
Gitblit v1.8.0