swagger

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">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.ils.billing</groupId>
+    <groupId>com.ils.oms</groupId>
     <artifactId>ils-order-service</artifactId>
     <version>1.0</version>
 
     <properties>
+        <java.version>1.8</java.version>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
+
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+
         <z.common.version>1.0.0-SNAPSHOT</z.common.version>
-    </properties>
 
+        <apache.commons.lang3.version>3.12.0</apache.commons.lang3.version>
+        <apache.commons.collections.version>4.4</apache.commons.collections.version>
+        <google.guava.version>31.1-jre</google.guava.version>
+    </properties>
     <parent>
-        <groupId>org.springframework.boot</groupId>
+        <groupId>com.z</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
+        <artifactId>platform</artifactId>
-        <version>2.6.6</version>
+        <version>1.0.0-RELEASE</version>
-        <relativePath/>
     </parent>
+<!--    <parent>-->
+<!--        <groupId>org.springframework.boot</groupId>-->
+<!--        <artifactId>spring-boot-starter-parent</artifactId>-->
+<!--        <version>2.6.6</version>-->
+<!--        <relativePath/>-->
+<!--    </parent>-->
     <dependencies>
+        <dependency>
+            <groupId>com.z.common</groupId>
+            <artifactId>z-common-mysql</artifactId>
+            <version>${z.common.version}</version>
+        </dependency>
         <!-- Z common redis依赖 -->
         <dependency>
             <groupId>com.z.common</groupId>
@@ -46,6 +65,40 @@
             <artifactId>z-common-core</artifactId>
             <version>${z.common.version}</version>
         </dependency>
+
+        <!-- Apache commons -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${apache.commons.lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>${apache.commons.collections.version}</version>
+        </dependency>
+
+        <!-- Google guava -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${google.guava.version}</version>
+        </dependency>
+
+        <!-- efficiency -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- testing -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <!--打包成jar包时的名字-->
@@ -56,7 +109,7 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
                     <mainClass>
-                        org.ils.order.IlsOrderServiceApplication
+                        com.ils.oms.IlsOrderServiceApplication
                     </mainClass>
                 </configuration>
                 <executions>

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,
+        ZSwagger2Configuration.class,   // 加载api接口文档配置
-        ZRedisAutoConfiguration.class,
+        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);

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.*;
 

src/main/java/com/ils/oms/api/SomeApi.java

@@ -0,0 +1,4 @@
+package com.ils.oms.api;
+
+public interface SomeApi {
+}

src/main/java/com/ils/oms/appservice/SomeAppService.java

@@ -0,0 +1,4 @@
+package com.ils.oms.appservice;
+
+public class SomeAppService {
+}

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 com.ils.oms.common.CommonConstant;
-import org.ils.order.result.JwtVerifyResult;
+import com.ils.oms.utils.JwtUtil;
-import org.ils.order.common.CommonConstant;
+import com.ils.oms.utils.SpringContextUtils;
-import org.ils.order.utils.JwtUtil;
-import org.ils.order.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() {
     }
 

src/main/java/com/ils/oms/common/CommonConstant.java

