diff --git a/src/main/java/org/ils/order/aspect/TokenAspect.java b/src/main/java/org/ils/order/aspect/TokenAspect.java index 46d5ce2..73c5c51 100644 --- a/src/main/java/org/ils/order/aspect/TokenAspect.java +++ b/src/main/java/org/ils/order/aspect/TokenAspect.java @@ -7,7 +7,7 @@ import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Pointcut; import org.ils.order.result.GlobalException; import org.ils.order.result.JwtVerifyResult; -import org.ils.order.utils.CommonConstant; +import org.ils.order.common.CommonConstant; import org.ils.order.utils.JwtUtil; import org.ils.order.utils.SpringContextUtils; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/ils/order/utils/CommonConstant.java b/src/main/java/org/ils/order/common/CommonConstant.java similarity index 95% rename from src/main/java/org/ils/order/utils/CommonConstant.java rename to src/main/java/org/ils/order/common/CommonConstant.java index 2f6740e..5e129ce 100644 --- a/src/main/java/org/ils/order/utils/CommonConstant.java +++ b/src/main/java/org/ils/order/common/CommonConstant.java @@ -1,4 +1,4 @@ -package org.ils.order.utils; +package org.ils.order.common; /** * 通用常量 diff --git a/src/main/java/org/ils/order/model/DTO/BasePageDto.java b/src/main/java/org/ils/order/dto/dto/BasePageDto.java similarity index 92% rename from src/main/java/org/ils/order/model/DTO/BasePageDto.java rename to src/main/java/org/ils/order/dto/dto/BasePageDto.java index a1b7a07..fb977f5 100644 --- a/src/main/java/org/ils/order/model/DTO/BasePageDto.java +++ b/src/main/java/org/ils/order/dto/dto/BasePageDto.java @@ -1,4 +1,4 @@ -package org.ils.order.model.DTO; +package org.ils.order.dto.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/org/ils/order/model/DTO/MainLineDto.java b/src/main/java/org/ils/order/dto/dto/MainLineDto.java similarity index 94% rename from src/main/java/org/ils/order/model/DTO/MainLineDto.java rename to src/main/java/org/ils/order/dto/dto/MainLineDto.java index 6d699c0..6564089 100644 --- a/src/main/java/org/ils/order/model/DTO/MainLineDto.java +++ b/src/main/java/org/ils/order/dto/dto/MainLineDto.java @@ -1,4 +1,4 @@ -package org.ils.order.model.DTO; +package org.ils.order.dto.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Builder; diff --git a/src/main/java/org/ils/order/model/DTO/MainLinePageDto.java b/src/main/java/org/ils/order/dto/dto/MainLinePageDto.java similarity index 90% rename from src/main/java/org/ils/order/model/DTO/MainLinePageDto.java rename to src/main/java/org/ils/order/dto/dto/MainLinePageDto.java index edd628e..51a920c 100644 --- a/src/main/java/org/ils/order/model/DTO/MainLinePageDto.java +++ b/src/main/java/org/ils/order/dto/dto/MainLinePageDto.java @@ -1,4 +1,4 @@ -package org.ils.order.model.DTO; +package org.ils.order.dto.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/org/ils/order/model/DTO/OrderPageDto.java b/src/main/java/org/ils/order/dto/dto/OrderPageDto.java similarity index 89% rename from src/main/java/org/ils/order/model/DTO/OrderPageDto.java rename to src/main/java/org/ils/order/dto/dto/OrderPageDto.java index 1b94402..82e452b 100644 --- a/src/main/java/org/ils/order/model/DTO/OrderPageDto.java +++ b/src/main/java/org/ils/order/dto/dto/OrderPageDto.java @@ -1,4 +1,4 @@ -package org.ils.order.model.DTO; +package org.ils.order.dto.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/org/ils/order/handler/GlobalExceptionHandler.java b/src/main/java/org/ils/order/exceptions/GlobalExceptionHandler.java similarity index 95% rename from src/main/java/org/ils/order/handler/GlobalExceptionHandler.java rename to src/main/java/org/ils/order/exceptions/GlobalExceptionHandler.java index 5fac2b2..fbfe5de 100644 --- a/src/main/java/org/ils/order/handler/GlobalExceptionHandler.java +++ b/src/main/java/org/ils/order/exceptions/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package org.ils.order.handler; +package org.ils.order.exceptions; import lombok.extern.slf4j.Slf4j; import org.ils.order.result.Result; diff --git a/src/main/java/org/ils/order/rabbitmq/RabbitQueue.java b/src/main/java/org/ils/order/listener/rabbitmq/RabbitQueue.java similarity index 78% rename from src/main/java/org/ils/order/rabbitmq/RabbitQueue.java rename to src/main/java/org/ils/order/listener/rabbitmq/RabbitQueue.java index 8af87e6..7148c55 100644 --- a/src/main/java/org/ils/order/rabbitmq/RabbitQueue.java +++ b/src/main/java/org/ils/order/listener/rabbitmq/RabbitQueue.java @@ -1,6 +1,6 @@ -package org.ils.order.rabbitmq; +package org.ils.order.listener.rabbitmq; -import org.ils.order.config.BaseConfig; +import org.ils.order.properties.BaseConfigProperties; import org.springframework.amqp.core.Queue; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Configuration; public class RabbitQueue { @Autowired - private BaseConfig baseConfig; + private BaseConfigProperties baseConfig; /** * 订单队列 diff --git a/src/main/java/org/ils/order/rabbitmq/RabbitReceiver.java b/src/main/java/org/ils/order/listener/rabbitmq/RabbitReceiver.java similarity index 92% rename from src/main/java/org/ils/order/rabbitmq/RabbitReceiver.java rename to src/main/java/org/ils/order/listener/rabbitmq/RabbitReceiver.java index 60c6e28..c0da797 100644 --- a/src/main/java/org/ils/order/rabbitmq/RabbitReceiver.java +++ b/src/main/java/org/ils/order/listener/rabbitmq/RabbitReceiver.java @@ -1,4 +1,4 @@ -package org.ils.order.rabbitmq; +package org.ils.order.listener.rabbitmq; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/org/ils/order/rabbitmq/RabbitSender.java b/src/main/java/org/ils/order/listener/rabbitmq/RabbitSender.java similarity index 80% rename from src/main/java/org/ils/order/rabbitmq/RabbitSender.java rename to src/main/java/org/ils/order/listener/rabbitmq/RabbitSender.java index f380489..bcf3334 100644 --- a/src/main/java/org/ils/order/rabbitmq/RabbitSender.java +++ b/src/main/java/org/ils/order/listener/rabbitmq/RabbitSender.java @@ -1,6 +1,6 @@ -package org.ils.order.rabbitmq; +package org.ils.order.listener.rabbitmq; -import org.ils.order.config.BaseConfig; +import org.ils.order.properties.BaseConfigProperties; import org.springframework.amqp.core.AmqpTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -16,7 +16,7 @@ public class RabbitSender { @Autowired private AmqpTemplate rabbitTemplate; @Autowired - private BaseConfig baseConfig ; + private BaseConfigProperties baseConfig ; /** * 队列发送消息 diff --git a/src/main/java/org/ils/order/config/BaseConfig.java b/src/main/java/org/ils/order/properties/BaseConfigProperties.java similarity index 84% rename from src/main/java/org/ils/order/config/BaseConfig.java rename to src/main/java/org/ils/order/properties/BaseConfigProperties.java index ace5bac..d3df856 100644 --- a/src/main/java/org/ils/order/config/BaseConfig.java +++ b/src/main/java/org/ils/order/properties/BaseConfigProperties.java @@ -1,4 +1,4 @@ -package org.ils.order.config; +package org.ils.order.properties; import lombok.Data; import org.springframework.beans.factory.annotation.Value; @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; */ @Component @Data -public class BaseConfig { +public class BaseConfigProperties { @Value("${spring.rabbitmq.queue.orderQueue}") private String ilsOrderQueue; diff --git a/src/main/java/org/ils/order/result/Result.java b/src/main/java/org/ils/order/result/Result.java index d57ef04..fd82ae8 100644 --- a/src/main/java/org/ils/order/result/Result.java +++ b/src/main/java/org/ils/order/result/Result.java @@ -2,7 +2,7 @@ package org.ils.order.result; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.ils.order.utils.CommonConstant; +import org.ils.order.common.CommonConstant; import java.io.Serializable; diff --git a/src/main/java/org/ils/order/service/MainLineService.java b/src/main/java/org/ils/order/service/MainLineService.java index 5531dc4..b32a6c0 100644 --- a/src/main/java/org/ils/order/service/MainLineService.java +++ b/src/main/java/org/ils/order/service/MainLineService.java @@ -1,8 +1,8 @@ package org.ils.order.service.impl; -import org.ils.order.model.DTO.MainLineDto; -import org.ils.order.model.DTO.MainLinePageDto; +import org.ils.order.dto.dto.MainLineDto; +import org.ils.order.dto.dto.MainLinePageDto; /** * 计费引擎主线计费主线模型接口 diff --git a/src/main/java/org/ils/order/service/impl/MainLineServiceImpl.java b/src/main/java/org/ils/order/service/impl/MainLineServiceImpl.java index a28ff20..771d68b 100644 --- a/src/main/java/org/ils/order/service/impl/MainLineServiceImpl.java +++ b/src/main/java/org/ils/order/service/impl/MainLineServiceImpl.java @@ -8,8 +8,8 @@ import lombok.extern.slf4j.Slf4j; import org.ils.order.entity.IlsMainLine; import org.ils.order.mapper.IlsMainLineMapper; -import org.ils.order.model.DTO.MainLineDto; -import org.ils.order.model.DTO.MainLinePageDto; +import org.ils.order.dto.dto.MainLineDto; +import org.ils.order.dto.dto.MainLinePageDto; import org.ils.order.result.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/ils/order/utils/IdGeneratorUtil.java b/src/main/java/org/ils/order/utils/IdGeneratorUtil.java index aa2c2b4..55634e9 100644 --- a/src/main/java/org/ils/order/utils/IdGeneratorUtil.java +++ b/src/main/java/org/ils/order/utils/IdGeneratorUtil.java @@ -12,7 +12,7 @@ import java.util.concurrent.atomic.AtomicInteger; @Component public class IdGeneratorUtil { private static volatile AtomicInteger atomicInteger = new AtomicInteger(1001); - private static Snowflake snowflake = IdUtil.createSnowflake(2, 1); + private static final Snowflake snowflake = IdUtil.createSnowflake(2, 1); public static void main(String[] args) { log.info("{}", IdGeneratorUtil.batchId("TAI")); diff --git a/src/test/java/org/ils/order/RabbitMqHelloTest.java b/src/test/java/org/ils/order/RabbitMqHelloTest.java index 679d0ef..6c6bcbc 100644 --- a/src/test/java/org/ils/order/RabbitMqHelloTest.java +++ b/src/test/java/org/ils/order/RabbitMqHelloTest.java @@ -3,8 +3,8 @@ package org.ils.order; import cn.hutool.json.JSONObject; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import org.ils.order.config.BaseConfig; -import org.ils.order.rabbitmq.RabbitSender; +import org.ils.order.properties.BaseConfigProperties; +import org.ils.order.listener.rabbitmq.RabbitSender; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -16,7 +16,7 @@ import org.springframework.test.context.junit4.SpringRunner; @SpringBootTest public class RabbitMqHelloTest{ @Autowired - private BaseConfig baseConfig; + private BaseConfigProperties baseConfig; @Autowired private RabbitSender rabbitSender; diff --git a/src/test/java/org/ils/order/RestTemplateTest.java b/src/test/java/org/ils/order/RestTemplateTest.java index a03148e..fd5f745 100644 --- a/src/test/java/org/ils/order/RestTemplateTest.java +++ b/src/test/java/org/ils/order/RestTemplateTest.java @@ -2,7 +2,7 @@ package org.ils.order; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import org.ils.order.config.BaseConfig; +import org.ils.order.properties.BaseConfigProperties; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -22,7 +22,7 @@ public class RestTemplateTest { private RestTemplate restTemplate; @Autowired - private BaseConfig baseConfig; + private BaseConfigProperties baseConfig; @Test public void test(){ log.info("url :{}", baseConfig.getBaiduUrl());