Ver código fonte

下载算法平台文件

LingxinMeng 1 ano atrás
pai
commit
22828f9cbe
36 arquivos alterados com 98 adições e 67 exclusões
  1. 1 0
      api-common/src/main/java/api/common/util/HttpUtil.java
  2. 22 1
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/acl/algorithm/AlgorithmExpandAcl.java
  3. 10 4
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/api/controller/AlgorithmExpandController.java
  4. 3 3
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/api/controller/MinioController.java
  5. 4 1
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/app/algorithm/AlgorithmExpandApplication.java
  6. 11 11
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/domain/service/algorithm/AlgorithmExpandDomainService.java
  7. 1 1
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/alg_platform/ClientDetail.java
  8. 1 1
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/kafka/producer/ApacheKafkaPartitioner.java
  9. 1 1
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/minio/MinioConfiguration.java
  10. 1 1
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/minio/SubMinioClient.java
  11. 1 1
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/oauth/MyTokenServices.java
  12. 1 1
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/oauth/OAuth2ResourceServerConfiguration.java
  13. 1 1
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/oauth/OauthParameter.java
  14. 1 1
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/redis/RedisTemplateConfiguration.java
  15. 2 2
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/mysql/entity/AlgorithmExpandEntity.java
  16. 15 0
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/mysql/mapper/AlgorithmExpandMapper.java
  17. 1 1
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/mysql/param/AlgorithmExpandInfrastructureParam.java
  18. 1 1
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/util/MinioUtil.java
  19. 1 1
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/util/ProgressInputStream.java
  20. 0 15
      simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/mysql/mapper/AlgorithmExpandMapper.java
  21. 1 1
      simulation-resource-common/src/main/resources/mysql/mapper/AlgorithmExpandMapper.xml
  22. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/adapter/consumer/ProjectConsumer.java
  23. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/adapter/controller/AlgorithmController.java
  24. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/adapter/controller/CpuNodeController.java
  25. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/adapter/controller/TaskController.java
  26. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/entity/ProjectWaitQueueEntity.java
  27. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/entity/VehicleEntity.java
  28. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/repository/TaskIndexRepository.java
  29. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/service/AlgorithmApplicationService.java
  30. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/service/FileApplicationService.java
  31. 3 3
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/service/ProjectApplicationService.java
  32. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/service/TaskApplicationService.java
  33. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/service/ProjectDomainService.java
  34. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/service/TaskDomainService.java
  35. 2 2
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/scheduler/ProjectScheduler.java
  36. 1 1
      simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/TaskMessageEntity.java

+ 1 - 0
api-common/src/main/java/api/common/util/HttpUtil.java

@@ -141,6 +141,7 @@ public class HttpUtil {
      * @return 请求结果
      */
     public static String get(String url) {
+        log.info("发送HTTP请求:" + url);
         String result;
         try {
             //1 创建 GET 对象

+ 22 - 1
simulation-resource-common/src/main/java/com/css/simulation/resource/common/acl/algorithm/AlgorithmExpandAcl.java

@@ -7,7 +7,7 @@ import api.common.util.HttpUtil;
 import api.common.util.JsonUtil;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.common.api.controller.RedisController;
-import com.css.simulation.resource.common.infrastructure.configuration.alg_platform.ClientDetail;
+import com.css.simulation.resource.common.infra.configuration.alg_platform.ClientDetail;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;
@@ -107,4 +107,25 @@ public class AlgorithmExpandAcl {
         return token;
     }
 
+
+    //TODO 可以把调度程序下载算法包改为访问这个接口
+    public void download(String algorithmId) {
+//        try {
+//            //1 获取 token
+//            String tokenUrl = clientDetail.getTokenUri() + "?grant_type=client_credential&appid=" + clientDetail.getAppid() + "&secret=" + clientDetail.getSecret();
+//            String tokenJson = HttpUtil.get(tokenUrl);
+//            String token = new ObjectMapper().readTree(tokenJson).path("data").path("access_token").asText();
+//            //2 获取 下载地址
+//            String idOfAlgorithm = algorithmExpandMapper.selectIdByAlgorithmId(AlgorithmExpandEntity.builder().algorithmId(algorithmId).build());
+//            String downloadUrl = clientDetail.getAlgorithmAddrUri() + "?access_token=" + token + "&id=" + idOfAlgorithm;
+//            //3 下载算法包
+//            String downloadUrlJson = HttpUtil.get(downloadUrl);
+//            String tempDownloadUrl = new ObjectMapper().readTree(downloadUrlJson).path("data").asText();
+////                log.info("索为算法" + algorithmId + "下载地址为:" + tempDownloadUrl);
+//            InputStream inputStream = HttpUtil.getInputStream(tempDownloadUrl);
+//            FileUtil.writeInputStreamToLocalFile(inputStream, algorithmTarLinuxTempPath);
+//        } catch (JsonProcessingException e) {
+//            throw new RuntimeException(e);
+//        }
+    }
 }

+ 10 - 4
simulation-resource-common/src/main/java/com/css/simulation/resource/common/api/controller/AlgorithmExpandController.java

@@ -1,10 +1,8 @@
 package com.css.simulation.resource.common.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.common.application.algorithm.AlgorithmExpandApplication;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.css.simulation.resource.common.app.algorithm.AlgorithmExpandApplication;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -48,4 +46,12 @@ public class AlgorithmExpandController {
         return algorithmExpandApplication.selectAlgorithmNameByAlgorithmId(algorithmId);
     }
 
+    @GetMapping("/download")
+    public void download(
+            @RequestParam String algorithmId
+    ) {
+        algorithmExpandApplication.download(algorithmId);
+
+    }
+
 }

+ 3 - 3
simulation-resource-common/src/main/java/com/css/simulation/resource/common/api/controller/MinioController.java

@@ -6,9 +6,9 @@ import api.common.pojo.param.MinioParameter;
 import api.common.util.FileUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.common.infrastructure.configuration.minio.MinioConfiguration;
-import com.css.simulation.resource.common.infrastructure.configuration.minio.SubMinioClient;
-import com.css.simulation.resource.common.infrastructure.util.MinioUtil;
+import com.css.simulation.resource.common.infra.configuration.minio.MinioConfiguration;
+import com.css.simulation.resource.common.infra.configuration.minio.SubMinioClient;
+import com.css.simulation.resource.common.infra.util.MinioUtil;
 import io.minio.CreateMultipartUploadResponse;
 import io.minio.ListPartsResponse;
 import io.minio.errors.*;

+ 4 - 1
simulation-resource-common/src/main/java/com/css/simulation/resource/common/application/algorithm/AlgorithmExpandApplication.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/app/algorithm/AlgorithmExpandApplication.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.application.algorithm;
+package com.css.simulation.resource.common.app.algorithm;
 
 import api.common.pojo.common.ResponseBodyVO;
 import com.css.simulation.resource.common.acl.algorithm.AlgorithmExpandAcl;
@@ -53,4 +53,7 @@ public class AlgorithmExpandApplication {
         return algorithmExpandAcl.selectAlgorithmNameByAlgorithmId(algorithmId);
     }
 
+    public void download(String algorithmId) {
+        algorithmExpandAcl.download(algorithmId);
+    }
 }

+ 11 - 11
simulation-resource-common/src/main/java/com/css/simulation/resource/common/domain/service/algorithm/AlgorithmExpandDomainService.java

@@ -5,9 +5,9 @@ import api.common.pojo.constants.DictConstants;
 import api.common.util.CollectionUtil;
 import api.common.util.JsonUtil;
 import com.css.simulation.resource.common.acl.entity.AlgorithmExpandAclEntity;
-import com.css.simulation.resource.common.infrastructure.mysql.entity.AlgorithmExpandInfrastructureEntity;
-import com.css.simulation.resource.common.infrastructure.mysql.mapper.AlgorithmExpandMapper;
-import com.css.simulation.resource.common.infrastructure.mysql.param.AlgorithmExpandInfrastructureParam;
+import com.css.simulation.resource.common.infra.mysql.entity.AlgorithmExpandEntity;
+import com.css.simulation.resource.common.infra.mysql.mapper.AlgorithmExpandMapper;
+import com.css.simulation.resource.common.infra.mysql.param.AlgorithmExpandInfrastructureParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -40,16 +40,16 @@ public class AlgorithmExpandDomainService {
                 final String algorithmId = algorithmExpandAclEntity.getAlgorithmId();
                 if (infrastructureAlgorithmIds.contains(algorithmId)) {
                     log.info("更新算法平台算法。");
-                    final List<AlgorithmExpandInfrastructureEntity> AlgorithmExpandInfrastructureEntities = algorithmExpandMapper.select(AlgorithmExpandInfrastructureParam.builder().algorithmId(algorithmId).build());
-                    final AlgorithmExpandInfrastructureEntity algorithmExpandInfrastructureEntity = AlgorithmExpandInfrastructureEntities.get(0);
-                    BeanUtils.copyProperties(algorithmExpandAclEntity, algorithmExpandInfrastructureEntity);
-                    algorithmExpandMapper.update(algorithmExpandInfrastructureEntity);
+                    final List<AlgorithmExpandEntity> AlgorithmExpandInfrastructureEntities = algorithmExpandMapper.select(AlgorithmExpandInfrastructureParam.builder().algorithmId(algorithmId).build());
+                    final AlgorithmExpandEntity algorithmExpandEntity = AlgorithmExpandInfrastructureEntities.get(0);
+                    BeanUtils.copyProperties(algorithmExpandAclEntity, algorithmExpandEntity);
+                    algorithmExpandMapper.update(algorithmExpandEntity);
                 }else {
                     log.info("插入算法平台算法。");
-                    final AlgorithmExpandInfrastructureEntity algorithmExpandInfrastructureEntity = new AlgorithmExpandInfrastructureEntity();
-                    BeanUtils.copyProperties(algorithmExpandAclEntity, algorithmExpandInfrastructureEntity);
-                    algorithmExpandInfrastructureEntity.setStatus(DictConstants.ALGORITHM_EXPAND_STATUS_NOT_TESTED);
-                    algorithmExpandMapper.insert(algorithmExpandInfrastructureEntity);
+                    final AlgorithmExpandEntity algorithmExpandEntity = new AlgorithmExpandEntity();
+                    BeanUtils.copyProperties(algorithmExpandAclEntity, algorithmExpandEntity);
+                    algorithmExpandEntity.setStatus(DictConstants.ALGORITHM_EXPAND_STATUS_NOT_TESTED);
+                    algorithmExpandMapper.insert(algorithmExpandEntity);
                 }
             });
         }

+ 1 - 1
simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/configuration/alg_platform/ClientDetail.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/alg_platform/ClientDetail.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.infrastructure.configuration.alg_platform;
+package com.css.simulation.resource.common.infra.configuration.alg_platform;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 1 - 1
simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/configuration/kafka/producer/ApacheKafkaPartitioner.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/kafka/producer/ApacheKafkaPartitioner.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.infrastructure.configuration.kafka.producer;
+package com.css.simulation.resource.common.infra.configuration.kafka.producer;
 
 import org.apache.kafka.clients.producer.Partitioner;
 import org.apache.kafka.common.Cluster;

+ 1 - 1
simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/configuration/minio/MinioConfiguration.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/minio/MinioConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.infrastructure.configuration.minio;
+package com.css.simulation.resource.common.infra.configuration.minio;
 
 import io.minio.MinioClient;
 import lombok.Data;

+ 1 - 1
simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/configuration/minio/SubMinioClient.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/minio/SubMinioClient.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.infrastructure.configuration.minio;
+package com.css.simulation.resource.common.infra.configuration.minio;
 
 import com.google.common.collect.Multimap;
 import io.minio.CreateMultipartUploadResponse;

+ 1 - 1
simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/configuration/oauth/MyTokenServices.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/oauth/MyTokenServices.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.infrastructure.configuration.oauth;
+package com.css.simulation.resource.common.infra.configuration.oauth;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

+ 1 - 1
simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/configuration/oauth/OAuth2ResourceServerConfiguration.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/oauth/OAuth2ResourceServerConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.infrastructure.configuration.oauth;
+package com.css.simulation.resource.common.infra.configuration.oauth;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;

+ 1 - 1
simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/configuration/oauth/OauthParameter.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/oauth/OauthParameter.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.infrastructure.configuration.oauth;
+package com.css.simulation.resource.common.infra.configuration.oauth;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 1 - 1
simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/configuration/redis/RedisTemplateConfiguration.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/configuration/redis/RedisTemplateConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.infrastructure.configuration.redis;
+package com.css.simulation.resource.common.infra.configuration.redis;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;