@@ -1,4 +1,4 @@
-package org.ils.order.common;
+package com.ils.oms.common;
 
 /**
  * 通用常量

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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 com.ils.oms.dto.MainLinePageDto;
-import org.ils.order.result.Result;
+import com.ils.oms.result.Result;
-import org.ils.order.service.impl.MainLineServiceImpl;
+import com.ils.oms.service.impl.MainLineServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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());
+//    }
+//}

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());
 

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());
+//    }
+//}

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());
+//    }
+//}

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);
+//    }
+//}

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;
 
 /**

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

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
+//}

src/main/java/com/ils/oms/result/GlobalException.java

@@ -1,4 +1,4 @@
-package org.ils.order.result;
+package com.ils.oms.result;
 
 /**
  *

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;
 

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;
 

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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 com.ils.oms.dto.MainLineDto;
-import org.ils.order.dto.dto.MainLinePageDto;
+import com.ils.oms.dto.MainLinePageDto;
 
 /**
  * 计费引擎主线计费主线模型接口

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;

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 com.ils.oms.service.IIlsCustomerService;
-import org.ils.order.mapper.IlsCustomerMapper;
+import com.ils.oms.entity.IlsCustomerDO;
-import org.ils.order.service.IIlsCustomerService;
+import com.ils.oms.mapper.IlsCustomerMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

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 com.ils.oms.service.IIlsOrderAddressService;
-import org.ils.order.mapper.IlsOrderAddressMapper;
+import com.ils.oms.entity.IlsOrderAddressDO;
-import org.ils.order.service.IIlsOrderAddressService;
+import com.ils.oms.mapper.IlsOrderAddressMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

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 com.ils.oms.service.IIlsOrderFeeService;
-import org.ils.order.mapper.IlsOrderFeeMapper;
+import com.ils.oms.entity.IlsOrderFeeDO;
-import org.ils.order.service.IIlsOrderFeeService;
+import com.ils.oms.mapper.IlsOrderFeeMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

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 com.ils.oms.service.IIlsOrderItemService;
-import org.ils.order.mapper.IlsOrderItemMapper;
+import com.ils.oms.entity.IlsOrderItemDO;
-import org.ils.order.service.IIlsOrderItemService;
+import com.ils.oms.mapper.IlsOrderItemMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

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 com.ils.oms.service.IIlsOrderLabelService;
-import org.ils.order.mapper.IlsOrderLabelMapper;
+import com.ils.oms.entity.IlsOrderLabelDO;
-import org.ils.order.service.IIlsOrderLabelService;
+import com.ils.oms.mapper.IlsOrderLabelMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

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 com.ils.oms.service.IIlsOrderParcelService;
-import org.ils.order.mapper.IlsOrderParcelMapper;
+import com.ils.oms.entity.IlsOrderParcelDO;
-import org.ils.order.service.IIlsOrderParcelService;
+import com.ils.oms.mapper.IlsOrderParcelMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

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 com.ils.oms.service.IIlsOrderService;
-import org.ils.order.mapper.IlsOrderMapper;
+import com.ils.oms.entity.IlsOrderDO;
-import org.ils.order.service.IIlsOrderService;
+import com.ils.oms.mapper.IlsOrderMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

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 com.ils.oms.service.IIlsOrderUploadService;
-import org.ils.order.mapper.IlsOrderUploadMapper;
+import com.ils.oms.entity.IlsOrderUploadDO;
-import org.ils.order.service.IIlsOrderUploadService;
+import com.ils.oms.mapper.IlsOrderUploadMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

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 com.ils.oms.service.IIlsProductService;
-import org.ils.order.mapper.IlsProductMapper;
+import com.ils.oms.entity.IlsProductDO;
-import org.ils.order.service.IIlsProductService;
+import com.ils.oms.mapper.IlsProductMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

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 com.ils.oms.service.IIlsProductValidationService;
-import org.ils.order.mapper.IlsProductValidationMapper;
+import com.ils.oms.entity.IlsProductValidationDO;
-import org.ils.order.service.IIlsProductValidationService;
+import com.ils.oms.mapper.IlsProductValidationMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

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 com.ils.oms.entity.IlsMainLine;
-import org.ils.order.mapper.IlsMainLineMapper;
+import com.ils.oms.mapper.IlsMainLineMapper;
-import org.ils.order.dto.dto.MainLineDto;
+import com.ils.oms.dto.MainLineDto;
-import org.ils.order.dto.dto.MainLinePageDto;
+import com.ils.oms.dto.MainLinePageDto;
-import org.ils.order.result.Result;
+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;

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;

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;

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;

src/main/java/org/ils/order/config/WebMvcConfig.java

@@ -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/");
-    }
-}

src/main/java/org/ils/order/exceptions/GlobalExceptionHandler.java

@@ -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());
-    }
-}

src/main/java/org/ils/order/listener/rabbitmq/RabbitQueueConfig.java

@@ -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());
-    }
-}

src/main/java/org/ils/order/listener/rabbitmq/RabbitReceiver.java

@@ -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());
-    }
-}

src/main/java/org/ils/order/listener/rabbitmq/RabbitSender.java

@@ -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);
-    }
-}

src/main/java/org/ils/order/properties/BaseConfigProperties.java

@@ -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;
-}

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参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
+    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
-      initial-size: 50
+    type: com.zaxxer.hikari.HikariDataSource
-      min-idle: 5
+    hikari:
-      maxActive: 200
+      minimum-idle: 1
-      # 配置获取连接等待超时的时间
+      maximum-pool-size: 10
-      maxWait: 60000
+      auto-commit: true
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      idle-timeout: 30000
-      timeBetweenEvictionRunsMillis: 60000
+      pool-name: DatebookHikariCP
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      max-lifetime: 1800000
-      minEvictableIdleTimeMillis: 300000
+      connection-timeout: 30000
-      validationQuery: SELECT 1
+      connection-test-query: 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
   #redis 配置
   redis:
     database: 9
@@ -52,35 +70,26 @@ spring:
     port: 6379
   # rabbitmq 配置
   rabbitmq:
-    virtual-host: /
+    host: 192.168.1.60
-    host: localhost
     port: 5672
-    username: guest
+    username: admin
-    password: guest
+    password: admin
-    mode: single # cluster 集群模式
+    virtual-host: /
-    #超时时间
-    connection-timeout: 10000s
-    #开启消息确认模式
-    publisher-confirms: false
-    #开启消息送达提示
-    publisher-returns: true
-    #开启不可达消息不会被broker给删除
-    template:
-        mandatory: true
-    # 表示消息确认方式，其有三种配置方式，分别是none、manual和auto；默认auto
     listener:
       simple:
-        acknowledge-mode: auto
+        retry:
-    # 配置rabbitmq队列
+          enabled: true
-    queues:
+          initial-interval: 10s
-      orderQueue:  ilsOrderQueue #订单队列
+          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
 
 
 

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   application:
-    name: ils-order-service
+    name: oms
   profiles:
     active: 'dev'

src/main/resources/oms/mapper/IlsCustomerMapper.xml

@@ -1,9 +1,9 @@
 <?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="org.ils.order.mapper.IlsCustomerMapper">
+<mapper namespace="com.ils.oms.mapper.IlsCustomerMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.ils.order.entity.IlsCustomerDO">
+    <resultMap id="BaseResultMap" type="com.ils.oms.entity.IlsCustomerDO">
         <id column="id" property="id" />
         <result column="customer_id" property="customerId" />
         <result column="customer_name" property="customerName" />

src/main/resources/oms/mapper/IlsOrderAddressMapper.xml

@@ -1,9 +1,9 @@
 <?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="org.ils.order.mapper.IlsOrderAddressMapper">
+<mapper namespace="com.ils.oms.mapper.IlsOrderAddressMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.ils.order.entity.IlsOrderAddressDO">
+    <resultMap id="BaseResultMap" type="com.ils.oms.entity.IlsOrderAddressDO">
         <id column="id" property="id" />
         <result column="order_id" property="orderId" />
         <result column="con_code" property="conCode" />

src/main/resources/oms/mapper/IlsOrderFeeMapper.xml

@@ -1,9 +1,9 @@
 <?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="org.ils.order.mapper.IlsOrderFeeMapper">
+<mapper namespace="com.ils.oms.mapper.IlsOrderFeeMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.ils.order.entity.IlsOrderFeeDO">
+    <resultMap id="BaseResultMap" type="com.ils.oms.entity.IlsOrderFeeDO">
         <id column="id" property="id" />
         <result column="order_id" property="orderId" />
         <result column="con_code" property="conCode" />

src/main/resources/oms/mapper/IlsOrderItemMapper.xml

@@ -1,9 +1,9 @@
 <?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="org.ils.order.mapper.IlsOrderItemMapper">
+<mapper namespace="com.ils.oms.mapper.IlsOrderItemMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.ils.order.entity.IlsOrderItemDO">
+    <resultMap id="BaseResultMap" type="com.ils.oms.entity.IlsOrderItemDO">
         <id column="id" property="id" />
         <result column="order_id" property="orderId" />
         <result column="con_code" property="conCode" />

src/main/resources/oms/mapper/IlsOrderLabelMapper.xml

@@ -1,9 +1,9 @@
 <?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="org.ils.order.mapper.IlsOrderLabelMapper">
+<mapper namespace="com.ils.oms.mapper.IlsOrderLabelMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.ils.order.entity.IlsOrderLabelDO">
+    <resultMap id="BaseResultMap" type="com.ils.oms.entity.IlsOrderLabelDO">
         <id column="id" property="id" />
         <result column="order_id" property="orderId" />
         <result column="con_code" property="conCode" />

src/main/resources/oms/mapper/IlsOrderMapper.xml

@@ -1,9 +1,9 @@
 <?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="org.ils.order.mapper.IlsOrderMapper">
+<mapper namespace="com.ils.oms.mapper.IlsOrderMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.ils.order.entity.IlsOrderDO">
+    <resultMap id="BaseResultMap" type="com.ils.oms.entity.IlsOrderDO">
         <id column="id" property="id" />
         <result column="order_id" property="orderId" />
         <result column="con_code" property="conCode" />

src/main/resources/oms/mapper/IlsOrderParcelMapper.xml

@@ -1,9 +1,9 @@
 <?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="org.ils.order.mapper.IlsOrderParcelMapper">
+<mapper namespace="com.ils.oms.mapper.IlsOrderParcelMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.ils.order.entity.IlsOrderParcelDO">
+    <resultMap id="BaseResultMap" type="com.ils.oms.entity.IlsOrderParcelDO">
         <id column="id" property="id" />
         <result column="order_id" property="orderId" />
         <result column="parcel_code" property="parcelCode" />

src/main/resources/oms/mapper/IlsOrderUploadMapper.xml

@@ -1,9 +1,9 @@
 <?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="org.ils.order.mapper.IlsOrderUploadMapper">
+<mapper namespace="com.ils.oms.mapper.IlsOrderUploadMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.ils.order.entity.IlsOrderUploadDO">
+    <resultMap id="BaseResultMap" type="com.ils.oms.entity.IlsOrderUploadDO">
         <id column="id" property="id" />
         <result column="customer_id" property="customerId" />
         <result column="customer_name" property="customerName" />

src/main/resources/oms/mapper/IlsProductMapper.xml

@@ -1,9 +1,9 @@
 <?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="org.ils.order.mapper.IlsProductMapper">
+<mapper namespace="com.ils.oms.mapper.IlsProductMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.ils.order.entity.IlsProductDO">
+    <resultMap id="BaseResultMap" type="com.ils.oms.entity.IlsProductDO">
         <id column="id" property="id" />
         <result column="product_code" property="productCode" />
         <result column="product_name_cn" property="productNameCn" />

src/main/resources/oms/mapper/IlsProductValidationMapper.xml

@@ -1,9 +1,9 @@
 <?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="org.ils.order.mapper.IlsProductValidationMapper">
+<mapper namespace="com.ils.oms.mapper.IlsProductValidationMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.ils.order.entity.IlsProductValidationDO">
+    <resultMap id="BaseResultMap" type="com.ils.oms.entity.IlsProductValidationDO">
         <id column="id" property="id" />
         <result column="product_code" property="productCode" />
         <result column="rule_entity" property="ruleEntity" />

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 com.ils.oms.properties.BaseConfigProperties;
-import org.ils.order.listener.rabbitmq.RabbitSender;
+import com.ils.oms.listener.rabbitmq.RabbitSender;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

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 com.ils.oms.dto.MainLinePageDto;
-import org.ils.order.properties.BaseConfigProperties;
+import com.ils.oms.properties.BaseConfigProperties;
-import org.ils.order.result.Result;
+import com.ils.oms.result.Result;
-import org.ils.order.service.impl.MainLineServiceImpl;
+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)