批量调整目录结构

buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java

@@ -2,7 +2,7 @@ package cn.lili.controller.passport;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.sms.SmsUtil;
+import cn.lili.modules.system.sms.SmsUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.modules.verification.enums.VerificationEnums;
 import cn.lili.modules.verification.service.VerificationService;

buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java

@@ -1,8 +1,8 @@
 package cn.lili.security;
 
 import cn.hutool.core.util.StrUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+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;

buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java

@@ -1,9 +1,9 @@
 package cn.lili.security;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.security.CustomAccessDeniedHandler;
 import cn.lili.common.utils.SpringContextUtil;
-import cn.lili.config.properties.IgnoredUrlsProperties;
+import cn.lili.common.config.properties.IgnoredUrlsProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;

buyer-api/src/main/resources/application.yml

@@ -118,9 +118,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:

buyer-api/src/test/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:

common-api/src/main/java/cn/lili/controller/common/FileController.java

@@ -1,6 +1,6 @@
 package cn.lili.controller.common;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;

common-api/src/main/java/cn/lili/controller/common/SliderImageController.java

@@ -1,6 +1,6 @@
 package cn.lili.controller.common;
 
-import cn.lili.common.cache.limit.annotation.LimitPoint;
+import cn.lili.cache.limit.annotation.LimitPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.enums.ResultUtil;

common-api/src/main/java/cn/lili/controller/common/SmsController.java

@@ -1,9 +1,9 @@
 package cn.lili.controller.common;
 
-import cn.lili.common.cache.limit.annotation.LimitPoint;
+import cn.lili.cache.limit.annotation.LimitPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.sms.SmsUtil;
+import cn.lili.modules.system.sms.SmsUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.modules.verification.enums.VerificationEnums;
 import cn.lili.modules.verification.service.VerificationService;

common-api/src/main/java/cn/lili/controller/common/UploadController.java

@@ -1,7 +1,7 @@
 package cn.lili.controller.common;
 
 import cn.hutool.core.util.StrUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
@@ -12,7 +12,7 @@ import cn.lili.common.utils.CommonUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.config.properties.SystemSetting;
+import cn.lili.common.config.properties.SystemSetting;
 import cn.lili.modules.file.entity.File;
 import cn.lili.modules.file.plugin.FileManagerPlugin;
 import cn.lili.modules.file.service.FileService;

common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java

@@ -1,8 +1,8 @@
 package cn.lili.controller.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.config.properties.IgnoredUrlsProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;

common-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:

config/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:

consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java

@@ -1,7 +1,7 @@
 package cn.lili.event.impl;
 
 import cn.hutool.core.convert.Convert;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.event.OrderStatusChangeEvent;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.service.GoodsSkuService;

consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java

@@ -1,7 +1,7 @@
 package cn.lili.listener;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.rocketmq.tags.AfterSaleTagsEnum;
+import cn.lili.rocketmq.tags.AfterSaleTagsEnum;
 import cn.lili.event.AfterSaleStatusChangeEvent;
 import cn.lili.modules.order.order.entity.dos.AfterSale;
 import lombok.extern.slf4j.Slf4j;

consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java

@@ -1,7 +1,7 @@
 package cn.lili.listener;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.rocketmq.tags.GoodsTagsEnum;
+import cn.lili.rocketmq.tags.GoodsTagsEnum;
 import cn.lili.event.GoodsCommentCompleteEvent;
 import cn.lili.modules.distribution.entity.dos.DistributionGoods;
 import cn.lili.modules.distribution.entity.dos.DistributionSelectedGoods;

consumer/src/main/java/cn/lili/listener/MemberMessageListener.java

@@ -1,7 +1,7 @@
 package cn.lili.listener;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.rocketmq.tags.MemberTagsEnum;
+import cn.lili.rocketmq.tags.MemberTagsEnum;
 import cn.lili.event.MemberPointChangeEvent;
 import cn.lili.event.MemberRegisterEvent;
 import cn.lili.event.MemberWithdrawalEvent;

consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java

@@ -2,8 +2,8 @@ package cn.lili.listener;
 
 import cn.hutool.json.JSONUtil;
 import cn.lili.common.enums.SwitchEnum;
-import cn.lili.common.rocketmq.tags.OtherTagsEnum;
+import cn.lili.rocketmq.tags.OtherTagsEnum;
-import cn.lili.common.sms.SmsUtil;
+import cn.lili.modules.system.sms.SmsUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.vo.MemberSearchVO;

consumer/src/main/java/cn/lili/listener/OrderMessageListener.java

@@ -1,8 +1,8 @@
 package cn.lili.listener;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
-import cn.lili.common.rocketmq.tags.MqOrderTagsEnum;
+import cn.lili.rocketmq.tags.MqOrderTagsEnum;
 import cn.lili.event.OrderStatusChangeEvent;
 import cn.lili.event.TradeEvent;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;

consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java

@@ -1,9 +1,9 @@
 package cn.lili.timetask.handler.impl.statistics;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.config.properties.StatisticsProperties;
+import cn.lili.common.config.properties.StatisticsProperties;
 import cn.lili.modules.statistics.model.vo.OnlineMemberVO;
 import cn.lili.timetask.handler.EveryHourExecute;
 import org.springframework.beans.factory.annotation.Autowired;

consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java

@@ -1,8 +1,8 @@
 package cn.lili.timetask.handler.impl.view;
 
 import cn.hutool.core.convert.Convert;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.modules.statistics.model.dos.PlatformViewData;
 import cn.lili.modules.statistics.service.PlatformViewDataService;

consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java

@@ -1,7 +1,7 @@
 package cn.lili.trigger;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.utils.ThreadPoolUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java

@@ -1,9 +1,9 @@
 package cn.lili.trigger;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.model.TimeTriggerMsg;
-import cn.lili.common.trigger.util.DelayQueueTools;
+import cn.lili.trigger.util.DelayQueueTools;
 import cn.lili.common.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;

consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java

@@ -2,7 +2,7 @@ package cn.lili.trigger.executor;
 
 import cn.hutool.json.JSONUtil;
 import cn.lili.common.delayqueue.BroadcastMessage;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeExecuteConstant;
 import cn.lili.modules.goods.service.StudioService;
 import cn.lili.trigger.TimeTriggerExecutor;
 import lombok.extern.slf4j.Slf4j;

consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java

@@ -1,13 +1,13 @@
 package cn.lili.trigger.executor;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.interfaces.TimeTrigger;
 import cn.lili.trigger.TimeTriggerExecutor;
-import cn.lili.common.trigger.message.PintuanOrderMessage;
+import cn.lili.trigger.message.PintuanOrderMessage;
-import cn.lili.common.trigger.message.PromotionMessage;
+import cn.lili.trigger.message.PromotionMessage;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeExecuteConstant;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.model.TimeTriggerMsg;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
 import cn.lili.modules.promotion.service.PromotionService;

consumer/src/main/java/cn/lili/trigger/listen/PromotionDelayQueueListen.java

@@ -1,9 +1,9 @@
 package cn.lili.trigger.listen;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.trigger.enums.DelayQueueEnums;
+import cn.lili.trigger.enums.DelayQueueEnums;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.model.TimeTriggerMsg;
 import cn.lili.trigger.AbstractDelayQueueListen;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

consumer/src/main/resources/application.yml

@@ -118,9 +118,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:

framework/src/main/java/cn/lili/cache/Cache.java

@@ -1,4 +1,4 @@
-package cn.lili.common.cache;
+package cn.lili.cache;
 
 
 import org.springframework.data.redis.core.ZSetOperations;

framework/src/main/java/cn/lili/cache/CachePrefix.java

@@ -1,4 +1,4 @@
-package cn.lili.common.cache;
+package cn.lili.cache;
 
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;

framework/src/main/java/cn/lili/cache/MybatisRedisCache.java

@@ -1,4 +1,4 @@
-package cn.lili.common.cache;
+package cn.lili.cache;
 
 import cn.lili.common.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;

framework/src/main/java/cn/lili/cache/config/mongo/MongoConfig.java

@@ -1,4 +1,4 @@
-package cn.lili.config.mongo;
+package cn.lili.cache.config.mongo;
 
 import com.mongodb.MongoClientSettings;
 import com.mongodb.MongoCredential;

framework/src/main/java/cn/lili/cache/config/redis/FastJsonRedisSerializer.java

