速度单位

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/AlgoPlatformService.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.server.acl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import com.css.simulation.resource.server.acl.impl.AlgoPlatformServiceFallback;
-import com.css.simulation.resource.server.infra.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.infra.feign.FeignConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/FileDownService.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.server.acl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.MinioParameter;
-import com.css.simulation.resource.server.infra.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.infra.feign.FeignConfiguration;
 import com.css.simulation.resource.server.acl.impl.FileDownServiceFallback;
 import feign.Response;
 import org.springframework.cloud.openfeign.FeignClient;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/KafkaService.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.server.acl;
 
 
 import api.common.pojo.param.KafkaParameter;
-import com.css.simulation.resource.server.infra.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.infra.feign.FeignConfiguration;
 import com.css.simulation.resource.server.acl.impl.KafkaServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/MonitorService.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.server.acl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
-import com.css.simulation.resource.server.infra.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.infra.feign.FeignConfiguration;
 import com.css.simulation.resource.server.acl.impl.MonitorServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/OauthClientService.java

@@ -1,7 +1,7 @@
 package com.css.simulation.resource.server.acl;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.server.infra.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.infra.feign.FeignConfiguration;
 import com.css.simulation.resource.server.acl.impl.RedisServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/RedisService.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.server.acl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.RedisParameter;
-import com.css.simulation.resource.server.infra.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.infra.feign.FeignConfiguration;
 import com.css.simulation.resource.server.acl.impl.RedisServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/SceneService.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.server.acl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.po.system.SceneImportPO;
-import com.css.simulation.resource.server.infra.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.infra.feign.FeignConfiguration;
 import com.css.simulation.resource.server.acl.impl.SceneServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.scheduling.annotation.Async;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/SchedulerService.java

@@ -1,7 +1,7 @@
 package com.css.simulation.resource.server.acl;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.server.infra.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.infra.feign.FeignConfiguration;
 import com.css.simulation.resource.server.acl.impl.SchedulerServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/DictController.java

@@ -3,7 +3,7 @@ package com.css.simulation.resource.server.api.controller;
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.DictParam;
 import api.common.pojo.vo.system.DictVO;
-import com.css.simulation.resource.server.application.service.DictService;
+import com.css.simulation.resource.server.app.service.DictService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/MenuController.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.vo.system.MenuVO;
-import com.css.simulation.resource.server.application.service.MenuService;
+import com.css.simulation.resource.server.app.service.MenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/algorithm_library/AlgorithmLibraryController.java

@@ -4,7 +4,7 @@ package com.css.simulation.resource.server.api.controller.algorithm_library;
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.algorithm.AlgorithmParameter;
-import com.css.simulation.resource.server.application.service.AlgorithmService;
+import com.css.simulation.resource.server.app.service.AlgorithmService;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/home_page/HomePageController.java

@@ -6,12 +6,12 @@ import api.common.pojo.vo.home.HardwareVO;
 import api.common.pojo.vo.home.LineChartVO;
 import api.common.pojo.vo.home.ServiceVO;
 import api.common.pojo.vo.home.SystemServerVO;
-import com.css.simulation.resource.server.application.service.AlgorithmService;
-import com.css.simulation.resource.server.application.service.HomePageService;
-import com.css.simulation.resource.server.application.service.ConfigService;
-import com.css.simulation.resource.server.application.service.job_manage.SimulationProjectService;
-import com.css.simulation.resource.server.application.service.SceneNaturalService;
-import com.css.simulation.resource.server.application.service.ClusterService;
+import com.css.simulation.resource.server.app.service.AlgorithmService;
+import com.css.simulation.resource.server.app.service.HomePageService;
+import com.css.simulation.resource.server.app.service.ConfigService;
+import com.css.simulation.resource.server.app.service.job_manage.SimulationProjectService;
+import com.css.simulation.resource.server.app.service.SceneNaturalService;
+import com.css.simulation.resource.server.app.service.ClusterService;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/job_manage/AlgorithmPlatformResultController.java

@@ -5,7 +5,7 @@ import api.common.pojo.vo.project.ProjectReportVO;
 import api.common.pojo.vo.project.ProjectResultWithAlgorithmVO;
 import api.common.util.StringUtil;
 import com.css.simulation.resource.server.api.parameter.ProjectParam;
-import com.css.simulation.resource.server.application.service.job_manage.JobManageApplicationService;
+import com.css.simulation.resource.server.app.service.job_manage.JobManageApplicationService;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/job_manage/JobManageController.java

