Merge branch 'backup'

# Conflicts: # framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java # framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java # framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java # framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java
2021-07-22 12:07:22 +08:00
parent 0ccdc94644 bc6abdbf1a
commit fdb55bc426
354 changed files with 648 additions and 910 deletions
--- a/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java
@@ -1,8 +1,7 @@
 package cn.lili.controller.goods;


-import cn.lili.common.enums.ResultCode;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
--- a/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java
@@ -2,7 +2,7 @@ package cn.lili.controller.goods;


 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java
@@ -3,7 +3,7 @@ package cn.lili.controller.member;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dos.MemberGrade;
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.member;

 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dos.MemberNoticeLog;
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.member;

 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
--- a/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java
@@ -1,6 +1,6 @@
 package cn.lili.controller.other;

-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
--- a/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.other;

 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.system.entity.dos.SensitiveWords;
--- a/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.other;

 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.page.entity.dos.Special;
--- a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.other;

 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
--- a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
@@ -5,11 +5,11 @@ import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.token.Token;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.common.security.token.Token;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
-import cn.lili.common.verification.enums.VerificationEnums;
-import cn.lili.common.verification.service.VerificationService;
+import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.service.VerificationService;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
--- a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.permission;

 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
 import cn.lili.modules.permission.entity.dos.Department;
--- a/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java
@@ -1,7 +1,6 @@
 package cn.lili.controller.permission;

-import cn.lili.common.enums.ResultCode;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
--- a/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java
@@ -3,7 +3,7 @@ package cn.lili.controller.promotion;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.promotion.entity.dos.CouponActivity;
--- a/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java
@@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
--- a/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java
@@ -7,7 +7,7 @@ import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.promotion.entity.dos.Pintuan;
 import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.entity.vos.PintuanSearchParams;
 import cn.lili.modules.promotion.entity.vos.PintuanVO;
 import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams;
--- a/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java
@@ -2,7 +2,7 @@ package cn.lili.controller.setting;

 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
--- a/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java
@@ -1,7 +1,6 @@
 package cn.lili.controller.setting;

-import cn.lili.common.enums.ResultCode;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
--- a/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java
@@ -1,7 +1,6 @@
 package cn.lili.controller.setting;

-import cn.lili.common.enums.ResultCode;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
--- a/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java
@@ -1,8 +1,7 @@
 package cn.lili.controller.setting;

-import cn.lili.common.enums.ResultCode;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
--- a/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.setting;

 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
--- a/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java
@@ -1,7 +1,6 @@
 package cn.lili.controller.setting;

-import cn.lili.common.enums.ResultCode;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
--- a/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.setting;

 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
--- a/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.setting;

 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.message.entity.dos.WechatMessage;
--- a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java
@@ -1,7 +1,6 @@
 package cn.lili.controller.trade;

-import cn.lili.common.enums.ResultCode;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
--- a/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java
@@ -1,6 +1,6 @@
 package cn.lili.controller.trade;

-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
--- a/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java
@@ -1,6 +1,6 @@
 package cn.lili.controller.trade;

-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
--- a/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java
@@ -1,6 +1,6 @@
 package cn.lili.controller.trade;

-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
--- a/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java
+++ b/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java
@@ -1,12 +1,12 @@
 package cn.lili.security;

 import cn.hutool.core.util.StrUtil;
-import cn.lili.common.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.Cache;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.SecurityEnum;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.token.SecretKeyUtil;
+import cn.lili.common.security.token.SecretKeyUtil;
 import cn.lili.common.utils.ResponseUtil;
 import com.google.gson.Gson;
 import io.jsonwebtoken.Claims;
--- a/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java
+++ b/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java
@@ -1,8 +1,8 @@
 package cn.lili.security;

-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.security.CustomAccessDeniedHandler;
-import cn.lili.config.properties.IgnoredUrlsProperties;
+import cn.lili.common.properties.IgnoredUrlsProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
--- a/manager-api/src/main/resources/application.yml
+++ b/manager-api/src/main/resources/application.yml
@@ -115,9 +115,9 @@ spring:
    #            standard:
    #              sharding-column: create_time
    #              #分表策略
-    #              precise-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
+    #              precise-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
    #              #范围查询实现
-    #              range-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
+    #              range-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
    props:
      #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
      sql:
--- a/manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java
+++ b/manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java
@@ -1,7 +1,7 @@
 package cn.lili.test.CacheTest;

-import cn.lili.common.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.Cache;
+import cn.lili.cache.CachePrefix;
 import cn.lili.modules.statistics.util.StatisticsSuffix;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
--- a/manager-api/src/test/java/cn/lili/test/promotion/CouponTest.java
+++ b/manager-api/src/test/java/cn/lili/test/promotion/CouponTest.java
@@ -1,7 +1,8 @@
 package cn.lili.test.promotion;

+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
 import cn.lili.modules.goods.service.GoodsSkuService;
 import cn.lili.modules.promotion.entity.dos.Coupon;
--- a/manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java
+++ b/manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java
@@ -8,7 +8,7 @@ import cn.lili.modules.goods.service.GoodsSkuService;
 import cn.lili.modules.promotion.entity.dos.FullDiscount;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.entity.vos.FullDiscountSearchParams;
 import cn.lili.modules.promotion.service.FullDiscountService;
 import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
--- a/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java
+++ b/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java
@@ -6,7 +6,7 @@ import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.promotion.entity.dto.BasePromotion;
 import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.service.PromotionPriceService;
 import cn.lili.modules.promotion.service.PromotionService;
 import cn.lili.modules.promotion.service.PromotionGoodsService;
--- a/manager-api/src/test/java/cn/lili/test/rocketmq/MsgExtRocketMqTest.java
+++ b/manager-api/src/test/java/cn/lili/test/rocketmq/MsgExtRocketMqTest.java
@@ -1,8 +1,8 @@
 package cn.lili.test.rocketmq;

-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.MqOrderTagsEnum;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.MqOrderTagsEnum;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;