+ 2 - 2
simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/mysql/entity/AlgorithmExpandInfrastructureEntity.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/mysql/entity/AlgorithmExpandEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.infrastructure.mysql.entity;
+package com.css.simulation.resource.common.infra.mysql.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class AlgorithmExpandInfrastructureEntity {
+public class AlgorithmExpandEntity {
     private String id = "";
     private String algorithmId = "";
     private String algorithmName = "";

+ 15 - 0
simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/mysql/mapper/AlgorithmExpandMapper.java

@@ -0,0 +1,15 @@
+package com.css.simulation.resource.common.infra.mysql.mapper;
+
+import com.css.simulation.resource.common.infra.mysql.entity.AlgorithmExpandEntity;
+import com.css.simulation.resource.common.infra.mysql.param.AlgorithmExpandInfrastructureParam;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface AlgorithmExpandMapper {
+    List<AlgorithmExpandEntity> select(AlgorithmExpandInfrastructureParam algorithmExpandInfrastructureParam);
+    List<String> selectAlgorithmIds(AlgorithmExpandInfrastructureParam algorithmExpandInfrastructureParam);
+    void insert(AlgorithmExpandEntity algorithmExpandEntity);
+    void update(AlgorithmExpandEntity algorithmExpandEntity);
+}

+ 1 - 1
simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/mysql/param/AlgorithmExpandInfrastructureParam.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/mysql/param/AlgorithmExpandInfrastructureParam.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.infrastructure.mysql.param;
+package com.css.simulation.resource.common.infra.mysql.param;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/util/MinioUtil.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/util/MinioUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.infrastructure.util;
+package com.css.simulation.resource.common.infra.util;
 
 import io.minio.*;
 import io.minio.errors.*;

+ 1 - 1
simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/util/ProgressInputStream.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infra/util/ProgressInputStream.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.infrastructure.util;
+package com.css.simulation.resource.common.infra.util;
 
 
 import java.io.BufferedInputStream;

+ 0 - 15
simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/mysql/mapper/AlgorithmExpandMapper.java

@@ -1,15 +0,0 @@
-package com.css.simulation.resource.common.infrastructure.mysql.mapper;
-
-import com.css.simulation.resource.common.infrastructure.mysql.entity.AlgorithmExpandInfrastructureEntity;
-import com.css.simulation.resource.common.infrastructure.mysql.param.AlgorithmExpandInfrastructureParam;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface AlgorithmExpandMapper {
-    List<AlgorithmExpandInfrastructureEntity> select(AlgorithmExpandInfrastructureParam algorithmExpandInfrastructureParam);
-    List<String> selectAlgorithmIds(AlgorithmExpandInfrastructureParam algorithmExpandInfrastructureParam);
-    void insert(AlgorithmExpandInfrastructureEntity algorithmExpandInfrastructureEntity);
-    void update(AlgorithmExpandInfrastructureEntity algorithmExpandInfrastructureEntity);
-}

+ 1 - 1
simulation-resource-common/src/main/resources/mysql/mapper/AlgorithmExpandMapper.xml

@@ -21,7 +21,7 @@
 
 
     <select id="select"
-            resultType="com.css.simulation.resource.common.infrastructure.mysql.entity.AlgorithmExpandInfrastructureEntity">
+            resultType="com.css.simulation.resource.common.infra.mysql.entity.AlgorithmExpandEntity">
         select id, algorithm_id, algorithm_name, description, algorithm_type, status
         from algorithm_expand
         where 1=1

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/adapter/consumer/ProjectConsumer.java

@@ -3,7 +3,7 @@ package com.css.simulation.resource.scheduler.adapter.consumer;
 
 import api.common.util.JsonUtil;
 import com.css.simulation.resource.scheduler.adapter.controller.model.ProjectMessageModel;
-import com.css.simulation.resource.scheduler.application.service.ProjectApplicationService;
+import com.css.simulation.resource.scheduler.app.service.ProjectApplicationService;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/adapter/controller/AlgorithmController.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.scheduler.adapter.controller;
 
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.scheduler.application.service.AlgorithmApplicationService;
+import com.css.simulation.resource.scheduler.app.service.AlgorithmApplicationService;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/adapter/controller/CpuNodeController.java

@@ -1,7 +1,7 @@
 package com.css.simulation.resource.scheduler.adapter.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.scheduler.application.service.FileApplicationService;
+import com.css.simulation.resource.scheduler.app.service.FileApplicationService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestPart;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/adapter/controller/TaskController.java

@@ -1,7 +1,7 @@
 package com.css.simulation.resource.scheduler.adapter.controller;
 
 
-import com.css.simulation.resource.scheduler.application.service.TaskApplicationService;
+import com.css.simulation.resource.scheduler.app.service.TaskApplicationService;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/entity/ProjectWaitQueueEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/entity/ProjectWaitQueueEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.application.entity;
+package com.css.simulation.resource.scheduler.app.entity;
 
 import com.css.simulation.resource.scheduler.adapter.controller.model.ProjectMessageModel;
 import lombok.*;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/entity/VehicleEntity.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/entity/VehicleEntity.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.application.entity;
+package com.css.simulation.resource.scheduler.app.entity;
 
 import com.css.simulation.resource.scheduler.infra.configuration.entity.DynamicsEntity;
 import com.css.simulation.resource.scheduler.infra.entity.ModelEntity;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/repository/TaskIndexRepository.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/repository/TaskIndexRepository.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.application.repository;
+package com.css.simulation.resource.scheduler.app.repository;
 
 import com.css.simulation.resource.scheduler.infra.db.mysql.mapper.IndexMapper;
 import com.css.simulation.resource.scheduler.infra.entity.LeafIndexEntity;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/AlgorithmApplicationService.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/service/AlgorithmApplicationService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.application.service;
+package com.css.simulation.resource.scheduler.app.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.util.FileUtil;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/FileApplicationService.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/service/FileApplicationService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.application.service;
+package com.css.simulation.resource.scheduler.app.service;
 
 import api.common.util.FileUtil;
 import api.common.util.HttpUtil;

+ 3 - 3
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/ProjectApplicationService.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/service/ProjectApplicationService.java

@@ -1,10 +1,10 @@
-package com.css.simulation.resource.scheduler.application.service;
+package com.css.simulation.resource.scheduler.app.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.util.*;
 import com.css.simulation.resource.scheduler.adapter.controller.model.ProjectMessageModel;
-import com.css.simulation.resource.scheduler.application.entity.ProjectWaitQueueEntity;
-import com.css.simulation.resource.scheduler.application.entity.VehicleEntity;
+import com.css.simulation.resource.scheduler.app.entity.ProjectWaitQueueEntity;
+import com.css.simulation.resource.scheduler.app.entity.VehicleEntity;
 import com.css.simulation.resource.scheduler.domain.service.ProjectDomainService;
 import com.css.simulation.resource.scheduler.domain.service.TaskDomainService;
 import com.css.simulation.resource.scheduler.infra.configuration.custom.CustomConfiguration;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/TaskApplicationService.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/service/TaskApplicationService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.application.service;
+package com.css.simulation.resource.scheduler.app.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.util.HttpUtil;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/service/ProjectDomainService.java

@@ -4,7 +4,7 @@ import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
 import api.common.util.*;
 import com.css.simulation.resource.scheduler.adapter.controller.model.ProjectMessageModel;
-import com.css.simulation.resource.scheduler.application.entity.ProjectWaitQueueEntity;
+import com.css.simulation.resource.scheduler.app.entity.ProjectWaitQueueEntity;
 import com.css.simulation.resource.scheduler.infra.configuration.custom.CustomConfiguration;
 import com.css.simulation.resource.scheduler.infra.configuration.entity.NodeEntity;
 import com.css.simulation.resource.scheduler.infra.configuration.kubernetes.KubernetesConfiguration;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/service/TaskDomainService.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.scheduler.domain.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.util.*;
-import com.css.simulation.resource.scheduler.application.repository.TaskIndexRepository;
+import com.css.simulation.resource.scheduler.app.repository.TaskIndexRepository;
 import com.css.simulation.resource.scheduler.infra.configuration.custom.CustomConfiguration;
 import com.css.simulation.resource.scheduler.infra.db.entity.ScoringRuleEntity;
 import com.css.simulation.resource.scheduler.infra.db.mysql.mapper.*;

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/configuration/scheduler/ProjectScheduler.java

@@ -3,8 +3,8 @@ package com.css.simulation.resource.scheduler.infra.configuration.scheduler;
 import api.common.pojo.constants.DictConstants;
 import api.common.util.CollectionUtil;
 import com.css.simulation.resource.scheduler.adapter.controller.model.ProjectMessageModel;
-import com.css.simulation.resource.scheduler.application.entity.ProjectWaitQueueEntity;
-import com.css.simulation.resource.scheduler.application.service.ProjectApplicationService;
+import com.css.simulation.resource.scheduler.app.entity.ProjectWaitQueueEntity;
+import com.css.simulation.resource.scheduler.app.service.ProjectApplicationService;
 import com.css.simulation.resource.scheduler.domain.service.ProjectDomainService;
 import com.css.simulation.resource.scheduler.infra.entity.ProjectEntity;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/entity/TaskMessageEntity.java

@@ -1,6 +1,6 @@
 package com.css.simulation.resource.scheduler.infra.entity;
 
-import com.css.simulation.resource.scheduler.application.entity.VehicleEntity;
+import com.css.simulation.resource.scheduler.app.entity.VehicleEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;