diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java index e2a0ac3df..d9dac7f5b 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java @@ -5,8 +5,8 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; import cn.lili.common.enums.ResultUtil; -import cn.lili.common.verification.enums.VerificationEnums; -import cn.lili.common.verification.service.VerificationService; +import cn.lili.modules.verification.enums.VerificationEnums; +import cn.lili.modules.verification.service.VerificationService; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.dos.MemberWallet; diff --git a/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java index 204347420..acea7dc56 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.member; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; diff --git a/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java index 6b173d386..25530f94c 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.member; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; diff --git a/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java index 6249bd527..eef2a8c4e 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.other; import cn.lili.common.enums.ResultUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.system.entity.dos.AppVersion; 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 43a5ca6c7..7528ff04f 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,10 +2,10 @@ 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.common.verification.enums.VerificationEnums; -import cn.lili.common.verification.service.VerificationService; +import cn.lili.modules.verification.enums.VerificationEnums; +import cn.lili.modules.verification.service.VerificationService; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.dto.MemberEditDTO; diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java index 76093ff1c..8e3264b3b 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java @@ -3,7 +3,7 @@ package cn.lili.controller.passport.connect; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.token.Token; +import cn.lili.common.security.token.Token; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.connect.entity.dto.AuthCallback; diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java index 7c3697a8f..f7c63f4a8 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.passport.connect; -import cn.lili.common.token.Token; +import cn.lili.common.security.token.Token; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.connect.entity.dto.WechatMPLoginParams; diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java index 7e8143e86..9ec1ed223 100644 --- a/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java @@ -6,7 +6,7 @@ import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.entity.vos.PintuanMemberVO; import cn.lili.modules.promotion.entity.vos.PintuanShareVO; import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams; diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java index fc990f5c3..aa1708ecf 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.trade; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; 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 bee0fde58..7372a7d2a 100755 --- a/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java +++ b/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java @@ -1,12 +1,12 @@ package cn.lili.security; import cn.hutool.core.util.StrUtil; -import cn.lili.common.cache.Cache; -import cn.lili.common.cache.CachePrefix; +import cn.lili.cache.Cache; +import cn.lili.cache.CachePrefix; import cn.lili.common.security.AuthUser; import cn.lili.common.security.enums.SecurityEnum; import cn.lili.common.security.enums.UserEnums; -import cn.lili.common.token.SecretKeyUtil; +import cn.lili.common.security.token.SecretKeyUtil; import cn.lili.common.utils.ResponseUtil; import com.google.gson.Gson; import io.jsonwebtoken.Claims; 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 79eedb9f1..8ba35de55 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.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 02c5f7dc0..84df93ffc 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 f8f426579..640ffec97 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,11 +1,11 @@ package cn.lili.controller.common; -import cn.lili.common.aop.limiter.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; -import cn.lili.common.verification.enums.VerificationEnums; -import cn.lili.common.verification.service.VerificationService; +import cn.lili.modules.verification.enums.VerificationEnums; +import cn.lili.modules.verification.service.VerificationService; import cn.lili.common.vo.ResultMessage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; 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 c3683c641..70f5bfabd 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,12 +1,12 @@ package cn.lili.controller.common; -import cn.lili.common.aop.limiter.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.common.verification.enums.VerificationEnums; -import cn.lili.common.verification.service.VerificationService; +import cn.lili.modules.verification.enums.VerificationEnums; +import cn.lili.modules.verification.service.VerificationService; import cn.lili.common.vo.ResultMessage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; 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 047dc8aa2..82003a58b 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.properties.SystemSettingProperties; import cn.lili.modules.file.entity.File; import cn.lili.modules.file.plugin.FileManagerPlugin; import cn.lili.modules.file.service.FileService; @@ -53,7 +53,7 @@ public class UploadController { private Cache cache; @Autowired - private SystemSetting systemSetting; + private SystemSettingProperties systemSettingProperties; @ApiOperation(value = "文件上传") @PostMapping(value = "/file") @@ -109,6 +109,6 @@ public class UploadController { @ApiOperation(value = "返回licences") @PostMapping(value = "/licences") public ResultMessage licences() { - return ResultUtil.data(systemSetting.getLicences()); + return ResultUtil.data(systemSettingProperties.getLicences()); } } 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 c1d1d110f..8fa1f8c2c 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.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 b15ff6040..4752032f1 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; @@ -11,7 +11,7 @@ import cn.lili.modules.order.order.entity.enums.PayStatusEnum; import cn.lili.modules.order.order.entity.vo.OrderDetailVO; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.promotion.entity.dos.PromotionGoods; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.service.PromotionGoodsService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; 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 6a35f44ad..0dec275ba 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.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 2601b761a..edd45045c 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 f4d407213..f53371a93 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 a6bbeeb5a..c7d74cf91 100644 --- a/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java +++ b/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java @@ -1,8 +1,8 @@ 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.message.BroadcastMessage; +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 77d80e919..bc331eb90 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.properties.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/pom.xml b/framework/pom.xml index ded46f474..9568b25df 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -63,21 +63,16 @@ org.springframework.boot spring-boot-starter-data-mongodb - - - org.springframework.boot - spring-boot-starter-thymeleaf - org.springframework.boot spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-websocket - + + + + + com.baomidou 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 a6064b522..c8c690809 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 98% 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..ce8cc3922 100644 --- a/framework/src/main/java/cn/lili/common/cache/CachePrefix.java +++ b/framework/src/main/java/cn/lili/cache/CachePrefix.java @@ -1,7 +1,7 @@ -package cn.lili.common.cache; +package cn.lili.cache; import cn.lili.common.security.enums.UserEnums; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; /** * 缓存前缀 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 2c7b53803..d59e29cfe 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 8f490649e..62d505b2b 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 880882b21..ef96f058e 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/aop/limiter/annotation/LimitPoint.java b/framework/src/main/java/cn/lili/cache/limit/annotation/LimitPoint.java similarity index 88% rename from framework/src/main/java/cn/lili/common/aop/limiter/annotation/LimitPoint.java rename to framework/src/main/java/cn/lili/cache/limit/annotation/LimitPoint.java index cee99c07b..182bb5067 100644 --- a/framework/src/main/java/cn/lili/common/aop/limiter/annotation/LimitPoint.java +++ b/framework/src/main/java/cn/lili/cache/limit/annotation/LimitPoint.java @@ -1,7 +1,7 @@ -package cn.lili.common.aop.limiter.annotation; +package cn.lili.cache.limit.annotation; -import cn.lili.common.aop.limiter.LimitType; +import cn.lili.cache.limit.enums.LimitTypeEnums; import java.lang.annotation.*; @@ -60,5 +60,5 @@ public @interface LimitPoint { * * @return LimitType */ - LimitType limitType() default LimitType.IP; + LimitTypeEnums limitType() default LimitTypeEnums.IP; } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/common/aop/limiter/LimitType.java b/framework/src/main/java/cn/lili/cache/limit/enums/LimitTypeEnums.java similarity index 78% rename from framework/src/main/java/cn/lili/common/aop/limiter/LimitType.java rename to framework/src/main/java/cn/lili/cache/limit/enums/LimitTypeEnums.java index 110f21957..50b060bc1 100644 --- a/framework/src/main/java/cn/lili/common/aop/limiter/LimitType.java +++ b/framework/src/main/java/cn/lili/cache/limit/enums/LimitTypeEnums.java @@ -1,4 +1,4 @@ -package cn.lili.common.aop.limiter; +package cn.lili.cache.limit.enums; /** @@ -8,7 +8,7 @@ package cn.lili.common.aop.limiter; * @since 2018年2月02日 下午4:58:52 */ -public enum LimitType { +public enum LimitTypeEnums { /** * 自定义key(即全局限流) */ diff --git a/framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java b/framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java similarity index 93% rename from framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java rename to framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java index f6e5397da..465cfc086 100644 --- a/framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java +++ b/framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java @@ -1,6 +1,7 @@ -package cn.lili.common.aop.limiter; +package cn.lili.cache.limit.interceptor; -import cn.lili.common.aop.limiter.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; @@ -43,12 +44,12 @@ public class LimitInterceptor { @Before("@annotation(limitPointAnnotation)") public void interceptor(LimitPoint limitPointAnnotation) { - LimitType limitType = limitPointAnnotation.limitType(); + LimitTypeEnums limitTypeEnums = limitPointAnnotation.limitType(); String name = limitPointAnnotation.name(); String key; int limitPeriod = limitPointAnnotation.period(); int limitCount = limitPointAnnotation.limit(); - switch (limitType) { + switch (limitTypeEnums) { case CUSTOMER: key = limitPointAnnotation.key(); break; diff --git a/framework/src/main/java/cn/lili/common/utils/RedisUtil.java b/framework/src/main/java/cn/lili/cache/util/RedisUtil.java similarity index 99% rename from framework/src/main/java/cn/lili/common/utils/RedisUtil.java rename to framework/src/main/java/cn/lili/cache/util/RedisUtil.java index c1ac34b33..98516a631 100644 --- a/framework/src/main/java/cn/lili/common/utils/RedisUtil.java +++ b/framework/src/main/java/cn/lili/cache/util/RedisUtil.java @@ -1,4 +1,4 @@ -package cn.lili.common.utils; +package cn.lili.cache.util; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/framework/src/main/java/cn/lili/common/cache/MybatisRedisCache.java b/framework/src/main/java/cn/lili/common/cache/MybatisRedisCache.java deleted file mode 100644 index e47185bd4..000000000 --- a/framework/src/main/java/cn/lili/common/cache/MybatisRedisCache.java +++ /dev/null @@ -1,101 +0,0 @@ -package cn.lili.common.cache; - -import cn.lili.common.utils.SpringContextUtil; -import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.cache.Cache; -import org.springframework.data.redis.connection.RedisServerCommands; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.util.CollectionUtils; - -import java.util.Set; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; - -/** - * MybatisRedisCache - * - * @author Chopper - * @version v1.0 - * @since - * 2020-04-01 2:59 下午 - * 不赞成使用此方式注解，统一使用Cacheable 更为合适 - * - * 使用方法 @CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class) - */ -@Deprecated -@Slf4j -public class MybatisRedisCache implements Cache { - - private final ReadWriteLock readWriteLock = new ReentrantReadWriteLock(true); - - - private RedisTemplate getRedisTemplate() { - return (RedisTemplate) SpringContextUtil.getBean("redisTemplate"); - } - - private final String id; - - public MybatisRedisCache(final String id) { - if (id == null) { - throw new IllegalArgumentException("Cache instances require an ID"); - } - this.id = id; - } - - @Override - public String getId() { - return this.id; - } - - @Override - public void putObject(Object key, Object value) { - try { - if (value != null) { - log.info("写入缓存：" + key.toString()+"----"+value.toString()); - getRedisTemplate().opsForValue().set(key.toString(), value); - } - } catch (Exception e) { - log.error("写入mybatis缓存异常 ", e); - } - } - - @Override - public Object getObject(Object key) { - try { - if (key != null) { - log.info("获取缓存：" + key); - return getRedisTemplate().opsForValue().get(key.toString()); - } - } catch (Exception e) { - log.error("mybatis缓存获取异常 ", e); - } - return null; - } - - @Override - public Object removeObject(Object key) { - if (key != null) { - getRedisTemplate().delete(key.toString()); - } - return null; - } - - @Override - public void clear() { - Set keys = getRedisTemplate().keys("*:" + this.id + "*"); - if (!CollectionUtils.isEmpty(keys)) { - getRedisTemplate().delete(keys); - } - } - - @Override - public int getSize() { - Long size = getRedisTemplate().execute(RedisServerCommands::dbSize); - return size.intValue(); - } - - @Override - public ReadWriteLock getReadWriteLock() { - return this.readWriteLock; - } -} diff --git a/framework/src/main/java/cn/lili/config/context/ContextConfiguration.java b/framework/src/main/java/cn/lili/common/context/ContextConfiguration.java similarity index 94% rename from framework/src/main/java/cn/lili/config/context/ContextConfiguration.java rename to framework/src/main/java/cn/lili/common/context/ContextConfiguration.java index ed5d42ee4..a0d712750 100644 --- a/framework/src/main/java/cn/lili/config/context/ContextConfiguration.java +++ b/framework/src/main/java/cn/lili/common/context/ContextConfiguration.java @@ -1,4 +1,4 @@ -package cn.lili.config.context; +package cn.lili.common.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/context/ThreadContextHolder.java similarity index 97% rename from framework/src/main/java/cn/lili/config/context/ThreadContextHolder.java rename to framework/src/main/java/cn/lili/common/context/ThreadContextHolder.java index 60bcc7974..87007ac4f 100644 --- a/framework/src/main/java/cn/lili/config/context/ThreadContextHolder.java +++ b/framework/src/main/java/cn/lili/common/context/ThreadContextHolder.java @@ -1,4 +1,4 @@ -package cn.lili.config.context; +package cn.lili.common.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/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/context/ThreadContextHolderInterceptorAdapter.java index b78c4ca02..5e3342d04 100644 --- a/framework/src/main/java/cn/lili/config/context/ThreadContextHolderInterceptorAdapter.java +++ b/framework/src/main/java/cn/lili/common/context/ThreadContextHolderInterceptorAdapter.java @@ -1,4 +1,4 @@ -package cn.lili.config.context; +package cn.lili.common.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/context/interceptor/RequestInterceptorAdapter.java similarity index 93% rename from framework/src/main/java/cn/lili/config/interceptor/RequestInterceptorAdapter.java rename to framework/src/main/java/cn/lili/common/context/interceptor/RequestInterceptorAdapter.java index 17e7f37a9..42348795b 100644 --- a/framework/src/main/java/cn/lili/config/interceptor/RequestInterceptorAdapter.java +++ b/framework/src/main/java/cn/lili/common/context/interceptor/RequestInterceptorAdapter.java @@ -1,6 +1,6 @@ -package cn.lili.config.interceptor; +package cn.lili.common.context.interceptor; -import cn.lili.config.context.ThreadContextHolder; +import cn.lili.common.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/context/interceptor/UrlConfiguration.java similarity index 94% rename from framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java rename to framework/src/main/java/cn/lili/common/context/interceptor/UrlConfiguration.java index 8bb5c5f70..593ec06b8 100644 --- a/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java +++ b/framework/src/main/java/cn/lili/common/context/interceptor/UrlConfiguration.java @@ -1,6 +1,6 @@ -package cn.lili.config.interceptor; +package cn.lili.common.context.interceptor; -import cn.lili.config.properties.IgnoredUrlsProperties; +import cn.lili.common.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/modules/promotion/entity/enums/PromotionTypeEnum.java b/framework/src/main/java/cn/lili/common/enums/PromotionTypeEnum.java similarity index 95% rename from framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionTypeEnum.java rename to framework/src/main/java/cn/lili/common/enums/PromotionTypeEnum.java index ee56a2967..3c4c845cc 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionTypeEnum.java +++ b/framework/src/main/java/cn/lili/common/enums/PromotionTypeEnum.java @@ -1,4 +1,4 @@ -package cn.lili.modules.promotion.entity.enums; +package cn.lili.common.enums; /** diff --git a/framework/src/main/java/cn/lili/config/properties/ApiProperties.java b/framework/src/main/java/cn/lili/common/properties/ApiProperties.java similarity index 94% rename from framework/src/main/java/cn/lili/config/properties/ApiProperties.java rename to framework/src/main/java/cn/lili/common/properties/ApiProperties.java index 806c891d9..9a584dde7 100644 --- a/framework/src/main/java/cn/lili/config/properties/ApiProperties.java +++ b/framework/src/main/java/cn/lili/common/properties/ApiProperties.java @@ -1,4 +1,4 @@ -package cn.lili.config.properties; +package cn.lili.common.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/properties/DomainProperties.java similarity index 94% rename from framework/src/main/java/cn/lili/config/properties/DomainProperties.java rename to framework/src/main/java/cn/lili/common/properties/DomainProperties.java index 7a56f007e..0f7675f47 100644 --- a/framework/src/main/java/cn/lili/config/properties/DomainProperties.java +++ b/framework/src/main/java/cn/lili/common/properties/DomainProperties.java @@ -1,4 +1,4 @@ -package cn.lili.config.properties; +package cn.lili.common.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/properties/IgnoredUrlsProperties.java similarity index 93% rename from framework/src/main/java/cn/lili/config/properties/IgnoredUrlsProperties.java rename to framework/src/main/java/cn/lili/common/properties/IgnoredUrlsProperties.java index 097fdee62..b3ffc857b 100644 --- a/framework/src/main/java/cn/lili/config/properties/IgnoredUrlsProperties.java +++ b/framework/src/main/java/cn/lili/common/properties/IgnoredUrlsProperties.java @@ -1,4 +1,4 @@ -package cn.lili.config.properties; +package cn.lili.common.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/properties/JWTTokenProperties.java similarity index 92% rename from framework/src/main/java/cn/lili/config/properties/JWTTokenProperties.java rename to framework/src/main/java/cn/lili/common/properties/JWTTokenProperties.java index b542694c0..d56293cf9 100644 --- a/framework/src/main/java/cn/lili/config/properties/JWTTokenProperties.java +++ b/framework/src/main/java/cn/lili/common/properties/JWTTokenProperties.java @@ -1,4 +1,4 @@ -package cn.lili.config.properties; +package cn.lili.common.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/properties/RocketmqCustomProperties.java similarity index 97% rename from framework/src/main/java/cn/lili/config/rocketmq/RocketmqCustomProperties.java rename to framework/src/main/java/cn/lili/common/properties/RocketmqCustomProperties.java index daedfe43f..934057ac9 100644 --- a/framework/src/main/java/cn/lili/config/rocketmq/RocketmqCustomProperties.java +++ b/framework/src/main/java/cn/lili/common/properties/RocketmqCustomProperties.java @@ -1,4 +1,4 @@ -package cn.lili.config.rocketmq; +package cn.lili.common.properties; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/framework/src/main/java/cn/lili/config/properties/SmsTemplateSetting.java b/framework/src/main/java/cn/lili/common/properties/SmsTemplateProperties.java similarity index 90% rename from framework/src/main/java/cn/lili/config/properties/SmsTemplateSetting.java rename to framework/src/main/java/cn/lili/common/properties/SmsTemplateProperties.java index 5c05732dc..55dbf7ae5 100644 --- a/framework/src/main/java/cn/lili/config/properties/SmsTemplateSetting.java +++ b/framework/src/main/java/cn/lili/common/properties/SmsTemplateProperties.java @@ -1,4 +1,4 @@ -package cn.lili.config.properties; +package cn.lili.common.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration; @Data @Configuration @ConfigurationProperties(prefix = "lili.sms") -public class SmsTemplateSetting { +public class SmsTemplateProperties { /** * 登录 */ diff --git a/framework/src/main/java/cn/lili/config/properties/StatisticsProperties.java b/framework/src/main/java/cn/lili/common/properties/StatisticsProperties.java similarity index 96% rename from framework/src/main/java/cn/lili/config/properties/StatisticsProperties.java rename to framework/src/main/java/cn/lili/common/properties/StatisticsProperties.java index b46690805..30cd2ba3c 100644 --- a/framework/src/main/java/cn/lili/config/properties/StatisticsProperties.java +++ b/framework/src/main/java/cn/lili/common/properties/StatisticsProperties.java @@ -1,4 +1,4 @@ -package cn.lili.config.properties; +package cn.lili.common.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/properties/SystemSettingProperties.java similarity index 88% rename from framework/src/main/java/cn/lili/config/properties/SystemSetting.java rename to framework/src/main/java/cn/lili/common/properties/SystemSettingProperties.java index 17186884c..7391fe527 100644 --- a/framework/src/main/java/cn/lili/config/properties/SystemSetting.java +++ b/framework/src/main/java/cn/lili/common/properties/SystemSettingProperties.java @@ -1,4 +1,4 @@ -package cn.lili.config.properties; +package cn.lili.common.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration; @Data @Configuration @ConfigurationProperties(prefix = "lili.system") -public class SystemSetting { +public class SystemSettingProperties { /** diff --git a/framework/src/main/java/cn/lili/config/properties/ThreadProperties.java b/framework/src/main/java/cn/lili/common/properties/ThreadProperties.java similarity index 95% rename from framework/src/main/java/cn/lili/config/properties/ThreadProperties.java rename to framework/src/main/java/cn/lili/common/properties/ThreadProperties.java index b58c78269..df57a9c2e 100644 --- a/framework/src/main/java/cn/lili/config/properties/ThreadProperties.java +++ b/framework/src/main/java/cn/lili/common/properties/ThreadProperties.java @@ -1,4 +1,4 @@ -package cn.lili.config.properties; +package cn.lili.common.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; 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 1cb42b928..534afdc2b 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,11 +1,11 @@ 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; import cn.lili.common.security.enums.SecurityEnum; -import cn.lili.common.token.SecretKeyUtil; +import cn.lili.common.security.token.SecretKeyUtil; import com.google.gson.Gson; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/framework/src/main/java/cn/lili/common/token/PermissionEnum.java b/framework/src/main/java/cn/lili/common/security/enums/PermissionEnum.java similarity index 83% rename from framework/src/main/java/cn/lili/common/token/PermissionEnum.java rename to framework/src/main/java/cn/lili/common/security/enums/PermissionEnum.java index cc49343cc..a9007eb96 100644 --- a/framework/src/main/java/cn/lili/common/token/PermissionEnum.java +++ b/framework/src/main/java/cn/lili/common/security/enums/PermissionEnum.java @@ -1,4 +1,4 @@ -package cn.lili.common.token; +package cn.lili.common.security.enums; /** * 权限枚举值 diff --git a/framework/src/main/java/cn/lili/common/token/SecretKeyUtil.java b/framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java similarity index 94% rename from framework/src/main/java/cn/lili/common/token/SecretKeyUtil.java rename to framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java index a87f4a8ce..e5fe970cc 100644 --- a/framework/src/main/java/cn/lili/common/token/SecretKeyUtil.java +++ b/framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java @@ -1,4 +1,4 @@ -package cn.lili.common.token; +package cn.lili.common.security.token; import com.google.api.client.repackaged.org.apache.commons.codec.binary.Base64; import io.jsonwebtoken.io.Decoders; diff --git a/framework/src/main/java/cn/lili/common/token/Token.java b/framework/src/main/java/cn/lili/common/security/token/Token.java similarity index 87% rename from framework/src/main/java/cn/lili/common/token/Token.java rename to framework/src/main/java/cn/lili/common/security/token/Token.java index 94be6fb37..81286345b 100644 --- a/framework/src/main/java/cn/lili/common/token/Token.java +++ b/framework/src/main/java/cn/lili/common/security/token/Token.java @@ -1,4 +1,4 @@ -package cn.lili.common.token; +package cn.lili.common.security.token; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/common/token/TokenUtil.java b/framework/src/main/java/cn/lili/common/security/token/TokenUtil.java similarity index 97% rename from framework/src/main/java/cn/lili/common/token/TokenUtil.java rename to framework/src/main/java/cn/lili/common/security/token/TokenUtil.java index 7646a833a..47bd05850 100644 --- a/framework/src/main/java/cn/lili/common/token/TokenUtil.java +++ b/framework/src/main/java/cn/lili/common/security/token/TokenUtil.java @@ -1,13 +1,13 @@ -package cn.lili.common.token; +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.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/token/base/AbstractTokenGenerate.java b/framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java similarity index 88% rename from framework/src/main/java/cn/lili/common/token/base/AbstractTokenGenerate.java rename to framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java index ddb5cf462..48418b651 100644 --- a/framework/src/main/java/cn/lili/common/token/base/AbstractTokenGenerate.java +++ b/framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java @@ -1,7 +1,7 @@ -package cn.lili.common.token.base; +package cn.lili.common.security.token.base; import cn.lili.common.security.enums.UserEnums; -import cn.lili.common.token.Token; +import cn.lili.common.security.token.Token; /** * AbstractToken diff --git a/framework/src/main/java/cn/lili/config/swagger/Swagger2Config.java b/framework/src/main/java/cn/lili/common/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/swagger/Swagger2Config.java index a9bdf6318..e604498bf 100644 --- a/framework/src/main/java/cn/lili/config/swagger/Swagger2Config.java +++ b/framework/src/main/java/cn/lili/common/swagger/Swagger2Config.java @@ -1,4 +1,4 @@ -package cn.lili.config.swagger; +package cn.lili.common.swagger; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/framework/src/main/java/cn/lili/common/test/BaseTest.java b/framework/src/main/java/cn/lili/common/test/BaseTest.java deleted file mode 100644 index a9ed9b699..000000000 --- a/framework/src/main/java/cn/lili/common/test/BaseTest.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.lili.common.test; - -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.test.annotation.Rollback; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.TestContext; -import org.springframework.test.context.TestExecutionListener; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.transaction.annotation.Transactional; - -/** - * BaseTest - * - * @author Chopper - * @version v1.0 - * @since - * 2020-06-13 12:17 - */ -@RunWith(SpringRunner.class) -@SpringBootTest -@Transactional(rollbackFor = Exception.class) -@Rollback() -@ContextConfiguration -@Configuration -@ComponentScan("cn.lili") -public class BaseTest implements TestExecutionListener { - @Override - public void beforeTestClass(TestContext testContext) throws Exception { - //设置环境变量 解决es冲突 - System.setProperty("es.set.netty.runtime.available.processors", "false"); - } - -} diff --git a/framework/src/main/java/cn/lili/config/thread/ThreadConfig.java b/framework/src/main/java/cn/lili/common/thread/ThreadConfig.java similarity index 94% rename from framework/src/main/java/cn/lili/config/thread/ThreadConfig.java rename to framework/src/main/java/cn/lili/common/thread/ThreadConfig.java index e3943a343..f6aa1d88e 100644 --- a/framework/src/main/java/cn/lili/config/thread/ThreadConfig.java +++ b/framework/src/main/java/cn/lili/common/thread/ThreadConfig.java @@ -1,6 +1,6 @@ -package cn.lili.config.thread; +package cn.lili.common.thread; -import cn.lili.config.properties.ThreadProperties; +import cn.lili.common.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/modules/connect/util/Base64Utils.java b/framework/src/main/java/cn/lili/common/utils/Base64Utils.java similarity index 99% rename from framework/src/main/java/cn/lili/modules/connect/util/Base64Utils.java rename to framework/src/main/java/cn/lili/common/utils/Base64Utils.java index 1a872c1af..38dcf13c6 100644 --- a/framework/src/main/java/cn/lili/modules/connect/util/Base64Utils.java +++ b/framework/src/main/java/cn/lili/common/utils/Base64Utils.java @@ -1,4 +1,4 @@ -package cn.lili.modules.connect.util; +package cn.lili.common.utils; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/framework/src/main/java/cn/lili/common/utils/HibernateProxyTypeAdapter.java b/framework/src/main/java/cn/lili/common/utils/HibernateProxyTypeAdapter.java deleted file mode 100644 index d4f75e5df..000000000 --- a/framework/src/main/java/cn/lili/common/utils/HibernateProxyTypeAdapter.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.lili.common.utils; - -import com.google.gson.Gson; -import com.google.gson.TypeAdapter; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import org.hibernate.Hibernate; -import org.hibernate.proxy.HibernateProxy; - -import java.io.IOException; - -/** - * 代理对象实例化 - * @author Chopper - */ -public class HibernateProxyTypeAdapter extends TypeAdapter { - - public static final TypeAdapterFactory FACTORY = new TypeAdapterFactory() { - - @Override - @SuppressWarnings("unchecked") - public TypeAdapter create(Gson gson, TypeToken type) { - return (HibernateProxy.class.isAssignableFrom(type.getRawType()) ? (TypeAdapter) new HibernateProxyTypeAdapter(gson) : null); - } - }; - private final Gson context; - - private HibernateProxyTypeAdapter(Gson context) { - this.context = context; - } - - @Override - public HibernateProxy read(JsonReader in) throws IOException { - throw new UnsupportedOperationException("Not supported"); - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - @Override - public void write(JsonWriter out, HibernateProxy value) throws IOException { - if (value == null) { - out.nullValue(); - return; - } - //Retrieve the original (not proxy) class - Class baseType = Hibernate.getClass(value); - //Get the TypeAdapter of the original class, to delegate the serialization - TypeAdapter delegate = context.getAdapter(TypeToken.get(baseType)); - //Get a filled instance of the original class - Object unproxiedValue = ((HibernateProxy) value).getHibernateLazyInitializer() - .getImplementation(); - //Serialize the value - delegate.write(out, unproxiedValue); - } -} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/connect/util/HttpUtils.java b/framework/src/main/java/cn/lili/common/utils/HttpUtils.java similarity index 98% rename from framework/src/main/java/cn/lili/modules/connect/util/HttpUtils.java rename to framework/src/main/java/cn/lili/common/utils/HttpUtils.java index e70a2b4e5..4f8e7a3ed 100644 --- a/framework/src/main/java/cn/lili/modules/connect/util/HttpUtils.java +++ b/framework/src/main/java/cn/lili/common/utils/HttpUtils.java @@ -1,4 +1,4 @@ -package cn.lili.modules.connect.util; +package cn.lili.common.utils; import com.xkcoding.http.HttpUtil; import com.xkcoding.http.config.HttpConfig; diff --git a/framework/src/main/java/cn/lili/common/utils/IpHelper.java b/framework/src/main/java/cn/lili/common/utils/IpHelper.java index 6dbae5bba..23fd6d959 100644 --- a/framework/src/main/java/cn/lili/common/utils/IpHelper.java +++ b/framework/src/main/java/cn/lili/common/utils/IpHelper.java @@ -4,7 +4,6 @@ package cn.lili.common.utils; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.http.HttpUtil; -import cn.lili.modules.connect.util.IpUtils; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/cn/lili/modules/connect/util/IpUtils.java b/framework/src/main/java/cn/lili/common/utils/IpUtils.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/connect/util/IpUtils.java rename to framework/src/main/java/cn/lili/common/utils/IpUtils.java index 8b343fa65..2a31a4ba3 100644 --- a/framework/src/main/java/cn/lili/modules/connect/util/IpUtils.java +++ b/framework/src/main/java/cn/lili/common/utils/IpUtils.java @@ -1,4 +1,4 @@ -package cn.lili.modules.connect.util; +package cn.lili.common.utils; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/cn/lili/config/websocket/WebSocketStompConfig.java b/framework/src/main/java/cn/lili/config/websocket/WebSocketStompConfig.java deleted file mode 100644 index 63100a8e4..000000000 --- a/framework/src/main/java/cn/lili/config/websocket/WebSocketStompConfig.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.lili.config.websocket; - -import org.springframework.context.annotation.Configuration; -import org.springframework.messaging.simp.config.MessageBrokerRegistry; -import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; -import org.springframework.web.socket.config.annotation.StompEndpointRegistry; -import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; - -/** - * @author Chopper - */ -@Configuration -@EnableWebSocketMessageBroker -public class WebSocketStompConfig implements WebSocketMessageBrokerConfigurer { - - /** - * 注册stomp端点 - * @param registry - */ - @Override - public void registerStompEndpoints(StompEndpointRegistry registry) { - - //允许使用socketJs方式访问 即可通过http://IP:PORT/manager/ws来和服务端websocket连接 - registry.addEndpoint("/ws").setAllowedOrigins("*").withSockJS(); - } - - /** - * 配置信息代理 - * @param registry - */ - @Override - public void configureMessageBroker(MessageBrokerRegistry registry) { - - //订阅Broker名称 user点对点 topic广播即群发 - registry.enableSimpleBroker("/user","/topic"); - //全局(客户端)使用的消息前缀 - registry.setApplicationDestinationPrefixes("/app"); - //点对点使用的前缀 无需配置 默认/user - registry.setUserDestinationPrefix("/user"); - } -} 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 8c547e989..dc04ee947 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/entity/ConnectConfig.java b/framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java index b32d62e6b..a6c1bd3e7 100644 --- a/framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java +++ b/framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java @@ -1,6 +1,6 @@ package cn.lili.modules.connect.entity; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.modules.connect.entity.enums.ConnectConfigEnum; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; 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..8ecd0e1b1 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; @@ -12,7 +12,7 @@ import cn.lili.modules.connect.entity.dto.ConnectAuthUser; import cn.lili.modules.connect.entity.enums.AuthResponseStatus; import cn.lili.modules.connect.exception.AuthException; import cn.lili.modules.connect.util.AuthChecker; -import cn.lili.modules.connect.util.HttpUtils; +import cn.lili.common.utils.HttpUtils; import cn.lili.modules.connect.util.UuidUtils; import com.xkcoding.http.util.UrlUtil; import lombok.extern.slf4j.Slf4j; 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..69bb075f5 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; @@ -14,7 +14,7 @@ import cn.lili.modules.connect.entity.enums.AuthResponseStatus; import cn.lili.modules.connect.entity.enums.AuthUserGender; import cn.lili.modules.connect.exception.AuthException; import cn.lili.modules.connect.util.GlobalAuthUtils; -import cn.lili.modules.connect.util.HttpUtils; +import cn.lili.common.utils.HttpUtils; import com.alibaba.fastjson.JSONObject; import java.util.Map; 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..8a8b564d2 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; @@ -11,7 +11,7 @@ import cn.lili.modules.connect.entity.dto.ConnectAuthUser; import cn.lili.modules.connect.entity.enums.AuthResponseStatus; import cn.lili.modules.connect.entity.enums.AuthUserGender; import cn.lili.modules.connect.exception.AuthException; -import cn.lili.modules.connect.util.HttpUtils; +import cn.lili.common.utils.HttpUtils; import com.alibaba.fastjson.JSONObject; /** 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..e9086636f 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; @@ -12,7 +12,7 @@ import cn.lili.modules.connect.entity.enums.AuthResponseStatus; import cn.lili.modules.connect.entity.enums.AuthUserGender; import cn.lili.modules.connect.exception.AuthException; import cn.lili.modules.connect.util.GlobalAuthUtils; -import cn.lili.modules.connect.util.HttpUtils; +import cn.lili.common.utils.HttpUtils; import com.alibaba.fastjson.JSONObject; /** 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..fa00225bd 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; @@ -13,8 +13,8 @@ import cn.lili.modules.connect.entity.dto.ConnectAuthUser; import cn.lili.modules.connect.entity.enums.AuthResponseStatus; import cn.lili.modules.connect.entity.enums.AuthUserGender; import cn.lili.modules.connect.exception.AuthException; -import cn.lili.modules.connect.util.HttpUtils; -import cn.lili.modules.connect.util.IpUtils; +import cn.lili.common.utils.HttpUtils; +import cn.lili.common.utils.IpUtils; import com.alibaba.fastjson.JSONObject; import com.xkcoding.http.support.HttpHeader; 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 61e7487d6..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,7 +1,7 @@ package cn.lili.modules.connect.service; -import cn.lili.common.cache.CachePrefix; -import cn.lili.common.token.Token; +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; import cn.lili.modules.connect.entity.dto.WechatMPLoginParams; 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 e54a3f8f4..527fe185a 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,17 +2,17 @@ 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; import cn.lili.common.security.context.UserContext; -import cn.lili.common.token.Token; -import cn.lili.common.token.base.generate.MemberTokenGenerate; +import cn.lili.common.security.token.Token; +import cn.lili.modules.member.token.MemberTokenGenerate; import cn.lili.common.utils.CookieUtil; import cn.lili.common.utils.StringUtils; -import cn.lili.config.context.ThreadContextHolder; +import cn.lili.common.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 814a3e7b4..9b9516b07 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.token.Token; +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.properties.ApiProperties; +import cn.lili.common.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/connect/util/GlobalAuthUtils.java b/framework/src/main/java/cn/lili/modules/connect/util/GlobalAuthUtils.java index e4a7a256c..2b1868b9a 100644 --- a/framework/src/main/java/cn/lili/modules/connect/util/GlobalAuthUtils.java +++ b/framework/src/main/java/cn/lili/modules/connect/util/GlobalAuthUtils.java @@ -1,5 +1,6 @@ package cn.lili.modules.connect.util; +import cn.lili.common.utils.Base64Utils; import cn.lili.common.utils.StringUtils; import cn.lili.modules.connect.exception.AuthException; import com.alibaba.fastjson.JSON; diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java index 66bfb6909..8014ae87c 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java @@ -1,6 +1,6 @@ package cn.lili.modules.distribution.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.common.utils.BeanUtil; import cn.lili.modules.distribution.entity.dto.DistributionApplyDTO; import cn.lili.modules.distribution.entity.enums.DistributionStatusEnum; diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java index 3171dc6d8..65e612f37 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java @@ -1,6 +1,6 @@ package cn.lili.modules.distribution.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.modules.distribution.entity.enums.DistributionCashStatusEnum; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; 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 50e868672..dc46f3946 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.mybatis.util.PageUtil; import cn.lili.common.utils.SnowFlake; import cn.lili.common.vo.PageVO; -import cn.lili.config.rocketmq.RocketmqCustomProperties; +import cn.lili.common.properties.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/DistributionGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java index b45f8b4b2..11a049ff8 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java @@ -4,7 +4,7 @@ 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.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.modules.distribution.entity.dos.Distribution; import cn.lili.modules.distribution.entity.dos.DistributionGoods; import cn.lili.modules.distribution.entity.dto.DistributionGoodsSearchParams; diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java index b7fde9ed4..7bef10f32 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateTime; import cn.hutool.json.JSONUtil; import cn.lili.common.utils.CurrencyUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.modules.distribution.entity.dos.Distribution; import cn.lili.modules.distribution.entity.dos.DistributionOrder; import cn.lili.modules.distribution.entity.enums.DistributionOrderStatusEnum; 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 bf35f7e67..6d474f821 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,13 +1,13 @@ 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; import cn.lili.common.utils.BeanUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.distribution.entity.dos.Distribution; import cn.lili.modules.distribution.entity.dto.DistributionApplyDTO; diff --git a/framework/src/main/java/cn/lili/modules/file/entity/File.java b/framework/src/main/java/cn/lili/modules/file/entity/File.java index 72f6c0243..453f8c0cb 100644 --- a/framework/src/main/java/cn/lili/modules/file/entity/File.java +++ b/framework/src/main/java/cn/lili/modules/file/entity/File.java @@ -1,6 +1,6 @@ package cn.lili.modules.file.entity; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java index 41aa06f90..57cc5036c 100644 --- a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java @@ -3,7 +3,7 @@ package cn.lili.modules.file.serviceimpl; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.SearchVO; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java index c088036a5..8c2d51f8e 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java @@ -1,6 +1,6 @@ package cn.lili.modules.goods.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java index cfc1c2000..4dc0933ed 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java @@ -1,6 +1,6 @@ package cn.lili.modules.goods.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java index 2a0a8c84d..f88d6359c 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java @@ -1,6 +1,6 @@ package cn.lili.modules.goods.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java index dc547e362..7efbb5311 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java @@ -1,6 +1,6 @@ package cn.lili.modules.goods.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java index 56bf56c90..41ce6c9b7 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java @@ -1,6 +1,6 @@ package cn.lili.modules.goods.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java index 05f9ff3c3..b1c6880d7 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java @@ -1,6 +1,6 @@ package cn.lili.modules.goods.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.modules.goods.entity.enums.DraftGoodsSaveType; import cn.lili.modules.goods.entity.enums.GoodsStatusEnum; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java index e589f5db1..f8a347d12 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java @@ -2,7 +2,7 @@ package cn.lili.modules.goods.entity.dos; import cn.hutool.core.convert.Convert; import cn.hutool.json.JSONUtil; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.modules.goods.entity.dto.GoodsOperationDTO; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java index 94e3c3f59..beff2494c 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java @@ -1,6 +1,6 @@ package cn.lili.modules.goods.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.modules.goods.entity.enums.GoodsAuthEnum; import cn.lili.modules.goods.entity.enums.GoodsStatusEnum; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java index 2a9b499c1..e0685a017 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java @@ -1,6 +1,6 @@ package cn.lili.modules.goods.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java index 966512c82..073ffd8c5 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java @@ -1,6 +1,6 @@ package cn.lili.modules.goods.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java index 888e1c3b4..776891c80 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java @@ -1,17 +1,13 @@ package cn.lili.modules.goods.entity.dos; -import cn.lili.base.IdEntity; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Id; import javax.persistence.Table; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java index cb81072c1..f57a7707c 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java @@ -1,6 +1,6 @@ package cn.lili.modules.goods.entity.dos; -import cn.lili.base.IdEntity; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java index 53cdcf602..a0809f517 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java @@ -1,6 +1,6 @@ package cn.lili.modules.goods.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; 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 4f16dc1fc..e758a1a6a 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/service/StudioService.java b/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java index 3b9829854..80b3fc0bd 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java @@ -1,6 +1,6 @@ package cn.lili.modules.goods.service; -import cn.lili.common.delayqueue.BroadcastMessage; +import cn.lili.trigger.message.BroadcastMessage; import cn.lili.common.vo.PageVO; import cn.lili.modules.goods.entity.dos.Studio; import cn.lili.modules.goods.entity.vos.StudioVO; diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java index 2926f4ea5..5e5abf996 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java @@ -2,7 +2,7 @@ package cn.lili.modules.goods.serviceimpl; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.modules.goods.entity.dos.Brand; import cn.lili.modules.goods.entity.dos.CategoryBrand; import cn.lili.modules.goods.entity.dto.BrandPageDTO; 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 fee5e73c2..fcf3a41fa 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/CommodityServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CommodityServiceImpl.java index 3258783ed..2555e053b 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CommodityServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CommodityServiceImpl.java @@ -8,7 +8,7 @@ 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.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.goods.entity.dos.Commodity; import cn.lili.modules.goods.entity.dto.CommodityDTO; diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java index fb39ca831..796999531 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java @@ -4,11 +4,11 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONUtil; -import cn.lili.common.utils.PageUtil; import cn.lili.modules.goods.entity.dos.Category; import cn.lili.modules.goods.entity.dos.DraftGoods; import cn.lili.modules.goods.entity.dos.GoodsGallery; import cn.lili.modules.goods.entity.dos.GoodsSku; +import cn.lili.mybatis.util.PageUtil; import cn.lili.modules.goods.entity.dto.DraftGoodsDTO; import cn.lili.modules.goods.entity.dto.DraftGoodsSearchParams; import cn.lili.modules.goods.entity.dto.GoodsParamsDTO; 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 6caf43549..9b04f3506 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.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; -import cn.lili.config.rocketmq.RocketmqCustomProperties; +import cn.lili.common.properties.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 b4fdb9ed3..bfbe6ff5b 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 @@ -5,14 +5,14 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; 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.config.rocketmq.RocketmqCustomProperties; +import cn.lili.mybatis.util.PageUtil; +import cn.lili.common.properties.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 93926270b..393a0c261 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 @@ -2,21 +2,21 @@ package cn.lili.modules.goods.serviceimpl; import cn.hutool.core.convert.Convert; import cn.hutool.json.JSONUtil; -import cn.lili.common.delayqueue.BroadcastMessage; +import cn.lili.trigger.message.BroadcastMessage; 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.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; -import cn.lili.config.rocketmq.RocketmqCustomProperties; +import cn.lili.common.properties.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/entity/dos/FootPrint.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java index bdc95d0a6..f87f04723 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java @@ -1,6 +1,6 @@ package cn.lili.modules.member.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java index 85b2844c3..d78d11898 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java @@ -1,6 +1,6 @@ package cn.lili.modules.member.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.common.enums.ClientTypeEnum; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java index c351d091a..115ea94eb 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java @@ -1,6 +1,6 @@ package cn.lili.modules.member.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.common.validation.Phone; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java index b005392af..c6b3bd18d 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java @@ -1,6 +1,6 @@ package cn.lili.modules.member.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.common.enums.SwitchEnum; import cn.lili.common.utils.StringUtils; import cn.lili.modules.goods.entity.dos.GoodsSku; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java index caa611f92..1048a6ec6 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java @@ -1,6 +1,6 @@ package cn.lili.modules.member.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java index 3aa306314..4ca4513a5 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java @@ -1,11 +1,10 @@ package cn.lili.modules.member.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.NoArgsConstructor; import javax.persistence.Entity; import javax.persistence.Table; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java index bf8bb9f15..1bc250a07 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java @@ -1,6 +1,6 @@ package cn.lili.modules.member.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java index f4ebd4bed..b7196abaa 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java @@ -1,6 +1,6 @@ package cn.lili.modules.member.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java index 240f927a7..e83edce2e 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java @@ -1,6 +1,6 @@ package cn.lili.modules.member.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java index 4c79cd0d7..c5ab2f1ad 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java @@ -1,6 +1,6 @@ package cn.lili.modules.member.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java index b08c3ee55..e00ce3b24 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java @@ -1,6 +1,6 @@ package cn.lili.modules.member.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java index b8b6e7405..20ee42e89 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java @@ -1,7 +1,7 @@ package cn.lili.modules.member.service; -import cn.lili.common.token.Token; +import cn.lili.common.security.token.Token; import cn.lili.common.vo.PageVO; import cn.lili.modules.connect.entity.dto.ConnectAuthUser; import cn.lili.modules.member.entity.dos.Member; diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java index 2ef10e7ca..c9c0be867 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java @@ -1,7 +1,7 @@ package cn.lili.modules.member.serviceimpl; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.member.entity.dos.FootPrint; import cn.lili.modules.member.mapper.FootprintMapper; 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 d9efe129d..692a4b743 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.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; -import cn.lili.config.rocketmq.RocketmqCustomProperties; +import cn.lili.common.properties.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 e785660af..532b21edb 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.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; -import cn.lili.config.rocketmq.RocketmqCustomProperties; +import cn.lili.common.properties.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/MemberPointsHistoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java index 613e771ef..15111ca49 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java @@ -1,7 +1,7 @@ package cn.lili.modules.member.serviceimpl; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.modules.member.entity.dos.MemberPointsHistory; @@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; /** * 会员积分历史业务层实现 diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java index 3ead1ed6e..783293745 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java @@ -4,7 +4,7 @@ package cn.lili.modules.member.serviceimpl; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.BeanUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.dos.MemberReceipt; @@ -17,10 +17,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; 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/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index 25f89c49d..05a8f2b5b 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,22 +2,23 @@ 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.mybatis.util.PageUtil; +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.token.Token; -import cn.lili.common.token.base.generate.MemberTokenGenerate; -import cn.lili.common.token.base.generate.StoreTokenGenerate; +import cn.lili.common.security.token.Token; +import cn.lili.modules.member.token.MemberTokenGenerate; +import cn.lili.modules.member.token.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.context.ThreadContextHolder; +import cn.lili.common.properties.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 ddccc8ae4..ce1ec547a 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.properties.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/member/serviceimpl/MemberWithdrawApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java index f090f8629..a9f450074 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java @@ -3,7 +3,7 @@ package cn.lili.modules.member.serviceimpl; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.modules.member.entity.dos.MemberWithdrawApply; diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java index 84e1ebe5c..b8dbbbe96 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java @@ -3,7 +3,7 @@ package cn.lili.modules.member.serviceimpl; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.member.entity.dos.StoreCollection; import cn.lili.modules.member.entity.vo.StoreCollectionVO; diff --git a/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java b/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java similarity index 88% rename from framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java rename to framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java index 185e087d7..9e2b13da1 100644 --- a/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java @@ -1,11 +1,11 @@ -package cn.lili.common.token.base.generate; +package cn.lili.modules.member.token; import cn.lili.common.security.AuthUser; import cn.lili.common.security.enums.UserEnums; -import cn.lili.common.token.Token; -import cn.lili.common.token.TokenUtil; -import cn.lili.common.token.base.AbstractTokenGenerate; -import cn.lili.config.context.ThreadContextHolder; +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.common.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/token/base/generate/StoreTokenGenerate.java b/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java similarity index 90% rename from framework/src/main/java/cn/lili/common/token/base/generate/StoreTokenGenerate.java rename to framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java index 28b94c862..9d10db60e 100644 --- a/framework/src/main/java/cn/lili/common/token/base/generate/StoreTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java @@ -1,12 +1,12 @@ -package cn.lili.common.token.base.generate; +package cn.lili.modules.member.token; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.enums.UserEnums; -import cn.lili.common.token.Token; -import cn.lili.common.token.TokenUtil; -import cn.lili.common.token.base.AbstractTokenGenerate; +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.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; import cn.lili.modules.store.entity.dos.Store; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java index c4b8439c1..d2a854897 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java @@ -1,6 +1,6 @@ package cn.lili.modules.message.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.modules.message.entity.enums.MessageStatusEnum; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java index 941e1391c..48dabf496 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java @@ -1,6 +1,6 @@ package cn.lili.modules.message.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.modules.message.entity.enums.RangeEnum; import cn.lili.modules.message.entity.enums.MessageSendClient; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java index 68ea74285..65eab23dc 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java @@ -1,6 +1,6 @@ package cn.lili.modules.message.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java index 3dfbfa3f1..46abf9126 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java @@ -1,6 +1,6 @@ package cn.lili.modules.message.entity.dos; -import cn.lili.base.IdEntity; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java index c1c059f18..5ea4771af 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java @@ -1,6 +1,6 @@ package cn.lili.modules.message.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java index 115e4f1f1..983a79924 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java @@ -1,6 +1,6 @@ package cn.lili.modules.message.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java index b5f408124..98c7e85e4 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java @@ -1,7 +1,7 @@ package cn.lili.modules.message.serviceimpl; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.modules.message.entity.dos.MemberMessage; @@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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/MessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java index 86d57037a..395d4811d 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.common.utils.PageUtil; +import cn.lili.rocketmq.RocketmqSendCallbackBuilder; +import cn.lili.rocketmq.tags.OtherTagsEnum; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; -import cn.lili.config.rocketmq.RocketmqCustomProperties; +import cn.lili.common.properties.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/NoticeMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java index a2539294a..03d2512f8 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java @@ -1,7 +1,7 @@ package cn.lili.modules.message.serviceimpl; import cn.lili.common.enums.SwitchEnum; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.modules.message.entity.dos.MemberMessage; 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 436f7a638..6863ba39d 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.properties.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 957d6ec03..06717a3aa 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,8 +2,8 @@ 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.common.utils.PageUtil; +import cn.lili.modules.system.sms.AliSmsUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.message.entity.dos.SmsSign; import cn.lili.modules.message.mapper.SmsSignMapper; 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 291bfd652..22fd9e4bd 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,7 +1,7 @@ package cn.lili.modules.message.serviceimpl; -import cn.lili.common.sms.AliSmsUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.modules.system.sms.AliSmsUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.message.entity.dos.SmsTemplate; import cn.lili.modules.message.mapper.SmsTemplateMapper; diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java index 61954006a..1202b4d25 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java @@ -3,7 +3,7 @@ package cn.lili.modules.message.serviceimpl; import cn.lili.common.enums.ResultCode; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.modules.message.entity.dos.StoreMessage; 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..fc7411c82 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,12 +2,12 @@ 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; -import cn.lili.modules.connect.util.HttpUtils; +import cn.lili.common.utils.HttpUtils; import cn.lili.modules.system.entity.dos.Setting; import cn.lili.modules.system.entity.dto.connect.WechatConnectSetting; import cn.lili.modules.system.entity.dto.connect.dto.WechatConnectSettingItem; diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/GoodsPromotionVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/GoodsPromotionVO.java index 9da3d82a2..263340c7a 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/GoodsPromotionVO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/GoodsPromotionVO.java @@ -1,5 +1,6 @@ package cn.lili.modules.order.cart.entity.vo; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.entity.dos.PromotionGoods; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -30,7 +31,7 @@ public class GoodsPromotionVO implements Serializable { private String promotionId; /** - * @see cn.lili.modules.promotion.entity.enums.PromotionTypeEnum + * @see PromotionTypeEnum */ @ApiModelProperty(value = "活动工具类型") private String promotionType; 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 56d84e048..1ac8f77fd 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/render/impl/SkuPromotionRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java index 48f847e29..5711c06d6 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java @@ -20,7 +20,7 @@ import cn.lili.modules.promotion.entity.dto.GoodsSkuPromotionPriceDTO; import cn.lili.modules.promotion.entity.dto.PromotionPriceDTO; import cn.lili.modules.promotion.entity.dto.PromotionPriceParamDTO; import cn.lili.modules.promotion.entity.dto.StorePromotionPriceDTO; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.service.PintuanService; import cn.lili.modules.promotion.service.PromotionGoodsService; import cn.lili.modules.promotion.service.PromotionPriceService; 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 cad4fff01..985daecb0 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; @@ -28,7 +28,7 @@ import cn.lili.modules.promotion.entity.dos.Pintuan; import cn.lili.modules.promotion.entity.dos.PromotionGoods; import cn.lili.modules.promotion.entity.enums.CouponScopeTypeEnum; import cn.lili.modules.promotion.entity.enums.MemberCouponStatusEnum; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.service.MemberAddressService; import cn.lili.modules.promotion.service.MemberCouponService; import cn.lili.modules.promotion.service.PintuanService; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java index 99488837e..8f3366b99 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java @@ -1,6 +1,6 @@ package cn.lili.modules.order.order.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java index 8a69eb095..c5f4f9de2 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java @@ -1,6 +1,6 @@ package cn.lili.modules.order.order.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java index e8f766ffc..baf838df1 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java @@ -1,7 +1,7 @@ package cn.lili.modules.order.order.entity.dos; import cn.hutool.json.JSONUtil; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.common.utils.BeanUtil; import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.goods.entity.enums.GoodsTypeEnum; @@ -12,7 +12,7 @@ import cn.lili.modules.order.cart.entity.vo.CartVO; import cn.lili.modules.order.order.entity.dto.PriceDetailDTO; import cn.lili.modules.order.order.entity.enums.*; import cn.lili.modules.promotion.entity.dos.PromotionGoods; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java index 4529f36c6..f3386494f 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java @@ -1,6 +1,6 @@ package cn.lili.modules.order.order.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.modules.order.order.entity.enums.ComplaintStatusEnum; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaintCommunication.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaintCommunication.java index 5ed5fd88b..bc8dcd49a 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaintCommunication.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaintCommunication.java @@ -1,6 +1,6 @@ package cn.lili.modules.order.order.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java index 7f1d62ab0..b2ab11dd6 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java @@ -2,7 +2,7 @@ package cn.lili.modules.order.order.entity.dos; import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.common.utils.BeanUtil; import cn.lili.common.utils.SnowFlake; import cn.lili.modules.order.order.entity.dto.PriceDetailDTO; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java index d900074dc..60c8ec849 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java @@ -1,6 +1,6 @@ package cn.lili.modules.order.order.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java index 1f5c121d7..0e014b4b0 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java @@ -1,6 +1,6 @@ package cn.lili.modules.order.order.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.common.utils.BeanUtil; import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum; import cn.lili.modules.order.cart.entity.dto.TradeDTO; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java index 0b4705050..ae9037581 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java @@ -1,6 +1,6 @@ package cn.lili.modules.order.order.entity.vo; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.order.order.entity.enums.OrderTypeEnum; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; 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 4ccd21f1e..7beb0b539 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 @@ -3,17 +3,19 @@ package cn.lili.modules.order.order.serviceimpl; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import cn.lili.common.aop.syslog.annotation.SystemLogPoint; +import cn.lili.modules.system.utils.OperationalJudgment; +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.mybatis.util.PageUtil; +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.properties.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/OrderComplaintCommunicationServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintCommunicationServiceImpl.java index aef1868a4..b20ea3a52 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintCommunicationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintCommunicationServiceImpl.java @@ -1,6 +1,6 @@ package cn.lili.modules.order.order.serviceimpl; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.order.order.entity.dos.OrderComplaintCommunication; import cn.lili.modules.order.order.entity.vo.OrderComplaintCommunicationSearchParams; @@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import javax.transaction.Transactional; - /** * 交易投诉通信业务层实现 * diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java index 1d66cff7c..cf932c2ee 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java @@ -6,8 +6,8 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.security.context.UserContext; import cn.lili.common.security.enums.UserEnums; import cn.lili.common.utils.BeanUtil; -import cn.lili.common.utils.OperationalJudgment; -import cn.lili.common.utils.PageUtil; +import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.modules.goods.entity.dos.GoodsSku; diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java index 089dbedaf..8e9a7b181 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java @@ -1,11 +1,11 @@ package cn.lili.modules.order.order.serviceimpl; import cn.hutool.json.JSONUtil; -import cn.lili.common.aop.syslog.annotation.SystemLogPoint; +import cn.lili.modules.system.aspect.annotation.SystemLogPoint; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.CurrencyUtil; -import cn.lili.common.utils.OperationalJudgment; +import cn.lili.modules.system.utils.OperationalJudgment; import cn.lili.modules.goods.service.CategoryService; import cn.lili.modules.order.order.aop.OrderLogPoint; 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 677f96cb8..ef2982b44 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 @@ -8,26 +8,26 @@ import cn.hutool.json.JSONUtil; import cn.hutool.poi.excel.ExcelReader; import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelWriter; -import cn.lili.common.aop.syslog.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.modules.system.aspect.annotation.SystemLogPoint; +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.common.utils.OperationalJudgment; -import cn.lili.common.utils.PageUtil; +import cn.lili.trigger.interfaces.TimeTrigger; +import cn.lili.trigger.model.TimeExecuteConstant; +import cn.lili.trigger.model.TimeTriggerMsg; +import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.mybatis.util.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.properties.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/ReceiptServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java index a1b0fa4e3..6986fc569 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java @@ -2,7 +2,7 @@ package cn.lili.modules.order.order.serviceimpl; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.order.order.entity.dos.Receipt; import cn.lili.modules.order.order.entity.dto.OrderReceiptDTO; @@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; /** * 发票业务层实现 diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java index cecab0cef..f43b3534b 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java @@ -14,6 +14,7 @@ import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.order.order.service.StoreFlowService; import cn.lili.modules.payment.entity.RefundLog; import cn.lili.modules.payment.service.RefundLogService; +import cn.lili.mybatis.util.PageUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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 f02398962..e2189f9d6 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 * @since 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.properties.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/order/trade/serviceimpl/RechargeServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java index 9d2bac009..e1baf0dc9 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java @@ -5,8 +5,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.DateUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.utils.SnowFlake; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; diff --git a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java index 05cac9633..30f2ea312 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java @@ -1,6 +1,6 @@ package cn.lili.modules.order.trade.serviceimpl; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.modules.order.trade.entity.dos.WalletLog; diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java index 9ae3f3fab..f15908ff7 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java @@ -1,6 +1,6 @@ package cn.lili.modules.page.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.modules.page.entity.enums.ArticleEnum; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java index 53240b215..d5a677500 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java @@ -1,6 +1,6 @@ package cn.lili.modules.page.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.modules.page.entity.enums.ArticleCategoryEnum; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java index 706e9f75c..03beb9832 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java @@ -1,7 +1,5 @@ package cn.lili.modules.page.entity.dos; -import cn.lili.base.BaseEntity; -import cn.lili.common.utils.SnowFlake; import cn.lili.modules.page.entity.enums.FeedbackTypeEnum; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java index 8660da8c3..0238878bb 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java @@ -1,6 +1,6 @@ package cn.lili.modules.page.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.common.security.context.UserContext; import cn.lili.common.enums.SwitchEnum; import cn.lili.common.enums.ClientTypeEnum; diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java index 61a278ea0..8a9500652 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java @@ -1,6 +1,6 @@ package cn.lili.modules.page.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.common.enums.ClientTypeEnum; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; 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 843bbb1d3..96cae40ca 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.modules.page.entity.dos.Article; diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java index f8469d711..2650e6b7a 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java @@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.BeanUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.modules.page.entity.dos.Article; import cn.lili.modules.page.entity.dto.ArticleSearchParams; import cn.lili.modules.page.entity.enums.ArticleEnum; diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java index 5c16d50d0..2595e44e5 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java @@ -3,7 +3,7 @@ package cn.lili.modules.page.serviceimpl; import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.SwitchEnum; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.page.entity.dos.PageData; 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 67bed77b1..27238e03c 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.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 eda518beb..55426ed98 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.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/permission/entity/dos/AdminUser.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java index 1d480eb1d..83c4885a5 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java @@ -1,11 +1,10 @@ package cn.lili.modules.permission.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java index bab3acc76..b490b05a2 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java @@ -1,6 +1,6 @@ package cn.lili.modules.permission.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java index c9045bea9..cae231291 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java @@ -1,6 +1,6 @@ package cn.lili.modules.permission.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java index d9a316bc8..3ba16eb21 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java @@ -1,6 +1,6 @@ package cn.lili.modules.permission.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java index c231b8007..9beb00a44 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java @@ -1,6 +1,6 @@ package cn.lili.modules.permission.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java index cea390c5d..4b777c4c4 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java @@ -1,6 +1,6 @@ package cn.lili.modules.permission.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java index fd8f4a050..9bd4585a0 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java @@ -1,6 +1,6 @@ package cn.lili.modules.permission.entity.dos; -import cn.lili.base.IdEntity; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java b/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java index a105eef77..dcb6698b9 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java @@ -1,6 +1,6 @@ package cn.lili.modules.permission.entity.dto; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java b/framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java index 78182afa8..7257ca221 100644 --- a/framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java +++ b/framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java @@ -1,7 +1,7 @@ package cn.lili.modules.permission.service; -import cn.lili.common.token.Token; +import cn.lili.common.security.token.Token; import cn.lili.modules.permission.entity.dos.AdminUser; import cn.lili.modules.permission.entity.dto.AdminUserDTO; import cn.lili.modules.permission.entity.vo.AdminUserVO; diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java index 162f7660b..b4b56844d 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java @@ -1,12 +1,12 @@ package cn.lili.modules.permission.serviceimpl; -import cn.lili.common.aop.syslog.annotation.SystemLogPoint; +import cn.lili.modules.system.aspect.annotation.SystemLogPoint; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.token.Token; -import cn.lili.common.token.base.generate.ManagerTokenGenerate; +import cn.lili.common.security.token.Token; +import cn.lili.modules.system.token.ManagerTokenGenerate; import cn.lili.common.utils.BeanUtil; import cn.lili.common.utils.StringUtils; import cn.lili.modules.permission.entity.dos.AdminUser; diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java index f90bab4d5..d283b2875 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java @@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.SearchVO; import cn.lili.modules.permission.entity.dos.Menu; diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java index 7d80accf0..26bb84416 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java @@ -1,6 +1,6 @@ package cn.lili.modules.promotion.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java index 38fee247a..16b643120 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java @@ -3,7 +3,7 @@ package cn.lili.modules.promotion.entity.dos; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.modules.promotion.entity.enums.CouponRangeDayEnum; import cn.lili.modules.promotion.entity.enums.MemberCouponStatusEnum; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java index c23327b43..80016d0f4 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java @@ -1,12 +1,11 @@ package cn.lili.modules.promotion.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.persistence.Entity; diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java index 44cae339c..e6691aa8d 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java @@ -1,7 +1,8 @@ package cn.lili.modules.promotion.entity.dos; import cn.hutool.core.bean.BeanUtil; -import cn.lili.base.BaseEntity; +import cn.lili.common.enums.PromotionTypeEnum; +import cn.lili.mybatis.BaseEntity; import cn.lili.modules.goods.entity.dos.GoodsSku; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; import com.baomidou.mybatisplus.annotation.TableName; @@ -58,7 +59,7 @@ public class PromotionGoods extends BaseEntity { private String promotionId; /** - * @see cn.lili.modules.promotion.entity.enums.PromotionTypeEnum + * @see PromotionTypeEnum */ @ApiModelProperty(value = "促销工具类型") private String promotionType; diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java index 445bf45d2..adc10e958 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java @@ -1,6 +1,6 @@ package cn.lili.modules.promotion.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java index e2aaf0721..255b340b0 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java @@ -1,6 +1,6 @@ package cn.lili.modules.promotion.entity.dto; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/GoodsSkuPromotionPriceDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/GoodsSkuPromotionPriceDTO.java index 703fd9786..4f9a07319 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/GoodsSkuPromotionPriceDTO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/GoodsSkuPromotionPriceDTO.java @@ -1,5 +1,6 @@ package cn.lili.modules.promotion.entity.dto; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.common.utils.CurrencyUtil; import cn.lili.modules.goods.entity.dos.GoodsSku; import io.swagger.annotations.ApiModelProperty; @@ -77,7 +78,7 @@ public class GoodsSkuPromotionPriceDTO implements Serializable { private String promotionId; /** - * @see cn.lili.modules.promotion.entity.enums.PromotionTypeEnum + * @see PromotionTypeEnum */ @ApiModelProperty(value = "促销活动类型") private String promotionType; 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 284a332e2..96517f022 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,10 +1,10 @@ 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; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams; import cn.lili.modules.order.cart.entity.vo.CartSkuVO; import com.baomidou.mybatisplus.core.metadata.IPage; 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 f8886d53a..54d07cc8d 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 55e3ac5b6..bd0ece91b 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.properties.RocketmqCustomProperties; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; import cn.lili.modules.promotion.entity.dos.Coupon; @@ -21,7 +21,7 @@ import cn.lili.modules.promotion.entity.dto.CouponActivityDTO; import cn.lili.modules.promotion.entity.enums.CouponActivitySendTypeEnum; import cn.lili.modules.promotion.entity.enums.MemberCouponStatusEnum; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.entity.vos.CouponActivityVO; import cn.lili.modules.promotion.mapper.CouponActivityMapper; import cn.lili.modules.promotion.service.CouponActivityItemService; 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 4237e21f4..e12c770fc 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,18 @@ 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.common.enums.PromotionTypeEnum; +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.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; -import cn.lili.config.rocketmq.RocketmqCustomProperties; +import cn.lili.common.properties.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 bd064365d..8f0b24a9d 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,29 +1,29 @@ package cn.lili.modules.promotion.serviceimpl; +import cn.lili.common.enums.PromotionTypeEnum; 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.common.properties.RocketmqCustomProperties; 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.modules.order.cart.entity.vo.FullDiscountVO; import cn.lili.modules.promotion.entity.dos.Coupon; import cn.lili.modules.promotion.entity.dos.FullDiscount; import cn.lili.modules.promotion.entity.dos.PromotionGoods; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; import cn.lili.modules.promotion.entity.vos.FullDiscountSearchParams; import cn.lili.modules.promotion.mapper.FullDiscountMapper; import cn.lili.modules.promotion.service.CouponService; import cn.lili.modules.promotion.service.FullDiscountService; import cn.lili.modules.promotion.service.PromotionGoodsService; import cn.lili.modules.promotion.tools.PromotionTools; +import cn.lili.mybatis.util.PageUtil; +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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberAddressServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberAddressServiceImpl.java index 8ad33bea7..ca80e933c 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberAddressServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberAddressServiceImpl.java @@ -1,7 +1,7 @@ package cn.lili.modules.promotion.serviceimpl; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.member.entity.dos.MemberAddress; import cn.lili.modules.member.mapper.MemberAddressMapper; @@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java index 9c1a7a511..8c263c1d9 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java @@ -3,7 +3,7 @@ package cn.lili.modules.promotion.serviceimpl; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.promotion.entity.dos.Coupon; import cn.lili.modules.promotion.entity.dos.MemberCoupon; 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 ed7d8d6b6..9b1675fd1 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.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; -import cn.lili.config.rocketmq.RocketmqCustomProperties; +import cn.lili.common.properties.RocketmqCustomProperties; import cn.lili.modules.goods.service.GoodsSkuService; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; @@ -24,7 +24,7 @@ import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.promotion.entity.dos.Pintuan; import cn.lili.modules.promotion.entity.dos.PromotionGoods; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.entity.vos.PintuanMemberVO; import cn.lili.modules.promotion.entity.vos.PintuanSearchParams; import cn.lili.modules.promotion.entity.vos.PintuanShareVO; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java index 41b2ba205..d10f209dc 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java @@ -2,7 +2,7 @@ package cn.lili.modules.promotion.serviceimpl; import cn.hutool.core.util.StrUtil; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.promotion.entity.dos.PointsGoodsCategory; import cn.lili.modules.promotion.mapper.PointsGoodsCategoryMapper; @@ -10,8 +10,6 @@ import cn.lili.modules.promotion.service.PointsGoodsCategoryService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; 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 5694ef08f..f0b28ef53 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,21 +2,21 @@ 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.properties.RocketmqCustomProperties; import cn.lili.modules.goods.entity.dos.GoodsSku; import cn.lili.modules.goods.service.GoodsSkuService; import cn.lili.modules.promotion.entity.dos.PointsGoods; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.entity.vos.PointsGoodsSearchParams; import cn.lili.modules.promotion.entity.vos.PointsGoodsVO; import cn.lili.modules.promotion.mapper.PointsGoodsMapper; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java index e79b38bfb..48ef7ef33 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java @@ -6,7 +6,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.BeanUtil; import cn.lili.common.utils.DateUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.distribution.entity.dos.DistributionGoods; import cn.lili.modules.distribution.service.DistributionGoodsService; @@ -24,7 +24,7 @@ import cn.lili.modules.promotion.entity.dto.BasePromotion; import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO; import cn.lili.modules.promotion.entity.enums.CouponScopeTypeEnum; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.entity.vos.CouponVO; import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams; import cn.lili.modules.promotion.entity.vos.SeckillVO; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionPriceServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionPriceServiceImpl.java index f9becac3e..6df379d70 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionPriceServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionPriceServiceImpl.java @@ -1,6 +1,7 @@ package cn.lili.modules.promotion.serviceimpl; import cn.hutool.core.text.CharSequenceUtil; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.common.utils.CurrencyUtil; import cn.lili.modules.goods.entity.dos.GoodsSku; import cn.lili.modules.goods.service.GoodsSkuService; 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 2f57e90a0..4a97ceba4 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,8 @@ 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.common.enums.PromotionTypeEnum; +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 a5dfef284..bc2b1b0db 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; @@ -17,7 +17,7 @@ import cn.lili.modules.promotion.entity.dos.Seckill; import cn.lili.modules.promotion.entity.dos.SeckillApply; import cn.lili.modules.promotion.entity.enums.PromotionApplyStatusEnum; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.entity.vos.*; import cn.lili.modules.promotion.mapper.SeckillApplyMapper; import cn.lili.modules.promotion.service.PromotionGoodsService; 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 9e8496f7b..b03c092c5 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,24 +1,24 @@ 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.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; -import cn.lili.config.rocketmq.RocketmqCustomProperties; +import cn.lili.common.properties.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; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.entity.enums.SeckillApplyStatusEnum; import cn.lili.modules.promotion.entity.vos.SeckillSearchParams; import cn.lili.modules.promotion.entity.vos.SeckillVO; 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 9b7867592..6281f779e 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/promotion/tools/PromotionTools.java b/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java index 560b23ae2..1571edbd5 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java +++ b/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java @@ -8,7 +8,7 @@ import cn.lili.common.vo.PageVO; import cn.lili.modules.promotion.entity.dos.PromotionGoods; import cn.lili.modules.promotion.entity.dto.BasePromotion; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java index 2771d432e..28d2c8775 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java +++ b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java @@ -1,6 +1,6 @@ package cn.lili.modules.purchase.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java index 71c18395c..4c435c617 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java +++ b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java @@ -1,7 +1,5 @@ package cn.lili.modules.purchase.entity.dos; -import cn.lili.base.BaseEntity; -import cn.lili.common.utils.SnowFlake; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java b/framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java index fb744a1e9..7486127e5 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java @@ -1,6 +1,6 @@ package cn.lili.modules.search.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; 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 1be5bd9c2..1fbad5e43 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,7 @@ package cn.lili.modules.search.entity.dos; -import cn.lili.common.elasticsearch.EsSuffix; +import cn.lili.common.enums.PromotionTypeEnum; +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; @@ -238,7 +239,7 @@ public class EsGoodsIndex implements Serializable { * 商品促销活动集合 * key 为 促销活动类型 * - * @see cn.lili.modules.promotion.entity.enums.PromotionTypeEnum + * @see PromotionTypeEnum * value 为 促销活动实体信息 */ @Field(type = FieldType.Nested) diff --git a/framework/src/main/java/cn/lili/modules/search/service/EsGoodsIndexService.java b/framework/src/main/java/cn/lili/modules/search/service/EsGoodsIndexService.java index c2c3b2911..466dad438 100644 --- a/framework/src/main/java/cn/lili/modules/search/service/EsGoodsIndexService.java +++ b/framework/src/main/java/cn/lili/modules/search/service/EsGoodsIndexService.java @@ -4,7 +4,7 @@ import cn.lili.modules.goods.entity.dto.GoodsParamsDTO; import cn.lili.modules.goods.entity.dos.GoodsSku; import cn.lili.modules.promotion.entity.dos.PromotionGoods; import cn.lili.modules.promotion.entity.dto.BasePromotion; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.search.entity.dos.EsGoodsIndex; import java.util.List; 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 6ac65b9c1..2cb3b7e89 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 @@ -2,9 +2,9 @@ package cn.lili.modules.search.serviceimpl; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; -import cn.lili.config.context.ThreadContextHolder; +import cn.lili.common.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..c6b04f29a 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; @@ -16,7 +16,7 @@ import cn.lili.modules.goods.service.GoodsWordsService; import cn.lili.modules.promotion.entity.dos.PromotionGoods; import cn.lili.modules.promotion.entity.dto.BasePromotion; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.service.PromotionService; import cn.lili.modules.search.entity.dos.EsGoodsAttribute; import cn.lili.modules.search.entity.dos.EsGoodsIndex; 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 b8c51326e..ec039e520 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 @@ -2,7 +2,7 @@ package cn.lili.modules.search.serviceimpl; import cn.hutool.core.convert.Convert; 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 4931ffe23..605e85d32 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,10 +1,10 @@ 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; +import cn.lili.common.utils.IpUtils; import cn.lili.modules.goods.entity.vos.GoodsSkuVO; import cn.lili.modules.statistics.aop.PageViewPoint; import cn.lili.modules.statistics.aop.enums.PageViewEnum; 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 eed2d1798..d45c51360 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.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/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java index 8b605d737..1d5dc6828 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java @@ -1,7 +1,7 @@ package cn.lili.modules.statistics.serviceimpl; import cn.lili.common.utils.DateUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.modules.order.order.entity.dos.StoreFlow; diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java index 783feecef..e6c3a3e6d 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java @@ -1,6 +1,6 @@ package cn.lili.modules.store.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.modules.store.entity.enums.FreightTemplateEnum; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java index a167ea0c0..ead8f4eeb 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java @@ -1,6 +1,6 @@ package cn.lili.modules.store.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java index 2f8c5473c..845f839e6 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java @@ -1,6 +1,6 @@ package cn.lili.modules.store.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.common.utils.BeanUtil; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.store.entity.dto.AdminStoreApplyDTO; diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java index 136856b2c..587eee2be 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java @@ -1,6 +1,6 @@ package cn.lili.modules.store.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java index a314ecbbd..4b6cdbc22 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java @@ -1,6 +1,6 @@ package cn.lili.modules.store.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreLogistics.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreLogistics.java index b84af1e41..838375ae8 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreLogistics.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreLogistics.java @@ -1,6 +1,6 @@ package cn.lili.modules.store.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java index 025f03dea..e20cccd75 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java @@ -7,7 +7,7 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.security.context.UserContext; import cn.lili.common.security.enums.UserEnums; import cn.lili.common.utils.CurrencyUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.utils.SnowFlake; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; 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 3a68ae238..f92bc25f3 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,13 +1,13 @@ 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; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.BeanUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.store.entity.dos.FreightTemplate; import cn.lili.modules.store.entity.dos.FreightTemplateChild; diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java index df968e8dc..8eb78866c 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java @@ -2,7 +2,7 @@ package cn.lili.modules.store.serviceimpl; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.store.entity.dos.StoreAddress; import cn.lili.modules.store.mapper.StoreAddressMapper; 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 6fae9ea44..8e379368c 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/store/serviceimpl/StoreServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java index 35fa4bef0..60614ceda 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java @@ -6,7 +6,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.BeanUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.modules.goods.entity.dos.Goods; diff --git a/framework/src/main/java/cn/lili/modules/system/aspect/DemoSite.java b/framework/src/main/java/cn/lili/modules/system/aspect/annotation/DemoSite.java similarity index 82% rename from framework/src/main/java/cn/lili/modules/system/aspect/DemoSite.java rename to framework/src/main/java/cn/lili/modules/system/aspect/annotation/DemoSite.java index cf9bbcddb..9de798900 100644 --- a/framework/src/main/java/cn/lili/modules/system/aspect/DemoSite.java +++ b/framework/src/main/java/cn/lili/modules/system/aspect/annotation/DemoSite.java @@ -1,4 +1,4 @@ -package cn.lili.modules.system.aspect; +package cn.lili.modules.system.aspect.annotation; import java.lang.annotation.*; diff --git a/framework/src/main/java/cn/lili/common/aop/syslog/annotation/SystemLogPoint.java b/framework/src/main/java/cn/lili/modules/system/aspect/annotation/SystemLogPoint.java similarity index 89% rename from framework/src/main/java/cn/lili/common/aop/syslog/annotation/SystemLogPoint.java rename to framework/src/main/java/cn/lili/modules/system/aspect/annotation/SystemLogPoint.java index 1928d019d..9718fd6f2 100644 --- a/framework/src/main/java/cn/lili/common/aop/syslog/annotation/SystemLogPoint.java +++ b/framework/src/main/java/cn/lili/modules/system/aspect/annotation/SystemLogPoint.java @@ -1,4 +1,4 @@ -package cn.lili.common.aop.syslog.annotation; +package cn.lili.modules.system.aspect.annotation; import java.lang.annotation.*; diff --git a/framework/src/main/java/cn/lili/modules/system/aspect/DemoInterceptor.java b/framework/src/main/java/cn/lili/modules/system/aspect/interceptor/DemoInterceptor.java similarity index 69% rename from framework/src/main/java/cn/lili/modules/system/aspect/DemoInterceptor.java rename to framework/src/main/java/cn/lili/modules/system/aspect/interceptor/DemoInterceptor.java index ce0ffce7f..3a6fc434e 100644 --- a/framework/src/main/java/cn/lili/modules/system/aspect/DemoInterceptor.java +++ b/framework/src/main/java/cn/lili/modules/system/aspect/interceptor/DemoInterceptor.java @@ -1,8 +1,9 @@ -package cn.lili.modules.system.aspect; +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.properties.SystemSettingProperties; +import cn.lili.modules.system.aspect.annotation.DemoSite; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.springframework.beans.factory.annotation.Autowired; @@ -21,11 +22,11 @@ import org.springframework.stereotype.Component; public class DemoInterceptor { @Autowired - private SystemSetting systemSetting; + private SystemSettingProperties systemSettingProperties; @Before("@annotation(demoSite)") public void doAfter(DemoSite demoSite) { - if (systemSetting.getIsDemoSite()) { + if (systemSettingProperties.getIsDemoSite()) { throw new ServiceException(ResultCode.DEMO_SITE_EXCEPTION); } } diff --git a/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java b/framework/src/main/java/cn/lili/modules/system/aspect/interceptor/SystemLogAspect.java similarity index 96% rename from framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java rename to framework/src/main/java/cn/lili/modules/system/aspect/interceptor/SystemLogAspect.java index aec4771b5..534126015 100644 --- a/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java +++ b/framework/src/main/java/cn/lili/modules/system/aspect/interceptor/SystemLogAspect.java @@ -1,6 +1,6 @@ -package cn.lili.common.aop.syslog.interceptor; +package cn.lili.modules.system.aspect.interceptor; -import cn.lili.common.aop.syslog.annotation.SystemLogPoint; +import cn.lili.modules.system.aspect.annotation.SystemLogPoint; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; import cn.lili.common.security.enums.UserEnums; @@ -8,7 +8,7 @@ import cn.lili.common.utils.IpHelper; import cn.lili.common.utils.SpelUtil; import cn.lili.common.utils.ThreadPoolUtil; import cn.lili.modules.permission.entity.vo.SystemLogVO; -import cn.lili.modules.connect.util.IpUtils; +import cn.lili.common.utils.IpUtils; import cn.lili.modules.permission.service.SystemLogService; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; @@ -51,7 +51,7 @@ public class SystemLogAspect { /** * Controller层切点,注解方式 */ - @Pointcut("@annotation(cn.lili.common.aop.syslog.annotation.SystemLogPoint)") + @Pointcut("@annotation(cn.lili.modules.system.aspect.annotation.SystemLogPoint)") public void controllerAspect() { } diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java index ab73477b6..03559f7a3 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java @@ -1,7 +1,7 @@ package cn.lili.modules.system.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.modules.system.entity.vo.InstantDeliveryVO; import com.baomidou.mybatisplus.annotation.TableName; import com.google.gson.Gson; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/Logistics.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/Logistics.java index 5c6913613..4ee341404 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/Logistics.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/Logistics.java @@ -1,6 +1,6 @@ package cn.lili.modules.system.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/Region.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/Region.java index 592d8572f..e5882df38 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/Region.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/Region.java @@ -1,6 +1,6 @@ package cn.lili.modules.system.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/SensitiveWords.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/SensitiveWords.java index dca87da89..1854a80a8 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/SensitiveWords.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/SensitiveWords.java @@ -1,6 +1,6 @@ package cn.lili.modules.system.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/ServiceNotice.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/ServiceNotice.java index 1c20cde20..13916af13 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/ServiceNotice.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/ServiceNotice.java @@ -1,6 +1,6 @@ package cn.lili.modules.system.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/Setting.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/Setting.java index 426d961a2..daed12a11 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/Setting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/Setting.java @@ -1,6 +1,6 @@ package cn.lili.modules.system.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java index 63e013cd3..304823aaf 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java @@ -1,6 +1,6 @@ package cn.lili.modules.system.entity.dos; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import cn.lili.modules.system.entity.enums.VerificationSourceEnum; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/vo/StoreLogisticsVO.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/StoreLogisticsVO.java index c843c287f..1c7f1cbf1 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/vo/StoreLogisticsVO.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/vo/StoreLogisticsVO.java @@ -1,6 +1,6 @@ package cn.lili.modules.system.entity.vo; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; 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 0d6ecb70c..88542976f 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/InstantDeliveryServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java index c81d05dba..aaf2b1c43 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java @@ -1,6 +1,6 @@ package cn.lili.modules.system.serviceimpl; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.system.entity.dos.InstantDelivery; import cn.lili.modules.system.entity.plugin.InstantDelivery.InstantDeliveryPlugin; 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 304979749..a6b5708eb 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 31f7de205..37395abf8 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 a48c0545b..1cbdf9b36 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 93% 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 e47e5f1e0..de177e120 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,6 +1,6 @@ -package cn.lili.common.sms; +package cn.lili.modules.system.sms; -import cn.lili.common.verification.enums.VerificationEnums; +import cn.lili.modules.verification.enums.VerificationEnums; import java.util.List; import java.util.Map; 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 94% 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 8148317fc..ad7776b4c 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,19 +1,19 @@ -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.common.verification.enums.VerificationEnums; -import cn.lili.config.properties.SmsTemplateSetting; -import cn.lili.config.properties.SystemSetting; -import cn.lili.modules.connect.util.Base64Utils; +import cn.lili.modules.verification.enums.VerificationEnums; +import cn.lili.common.properties.SmsTemplateProperties; +import cn.lili.common.properties.SystemSettingProperties; +import cn.lili.common.utils.Base64Utils; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; import cn.lili.modules.message.entity.dos.SmsSign; @@ -54,10 +54,10 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { private MemberService memberService; @Autowired - private SmsTemplateSetting smsTemplateSetting; + private SmsTemplateProperties smsTemplateProperties; @Autowired - private SystemSetting systemSetting; + private SystemSettingProperties systemSettingProperties; @Override public void sendSmsCode(String mobile, VerificationEnums verificationEnums, String uuid) { @@ -83,17 +83,17 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { switch (verificationEnums) { //登录 case LOGIN: { - templateCode = smsTemplateSetting.getLOGIN(); + templateCode = smsTemplateProperties.getLOGIN(); break; } //注册 case REGISTER: { - templateCode = smsTemplateSetting.getREGISTER(); + templateCode = smsTemplateProperties.getREGISTER(); break; } //找回密码 case FIND_USER: { - templateCode = smsTemplateSetting.getFIND_USER(); + templateCode = smsTemplateProperties.getFIND_USER(); break; } //修改密码 @@ -104,7 +104,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { } //更新为用户最新手机号 mobile = member.getMobile(); - templateCode = smsTemplateSetting.getUPDATE_PASSWORD(); + templateCode = smsTemplateProperties.getUPDATE_PASSWORD(); break; } //设置支付密码 @@ -112,7 +112,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { Member member = memberService.getById(UserContext.getCurrentUser().getId()); //更新为用户最新手机号 mobile = member.getMobile(); - templateCode = smsTemplateSetting.getWALLET_PASSWORD(); + templateCode = smsTemplateProperties.getWALLET_PASSWORD(); break; } //如果不是有效的验证码手段，则此处不进行短信操作 @@ -120,7 +120,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { return; } //如果是测试模式 默认验证码 6个1 - if (systemSetting.getIsTestModel()) { + if (systemSettingProperties.getIsTestModel()) { code = "111111"; } else { //发送短信 diff --git a/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java similarity index 93% rename from framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java rename to framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java index b6994d7d5..ee621f04e 100644 --- a/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java @@ -1,13 +1,13 @@ -package cn.lili.common.token.base.generate; +package cn.lili.modules.system.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.security.AuthUser; import cn.lili.common.security.enums.UserEnums; -import cn.lili.common.token.PermissionEnum; -import cn.lili.common.token.Token; -import cn.lili.common.token.TokenUtil; -import cn.lili.common.token.base.AbstractTokenGenerate; +import cn.lili.common.security.enums.PermissionEnum; +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.modules.permission.entity.dos.AdminUser; import cn.lili.modules.permission.entity.vo.UserMenuVO; import cn.lili.modules.permission.service.AdminUserService; diff --git a/framework/src/main/java/cn/lili/common/utils/OperationalJudgment.java b/framework/src/main/java/cn/lili/modules/system/utils/OperationalJudgment.java similarity index 96% rename from framework/src/main/java/cn/lili/common/utils/OperationalJudgment.java rename to framework/src/main/java/cn/lili/modules/system/utils/OperationalJudgment.java index e75451169..085d2ca39 100644 --- a/framework/src/main/java/cn/lili/common/utils/OperationalJudgment.java +++ b/framework/src/main/java/cn/lili/modules/system/utils/OperationalJudgment.java @@ -1,9 +1,10 @@ -package cn.lili.common.utils; +package cn.lili.modules.system.utils; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; +import cn.lili.common.utils.BeanUtil; /** * 全局统一判定是否可操作某属性 diff --git a/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java b/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java index 6e8cb8f08..63a047874 100644 --- a/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java +++ b/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java @@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; -import org.thymeleaf.util.ListUtils; import java.io.Serializable; import java.util.List; @@ -237,15 +236,13 @@ public class SensitiveWordsFilter implements Serializable, ApplicationRunner { nodes = new SensitiveWordsNode[DEFAULT_INITIAL_CAPACITY]; //加入平台添加的敏感词 List list = sensitiveWordsService.list(); - if (ListUtils.isEmpty(list)) { + if (list != null && list.size() > 0) { for (SensitiveWords sensitiveWords : list) { put(sensitiveWords.getSensitiveWord()); } } } catch (Exception e) { - log.error("初始化敏感词错误",e); + log.error("初始化敏感词错误", e); } - - } } diff --git a/framework/src/main/java/cn/lili/common/verification/ImageUtil.java b/framework/src/main/java/cn/lili/modules/verification/ImageUtil.java similarity index 99% rename from framework/src/main/java/cn/lili/common/verification/ImageUtil.java rename to framework/src/main/java/cn/lili/modules/verification/ImageUtil.java index e80959f7b..98805297e 100644 --- a/framework/src/main/java/cn/lili/common/verification/ImageUtil.java +++ b/framework/src/main/java/cn/lili/modules/verification/ImageUtil.java @@ -1,4 +1,4 @@ -package cn.lili.common.verification; +package cn.lili.modules.verification; import java.awt.*; import java.awt.image.BufferedImage; diff --git a/framework/src/main/java/cn/lili/common/verification/SliderImageUtil.java b/framework/src/main/java/cn/lili/modules/verification/SliderImageUtil.java similarity index 96% rename from framework/src/main/java/cn/lili/common/verification/SliderImageUtil.java rename to framework/src/main/java/cn/lili/modules/verification/SliderImageUtil.java index 988325c4b..90ca90a30 100644 --- a/framework/src/main/java/cn/lili/common/verification/SliderImageUtil.java +++ b/framework/src/main/java/cn/lili/modules/verification/SliderImageUtil.java @@ -1,4 +1,4 @@ -package cn.lili.common.verification; +package cn.lili.modules.verification; import cn.lili.common.utils.Base64DecodeMultipartFile; import cn.lili.common.vo.SerializableStream; diff --git a/framework/src/main/java/cn/lili/common/verification/VerificationSDK.java b/framework/src/main/java/cn/lili/modules/verification/VerificationSDK.java similarity index 85% rename from framework/src/main/java/cn/lili/common/verification/VerificationSDK.java rename to framework/src/main/java/cn/lili/modules/verification/VerificationSDK.java index 86630ff34..2d98b28e2 100644 --- a/framework/src/main/java/cn/lili/common/verification/VerificationSDK.java +++ b/framework/src/main/java/cn/lili/modules/verification/VerificationSDK.java @@ -1,7 +1,7 @@ -package cn.lili.common.verification; +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/common/verification/aop/VerificationInterceptor.java b/framework/src/main/java/cn/lili/modules/verification/aop/VerificationInterceptor.java similarity index 77% rename from framework/src/main/java/cn/lili/common/verification/aop/VerificationInterceptor.java rename to framework/src/main/java/cn/lili/modules/verification/aop/VerificationInterceptor.java index 8bb647028..0948babd4 100644 --- a/framework/src/main/java/cn/lili/common/verification/aop/VerificationInterceptor.java +++ b/framework/src/main/java/cn/lili/modules/verification/aop/VerificationInterceptor.java @@ -1,11 +1,10 @@ -package cn.lili.common.verification.aop; +package cn.lili.modules.verification.aop; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.verification.aop.annotation.Verification; -import cn.lili.common.verification.enums.VerificationEnums; -import cn.lili.common.verification.service.VerificationService; -import lombok.RequiredArgsConstructor; +import cn.lili.modules.verification.aop.annotation.Verification; +import cn.lili.modules.verification.enums.VerificationEnums; +import cn.lili.modules.verification.service.VerificationService; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; @@ -29,7 +28,7 @@ public class VerificationInterceptor { @Autowired private VerificationService verificationService; - @Before("@annotation(cn.lili.common.verification.aop.annotation.Verification)") + @Before("@annotation(cn.lili.modules.verification.aop.annotation.Verification)") public void interceptor(JoinPoint pjp) { MethodSignature signature = (MethodSignature) pjp.getSignature(); Method method = signature.getMethod(); diff --git a/framework/src/main/java/cn/lili/common/verification/aop/annotation/Verification.java b/framework/src/main/java/cn/lili/modules/verification/aop/annotation/Verification.java similarity index 78% rename from framework/src/main/java/cn/lili/common/verification/aop/annotation/Verification.java rename to framework/src/main/java/cn/lili/modules/verification/aop/annotation/Verification.java index 74af54375..a6bd95e0f 100644 --- a/framework/src/main/java/cn/lili/common/verification/aop/annotation/Verification.java +++ b/framework/src/main/java/cn/lili/modules/verification/aop/annotation/Verification.java @@ -1,7 +1,7 @@ -package cn.lili.common.verification.aop.annotation; +package cn.lili.modules.verification.aop.annotation; -import cn.lili.common.verification.enums.VerificationEnums; +import cn.lili.modules.verification.enums.VerificationEnums; import java.lang.annotation.*; diff --git a/framework/src/main/java/cn/lili/common/verification/enums/VerificationEnums.java b/framework/src/main/java/cn/lili/modules/verification/enums/VerificationEnums.java similarity index 87% rename from framework/src/main/java/cn/lili/common/verification/enums/VerificationEnums.java rename to framework/src/main/java/cn/lili/modules/verification/enums/VerificationEnums.java index 4cb723398..4825c9a65 100644 --- a/framework/src/main/java/cn/lili/common/verification/enums/VerificationEnums.java +++ b/framework/src/main/java/cn/lili/modules/verification/enums/VerificationEnums.java @@ -1,4 +1,4 @@ -package cn.lili.common.verification.enums; +package cn.lili.modules.verification.enums; /** * VerificationEnums diff --git a/framework/src/main/java/cn/lili/common/verification/service/VerificationService.java b/framework/src/main/java/cn/lili/modules/verification/service/VerificationService.java similarity index 90% rename from framework/src/main/java/cn/lili/common/verification/service/VerificationService.java rename to framework/src/main/java/cn/lili/modules/verification/service/VerificationService.java index b9065facb..497edbe59 100644 --- a/framework/src/main/java/cn/lili/common/verification/service/VerificationService.java +++ b/framework/src/main/java/cn/lili/modules/verification/service/VerificationService.java @@ -1,6 +1,6 @@ -package cn.lili.common.verification.service; +package cn.lili.modules.verification.service; -import cn.lili.common.verification.enums.VerificationEnums; +import cn.lili.modules.verification.enums.VerificationEnums; import java.io.IOException; import java.util.Map; diff --git a/framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java similarity index 95% rename from framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java rename to framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java index 023734a9e..d37275ab6 100644 --- a/framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java @@ -1,13 +1,13 @@ -package cn.lili.common.verification.service.impl; +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; -import cn.lili.common.verification.SliderImageUtil; -import cn.lili.common.verification.enums.VerificationEnums; -import cn.lili.common.verification.service.VerificationService; +import cn.lili.modules.verification.SliderImageUtil; +import cn.lili.modules.verification.enums.VerificationEnums; +import cn.lili.modules.verification.service.VerificationService; import cn.lili.common.vo.SerializableStream; import cn.lili.modules.system.entity.dos.VerificationSource; import cn.lili.modules.system.entity.vo.VerificationVO; diff --git a/framework/src/main/java/cn/lili/base/BaseEntity.java b/framework/src/main/java/cn/lili/mybatis/BaseEntity.java similarity index 99% rename from framework/src/main/java/cn/lili/base/BaseEntity.java rename to framework/src/main/java/cn/lili/mybatis/BaseEntity.java index c667b1493..a37fa984a 100644 --- a/framework/src/main/java/cn/lili/base/BaseEntity.java +++ b/framework/src/main/java/cn/lili/mybatis/BaseEntity.java @@ -1,4 +1,4 @@ -package cn.lili.base; +package cn.lili.mybatis; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/framework/src/main/java/cn/lili/base/IdEntity.java b/framework/src/main/java/cn/lili/mybatis/IdEntity.java similarity index 97% rename from framework/src/main/java/cn/lili/base/IdEntity.java rename to framework/src/main/java/cn/lili/mybatis/IdEntity.java index 5909ebcec..5e17357a3 100644 --- a/framework/src/main/java/cn/lili/base/IdEntity.java +++ b/framework/src/main/java/cn/lili/mybatis/IdEntity.java @@ -1,4 +1,4 @@ -package cn.lili.base; +package cn.lili.mybatis; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; 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 fad46b098..ec1e7037c 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/base/mybatisplus/MyMetaObjectHandler.java b/framework/src/main/java/cn/lili/mybatis/mybatisplus/MyMetaObjectHandler.java similarity index 97% rename from framework/src/main/java/cn/lili/base/mybatisplus/MyMetaObjectHandler.java rename to framework/src/main/java/cn/lili/mybatis/mybatisplus/MyMetaObjectHandler.java index e7a2e74f2..b6d3e49ef 100644 --- a/framework/src/main/java/cn/lili/base/mybatisplus/MyMetaObjectHandler.java +++ b/framework/src/main/java/cn/lili/mybatis/mybatisplus/MyMetaObjectHandler.java @@ -1,4 +1,4 @@ -package cn.lili.base.mybatisplus; +package cn.lili.mybatis.mybatisplus; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; diff --git a/framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java b/framework/src/main/java/cn/lili/mybatis/mybatisplus/MybatisPlusConfig.java similarity index 96% rename from framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java rename to framework/src/main/java/cn/lili/mybatis/mybatisplus/MybatisPlusConfig.java index 7407971cf..de13d972e 100644 --- a/framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java +++ b/framework/src/main/java/cn/lili/mybatis/mybatisplus/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package cn.lili.base.mybatisplus; +package cn.lili.mybatis.mybatisplus; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import org.mybatis.spring.annotation.MapperScan; 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/utils/PageUtil.java b/framework/src/main/java/cn/lili/mybatis/util/PageUtil.java similarity index 97% rename from framework/src/main/java/cn/lili/common/utils/PageUtil.java rename to framework/src/main/java/cn/lili/mybatis/util/PageUtil.java index 119a91246..691da0428 100644 --- a/framework/src/main/java/cn/lili/common/utils/PageUtil.java +++ b/framework/src/main/java/cn/lili/mybatis/util/PageUtil.java @@ -1,7 +1,9 @@ -package cn.lili.common.utils; +package cn.lili.mybatis.util; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; +import cn.lili.common.utils.BeanUtil; +import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.SearchVO; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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 68% 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 edf0b0e02..523756bbb 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 87% 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 488fc4762..df1a488fb 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 82% 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 index 105769eca..2f057dfec 100644 --- a/framework/src/main/java/cn/lili/common/trigger/message/BroadcastMessage.java +++ b/framework/src/main/java/cn/lili/trigger/message/BroadcastMessage.java @@ -1,11 +1,8 @@ -package cn.lili.common.delayqueue; +package cn.lili.trigger.message; -import cn.hutool.core.date.DateTime; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; - /** * 直播消息实体 * 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 39afaf8b3..a49c907c9 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/framework/src/main/resources/templates/controller.btl b/framework/src/main/resources/templates/controller.btl index fb4b1ed84..5fa132f38 100644 --- a/framework/src/main/resources/templates/controller.btl +++ b/framework/src/main/resources/templates/controller.btl @@ -1,6 +1,6 @@ package ${entity.controllerPackage}; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.SearchVO; diff --git a/framework/src/main/resources/templates/entity.btl b/framework/src/main/resources/templates/entity.btl index 0c4df5e60..54047fd02 100644 --- a/framework/src/main/resources/templates/entity.btl +++ b/framework/src/main/resources/templates/entity.btl @@ -1,6 +1,6 @@ package ${entity.entityPackage}; -import cn.lili.base.BaseEntity; +import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModel; diff --git a/framework/src/test/java/cn/lili/test/script/ScriptTest.java b/framework/src/test/java/cn/lili/test/script/ScriptTest.java index 6dd5b2840..d2312a029 100644 --- a/framework/src/test/java/cn/lili/test/script/ScriptTest.java +++ b/framework/src/test/java/cn/lili/test/script/ScriptTest.java @@ -1,6 +1,5 @@ package cn.lili.test.script; -import cn.lili.common.test.BaseTest; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; @@ -35,7 +34,7 @@ import java.util.List; @ContextConfiguration @Configuration @ComponentScan("cn.lili") -public class ScriptTest extends BaseTest { +public class ScriptTest { @Resource private DefaultRedisScript redisScript; @Resource diff --git a/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java index 5dbacac57..1bcf91070 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java @@ -1,8 +1,7 @@ package cn.lili.controller.goods; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java index 47daf67fe..36c8a2583 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.goods; import cn.lili.common.enums.ResultUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java index 3aba38081..fc2a60d42 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java @@ -3,7 +3,7 @@ package cn.lili.controller.member; import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultUtil; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.MemberGrade; diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java index 804ae92d7..57f29a742 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.member; import cn.lili.common.enums.ResultUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.MemberNoticeLog; diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java index 62c0630d7..312852dd6 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.member; import cn.lili.common.enums.ResultUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; diff --git a/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java index 688095dda..5e882def9 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.other; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java index 9818cff7d..5ca04bc2d 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.other; import cn.lili.common.enums.ResultUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.system.entity.dos.SensitiveWords; diff --git a/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java index 3dda7b20d..4aab2f595 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.other; import cn.lili.common.enums.ResultUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.page.entity.dos.Special; diff --git a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java index 9cb6b9b25..c89b946dc 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java @@ -1,7 +1,7 @@ package cn.lili.controller.other; import cn.lili.common.enums.ResultUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; diff --git a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java index ef8e3113d..e06a2d5e1 100644 --- a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java @@ -5,11 +5,11 @@ import cn.lili.common.enums.ResultUtil; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.token.Token; -import cn.lili.common.utils.PageUtil; +import cn.lili.common.security.token.Token; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; -import cn.lili.common.verification.enums.VerificationEnums; -import cn.lili.common.verification.service.VerificationService; +import cn.lili.modules.verification.enums.VerificationEnums; +import cn.lili.modules.verification.service.VerificationService; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; diff --git a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java index 737241784..442a406f1 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.permission; import cn.lili.common.enums.ResultUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; import cn.lili.modules.permission.entity.dos.Department; diff --git a/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java index b53903abd..4e4abbe7c 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java @@ -1,7 +1,6 @@ package cn.lili.controller.permission; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java index 8e6f7c742..db837f992 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java @@ -3,7 +3,7 @@ package cn.lili.controller.promotion; import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultUtil; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dos.CouponActivity; diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java index 90482c2bd..359dcff63 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java @@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java index dacc69adf..350b9f205 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java @@ -7,7 +7,7 @@ import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dos.Pintuan; import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.entity.vos.PintuanSearchParams; import cn.lili.modules.promotion.entity.vos.PintuanVO; import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java index 7281fc801..0beb7cbcb 100755 --- a/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.setting; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java index 681dee9e5..bd6e68ce1 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java @@ -1,7 +1,6 @@ package cn.lili.controller.setting; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java index bcee576fb..f5623706e 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java @@ -1,7 +1,6 @@ package cn.lili.controller.setting; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java index f9b87a57e..87b5bce0c 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java @@ -1,8 +1,7 @@ package cn.lili.controller.setting; -import cn.lili.common.enums.ResultCode; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java index 38ba2c879..433d50544 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.setting; import cn.lili.common.enums.ResultUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java index 61560bbdc..204e1c92a 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java @@ -1,7 +1,6 @@ package cn.lili.controller.setting; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java index fe783888e..366363ac9 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.setting; import cn.lili.common.enums.ResultUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java b/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java index 28cf174a3..f2f3634ca 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java @@ -1,7 +1,7 @@ package cn.lili.controller.setting; import cn.lili.common.enums.ResultUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.message.entity.dos.WechatMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java index 025fe3a4c..396e4b978 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java @@ -1,7 +1,6 @@ package cn.lili.controller.trade; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java index e0d7cea66..401461e29 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.trade; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java index 362159a4c..48a58eb4e 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.trade; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java index 1774f35ca..8b735320c 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.trade; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; 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 5f311c2f2..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,12 +1,12 @@ package cn.lili.security; import cn.hutool.core.util.StrUtil; -import cn.lili.common.cache.Cache; -import cn.lili.common.cache.CachePrefix; +import cn.lili.cache.Cache; +import cn.lili.cache.CachePrefix; import cn.lili.common.security.AuthUser; import cn.lili.common.security.enums.SecurityEnum; import cn.lili.common.security.enums.UserEnums; -import cn.lili.common.token.SecretKeyUtil; +import cn.lili.common.security.token.SecretKeyUtil; import cn.lili.common.utils.ResponseUtil; import com.google.gson.Gson; import io.jsonwebtoken.Claims; 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 cb406c47f..32fb6e4fd 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.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 185349a21..3a4385f5a 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..3964d5b59 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,8 @@ package cn.lili.test.promotion; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.common.vo.PageVO; -import cn.lili.config.rocketmq.RocketmqCustomProperties; +import cn.lili.common.properties.RocketmqCustomProperties; import cn.lili.modules.goods.entity.enums.GoodsStatusEnum; import cn.lili.modules.goods.service.GoodsSkuService; import cn.lili.modules.promotion.entity.dos.Coupon; diff --git a/manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java b/manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java index ece3b3dd5..068e60a22 100644 --- a/manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java +++ b/manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java @@ -8,7 +8,7 @@ import cn.lili.modules.goods.service.GoodsSkuService; import cn.lili.modules.promotion.entity.dos.FullDiscount; import cn.lili.modules.promotion.entity.dos.PromotionGoods; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.entity.vos.FullDiscountSearchParams; import cn.lili.modules.promotion.service.FullDiscountService; import cn.lili.modules.order.cart.entity.vo.FullDiscountVO; diff --git a/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java b/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java index 6e5936684..54f2105d1 100644 --- a/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java +++ b/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java @@ -6,7 +6,7 @@ import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dto.BasePromotion; import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.service.PromotionPriceService; import cn.lili.modules.promotion.service.PromotionService; import cn.lili.modules.promotion.service.PromotionGoodsService; 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..36c9c20bf 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.properties.RocketmqCustomProperties; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/pom.xml b/pom.xml index 411f37da2..453977cb2 100644 --- a/pom.xml +++ b/pom.xml @@ -94,6 +94,12 @@ + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java index 003daab4e..cd122b55e 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java @@ -1,7 +1,7 @@ package cn.lili.controller.goods; import cn.lili.common.enums.ResultUtil; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java index 894fd8a5d..4a1ff7640 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java @@ -1,7 +1,7 @@ package cn.lili.controller.goods; -import cn.lili.common.utils.PageUtil; +import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; diff --git a/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java index e796293f6..639164e11 100644 --- a/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java +++ b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java @@ -4,8 +4,8 @@ package cn.lili.controller.passport; import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultUtil; import cn.lili.common.exception.ServiceException; -import cn.lili.common.verification.enums.VerificationEnums; -import cn.lili.common.verification.service.VerificationService; +import cn.lili.modules.verification.enums.VerificationEnums; +import cn.lili.modules.verification.service.VerificationService; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java index 205867e23..ba499b861 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java @@ -8,7 +8,7 @@ import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO; -import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; +import cn.lili.common.enums.PromotionTypeEnum; import cn.lili.modules.promotion.entity.vos.PintuanSearchParams; import cn.lili.modules.promotion.entity.vos.PintuanVO; import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams; 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 8e95caea0..f73bfec7d 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.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 30439eaa8..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,12 +1,12 @@ package cn.lili.security; import cn.hutool.core.util.StrUtil; -import cn.lili.common.cache.Cache; -import cn.lili.common.cache.CachePrefix; +import cn.lili.cache.Cache; +import cn.lili.cache.CachePrefix; import cn.lili.common.security.AuthUser; import cn.lili.common.security.enums.SecurityEnum; import cn.lili.common.security.enums.UserEnums; -import cn.lili.common.token.SecretKeyUtil; +import cn.lili.common.security.token.SecretKeyUtil; import cn.lili.common.utils.ResponseUtil; import com.google.gson.Gson; import io.jsonwebtoken.Claims; 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 f71abd3a0..502026946 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.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: