From 49851384c8f4781138f8f6fd5ffcfbd908a64c7f Mon Sep 17 00:00:00 2001 From: xiaohucoding <2307520758@qq.com> Date: Tue, 3 Jun 2025 21:52:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=B3=A8=E5=86=8C=EF=BC=88?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 3 ++- .../controller/ServiceAPIController.java | 5 ++++- .../filter/ApiRequestGlobalFilter.java | 6 +----- .../pojo/ServicePublishDTO.java | 2 ++ src/main/resources/application.properties | 2 ++ src/main/resources/bootstrap.properties | 4 ++-- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 5aac308..3ca8df4 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ com.alibaba.cloud spring-cloud-alibaba-dependencies - 2022.0.0.0 + 2022.0.0.0-RC2 pom import @@ -55,6 +55,7 @@ org.springframework.boot spring-boot-starter-web --> + org.springframework.boot spring-boot-starter-data-redis diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ServiceAPIController.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ServiceAPIController.java index f08513e..468ee08 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ServiceAPIController.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ServiceAPIController.java @@ -74,13 +74,16 @@ public class ServiceAPIController { return OptResult.success("资源释放成功"); } - @PostMapping("/request") + @PostMapping("/request/{modelId}") @Operation(summary = "请求调度") @Transactional public OptResult schedule(@PathVariable Long modelId) { // 1. 存储modelConfig到缓存 String modelConfig = serviceAPIService.getByModelId(modelId); int requestMemorySize = parseGpuMemorySize(modelConfig); + if (requestMemorySize == -1){ + return OptResult.error("解析配置失败，请检查模型:" + modelId +"是否存在"); + } String modelConfigKey = "modelConfig:" + modelId; redisTemplate.opsForValue().set(modelConfigKey, modelConfig); // 2. 获取Nacos实例IP列表 diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/filter/ApiRequestGlobalFilter.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/filter/ApiRequestGlobalFilter.java index 41eb59c..c015c05 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/filter/ApiRequestGlobalFilter.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/filter/ApiRequestGlobalFilter.java @@ -15,16 +15,12 @@ public class ApiRequestGlobalFilter implements GlobalFilter, Ordered { @Override public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { ServerHttpRequest request = exchange.getRequest(); - // 检查请求路径和方法 - if (request.getURI().getPath().equals("/request") && + if (request.getURI().getPath().equals("/request/{id}") && request.getMethod() == HttpMethod.POST) { - // 在此处添加拦截逻辑 System.out.println("拦截到POST /request请求"); - } - // 继续处理请求 return chain.filter(exchange); } diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ServicePublishDTO.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ServicePublishDTO.java index 31f384f..021f1f8 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ServicePublishDTO.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ServicePublishDTO.java @@ -1,5 +1,6 @@ package com.bipt.intelligentapplicationorchestrationservice.pojo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -18,6 +19,7 @@ public class ServicePublishDTO implements Serializable { private Long id; private Long modelId; private String apiUrl; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime createTime; private String ip; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0115fcb..1bcdc62 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -29,6 +29,8 @@ spring.cloud.gateway.routes[0].predicates[0]=Path=/request +logging.level.org.springframework.web=DEBUG + #SQL 语句日志输出配置 logging.level.com.bipt.intelligentapplicationorchestrationservice.mapper=DEBUG mybatis.configuration.log-impl=org.apache.ibatis.logging.slf4j.Slf4jImpl diff --git a/src/main/resources/bootstrap.properties b/src/main/resources/bootstrap.properties index b24d590..592b856 100644 --- a/src/main/resources/bootstrap.properties +++ b/src/main/resources/bootstrap.properties @@ -2,9 +2,9 @@ spring.application.name=intelligent-application-orchestration-service # Nacos配置中心地址（引导阶段加载配置） -spring.cloud.nacos.config.server-addr=192.168.100.1:8848 +spring.cloud.nacos.config.server-addr=113.44.217.169:8848 spring.cloud.nacos.config.data-id=${spring.application.name}.properties spring.cloud.nacos.config.group=DEFAULT_GROUP # Nacos服务注册地址（引导阶段注册服务） -spring.cloud.nacos.discovery.server-addr=192.168.100.1:8848 \ No newline at end of file +spring.cloud.nacos.discovery.server-addr=113.44.217.169:8848 \ No newline at end of file