roouzenn/wvp
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[1078] 合并主线

Browse Source
This commit is contained in:
lin
2025-07-03 14:54:29 +08:00
parent 465e03d15d
commit 537d86ca89
12 changed files with 37 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}

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

@@ -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;
}