@@ -5,8 +5,8 @@ import api.common.pojo.param.project.DictParam;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.vo.project.*;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.application.service.job_manage.SimulationProjectService;
-import com.css.simulation.resource.server.application.service.ClusterService;
+import com.css.simulation.resource.server.app.service.job_manage.SimulationProjectService;
+import com.css.simulation.resource.server.app.service.ClusterService;
 import com.github.pagehelper.PageInfo;
 
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/job_manage/MonitorController.java

@@ -3,7 +3,7 @@ package com.css.simulation.resource.server.api.controller.job_manage;
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.service.job_manage.SimulationProjectService;
+import com.css.simulation.resource.server.app.service.job_manage.SimulationProjectService;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/model_library/dynamic_configuration/VehicleController.java

@@ -9,7 +9,7 @@ import api.common.pojo.vo.model.VehicleGSVO;
 import api.common.pojo.vo.model.VehicleVO;
 import api.common.util.FileUtil;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.service.VehicleService;
+import com.css.simulation.resource.server.app.service.VehicleService;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/model_library/dynamic_configuration/VehicleTemplateController.java

@@ -4,7 +4,7 @@ import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.model.VehiclePageParam;
 import api.common.pojo.po.model.VehicleTempPO;
 import api.common.pojo.vo.model.VehicleTempVO;
-import com.css.simulation.resource.server.application.service.VehicleTempService;
+import com.css.simulation.resource.server.app.service.VehicleTempService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/model_library/sensor_configuration/SensorCameraController.java

@@ -6,7 +6,7 @@ import api.common.pojo.param.model.CameraParam;
 import api.common.pojo.po.model.CameraPO;
 import api.common.pojo.vo.model.CameraVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.service.CameraService;
+import com.css.simulation.resource.server.app.service.CameraService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/model_library/sensor_configuration/SensorController.java

@@ -7,10 +7,10 @@ import api.common.pojo.param.model.LidarParam;
 import api.common.pojo.param.model.OgtParam;
 import api.common.pojo.vo.model.SensorNewVO;
 import api.common.pojo.vo.model.SensorVO;
-import com.css.simulation.resource.server.application.service.CameraService;
-import com.css.simulation.resource.server.application.service.GpsService;
-import com.css.simulation.resource.server.application.service.LidarService;
-import com.css.simulation.resource.server.application.service.OgtService;
+import com.css.simulation.resource.server.app.service.CameraService;
+import com.css.simulation.resource.server.app.service.GpsService;
+import com.css.simulation.resource.server.app.service.LidarService;
+import com.css.simulation.resource.server.app.service.OgtService;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/model_library/sensor_configuration/SensorGpsController.java

@@ -7,7 +7,7 @@ import api.common.pojo.param.model.GpsParam;
 import api.common.pojo.po.model.GpsPO;
 import api.common.pojo.vo.model.GpsVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.service.GpsService;
+import com.css.simulation.resource.server.app.service.GpsService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/model_library/sensor_configuration/SensorLidarController.java

@@ -7,7 +7,7 @@ import api.common.pojo.param.model.LidarParam;
 import api.common.pojo.po.model.LidarPO;
 import api.common.pojo.vo.model.LidarVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.service.LidarService;
+import com.css.simulation.resource.server.app.service.LidarService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/model_library/sensor_configuration/SensorOgtController.java

@@ -6,7 +6,7 @@ import api.common.pojo.param.model.OgtParam;
 import api.common.pojo.po.model.OgtPO;
 import api.common.pojo.vo.model.OgtVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.service.OgtService;
+import com.css.simulation.resource.server.app.service.OgtService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/model_library/vehicle_configuration/ModelConfigController.java

@@ -8,7 +8,7 @@ import api.common.pojo.po.model.ConfigPO;
 import api.common.pojo.vo.model.ConfigSensorVO;
 import api.common.pojo.vo.model.ConfigVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.service.ConfigService;
+import com.css.simulation.resource.server.app.service.ConfigService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/personal_information/UserInfoController.java

@@ -10,12 +10,12 @@ import api.common.pojo.vo.system.ClusterVO;
 import api.common.pojo.vo.system.ParameterVO;
 import api.common.pojo.vo.system.UserVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SystemScenePackageSublistMapper;
-import com.css.simulation.resource.server.application.service.SystemScenePackageService;
-import com.css.simulation.resource.server.application.service.ClusterService;
-import com.css.simulation.resource.server.application.service.ParameterService;
-import com.css.simulation.resource.server.application.service.UserService;
+import com.css.simulation.resource.server.app.service.SystemScenePackageService;
+import com.css.simulation.resource.server.app.service.ClusterService;
+import com.css.simulation.resource.server.app.service.ParameterService;
+import com.css.simulation.resource.server.app.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/accident/SceneAccidentController.java

@@ -8,9 +8,9 @@ import api.common.pojo.po.scene.SceneAccidentPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.SceneAccidentVO;
 import api.common.util.CollectionUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
-import com.css.simulation.resource.server.application.service.SceneAccidentService;
-import com.css.simulation.resource.server.application.service.SceneImportService;
+import com.css.simulation.resource.server.infra.util.PageUtil;
+import com.css.simulation.resource.server.app.service.SceneAccidentService;
+import com.css.simulation.resource.server.app.service.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/general/SceneGeneralController.java

@@ -11,13 +11,13 @@ import api.common.pojo.vo.scene.SceneGeneralTemplateVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.util.PageUtil;
 import com.css.simulation.resource.server.acl.FileDownService;
-import com.css.simulation.resource.server.application.service.LogService;
-import com.css.simulation.resource.server.application.service.SceneGeneralExampleService;
-import com.css.simulation.resource.server.application.service.SceneGeneralTemplateService;
-import com.css.simulation.resource.server.application.service.DictService;
-import com.css.simulation.resource.server.application.service.SceneImportService;
+import com.css.simulation.resource.server.app.service.LogService;
+import com.css.simulation.resource.server.app.service.SceneGeneralExampleService;
+import com.css.simulation.resource.server.app.service.SceneGeneralTemplateService;
+import com.css.simulation.resource.server.app.service.DictService;
+import com.css.simulation.resource.server.app.service.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/natural/SceneNaturalController.java

@@ -9,9 +9,9 @@ import api.common.pojo.po.scene.SceneNaturalPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.SceneNaturalVO;
 import api.common.util.CollectionUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
-import com.css.simulation.resource.server.application.service.SceneNaturalService;
-import com.css.simulation.resource.server.application.service.SceneImportService;
+import com.css.simulation.resource.server.infra.util.PageUtil;
+import com.css.simulation.resource.server.app.service.SceneNaturalService;
+import com.css.simulation.resource.server.app.service.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/scene_test_package/SceneTestPackageController.java

@@ -8,12 +8,12 @@ import api.common.pojo.vo.scene.ScenePackageSublistVO;
 import api.common.pojo.vo.scene.ScenePackageVO;
 import api.common.util.ObjectUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.PageUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageMapper;
-import com.css.simulation.resource.server.application.service.ScenePackageService;
-import com.css.simulation.resource.server.application.service.ParameterService;
-import com.css.simulation.resource.server.infra.common.util.SceneUtil;
+import com.css.simulation.resource.server.app.service.ScenePackageService;
+import com.css.simulation.resource.server.app.service.ParameterService;
+import com.css.simulation.resource.server.infra.util.SceneUtil;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/score_rule/ScoreRuleController.java

@@ -8,9 +8,9 @@ import api.common.pojo.vo.scene.ScoringRulesVO;
 import api.common.util.ObjectUtil;
 import api.common.util.PythonUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
-import com.css.simulation.resource.server.application.service.ScoringRulesService;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.PageUtil;
+import com.css.simulation.resource.server.app.service.ScoringRulesService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.security.access.prepost.PreAuthorize;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/scene_library/standard/SceneStandardsController.java

@@ -8,9 +8,9 @@ import api.common.pojo.po.scene.StandardsRegulationsPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.StandardsRegulationsVO;
 import api.common.util.CollectionUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
-import com.css.simulation.resource.server.application.service.SceneStandardsService;
-import com.css.simulation.resource.server.application.service.SceneImportService;
+import com.css.simulation.resource.server.infra.util.PageUtil;
+import com.css.simulation.resource.server.app.service.SceneStandardsService;
+import com.css.simulation.resource.server.app.service.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/account_manage/RoleController.java

@@ -5,9 +5,9 @@ import api.common.pojo.param.system.RoleParam;
 import api.common.pojo.po.system.RolePO;
 import api.common.pojo.vo.system.RoleVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.service.RoleService;
+import com.css.simulation.resource.server.app.service.RoleService;
 import com.css.simulation.resource.server.domain.service.UserDomainService;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.github.pagehelper.PageInfo;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/account_manage/UserController.java

@@ -5,7 +5,7 @@ import api.common.pojo.param.system.UserParam;
 import api.common.pojo.po.system.UserPO;
 import api.common.pojo.vo.system.UserVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.service.UserService;
+import com.css.simulation.resource.server.app.service.UserService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/cluster_manage/ClusterController.java

@@ -5,7 +5,7 @@ import api.common.pojo.param.system.ClusterParam;
 import api.common.pojo.po.system.ClusterPO;
 import api.common.pojo.vo.system.ClusterVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.service.ClusterService;
+import com.css.simulation.resource.server.app.service.ClusterService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.RequestBody;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/log_manage/LogController.java

@@ -5,7 +5,7 @@ import api.common.pojo.param.log.LogPageParam;
 import api.common.pojo.po.log.LogLoginPO;
 import api.common.pojo.po.log.LogOperationPO;
 import api.common.pojo.po.log.LogSystemPO;
-import com.css.simulation.resource.server.application.service.LogService;
+import com.css.simulation.resource.server.app.service.LogService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/parameter_manage/ParameterController.java

@@ -5,7 +5,7 @@ import api.common.pojo.param.system.ParameterParam;
 import api.common.pojo.po.system.ParameterPO;
 import api.common.pojo.vo.system.ParameterVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.service.ParameterService;
+import com.css.simulation.resource.server.app.service.ParameterService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.RequestBody;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/scene_package_manage/ScenePackageController.java

@@ -9,8 +9,8 @@ import api.common.pojo.po.scene.SystemScenePackagePO;
 import api.common.pojo.vo.scene.SystemScenePackageVO;
 import api.common.pojo.vo.scene.SystemUserSceneVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
-import com.css.simulation.resource.server.application.service.SystemScenePackageService;
+import com.css.simulation.resource.server.infra.util.PageUtil;
+import com.css.simulation.resource.server.app.service.SystemScenePackageService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.web.bind.annotation.*;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/scene_package_share/SyetemUserSceneController.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.server.api.controller.system_manage.scene_pa
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.po.scene.SystemUserScenePO;
-import com.css.simulation.resource.server.application.service.SystemUserSceneService;
+import com.css.simulation.resource.server.app.service.SystemUserSceneService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.List;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/system_manage/scene_upload/SceneUploadController.java

@@ -5,9 +5,9 @@ import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.system.SceneImportPageParam;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.infra.configuration.oauth.AuthorizationHolder;
+import com.css.simulation.resource.server.infra.oauth.AuthorizationHolder;
 import com.css.simulation.resource.server.acl.SceneService;
-import com.css.simulation.resource.server.application.service.SceneImportService;
+import com.css.simulation.resource.server.app.service.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.RequestBody;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/enums/ProjectRunStateEnum.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/constant/ProjectRunStateEnum.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infra.common.enums;
+package com.css.simulation.resource.server.app.constant;
 
 import lombok.Getter;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/enums/SceneTypeEnum.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/constant/SceneTypeEnum.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infra.common.enums;
+package com.css.simulation.resource.server.app.constant;
 
 import lombok.Getter;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/impl/AlgorithmServiceImpl.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/impl/AlgorithmServiceImpl.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.impl;
+package com.css.simulation.resource.server.app.impl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -13,14 +13,14 @@ import api.common.util.*;
 import com.css.simulation.resource.server.acl.AlgoPlatformService;
 import com.css.simulation.resource.server.acl.FileDownService;
 import com.css.simulation.resource.server.acl.SchedulerService;
-import com.css.simulation.resource.server.application.service.AlgorithmService;
-import com.css.simulation.resource.server.application.service.DictService;
-import com.css.simulation.resource.server.application.service.job_manage.SimulationProjectService;
+import com.css.simulation.resource.server.app.service.AlgorithmService;
+import com.css.simulation.resource.server.app.service.DictService;
+import com.css.simulation.resource.server.app.service.job_manage.SimulationProjectService;
 import com.css.simulation.resource.server.domain.service.UserDomainService;
-import com.css.simulation.resource.server.infra.configuration.git.GitConfiguration;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
-import com.css.simulation.resource.server.infra.common.util.PoUtil;
+import com.css.simulation.resource.server.infra.git.GitConfiguration;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.PageUtil;
+import com.css.simulation.resource.server.infra.util.PoUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.AlgorithmExpandMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.AlgorithmMapper;
 import com.github.pagehelper.PageHelper;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/impl/SimulationProjectServiceImpl.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/impl/SimulationProjectServiceImpl.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.impl;
+package com.css.simulation.resource.server.app.impl;
 
 import api.common.pojo.common.PageVO;
 import api.common.pojo.common.ResponseBodyVO;
@@ -23,18 +23,18 @@ import api.common.pojo.vo.project.*;
 import api.common.util.*;
 import com.css.simulation.resource.server.domain.service.UserDomainService;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.*;
-import com.css.simulation.resource.server.application.service.AlgorithmService;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
+import com.css.simulation.resource.server.app.service.AlgorithmService;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.PageUtil;
 import com.css.simulation.resource.server.acl.AlgoPlatformService;
 import com.css.simulation.resource.server.acl.FileDownService;
 import com.css.simulation.resource.server.acl.MonitorService;
-import com.css.simulation.resource.server.infra.common.enums.ProjectRunStateEnum;
-import com.css.simulation.resource.server.infra.common.enums.SceneTypeEnum;
-import com.css.simulation.resource.server.application.service.job_manage.SimulationProjectService;
-import com.css.simulation.resource.server.infra.common.util.PdfBuilder;
-import com.css.simulation.resource.server.application.service.DictService;
-import com.css.simulation.resource.server.infra.common.util.ProjectUtil;
+import com.css.simulation.resource.server.app.constant.ProjectRunStateEnum;
+import com.css.simulation.resource.server.app.constant.SceneTypeEnum;
+import com.css.simulation.resource.server.app.service.job_manage.SimulationProjectService;
+import com.css.simulation.resource.server.infra.util.PdfBuilder;
+import com.css.simulation.resource.server.app.service.DictService;
+import com.css.simulation.resource.server.infra.util.ProjectUtil;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.ImmutableMap;
 import com.itextpdf.text.*;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/AlgorithmService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/AlgorithmService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.algorithm.AlgorithmParameter;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/CameraService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/CameraService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.CameraParam;
@@ -9,7 +9,7 @@ import api.common.util.LogUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.CameraMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ModelConfigMapper;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/ClusterService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/ClusterService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
@@ -7,9 +7,9 @@ import api.common.pojo.po.system.ClusterPO;
 import api.common.pojo.vo.system.ClusterVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
-import com.css.simulation.resource.server.infra.common.util.PoUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.PageUtil;
+import com.css.simulation.resource.server.infra.util.PoUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ClusterMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/ConfigService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/ConfigService.java

@@ -1,12 +1,12 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.*;
 import api.common.pojo.po.model.*;
 import api.common.pojo.vo.model.*;
 import api.common.util.*;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.PageUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ConfigMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ModelConfigMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.RelationConfigSensorMapper;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/DictService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/DictService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.RedisParameter;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/GpsService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/GpsService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.GpsParam;
@@ -9,8 +9,8 @@ import api.common.util.LogUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
-import com.css.simulation.resource.server.infra.common.util.PoUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.PoUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.GpsMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ModelConfigMapper;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/HomePageService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/HomePageService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.common.PageVO;
 import api.common.pojo.common.ResponseBodyVO;
@@ -10,8 +10,8 @@ import api.common.pojo.vo.home.SystemServerVO;
 import api.common.util.NumberUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.PageUtil;
 import com.css.simulation.resource.server.acl.OauthClientService;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.HomePageMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.LogMapper;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/LidarService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/LidarService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.LidarParam;
@@ -9,7 +9,7 @@ import api.common.util.LogUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.LidarMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ModelConfigMapper;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/LogService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/LogService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
@@ -19,8 +19,8 @@ import api.common.pojo.vo.system.UserVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.PageUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.LogMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SystemUserMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.VehicleTempMapper;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/MenuService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/MenuService.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.vo.system.MenuVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.MenuMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/OgtService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/OgtService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 
 import api.common.pojo.constants.DictConstants;
@@ -10,7 +10,7 @@ import api.common.util.LogUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ModelConfigMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.OgtMapper;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/ParameterService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/ParameterService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
@@ -7,9 +7,9 @@ import api.common.pojo.po.system.ParameterPO;
 import api.common.pojo.vo.system.ParameterVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
-import com.css.simulation.resource.server.infra.common.util.PoUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.PageUtil;
+import com.css.simulation.resource.server.infra.util.PoUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ParameterMapper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/ReportService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/ReportService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.vo.project.ProjectReportVO;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/RoleService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/RoleService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.param.system.RoleParam;
 import api.common.pojo.po.system.RoleMenuPO;
@@ -6,8 +6,8 @@ import api.common.pojo.po.system.RolePO;
 import api.common.pojo.vo.system.RoleVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
-import com.css.simulation.resource.server.infra.common.util.PoUtil;
+import com.css.simulation.resource.server.infra.util.PageUtil;
+import com.css.simulation.resource.server.infra.util.PoUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.RoleMapper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneAccidentService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneAccidentService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -10,7 +10,7 @@ import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.*;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.acl.FileDownService;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SceneAccidentMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageMapper;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneGeneralExampleService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneGeneralExampleService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 
 import api.common.pojo.common.ResponseBodyVO;
@@ -8,11 +8,11 @@ import api.common.pojo.po.scene.SceneGeneralTemplatePO;
 import api.common.pojo.vo.scene.SceneGeneralTemplateMbVO;
 import api.common.pojo.vo.scene.SceneGeneralTemplateVO;
 import api.common.util.*;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SceneGeneralDataMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SceneGeneralExampleMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SceneGeneralTemplateMapper;
-import com.css.simulation.resource.server.infra.common.util.SceneUtil;
+import com.css.simulation.resource.server.infra.util.SceneUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneGeneralTemplateService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneGeneralTemplateService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 
 import api.common.pojo.constants.DictConstants;
@@ -13,7 +13,7 @@ import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.SceneGeneralTemplateMbVO;
 import api.common.pojo.vo.scene.SceneGeneralTemplateVO;
 import api.common.util.*;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SceneGeneralTemplateMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageSublistMapper;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneImportService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneImportService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
@@ -9,9 +9,9 @@ import api.common.util.CollectionUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
-import com.css.simulation.resource.server.infra.common.util.PoUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.PageUtil;
+import com.css.simulation.resource.server.infra.util.PoUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SceneImportMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneNaturalService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneNaturalService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -10,7 +10,7 @@ import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.*;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.acl.FileDownService;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SceneNaturalMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageMapper;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/ScenePackageService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/ScenePackageService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.scene.ScenePackageParam;
@@ -7,9 +7,9 @@ import api.common.pojo.po.scene.*;
 import api.common.pojo.vo.scene.ScenePackageNewVO;
 import api.common.pojo.vo.scene.ScenePackageSublistVO;
 import api.common.util.*;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.*;
-import com.css.simulation.resource.server.infra.common.util.SceneUtil;
+import com.css.simulation.resource.server.infra.util.SceneUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.tomcat.util.buf.StringUtils;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SceneStandardsService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneStandardsService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -10,7 +10,7 @@ import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.po.scene.StandardsRegulationsPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.*;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.acl.FileDownService;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageSublistMapper;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/ScoringRulesService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/ScoringRulesService.java

@@ -1,11 +1,11 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.param.scene.ScoringRulesParam;
 import api.common.pojo.po.scene.ScoringRulesPO;
 import api.common.util.LogUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ScoringRulesMapper;
 import lombok.SneakyThrows;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SystemScenePackageService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SystemScenePackageService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;
@@ -12,7 +12,7 @@ import api.common.util.CollectionUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.*;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SystemUserSceneService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SystemUserSceneService.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 
 import api.common.pojo.po.scene.SystemUserScenePO;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SystemUserSceneMapper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/UserService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/UserService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
@@ -11,11 +11,11 @@ import api.common.util.EncryptUtil;
 import api.common.util.JsonUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.infra.configuration.oauth.OauthParameter;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
-import com.css.simulation.resource.server.infra.common.util.PoUtil;
-import com.css.simulation.resource.server.infra.configuration.sms.SmsConfiguration;
+import com.css.simulation.resource.server.infra.oauth.OauthParameter;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.PageUtil;
+import com.css.simulation.resource.server.infra.util.PoUtil;
+import com.css.simulation.resource.server.infra.sms.SmsConfiguration;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SystemUserMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/VehicleService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/VehicleService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.VehicleParam;
@@ -7,11 +7,11 @@ import api.common.pojo.po.model.VehiclePO;
 import api.common.pojo.vo.model.VehicleGSVO;
 import api.common.pojo.vo.model.VehicleVO;
 import api.common.util.*;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import com.css.simulation.resource.server.acl.FileDownService;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ModelConfigMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.VehicleMapper;
-import com.css.simulation.resource.server.infra.common.util.VehicleUtil;
+import com.css.simulation.resource.server.infra.util.VehicleUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/VehicleTempService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/VehicleTempService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;
@@ -9,8 +9,8 @@ import api.common.pojo.vo.model.VehicleDefaultValueVO;
 import api.common.pojo.vo.model.VehicleTempVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.infra.common.util.PageUtil;
-import com.css.simulation.resource.server.infra.common.util.PoUtil;
+import com.css.simulation.resource.server.infra.util.PageUtil;
+import com.css.simulation.resource.server.infra.util.PoUtil;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.VehicleMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.VehicleTempMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.DictMapper;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/XmlParse.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/XmlParse.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.app.service;
 
 import java.io.*;
 import java.util.HashMap;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/job_manage/JobManageApplicationService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/job_manage/JobManageApplicationService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service.job_manage;
+package com.css.simulation.resource.server.app.service.job_manage;
 
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.vo.project.ProjectReportVO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/job_manage/SimulationProjectService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/job_manage/SimulationProjectService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service.job_manage;
+package com.css.simulation.resource.server.app.service.job_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/domain/service/ProjectDomainService.java

@@ -9,7 +9,7 @@ import api.common.pojo.po.project.SimulationManualProjectPO;
 import api.common.pojo.vo.algorithm.AlgorithmVO;
 import api.common.pojo.vo.project.ProjectReportVO;
 import com.css.simulation.resource.server.acl.FileDownService;
-import com.css.simulation.resource.server.application.service.job_manage.SimulationProjectService;
+import com.css.simulation.resource.server.app.service.job_manage.SimulationProjectService;
 import com.css.simulation.resource.server.infra.db.entity.SimulationAutomaticProjectEntity;
 import com.css.simulation.resource.server.infra.db.entity.SimulationAutomaticSubprojectEntity;
 import com.css.simulation.resource.server.infra.db.entity.SimulationManualProjectEntity;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/LogAdvice.java

@@ -1,122 +0,0 @@
-package com.css.simulation.resource.server.infra.configuration;
-
-import api.common.pojo.common.ResponseBodyVO;
-import api.common.pojo.po.log.LogOperationPO;
-import api.common.util.LogUtil;
-import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
-import com.css.simulation.resource.server.application.service.LogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.MethodParameter;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.server.ServerHttpRequest;
-import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-@ControllerAdvice
-public class LogAdvice implements ResponseBodyAdvice {
-
-    @Autowired
-    LogService logService;
-
-    @Override
-    public boolean supports(MethodParameter methodParameter, Class aClass) {
-        return true;
-    }
-
-    @Override
-    public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType, Class aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
-        //没有操作标记则返回
-        String operationType = LogUtil.getOperationType();
-        LogUtil.remove();//线程标记清空
-        if(ObjectUtil.isNull(operationType)){
-            return o;
-        }
-        //异常后返回
-        if(o instanceof ResponseBodyVO){
-            boolean status = ((ResponseBodyVO) o).isStatus();
-            if(!status){
-                return o;
-            }
-        }
-        //类注解的模块名
-        Class<?> containingClass = methodParameter.getContainingClass();
-        RequestMapping classAnnotation = containingClass.getAnnotation(RequestMapping.class);
-        if(ObjectUtil.isNull(classAnnotation)){
-            return o;
-        }
-        String modelName = classAnnotation.name();
-        if(ObjectUtil.isNull(modelName)){
-            modelName = "未命名模块";
-        }
-        try {
-            //获取ip
-            String ip = getRemoteAddress(serverHttpRequest);
-            LogOperationPO po = new LogOperationPO();
-            po.setIp(ip);
-            po.setModule(modelName);
-            po.setOperationType(operationType);
-            po.setUserId(AuthUtil.getCurrentUserId());
-            po.setUsername(AuthUtil.getCurrentUsername());
-            logService.saveOperationLog(po);
-        }catch (Exception e){
-            //e.printStackTrace();
-        }
-        return o;
-    }
-
-    //IP地址获取
-    private String getRemoteAddress(ServerHttpRequest serverHttpRequest) {
-        HttpHeaders headers = serverHttpRequest.getHeaders();
-        String ip = headers.getFirst("x-forwarded-for");
-        if(ip != null && ip.length() != 0){
-            if(ip.indexOf(",") != -1){
-                ip = ip.split(",")[0];
-            }
-        }
-        if(ip == null || ip.length() == 0){
-            ip = headers.getFirst("Proxy-Client-IP");
-        }
-        if(ip == null || ip.length() == 0){
-            ip = headers.getFirst("WL-Proxy-Client-IP");
-        }
-        if(ip == null || ip.length() == 0){
-            ip = headers.getFirst("HTTP_CLIENT_IP");
-        }
-        if(ip == null || ip.length() == 0){
-            ip = headers.getFirst("HTTP_X_FORWARDED_FOR");
-        }
-        if(ip == null || ip.length() == 0){
-            ip = headers.getFirst("X-Real-IP");
-        }
-        if(ip == null || ip.length() == 0){
-            ip = serverHttpRequest.getRemoteAddress().getAddress().getHostAddress();
-        }
-        if(isIpv4(ip)){
-            return ip;
-        }else{
-            return "Illegal IP address";
-        }
-
-    }
-
-    //IP地址验证，防止非法地址
-    private boolean isIpv4(String ipAddress) {
-        String ip = "^(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\."
-                +"(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
-                +"(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
-                +"(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$";
-
-        Pattern pattern = Pattern.compile(ip);
-        Matcher matcher = pattern.matcher(ipAddress);
-        return matcher.matches();
-    }
-
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/FeignConfiguration.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/feign/FeignConfiguration.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.server.infra.configuration;
+package com.css.simulation.resource.server.infra.feign;
 
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.infra.configuration.oauth.AuthorizationHolder;
+import com.css.simulation.resource.server.infra.oauth.AuthorizationHolder;
 import feign.Logger;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/git/GitConfiguration.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/git/GitConfiguration.java

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

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/kafka/KafkaAdminConfiguration.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/kafka/KafkaAdminConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infra.configuration.kafka;
+package com.css.simulation.resource.server.infra.kafka;
 
 import org.apache.kafka.clients.admin.Admin;
 import org.apache.kafka.clients.admin.KafkaAdminClient;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/oauth/AuthorityCheck.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/oauth/AuthorityCheck.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.server.infra.configuration.oauth;
+package com.css.simulation.resource.server.infra.oauth;
 
 import api.common.pojo.constants.DictConstants;
-import com.css.simulation.resource.server.infra.common.util.AuthUtil;
+import com.css.simulation.resource.server.infra.util.AuthUtil;
 import org.springframework.stereotype.Component;
 
 @Component("AuthorityCheck")

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/oauth/AuthorizationHolder.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/oauth/AuthorizationHolder.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infra.configuration.oauth;
+package com.css.simulation.resource.server.infra.oauth;
 
 import org.springframework.core.NamedInheritableThreadLocal;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/oauth/MyUserAuthenticationConverter.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/oauth/MyUserAuthenticationConverter.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infra.configuration.oauth;
+package com.css.simulation.resource.server.infra.oauth;
 
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/oauth/MyUserDetails.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/oauth/MyUserDetails.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infra.configuration.oauth;
+package com.css.simulation.resource.server.infra.oauth;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/OAuth2Configuration.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/oauth/OAuth2Configuration.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.server.infra.configuration;
+package com.css.simulation.resource.server.infra.oauth;
 
-import com.css.simulation.resource.server.infra.configuration.oauth.MyUserAuthenticationConverter;
-import com.css.simulation.resource.server.infra.configuration.oauth.OauthParameter;
+import com.css.simulation.resource.server.infra.oauth.MyUserAuthenticationConverter;
+import com.css.simulation.resource.server.infra.oauth.OauthParameter;
 import lombok.SneakyThrows;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/oauth/OauthParameter.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/oauth/OauthParameter.java

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

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/sms/SmsConfiguration.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/sms/SmsConfiguration.java

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

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/configuration/TransactionConfiguration.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/transaction/TransactionConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infra.configuration;
+package com.css.simulation.resource.server.infra.transaction;
 
 import org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator;
 import org.springframework.beans.factory.annotation.Autowired;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/ApacheKafkaUtil.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/util/ApacheKafkaUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infra.common.util;
+package com.css.simulation.resource.server.infra.util;
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/AuthUtil.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/util/AuthUtil.java

@@ -1,6 +1,6 @@
-package com.css.simulation.resource.server.infra.common.util;
+package com.css.simulation.resource.server.infra.util;
 
-import com.css.simulation.resource.server.infra.configuration.oauth.MyUserDetails;
+import com.css.simulation.resource.server.infra.oauth.MyUserDetails;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/PageUtil.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/util/PageUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infra.common.util;
+package com.css.simulation.resource.server.infra.util;
 
 import api.common.pojo.common.PageVO;
 import com.github.pagehelper.PageHelper;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/PdfBuilder.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/util/PdfBuilder.java

@@ -1,6 +1,6 @@
-package com.css.simulation.resource.server.infra.common.util;
+package com.css.simulation.resource.server.infra.util;
 
-import com.css.simulation.resource.server.application.impl.SimulationProjectServiceImpl;
+import com.css.simulation.resource.server.app.impl.SimulationProjectServiceImpl;
 import com.itextpdf.text.*;
 import com.itextpdf.text.pdf.BaseFont;
 import com.itextpdf.text.pdf.ColumnText;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/PoUtil.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/util/PoUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infra.common.util;
+package com.css.simulation.resource.server.infra.util;
 
 import api.common.pojo.common.CommonPO;
 import api.common.pojo.constants.DictConstants;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/ProjectUtil.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/util/ProjectUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infra.common.util;
+package com.css.simulation.resource.server.infra.util;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.project.SimulationManualProjectParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/SceneUtil.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/util/SceneUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infra.common.util;
+package com.css.simulation.resource.server.infra.util;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.vo.scene.ScenePackageSublistVO;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/common/util/VehicleUtil.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/util/VehicleUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.infra.common.util;
+package com.css.simulation.resource.server.infra.util;
 
 import api.common.pojo.po.model.VehiclePO;
 import api.common.pojo.vo.model.VehicleVO;