[1078] 合并主线

src/main/java/com/genersoft/iot/vmp/jt1078/config/JT1078Config.java

@@ -0,0 +1,18 @@
+package com.genersoft.iot.vmp.jt1078.config;
+
+import com.genersoft.iot.vmp.jt1078.bean.common.ConfigAttribute;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+@Component
+@Data
+@ConfigurationProperties(prefix = "jt1078", ignoreInvalidFields = true)
+@Order(3)
+public class JT1078Config {
+
+    private Integer port;
+
+    private String password;
+}

src/main/java/com/genersoft/iot/vmp/vmanager/bean/SystemConfigInfo.java

@@ -3,6 +3,7 @@ package com.genersoft.iot.vmp.vmanager.bean;
 import com.genersoft.iot.vmp.common.VersionPo;
 import com.genersoft.iot.vmp.conf.SipConfig;
 import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.jt1078.config.JT1078Config;
 import lombok.Data;
 
 @Data
@@ -12,6 +13,7 @@ public class SystemConfigInfo {
     private SipConfig sip;
     private UserSetting addOn;
     private VersionPo version;
+    private JT1078Config jt1078Config;
 
 }
 

src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java

@@ -12,6 +12,7 @@ import com.genersoft.iot.vmp.conf.exception.ControllerException;
 import com.genersoft.iot.vmp.conf.security.JwtUtils;
 import com.genersoft.iot.vmp.gb28181.service.IDeviceChannelService;
 import com.genersoft.iot.vmp.gb28181.service.IDeviceService;
+import com.genersoft.iot.vmp.jt1078.config.JT1078Config;
 import com.genersoft.iot.vmp.media.bean.MediaInfo;
 import com.genersoft.iot.vmp.media.bean.MediaServer;
 import com.genersoft.iot.vmp.media.event.mediaServer.MediaServerChangeEvent;
@@ -67,6 +68,9 @@ public class ServerController {
     @Autowired
     private UserSetting userSetting;
 
+    @Autowired
+    private JT1078Config jt1078Config;
+
     @Autowired
     private IDeviceService deviceService;
 
@@ -196,6 +200,7 @@ public class ServerController {
         systemConfigInfo.setSip(sipConfig);
         systemConfigInfo.setAddOn(userSetting);
         systemConfigInfo.setServerPort(serverPort);
+        systemConfigInfo.setJt1078Config(jt1078Config);
         return systemConfigInfo;
     }