服务注册(服务器版
This commit is contained in:
3
pom.xml
3
pom.xml
@ -38,7 +38,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
|
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
|
||||||
<version>2022.0.0.0</version> <!-- 适配 Spring Boot 3.1.x 的正确版本 -->
|
<version>2022.0.0.0-RC2</version> <!-- 适配 Spring Boot 3.1.x 的正确版本 -->
|
||||||
<type>pom</type>
|
<type>pom</type>
|
||||||
<scope>import</scope>
|
<scope>import</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -55,6 +55,7 @@
|
|||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
<artifactId>spring-boot-starter-web</artifactId>
|
||||||
</dependency>-->
|
</dependency>-->
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-data-redis</artifactId>
|
<artifactId>spring-boot-starter-data-redis</artifactId>
|
||||||
|
@ -74,13 +74,16 @@ public class ServiceAPIController {
|
|||||||
return OptResult.success("资源释放成功");
|
return OptResult.success("资源释放成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/request")
|
@PostMapping("/request/{modelId}")
|
||||||
@Operation(summary = "请求调度")
|
@Operation(summary = "请求调度")
|
||||||
@Transactional
|
@Transactional
|
||||||
public OptResult schedule(@PathVariable Long modelId) {
|
public OptResult schedule(@PathVariable Long modelId) {
|
||||||
// 1. 存储modelConfig到缓存
|
// 1. 存储modelConfig到缓存
|
||||||
String modelConfig = serviceAPIService.getByModelId(modelId);
|
String modelConfig = serviceAPIService.getByModelId(modelId);
|
||||||
int requestMemorySize = parseGpuMemorySize(modelConfig);
|
int requestMemorySize = parseGpuMemorySize(modelConfig);
|
||||||
|
if (requestMemorySize == -1){
|
||||||
|
return OptResult.error("解析配置失败,请检查模型:" + modelId +"是否存在");
|
||||||
|
}
|
||||||
String modelConfigKey = "modelConfig:" + modelId;
|
String modelConfigKey = "modelConfig:" + modelId;
|
||||||
redisTemplate.opsForValue().set(modelConfigKey, modelConfig);
|
redisTemplate.opsForValue().set(modelConfigKey, modelConfig);
|
||||||
// 2. 获取Nacos实例IP列表
|
// 2. 获取Nacos实例IP列表
|
||||||
|
@ -15,16 +15,12 @@ public class ApiRequestGlobalFilter implements GlobalFilter, Ordered {
|
|||||||
@Override
|
@Override
|
||||||
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
|
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
|
||||||
ServerHttpRequest request = exchange.getRequest();
|
ServerHttpRequest request = exchange.getRequest();
|
||||||
|
|
||||||
// 检查请求路径和方法
|
// 检查请求路径和方法
|
||||||
if (request.getURI().getPath().equals("/request") &&
|
if (request.getURI().getPath().equals("/request/{id}") &&
|
||||||
request.getMethod() == HttpMethod.POST) {
|
request.getMethod() == HttpMethod.POST) {
|
||||||
|
|
||||||
// 在此处添加拦截逻辑
|
// 在此处添加拦截逻辑
|
||||||
System.out.println("拦截到POST /request请求");
|
System.out.println("拦截到POST /request请求");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 继续处理请求
|
// 继续处理请求
|
||||||
return chain.filter(exchange);
|
return chain.filter(exchange);
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.bipt.intelligentapplicationorchestrationservice.pojo;
|
package com.bipt.intelligentapplicationorchestrationservice.pojo;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -18,6 +19,7 @@ public class ServicePublishDTO implements Serializable {
|
|||||||
private Long id;
|
private Long id;
|
||||||
private Long modelId;
|
private Long modelId;
|
||||||
private String apiUrl;
|
private String apiUrl;
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
private LocalDateTime createTime;
|
private LocalDateTime createTime;
|
||||||
private String ip;
|
private String ip;
|
||||||
}
|
}
|
||||||
|
@ -29,6 +29,8 @@ spring.cloud.gateway.routes[0].predicates[0]=Path=/request
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
logging.level.org.springframework.web=DEBUG
|
||||||
|
|
||||||
#SQL 语句日志输出配置
|
#SQL 语句日志输出配置
|
||||||
logging.level.com.bipt.intelligentapplicationorchestrationservice.mapper=DEBUG
|
logging.level.com.bipt.intelligentapplicationorchestrationservice.mapper=DEBUG
|
||||||
mybatis.configuration.log-impl=org.apache.ibatis.logging.slf4j.Slf4jImpl
|
mybatis.configuration.log-impl=org.apache.ibatis.logging.slf4j.Slf4jImpl
|
||||||
|
@ -2,9 +2,9 @@
|
|||||||
spring.application.name=intelligent-application-orchestration-service
|
spring.application.name=intelligent-application-orchestration-service
|
||||||
|
|
||||||
# Nacos配置中心地址(引导阶段加载配置)
|
# 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.data-id=${spring.application.name}.properties
|
||||||
spring.cloud.nacos.config.group=DEFAULT_GROUP
|
spring.cloud.nacos.config.group=DEFAULT_GROUP
|
||||||
|
|
||||||
# Nacos服务注册地址(引导阶段注册服务)
|
# Nacos服务注册地址(引导阶段注册服务)
|
||||||
spring.cloud.nacos.discovery.server-addr=192.168.100.1:8848
|
spring.cloud.nacos.discovery.server-addr=113.44.217.169:8848
|
Reference in New Issue
Block a user