Merge branch 'test' into test-02huogui

# Conflicts: # deploy/sql/头程数据库统一增量-MySQL8.sql # firstleg/src/main/java/com/baiyue/firstleg/service/FbaPricingService.java # firstleg/src/main/resources/application.yml # firstleg/src/main/resources/openapi/fba-pricing-v1.yaml # firstleg/src/test/java/com/baiyue/firstleg/service/FbaPricingServiceTest.java # order/src/main/java/com/baiyue/order/controller/PlatformFirstLegOrderController.java # order/src/test/java/com/baiyue/order/controller/OrderControllerPermissionTest.java
2026-08-07 19:49:09 +08:00
parent 3f15f3ad2b c698290106
commit 2b81fd40e7
192 changed files with 10729 additions and 391 deletions
@@ -15,6 +15,8 @@ import java.security.MessageDigest;
@RestController
@RequestMapping("/internal/warehouses")
 public class InternalWarehouseController {
+    private static final long PLATFORM_TENANT_ID = 0L;
+
    @Resource
    private WarehouseApplicationService service;

@@ -30,8 +32,17 @@ public class InternalWarehouseController {
    public ApiResponse<WarehouseDetailResponse> active(
            @RequestHeader(value="X-Internal-Service-Token", required=false) String token,
            @PathVariable long tenantId, @PathVariable long id) {
-        if (token == null || !MessageDigest.isEqual(expected, token.getBytes(StandardCharsets.UTF_8)))
+        verifyToken(token);
+        if (tenantId != PLATFORM_TENANT_ID) {
+            throw new BizException(ResultCode.BAD_REQUEST, "平台公共仓库作用域必须为0");
+        }
+        return ApiResponse.success(service.activeDetail(PLATFORM_TENANT_ID, id));
+    }
+
+    private void verifyToken(String token) {
+        byte[] supplied = token == null ? new byte[0] : token.getBytes(StandardCharsets.UTF_8);
+        if (!MessageDigest.isEqual(expected, supplied)) {
            throw new BizException(ResultCode.FORBIDDEN, "内部服务凭证无效");
-        return ApiResponse.success(service.activeDetail(tenantId, id));
+        }
    }
 }