推流列表和拉流代理支持根据来源ip返回流地址

src/main/java/com/genersoft/iot/vmp/streamProxy/controller/StreamProxyController.java

@@ -23,6 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Map;
 
 @SuppressWarnings("rawtypes")
@@ -190,12 +193,23 @@ public class StreamProxyController {
     @ResponseBody
     @Operation(summary = "启用代理", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "id", description = "代理Id", required = true)
-    public StreamContent start(int id){
+    public StreamContent start(HttpServletRequest request, int id){
         log.info("播放代理： {}", id);
         StreamInfo streamInfo = streamProxyPlayService.start(id, null, null);
         if (streamInfo == null) {
             throw new ControllerException(ErrorCode.ERROR100.getCode(), ErrorCode.ERROR100.getMsg());
         }else {
+            if (userSetting.getUseSourceIpAsStreamIp()) {
+                streamInfo=streamInfo.clone();//深拷贝
+                String host;
+                try {
+                    URL url=new URL(request.getRequestURL().toString());
+                    host=url.getHost();
+                } catch (MalformedURLException e) {
+                    host=request.getLocalAddr();
+                }
+                streamInfo.changeStreamIp(host);
+            }
             return new StreamContent(streamInfo);
         }
     }

src/main/java/com/genersoft/iot/vmp/streamPush/controller/StreamPushController.java

@@ -35,8 +35,11 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -245,7 +248,7 @@ public class StreamPushController {
     @GetMapping(value = "/start")
     @ResponseBody
     @Operation(summary = "开始播放", security = @SecurityRequirement(name = JwtUtils.HEADER))
-    public DeferredResult<WVPResult<StreamContent>> start(Integer id){
+    public DeferredResult<WVPResult<StreamContent>> start(HttpServletRequest request, Integer id){
         Assert.notNull(id, "推流ID不可为NULL");
         DeferredResult<WVPResult<StreamContent>> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue());
         result.onTimeout(()->{
@@ -254,6 +257,17 @@ public class StreamPushController {
         });
         streamPushPlayService.start(id, (code, msg, streamInfo) -> {
             if (code == 0 && streamInfo != null) {
+                if (userSetting.getUseSourceIpAsStreamIp()) {
+                    streamInfo=streamInfo.clone();//深拷贝
+                    String host;
+                    try {
+                        URL url=new URL(request.getRequestURL().toString());
+                        host=url.getHost();
+                    } catch (MalformedURLException e) {
+                        host=request.getLocalAddr();
+                    }
+                    streamInfo.changeStreamIp(host);
+                }
                 WVPResult<StreamContent> success = WVPResult.success(new StreamContent(streamInfo));
                 result.setResult(success);
             }