diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java index d2d798d44..6b6bd60ed 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java +++ b/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; diff --git a/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java b/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java index 5cbfd678a..13f8c7142 100755 --- a/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java +++ b/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.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; diff --git a/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java b/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java index 779e0d784..48a06ee2a 100644 --- a/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java +++ b/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; diff --git a/buyer-api/src/main/resources/application.yml b/buyer-api/src/main/resources/application.yml index 61b5b4fba..f40984b4d 100644 --- a/buyer-api/src/main/resources/application.yml +++ b/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: diff --git a/buyer-api/src/test/resources/application.yml b/buyer-api/src/test/resources/application.yml index 9484829ba..ae1c46874 100644 --- a/buyer-api/src/test/resources/application.yml +++ b/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: diff --git a/common-api/src/main/java/cn/lili/controller/common/FileController.java b/common-api/src/main/java/cn/lili/controller/common/FileController.java index 20e33256c..51a70289e 100644 --- a/common-api/src/main/java/cn/lili/controller/common/FileController.java +++ b/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; diff --git a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java index 06a13e989..e2ff3977c 100644 --- a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java +++ b/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; diff --git a/common-api/src/main/java/cn/lili/controller/common/SmsController.java b/common-api/src/main/java/cn/lili/controller/common/SmsController.java index 77a02304b..6d1caa81c 100644 --- a/common-api/src/main/java/cn/lili/controller/common/SmsController.java +++ b/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; diff --git a/common-api/src/main/java/cn/lili/controller/common/UploadController.java b/common-api/src/main/java/cn/lili/controller/common/UploadController.java index d4f5cdfd9..09b11341c 100644 --- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java +++ b/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; diff --git a/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java b/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java index a3cd9e4cb..7228cbbaa 100644 --- a/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java +++ b/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; diff --git a/common-api/src/main/resources/application.yml b/common-api/src/main/resources/application.yml index 0d48f2ae9..c2ae14401 100644 --- a/common-api/src/main/resources/application.yml +++ b/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: diff --git a/config/application.yml b/config/application.yml index 2193b51fe..5637e5da5 100644 --- a/config/application.yml +++ b/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: diff --git a/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java b/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java index 402b74f09..7d9d0081c 100644 --- a/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java +++ b/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; diff --git a/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java b/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java index da5a5fa9e..ed0ee8a76 100644 --- a/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java +++ b/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; diff --git a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java index e0f24d7b0..5a9c67ad2 100644 --- a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java +++ b/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; diff --git a/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java b/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java index 4cc3b8fa6..48800bb5e 100644 --- a/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java +++ b/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; diff --git a/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java b/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java index fe7a4a212..df5104a87 100644 --- a/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java +++ b/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.common.sms.SmsUtil; +import cn.lili.rocketmq.tags.OtherTagsEnum; +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; diff --git a/consumer/src/main/java/cn/lili/listener/OrderMessageListener.java b/consumer/src/main/java/cn/lili/listener/OrderMessageListener.java index 508ec62cc..21744c817 100644 --- a/consumer/src/main/java/cn/lili/listener/OrderMessageListener.java +++ b/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.common.rocketmq.tags.MqOrderTagsEnum; +import cn.lili.cache.Cache; +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; diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java index 2b80be56f..ef5ab273f 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java +++ b/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.common.cache.CachePrefix; +import cn.lili.cache.Cache; +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; diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java index b39e455f6..2c09e7b46 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java +++ b/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.common.cache.CachePrefix; +import cn.lili.cache.Cache; +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; diff --git a/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java b/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java index 9ddf24358..2ac74f981 100644 --- a/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java +++ b/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; diff --git a/consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java b/consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java index f0910140b..b8e894582 100644 --- a/consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java +++ b/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.common.trigger.model.TimeTriggerMsg; -import cn.lili.common.trigger.util.DelayQueueTools; +import cn.lili.cache.Cache; +import cn.lili.trigger.model.TimeTriggerMsg; +import cn.lili.trigger.util.DelayQueueTools; import cn.lili.common.utils.SpringContextUtil; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; diff --git a/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java b/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java index b421b1292..990ea870c 100644 --- a/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java +++ b/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; diff --git a/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java b/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java index ddb90e51e..f6e953f8a 100644 --- a/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java +++ b/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.common.trigger.message.PromotionMessage; -import cn.lili.common.trigger.model.TimeExecuteConstant; -import cn.lili.common.trigger.model.TimeTriggerMsg; -import cn.lili.config.rocketmq.RocketmqCustomProperties; +import cn.lili.trigger.message.PintuanOrderMessage; +import cn.lili.trigger.message.PromotionMessage; +import cn.lili.trigger.model.TimeExecuteConstant; +import cn.lili.trigger.model.TimeTriggerMsg; +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; diff --git a/consumer/src/main/java/cn/lili/trigger/listen/PromotionDelayQueueListen.java b/consumer/src/main/java/cn/lili/trigger/listen/PromotionDelayQueueListen.java index 4466aa978..4b2845b01 100644 --- a/consumer/src/main/java/cn/lili/trigger/listen/PromotionDelayQueueListen.java +++ b/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.common.trigger.interfaces.TimeTrigger; -import cn.lili.common.trigger.model.TimeTriggerMsg; +import cn.lili.trigger.enums.DelayQueueEnums; +import cn.lili.trigger.interfaces.TimeTrigger; +import cn.lili.trigger.model.TimeTriggerMsg; import cn.lili.trigger.AbstractDelayQueueListen; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/consumer/src/main/resources/application.yml b/consumer/src/main/resources/application.yml index d50be0e6a..dd50c5589 100644 --- a/consumer/src/main/resources/application.yml +++ b/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: diff --git a/framework/src/main/java/cn/lili/common/cache/Cache.java b/framework/src/main/java/cn/lili/cache/Cache.java similarity index 99% rename from framework/src/main/java/cn/lili/common/cache/Cache.java rename to framework/src/main/java/cn/lili/cache/Cache.java index 25d919cef..3b6b6a689 100644 --- a/framework/src/main/java/cn/lili/common/cache/Cache.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/common/cache/CachePrefix.java b/framework/src/main/java/cn/lili/cache/CachePrefix.java similarity index 99% rename from framework/src/main/java/cn/lili/common/cache/CachePrefix.java rename to framework/src/main/java/cn/lili/cache/CachePrefix.java index 925766b11..52660c83c 100644 --- a/framework/src/main/java/cn/lili/common/cache/CachePrefix.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/common/cache/MybatisRedisCache.java b/framework/src/main/java/cn/lili/cache/MybatisRedisCache.java similarity index 98% rename from framework/src/main/java/cn/lili/common/cache/MybatisRedisCache.java rename to framework/src/main/java/cn/lili/cache/MybatisRedisCache.java index e47185bd4..9bbda4889 100644 --- a/framework/src/main/java/cn/lili/common/cache/MybatisRedisCache.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/mongo/MongoConfig.java b/framework/src/main/java/cn/lili/cache/config/mongo/MongoConfig.java similarity index 97% rename from framework/src/main/java/cn/lili/config/mongo/MongoConfig.java rename to framework/src/main/java/cn/lili/cache/config/mongo/MongoConfig.java index d2fffd744..9fee65e37 100644 --- a/framework/src/main/java/cn/lili/config/mongo/MongoConfig.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/cache/FastJsonRedisSerializer.java b/framework/src/main/java/cn/lili/cache/config/redis/FastJsonRedisSerializer.java similarity index 97% rename from framework/src/main/java/cn/lili/config/cache/FastJsonRedisSerializer.java rename to framework/src/main/java/cn/lili/cache/config/redis/FastJsonRedisSerializer.java index ff54b9244..baac1e94b 100644 --- a/framework/src/main/java/cn/lili/config/cache/FastJsonRedisSerializer.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/cache/RedisConfig.java b/framework/src/main/java/cn/lili/cache/config/redis/RedisConfig.java similarity index 99% rename from framework/src/main/java/cn/lili/config/cache/RedisConfig.java rename to framework/src/main/java/cn/lili/cache/config/redis/RedisConfig.java index 63271fb85..3ddef5493 100644 --- a/framework/src/main/java/cn/lili/config/cache/RedisConfig.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java b/framework/src/main/java/cn/lili/cache/impl/RedisCache.java similarity index 99% rename from framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java rename to framework/src/main/java/cn/lili/cache/impl/RedisCache.java index ef3316659..5d2fd20ee 100644 --- a/framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/common/cache/limit/annotation/LimitPoint.java b/framework/src/main/java/cn/lili/cache/limit/annotation/LimitPoint.java similarity index 92% rename from framework/src/main/java/cn/lili/common/cache/limit/annotation/LimitPoint.java rename to framework/src/main/java/cn/lili/cache/limit/annotation/LimitPoint.java index 94f9e34bf..182bb5067 100644 --- a/framework/src/main/java/cn/lili/common/cache/limit/annotation/LimitPoint.java +++ b/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.*; diff --git a/framework/src/main/java/cn/lili/common/cache/limit/enums/LimitTypeEnums.java b/framework/src/main/java/cn/lili/cache/limit/enums/LimitTypeEnums.java similarity index 85% rename from framework/src/main/java/cn/lili/common/cache/limit/enums/LimitTypeEnums.java rename to framework/src/main/java/cn/lili/cache/limit/enums/LimitTypeEnums.java index 5448ee6a8..50b060bc1 100644 --- a/framework/src/main/java/cn/lili/common/cache/limit/enums/LimitTypeEnums.java +++ b/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; /** diff --git a/framework/src/main/java/cn/lili/common/cache/limit/interceptor/LimitInterceptor.java b/framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java similarity index 95% rename from framework/src/main/java/cn/lili/common/cache/limit/interceptor/LimitInterceptor.java rename to framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java index f319ead8e..465cfc086 100644 --- a/framework/src/main/java/cn/lili/common/cache/limit/interceptor/LimitInterceptor.java +++ b/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.common.cache.limit.annotation.LimitPoint; +import cn.lili.cache.limit.enums.LimitTypeEnums; +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; diff --git a/framework/src/main/java/cn/lili/config/context/ContextConfiguration.java b/framework/src/main/java/cn/lili/common/config/context/ContextConfiguration.java similarity index 93% rename from framework/src/main/java/cn/lili/config/context/ContextConfiguration.java rename to framework/src/main/java/cn/lili/common/config/context/ContextConfiguration.java index ed5d42ee4..92d4f2d49 100644 --- a/framework/src/main/java/cn/lili/config/context/ContextConfiguration.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/context/ThreadContextHolder.java b/framework/src/main/java/cn/lili/common/config/context/ThreadContextHolder.java similarity index 96% rename from framework/src/main/java/cn/lili/config/context/ThreadContextHolder.java rename to framework/src/main/java/cn/lili/common/config/context/ThreadContextHolder.java index 60bcc7974..b5f86a193 100644 --- a/framework/src/main/java/cn/lili/config/context/ThreadContextHolder.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/context/ThreadContextHolderInterceptorAdapter.java b/framework/src/main/java/cn/lili/common/config/context/ThreadContextHolderInterceptorAdapter.java similarity index 97% rename from framework/src/main/java/cn/lili/config/context/ThreadContextHolderInterceptorAdapter.java rename to framework/src/main/java/cn/lili/common/config/context/ThreadContextHolderInterceptorAdapter.java index a8cb28e1d..48e8c1fa2 100644 --- a/framework/src/main/java/cn/lili/config/context/ThreadContextHolderInterceptorAdapter.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/interceptor/RequestInterceptorAdapter.java b/framework/src/main/java/cn/lili/common/config/interceptor/RequestInterceptorAdapter.java similarity index 92% rename from framework/src/main/java/cn/lili/config/interceptor/RequestInterceptorAdapter.java rename to framework/src/main/java/cn/lili/common/config/interceptor/RequestInterceptorAdapter.java index 17e7f37a9..4adc4f7fc 100644 --- a/framework/src/main/java/cn/lili/config/interceptor/RequestInterceptorAdapter.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java b/framework/src/main/java/cn/lili/common/config/interceptor/UrlConfiguration.java similarity index 93% rename from framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java rename to framework/src/main/java/cn/lili/common/config/interceptor/UrlConfiguration.java index f943c75e7..7182cf6de 100644 --- a/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/properties/ApiProperties.java b/framework/src/main/java/cn/lili/common/config/properties/ApiProperties.java similarity index 93% rename from framework/src/main/java/cn/lili/config/properties/ApiProperties.java rename to framework/src/main/java/cn/lili/common/config/properties/ApiProperties.java index 806c891d9..55c848d0a 100644 --- a/framework/src/main/java/cn/lili/config/properties/ApiProperties.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/properties/DomainProperties.java b/framework/src/main/java/cn/lili/common/config/properties/DomainProperties.java similarity index 93% rename from framework/src/main/java/cn/lili/config/properties/DomainProperties.java rename to framework/src/main/java/cn/lili/common/config/properties/DomainProperties.java index 7a56f007e..a42e1f01b 100644 --- a/framework/src/main/java/cn/lili/config/properties/DomainProperties.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/properties/IgnoredUrlsProperties.java b/framework/src/main/java/cn/lili/common/config/properties/IgnoredUrlsProperties.java similarity index 91% rename from framework/src/main/java/cn/lili/config/properties/IgnoredUrlsProperties.java rename to framework/src/main/java/cn/lili/common/config/properties/IgnoredUrlsProperties.java index 097fdee62..fa4f05a2f 100644 --- a/framework/src/main/java/cn/lili/config/properties/IgnoredUrlsProperties.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/properties/JWTTokenProperties.java b/framework/src/main/java/cn/lili/common/config/properties/JWTTokenProperties.java similarity index 90% rename from framework/src/main/java/cn/lili/config/properties/JWTTokenProperties.java rename to framework/src/main/java/cn/lili/common/config/properties/JWTTokenProperties.java index b542694c0..94fbe851e 100644 --- a/framework/src/main/java/cn/lili/config/properties/JWTTokenProperties.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/properties/SmsTemplateSetting.java b/framework/src/main/java/cn/lili/common/config/properties/SmsTemplateSetting.java similarity index 94% rename from framework/src/main/java/cn/lili/config/properties/SmsTemplateSetting.java rename to framework/src/main/java/cn/lili/common/config/properties/SmsTemplateSetting.java index 5c05732dc..79aaab283 100644 --- a/framework/src/main/java/cn/lili/config/properties/SmsTemplateSetting.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/properties/StatisticsProperties.java b/framework/src/main/java/cn/lili/common/config/properties/StatisticsProperties.java similarity index 95% rename from framework/src/main/java/cn/lili/config/properties/StatisticsProperties.java rename to framework/src/main/java/cn/lili/common/config/properties/StatisticsProperties.java index a2e697774..c5f99cd22 100644 --- a/framework/src/main/java/cn/lili/config/properties/StatisticsProperties.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/properties/SystemSetting.java b/framework/src/main/java/cn/lili/common/config/properties/SystemSetting.java similarity index 93% rename from framework/src/main/java/cn/lili/config/properties/SystemSetting.java rename to framework/src/main/java/cn/lili/common/config/properties/SystemSetting.java index 17186884c..85c02f81d 100644 --- a/framework/src/main/java/cn/lili/config/properties/SystemSetting.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/properties/ThreadProperties.java b/framework/src/main/java/cn/lili/common/config/properties/ThreadProperties.java similarity index 94% rename from framework/src/main/java/cn/lili/config/properties/ThreadProperties.java rename to framework/src/main/java/cn/lili/common/config/properties/ThreadProperties.java index b58c78269..1a97f2b19 100644 --- a/framework/src/main/java/cn/lili/config/properties/ThreadProperties.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/rocketmq/RocketmqCustomProperties.java b/framework/src/main/java/cn/lili/common/config/rocketmq/RocketmqCustomProperties.java similarity index 96% rename from framework/src/main/java/cn/lili/config/rocketmq/RocketmqCustomProperties.java rename to framework/src/main/java/cn/lili/common/config/rocketmq/RocketmqCustomProperties.java index daedfe43f..b5a786d9e 100644 --- a/framework/src/main/java/cn/lili/config/rocketmq/RocketmqCustomProperties.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/swagger/Swagger2Config.java b/framework/src/main/java/cn/lili/common/config/swagger/Swagger2Config.java similarity index 99% rename from framework/src/main/java/cn/lili/config/swagger/Swagger2Config.java rename to framework/src/main/java/cn/lili/common/config/swagger/Swagger2Config.java index a9bdf6318..f50415468 100644 --- a/framework/src/main/java/cn/lili/config/swagger/Swagger2Config.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/thread/ThreadConfig.java b/framework/src/main/java/cn/lili/common/config/thread/ThreadConfig.java similarity index 93% rename from framework/src/main/java/cn/lili/config/thread/ThreadConfig.java rename to framework/src/main/java/cn/lili/common/config/thread/ThreadConfig.java index e3943a343..6d1ddd19b 100644 --- a/framework/src/main/java/cn/lili/config/thread/ThreadConfig.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/websocket/WebSocketStompConfig.java b/framework/src/main/java/cn/lili/common/config/websocket/WebSocketStompConfig.java similarity index 97% rename from framework/src/main/java/cn/lili/config/websocket/WebSocketStompConfig.java rename to framework/src/main/java/cn/lili/common/config/websocket/WebSocketStompConfig.java index 63100a8e4..07ae1c282 100644 --- a/framework/src/main/java/cn/lili/config/websocket/WebSocketStompConfig.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/common/security/context/UserContext.java b/framework/src/main/java/cn/lili/common/security/context/UserContext.java index a0737b062..3f76bb046 100644 --- a/framework/src/main/java/cn/lili/common/security/context/UserContext.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/common/security/token/TokenUtil.java b/framework/src/main/java/cn/lili/common/security/token/TokenUtil.java index 388d285df..f59c3e881 100644 --- a/framework/src/main/java/cn/lili/common/security/token/TokenUtil.java +++ b/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.common.cache.CachePrefix; +import cn.lili.cache.Cache; +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; diff --git a/framework/src/main/java/cn/lili/common/security/token/base/generate/ManagerTokenGenerate.java b/framework/src/main/java/cn/lili/common/security/token/base/generate/ManagerTokenGenerate.java index 37ef66447..860fc2c84 100644 --- a/framework/src/main/java/cn/lili/common/security/token/base/generate/ManagerTokenGenerate.java +++ b/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.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.UserEnums; import cn.lili.common.security.token.PermissionEnum; diff --git a/framework/src/main/java/cn/lili/common/security/token/base/generate/MemberTokenGenerate.java b/framework/src/main/java/cn/lili/common/security/token/base/generate/MemberTokenGenerate.java index ba0c53c90..196bdb9f1 100644 --- a/framework/src/main/java/cn/lili/common/security/token/base/generate/MemberTokenGenerate.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java b/framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java similarity index 99% rename from framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java rename to framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java index a133da670..d5808098d 100644 --- a/framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/common/elasticsearch/EsSuffix.java b/framework/src/main/java/cn/lili/elasticsearch/EsSuffix.java similarity index 84% rename from framework/src/main/java/cn/lili/common/elasticsearch/EsSuffix.java rename to framework/src/main/java/cn/lili/elasticsearch/EsSuffix.java index e7fe6f8e2..528f28c61 100644 --- a/framework/src/main/java/cn/lili/common/elasticsearch/EsSuffix.java +++ b/framework/src/main/java/cn/lili/elasticsearch/EsSuffix.java @@ -1,4 +1,4 @@ -package cn.lili.common.elasticsearch; +package cn.lili.elasticsearch; /** * elasticsearch 索引后缀 diff --git a/framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchConfig.java b/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java similarity index 99% rename from framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchConfig.java rename to framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java index f5b08948c..0c78f88ad 100644 --- a/framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchConfig.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchProperties.java b/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchProperties.java similarity index 98% rename from framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchProperties.java rename to framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchProperties.java index b6e66fbfa..b4dfc18c3 100644 --- a/framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchProperties.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthAlipayRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/AuthAlipayRequest.java index 53dd69af6..10da20989 100644 --- a/framework/src/main/java/cn/lili/modules/connect/request/AuthAlipayRequest.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthDefaultRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/AuthDefaultRequest.java index 22b3fdad3..f5712bc64 100644 --- a/framework/src/main/java/cn/lili/modules/connect/request/AuthDefaultRequest.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthQQRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/AuthQQRequest.java index 15299731d..e8df41cbe 100644 --- a/framework/src/main/java/cn/lili/modules/connect/request/AuthQQRequest.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatPCRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatPCRequest.java index e0c3bd2e0..9a9221640 100644 --- a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatPCRequest.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatRequest.java index bc1655fdf..eb8298e4d 100644 --- a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatRequest.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeiboRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/AuthWeiboRequest.java index b3284e765..549284588 100644 --- a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeiboRequest.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java b/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java index 3186f7bac..7a33b102c 100644 --- a/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java index 3a78216d1..eaeb1f114 100644 --- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java +++ b/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.common.cache.CachePrefix; +import cn.lili.cache.Cache; +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; diff --git a/framework/src/main/java/cn/lili/modules/connect/util/AuthChecker.java b/framework/src/main/java/cn/lili/modules/connect/util/AuthChecker.java index 838cbe900..fb23837f3 100644 --- a/framework/src/main/java/cn/lili/modules/connect/util/AuthChecker.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java index e185ca04e..5f9038c5b 100644 --- a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java +++ b/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.common.cache.CachePrefix; +import cn.lili.cache.Cache; +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.config.properties.DomainProperties; +import cn.lili.common.config.properties.ApiProperties; +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; diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java index 7a0bef763..1beb036b7 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java +++ b/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.common.rocketmq.tags.MemberTagsEnum; +import cn.lili.rocketmq.RocketmqSendCallbackBuilder; +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; diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java index 7a255e055..132adf9ba 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java +++ b/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.common.cache.CachePrefix; +import cn.lili.cache.Cache; +import cn.lili.cache.CachePrefix; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.context.UserContext; diff --git a/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java b/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java index c2976aaa0..85cdbf89b 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java index bc102fca9..59ad8a33a 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java +++ b/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.common.cache.CachePrefix; +import cn.lili.cache.Cache; +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; diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java index 352324597..831276fc7 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java +++ b/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.common.rocketmq.tags.GoodsTagsEnum; +import cn.lili.rocketmq.RocketmqSendCallbackBuilder; +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; diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java index 0948d00f9..d7e21986d 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java +++ b/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.common.rocketmq.tags.GoodsTagsEnum; +import cn.lili.rocketmq.RocketmqSendCallbackBuilder; +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; diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java index aa487b988..29ebdd21e 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java +++ b/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.common.trigger.interfaces.TimeTrigger; -import cn.lili.common.trigger.model.TimeExecuteConstant; -import cn.lili.common.trigger.model.TimeTriggerMsg; -import cn.lili.common.trigger.util.DelayQueueTools; +import cn.lili.trigger.enums.DelayTypeEnums; +import cn.lili.trigger.interfaces.TimeTrigger; +import cn.lili.trigger.model.TimeExecuteConstant; +import cn.lili.trigger.model.TimeTriggerMsg; +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; diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java index 4aa7f9259..f5dca62ba 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java +++ b/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.common.rocketmq.tags.GoodsTagsEnum; +import cn.lili.rocketmq.RocketmqSendCallbackBuilder; +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; diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java index 34aab3fb7..2c24fd130 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java +++ b/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.common.rocketmq.tags.GoodsTagsEnum; +import cn.lili.rocketmq.RocketmqSendCallbackBuilder; +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; diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index 466a68951..b01dcf7a0 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/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.common.cache.CachePrefix; +import cn.lili.cache.Cache; +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.common.rocketmq.tags.MemberTagsEnum; +import cn.lili.rocketmq.RocketmqSendCallbackBuilder; +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.config.rocketmq.RocketmqCustomProperties; +import cn.lili.common.config.context.ThreadContextHolder; +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; diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java index 5fccdd4c1..6c6fe778c 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java +++ b/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.common.rocketmq.tags.MemberTagsEnum; +import cn.lili.rocketmq.RocketmqSendCallbackBuilder; +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; diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java index e6a044661..d0eabd398 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java +++ b/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.common.rocketmq.tags.OtherTagsEnum; +import cn.lili.rocketmq.RocketmqSendCallbackBuilder; +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; diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java index d8fa32b23..bde409643 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java +++ b/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.common.rocketmq.tags.OtherTagsEnum; +import cn.lili.rocketmq.RocketmqSendCallbackBuilder; +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; diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java index e7ec89dd1..a70b55386 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java index ad1cca95d..468c8fdd7 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java b/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java index d4c6e15a1..1f8f57772 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java +++ b/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.common.cache.CachePrefix; +import cn.lili.cache.Cache; +import cn.lili.cache.CachePrefix; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.enums.ClientTypeEnum; diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java index b8b537929..34c2277e5 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java +++ b/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.common.cache.CachePrefix; +import cn.lili.cache.Cache; +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; diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java index a3c1b50ac..b10fb4c96 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java index ce73de796..eab05b3f7 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java +++ b/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.common.rocketmq.tags.AfterSaleTagsEnum; +import cn.lili.rocketmq.RocketmqSendCallbackBuilder; +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; diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java index fe4919254..32c085a55 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java +++ b/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.common.trigger.enums.DelayTypeEnums; -import cn.lili.common.trigger.message.PintuanOrderMessage; +import cn.lili.trigger.util.DelayQueueTools; +import cn.lili.trigger.enums.DelayTypeEnums; +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.common.rocketmq.tags.GoodsTagsEnum; -import cn.lili.common.rocketmq.tags.MqOrderTagsEnum; +import cn.lili.rocketmq.RocketmqSendCallbackBuilder; +import cn.lili.rocketmq.tags.GoodsTagsEnum; +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.common.trigger.model.TimeExecuteConstant; -import cn.lili.common.trigger.model.TimeTriggerMsg; +import cn.lili.trigger.interfaces.TimeTrigger; +import cn.lili.trigger.model.TimeExecuteConstant; +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; diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java index 1bb77a78c..88ba490c0 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java @@ -1 +1 @@ -package cn.lili.modules.order.order.serviceimpl; import cn.lili.common.cache.Cache; import cn.lili.common.cache.CachePrefix; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder; import cn.lili.common.rocketmq.tags.MqOrderTagsEnum; import cn.lili.config.rocketmq.RocketmqCustomProperties; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.dos.MemberAddress; import cn.lili.modules.member.service.MemberService; import cn.lili.modules.order.cart.entity.dto.MemberCouponDTO; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.cart.entity.vo.CartVO; import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.order.order.entity.dos.Trade; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; import cn.lili.modules.order.order.mapper.TradeMapper; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.order.order.service.TradeService; import cn.lili.modules.promotion.service.CouponService; import cn.lili.modules.promotion.service.MemberCouponService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.ArrayList; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; /** * 交易业务层实现 * * @author Chopper * @date 2020/11/17 7:39 下午 */ @Service @Transactional(rollbackFor = Exception.class) public class TradeServiceImpl extends ServiceImpl implements TradeService { /** * 缓存 */ @Autowired private Cache cache; /** * 订单 */ @Autowired private OrderService orderService; /** * 会员 */ @Autowired private MemberService memberService; /** * 优惠券 */ @Autowired private CouponService couponService; /** * 会员优惠券 */ @Autowired private MemberCouponService memberCouponService; /** * RocketMQ */ @Autowired private RocketMQTemplate rocketMQTemplate; /** * RocketMQ 配置 */ @Autowired private RocketmqCustomProperties rocketmqCustomProperties; @Override @Transactional(rollbackFor = Exception.class) public Trade createTrade(TradeDTO tradeDTO) { //创建订单预校验 createTradeCheck(tradeDTO); Trade trade = new Trade(tradeDTO); String key = CachePrefix.TRADE.getPrefix() + trade.getSn(); //积分预处理 pointPretreatment(tradeDTO); //优惠券预处理 couponPretreatment(tradeDTO); //添加交易 this.save(trade); //添加订单 orderService.intoDB(tradeDTO); //写入缓存，给消费者调用 cache.put(key, tradeDTO); //构建订单创建消息 String destination = rocketmqCustomProperties.getOrderTopic() + ":" + MqOrderTagsEnum.ORDER_CREATE.name(); //发送订单创建消息 rocketMQTemplate.asyncSend(destination, key, RocketmqSendCallbackBuilder.commonCallback()); return trade; } /** * 创建订单最后一步校验 * * @param tradeDTO */ private void createTradeCheck(TradeDTO tradeDTO) { //创建订单如果没有收获地址， MemberAddress memberAddress = tradeDTO.getMemberAddress(); if (memberAddress == null) { throw new ServiceException(ResultCode.MEMBER_ADDRESS_NOT_EXIST); } /** * 订单配送区域校验 */ if (tradeDTO.getNotSupportFreight() != null && tradeDTO.getNotSupportFreight().size() > 0) { StringBuilder stringBuilder = new StringBuilder("包含商品有-"); tradeDTO.getNotSupportFreight().forEach(sku -> { stringBuilder.append(sku.getGoodsSku().getGoodsName()); }); throw new ServiceException(ResultCode.ORDER_NOT_SUPPORT_DISTRIBUTION, stringBuilder.toString()); } } @Override public Trade getBySn(String sn) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Trade::getSn, sn); return this.getOne(queryWrapper); } @Override public void payTrade(String tradeSn, String paymentName, String receivableNo) { LambdaQueryWrapper orderQueryWrapper = new LambdaQueryWrapper<>(); orderQueryWrapper.eq(Order::getTradeSn, tradeSn); List orders = orderService.list(orderQueryWrapper); for (Order order : orders) { orderService.payOrder(order.getSn(), paymentName, receivableNo); } Trade trade = this.getBySn(tradeSn); trade.setPayStatus(PayStatusEnum.PAID.name()); this.saveOrUpdate(trade); } /** * 积分预处理 * 下单同时，使用积分 * * @param tradeDTO */ private void pointPretreatment(TradeDTO tradeDTO) { StringBuilder orderSns = new StringBuilder(); for (CartVO item : tradeDTO.getCartList()) { orderSns.append(item.getSn()).append(","); } if (tradeDTO.getPriceDetailDTO() != null && tradeDTO.getPriceDetailDTO().getPayPoint() != null && tradeDTO.getPriceDetailDTO().getPayPoint() > 0) { Member userInfo = memberService.getUserInfo(); if (userInfo.getPoint() < tradeDTO.getPriceDetailDTO().getPayPoint()) { throw new ServiceException(ResultCode.PAY_POINT_ENOUGH); } boolean result = memberService.updateMemberPoint(tradeDTO.getPriceDetailDTO(). getPayPoint().longValue(), false, tradeDTO.getMemberId(), "订单【" + orderSns + "】创建，积分扣减"); if (!result) { throw new ServiceException(ResultCode.PAY_POINT_ENOUGH); } } } /** * 优惠券预处理 * 下单同时，扣除优惠券 * * @param tradeDTO */ private void couponPretreatment(TradeDTO tradeDTO) { List memberCouponDTOList = new ArrayList<>(); if (null != tradeDTO.getPlatformCoupon()) { memberCouponDTOList.add(tradeDTO.getPlatformCoupon()); } Collection storeCoupons = tradeDTO.getStoreCoupons().values(); if (!storeCoupons.isEmpty()) { memberCouponDTOList.addAll(storeCoupons); } List ids = memberCouponDTOList.stream().map(e -> e.getMemberCoupon().getId()).collect(Collectors.toList()); memberCouponService.used(ids); memberCouponDTOList.forEach(e -> couponService.usedCoupon(e.getMemberCoupon().getCouponId(), 1)); } } \ No newline at end of file +package cn.lili.modules.order.order.serviceimpl; import cn.lili.cache.Cache; import cn.lili.cache.CachePrefix; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.rocketmq.RocketmqSendCallbackBuilder; import cn.lili.rocketmq.tags.MqOrderTagsEnum; import cn.lili.common.config.rocketmq.RocketmqCustomProperties; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.dos.MemberAddress; import cn.lili.modules.member.service.MemberService; import cn.lili.modules.order.cart.entity.dto.MemberCouponDTO; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.cart.entity.vo.CartVO; import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.order.order.entity.dos.Trade; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; import cn.lili.modules.order.order.mapper.TradeMapper; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.order.order.service.TradeService; import cn.lili.modules.promotion.service.CouponService; import cn.lili.modules.promotion.service.MemberCouponService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.ArrayList; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; /** * 交易业务层实现 * * @author Chopper * @date 2020/11/17 7:39 下午 */ @Service @Transactional(rollbackFor = Exception.class) public class TradeServiceImpl extends ServiceImpl implements TradeService { /** * 缓存 */ @Autowired private Cache cache; /** * 订单 */ @Autowired private OrderService orderService; /** * 会员 */ @Autowired private MemberService memberService; /** * 优惠券 */ @Autowired private CouponService couponService; /** * 会员优惠券 */ @Autowired private MemberCouponService memberCouponService; /** * RocketMQ */ @Autowired private RocketMQTemplate rocketMQTemplate; /** * RocketMQ 配置 */ @Autowired private RocketmqCustomProperties rocketmqCustomProperties; @Override @Transactional(rollbackFor = Exception.class) public Trade createTrade(TradeDTO tradeDTO) { //创建订单预校验 createTradeCheck(tradeDTO); Trade trade = new Trade(tradeDTO); String key = CachePrefix.TRADE.getPrefix() + trade.getSn(); //积分预处理 pointPretreatment(tradeDTO); //优惠券预处理 couponPretreatment(tradeDTO); //添加交易 this.save(trade); //添加订单 orderService.intoDB(tradeDTO); //写入缓存，给消费者调用 cache.put(key, tradeDTO); //构建订单创建消息 String destination = rocketmqCustomProperties.getOrderTopic() + ":" + MqOrderTagsEnum.ORDER_CREATE.name(); //发送订单创建消息 rocketMQTemplate.asyncSend(destination, key, RocketmqSendCallbackBuilder.commonCallback()); return trade; } /** * 创建订单最后一步校验 * * @param tradeDTO */ private void createTradeCheck(TradeDTO tradeDTO) { //创建订单如果没有收获地址， MemberAddress memberAddress = tradeDTO.getMemberAddress(); if (memberAddress == null) { throw new ServiceException(ResultCode.MEMBER_ADDRESS_NOT_EXIST); } /** * 订单配送区域校验 */ if (tradeDTO.getNotSupportFreight() != null && tradeDTO.getNotSupportFreight().size() > 0) { StringBuilder stringBuilder = new StringBuilder("包含商品有-"); tradeDTO.getNotSupportFreight().forEach(sku -> { stringBuilder.append(sku.getGoodsSku().getGoodsName()); }); throw new ServiceException(ResultCode.ORDER_NOT_SUPPORT_DISTRIBUTION, stringBuilder.toString()); } } @Override public Trade getBySn(String sn) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Trade::getSn, sn); return this.getOne(queryWrapper); } @Override public void payTrade(String tradeSn, String paymentName, String receivableNo) { LambdaQueryWrapper orderQueryWrapper = new LambdaQueryWrapper<>(); orderQueryWrapper.eq(Order::getTradeSn, tradeSn); List orders = orderService.list(orderQueryWrapper); for (Order order : orders) { orderService.payOrder(order.getSn(), paymentName, receivableNo); } Trade trade = this.getBySn(tradeSn); trade.setPayStatus(PayStatusEnum.PAID.name()); this.saveOrUpdate(trade); } /** * 积分预处理 * 下单同时，使用积分 * * @param tradeDTO */ private void pointPretreatment(TradeDTO tradeDTO) { StringBuilder orderSns = new StringBuilder(); for (CartVO item : tradeDTO.getCartList()) { orderSns.append(item.getSn()).append(","); } if (tradeDTO.getPriceDetailDTO() != null && tradeDTO.getPriceDetailDTO().getPayPoint() != null && tradeDTO.getPriceDetailDTO().getPayPoint() > 0) { Member userInfo = memberService.getUserInfo(); if (userInfo.getPoint() < tradeDTO.getPriceDetailDTO().getPayPoint()) { throw new ServiceException(ResultCode.PAY_POINT_ENOUGH); } boolean result = memberService.updateMemberPoint(tradeDTO.getPriceDetailDTO(). getPayPoint().longValue(), false, tradeDTO.getMemberId(), "订单【" + orderSns + "】创建，积分扣减"); if (!result) { throw new ServiceException(ResultCode.PAY_POINT_ENOUGH); } } } /** * 优惠券预处理 * 下单同时，扣除优惠券 * * @param tradeDTO */ private void couponPretreatment(TradeDTO tradeDTO) { List memberCouponDTOList = new ArrayList<>(); if (null != tradeDTO.getPlatformCoupon()) { memberCouponDTOList.add(tradeDTO.getPlatformCoupon()); } Collection storeCoupons = tradeDTO.getStoreCoupons().values(); if (!storeCoupons.isEmpty()) { memberCouponDTOList.addAll(storeCoupons); } List ids = memberCouponDTOList.stream().map(e -> e.getMemberCoupon().getId()).collect(Collectors.toList()); memberCouponService.used(ids); memberCouponDTOList.forEach(e -> couponService.usedCoupon(e.getMemberCoupon().getCouponId(), 1)); } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java index e4f13ce0d..aa6ad3bca 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java +++ b/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.common.cache.CachePrefix; +import cn.lili.cache.Cache; +import cn.lili.cache.CachePrefix; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.StringUtils; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java index e89f141ba..3801272ec 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java index ef6033069..2be733458 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java +++ b/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.common.cache.CachePrefix; +import cn.lili.cache.Cache; +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; diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java b/framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java index de04aea46..676809080 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionService.java b/framework/src/main/java/cn/lili/modules/promotion/service/PromotionService.java index 6698bbd25..906f90f6c 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionService.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java index 35f0556a9..ab537b3b2 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java +++ b/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.common.trigger.interfaces.TimeTrigger; -import cn.lili.common.trigger.message.PromotionMessage; -import cn.lili.common.trigger.model.TimeExecuteConstant; -import cn.lili.common.trigger.model.TimeTriggerMsg; -import cn.lili.common.trigger.util.DelayQueueTools; +import cn.lili.trigger.enums.DelayTypeEnums; +import cn.lili.trigger.interfaces.TimeTrigger; +import cn.lili.trigger.message.PromotionMessage; +import cn.lili.trigger.model.TimeExecuteConstant; +import cn.lili.trigger.model.TimeTriggerMsg; +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; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java index 666b75396..0408c0ef1 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java +++ b/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.common.trigger.interfaces.TimeTrigger; -import cn.lili.common.trigger.message.PromotionMessage; -import cn.lili.common.trigger.model.TimeExecuteConstant; -import cn.lili.common.trigger.model.TimeTriggerMsg; -import cn.lili.common.trigger.util.DelayQueueTools; +import cn.lili.trigger.enums.DelayTypeEnums; +import cn.lili.trigger.interfaces.TimeTrigger; +import cn.lili.trigger.message.PromotionMessage; +import cn.lili.trigger.model.TimeExecuteConstant; +import cn.lili.trigger.model.TimeTriggerMsg; +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.*; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java index b2b0a9622..5bbfd39a4 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java +++ b/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.common.trigger.enums.DelayTypeEnums; -import cn.lili.common.trigger.message.PromotionMessage; +import cn.lili.trigger.util.DelayQueueTools; +import cn.lili.trigger.enums.DelayTypeEnums; +import cn.lili.trigger.message.PromotionMessage; import cn.lili.common.exception.ServiceException; -import cn.lili.common.trigger.interfaces.TimeTrigger; -import cn.lili.common.trigger.model.TimeExecuteConstant; -import cn.lili.common.trigger.model.TimeTriggerMsg; +import cn.lili.trigger.interfaces.TimeTrigger; +import cn.lili.trigger.model.TimeExecuteConstant; +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; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java index a094fd7d9..d22d7d8c6 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java @@ -3,17 +3,17 @@ package cn.lili.modules.promotion.serviceimpl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import cn.lili.common.enums.ResultCode; -import cn.lili.common.trigger.util.DelayQueueTools; -import cn.lili.common.trigger.enums.DelayTypeEnums; -import cn.lili.common.trigger.message.PromotionMessage; +import cn.lili.trigger.util.DelayQueueTools; +import cn.lili.trigger.enums.DelayTypeEnums; +import cn.lili.trigger.message.PromotionMessage; import cn.lili.common.exception.ServiceException; -import cn.lili.common.trigger.interfaces.TimeTrigger; -import cn.lili.common.trigger.model.TimeExecuteConstant; -import cn.lili.common.trigger.model.TimeTriggerMsg; +import cn.lili.trigger.interfaces.TimeTrigger; +import cn.lili.trigger.model.TimeExecuteConstant; +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.goods.service.GoodsSkuService; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java index b3a104584..164680be6 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java @@ -2,16 +2,16 @@ package cn.lili.modules.promotion.serviceimpl; import cn.hutool.core.util.StrUtil; import cn.lili.common.enums.ResultCode; -import cn.lili.common.trigger.util.DelayQueueTools; -import cn.lili.common.trigger.enums.DelayTypeEnums; -import cn.lili.common.trigger.message.PromotionMessage; +import cn.lili.trigger.util.DelayQueueTools; +import cn.lili.trigger.enums.DelayTypeEnums; +import cn.lili.trigger.message.PromotionMessage; import cn.lili.common.exception.ServiceException; -import cn.lili.common.trigger.interfaces.TimeTrigger; -import cn.lili.common.trigger.model.TimeExecuteConstant; -import cn.lili.common.trigger.model.TimeTriggerMsg; +import cn.lili.trigger.interfaces.TimeTrigger; +import cn.lili.trigger.model.TimeExecuteConstant; +import cn.lili.trigger.model.TimeTriggerMsg; import cn.lili.common.utils.DateUtil; 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.PointsGoods; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java index d993797bc..b690ce9b9 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java @@ -6,7 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.trigger.message.PromotionMessage; +import cn.lili.trigger.message.PromotionMessage; import cn.lili.modules.order.cart.entity.vo.FullDiscountVO; import cn.lili.modules.promotion.entity.dos.*; import cn.lili.modules.promotion.entity.enums.*; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java index 5f3a916f0..af907a567 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java @@ -6,7 +6,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; 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.vo.PageVO; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java index 6787d5d36..0c68e74a3 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java @@ -1,19 +1,19 @@ package cn.lili.modules.promotion.serviceimpl; import cn.lili.common.enums.ResultCode; -import cn.lili.common.trigger.util.DelayQueueTools; -import cn.lili.common.trigger.enums.DelayTypeEnums; -import cn.lili.common.trigger.message.PromotionMessage; +import cn.lili.trigger.util.DelayQueueTools; +import cn.lili.trigger.enums.DelayTypeEnums; +import cn.lili.trigger.message.PromotionMessage; import cn.lili.common.exception.ServiceException; -import cn.lili.common.trigger.interfaces.TimeTrigger; -import cn.lili.common.trigger.model.TimeExecuteConstant; -import cn.lili.common.trigger.model.TimeTriggerMsg; +import cn.lili.trigger.interfaces.TimeTrigger; +import cn.lili.trigger.model.TimeExecuteConstant; +import cn.lili.trigger.model.TimeTriggerMsg; import cn.lili.common.utils.BeanUtil; 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.promotion.entity.dos.PromotionGoods; import cn.lili.modules.promotion.entity.dos.Seckill; import cn.lili.modules.promotion.entity.dos.SeckillApply; diff --git a/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionCacheKeys.java b/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionCacheKeys.java index b2a7a1500..19d6a6016 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionCacheKeys.java +++ b/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionCacheKeys.java @@ -1,6 +1,6 @@ package cn.lili.modules.promotion.tools; -import cn.lili.common.cache.CachePrefix; +import cn.lili.cache.CachePrefix; /** * 满额活动缓存Key diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java index 89148a92c..73e89c220 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java @@ -1,6 +1,6 @@ package cn.lili.modules.search.entity.dos; -import cn.lili.common.elasticsearch.EsSuffix; +import cn.lili.elasticsearch.EsSuffix; import cn.lili.modules.goods.entity.dos.GoodsSku; import cn.lili.modules.goods.entity.dto.GoodsParamsDTO; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java index 4797774e2..2e66f1780 100644 --- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java @@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.PageUtil; import cn.lili.common.vo.PageVO; -import cn.lili.config.context.ThreadContextHolder; +import cn.lili.common.config.context.ThreadContextHolder; import cn.lili.modules.search.entity.dos.CustomWords; import cn.lili.modules.search.entity.vo.CustomWordsVO; import cn.lili.modules.search.mapper.CustomWordsMapper; diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java index 65c4415e4..b3a002b00 100644 --- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java @@ -5,9 +5,9 @@ import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.date.DateUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.extra.pinyin.PinyinUtil; -import cn.lili.common.elasticsearch.BaseElasticsearchService; -import cn.lili.common.elasticsearch.EsSuffix; -import cn.lili.config.elasticsearch.ElasticsearchProperties; +import cn.lili.elasticsearch.BaseElasticsearchService; +import cn.lili.elasticsearch.EsSuffix; +import cn.lili.elasticsearch.config.ElasticsearchProperties; import cn.lili.modules.goods.entity.dto.GoodsParamsDTO; import cn.lili.modules.goods.entity.dos.GoodsSku; import cn.lili.modules.goods.entity.dos.GoodsWords; diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java index 72239a170..1ad06e760 100644 --- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java @@ -1,7 +1,7 @@ package cn.lili.modules.search.serviceimpl; import cn.hutool.core.text.CharSequenceUtil; -import cn.lili.common.cache.Cache; +import cn.lili.cache.Cache; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.modules.goods.entity.dos.Brand; diff --git a/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java b/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java index c72d0a378..6dd436cea 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java +++ b/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java @@ -1,7 +1,7 @@ package cn.lili.modules.statistics.aop.aspect; -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.utils.SpelUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.connect.util.IpUtils; diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java index 7a2258c58..a5f8bbeb5 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java @@ -1,12 +1,12 @@ package cn.lili.modules.statistics.serviceimpl; -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.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.enums.UserEnums; import cn.lili.common.utils.CurrencyUtil; -import cn.lili.config.properties.StatisticsProperties; +import cn.lili.common.config.properties.StatisticsProperties; import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.member.entity.vo.MemberDistributionVO; import cn.lili.modules.member.service.MemberService; diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java index 509b0c810..465a0b2e7 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java @@ -1,7 +1,7 @@ package cn.lili.modules.store.serviceimpl; -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.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java index 95cb3090a..c1c722391 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java @@ -1,7 +1,7 @@ package cn.lili.modules.store.serviceimpl; -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.context.UserContext; import cn.lili.modules.store.entity.dos.StoreGoodsLabel; diff --git a/framework/src/main/java/cn/lili/modules/system/aspect/interceptor/DemoInterceptor.java b/framework/src/main/java/cn/lili/modules/system/aspect/interceptor/DemoInterceptor.java index 7ee11eca7..512291f6c 100644 --- a/framework/src/main/java/cn/lili/modules/system/aspect/interceptor/DemoInterceptor.java +++ b/framework/src/main/java/cn/lili/modules/system/aspect/interceptor/DemoInterceptor.java @@ -2,7 +2,7 @@ package cn.lili.modules.system.aspect.interceptor; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.config.properties.SystemSetting; +import cn.lili.common.config.properties.SystemSetting; import cn.lili.modules.system.aspect.DemoSite; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; diff --git a/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java b/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java index 4dc5b478d..1712aa941 100644 --- a/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java +++ b/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java @@ -1,6 +1,6 @@ package cn.lili.modules.system.service; -import cn.lili.common.cache.CachePrefix; +import cn.lili.cache.CachePrefix; import cn.lili.modules.system.entity.dos.VerificationSource; import cn.lili.modules.system.entity.vo.VerificationVO; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java index 896f84898..2e4d0529f 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java @@ -1,6 +1,6 @@ package cn.lili.modules.system.serviceimpl; -import cn.lili.common.cache.Cache; +import cn.lili.cache.Cache; import cn.lili.common.utils.HttpClientUtils; import cn.lili.common.utils.SnowFlake; import cn.lili.common.utils.StringUtils; diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java index dd7f0b390..bccec0f3d 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java @@ -1,6 +1,6 @@ package cn.lili.modules.system.serviceimpl; -import cn.lili.common.cache.Cache; +import cn.lili.cache.Cache; import cn.lili.modules.system.entity.dos.VerificationSource; import cn.lili.modules.system.entity.enums.VerificationSourceEnum; import cn.lili.modules.system.entity.vo.VerificationVO; diff --git a/framework/src/main/java/cn/lili/common/sms/AliSmsUtil.java b/framework/src/main/java/cn/lili/modules/system/sms/AliSmsUtil.java similarity index 98% rename from framework/src/main/java/cn/lili/common/sms/AliSmsUtil.java rename to framework/src/main/java/cn/lili/modules/system/sms/AliSmsUtil.java index ebc0e2f90..a68c1852c 100644 --- a/framework/src/main/java/cn/lili/common/sms/AliSmsUtil.java +++ b/framework/src/main/java/cn/lili/modules/system/sms/AliSmsUtil.java @@ -1,4 +1,4 @@ -package cn.lili.common.sms; +package cn.lili.modules.system.sms; import cn.lili.modules.message.entity.dos.SmsSign; import cn.lili.modules.message.entity.dos.SmsTemplate; diff --git a/framework/src/main/java/cn/lili/common/sms/SmsUtil.java b/framework/src/main/java/cn/lili/modules/system/sms/SmsUtil.java similarity index 97% rename from framework/src/main/java/cn/lili/common/sms/SmsUtil.java rename to framework/src/main/java/cn/lili/modules/system/sms/SmsUtil.java index 0e17b56dd..d4063ffc1 100644 --- a/framework/src/main/java/cn/lili/common/sms/SmsUtil.java +++ b/framework/src/main/java/cn/lili/modules/system/sms/SmsUtil.java @@ -1,4 +1,4 @@ -package cn.lili.common.sms; +package cn.lili.modules.system.sms; import cn.lili.modules.verification.enums.VerificationEnums; diff --git a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java b/framework/src/main/java/cn/lili/modules/system/sms/impl/SmsUtilAliImplService.java similarity index 98% rename from framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java rename to framework/src/main/java/cn/lili/modules/system/sms/impl/SmsUtilAliImplService.java index 7e6da0649..817b79655 100644 --- a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java +++ b/framework/src/main/java/cn/lili/modules/system/sms/impl/SmsUtilAliImplService.java @@ -1,18 +1,18 @@ -package cn.lili.common.sms.impl; +package cn.lili.modules.system.sms.impl; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -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.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.context.UserContext; -import cn.lili.common.sms.AliSmsUtil; -import cn.lili.common.sms.SmsUtil; +import cn.lili.modules.system.sms.AliSmsUtil; +import cn.lili.modules.system.sms.SmsUtil; import cn.lili.common.utils.CommonUtil; import cn.lili.modules.verification.enums.VerificationEnums; -import cn.lili.config.properties.SmsTemplateSetting; -import cn.lili.config.properties.SystemSetting; +import cn.lili.common.config.properties.SmsTemplateSetting; +import cn.lili.common.config.properties.SystemSetting; import cn.lili.modules.connect.util.Base64Utils; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; diff --git a/framework/src/main/java/cn/lili/modules/verification/VerificationSDK.java b/framework/src/main/java/cn/lili/modules/verification/VerificationSDK.java index 9cf2f4575..961896a02 100644 --- a/framework/src/main/java/cn/lili/modules/verification/VerificationSDK.java +++ b/framework/src/main/java/cn/lili/modules/verification/VerificationSDK.java @@ -1,7 +1,7 @@ package cn.lili.modules.verification; -import cn.lili.common.cache.Cache; -import cn.lili.common.cache.CachePrefix; +import cn.lili.cache.Cache; +import cn.lili.cache.CachePrefix; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java index 0c8960081..d37275ab6 100644 --- a/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java @@ -1,7 +1,7 @@ package cn.lili.modules.verification.service.impl; -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.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.StringUtils; diff --git a/framework/src/main/java/cn/lili/common/heath/DataSourceHealthConfig.java b/framework/src/main/java/cn/lili/mybatis/heath/DataSourceHealthConfig.java similarity index 97% rename from framework/src/main/java/cn/lili/common/heath/DataSourceHealthConfig.java rename to framework/src/main/java/cn/lili/mybatis/heath/DataSourceHealthConfig.java index 2437cc995..41e4143ee 100644 --- a/framework/src/main/java/cn/lili/common/heath/DataSourceHealthConfig.java +++ b/framework/src/main/java/cn/lili/mybatis/heath/DataSourceHealthConfig.java @@ -1,4 +1,4 @@ -package cn.lili.common.heath; +package cn.lili.mybatis.heath; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Value; diff --git a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingDatabaseAlgorithm.java b/framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingDatabaseAlgorithm.java similarity index 97% rename from framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingDatabaseAlgorithm.java rename to framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingDatabaseAlgorithm.java index dc1f6b66f..164c20274 100644 --- a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingDatabaseAlgorithm.java +++ b/framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingDatabaseAlgorithm.java @@ -1,4 +1,4 @@ -package cn.lili.config.sharding; +package cn.lili.mybatis.sharding; import cn.lili.common.utils.DateUtil; import com.google.common.collect.Range; diff --git a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithm.java b/framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingTableAlgorithm.java similarity index 98% rename from framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithm.java rename to framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingTableAlgorithm.java index 619da8cdf..5d07ec384 100644 --- a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithm.java +++ b/framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingTableAlgorithm.java @@ -1,4 +1,4 @@ -package cn.lili.config.sharding; +package cn.lili.mybatis.sharding; import cn.hutool.core.convert.Convert; import cn.lili.common.utils.DateUtil; diff --git a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithmBak.java b/framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingTableAlgorithmBak.java similarity index 97% rename from framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithmBak.java rename to framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingTableAlgorithmBak.java index 98a27c1ae..a35f7b52f 100644 --- a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithmBak.java +++ b/framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingTableAlgorithmBak.java @@ -1,4 +1,4 @@ -package cn.lili.config.sharding; +package cn.lili.mybatis.sharding; import cn.lili.common.utils.DateUtil; import org.apache.shardingsphere.api.sharding.standard.PreciseShardingAlgorithm; diff --git a/framework/src/main/java/cn/lili/common/rocketmq/RocketmqSendCallback.java b/framework/src/main/java/cn/lili/rocketmq/RocketmqSendCallback.java similarity index 94% rename from framework/src/main/java/cn/lili/common/rocketmq/RocketmqSendCallback.java rename to framework/src/main/java/cn/lili/rocketmq/RocketmqSendCallback.java index 088420b3e..797bc467b 100644 --- a/framework/src/main/java/cn/lili/common/rocketmq/RocketmqSendCallback.java +++ b/framework/src/main/java/cn/lili/rocketmq/RocketmqSendCallback.java @@ -1,4 +1,4 @@ -package cn.lili.common.rocketmq; +package cn.lili.rocketmq; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.producer.SendCallback; diff --git a/framework/src/main/java/cn/lili/common/rocketmq/RocketmqSendCallbackBuilder.java b/framework/src/main/java/cn/lili/rocketmq/RocketmqSendCallbackBuilder.java similarity index 85% rename from framework/src/main/java/cn/lili/common/rocketmq/RocketmqSendCallbackBuilder.java rename to framework/src/main/java/cn/lili/rocketmq/RocketmqSendCallbackBuilder.java index d29c25eb6..13691db7f 100644 --- a/framework/src/main/java/cn/lili/common/rocketmq/RocketmqSendCallbackBuilder.java +++ b/framework/src/main/java/cn/lili/rocketmq/RocketmqSendCallbackBuilder.java @@ -1,4 +1,4 @@ -package cn.lili.common.rocketmq; +package cn.lili.rocketmq; /** * @author paulG diff --git a/framework/src/main/java/cn/lili/common/rocketmq/tags/AfterSaleTagsEnum.java b/framework/src/main/java/cn/lili/rocketmq/tags/AfterSaleTagsEnum.java similarity index 92% rename from framework/src/main/java/cn/lili/common/rocketmq/tags/AfterSaleTagsEnum.java rename to framework/src/main/java/cn/lili/rocketmq/tags/AfterSaleTagsEnum.java index b668ee793..174f3ecce 100644 --- a/framework/src/main/java/cn/lili/common/rocketmq/tags/AfterSaleTagsEnum.java +++ b/framework/src/main/java/cn/lili/rocketmq/tags/AfterSaleTagsEnum.java @@ -1,4 +1,4 @@ -package cn.lili.common.rocketmq.tags; +package cn.lili.rocketmq.tags; /** * 售后标签枚举 diff --git a/framework/src/main/java/cn/lili/common/rocketmq/tags/GoodsTagsEnum.java b/framework/src/main/java/cn/lili/rocketmq/tags/GoodsTagsEnum.java similarity index 95% rename from framework/src/main/java/cn/lili/common/rocketmq/tags/GoodsTagsEnum.java rename to framework/src/main/java/cn/lili/rocketmq/tags/GoodsTagsEnum.java index f4dbd25bf..089b24a93 100644 --- a/framework/src/main/java/cn/lili/common/rocketmq/tags/GoodsTagsEnum.java +++ b/framework/src/main/java/cn/lili/rocketmq/tags/GoodsTagsEnum.java @@ -1,4 +1,4 @@ -package cn.lili.common.rocketmq.tags; +package cn.lili.rocketmq.tags; /** * @author paulG diff --git a/framework/src/main/java/cn/lili/common/rocketmq/tags/MemberTagsEnum.java b/framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java similarity index 94% rename from framework/src/main/java/cn/lili/common/rocketmq/tags/MemberTagsEnum.java rename to framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java index 88fb01fe7..0d8c02a27 100644 --- a/framework/src/main/java/cn/lili/common/rocketmq/tags/MemberTagsEnum.java +++ b/framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java @@ -1,4 +1,4 @@ -package cn.lili.common.rocketmq.tags; +package cn.lili.rocketmq.tags; /** * 会员操作枚举 diff --git a/framework/src/main/java/cn/lili/common/rocketmq/tags/MqOrderTagsEnum.java b/framework/src/main/java/cn/lili/rocketmq/tags/MqOrderTagsEnum.java similarity index 92% rename from framework/src/main/java/cn/lili/common/rocketmq/tags/MqOrderTagsEnum.java rename to framework/src/main/java/cn/lili/rocketmq/tags/MqOrderTagsEnum.java index fde73145a..cfe9ba87d 100644 --- a/framework/src/main/java/cn/lili/common/rocketmq/tags/MqOrderTagsEnum.java +++ b/framework/src/main/java/cn/lili/rocketmq/tags/MqOrderTagsEnum.java @@ -1,4 +1,4 @@ -package cn.lili.common.rocketmq.tags; +package cn.lili.rocketmq.tags; /** * 订单操作枚举 diff --git a/framework/src/main/java/cn/lili/common/rocketmq/tags/OtherTagsEnum.java b/framework/src/main/java/cn/lili/rocketmq/tags/OtherTagsEnum.java similarity index 92% rename from framework/src/main/java/cn/lili/common/rocketmq/tags/OtherTagsEnum.java rename to framework/src/main/java/cn/lili/rocketmq/tags/OtherTagsEnum.java index 6117c6365..c4c2000ec 100644 --- a/framework/src/main/java/cn/lili/common/rocketmq/tags/OtherTagsEnum.java +++ b/framework/src/main/java/cn/lili/rocketmq/tags/OtherTagsEnum.java @@ -1,4 +1,4 @@ -package cn.lili.common.rocketmq.tags; +package cn.lili.rocketmq.tags; /** * 其他操作枚举 diff --git a/framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java b/framework/src/main/java/cn/lili/trigger/delay/AbstractDelayQueueMachineFactory.java similarity index 93% rename from framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java rename to framework/src/main/java/cn/lili/trigger/delay/AbstractDelayQueueMachineFactory.java index 4470b3950..18d3b7bd0 100644 --- a/framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java +++ b/framework/src/main/java/cn/lili/trigger/delay/AbstractDelayQueueMachineFactory.java @@ -1,6 +1,6 @@ -package cn.lili.common.trigger.delay; +package cn.lili.trigger.delay; -import cn.lili.common.cache.Cache; +import cn.lili.cache.Cache; import cn.lili.common.utils.DateUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/framework/src/main/java/cn/lili/common/trigger/delay/queue/PromotionDelayQueue.java b/framework/src/main/java/cn/lili/trigger/delay/queue/PromotionDelayQueue.java similarity index 69% rename from framework/src/main/java/cn/lili/common/trigger/delay/queue/PromotionDelayQueue.java rename to framework/src/main/java/cn/lili/trigger/delay/queue/PromotionDelayQueue.java index 28f927137..728eba0c5 100644 --- a/framework/src/main/java/cn/lili/common/trigger/delay/queue/PromotionDelayQueue.java +++ b/framework/src/main/java/cn/lili/trigger/delay/queue/PromotionDelayQueue.java @@ -1,7 +1,7 @@ -package cn.lili.common.trigger.delay.queue; +package cn.lili.trigger.delay.queue; -import cn.lili.common.trigger.delay.AbstractDelayQueueMachineFactory; -import cn.lili.common.trigger.enums.DelayQueueEnums; +import cn.lili.trigger.delay.AbstractDelayQueueMachineFactory; +import cn.lili.trigger.enums.DelayQueueEnums; import org.springframework.stereotype.Component; /** diff --git a/framework/src/main/java/cn/lili/common/trigger/enums/DelayQueueEnums.java b/framework/src/main/java/cn/lili/trigger/enums/DelayQueueEnums.java similarity index 88% rename from framework/src/main/java/cn/lili/common/trigger/enums/DelayQueueEnums.java rename to framework/src/main/java/cn/lili/trigger/enums/DelayQueueEnums.java index 54998fdaa..d35c76799 100644 --- a/framework/src/main/java/cn/lili/common/trigger/enums/DelayQueueEnums.java +++ b/framework/src/main/java/cn/lili/trigger/enums/DelayQueueEnums.java @@ -1,4 +1,4 @@ -package cn.lili.common.trigger.enums; +package cn.lili.trigger.enums; /** * 队列枚举 diff --git a/framework/src/main/java/cn/lili/common/trigger/enums/DelayTypeEnums.java b/framework/src/main/java/cn/lili/trigger/enums/DelayTypeEnums.java similarity index 91% rename from framework/src/main/java/cn/lili/common/trigger/enums/DelayTypeEnums.java rename to framework/src/main/java/cn/lili/trigger/enums/DelayTypeEnums.java index 2369fa524..85345f90a 100644 --- a/framework/src/main/java/cn/lili/common/trigger/enums/DelayTypeEnums.java +++ b/framework/src/main/java/cn/lili/trigger/enums/DelayTypeEnums.java @@ -1,4 +1,4 @@ -package cn.lili.common.trigger.enums; +package cn.lili.trigger.enums; /** * 延时任务类型 diff --git a/framework/src/main/java/cn/lili/common/trigger/interfaces/TimeTrigger.java b/framework/src/main/java/cn/lili/trigger/interfaces/TimeTrigger.java similarity index 92% rename from framework/src/main/java/cn/lili/common/trigger/interfaces/TimeTrigger.java rename to framework/src/main/java/cn/lili/trigger/interfaces/TimeTrigger.java index 820314ae6..3e2e95b21 100644 --- a/framework/src/main/java/cn/lili/common/trigger/interfaces/TimeTrigger.java +++ b/framework/src/main/java/cn/lili/trigger/interfaces/TimeTrigger.java @@ -1,6 +1,6 @@ -package cn.lili.common.trigger.interfaces; +package cn.lili.trigger.interfaces; -import cn.lili.common.trigger.model.TimeTriggerMsg; +import cn.lili.trigger.model.TimeTriggerMsg; /** * 延时执行接口 diff --git a/framework/src/main/java/cn/lili/common/trigger/interfaces/impl/RocketmqTimerTrigger.java b/framework/src/main/java/cn/lili/trigger/interfaces/impl/RocketmqTimerTrigger.java similarity index 91% rename from framework/src/main/java/cn/lili/common/trigger/interfaces/impl/RocketmqTimerTrigger.java rename to framework/src/main/java/cn/lili/trigger/interfaces/impl/RocketmqTimerTrigger.java index b6589bc1b..32ce40848 100644 --- a/framework/src/main/java/cn/lili/common/trigger/interfaces/impl/RocketmqTimerTrigger.java +++ b/framework/src/main/java/cn/lili/trigger/interfaces/impl/RocketmqTimerTrigger.java @@ -1,12 +1,12 @@ -package cn.lili.common.trigger.interfaces.impl; +package cn.lili.trigger.interfaces.impl; import cn.hutool.json.JSONUtil; -import cn.lili.common.cache.Cache; -import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder; -import cn.lili.common.trigger.delay.queue.PromotionDelayQueue; -import cn.lili.common.trigger.interfaces.TimeTrigger; -import cn.lili.common.trigger.model.TimeTriggerMsg; -import cn.lili.common.trigger.util.DelayQueueTools; +import cn.lili.cache.Cache; +import cn.lili.rocketmq.RocketmqSendCallbackBuilder; +import cn.lili.trigger.delay.queue.PromotionDelayQueue; +import cn.lili.trigger.interfaces.TimeTrigger; +import cn.lili.trigger.model.TimeTriggerMsg; +import cn.lili.trigger.util.DelayQueueTools; import cn.lili.common.utils.DateUtil; import cn.lili.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/cn/lili/common/trigger/message/BroadcastMessage.java b/framework/src/main/java/cn/lili/trigger/message/BroadcastMessage.java similarity index 100% rename from framework/src/main/java/cn/lili/common/trigger/message/BroadcastMessage.java rename to framework/src/main/java/cn/lili/trigger/message/BroadcastMessage.java diff --git a/framework/src/main/java/cn/lili/common/trigger/message/PintuanOrderMessage.java b/framework/src/main/java/cn/lili/trigger/message/PintuanOrderMessage.java similarity index 90% rename from framework/src/main/java/cn/lili/common/trigger/message/PintuanOrderMessage.java rename to framework/src/main/java/cn/lili/trigger/message/PintuanOrderMessage.java index e8acf50fe..b331ee22f 100644 --- a/framework/src/main/java/cn/lili/common/trigger/message/PintuanOrderMessage.java +++ b/framework/src/main/java/cn/lili/trigger/message/PintuanOrderMessage.java @@ -1,4 +1,4 @@ -package cn.lili.common.trigger.message; +package cn.lili.trigger.message; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/common/trigger/message/PromotionMessage.java b/framework/src/main/java/cn/lili/trigger/message/PromotionMessage.java similarity index 93% rename from framework/src/main/java/cn/lili/common/trigger/message/PromotionMessage.java rename to framework/src/main/java/cn/lili/trigger/message/PromotionMessage.java index 1ec5c1ae0..86dfd9848 100644 --- a/framework/src/main/java/cn/lili/common/trigger/message/PromotionMessage.java +++ b/framework/src/main/java/cn/lili/trigger/message/PromotionMessage.java @@ -1,4 +1,4 @@ -package cn.lili.common.trigger.message; +package cn.lili.trigger.message; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/common/trigger/model/TimeExecuteConstant.java b/framework/src/main/java/cn/lili/trigger/model/TimeExecuteConstant.java similarity index 91% rename from framework/src/main/java/cn/lili/common/trigger/model/TimeExecuteConstant.java rename to framework/src/main/java/cn/lili/trigger/model/TimeExecuteConstant.java index e9136ee47..2e79068fe 100644 --- a/framework/src/main/java/cn/lili/common/trigger/model/TimeExecuteConstant.java +++ b/framework/src/main/java/cn/lili/trigger/model/TimeExecuteConstant.java @@ -1,4 +1,4 @@ -package cn.lili.common.trigger.model; +package cn.lili.trigger.model; /** * 延时任务执行器常量 diff --git a/framework/src/main/java/cn/lili/common/trigger/model/TimeTriggerMsg.java b/framework/src/main/java/cn/lili/trigger/model/TimeTriggerMsg.java similarity index 95% rename from framework/src/main/java/cn/lili/common/trigger/model/TimeTriggerMsg.java rename to framework/src/main/java/cn/lili/trigger/model/TimeTriggerMsg.java index 09ed7b006..8b620c00d 100644 --- a/framework/src/main/java/cn/lili/common/trigger/model/TimeTriggerMsg.java +++ b/framework/src/main/java/cn/lili/trigger/model/TimeTriggerMsg.java @@ -1,4 +1,4 @@ -package cn.lili.common.trigger.model; +package cn.lili.trigger.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/common/trigger/util/DelayQueueTools.java b/framework/src/main/java/cn/lili/trigger/util/DelayQueueTools.java similarity index 90% rename from framework/src/main/java/cn/lili/common/trigger/util/DelayQueueTools.java rename to framework/src/main/java/cn/lili/trigger/util/DelayQueueTools.java index c8ce87be6..22074a450 100644 --- a/framework/src/main/java/cn/lili/common/trigger/util/DelayQueueTools.java +++ b/framework/src/main/java/cn/lili/trigger/util/DelayQueueTools.java @@ -1,6 +1,6 @@ -package cn.lili.common.trigger.util; +package cn.lili.trigger.util; -import cn.lili.common.trigger.enums.DelayTypeEnums; +import cn.lili.trigger.enums.DelayTypeEnums; /** * 延时任务工具类 diff --git a/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java b/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java index e24b82816..d8fa20ed4 100755 --- a/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java +++ b/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java @@ -1,8 +1,8 @@ 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; diff --git a/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java b/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java index 809105a59..ec8386649 100644 --- 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.config.properties.IgnoredUrlsProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; diff --git a/manager-api/src/main/resources/application.yml b/manager-api/src/main/resources/application.yml index 0d6ad2534..99c408e5c 100644 --- 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: diff --git a/manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java b/manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java index d0ed486a1..0d7699a7a 100644 --- 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; diff --git a/manager-api/src/test/java/cn/lili/test/promotion/CouponTest.java b/manager-api/src/test/java/cn/lili/test/promotion/CouponTest.java index 5c155fc6f..05c3dd52c 100644 --- 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,7 @@ package cn.lili.test.promotion; 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.enums.GoodsStatusEnum; import cn.lili.modules.goods.service.GoodsSkuService; import cn.lili.modules.promotion.entity.dos.Coupon; diff --git a/manager-api/src/test/java/cn/lili/test/rocketmq/MsgExtRocketMqTest.java b/manager-api/src/test/java/cn/lili/test/rocketmq/MsgExtRocketMqTest.java index f5f34bf1b..f658b735f 100644 --- 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.config.rocketmq.RocketmqCustomProperties; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java index 1290ded13..df6f4b3d1 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java @@ -1,13 +1,10 @@ package cn.lili.controller.trade; -import cn.hutool.poi.excel.ExcelReader; -import cn.hutool.poi.excel.ExcelUtil; import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.config.context.ThreadContextHolder; +import cn.lili.common.config.context.ThreadContextHolder; import cn.lili.modules.member.entity.dto.MemberAddressDTO; -import cn.lili.modules.order.order.entity.dto.OrderBatchDeliverDTO; import cn.lili.modules.order.order.entity.dto.OrderExportDTO; import cn.lili.modules.order.order.entity.dto.OrderSearchParams; import cn.lili.modules.order.order.entity.vo.OrderDetailVO; @@ -30,8 +27,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.io.InputStream; -import java.util.ArrayList; import java.util.List; /** diff --git a/seller-api/src/main/java/cn/lili/security/StoreAuthenticationFilter.java b/seller-api/src/main/java/cn/lili/security/StoreAuthenticationFilter.java index 89718806d..7b20ea1fc 100755 --- a/seller-api/src/main/java/cn/lili/security/StoreAuthenticationFilter.java +++ b/seller-api/src/main/java/cn/lili/security/StoreAuthenticationFilter.java @@ -1,8 +1,8 @@ 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; diff --git a/seller-api/src/main/java/cn/lili/security/StoreSecurityConfig.java b/seller-api/src/main/java/cn/lili/security/StoreSecurityConfig.java index d06df79dd..aa7ea3b29 100644 --- a/seller-api/src/main/java/cn/lili/security/StoreSecurityConfig.java +++ b/seller-api/src/main/java/cn/lili/security/StoreSecurityConfig.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; diff --git a/seller-api/src/main/resources/application.yml b/seller-api/src/main/resources/application.yml index fe58f5f87..24c344833 100644 --- a/seller-api/src/main/resources/application.yml +++ b/seller-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: