Compare commits

...

2 Commits

Author SHA1 Message Date
zjw
c65fdbab5b Merge branch 'main' of https://fun-md.com/whfh/label_backend
# Conflicts:
#	src/test/java/com/label/blackbox/AbstractBlackBoxTest.java
#	src/test/java/com/label/blackbox/SwaggerLiveBlackBoxTest.java
#	src/test/java/com/label/integration/AuthIntegrationTest.java
#	src/test/java/com/label/integration/ExportIntegrationTest.java
#	src/test/java/com/label/integration/ExtractionApprovalIntegrationTest.java
#	src/test/java/com/label/integration/MultiTenantIsolationTest.java
#	src/test/java/com/label/integration/QaApprovalIntegrationTest.java
#	src/test/java/com/label/integration/SourceIntegrationTest.java
#	src/test/java/com/label/integration/SysConfigIntegrationTest.java
#	src/test/java/com/label/integration/TaskClaimConcurrencyTest.java
#	src/test/java/com/label/integration/UserManagementIntegrationTest.java
#	src/test/java/com/label/integration/VideoCallbackIdempotencyTest.java
#	src/test/java/com/label/unit/AuthInterceptorTest.java
2026-04-15 10:48:11 +08:00
zjw
9fd8971732 统一接口前缀 2026-04-15 10:46:57 +08:00
13 changed files with 17 additions and 12 deletions

View File

@@ -2,7 +2,7 @@ FROM registry.bjzgzp.com:4433/library/eclipse-temurin:21-jdk-ubi10-minimal
WORKDIR /app WORKDIR /app
COPY ./target/label-backend-1.0.0-SNAPSHOT.jar /app/label-backend-1.0.0-SNAPSHOT.jar COPY ./label-backend-1.0.0-SNAPSHOT.jar /app/label-backend-1.0.0-SNAPSHOT.jar
EXPOSE 18082 EXPOSE 18082

View File

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
*/ */
@Tag(name = "认证管理", description = "登录、退出和当前用户信息") @Tag(name = "认证管理", description = "登录、退出和当前用户信息")
@RestController @RestController
@RequestMapping("/api/auth") @RequestMapping("/label/api/auth")
@RequiredArgsConstructor @RequiredArgsConstructor
public class AuthController { public class AuthController {

View File

@@ -24,7 +24,7 @@ import java.util.Map;
@Tag(name = "公司管理", description = "租户公司增删改查") @Tag(name = "公司管理", description = "租户公司增删改查")
@RestController @RestController
@RequestMapping("/api/companies") @RequestMapping("/label/api/companies")
@RequiredArgsConstructor @RequiredArgsConstructor
public class CompanyController { public class CompanyController {

View File

@@ -23,6 +23,7 @@ import java.util.Map;
*/ */
@Tag(name = "导出管理", description = "训练样本查询、导出批次和微调任务") @Tag(name = "导出管理", description = "训练样本查询、导出批次和微调任务")
@RestController @RestController
@RequestMapping("/label")
@RequiredArgsConstructor @RequiredArgsConstructor
public class ExportController { public class ExportController {

View File

@@ -17,7 +17,7 @@ import java.util.Map;
*/ */
@Tag(name = "提取标注", description = "提取阶段的查看、编辑、提交和审批") @Tag(name = "提取标注", description = "提取阶段的查看、编辑、提交和审批")
@RestController @RestController
@RequestMapping("/api/extraction") @RequestMapping("/label/api/extraction")
@RequiredArgsConstructor @RequiredArgsConstructor
public class ExtractionController { public class ExtractionController {

View File

@@ -17,7 +17,7 @@ import java.util.Map;
*/ */
@Tag(name = "问答生成", description = "问答生成阶段的查看、编辑、提交和审批") @Tag(name = "问答生成", description = "问答生成阶段的查看、编辑、提交和审批")
@RestController @RestController
@RequestMapping("/api/qa") @RequestMapping("/label/api/qa")
@RequiredArgsConstructor @RequiredArgsConstructor
public class QaController { public class QaController {

View File

@@ -23,7 +23,7 @@ import org.springframework.web.multipart.MultipartFile;
*/ */
@Tag(name = "资料管理", description = "原始资料上传、查询和删除") @Tag(name = "资料管理", description = "原始资料上传、查询和删除")
@RestController @RestController
@RequestMapping("/api/source") @RequestMapping("/label/api/source")
@RequiredArgsConstructor @RequiredArgsConstructor
public class SourceController { public class SourceController {

View File

@@ -22,6 +22,7 @@ import java.util.Map;
*/ */
@Tag(name = "系统配置", description = "全局和公司级系统配置管理") @Tag(name = "系统配置", description = "全局和公司级系统配置管理")
@RestController @RestController
@RequestMapping("/label")
@RequiredArgsConstructor @RequiredArgsConstructor
public class SysConfigController { public class SysConfigController {

View File

@@ -20,7 +20,7 @@ import java.util.Map;
*/ */
@Tag(name = "任务管理", description = "任务池、我的任务、审批队列和管理操作") @Tag(name = "任务管理", description = "任务池、我的任务、审批队列和管理操作")
@RestController @RestController
@RequestMapping("/api/tasks") @RequestMapping("/label/api/tasks")
@RequiredArgsConstructor @RequiredArgsConstructor
public class TaskController { public class TaskController {

View File

@@ -28,7 +28,7 @@ import lombok.RequiredArgsConstructor;
*/ */
@Tag(name = "用户管理", description = "管理员维护公司用户") @Tag(name = "用户管理", description = "管理员维护公司用户")
@RestController @RestController
@RequestMapping("/api/users") @RequestMapping("/label/api/users")
@RequiredArgsConstructor @RequiredArgsConstructor
public class UserController { public class UserController {

View File

@@ -26,6 +26,7 @@ import java.util.Map;
@Tag(name = "视频处理", description = "视频处理任务创建、查询、重置和回调") @Tag(name = "视频处理", description = "视频处理任务创建、查询、重置和回调")
@Slf4j @Slf4j
@RestController @RestController
@RequestMapping("/label")
@RequiredArgsConstructor @RequiredArgsConstructor
public class VideoController { public class VideoController {

View File

@@ -28,6 +28,9 @@ import lombok.extern.slf4j.Slf4j;
@RequiredArgsConstructor @RequiredArgsConstructor
public class AuthInterceptor implements HandlerInterceptor { public class AuthInterceptor implements HandlerInterceptor {
private static final String API_PREFIX = "/label";
private static final String API_ROOT = API_PREFIX + "/api/";
private final RedisService redisService; private final RedisService redisService;
private final ObjectMapper objectMapper; private final ObjectMapper objectMapper;
@@ -155,9 +158,9 @@ public class AuthInterceptor implements HandlerInterceptor {
} }
private boolean isPublicPath(String path) { private boolean isPublicPath(String path) {
return !path.startsWith("/api/") return !path.startsWith(API_ROOT)
|| path.equals("/api/auth/login") || path.equals(API_PREFIX + "/api/auth/login")
|| path.equals("/api/video/callback") || path.equals(API_PREFIX + "/api/video/callback")
|| path.startsWith("/swagger-ui") || path.startsWith("/swagger-ui")
|| path.startsWith("/v3/api-docs"); || path.startsWith("/v3/api-docs");
} }

View File

@@ -1,5 +1,4 @@
server: server:
port: 8080
port: 18082 port: 18082
spring: spring: