mlx

simulation-resource-server/src/main/java/com/css/simulation/resource/algorithm/serviceImpl/AlgorithmServiceImpl.java

@@ -15,7 +15,7 @@ import com.css.simulation.resource.algorithm.service.AlgorithmService;
 import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.common.utils.PoUtil;
-import com.css.simulation.resource.configuration.git.GitConfiguration;
+import com.css.simulation.resource.common.configuration.git.GitConfiguration;
 import com.css.simulation.resource.feign.AlgoPlatformService;
 import com.css.simulation.resource.feign.FileDownService;
 import com.css.simulation.resource.feign.SchedulerService;

simulation-resource-server/src/main/java/com/css/simulation/resource/common/config/FeignConfiguration.java → simulation-resource-server/src/main/java/com/css/simulation/resource/common/configuration/FeignConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.config;
+package com.css.simulation.resource.common.configuration;
 
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.common.oauth.AuthorizationHolder;

simulation-resource-server/src/main/java/com/css/simulation/resource/common/config/OAuth2Config.java → simulation-resource-server/src/main/java/com/css/simulation/resource/common/configuration/OAuth2Configuration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.config;
+package com.css.simulation.resource.common.configuration;
 
 import com.css.simulation.resource.common.oauth.MyUserAuthenticationConverter;
 import com.css.simulation.resource.common.oauth.OauthParameter;
@@ -13,7 +13,7 @@ import org.springframework.security.oauth2.provider.token.RemoteTokenServices;
 import javax.annotation.Resource;
 
 @Configuration
-public class OAuth2Config extends ResourceServerConfigurerAdapter {
+public class OAuth2Configuration extends ResourceServerConfigurerAdapter {
 
     @Resource
     private OauthParameter oauthParameter;

simulation-resource-server/src/main/java/com/css/simulation/resource/common/config/TransactionConfig.java → simulation-resource-server/src/main/java/com/css/simulation/resource/common/configuration/TransactionConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.config;
+package com.css.simulation.resource.common.configuration;
 
 import org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +19,7 @@ import java.util.Map;
  * 声明式事务配置
  */
 @Configuration
-public class TransactionConfig {
+public class TransactionConfiguration {
 
     @Autowired
     DataSource dataSource;

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

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

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.configuration.kafka;
+package com.css.simulation.resource.common.configuration.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/configuration/sms/SmsConfiguration.java → simulation-resource-server/src/main/java/com/css/simulation/resource/common/configuration/sms/SmsConfiguration.java

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

simulation-resource-server/src/main/java/com/css/simulation/resource/demo/ctrl/TestCtrl.java → simulation-resource-server/src/main/java/com/css/simulation/resource/common/demo/ctrl/TestCtrl.java

@@ -1,22 +1,23 @@
-package com.css.simulation.resource.demo.ctrl;
+package com.css.simulation.resource.common.demo.ctrl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.demo.TestPageParam;
 import api.common.pojo.vo.demo.TestVO;
-import com.css.simulation.resource.demo.service.TestService;
+import com.css.simulation.resource.common.demo.service.TestService;
 import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
+
 @Controller
 @RequestMapping("/test")
 public class TestCtrl {
 
-    @Autowired
-    TestService testService;
+    @Resource
+    private TestService testService;
 
     @RequestMapping("/getTestPageList")
     @ResponseBody

simulation-resource-server/src/main/java/com/css/simulation/resource/demo/mapper/TestMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/common/demo/mapper/TestMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.demo.mapper;
+package com.css.simulation.resource.common.demo.mapper;
 
 
 import api.common.pojo.param.demo.TestPageParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/demo/service/TestService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/common/demo/service/TestService.java

@@ -1,11 +1,10 @@
-package com.css.simulation.resource.demo.service;
+package com.css.simulation.resource.common.demo.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.demo.TestPageParam;
 import api.common.pojo.vo.demo.TestVO;
-import com.css.simulation.resource.common.utils.AuthUtil;
+import com.css.simulation.resource.common.demo.mapper.TestMapper;
 import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.demo.mapper.TestMapper;
 import com.css.simulation.resource.system.service.DictService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,7 +1,7 @@
 package com.css.simulation.resource.feign;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.common.config.FeignConfiguration;
+import com.css.simulation.resource.common.configuration.FeignConfiguration;
 import com.css.simulation.resource.feign.fallback.AlgoPlatformServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

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

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

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

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

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

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

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

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

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

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

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

@@ -1,10 +1,9 @@
 package com.css.simulation.resource.feign;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.common.config.FeignConfiguration;
+import com.css.simulation.resource.common.configuration.FeignConfiguration;
 import com.css.simulation.resource.feign.fallback.SchedulerServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 

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

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

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/UserService.java

@@ -15,7 +15,7 @@ import com.css.simulation.resource.common.oauth.OauthParameter;
 import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.common.utils.PoUtil;
-import com.css.simulation.resource.configuration.sms.SmsConfiguration;
+import com.css.simulation.resource.common.configuration.sms.SmsConfiguration;
 import com.css.simulation.resource.log.service.LogService;
 import com.css.simulation.resource.system.mapper.UserMapper;
 import com.github.pagehelper.PageInfo;

simulation-resource-server/src/main/resources/mapper/demo/TestMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.css.simulation.resource.demo.mapper.TestMapper" >
+<mapper namespace="com.css.simulation.resource.common.demo.mapper.TestMapper" >
 
     <resultMap id="TestVOMap" type="api.common.pojo.vo.demo.TestVO">
         <id column="ID" property="id" jdbcType="VARCHAR" />