@@ -1,4 +1,4 @@
-package cn.lili.config.cache;
+package cn.lili.cache.config.redis;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;

framework/src/main/java/cn/lili/cache/config/redis/RedisConfig.java

@@ -1,4 +1,4 @@
-package cn.lili.config.cache;
+package cn.lili.cache.config.redis;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.parser.ParserConfig;

framework/src/main/java/cn/lili/cache/impl/RedisCache.java

@@ -1,6 +1,6 @@
-package cn.lili.common.cache.impl;
+package cn.lili.cache.impl;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.RedisConnection;

framework/src/main/java/cn/lili/cache/limit/annotation/LimitPoint.java

@@ -1,7 +1,7 @@
-package cn.lili.common.cache.limit.annotation;
+package cn.lili.cache.limit.annotation;
 
 
-import cn.lili.common.cache.limit.enums.LimitTypeEnums;
+import cn.lili.cache.limit.enums.LimitTypeEnums;
 
 import java.lang.annotation.*;
 

framework/src/main/java/cn/lili/cache/limit/enums/LimitTypeEnums.java

@@ -1,4 +1,4 @@
-package cn.lili.common.cache.limit.enums;
+package cn.lili.cache.limit.enums;
 
 
 /**

framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java

@@ -1,7 +1,7 @@
-package cn.lili.common.cache.limit.interceptor;
+package cn.lili.cache.limit.interceptor;
 
-import cn.lili.common.cache.limit.enums.LimitTypeEnums;
+import cn.lili.cache.limit.enums.LimitTypeEnums;
-import cn.lili.common.cache.limit.annotation.LimitPoint;
+import cn.lili.cache.limit.annotation.LimitPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import com.google.common.collect.ImmutableList;

framework/src/main/java/cn/lili/common/config/context/ContextConfiguration.java

@@ -1,4 +1,4 @@
-package cn.lili.config.context;
+package cn.lili.common.config.context;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;

framework/src/main/java/cn/lili/common/config/context/ThreadContextHolder.java

@@ -1,4 +1,4 @@
-package cn.lili.config.context;
+package cn.lili.common.config.context;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

framework/src/main/java/cn/lili/common/config/context/ThreadContextHolderInterceptorAdapter.java

@@ -1,4 +1,4 @@
-package cn.lili.config.context;
+package cn.lili.common.config.context;
 
 import org.springframework.lang.Nullable;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;

framework/src/main/java/cn/lili/common/config/interceptor/RequestInterceptorAdapter.java

@@ -1,6 +1,6 @@
-package cn.lili.config.interceptor;
+package cn.lili.common.config.interceptor;
 
-import cn.lili.config.context.ThreadContextHolder;
+import cn.lili.common.config.context.ThreadContextHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.ModelAndView;

framework/src/main/java/cn/lili/common/config/interceptor/UrlConfiguration.java

@@ -1,6 +1,6 @@
-package cn.lili.config.interceptor;
+package cn.lili.common.config.interceptor;
 
-import cn.lili.config.properties.IgnoredUrlsProperties;
+import cn.lili.common.config.properties.IgnoredUrlsProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistration;

framework/src/main/java/cn/lili/common/config/properties/ApiProperties.java

@@ -1,4 +1,4 @@
-package cn.lili.config.properties;
+package cn.lili.common.config.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

framework/src/main/java/cn/lili/common/config/properties/DomainProperties.java

@@ -1,4 +1,4 @@
-package cn.lili.config.properties;
+package cn.lili.common.config.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

framework/src/main/java/cn/lili/common/config/properties/IgnoredUrlsProperties.java

@@ -1,4 +1,4 @@
-package cn.lili.config.properties;
+package cn.lili.common.config.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

framework/src/main/java/cn/lili/common/config/properties/JWTTokenProperties.java

@@ -1,4 +1,4 @@
-package cn.lili.config.properties;
+package cn.lili.common.config.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

framework/src/main/java/cn/lili/common/config/properties/SmsTemplateSetting.java

@@ -1,4 +1,4 @@
-package cn.lili.config.properties;
+package cn.lili.common.config.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

framework/src/main/java/cn/lili/common/config/properties/StatisticsProperties.java

@@ -1,4 +1,4 @@
-package cn.lili.config.properties;
+package cn.lili.common.config.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

framework/src/main/java/cn/lili/common/config/properties/SystemSetting.java

@@ -1,4 +1,4 @@
-package cn.lili.config.properties;
+package cn.lili.common.config.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

framework/src/main/java/cn/lili/common/config/properties/ThreadProperties.java

@@ -1,4 +1,4 @@
-package cn.lili.config.properties;
+package cn.lili.common.config.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

framework/src/main/java/cn/lili/common/config/rocketmq/RocketmqCustomProperties.java

@@ -1,4 +1,4 @@
-package cn.lili.config.rocketmq;
+package cn.lili.common.config.rocketmq;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

framework/src/main/java/cn/lili/common/config/swagger/Swagger2Config.java

@@ -1,4 +1,4 @@
-package cn.lili.config.swagger;
+package cn.lili.common.config.swagger;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;

framework/src/main/java/cn/lili/common/config/thread/ThreadConfig.java

@@ -1,6 +1,6 @@
-package cn.lili.config.thread;
+package cn.lili.common.config.thread;
 
-import cn.lili.config.properties.ThreadProperties;
+import cn.lili.common.config.properties.ThreadProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.AsyncConfigurer;

framework/src/main/java/cn/lili/common/config/websocket/WebSocketStompConfig.java

@@ -1,4 +1,4 @@
-package cn.lili.config.websocket;
+package cn.lili.common.config.websocket;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.simp.config.MessageBrokerRegistry;

framework/src/main/java/cn/lili/common/security/context/UserContext.java

@@ -1,6 +1,6 @@
 package cn.lili.common.security.context;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;

framework/src/main/java/cn/lili/common/security/token/TokenUtil.java

@@ -1,13 +1,13 @@
 package cn.lili.common.security.token;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.SecurityEnum;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.config.properties.JWTTokenProperties;
+import cn.lili.common.config.properties.JWTTokenProperties;
 import com.google.gson.Gson;
 import io.jsonwebtoken.*;
 import io.jsonwebtoken.security.SignatureException;

framework/src/main/java/cn/lili/common/security/token/base/generate/ManagerTokenGenerate.java

@@ -1,7 +1,7 @@
 package cn.lili.common.security.token.base.generate;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.security.token.PermissionEnum;

framework/src/main/java/cn/lili/common/security/token/base/generate/MemberTokenGenerate.java

@@ -5,7 +5,7 @@ import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.security.token.Token;
 import cn.lili.common.security.token.TokenUtil;
 import cn.lili.common.security.token.base.AbstractTokenGenerate;
-import cn.lili.config.context.ThreadContextHolder;
+import cn.lili.common.config.context.ThreadContextHolder;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.service.MemberService;

framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java

@@ -1,7 +1,7 @@
-package cn.lili.common.elasticsearch;
+package cn.lili.elasticsearch;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.lili.config.elasticsearch.ElasticsearchProperties;
+import cn.lili.elasticsearch.config.ElasticsearchProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.api.Assertions;
 import org.elasticsearch.ElasticsearchException;

framework/src/main/java/cn/lili/elasticsearch/EsSuffix.java

@@ -1,4 +1,4 @@
-package cn.lili.common.elasticsearch;
+package cn.lili.elasticsearch;
 
 /**
  * elasticsearch 索引后缀

framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java

@@ -1,4 +1,4 @@
-package cn.lili.config.elasticsearch;
+package cn.lili.elasticsearch.config;
 
 import cn.hutool.core.convert.Convert;
 import lombok.RequiredArgsConstructor;

framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchProperties.java

@@ -1,4 +1,4 @@
-package cn.lili.config.elasticsearch;
+package cn.lili.elasticsearch.config;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

framework/src/main/java/cn/lili/modules/connect/request/AuthAlipayRequest.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.connect.request;
 
 import cn.hutool.core.convert.Convert;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.utils.UrlBuilder;
 import cn.lili.modules.connect.config.AuthConfig;

framework/src/main/java/cn/lili/modules/connect/request/AuthDefaultRequest.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.connect.request;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.utils.UrlBuilder;
 import cn.lili.modules.connect.config.AuthConfig;

framework/src/main/java/cn/lili/modules/connect/request/AuthQQRequest.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.connect.request;
 
 import cn.hutool.core.convert.Convert;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.utils.UrlBuilder;
 import cn.lili.modules.connect.config.AuthConfig;

framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatPCRequest.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.connect.request;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.utils.UrlBuilder;
 import cn.lili.modules.connect.config.AuthConfig;
 import cn.lili.modules.connect.config.ConnectAuthEnum;

framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatRequest.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.connect.request;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.utils.UrlBuilder;
 import cn.lili.modules.connect.config.AuthConfig;
 import cn.lili.modules.connect.config.ConnectAuthEnum;

framework/src/main/java/cn/lili/modules/connect/request/AuthWeiboRequest.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.connect.request;
 
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.utils.UrlBuilder;
 import cn.lili.modules.connect.config.AuthConfig;

framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.connect.service;
 
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.security.token.Token;
 import cn.lili.modules.connect.entity.Connect;
 import cn.lili.modules.connect.entity.dto.ConnectAuthUser;

framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java

@@ -2,8 +2,8 @@ package cn.lili.modules.connect.serviceimpl;
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
@@ -12,7 +12,7 @@ import cn.lili.common.security.token.Token;
 import cn.lili.common.security.token.base.generate.MemberTokenGenerate;
 import cn.lili.common.utils.CookieUtil;
 import cn.lili.common.utils.StringUtils;
-import cn.lili.config.context.ThreadContextHolder;
+import cn.lili.common.config.context.ThreadContextHolder;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.connect.entity.Connect;
 import cn.lili.modules.connect.entity.dto.ConnectAuthUser;

framework/src/main/java/cn/lili/modules/connect/util/AuthChecker.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.connect.util;
 
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.modules.connect.config.AuthConfig;
 import cn.lili.modules.connect.config.ConnectAuth;
 import cn.lili.modules.connect.config.ConnectAuthEnum;

framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java

@@ -1,15 +1,15 @@
 package cn.lili.modules.connect.util;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.token.Token;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.config.properties.ApiProperties;
+import cn.lili.common.config.properties.ApiProperties;
-import cn.lili.config.properties.DomainProperties;
+import cn.lili.common.config.properties.DomainProperties;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.connect.config.AuthConfig;
 import cn.lili.modules.connect.config.ConnectAuthEnum;

framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java

@@ -2,13 +2,13 @@ package cn.lili.modules.distribution.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.MemberTagsEnum;
+import cn.lili.rocketmq.tags.MemberTagsEnum;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.common.utils.PageUtil;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.distribution.entity.dos.Distribution;
 import cn.lili.modules.distribution.entity.dos.DistributionCash;
 import cn.lili.modules.distribution.entity.enums.DistributionCashStatusEnum;

framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java

@@ -1,8 +1,8 @@
 package cn.lili.modules.distribution.serviceimpl;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;

framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.service;
 
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.modules.goods.entity.dos.Goods;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.entity.dto.GoodsSearchParams;

framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java

@@ -1,8 +1,8 @@
 package cn.lili.modules.goods.serviceimpl;
 
 import cn.hutool.core.util.StrUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.modules.goods.entity.dos.Category;

framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java

@@ -6,13 +6,13 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.json.JSONUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.GoodsTagsEnum;
+import cn.lili.rocketmq.tags.GoodsTagsEnum;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.utils.PageUtil;
 import cn.lili.common.utils.StringUtils;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.Category;
 import cn.lili.modules.goods.entity.dos.Goods;
 import cn.lili.modules.goods.entity.dos.GoodsGallery;

framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java

@@ -4,15 +4,15 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.GoodsTagsEnum;
+import cn.lili.rocketmq.tags.GoodsTagsEnum;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.utils.PageUtil;
 import cn.lili.common.utils.StringUtils;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.Goods;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;

framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java

@@ -7,16 +7,16 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.trigger.enums.DelayTypeEnums;
+import cn.lili.trigger.enums.DelayTypeEnums;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeExecuteConstant;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.model.TimeTriggerMsg;
-import cn.lili.common.trigger.util.DelayQueueTools;
+import cn.lili.trigger.util.DelayQueueTools;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.DateUtil;
 import cn.lili.common.utils.PageUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.Studio;
 import cn.lili.modules.goods.entity.dos.StudioCommodity;
 import cn.lili.modules.goods.entity.enums.StudioStatusEnum;

framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java

@@ -3,12 +3,12 @@ package cn.lili.modules.member.serviceimpl;
 import cn.hutool.json.JSONUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.GoodsTagsEnum;
+import cn.lili.rocketmq.tags.GoodsTagsEnum;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.utils.PageUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.member.entity.dos.GoodsCollection;
 import cn.lili.modules.member.entity.vo.GoodsCollectionVO;
 import cn.lili.modules.member.mapper.GoodsCollectionMapper;

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java

@@ -6,13 +6,13 @@ import cn.hutool.json.JSONUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.SwitchEnum;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.GoodsTagsEnum;
+import cn.lili.rocketmq.tags.GoodsTagsEnum;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.utils.PageUtil;
 import cn.lili.common.utils.StringUtils;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.service.GoodsSkuService;
 import cn.lili.modules.member.entity.dos.Member;

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java

@@ -2,13 +2,13 @@ package cn.lili.modules.member.serviceimpl;
 
 
 import cn.hutool.core.convert.Convert;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.SwitchEnum;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.MemberTagsEnum;
+import cn.lili.rocketmq.tags.MemberTagsEnum;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.token.Token;
@@ -16,8 +16,8 @@ import cn.lili.common.security.token.base.generate.MemberTokenGenerate;
 import cn.lili.common.security.token.base.generate.StoreTokenGenerate;
 import cn.lili.common.utils.*;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.context.ThreadContextHolder;
+import cn.lili.common.config.context.ThreadContextHolder;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.connect.config.ConnectAuthEnum;
 import cn.lili.modules.connect.entity.Connect;
 import cn.lili.modules.connect.entity.dto.ConnectAuthUser;

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java

@@ -2,14 +2,14 @@ package cn.lili.modules.member.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.MemberTagsEnum;
+import cn.lili.rocketmq.tags.MemberTagsEnum;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.common.utils.DateUtil;
 import cn.lili.common.utils.StringUtils;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.member.entity.dos.MemberSign;
 import cn.lili.modules.member.mapper.MemberSignMapper;
 import cn.lili.modules.member.service.MemberService;

framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java

@@ -1,10 +1,10 @@
 package cn.lili.modules.message.serviceimpl;
 
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.OtherTagsEnum;
+import cn.lili.rocketmq.tags.OtherTagsEnum;
 import cn.lili.common.utils.PageUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.message.entity.dos.Message;
 import cn.lili.modules.message.entity.vos.MessageVO;
 import cn.lili.modules.message.mapper.MessageMapper;

framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java

@@ -1,10 +1,10 @@
 package cn.lili.modules.message.serviceimpl;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.OtherTagsEnum;
+import cn.lili.rocketmq.tags.OtherTagsEnum;
 import cn.lili.common.utils.BeanUtil;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.message.entity.dos.SmsReach;
 import cn.lili.modules.message.entity.dto.SmsReachDTO;
 import cn.lili.modules.message.mapper.SmsReachMapper;
@@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 

framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java

@@ -2,7 +2,7 @@ package cn.lili.modules.message.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.sms.AliSmsUtil;
+import cn.lili.modules.system.sms.AliSmsUtil;
 import cn.lili.common.utils.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.message.entity.dos.SmsSign;

framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.message.serviceimpl;
 
-import cn.lili.common.sms.AliSmsUtil;
+import cn.lili.modules.system.sms.AliSmsUtil;
 import cn.lili.common.utils.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.message.entity.dos.SmsTemplate;

framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java

@@ -2,8 +2,8 @@ package cn.lili.modules.message.util;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.enums.ClientTypeEnum;

framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java

@@ -1,12 +1,11 @@
 package cn.lili.modules.order.cart.render.impl;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
 import cn.lili.modules.order.cart.entity.vo.CartSkuVO;
 import cn.lili.modules.order.cart.render.CartRenderStep;
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;

framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.order.cart.service;
 
 import cn.hutool.core.text.CharSequenceUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java

@@ -5,14 +5,14 @@ import cn.hutool.json.JSONUtil;
 import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.AfterSaleTagsEnum;
+import cn.lili.rocketmq.tags.AfterSaleTagsEnum;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.utils.*;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.order.order.aop.AfterSaleLogPoint;
 import cn.lili.modules.order.order.entity.dos.AfterSale;
 import cn.lili.modules.order.order.entity.dos.Order;

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java

@@ -9,25 +9,25 @@ import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
-import cn.lili.common.trigger.util.DelayQueueTools;
+import cn.lili.trigger.util.DelayQueueTools;
-import cn.lili.common.trigger.enums.DelayTypeEnums;
+import cn.lili.trigger.enums.DelayTypeEnums;
-import cn.lili.common.trigger.message.PintuanOrderMessage;
+import cn.lili.trigger.message.PintuanOrderMessage;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.GoodsTagsEnum;
+import cn.lili.rocketmq.tags.GoodsTagsEnum;
-import cn.lili.common.rocketmq.tags.MqOrderTagsEnum;
+import cn.lili.rocketmq.tags.MqOrderTagsEnum;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeExecuteConstant;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.model.TimeTriggerMsg;
 import cn.lili.common.utils.OperationalJudgment;
 import cn.lili.common.utils.PageUtil;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage;
 import cn.lili.modules.goods.service.GoodsSkuService;

framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.page.serviceimpl;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.StringUtils;

framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java

@@ -10,7 +10,7 @@ import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.config.properties.ApiProperties;
+import cn.lili.common.config.properties.ApiProperties;
 import cn.lili.modules.payment.entity.RefundLog;
 import cn.lili.modules.payment.kit.CashierSupport;
 import cn.lili.modules.payment.kit.Payment;

framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java

@@ -5,8 +5,8 @@ import cn.hutool.core.net.URLEncoder;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
@@ -15,7 +15,7 @@ import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.config.properties.ApiProperties;
+import cn.lili.common.config.properties.ApiProperties;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.connect.entity.Connect;
 import cn.lili.modules.connect.entity.enums.ConnectEnum;

framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.promotion.service;
 
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO;

framework/src/main/java/cn/lili/modules/promotion/service/PromotionService.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.promotion.service;
 
-import cn.lili.common.trigger.message.PromotionMessage;
+import cn.lili.trigger.message.PromotionMessage;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
 
 import java.util.Map;

framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java

@@ -3,14 +3,14 @@ package cn.lili.modules.promotion.serviceimpl;
 import cn.hutool.json.JSONUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.trigger.enums.DelayTypeEnums;
+import cn.lili.trigger.enums.DelayTypeEnums;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.message.PromotionMessage;
+import cn.lili.trigger.message.PromotionMessage;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeExecuteConstant;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.model.TimeTriggerMsg;
-import cn.lili.common.trigger.util.DelayQueueTools;
+import cn.lili.trigger.util.DelayQueueTools;
 import cn.lili.common.utils.DateUtil;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.service.MemberService;
 import cn.lili.modules.promotion.entity.dos.Coupon;

framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java

@@ -3,17 +3,17 @@ package cn.lili.modules.promotion.serviceimpl;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.trigger.enums.DelayTypeEnums;
+import cn.lili.trigger.enums.DelayTypeEnums;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.message.PromotionMessage;
+import cn.lili.trigger.message.PromotionMessage;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeExecuteConstant;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.model.TimeTriggerMsg;
-import cn.lili.common.trigger.util.DelayQueueTools;
+import cn.lili.trigger.util.DelayQueueTools;
 import cn.lili.common.utils.DateUtil;
 import cn.lili.common.utils.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.service.GoodsSkuService;
 import cn.lili.modules.promotion.entity.dos.*;

framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java

@@ -1,17 +1,17 @@
 package cn.lili.modules.promotion.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
-import cn.lili.common.trigger.util.DelayQueueTools;
+import cn.lili.trigger.util.DelayQueueTools;
-import cn.lili.common.trigger.enums.DelayTypeEnums;
+import cn.lili.trigger.enums.DelayTypeEnums;
-import cn.lili.common.trigger.message.PromotionMessage;
+import cn.lili.trigger.message.PromotionMessage;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeExecuteConstant;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.model.TimeTriggerMsg;
 import cn.lili.common.utils.DateUtil;
 import cn.lili.common.utils.PageUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
 import cn.lili.modules.promotion.entity.dos.Coupon;
 import cn.lili.modules.promotion.entity.dos.FullDiscount;