zkr/shz-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add RequestUrlUtils for building base URLs and refactor OutdoorFairController to use it

Browse Source
This commit is contained in:
lapuda
2026-07-14 21:13:57 +08:00
parent 80caa84a59
commit 4306862ece
5 changed files with 237 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-bussiness/pom.xml
View File

@@ -116,6 +116,11 @@
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>

8
ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppOutdoorFairController.java
View File

@@ -23,6 +23,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.RequestUrlUtils;
import com.ruoyi.common.utils.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -387,12 +388,7 @@ public class AppOutdoorFairController extends BaseController
private String buildBaseUrl(HttpServletRequest request)
{
String baseUrl = request.getScheme() + "://" + request.getServerName();
int port = request.getServerPort();
if (port != 80 && port != 443) {
baseUrl += ":" + port;
}
return baseUrl + (request.getContextPath() == null ? "" : request.getContextPath());
return RequestUrlUtils.buildBaseUrl(request);
}
}

10
ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/OutdoorFairController.java
View File

@@ -49,6 +49,7 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.RequestUrlUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -994,13 +995,8 @@ public class OutdoorFairController extends BaseController
private String buildOutdoorFairCompanyH5Url(HttpServletRequest request, Long fairId, Long companyId)
{
String baseUrl = request.getScheme() + "://" + request.getServerName();
int port = request.getServerPort();
if (port != 80 && port != 443) {
baseUrl += ":" + port;
}
String contextPath = request.getContextPath() == null ? "" : request.getContextPath();
return baseUrl + contextPath + "/h5/outdoor-fair/company.html?fairId=" + fairId + "&companyId=" + companyId;
return RequestUrlUtils.buildBaseUrl(request)
+ "/h5/outdoor-fair/company.html?fairId=" + fairId + "&companyId=" + companyId;
}
private Map<String, Object> buildCompanyQrCodeData(HttpServletRequest request, Long fairId, Long companyId)

65
ruoyi-bussiness/src/test/java/com/ruoyi/cms/controller/cms/OutdoorFairControllerTest.java Normal file
View File

@@ -0,0 +1,65 @@
package com.ruoyi.cms.controller.cms;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import java.lang.reflect.Method;
import static org.junit.jupiter.api.Assertions.assertEquals;
class OutdoorFairControllerTest
{
@Test
void companyQrCodeUrlUsesPublicForwardedHost() throws Exception
{
MockHttpServletRequest request = new MockHttpServletRequest();
request.setScheme("http");
request.setServerName("127.0.0.1");
request.setServerPort(9091);
request.addHeader("X-Forwarded-Proto", "http");
request.addHeader("X-Forwarded-Host", "39.98.44.136");
request.addHeader("X-Forwarded-Port", "6024");
assertEquals(
"http://39.98.44.136:6024/h5/outdoor-fair/company.html?fairId=12&companyId=34",
buildCompanyH5Url(request, 12L, 34L));
}
@Test
void companyQrCodeUrlUsesStandardForwardedHeader() throws Exception
{
MockHttpServletRequest request = new MockHttpServletRequest();
request.setScheme("http");
request.setServerName("127.0.0.1");
request.setServerPort(9091);
request.addHeader("Forwarded", "for=192.0.2.10;proto=https;host=jobs.example.com:8443");
assertEquals(
"https://jobs.example.com:8443/h5/outdoor-fair/company.html?fairId=12&companyId=34",
buildCompanyH5Url(request, 12L, 34L));
}
@Test
void companyQrCodeUrlUsesHostHeaderWithoutForwardedHeaders() throws Exception
{
MockHttpServletRequest request = new MockHttpServletRequest();
request.setScheme("https");
request.setServerName("127.0.0.1");
request.setServerPort(9091);
request.addHeader("Host", "jobs.example.com");
assertEquals(
"https://jobs.example.com/h5/outdoor-fair/company.html?fairId=12&companyId=34",
buildCompanyH5Url(request, 12L, 34L));
}
private String buildCompanyH5Url(MockHttpServletRequest request, Long fairId, Long companyId)
throws Exception
{
OutdoorFairController controller = new OutdoorFairController();
Method method = OutdoorFairController.class.getDeclaredMethod(
"buildOutdoorFairCompanyH5Url", javax.servlet.http.HttpServletRequest.class, Long.class, Long.class);
method.setAccessible(true);
return (String) method.invoke(controller, request, fairId, companyId);
}
}