From 063d606f4578fc4308e7b38b75797a165762e59f Mon Sep 17 00:00:00 2001 From: 4670101279 Date: Wed, 28 Sep 2022 17:27:01 +0800 Subject: [PATCH] youhua --- ruoyi-admin/src/main/resources/application.yml | 2 ++ .../ruoyi/code/camera/scheduled/RegisterServer.java | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 448d6a3..15c79fe 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -133,3 +133,5 @@ xss: localip: 192.168.1.7 #公网ip，用于判断视频播放 serverip: 121.40.203.197 +#接入方式 0-主动注册 1-网络 +accessmode: 0 diff --git a/ruoyi-code/src/main/java/com/ruoyi/code/camera/scheduled/RegisterServer.java b/ruoyi-code/src/main/java/com/ruoyi/code/camera/scheduled/RegisterServer.java index 5cd969c..eda95d8 100644 --- a/ruoyi-code/src/main/java/com/ruoyi/code/camera/scheduled/RegisterServer.java +++ b/ruoyi-code/src/main/java/com/ruoyi/code/camera/scheduled/RegisterServer.java @@ -28,14 +28,16 @@ import java.util.List; @Configuration @EnableScheduling public class RegisterServer { - private static String sercer_ip = ""; + private static String localip = ""; + private static String accessmode = ""; @Autowired private Environment env; @PostConstruct public void config() { - sercer_ip = env.getProperty("localip"); + localip = env.getProperty("localip"); + accessmode = env.getProperty("accessmode"); } @Autowired private ICameraService cameraService; @@ -48,8 +50,8 @@ public class RegisterServer { private void start(){ String ip = IPUtils.getLocalIpAddress(); System.out.println(ip); - if(sercer_ip.equals(ip)){ - R result = cameraService.register(sercer_ip); + if(localip.equals(ip) && "0".equals(accessmode)){ + R result = cameraService.register(localip); if("0".equals(result.get("code").toString())){ System.out.println("主动注册服务已启动"); }else{