服务发布（nacos版）

src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java

@@ -4,11 +4,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @MapperScan("com.bipt.intelligentapplicationorchestrationservice.mapper")//指定扫描Mapper接口的包
 @SpringBootApplication
 @EnableTransactionManagement
+@EnableDiscoveryClient
 @Slf4j
 public class IntelligentApplicationOrchestrationServiceApplication {
 

src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/publishController.java

@@ -1,8 +1,8 @@
 package com.bipt.intelligentapplicationorchestrationservice.controller;
 
-import com.bipt.intelligentapplicationorchestrationservice.config.RedisConfiguration;
 import com.bipt.intelligentapplicationorchestrationservice.pojo.*;
 import com.bipt.intelligentapplicationorchestrationservice.service.PublishService;
+import com.bipt.intelligentapplicationorchestrationservice.util.NacosServiceUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -24,11 +24,9 @@ public class publishController {
 
     @Autowired
     private RedisTemplate redisTemplate;
-    /**
-     * 新增请求发布
-     * @param servicePublishDTO
-     * @return
-     */
+    @Autowired
+    private NacosServiceUtil nacosServiceUtil;
+
     @PostMapping
     @Operation(summary ="新增发布请求")
     @Transactional
@@ -37,70 +35,22 @@ public class publishController {
         publishService.save(servicePublishDTO);
         Long modelId = servicePublishDTO.getModelId();
         String key = "Model_" + modelId;
-        //查询redis是否存在GPU相关资源数据
-        List<ServicePublishVO> list;
-        list = (List<ServicePublishVO>) redisTemplate.opsForValue().get(key);
-        //如果存在，直接返回，无须查询数据库
-        if (list != null) {
-            return OptResult.success(list);
-        }else {
-            list = new ArrayList<>();
-        }
-        String modelConfig = publishService.getByModelId(modelId);
-        if (modelConfig == null) {
-            log.error("模型配置为空，modelId={}", modelId);
-        }
-        String[] keyValuePairs = modelConfig.split("\\|");
-        String GPUMemorySize = null;
-        String GPUModel = null;
-        for (String pair : keyValuePairs) {
-            pair = pair.trim();
-            if (pair.startsWith("GPU")) {
-                GPUModel = pair.split(";", 2)[1];
-            } else if (pair.startsWith("Memory:")) {
-                GPUMemorySize = pair.split(":", 2)[1];
-            }
-        }
-        ServicePublishVO servicePublishVO = new ServicePublishVO();
-        servicePublishVO.setIp(servicePublishDTO.getIp());
-        servicePublishVO.setModelId(servicePublishDTO.getModelId());
-        servicePublishVO.setGPUMemorySize(GPUMemorySize);
-        servicePublishVO.setGPUModel(GPUModel);
-        //todo 调用模型部署，传递信息
-
-        servicePublishVO.setApiUrl(servicePublishDTO.getApiUrl());
-        list.add(servicePublishVO);
-        redisTemplate.opsForValue().set(key,list);
-        //一个ip上有多个机器
-        // 假设从 Redis 获取的列表元素是 MachineInfo 类型
-        String ip = servicePublishVO.getIp();
-        String key1 = ip;
-        List<MachineInfo> machineList = (List<MachineInfo>) redisTemplate.opsForValue().get(key1);
 
 
-        // 模型所需的 GPU 资源
-        String requiredGPUModel = servicePublishVO.getGPUModel();
-        Integer requiredGPUMemory = Integer.valueOf(servicePublishVO.getGPUMemorySize());
 
-        if (machineList != null) {
-            for (MachineInfo machine : machineList) {
-                // 获取机器的 GPU 资源
-                String machineGPUModel = machine.getGPUModel();
-                Integer machineGPUMemory = machine.getGPUMemorySize();
-
-                // 判断机器是否满足模型需求
-                if (requiredGPUModel.equals(machineGPUModel) &&
-                        machineGPUMemory >= requiredGPUMemory) {
-                    return OptResult.success(list);
-                }
-            }
-            String key3 = "wait_queue";
-            redisTemplate.opsForValue().set(key3,list);
-            //todo资源释放时候优先分配等待队列中任务
 
+        try {
+            nacosServiceUtil.registerService(
+                servicePublishDTO.getModelId().toString(),
+                servicePublishDTO.getIp(),
+                8080
+            );
+            log.info("Nacos服务注册成功");
+        } catch (Exception e) {
+            log.error("Nacos服务注册失败", e);
         }
 
-        return OptResult.success(list);
+        return OptResult.success();
     }
 
 

src/main/java/com/bipt/intelligentapplicationorchestrationservice/util/NacosServiceUtil.java

@@ -0,0 +1,21 @@
+package com.bipt.intelligentapplicationorchestrationservice.util;
+
+import com.alibaba.nacos.api.naming.NamingFactory;
+import com.alibaba.nacos.api.naming.NamingService;
+import com.alibaba.nacos.api.naming.pojo.Instance;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class NacosServiceUtil {
+    @Value("${spring.cloud.nacos.discovery.server-addr}")
+    private String nacosServerAddr;
+
+    public void registerService(String serviceName, String ip, int port) throws Exception {
+        NamingService naming = NamingFactory.createNamingService(nacosServerAddr);
+        Instance instance = new Instance();
+        instance.setIp(ip);
+        instance.setPort(port);
+        naming.registerInstance(serviceName, instance);
+    }
+}