diff --git a/pom.xml b/pom.xml index cbebf6e..c936a0d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,24 +4,43 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.ils.billing + com.ils.oms ils-order-service 1.0 + 1.8 8 8 + UTF-8 + UTF-8 + + 3.8.1 + 1.0.0-SNAPSHOT - + 3.12.0 + 4.4 + 31.1-jre + - org.springframework.boot - spring-boot-starter-parent - 2.6.6 - + com.z + platform + 1.0.0-RELEASE + + + + + + + + com.z.common + z-common-mysql + ${z.common.version} + com.z.common @@ -46,6 +65,40 @@ z-common-core ${z.common.version} + + + + org.apache.commons + commons-lang3 + ${apache.commons.lang3.version} + + + org.apache.commons + commons-collections4 + ${apache.commons.collections.version} + + + + + com.google.guava + guava + ${google.guava.version} + + + + + org.projectlombok + lombok + true + + + + + org.springframework.boot + spring-boot-starter-test + test + + @@ -56,7 +109,7 @@ spring-boot-maven-plugin - org.ils.order.IlsOrderServiceApplication + com.ils.oms.IlsOrderServiceApplication diff --git a/src/main/java/org/ils/order/IlsOrderServiceApplication.java b/src/main/java/com/ils/oms/IlsOrderServiceApplication.java similarity index 57% rename from src/main/java/org/ils/order/IlsOrderServiceApplication.java rename to src/main/java/com/ils/oms/IlsOrderServiceApplication.java index 835e43b..5dbc0d2 100644 --- a/src/main/java/org/ils/order/IlsOrderServiceApplication.java +++ b/src/main/java/com/ils/oms/IlsOrderServiceApplication.java @@ -1,5 +1,6 @@ -package org.ils.order; +package com.ils.oms; +import com.z.common.configuration.bean.ZAnnotationBeanNameGenerator; import com.z.common.configuration.exception.ZGlobalExceptionHandler; import com.z.common.configuration.rabbit.ZRabbitAutoConfiguration; import com.z.common.configuration.redis.ZRedisAutoConfiguration; @@ -7,6 +8,7 @@ import com.z.common.swagger.ZSwagger2Configuration; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.context.annotation.Import; @@ -14,14 +16,14 @@ import org.springframework.context.annotation.Import; * 主程序 * @author chenjf */ -@SpringBootApplication +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +@MapperScan(value = {"com.ils.oms.mapper"}, nameGenerator = ZAnnotationBeanNameGenerator.class) @Import(value = { - //ZSwagger2Configuration.class, - ZRedisAutoConfiguration.class, + ZSwagger2Configuration.class, // 加载api接口文档配置 + ZGlobalExceptionHandler.class, // 引入全局异常处理 + ZRedisAutoConfiguration.class, // 引入redis工具包配置 ZRabbitAutoConfiguration.class, - ZGlobalExceptionHandler.class - }) -@MapperScan(basePackages = "org.ils.order.mapper") +}) public class IlsOrderServiceApplication { public static void main(String[] args) { SpringApplication.run(IlsOrderServiceApplication.class, args); diff --git a/src/main/java/org/ils/order/annotation/TokenAnnotation.java b/src/main/java/com/ils/oms/annotation/TokenAnnotation.java similarity index 88% rename from src/main/java/org/ils/order/annotation/TokenAnnotation.java rename to src/main/java/com/ils/oms/annotation/TokenAnnotation.java index ff3e247..98cdeed 100644 --- a/src/main/java/org/ils/order/annotation/TokenAnnotation.java +++ b/src/main/java/com/ils/oms/annotation/TokenAnnotation.java @@ -1,4 +1,4 @@ -package org.ils.order.annotation; +package com.ils.oms.annotation; import java.lang.annotation.*; diff --git a/src/main/java/com/ils/oms/api/SomeApi.java b/src/main/java/com/ils/oms/api/SomeApi.java new file mode 100644 index 0000000..ffc7fe6 --- /dev/null +++ b/src/main/java/com/ils/oms/api/SomeApi.java @@ -0,0 +1,4 @@ +package com.ils.oms.api; + +public interface SomeApi { +} diff --git a/src/main/java/com/ils/oms/appservice/SomeAppService.java b/src/main/java/com/ils/oms/appservice/SomeAppService.java new file mode 100644 index 0000000..81e80ab --- /dev/null +++ b/src/main/java/com/ils/oms/appservice/SomeAppService.java @@ -0,0 +1,4 @@ +package com.ils.oms.appservice; + +public class SomeAppService { +} diff --git a/src/main/java/org/ils/order/aspect/TokenAspect.java b/src/main/java/com/ils/oms/aspect/TokenAspect.java similarity index 84% rename from src/main/java/org/ils/order/aspect/TokenAspect.java rename to src/main/java/com/ils/oms/aspect/TokenAspect.java index 73c5c51..737480d 100644 --- a/src/main/java/org/ils/order/aspect/TokenAspect.java +++ b/src/main/java/com/ils/oms/aspect/TokenAspect.java @@ -1,15 +1,15 @@ -package org.ils.order.aspect; +package com.ils.oms.aspect; +import com.ils.oms.result.GlobalException; +import com.ils.oms.result.JwtVerifyResult; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; 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.common.CommonConstant; -import org.ils.order.utils.JwtUtil; -import org.ils.order.utils.SpringContextUtils; +import com.ils.oms.common.CommonConstant; +import com.ils.oms.utils.JwtUtil; +import com.ils.oms.utils.SpringContextUtils; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest; @Component public class TokenAspect { //controller层切点 - @Pointcut("@annotation(org.ils.order.annotation.TokenAnnotation)") + @Pointcut("@annotation(com.ils.oms.annotation.TokenAnnotation)") public void TokenAspect() { } diff --git a/src/main/java/org/ils/order/common/CommonConstant.java b/src/main/java/com/ils/oms/common/CommonConstant.java similarity index 95% rename from src/main/java/org/ils/order/common/CommonConstant.java rename to src/main/java/com/ils/oms/common/CommonConstant.java index 5e129ce..d6a9d29 100644 --- a/src/main/java/org/ils/order/common/CommonConstant.java +++ b/src/main/java/com/ils/oms/common/CommonConstant.java @@ -1,4 +1,4 @@ -package org.ils.order.common; +package com.ils.oms.common; /** * 通用常量 diff --git a/src/main/java/org/ils/order/controller/IlsCustomerController.java b/src/main/java/com/ils/oms/controller/IlsCustomerController.java similarity index 90% rename from src/main/java/org/ils/order/controller/IlsCustomerController.java rename to src/main/java/com/ils/oms/controller/IlsCustomerController.java index 44a1b39..3164d08 100644 --- a/src/main/java/org/ils/order/controller/IlsCustomerController.java +++ b/src/main/java/com/ils/oms/controller/IlsCustomerController.java @@ -1,4 +1,4 @@ -package org.ils.order.controller; +package com.ils.oms.controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/org/ils/order/controller/IlsOrderAddressController.java b/src/main/java/com/ils/oms/controller/IlsOrderAddressController.java similarity index 90% rename from src/main/java/org/ils/order/controller/IlsOrderAddressController.java rename to src/main/java/com/ils/oms/controller/IlsOrderAddressController.java index be1a125..da1ece3 100644 --- a/src/main/java/org/ils/order/controller/IlsOrderAddressController.java +++ b/src/main/java/com/ils/oms/controller/IlsOrderAddressController.java @@ -1,4 +1,4 @@ -package org.ils.order.controller; +package com.ils.oms.controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/org/ils/order/controller/IlsOrderController.java b/src/main/java/com/ils/oms/controller/IlsOrderController.java similarity index 85% rename from src/main/java/org/ils/order/controller/IlsOrderController.java rename to src/main/java/com/ils/oms/controller/IlsOrderController.java index 70727a9..fabe253 100644 --- a/src/main/java/org/ils/order/controller/IlsOrderController.java +++ b/src/main/java/com/ils/oms/controller/IlsOrderController.java @@ -1,7 +1,7 @@ -package org.ils.order.controller; +package com.ils.oms.controller; -import org.ils.order.service.IIlsOrderService; +import com.ils.oms.service.IIlsOrderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/org/ils/order/controller/IlsOrderFeeController.java b/src/main/java/com/ils/oms/controller/IlsOrderFeeController.java similarity index 90% rename from src/main/java/org/ils/order/controller/IlsOrderFeeController.java rename to src/main/java/com/ils/oms/controller/IlsOrderFeeController.java index bf2b814..43a0f89 100644 --- a/src/main/java/org/ils/order/controller/IlsOrderFeeController.java +++ b/src/main/java/com/ils/oms/controller/IlsOrderFeeController.java @@ -1,4 +1,4 @@ -package org.ils.order.controller; +package com.ils.oms.controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/org/ils/order/controller/IlsOrderItemController.java b/src/main/java/com/ils/oms/controller/IlsOrderItemController.java similarity index 90% rename from src/main/java/org/ils/order/controller/IlsOrderItemController.java rename to src/main/java/com/ils/oms/controller/IlsOrderItemController.java index ba54279..ce67562 100644 --- a/src/main/java/org/ils/order/controller/IlsOrderItemController.java +++ b/src/main/java/com/ils/oms/controller/IlsOrderItemController.java @@ -1,4 +1,4 @@ -package org.ils.order.controller; +package com.ils.oms.controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/org/ils/order/controller/IlsOrderLabelController.java b/src/main/java/com/ils/oms/controller/IlsOrderLabelController.java similarity index 90% rename from src/main/java/org/ils/order/controller/IlsOrderLabelController.java rename to src/main/java/com/ils/oms/controller/IlsOrderLabelController.java index a90a205..968eccb 100644 --- a/src/main/java/org/ils/order/controller/IlsOrderLabelController.java +++ b/src/main/java/com/ils/oms/controller/IlsOrderLabelController.java @@ -1,4 +1,4 @@ -package org.ils.order.controller; +package com.ils.oms.controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/org/ils/order/controller/IlsOrderParcelController.java b/src/main/java/com/ils/oms/controller/IlsOrderParcelController.java similarity index 90% rename from src/main/java/org/ils/order/controller/IlsOrderParcelController.java rename to src/main/java/com/ils/oms/controller/IlsOrderParcelController.java index b28bb66..d538c5c 100644 --- a/src/main/java/org/ils/order/controller/IlsOrderParcelController.java +++ b/src/main/java/com/ils/oms/controller/IlsOrderParcelController.java @@ -1,4 +1,4 @@ -package org.ils.order.controller; +package com.ils.oms.controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/org/ils/order/controller/IlsOrderUploadController.java b/src/main/java/com/ils/oms/controller/IlsOrderUploadController.java similarity index 90% rename from src/main/java/org/ils/order/controller/IlsOrderUploadController.java rename to src/main/java/com/ils/oms/controller/IlsOrderUploadController.java index 9379884..450cf23 100644 --- a/src/main/java/org/ils/order/controller/IlsOrderUploadController.java +++ b/src/main/java/com/ils/oms/controller/IlsOrderUploadController.java @@ -1,4 +1,4 @@ -package org.ils.order.controller; +package com.ils.oms.controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/org/ils/order/controller/IlsProductController.java b/src/main/java/com/ils/oms/controller/IlsProductController.java similarity index 90% rename from src/main/java/org/ils/order/controller/IlsProductController.java rename to src/main/java/com/ils/oms/controller/IlsProductController.java index eb3fbc5..e34d4cd 100644 --- a/src/main/java/org/ils/order/controller/IlsProductController.java +++ b/src/main/java/com/ils/oms/controller/IlsProductController.java @@ -1,4 +1,4 @@ -package org.ils.order.controller; +package com.ils.oms.controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/org/ils/order/controller/IlsProductValidationController.java b/src/main/java/com/ils/oms/controller/IlsProductValidationController.java similarity index 91% rename from src/main/java/org/ils/order/controller/IlsProductValidationController.java rename to src/main/java/com/ils/oms/controller/IlsProductValidationController.java index 33c68f5..e5d6250 100644 --- a/src/main/java/org/ils/order/controller/IlsProductValidationController.java +++ b/src/main/java/com/ils/oms/controller/IlsProductValidationController.java @@ -1,4 +1,4 @@ -package org.ils.order.controller; +package com.ils.oms.controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/org/ils/order/controller/MainLineController.java b/src/main/java/com/ils/oms/controller/MainLineController.java similarity index 79% rename from src/main/java/org/ils/order/controller/MainLineController.java rename to src/main/java/com/ils/oms/controller/MainLineController.java index ea1a517..9c00e7c 100644 --- a/src/main/java/org/ils/order/controller/MainLineController.java +++ b/src/main/java/com/ils/oms/controller/MainLineController.java @@ -1,11 +1,11 @@ -package org.ils.order.controller; +package com.ils.oms.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.ils.order.dto.dto.MainLinePageDto; -import org.ils.order.result.Result; -import org.ils.order.service.impl.MainLineServiceImpl; +import com.ils.oms.dto.MainLinePageDto; +import com.ils.oms.result.Result; +import com.ils.oms.service.impl.MainLineServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/ils/order/dto/dto/BasePageDto.java b/src/main/java/com/ils/oms/dto/BasePageDto.java similarity index 92% rename from src/main/java/org/ils/order/dto/dto/BasePageDto.java rename to src/main/java/com/ils/oms/dto/BasePageDto.java index fb977f5..088f229 100644 --- a/src/main/java/org/ils/order/dto/dto/BasePageDto.java +++ b/src/main/java/com/ils/oms/dto/BasePageDto.java @@ -1,4 +1,4 @@ -package org.ils.order.dto.dto; +package com.ils.oms.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/org/ils/order/dto/dto/MainLineDto.java b/src/main/java/com/ils/oms/dto/MainLineDto.java similarity index 94% rename from src/main/java/org/ils/order/dto/dto/MainLineDto.java rename to src/main/java/com/ils/oms/dto/MainLineDto.java index 6564089..94f3e41 100644 --- a/src/main/java/org/ils/order/dto/dto/MainLineDto.java +++ b/src/main/java/com/ils/oms/dto/MainLineDto.java @@ -1,4 +1,4 @@ -package org.ils.order.dto.dto; +package com.ils.oms.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Builder; diff --git a/src/main/java/org/ils/order/dto/dto/MainLinePageDto.java b/src/main/java/com/ils/oms/dto/MainLinePageDto.java similarity index 91% rename from src/main/java/org/ils/order/dto/dto/MainLinePageDto.java rename to src/main/java/com/ils/oms/dto/MainLinePageDto.java index 51a920c..e7dc883 100644 --- a/src/main/java/org/ils/order/dto/dto/MainLinePageDto.java +++ b/src/main/java/com/ils/oms/dto/MainLinePageDto.java @@ -1,4 +1,4 @@ -package org.ils.order.dto.dto; +package com.ils.oms.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/org/ils/order/dto/dto/OrderPageDto.java b/src/main/java/com/ils/oms/dto/OrderPageDto.java similarity index 90% rename from src/main/java/org/ils/order/dto/dto/OrderPageDto.java rename to src/main/java/com/ils/oms/dto/OrderPageDto.java index 82e452b..23de8fb 100644 --- a/src/main/java/org/ils/order/dto/dto/OrderPageDto.java +++ b/src/main/java/com/ils/oms/dto/OrderPageDto.java @@ -1,4 +1,4 @@ -package org.ils.order.dto.dto; +package com.ils.oms.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/org/ils/order/entity/BaseEntity.java b/src/main/java/com/ils/oms/entity/BaseEntity.java similarity index 96% rename from src/main/java/org/ils/order/entity/BaseEntity.java rename to src/main/java/com/ils/oms/entity/BaseEntity.java index 4c84713..56d57e6 100644 --- a/src/main/java/org/ils/order/entity/BaseEntity.java +++ b/src/main/java/com/ils/oms/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package org.ils.order.entity; +package com.ils.oms.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/org/ils/order/entity/IlsCustomerDO.java b/src/main/java/com/ils/oms/entity/IlsCustomerDO.java similarity index 98% rename from src/main/java/org/ils/order/entity/IlsCustomerDO.java rename to src/main/java/com/ils/oms/entity/IlsCustomerDO.java index 9d920ba..d26279d 100644 --- a/src/main/java/org/ils/order/entity/IlsCustomerDO.java +++ b/src/main/java/com/ils/oms/entity/IlsCustomerDO.java @@ -1,4 +1,4 @@ -package org.ils.order.entity; +package com.ils.oms.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/org/ils/order/entity/IlsMainLine.java b/src/main/java/com/ils/oms/entity/IlsMainLine.java similarity index 96% rename from src/main/java/org/ils/order/entity/IlsMainLine.java rename to src/main/java/com/ils/oms/entity/IlsMainLine.java index 63b4fb5..4b93bcc 100644 --- a/src/main/java/org/ils/order/entity/IlsMainLine.java +++ b/src/main/java/com/ils/oms/entity/IlsMainLine.java @@ -1,4 +1,4 @@ -package org.ils.order.entity; +package com.ils.oms.entity; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/org/ils/order/entity/IlsOrderAddressDO.java b/src/main/java/com/ils/oms/entity/IlsOrderAddressDO.java similarity index 98% rename from src/main/java/org/ils/order/entity/IlsOrderAddressDO.java rename to src/main/java/com/ils/oms/entity/IlsOrderAddressDO.java index 4d2ab5b..105b563 100644 --- a/src/main/java/org/ils/order/entity/IlsOrderAddressDO.java +++ b/src/main/java/com/ils/oms/entity/IlsOrderAddressDO.java @@ -1,4 +1,4 @@ -package org.ils.order.entity; +package com.ils.oms.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/org/ils/order/entity/IlsOrderDO.java b/src/main/java/com/ils/oms/entity/IlsOrderDO.java similarity index 98% rename from src/main/java/org/ils/order/entity/IlsOrderDO.java rename to src/main/java/com/ils/oms/entity/IlsOrderDO.java index 8db01f5..f6cf170 100644 --- a/src/main/java/org/ils/order/entity/IlsOrderDO.java +++ b/src/main/java/com/ils/oms/entity/IlsOrderDO.java @@ -1,4 +1,4 @@ -package org.ils.order.entity; +package com.ils.oms.entity; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/org/ils/order/entity/IlsOrderFeeDO.java b/src/main/java/com/ils/oms/entity/IlsOrderFeeDO.java similarity index 97% rename from src/main/java/org/ils/order/entity/IlsOrderFeeDO.java rename to src/main/java/com/ils/oms/entity/IlsOrderFeeDO.java index 37cc03f..83ab1fa 100644 --- a/src/main/java/org/ils/order/entity/IlsOrderFeeDO.java +++ b/src/main/java/com/ils/oms/entity/IlsOrderFeeDO.java @@ -1,4 +1,4 @@ -package org.ils.order.entity; +package com.ils.oms.entity; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/org/ils/order/entity/IlsOrderItemDO.java b/src/main/java/com/ils/oms/entity/IlsOrderItemDO.java similarity index 98% rename from src/main/java/org/ils/order/entity/IlsOrderItemDO.java rename to src/main/java/com/ils/oms/entity/IlsOrderItemDO.java index 1d1c053..e33cef2 100644 --- a/src/main/java/org/ils/order/entity/IlsOrderItemDO.java +++ b/src/main/java/com/ils/oms/entity/IlsOrderItemDO.java @@ -1,4 +1,4 @@ -package org.ils.order.entity; +package com.ils.oms.entity; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/org/ils/order/entity/IlsOrderLabelDO.java b/src/main/java/com/ils/oms/entity/IlsOrderLabelDO.java similarity index 97% rename from src/main/java/org/ils/order/entity/IlsOrderLabelDO.java rename to src/main/java/com/ils/oms/entity/IlsOrderLabelDO.java index 85e5fbf..aa1e64f 100644 --- a/src/main/java/org/ils/order/entity/IlsOrderLabelDO.java +++ b/src/main/java/com/ils/oms/entity/IlsOrderLabelDO.java @@ -1,4 +1,4 @@ -package org.ils.order.entity; +package com.ils.oms.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/org/ils/order/entity/IlsOrderParcelDO.java b/src/main/java/com/ils/oms/entity/IlsOrderParcelDO.java similarity index 98% rename from src/main/java/org/ils/order/entity/IlsOrderParcelDO.java rename to src/main/java/com/ils/oms/entity/IlsOrderParcelDO.java index 12758f9..85b71d0 100644 --- a/src/main/java/org/ils/order/entity/IlsOrderParcelDO.java +++ b/src/main/java/com/ils/oms/entity/IlsOrderParcelDO.java @@ -1,4 +1,4 @@ -package org.ils.order.entity; +package com.ils.oms.entity; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/org/ils/order/entity/IlsOrderUploadDO.java b/src/main/java/com/ils/oms/entity/IlsOrderUploadDO.java similarity index 98% rename from src/main/java/org/ils/order/entity/IlsOrderUploadDO.java rename to src/main/java/com/ils/oms/entity/IlsOrderUploadDO.java index ba71dbe..ac5a347 100644 --- a/src/main/java/org/ils/order/entity/IlsOrderUploadDO.java +++ b/src/main/java/com/ils/oms/entity/IlsOrderUploadDO.java @@ -1,4 +1,4 @@ -package org.ils.order.entity; +package com.ils.oms.entity; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/org/ils/order/entity/IlsProductDO.java b/src/main/java/com/ils/oms/entity/IlsProductDO.java similarity index 98% rename from src/main/java/org/ils/order/entity/IlsProductDO.java rename to src/main/java/com/ils/oms/entity/IlsProductDO.java index 1ab64ca..6bf4002 100644 --- a/src/main/java/org/ils/order/entity/IlsProductDO.java +++ b/src/main/java/com/ils/oms/entity/IlsProductDO.java @@ -1,4 +1,4 @@ -package org.ils.order.entity; +package com.ils.oms.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/org/ils/order/entity/IlsProductValidationDO.java b/src/main/java/com/ils/oms/entity/IlsProductValidationDO.java similarity index 98% rename from src/main/java/org/ils/order/entity/IlsProductValidationDO.java rename to src/main/java/com/ils/oms/entity/IlsProductValidationDO.java index 292acf6..0b6fcf8 100644 --- a/src/main/java/org/ils/order/entity/IlsProductValidationDO.java +++ b/src/main/java/com/ils/oms/entity/IlsProductValidationDO.java @@ -1,4 +1,4 @@ -package org.ils.order.entity; +package com.ils.oms.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/com/ils/oms/exceptions/GlobalExceptionHandler.java b/src/main/java/com/ils/oms/exceptions/GlobalExceptionHandler.java new file mode 100644 index 0000000..b133302 --- /dev/null +++ b/src/main/java/com/ils/oms/exceptions/GlobalExceptionHandler.java @@ -0,0 +1,27 @@ +//package com.ils.oms.exceptions; +// +//import lombok.extern.slf4j.Slf4j; +//import com.ils.oms.result.Result; +//import org.springframework.web.bind.annotation.ControllerAdvice; +//import org.springframework.web.bind.annotation.ExceptionHandler; +//import org.springframework.web.bind.annotation.ResponseBody; +// +///** +// * 全局异常捕获 +// * @author chenjf +// */ +//@Slf4j +//@ControllerAdvice +//public class GlobalExceptionHandler { +// /** +// * 处理除0异常捕获 +// * @param exception +// * @return +// */ +// @ExceptionHandler(value = Exception.class) +// @ResponseBody +// public Result exceptionHandler(Exception exception){ +// log.error("exceptionHandler: {}", exception.getMessage()); +// return Result.error(exception.getMessage()); +// } +//} diff --git a/src/main/java/org/ils/order/handler/MysqlMetaObjectHandler.java b/src/main/java/com/ils/oms/handler/MysqlMetaObjectHandler.java similarity index 81% rename from src/main/java/org/ils/order/handler/MysqlMetaObjectHandler.java rename to src/main/java/com/ils/oms/handler/MysqlMetaObjectHandler.java index 017b43b..2c1a7aa 100644 --- a/src/main/java/org/ils/order/handler/MysqlMetaObjectHandler.java +++ b/src/main/java/com/ils/oms/handler/MysqlMetaObjectHandler.java @@ -1,4 +1,4 @@ -package org.ils.order.handler; +package com.ils.oms.handler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import lombok.extern.slf4j.Slf4j; @@ -14,7 +14,7 @@ public class MysqlMetaObjectHandler implements MetaObjectHandler { log.info("start insert fill ...."); this.strictInsertFill(metaObject, "createTime", Long.class, System.currentTimeMillis()); // 或者 - this.strictInsertFill(metaObject, "createTime", () -> System.currentTimeMillis(), Long.class); +// this.strictInsertFill(metaObject, "createTime", () -> System.currentTimeMillis(), Long.class); // 或者 this.fillStrategy(metaObject, "createTime",System.currentTimeMillis()); @@ -27,7 +27,7 @@ public class MysqlMetaObjectHandler implements MetaObjectHandler { log.info("start update fill ...."); this.strictUpdateFill(metaObject, "updateTime", Long.class,System.currentTimeMillis()); // 或者 - this.strictUpdateFill(metaObject, "updateTime", () -> System.currentTimeMillis(), Long.class); +// this.strictUpdateFill(metaObject, "updateTime", () -> System.currentTimeMillis(), Long.class); // 或者 this.fillStrategy(metaObject, "updateTime", System.currentTimeMillis()); diff --git a/src/main/java/com/ils/oms/listener/rabbitmq/RabbitQueueConfig.java b/src/main/java/com/ils/oms/listener/rabbitmq/RabbitQueueConfig.java new file mode 100644 index 0000000..0015198 --- /dev/null +++ b/src/main/java/com/ils/oms/listener/rabbitmq/RabbitQueueConfig.java @@ -0,0 +1,41 @@ +//package com.ils.oms.listener.rabbitmq; +// +//import com.ils.oms.properties.BaseConfigProperties; +//import org.springframework.amqp.core.*; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +// +///** +// * rabbitmq 绑定队列 +// * @author chenjf +// * @datetime 2023/08/09 +// */ +//@Configuration +//public class RabbitQueueConfig { +// +// @Autowired +// private BaseConfigProperties baseConfig; +// +// private final static String EVENT = "events."; +// +// @Bean +// public FanoutExchange OrderExchange() { +// return new FanoutExchange ( EVENT + baseConfig.getOrderQueue(), true, false); +// } +// +// +// /** +// * 订单队列 +// */ +// @Bean +// public Queue IlsOrderQueue() { +// return new Queue(baseConfig.getOrderQueue()); +// } +// +// +// @Bean +// public Binding OrderBinding() { +// return BindingBuilder.bind(IlsOrderQueue()).to(OrderExchange()); +// } +//} diff --git a/src/main/java/com/ils/oms/listener/rabbitmq/RabbitReceiver.java b/src/main/java/com/ils/oms/listener/rabbitmq/RabbitReceiver.java new file mode 100644 index 0000000..647bd9f --- /dev/null +++ b/src/main/java/com/ils/oms/listener/rabbitmq/RabbitReceiver.java @@ -0,0 +1,23 @@ +//package com.ils.oms.listener.rabbitmq; +// +// +//import com.z.common.mq.EventMessage; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.amqp.rabbit.annotation.RabbitHandler; +//import org.springframework.amqp.rabbit.annotation.RabbitListener; +//import org.springframework.stereotype.Component; +// +///** +// * 订单队列接收消息 +// * @author chenjf +// * @datetime 2023/08/09 +// */ +//@Slf4j +//@Component +//@RabbitListener(queues = "${spring.rabbitmq.queues.orderQueue}") +//public class RabbitReceiver { +// @RabbitHandler +// public void process(EventMessage message) { +// log.info("Receiver: {}", message.getPayload()); +// } +//} diff --git a/src/main/java/com/ils/oms/listener/rabbitmq/RabbitSender.java b/src/main/java/com/ils/oms/listener/rabbitmq/RabbitSender.java new file mode 100644 index 0000000..57388ec --- /dev/null +++ b/src/main/java/com/ils/oms/listener/rabbitmq/RabbitSender.java @@ -0,0 +1,28 @@ +//package com.ils.oms.listener.rabbitmq; +// +//import com.ils.oms.properties.BaseConfigProperties; +//import com.z.common.mq.EventPublisher; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Component; +// +// +///** +// * rabbitmq 发送消息 +// * @author chenjf +// * @datetime 2023/08/09 +// */ +//@Component +//public class RabbitSender { +// @Autowired +// private EventPublisher eventPublisher; +// @Autowired +// private BaseConfigProperties baseConfig ; +// /** +// * 队列发送消息 +// * @param exChangeName 交换机名称 +// * @param json json字符串 +// */ +// public void sendOrderQueue(String exChangeName,String json) { +// this.eventPublisher.publish( exChangeName, json); +// } +//} diff --git a/src/main/java/org/ils/order/mapper/IlsCustomerMapper.java b/src/main/java/com/ils/oms/mapper/IlsCustomerMapper.java similarity index 76% rename from src/main/java/org/ils/order/mapper/IlsCustomerMapper.java rename to src/main/java/com/ils/oms/mapper/IlsCustomerMapper.java index 676ea52..0031e52 100644 --- a/src/main/java/org/ils/order/mapper/IlsCustomerMapper.java +++ b/src/main/java/com/ils/oms/mapper/IlsCustomerMapper.java @@ -1,6 +1,6 @@ -package org.ils.order.mapper; +package com.ils.oms.mapper; -import org.ils.order.entity.IlsCustomerDO; +import com.ils.oms.entity.IlsCustomerDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/org/ils/order/mapper/IlsMainLineMapper.java b/src/main/java/com/ils/oms/mapper/IlsMainLineMapper.java similarity index 72% rename from src/main/java/org/ils/order/mapper/IlsMainLineMapper.java rename to src/main/java/com/ils/oms/mapper/IlsMainLineMapper.java index 107a8e3..01fd348 100644 --- a/src/main/java/org/ils/order/mapper/IlsMainLineMapper.java +++ b/src/main/java/com/ils/oms/mapper/IlsMainLineMapper.java @@ -1,9 +1,9 @@ -package org.ils.order.mapper; +package com.ils.oms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.ils.order.entity.IlsMainLine; +import com.ils.oms.entity.IlsMainLine; @Mapper diff --git a/src/main/java/org/ils/order/mapper/IlsOrderAddressMapper.java b/src/main/java/com/ils/oms/mapper/IlsOrderAddressMapper.java similarity index 75% rename from src/main/java/org/ils/order/mapper/IlsOrderAddressMapper.java rename to src/main/java/com/ils/oms/mapper/IlsOrderAddressMapper.java index 16eee05..fbc4bb8 100644 --- a/src/main/java/org/ils/order/mapper/IlsOrderAddressMapper.java +++ b/src/main/java/com/ils/oms/mapper/IlsOrderAddressMapper.java @@ -1,6 +1,6 @@ -package org.ils.order.mapper; +package com.ils.oms.mapper; -import org.ils.order.entity.IlsOrderAddressDO; +import com.ils.oms.entity.IlsOrderAddressDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/org/ils/order/mapper/IlsOrderFeeMapper.java b/src/main/java/com/ils/oms/mapper/IlsOrderFeeMapper.java similarity index 75% rename from src/main/java/org/ils/order/mapper/IlsOrderFeeMapper.java rename to src/main/java/com/ils/oms/mapper/IlsOrderFeeMapper.java index 94c5fa0..cf82acc 100644 --- a/src/main/java/org/ils/order/mapper/IlsOrderFeeMapper.java +++ b/src/main/java/com/ils/oms/mapper/IlsOrderFeeMapper.java @@ -1,6 +1,6 @@ -package org.ils.order.mapper; +package com.ils.oms.mapper; -import org.ils.order.entity.IlsOrderFeeDO; +import com.ils.oms.entity.IlsOrderFeeDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/org/ils/order/mapper/IlsOrderItemMapper.java b/src/main/java/com/ils/oms/mapper/IlsOrderItemMapper.java similarity index 75% rename from src/main/java/org/ils/order/mapper/IlsOrderItemMapper.java rename to src/main/java/com/ils/oms/mapper/IlsOrderItemMapper.java index 315bec2..159447a 100644 --- a/src/main/java/org/ils/order/mapper/IlsOrderItemMapper.java +++ b/src/main/java/com/ils/oms/mapper/IlsOrderItemMapper.java @@ -1,6 +1,6 @@ -package org.ils.order.mapper; +package com.ils.oms.mapper; -import org.ils.order.entity.IlsOrderItemDO; +import com.ils.oms.entity.IlsOrderItemDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/org/ils/order/mapper/IlsOrderLabelMapper.java b/src/main/java/com/ils/oms/mapper/IlsOrderLabelMapper.java similarity index 75% rename from src/main/java/org/ils/order/mapper/IlsOrderLabelMapper.java rename to src/main/java/com/ils/oms/mapper/IlsOrderLabelMapper.java index 5b39003..eb0c645 100644 --- a/src/main/java/org/ils/order/mapper/IlsOrderLabelMapper.java +++ b/src/main/java/com/ils/oms/mapper/IlsOrderLabelMapper.java @@ -1,6 +1,6 @@ -package org.ils.order.mapper; +package com.ils.oms.mapper; -import org.ils.order.entity.IlsOrderLabelDO; +import com.ils.oms.entity.IlsOrderLabelDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/org/ils/order/mapper/IlsOrderMapper.java b/src/main/java/com/ils/oms/mapper/IlsOrderMapper.java similarity index 75% rename from src/main/java/org/ils/order/mapper/IlsOrderMapper.java rename to src/main/java/com/ils/oms/mapper/IlsOrderMapper.java index 17acd76..423beea 100644 --- a/src/main/java/org/ils/order/mapper/IlsOrderMapper.java +++ b/src/main/java/com/ils/oms/mapper/IlsOrderMapper.java @@ -1,6 +1,6 @@ -package org.ils.order.mapper; +package com.ils.oms.mapper; -import org.ils.order.entity.IlsOrderDO; +import com.ils.oms.entity.IlsOrderDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/org/ils/order/mapper/IlsOrderParcelMapper.java b/src/main/java/com/ils/oms/mapper/IlsOrderParcelMapper.java similarity index 76% rename from src/main/java/org/ils/order/mapper/IlsOrderParcelMapper.java rename to src/main/java/com/ils/oms/mapper/IlsOrderParcelMapper.java index 16a3293..0d095cb 100644 --- a/src/main/java/org/ils/order/mapper/IlsOrderParcelMapper.java +++ b/src/main/java/com/ils/oms/mapper/IlsOrderParcelMapper.java @@ -1,6 +1,6 @@ -package org.ils.order.mapper; +package com.ils.oms.mapper; -import org.ils.order.entity.IlsOrderParcelDO; +import com.ils.oms.entity.IlsOrderParcelDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/org/ils/order/mapper/IlsOrderUploadMapper.java b/src/main/java/com/ils/oms/mapper/IlsOrderUploadMapper.java similarity index 75% rename from src/main/java/org/ils/order/mapper/IlsOrderUploadMapper.java rename to src/main/java/com/ils/oms/mapper/IlsOrderUploadMapper.java index a69a9be..8988913 100644 --- a/src/main/java/org/ils/order/mapper/IlsOrderUploadMapper.java +++ b/src/main/java/com/ils/oms/mapper/IlsOrderUploadMapper.java @@ -1,6 +1,6 @@ -package org.ils.order.mapper; +package com.ils.oms.mapper; -import org.ils.order.entity.IlsOrderUploadDO; +import com.ils.oms.entity.IlsOrderUploadDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/org/ils/order/mapper/IlsProductMapper.java b/src/main/java/com/ils/oms/mapper/IlsProductMapper.java similarity index 75% rename from src/main/java/org/ils/order/mapper/IlsProductMapper.java rename to src/main/java/com/ils/oms/mapper/IlsProductMapper.java index c44359e..856b2ec 100644 --- a/src/main/java/org/ils/order/mapper/IlsProductMapper.java +++ b/src/main/java/com/ils/oms/mapper/IlsProductMapper.java @@ -1,6 +1,6 @@ -package org.ils.order.mapper; +package com.ils.oms.mapper; -import org.ils.order.entity.IlsProductDO; +import com.ils.oms.entity.IlsProductDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/org/ils/order/mapper/IlsProductValidationMapper.java b/src/main/java/com/ils/oms/mapper/IlsProductValidationMapper.java similarity index 75% rename from src/main/java/org/ils/order/mapper/IlsProductValidationMapper.java rename to src/main/java/com/ils/oms/mapper/IlsProductValidationMapper.java index 82304fe..82fb27e 100644 --- a/src/main/java/org/ils/order/mapper/IlsProductValidationMapper.java +++ b/src/main/java/com/ils/oms/mapper/IlsProductValidationMapper.java @@ -1,6 +1,6 @@ -package org.ils.order.mapper; +package com.ils.oms.mapper; -import org.ils.order.entity.IlsProductValidationDO; +import com.ils.oms.entity.IlsProductValidationDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/com/ils/oms/properties/BaseConfigProperties.java b/src/main/java/com/ils/oms/properties/BaseConfigProperties.java new file mode 100644 index 0000000..d25473d --- /dev/null +++ b/src/main/java/com/ils/oms/properties/BaseConfigProperties.java @@ -0,0 +1,21 @@ +//package com.ils.oms.properties; +// +//import lombok.Data; +//import org.springframework.beans.factory.annotation.Value; +//import org.springframework.stereotype.Component; +// +///** +// * 系统获取yml基本参数 +// * @author chenjf +// * @datetime 2023/08/09 +// */ +//@Component +//@Data +//public class BaseConfigProperties { +// +// @Value("${spring.rabbitmq.queues.orderQueue}") +// private String orderQueue; +// +// @Value("${ils.other.host.baiduUrl}") +// private String baiduUrl; +//} diff --git a/src/main/java/org/ils/order/result/GlobalException.java b/src/main/java/com/ils/oms/result/GlobalException.java similarity index 96% rename from src/main/java/org/ils/order/result/GlobalException.java rename to src/main/java/com/ils/oms/result/GlobalException.java index 65754f3..29be303 100644 --- a/src/main/java/org/ils/order/result/GlobalException.java +++ b/src/main/java/com/ils/oms/result/GlobalException.java @@ -1,4 +1,4 @@ -package org.ils.order.result; +package com.ils.oms.result; /** * diff --git a/src/main/java/org/ils/order/result/JwtVerifyResult.java b/src/main/java/com/ils/oms/result/JwtVerifyResult.java similarity index 97% rename from src/main/java/org/ils/order/result/JwtVerifyResult.java rename to src/main/java/com/ils/oms/result/JwtVerifyResult.java index 94f93fc..0a27c18 100644 --- a/src/main/java/org/ils/order/result/JwtVerifyResult.java +++ b/src/main/java/com/ils/oms/result/JwtVerifyResult.java @@ -1,4 +1,4 @@ -package org.ils.order.result; +package com.ils.oms.result; import java.util.Map; diff --git a/src/main/java/org/ils/order/result/Result.java b/src/main/java/com/ils/oms/result/Result.java similarity index 97% rename from src/main/java/org/ils/order/result/Result.java rename to src/main/java/com/ils/oms/result/Result.java index fd82ae8..dd720d1 100644 --- a/src/main/java/org/ils/order/result/Result.java +++ b/src/main/java/com/ils/oms/result/Result.java @@ -1,8 +1,8 @@ -package org.ils.order.result; +package com.ils.oms.result; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.ils.order.common.CommonConstant; +import com.ils.oms.common.CommonConstant; import java.io.Serializable; diff --git a/src/main/java/org/ils/order/service/IIlsCustomerService.java b/src/main/java/com/ils/oms/service/IIlsCustomerService.java similarity index 75% rename from src/main/java/org/ils/order/service/IIlsCustomerService.java rename to src/main/java/com/ils/oms/service/IIlsCustomerService.java index 39c97ec..cda9491 100644 --- a/src/main/java/org/ils/order/service/IIlsCustomerService.java +++ b/src/main/java/com/ils/oms/service/IIlsCustomerService.java @@ -1,6 +1,6 @@ -package org.ils.order.service; +package com.ils.oms.service; -import org.ils.order.entity.IlsCustomerDO; +import com.ils.oms.entity.IlsCustomerDO; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/src/main/java/org/ils/order/service/IIlsOrderAddressService.java b/src/main/java/com/ils/oms/service/IIlsOrderAddressService.java similarity index 75% rename from src/main/java/org/ils/order/service/IIlsOrderAddressService.java rename to src/main/java/com/ils/oms/service/IIlsOrderAddressService.java index ad29b62..fca0e57 100644 --- a/src/main/java/org/ils/order/service/IIlsOrderAddressService.java +++ b/src/main/java/com/ils/oms/service/IIlsOrderAddressService.java @@ -1,6 +1,6 @@ -package org.ils.order.service; +package com.ils.oms.service; -import org.ils.order.entity.IlsOrderAddressDO; +import com.ils.oms.entity.IlsOrderAddressDO; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/src/main/java/org/ils/order/service/IIlsOrderFeeService.java b/src/main/java/com/ils/oms/service/IIlsOrderFeeService.java similarity index 75% rename from src/main/java/org/ils/order/service/IIlsOrderFeeService.java rename to src/main/java/com/ils/oms/service/IIlsOrderFeeService.java index 4c879fe..bf6aef9 100644 --- a/src/main/java/org/ils/order/service/IIlsOrderFeeService.java +++ b/src/main/java/com/ils/oms/service/IIlsOrderFeeService.java @@ -1,6 +1,6 @@ -package org.ils.order.service; +package com.ils.oms.service; -import org.ils.order.entity.IlsOrderFeeDO; +import com.ils.oms.entity.IlsOrderFeeDO; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/src/main/java/org/ils/order/service/IIlsOrderItemService.java b/src/main/java/com/ils/oms/service/IIlsOrderItemService.java similarity index 75% rename from src/main/java/org/ils/order/service/IIlsOrderItemService.java rename to src/main/java/com/ils/oms/service/IIlsOrderItemService.java index 8c4d038..dd5d5f0 100644 --- a/src/main/java/org/ils/order/service/IIlsOrderItemService.java +++ b/src/main/java/com/ils/oms/service/IIlsOrderItemService.java @@ -1,6 +1,6 @@ -package org.ils.order.service; +package com.ils.oms.service; -import org.ils.order.entity.IlsOrderItemDO; +import com.ils.oms.entity.IlsOrderItemDO; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/src/main/java/org/ils/order/service/IIlsOrderLabelService.java b/src/main/java/com/ils/oms/service/IIlsOrderLabelService.java similarity index 75% rename from src/main/java/org/ils/order/service/IIlsOrderLabelService.java rename to src/main/java/com/ils/oms/service/IIlsOrderLabelService.java index 8e1662a..a3c0287 100644 --- a/src/main/java/org/ils/order/service/IIlsOrderLabelService.java +++ b/src/main/java/com/ils/oms/service/IIlsOrderLabelService.java @@ -1,6 +1,6 @@ -package org.ils.order.service; +package com.ils.oms.service; -import org.ils.order.entity.IlsOrderLabelDO; +import com.ils.oms.entity.IlsOrderLabelDO; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/src/main/java/org/ils/order/service/IIlsOrderParcelService.java b/src/main/java/com/ils/oms/service/IIlsOrderParcelService.java similarity index 75% rename from src/main/java/org/ils/order/service/IIlsOrderParcelService.java rename to src/main/java/com/ils/oms/service/IIlsOrderParcelService.java index 5b12264..54a5b40 100644 --- a/src/main/java/org/ils/order/service/IIlsOrderParcelService.java +++ b/src/main/java/com/ils/oms/service/IIlsOrderParcelService.java @@ -1,6 +1,6 @@ -package org.ils.order.service; +package com.ils.oms.service; -import org.ils.order.entity.IlsOrderParcelDO; +import com.ils.oms.entity.IlsOrderParcelDO; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/src/main/java/org/ils/order/service/IIlsOrderService.java b/src/main/java/com/ils/oms/service/IIlsOrderService.java similarity index 75% rename from src/main/java/org/ils/order/service/IIlsOrderService.java rename to src/main/java/com/ils/oms/service/IIlsOrderService.java index 9e1358f..9da9c96 100644 --- a/src/main/java/org/ils/order/service/IIlsOrderService.java +++ b/src/main/java/com/ils/oms/service/IIlsOrderService.java @@ -1,6 +1,6 @@ -package org.ils.order.service; +package com.ils.oms.service; -import org.ils.order.entity.IlsOrderDO; +import com.ils.oms.entity.IlsOrderDO; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/src/main/java/org/ils/order/service/IIlsOrderUploadService.java b/src/main/java/com/ils/oms/service/IIlsOrderUploadService.java similarity index 75% rename from src/main/java/org/ils/order/service/IIlsOrderUploadService.java rename to src/main/java/com/ils/oms/service/IIlsOrderUploadService.java index 906b439..5910d75 100644 --- a/src/main/java/org/ils/order/service/IIlsOrderUploadService.java +++ b/src/main/java/com/ils/oms/service/IIlsOrderUploadService.java @@ -1,6 +1,6 @@ -package org.ils.order.service; +package com.ils.oms.service; -import org.ils.order.entity.IlsOrderUploadDO; +import com.ils.oms.entity.IlsOrderUploadDO; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/src/main/java/org/ils/order/service/IIlsProductService.java b/src/main/java/com/ils/oms/service/IIlsProductService.java similarity index 75% rename from src/main/java/org/ils/order/service/IIlsProductService.java rename to src/main/java/com/ils/oms/service/IIlsProductService.java index b38e7de..ea52e46 100644 --- a/src/main/java/org/ils/order/service/IIlsProductService.java +++ b/src/main/java/com/ils/oms/service/IIlsProductService.java @@ -1,6 +1,6 @@ -package org.ils.order.service; +package com.ils.oms.service; -import org.ils.order.entity.IlsProductDO; +import com.ils.oms.entity.IlsProductDO; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/src/main/java/org/ils/order/service/IIlsProductValidationService.java b/src/main/java/com/ils/oms/service/IIlsProductValidationService.java similarity index 75% rename from src/main/java/org/ils/order/service/IIlsProductValidationService.java rename to src/main/java/com/ils/oms/service/IIlsProductValidationService.java index 1818aa5..0076d11 100644 --- a/src/main/java/org/ils/order/service/IIlsProductValidationService.java +++ b/src/main/java/com/ils/oms/service/IIlsProductValidationService.java @@ -1,6 +1,6 @@ -package org.ils.order.service; +package com.ils.oms.service; -import org.ils.order.entity.IlsProductValidationDO; +import com.ils.oms.entity.IlsProductValidationDO; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/src/main/java/org/ils/order/service/MainLineService.java b/src/main/java/com/ils/oms/service/MainLineService.java similarity index 82% rename from src/main/java/org/ils/order/service/MainLineService.java rename to src/main/java/com/ils/oms/service/MainLineService.java index 82219c7..61cc519 100644 --- a/src/main/java/org/ils/order/service/MainLineService.java +++ b/src/main/java/com/ils/oms/service/MainLineService.java @@ -1,8 +1,8 @@ -package org.ils.order.service.impl; +package com.ils.oms.service; -import org.ils.order.dto.dto.MainLineDto; -import org.ils.order.dto.dto.MainLinePageDto; +import com.ils.oms.dto.MainLineDto; +import com.ils.oms.dto.MainLinePageDto; /** * 计费引擎主线计费主线模型接口 diff --git a/src/main/java/org/ils/order/service/impl/BaseService.java b/src/main/java/com/ils/oms/service/impl/BaseService.java similarity index 83% rename from src/main/java/org/ils/order/service/impl/BaseService.java rename to src/main/java/com/ils/oms/service/impl/BaseService.java index 8580a3c..954c3d8 100644 --- a/src/main/java/org/ils/order/service/impl/BaseService.java +++ b/src/main/java/com/ils/oms/service/impl/BaseService.java @@ -1,4 +1,4 @@ -package org.ils.order.service.impl; +package com.ils.oms.service.impl; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/ils/order/service/impl/IlsCustomerServiceImpl.java b/src/main/java/com/ils/oms/service/impl/IlsCustomerServiceImpl.java similarity index 66% rename from src/main/java/org/ils/order/service/impl/IlsCustomerServiceImpl.java rename to src/main/java/com/ils/oms/service/impl/IlsCustomerServiceImpl.java index 9d2be8a..4c3a708 100644 --- a/src/main/java/org/ils/order/service/impl/IlsCustomerServiceImpl.java +++ b/src/main/java/com/ils/oms/service/impl/IlsCustomerServiceImpl.java @@ -1,8 +1,8 @@ -package org.ils.order.service.impl; +package com.ils.oms.service.impl; -import org.ils.order.entity.IlsCustomerDO; -import org.ils.order.mapper.IlsCustomerMapper; -import org.ils.order.service.IIlsCustomerService; +import com.ils.oms.service.IIlsCustomerService; +import com.ils.oms.entity.IlsCustomerDO; +import com.ils.oms.mapper.IlsCustomerMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/ils/order/service/impl/IlsOrderAddressServiceImpl.java b/src/main/java/com/ils/oms/service/impl/IlsOrderAddressServiceImpl.java similarity index 66% rename from src/main/java/org/ils/order/service/impl/IlsOrderAddressServiceImpl.java rename to src/main/java/com/ils/oms/service/impl/IlsOrderAddressServiceImpl.java index 1d23617..c8b2554 100644 --- a/src/main/java/org/ils/order/service/impl/IlsOrderAddressServiceImpl.java +++ b/src/main/java/com/ils/oms/service/impl/IlsOrderAddressServiceImpl.java @@ -1,8 +1,8 @@ -package org.ils.order.service.impl; +package com.ils.oms.service.impl; -import org.ils.order.entity.IlsOrderAddressDO; -import org.ils.order.mapper.IlsOrderAddressMapper; -import org.ils.order.service.IIlsOrderAddressService; +import com.ils.oms.service.IIlsOrderAddressService; +import com.ils.oms.entity.IlsOrderAddressDO; +import com.ils.oms.mapper.IlsOrderAddressMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/ils/order/service/impl/IlsOrderFeeServiceImpl.java b/src/main/java/com/ils/oms/service/impl/IlsOrderFeeServiceImpl.java similarity index 66% rename from src/main/java/org/ils/order/service/impl/IlsOrderFeeServiceImpl.java rename to src/main/java/com/ils/oms/service/impl/IlsOrderFeeServiceImpl.java index 1b70943..70c1f3f 100644 --- a/src/main/java/org/ils/order/service/impl/IlsOrderFeeServiceImpl.java +++ b/src/main/java/com/ils/oms/service/impl/IlsOrderFeeServiceImpl.java @@ -1,8 +1,8 @@ -package org.ils.order.service.impl; +package com.ils.oms.service.impl; -import org.ils.order.entity.IlsOrderFeeDO; -import org.ils.order.mapper.IlsOrderFeeMapper; -import org.ils.order.service.IIlsOrderFeeService; +import com.ils.oms.service.IIlsOrderFeeService; +import com.ils.oms.entity.IlsOrderFeeDO; +import com.ils.oms.mapper.IlsOrderFeeMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/ils/order/service/impl/IlsOrderItemServiceImpl.java b/src/main/java/com/ils/oms/service/impl/IlsOrderItemServiceImpl.java similarity index 66% rename from src/main/java/org/ils/order/service/impl/IlsOrderItemServiceImpl.java rename to src/main/java/com/ils/oms/service/impl/IlsOrderItemServiceImpl.java index e7b2582..81d3165 100644 --- a/src/main/java/org/ils/order/service/impl/IlsOrderItemServiceImpl.java +++ b/src/main/java/com/ils/oms/service/impl/IlsOrderItemServiceImpl.java @@ -1,8 +1,8 @@ -package org.ils.order.service.impl; +package com.ils.oms.service.impl; -import org.ils.order.entity.IlsOrderItemDO; -import org.ils.order.mapper.IlsOrderItemMapper; -import org.ils.order.service.IIlsOrderItemService; +import com.ils.oms.service.IIlsOrderItemService; +import com.ils.oms.entity.IlsOrderItemDO; +import com.ils.oms.mapper.IlsOrderItemMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/ils/order/service/impl/IlsOrderLabelServiceImpl.java b/src/main/java/com/ils/oms/service/impl/IlsOrderLabelServiceImpl.java similarity index 66% rename from src/main/java/org/ils/order/service/impl/IlsOrderLabelServiceImpl.java rename to src/main/java/com/ils/oms/service/impl/IlsOrderLabelServiceImpl.java index f40902e..c4aadc3 100644 --- a/src/main/java/org/ils/order/service/impl/IlsOrderLabelServiceImpl.java +++ b/src/main/java/com/ils/oms/service/impl/IlsOrderLabelServiceImpl.java @@ -1,8 +1,8 @@ -package org.ils.order.service.impl; +package com.ils.oms.service.impl; -import org.ils.order.entity.IlsOrderLabelDO; -import org.ils.order.mapper.IlsOrderLabelMapper; -import org.ils.order.service.IIlsOrderLabelService; +import com.ils.oms.service.IIlsOrderLabelService; +import com.ils.oms.entity.IlsOrderLabelDO; +import com.ils.oms.mapper.IlsOrderLabelMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/ils/order/service/impl/IlsOrderParcelServiceImpl.java b/src/main/java/com/ils/oms/service/impl/IlsOrderParcelServiceImpl.java similarity index 66% rename from src/main/java/org/ils/order/service/impl/IlsOrderParcelServiceImpl.java rename to src/main/java/com/ils/oms/service/impl/IlsOrderParcelServiceImpl.java index 3199c3d..cbf67b6 100644 --- a/src/main/java/org/ils/order/service/impl/IlsOrderParcelServiceImpl.java +++ b/src/main/java/com/ils/oms/service/impl/IlsOrderParcelServiceImpl.java @@ -1,8 +1,8 @@ -package org.ils.order.service.impl; +package com.ils.oms.service.impl; -import org.ils.order.entity.IlsOrderParcelDO; -import org.ils.order.mapper.IlsOrderParcelMapper; -import org.ils.order.service.IIlsOrderParcelService; +import com.ils.oms.service.IIlsOrderParcelService; +import com.ils.oms.entity.IlsOrderParcelDO; +import com.ils.oms.mapper.IlsOrderParcelMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/ils/order/service/impl/IlsOrderServiceImpl.java b/src/main/java/com/ils/oms/service/impl/IlsOrderServiceImpl.java similarity index 66% rename from src/main/java/org/ils/order/service/impl/IlsOrderServiceImpl.java rename to src/main/java/com/ils/oms/service/impl/IlsOrderServiceImpl.java index 63208d9..f96542b 100644 --- a/src/main/java/org/ils/order/service/impl/IlsOrderServiceImpl.java +++ b/src/main/java/com/ils/oms/service/impl/IlsOrderServiceImpl.java @@ -1,8 +1,8 @@ -package org.ils.order.service.impl; +package com.ils.oms.service.impl; -import org.ils.order.entity.IlsOrderDO; -import org.ils.order.mapper.IlsOrderMapper; -import org.ils.order.service.IIlsOrderService; +import com.ils.oms.service.IIlsOrderService; +import com.ils.oms.entity.IlsOrderDO; +import com.ils.oms.mapper.IlsOrderMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/ils/order/service/impl/IlsOrderUploadServiceImpl.java b/src/main/java/com/ils/oms/service/impl/IlsOrderUploadServiceImpl.java similarity index 66% rename from src/main/java/org/ils/order/service/impl/IlsOrderUploadServiceImpl.java rename to src/main/java/com/ils/oms/service/impl/IlsOrderUploadServiceImpl.java index 84c7902..b049d89 100644 --- a/src/main/java/org/ils/order/service/impl/IlsOrderUploadServiceImpl.java +++ b/src/main/java/com/ils/oms/service/impl/IlsOrderUploadServiceImpl.java @@ -1,8 +1,8 @@ -package org.ils.order.service.impl; +package com.ils.oms.service.impl; -import org.ils.order.entity.IlsOrderUploadDO; -import org.ils.order.mapper.IlsOrderUploadMapper; -import org.ils.order.service.IIlsOrderUploadService; +import com.ils.oms.service.IIlsOrderUploadService; +import com.ils.oms.entity.IlsOrderUploadDO; +import com.ils.oms.mapper.IlsOrderUploadMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/ils/order/service/impl/IlsProductServiceImpl.java b/src/main/java/com/ils/oms/service/impl/IlsProductServiceImpl.java similarity index 66% rename from src/main/java/org/ils/order/service/impl/IlsProductServiceImpl.java rename to src/main/java/com/ils/oms/service/impl/IlsProductServiceImpl.java index 5c71138..cc21333 100644 --- a/src/main/java/org/ils/order/service/impl/IlsProductServiceImpl.java +++ b/src/main/java/com/ils/oms/service/impl/IlsProductServiceImpl.java @@ -1,8 +1,8 @@ -package org.ils.order.service.impl; +package com.ils.oms.service.impl; -import org.ils.order.entity.IlsProductDO; -import org.ils.order.mapper.IlsProductMapper; -import org.ils.order.service.IIlsProductService; +import com.ils.oms.service.IIlsProductService; +import com.ils.oms.entity.IlsProductDO; +import com.ils.oms.mapper.IlsProductMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/ils/order/service/impl/IlsProductValidationServiceImpl.java b/src/main/java/com/ils/oms/service/impl/IlsProductValidationServiceImpl.java similarity index 66% rename from src/main/java/org/ils/order/service/impl/IlsProductValidationServiceImpl.java rename to src/main/java/com/ils/oms/service/impl/IlsProductValidationServiceImpl.java index b483d2a..5b80c42 100644 --- a/src/main/java/org/ils/order/service/impl/IlsProductValidationServiceImpl.java +++ b/src/main/java/com/ils/oms/service/impl/IlsProductValidationServiceImpl.java @@ -1,8 +1,8 @@ -package org.ils.order.service.impl; +package com.ils.oms.service.impl; -import org.ils.order.entity.IlsProductValidationDO; -import org.ils.order.mapper.IlsProductValidationMapper; -import org.ils.order.service.IIlsProductValidationService; +import com.ils.oms.service.IIlsProductValidationService; +import com.ils.oms.entity.IlsProductValidationDO; +import com.ils.oms.mapper.IlsProductValidationMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/ils/order/service/impl/MainLineServiceImpl.java b/src/main/java/com/ils/oms/service/impl/MainLineServiceImpl.java similarity index 81% rename from src/main/java/org/ils/order/service/impl/MainLineServiceImpl.java rename to src/main/java/com/ils/oms/service/impl/MainLineServiceImpl.java index fe48c33..9fd036c 100644 --- a/src/main/java/org/ils/order/service/impl/MainLineServiceImpl.java +++ b/src/main/java/com/ils/oms/service/impl/MainLineServiceImpl.java @@ -1,17 +1,18 @@ -package org.ils.order.service.impl; +package com.ils.oms.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ils.oms.service.MainLineService; import com.z.common.util.RedisUtils; import lombok.extern.slf4j.Slf4j; -import org.ils.order.entity.IlsMainLine; -import org.ils.order.mapper.IlsMainLineMapper; -import org.ils.order.dto.dto.MainLineDto; -import org.ils.order.dto.dto.MainLinePageDto; -import org.ils.order.result.Result; +import com.ils.oms.entity.IlsMainLine; +import com.ils.oms.mapper.IlsMainLineMapper; +import com.ils.oms.dto.MainLineDto; +import com.ils.oms.dto.MainLinePageDto; +import com.ils.oms.result.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,7 +25,7 @@ import org.springframework.stereotype.Service; */ @Slf4j @Service -public class MainLineServiceImpl implements org.ils.order.service.impl.MainLineService { +public class MainLineServiceImpl implements MainLineService { @Autowired private IlsMainLineMapper ilsMainLineMapper; diff --git a/src/main/java/org/ils/order/utils/IdGeneratorUtil.java b/src/main/java/com/ils/oms/utils/IdGeneratorUtil.java similarity index 97% rename from src/main/java/org/ils/order/utils/IdGeneratorUtil.java rename to src/main/java/com/ils/oms/utils/IdGeneratorUtil.java index 55634e9..670f7e5 100644 --- a/src/main/java/org/ils/order/utils/IdGeneratorUtil.java +++ b/src/main/java/com/ils/oms/utils/IdGeneratorUtil.java @@ -1,4 +1,4 @@ -package org.ils.order.utils; +package com.ils.oms.utils; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateTime; diff --git a/src/main/java/org/ils/order/utils/JwtUtil.java b/src/main/java/com/ils/oms/utils/JwtUtil.java similarity index 98% rename from src/main/java/org/ils/order/utils/JwtUtil.java rename to src/main/java/com/ils/oms/utils/JwtUtil.java index 3c7458f..0b0f1fa 100644 --- a/src/main/java/org/ils/order/utils/JwtUtil.java +++ b/src/main/java/com/ils/oms/utils/JwtUtil.java @@ -1,4 +1,4 @@ -package org.ils.order.utils; +package com.ils.oms.utils; import cn.hutool.core.date.DateUtil; @@ -13,8 +13,8 @@ import cn.hutool.jwt.JWTPayload; import cn.hutool.jwt.RegisteredPayload; import cn.hutool.jwt.signers.JWTSigner; import cn.hutool.jwt.signers.JWTSignerUtil; +import com.ils.oms.result.JwtVerifyResult; import lombok.extern.slf4j.Slf4j; -import org.ils.order.result.JwtVerifyResult; import org.springframework.stereotype.Component; import java.util.Date; diff --git a/src/main/java/org/ils/order/utils/SpringContextUtils.java b/src/main/java/com/ils/oms/utils/SpringContextUtils.java similarity index 98% rename from src/main/java/org/ils/order/utils/SpringContextUtils.java rename to src/main/java/com/ils/oms/utils/SpringContextUtils.java index 98d1547..5ab4cd8 100644 --- a/src/main/java/org/ils/order/utils/SpringContextUtils.java +++ b/src/main/java/com/ils/oms/utils/SpringContextUtils.java @@ -1,4 +1,4 @@ -package org.ils.order.utils; +package com.ils.oms.utils; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/org/ils/order/config/WebMvcConfig.java b/src/main/java/org/ils/order/config/WebMvcConfig.java deleted file mode 100644 index ace2397..0000000 --- a/src/main/java/org/ils/order/config/WebMvcConfig.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.ils.order.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -/** - * @author chenjf - */ - - -@Configuration -public class WebMvcConfig implements WebMvcConfigurer { - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - registry.addResourceHandler("/**").addResourceLocations("classpath:/static/"); - registry.addResourceHandler("swagger-ui.html") - .addResourceLocations("classpath:/META-INF/resources/"); - registry.addResourceHandler("/webjars/**") - .addResourceLocations("classpath:/META-INF/resources/webjars/"); - registry.addResourceHandler("doc.html") - .addResourceLocations("classpath:/META-INF/resources/"); - } -} diff --git a/src/main/java/org/ils/order/exceptions/GlobalExceptionHandler.java b/src/main/java/org/ils/order/exceptions/GlobalExceptionHandler.java deleted file mode 100644 index fbfe5de..0000000 --- a/src/main/java/org/ils/order/exceptions/GlobalExceptionHandler.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.ils.order.exceptions; - -import lombok.extern.slf4j.Slf4j; -import org.ils.order.result.Result; -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * 全局异常捕获 - * @author chenjf - */ -@Slf4j -@ControllerAdvice -public class GlobalExceptionHandler { - /** - * 处理除0异常捕获 - * @param exception - * @return - */ - @ExceptionHandler(value = Exception.class) - @ResponseBody - public Result exceptionHandler(Exception exception){ - log.error("exceptionHandler: {}", exception.getMessage()); - return Result.error(exception.getMessage()); - } -} diff --git a/src/main/java/org/ils/order/listener/rabbitmq/RabbitQueueConfig.java b/src/main/java/org/ils/order/listener/rabbitmq/RabbitQueueConfig.java deleted file mode 100644 index 1ef31f6..0000000 --- a/src/main/java/org/ils/order/listener/rabbitmq/RabbitQueueConfig.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.ils.order.listener.rabbitmq; - -import org.ils.order.properties.BaseConfigProperties; -import org.springframework.amqp.core.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * rabbitmq 绑定队列 - * @author chenjf - * @datetime 2023/08/09 - */ -@Configuration -public class RabbitQueueConfig { - - @Autowired - private BaseConfigProperties baseConfig; - - private final static String EVENT = "events."; - - @Bean - public FanoutExchange OrderExchange() { - return new FanoutExchange ( EVENT + baseConfig.getOrderQueue(), true, false); - } - - - /** - * 订单队列 - */ - @Bean - public Queue IlsOrderQueue() { - return new Queue(baseConfig.getOrderQueue()); - } - - - @Bean - public Binding OrderBinding() { - return BindingBuilder.bind(IlsOrderQueue()).to(OrderExchange()); - } -} diff --git a/src/main/java/org/ils/order/listener/rabbitmq/RabbitReceiver.java b/src/main/java/org/ils/order/listener/rabbitmq/RabbitReceiver.java deleted file mode 100644 index cede1d6..0000000 --- a/src/main/java/org/ils/order/listener/rabbitmq/RabbitReceiver.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.ils.order.listener.rabbitmq; - - -import com.z.common.mq.EventMessage; -import lombok.extern.slf4j.Slf4j; -import org.springframework.amqp.rabbit.annotation.RabbitHandler; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.stereotype.Component; - -/** - * 订单队列接收消息 - * @author chenjf - * @datetime 2023/08/09 - */ -@Slf4j -@Component -@RabbitListener(queues = "${spring.rabbitmq.queues.orderQueue}") -public class RabbitReceiver { - @RabbitHandler - public void process(EventMessage message) { - log.info("Receiver: {}", message.getPayload()); - } -} diff --git a/src/main/java/org/ils/order/listener/rabbitmq/RabbitSender.java b/src/main/java/org/ils/order/listener/rabbitmq/RabbitSender.java deleted file mode 100644 index 66fb09d..0000000 --- a/src/main/java/org/ils/order/listener/rabbitmq/RabbitSender.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.ils.order.listener.rabbitmq; - -import com.z.common.mq.EventPublisher; -import org.ils.order.properties.BaseConfigProperties; -import org.springframework.amqp.core.AmqpTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - - -/** - * rabbitmq 发送消息 - * @author chenjf - * @datetime 2023/08/09 - */ -@Component -public class RabbitSender { - @Autowired - private EventPublisher eventPublisher; - @Autowired - private BaseConfigProperties baseConfig ; - /** - * 队列发送消息 - * @param exChangeName 交换机名称 - * @param json json字符串 - */ - public void sendOrderQueue(String exChangeName,String json) { - this.eventPublisher.publish( exChangeName, json); - } -} diff --git a/src/main/java/org/ils/order/properties/BaseConfigProperties.java b/src/main/java/org/ils/order/properties/BaseConfigProperties.java deleted file mode 100644 index 98d9ed5..0000000 --- a/src/main/java/org/ils/order/properties/BaseConfigProperties.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ils.order.properties; - -import lombok.Data; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -/** - * 系统获取yml基本参数 - * @author chenjf - * @datetime 2023/08/09 - */ -@Component -@Data -public class BaseConfigProperties { - - @Value("${spring.rabbitmq.queues.orderQueue}") - private String orderQueue; - - @Value("${ils.other.host.baiduUrl}") - private String baiduUrl; -} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 08dc327..16c0312 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 9097 + port: 8091 spring: mvc: pathmatch: @@ -8,35 +8,53 @@ spring: multipart: max-file-size: 10MB max-request-size: 10MB +# datasource: +# url: jdbc:mysql://127.0.0.1:3306/ils_engine?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&AllowPublicKeyRetrieval=True&useSSL=false +# username: root +# password: 123456 +# driver-class-name: com.mysql.cj.jdbc.Driver +# druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置) +# # 连接池的配置信息 +# # 初始化大小，最小，最大 +# initial-size: 50 +# min-idle: 5 +# maxActive: 200 +# # 配置获取连接等待超时的时间 +# maxWait: 60000 +# # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 +# timeBetweenEvictionRunsMillis: 60000 +# # 配置一个连接在池中最小生存的时间，单位是毫秒 +# minEvictableIdleTimeMillis: 300000 +# validationQuery: SELECT 1 +# testWhileIdle: true +# testOnBorrow: false +# testOnReturn: false +# # 打开PSCache，并且指定每个连接上PSCache的大小 +# poolPreparedStatements: true +# maxPoolPreparedStatementPerConnectionSize: 20 +# # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 +# #filters: stat,wall,slf4j +# filters: stat,slf4j +# # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 +# # connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 + datasource: - url: jdbc:mysql://127.0.0.1:3306/ils_order?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&AllowPublicKeyRetrieval=True&useSSL=false - username: root - password: root driver-class-name: com.mysql.cj.jdbc.Driver - druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置) - # 连接池的配置信息 - # 初始化大小，最小，最大 - initial-size: 50 - min-idle: 5 - maxActive: 200 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间，单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - # 打开PSCache，并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 - #filters: stat,wall,slf4j - filters: stat,slf4j - # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 - # connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 + url: jdbc:mysql://192.168.1.60:3306/ilsboot?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + username: root + password: 123456 + type: com.zaxxer.hikari.HikariDataSource + hikari: + minimum-idle: 1 + maximum-pool-size: 10 + auto-commit: true + idle-timeout: 30000 + pool-name: DatebookHikariCP + max-lifetime: 1800000 + connection-timeout: 30000 + connection-test-query: select 1 + + #redis 配置 redis: database: 9 @@ -52,35 +70,26 @@ spring: port: 6379 # rabbitmq 配置 rabbitmq: - virtual-host: / - host: localhost + host: 192.168.1.60 port: 5672 - username: guest - password: guest - mode: single # cluster 集群模式 - #超时时间 - connection-timeout: 10000s - #开启消息确认模式 - publisher-confirms: false - #开启消息送达提示 - publisher-returns: true - #开启不可达消息不会被broker给删除 - template: - mandatory: true - # 表示消息确认方式，其有三种配置方式，分别是none、manual和auto；默认auto + username: admin + password: admin + virtual-host: / listener: simple: - acknowledge-mode: auto - # 配置rabbitmq队列 - queues: - orderQueue: ilsOrderQueue #订单队列 + retry: + enabled: true + initial-interval: 10s + max-attempts: 3 + max-interval: 30s + multiplier: 2 # mybatis-plus 配置 mybatis-plus: - mapper-locations: mapper/*.xml + mapper-locations: classpath:mapper/**/*.xml configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl map-underscore-to-camel-case: true - type-aliases-package: org.ils.billing.entity + type-aliases-package: com.ils.oms.entity ## swagger文档的部分配置 #### knife4j: # 生产环境可改为 false（改为false后 swagger将不能使用） @@ -95,14 +104,16 @@ ils: baiduUrl: https://www.baidu.com # swagger 配置 swagger: + title: ILS OMS API + description: ILS OMS API + name: ILS OMS API + url: 127.0.0.1:8091/ + email: 123@qq.com + version: v1 + pkg: com.ils.oms.* enabled: true - title: ils 订单接口api - description: ils订单接口文档 - name: ils订单接口文档 - url: 127.0.0.1:9097/ - version: v1.0 - pkg: org.ils - email: 123qq.com + + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c64a441..5b22911 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: application: - name: ils-order-service + name: oms profiles: active: 'dev' \ No newline at end of file diff --git a/src/main/resources/mapper/IlsCustomerMapper.xml b/src/main/resources/oms/mapper/IlsCustomerMapper.xml similarity index 94% rename from src/main/resources/mapper/IlsCustomerMapper.xml rename to src/main/resources/oms/mapper/IlsCustomerMapper.xml index 12c24f8..62bb121 100644 --- a/src/main/resources/mapper/IlsCustomerMapper.xml +++ b/src/main/resources/oms/mapper/IlsCustomerMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/main/resources/mapper/IlsOrderAddressMapper.xml b/src/main/resources/oms/mapper/IlsOrderAddressMapper.xml similarity index 91% rename from src/main/resources/mapper/IlsOrderAddressMapper.xml rename to src/main/resources/oms/mapper/IlsOrderAddressMapper.xml index 5447c40..93eb3c9 100644 --- a/src/main/resources/mapper/IlsOrderAddressMapper.xml +++ b/src/main/resources/oms/mapper/IlsOrderAddressMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/main/resources/mapper/IlsOrderFeeMapper.xml b/src/main/resources/oms/mapper/IlsOrderFeeMapper.xml similarity index 89% rename from src/main/resources/mapper/IlsOrderFeeMapper.xml rename to src/main/resources/oms/mapper/IlsOrderFeeMapper.xml index 8822c86..7d042c0 100644 --- a/src/main/resources/mapper/IlsOrderFeeMapper.xml +++ b/src/main/resources/oms/mapper/IlsOrderFeeMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/main/resources/mapper/IlsOrderItemMapper.xml b/src/main/resources/oms/mapper/IlsOrderItemMapper.xml similarity index 93% rename from src/main/resources/mapper/IlsOrderItemMapper.xml rename to src/main/resources/oms/mapper/IlsOrderItemMapper.xml index dedc3ec..a629951 100644 --- a/src/main/resources/mapper/IlsOrderItemMapper.xml +++ b/src/main/resources/oms/mapper/IlsOrderItemMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/main/resources/mapper/IlsOrderLabelMapper.xml b/src/main/resources/oms/mapper/IlsOrderLabelMapper.xml similarity index 88% rename from src/main/resources/mapper/IlsOrderLabelMapper.xml rename to src/main/resources/oms/mapper/IlsOrderLabelMapper.xml index 450ddd0..d817ade 100644 --- a/src/main/resources/mapper/IlsOrderLabelMapper.xml +++ b/src/main/resources/oms/mapper/IlsOrderLabelMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/main/resources/mapper/IlsOrderMapper.xml b/src/main/resources/oms/mapper/IlsOrderMapper.xml similarity index 95% rename from src/main/resources/mapper/IlsOrderMapper.xml rename to src/main/resources/oms/mapper/IlsOrderMapper.xml index b0dfab4..cf7f4f6 100644 --- a/src/main/resources/mapper/IlsOrderMapper.xml +++ b/src/main/resources/oms/mapper/IlsOrderMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/main/resources/mapper/IlsOrderParcelMapper.xml b/src/main/resources/oms/mapper/IlsOrderParcelMapper.xml similarity index 90% rename from src/main/resources/mapper/IlsOrderParcelMapper.xml rename to src/main/resources/oms/mapper/IlsOrderParcelMapper.xml index 64ad6bb..99047f4 100644 --- a/src/main/resources/mapper/IlsOrderParcelMapper.xml +++ b/src/main/resources/oms/mapper/IlsOrderParcelMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/main/resources/mapper/IlsOrderUploadMapper.xml b/src/main/resources/oms/mapper/IlsOrderUploadMapper.xml similarity index 91% rename from src/main/resources/mapper/IlsOrderUploadMapper.xml rename to src/main/resources/oms/mapper/IlsOrderUploadMapper.xml index 1f8f87b..db1ce72 100644 --- a/src/main/resources/mapper/IlsOrderUploadMapper.xml +++ b/src/main/resources/oms/mapper/IlsOrderUploadMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/main/resources/mapper/IlsProductMapper.xml b/src/main/resources/oms/mapper/IlsProductMapper.xml similarity index 92% rename from src/main/resources/mapper/IlsProductMapper.xml rename to src/main/resources/oms/mapper/IlsProductMapper.xml index cef137e..21ba7fd 100644 --- a/src/main/resources/mapper/IlsProductMapper.xml +++ b/src/main/resources/oms/mapper/IlsProductMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/main/resources/mapper/IlsProductValidationMapper.xml b/src/main/resources/oms/mapper/IlsProductValidationMapper.xml similarity index 88% rename from src/main/resources/mapper/IlsProductValidationMapper.xml rename to src/main/resources/oms/mapper/IlsProductValidationMapper.xml index 03ac008..469f2e5 100644 --- a/src/main/resources/mapper/IlsProductValidationMapper.xml +++ b/src/main/resources/oms/mapper/IlsProductValidationMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/src/test/java/org/ils/order/RabbitMqHelloTest.java b/src/test/java/com/ils/oms/RabbitMqHelloTest.java similarity index 86% rename from src/test/java/org/ils/order/RabbitMqHelloTest.java rename to src/test/java/com/ils/oms/RabbitMqHelloTest.java index 4ad9c89..0b9b7ab 100644 --- a/src/test/java/org/ils/order/RabbitMqHelloTest.java +++ b/src/test/java/com/ils/oms/RabbitMqHelloTest.java @@ -1,10 +1,10 @@ -package org.ils.order; +package com.ils.oms; import cn.hutool.json.JSONObject; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import org.ils.order.properties.BaseConfigProperties; -import org.ils.order.listener.rabbitmq.RabbitSender; +import com.ils.oms.properties.BaseConfigProperties; +import com.ils.oms.listener.rabbitmq.RabbitSender; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/ils/order/RestTemplateTest.java b/src/test/java/com/ils/oms/RestTemplateTest.java similarity index 75% rename from src/test/java/org/ils/order/RestTemplateTest.java rename to src/test/java/com/ils/oms/RestTemplateTest.java index e163676..23c4212 100644 --- a/src/test/java/org/ils/order/RestTemplateTest.java +++ b/src/test/java/com/ils/oms/RestTemplateTest.java @@ -1,19 +1,16 @@ -package org.ils.order; +package com.ils.oms; -import com.z.common.util.RedisUtils; import lombok.extern.slf4j.Slf4j; -import org.ils.order.dto.dto.MainLinePageDto; -import org.ils.order.properties.BaseConfigProperties; -import org.ils.order.result.Result; -import org.ils.order.service.impl.MainLineServiceImpl; +import com.ils.oms.dto.MainLinePageDto; +import com.ils.oms.properties.BaseConfigProperties; +import com.ils.oms.result.Result; +import com.ils.oms.service.impl.MainLineServiceImpl; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; - @Slf4j @RunWith(SpringRunner.class)