From 06212c073d49a5856e438f4cc210883ffd3610de Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 19 Jul 2021 15:01:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=AE=E5=BD=95=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/MemberWalletBuyerController.java | 4 ++-- .../controller/passport/MemberBuyerController.java | 4 ++-- .../passport/connect/ConnectBuyerWebController.java | 2 +- .../passport/connect/MiniProgramBuyerController.java | 2 +- .../cn/lili/security/BuyerAuthenticationFilter.java | 2 +- .../lili/controller/common/SliderImageController.java | 6 +++--- .../java/cn/lili/controller/common/SmsController.java | 6 +++--- .../limit}/annotation/LimitPoint.java | 6 +++--- .../limit/enums/LimitTypeEnums.java} | 4 ++-- .../limit/interceptor}/LimitInterceptor.java | 9 +++++---- .../cn/lili/common/security/context/UserContext.java | 2 +- .../common/{ => security}/token/PermissionEnum.java | 2 +- .../common/{ => security}/token/SecretKeyUtil.java | 2 +- .../cn/lili/common/{ => security}/token/Token.java | 2 +- .../lili/common/{ => security}/token/TokenUtil.java | 2 +- .../token/base/AbstractTokenGenerate.java | 4 ++-- .../token/base/generate/ManagerTokenGenerate.java | 10 +++++----- .../token/base/generate/MemberTokenGenerate.java | 8 ++++---- .../token/base/generate/StoreTokenGenerate.java | 8 ++++---- .../src/main/java/cn/lili/common/sms/SmsUtil.java | 2 +- .../lili/common/sms/impl/SmsUtilAliImplService.java | 2 +- .../cn/lili/modules/connect/entity/ConnectConfig.java | 2 +- .../lili/modules/connect/service/ConnectService.java | 2 +- .../connect/serviceimpl/ConnectServiceImpl.java | 4 ++-- .../cn/lili/modules/connect/util/ConnectUtil.java | 2 +- .../modules/distribution/entity/dos/Distribution.java | 2 +- .../distribution/entity/dos/DistributionCash.java | 2 +- .../main/java/cn/lili/modules/file/entity/File.java | 2 +- .../java/cn/lili/modules/goods/entity/dos/Brand.java | 2 +- .../cn/lili/modules/goods/entity/dos/Category.java | 2 +- .../goods/entity/dos/CategoryParameterGroup.java | 2 +- .../goods/entity/dos/CategorySpecification.java | 2 +- .../cn/lili/modules/goods/entity/dos/Commodity.java | 2 +- .../cn/lili/modules/goods/entity/dos/DraftGoods.java | 2 +- .../java/cn/lili/modules/goods/entity/dos/Goods.java | 2 +- .../cn/lili/modules/goods/entity/dos/GoodsSku.java | 2 +- .../cn/lili/modules/goods/entity/dos/GoodsUnit.java | 2 +- .../cn/lili/modules/goods/entity/dos/GoodsWords.java | 2 +- .../cn/lili/modules/goods/entity/dos/Parameters.java | 6 +----- .../lili/modules/goods/entity/dos/Specification.java | 2 +- .../java/cn/lili/modules/goods/entity/dos/Studio.java | 2 +- .../cn/lili/modules/member/entity/dos/FootPrint.java | 2 +- .../cn/lili/modules/member/entity/dos/Member.java | 2 +- .../lili/modules/member/entity/dos/MemberAddress.java | 2 +- .../modules/member/entity/dos/MemberEvaluation.java | 2 +- .../lili/modules/member/entity/dos/MemberGrade.java | 2 +- .../lili/modules/member/entity/dos/MemberNotice.java | 3 +-- .../modules/member/entity/dos/MemberNoticeLog.java | 2 +- .../modules/member/entity/dos/MemberNoticeSenter.java | 2 +- .../lili/modules/member/entity/dos/MemberWallet.java | 2 +- .../member/entity/dos/MemberWithdrawApply.java | 2 +- .../modules/member/entity/dos/StoreCollection.java | 2 +- .../cn/lili/modules/member/service/MemberService.java | 2 +- .../modules/member/serviceimpl/MemberServiceImpl.java | 6 +++--- .../modules/message/entity/dos/MemberMessage.java | 2 +- .../cn/lili/modules/message/entity/dos/Message.java | 2 +- .../modules/message/entity/dos/NoticeMessage.java | 2 +- .../cn/lili/modules/message/entity/dos/ShortLink.java | 2 +- .../modules/message/entity/dos/WechatMPMessage.java | 2 +- .../modules/message/entity/dos/WechatMessage.java | 2 +- .../modules/order/order/entity/dos/AfterSale.java | 2 +- .../order/order/entity/dos/AfterSaleReason.java | 2 +- .../cn/lili/modules/order/order/entity/dos/Order.java | 2 +- .../order/order/entity/dos/OrderComplaint.java | 2 +- .../order/entity/dos/OrderComplaintCommunication.java | 2 +- .../modules/order/order/entity/dos/OrderItem.java | 2 +- .../lili/modules/order/order/entity/dos/Receipt.java | 2 +- .../cn/lili/modules/order/order/entity/dos/Trade.java | 2 +- .../modules/order/order/entity/vo/PaymentLog.java | 2 +- .../order/order/serviceimpl/AfterSaleServiceImpl.java | 2 +- .../order/serviceimpl/OrderPriceServiceImpl.java | 2 +- .../order/order/serviceimpl/OrderServiceImpl.java | 2 +- .../java/cn/lili/modules/page/entity/dos/Article.java | 2 +- .../lili/modules/page/entity/dos/ArticleCategory.java | 2 +- .../cn/lili/modules/page/entity/dos/Feedback.java | 2 -- .../cn/lili/modules/page/entity/dos/PageData.java | 2 +- .../java/cn/lili/modules/page/entity/dos/Special.java | 2 +- .../lili/modules/permission/entity/dos/AdminUser.java | 3 +-- .../modules/permission/entity/dos/Department.java | 2 +- .../modules/permission/entity/dos/DepartmentRole.java | 2 +- .../cn/lili/modules/permission/entity/dos/Menu.java | 2 +- .../cn/lili/modules/permission/entity/dos/Role.java | 2 +- .../lili/modules/permission/entity/dos/RoleMenu.java | 2 +- .../lili/modules/permission/entity/dos/UserRole.java | 2 +- .../modules/permission/entity/dto/AdminUserDTO.java | 2 +- .../modules/permission/service/AdminUserService.java | 2 +- .../permission/serviceimpl/AdminUserServiceImpl.java | 6 +++--- .../promotion/entity/dos/CouponActivityItem.java | 2 +- .../modules/promotion/entity/dos/MemberCoupon.java | 2 +- .../promotion/entity/dos/PointsGoodsCategory.java | 3 +-- .../modules/promotion/entity/dos/PromotionGoods.java | 2 +- .../modules/promotion/entity/dos/SeckillApply.java | 2 +- .../modules/promotion/entity/dto/BasePromotion.java | 2 +- .../modules/purchase/entity/dos/PurchaseOrder.java | 2 +- .../modules/purchase/entity/dos/PurchaseQuoted.java | 2 -- .../lili/modules/search/entity/dos/CustomWords.java | 2 +- .../modules/store/entity/dos/FreightTemplate.java | 2 +- .../store/entity/dos/FreightTemplateChild.java | 2 +- .../java/cn/lili/modules/store/entity/dos/Store.java | 2 +- .../lili/modules/store/entity/dos/StoreAddress.java | 2 +- .../modules/store/entity/dos/StoreGoodsLabel.java | 2 +- .../lili/modules/store/entity/dos/StoreLogistics.java | 2 +- .../system/aspect/{ => annotation}/DemoSite.java | 2 +- .../system/aspect}/annotation/SystemLogPoint.java | 2 +- .../aspect/{ => interceptor}/DemoInterceptor.java | 3 ++- .../system/aspect}/interceptor/SystemLogAspect.java | 6 +++--- .../modules/system/entity/dos/InstantDelivery.java | 2 +- .../cn/lili/modules/system/entity/dos/Logistics.java | 2 +- .../cn/lili/modules/system/entity/dos/Region.java | 2 +- .../modules/system/entity/dos/SensitiveWords.java | 2 +- .../lili/modules/system/entity/dos/ServiceNotice.java | 2 +- .../cn/lili/modules/system/entity/dos/Setting.java | 2 +- .../modules/system/entity/dos/VerificationSource.java | 2 +- .../modules/system/entity/vo/StoreLogisticsVO.java | 2 +- .../{common => modules}/verification/ImageUtil.java | 2 +- .../verification/SliderImageUtil.java | 2 +- .../verification/VerificationSDK.java | 2 +- .../verification/aop/VerificationInterceptor.java | 11 +++++------ .../verification/aop/annotation/Verification.java | 4 ++-- .../verification/enums/VerificationEnums.java | 2 +- .../verification/service/VerificationService.java | 4 ++-- .../service/impl/VerificationServiceImpl.java | 8 ++++---- .../java/cn/lili/{base => mybatis}/BaseEntity.java | 2 +- .../main/java/cn/lili/{base => mybatis}/IdEntity.java | 2 +- .../mybatisplus/MyMetaObjectHandler.java | 2 +- .../mybatisplus/MybatisPlusConfig.java | 2 +- framework/src/main/resources/templates/entity.btl | 2 +- .../passport/AdminUserManagerController.java | 6 +++--- .../cn/lili/security/ManagerAuthenticationFilter.java | 2 +- .../controller/passport/StorePassportController.java | 4 ++-- .../cn/lili/security/StoreAuthenticationFilter.java | 2 +- 131 files changed, 173 insertions(+), 183 deletions(-) rename framework/src/main/java/cn/lili/common/{aop/limiter => cache/limit}/annotation/LimitPoint.java (87%) rename framework/src/main/java/cn/lili/common/{aop/limiter/LimitType.java => cache/limit/enums/LimitTypeEnums.java} (76%) rename framework/src/main/java/cn/lili/common/{aop/limiter => cache/limit/interceptor}/LimitInterceptor.java (92%) rename framework/src/main/java/cn/lili/common/{ => security}/token/PermissionEnum.java (84%) rename framework/src/main/java/cn/lili/common/{ => security}/token/SecretKeyUtil.java (94%) rename framework/src/main/java/cn/lili/common/{ => security}/token/Token.java (87%) rename framework/src/main/java/cn/lili/common/{ => security}/token/TokenUtil.java (99%) rename framework/src/main/java/cn/lili/common/{ => security}/token/base/AbstractTokenGenerate.java (88%) rename framework/src/main/java/cn/lili/common/{ => security}/token/base/generate/ManagerTokenGenerate.java (94%) rename framework/src/main/java/cn/lili/common/{ => security}/token/base/generate/MemberTokenGenerate.java (90%) rename framework/src/main/java/cn/lili/common/{ => security}/token/base/generate/StoreTokenGenerate.java (89%) rename framework/src/main/java/cn/lili/modules/system/aspect/{ => annotation}/DemoSite.java (82%) rename framework/src/main/java/cn/lili/{common/aop/syslog => modules/system/aspect}/annotation/SystemLogPoint.java (89%) rename framework/src/main/java/cn/lili/modules/system/aspect/{ => interceptor}/DemoInterceptor.java (88%) rename framework/src/main/java/cn/lili/{common/aop/syslog => modules/system/aspect}/interceptor/SystemLogAspect.java (96%) rename framework/src/main/java/cn/lili/{common => modules}/verification/ImageUtil.java (99%) rename framework/src/main/java/cn/lili/{common => modules}/verification/SliderImageUtil.java (96%) rename framework/src/main/java/cn/lili/{common => modules}/verification/VerificationSDK.java (95%) rename framework/src/main/java/cn/lili/{common => modules}/verification/aop/VerificationInterceptor.java (77%) rename framework/src/main/java/cn/lili/{common => modules}/verification/aop/annotation/Verification.java (78%) rename framework/src/main/java/cn/lili/{common => modules}/verification/enums/VerificationEnums.java (87%) rename framework/src/main/java/cn/lili/{common => modules}/verification/service/VerificationService.java (90%) rename framework/src/main/java/cn/lili/{common => modules}/verification/service/impl/VerificationServiceImpl.java (96%) rename framework/src/main/java/cn/lili/{base => mybatis}/BaseEntity.java (99%) rename framework/src/main/java/cn/lili/{base => mybatis}/IdEntity.java (97%) rename framework/src/main/java/cn/lili/{base => mybatis}/mybatisplus/MyMetaObjectHandler.java (97%) rename framework/src/main/java/cn/lili/{base => mybatis}/mybatisplus/MybatisPlusConfig.java (96%) 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 737167101..a8ea72b42 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/passport/MemberBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java index aeae60d6d..d2d798d44 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 @@ -4,8 +4,8 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.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 03efbbc94..2b673eca1 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 bd3db44d4..61a8a1489 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/security/BuyerAuthenticationFilter.java b/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java index 2b7134af5..5cbfd678a 100755 --- a/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java +++ b/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java @@ -6,7 +6,7 @@ import cn.lili.common.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/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java index b41d0ace4..06a13e989 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.common.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 cfec27ab8..77a02304b 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.common.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.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/framework/src/main/java/cn/lili/common/aop/limiter/annotation/LimitPoint.java b/framework/src/main/java/cn/lili/common/cache/limit/annotation/LimitPoint.java similarity index 87% rename from framework/src/main/java/cn/lili/common/aop/limiter/annotation/LimitPoint.java rename to framework/src/main/java/cn/lili/common/cache/limit/annotation/LimitPoint.java index cee99c07b..94f9e34bf 100644 --- a/framework/src/main/java/cn/lili/common/aop/limiter/annotation/LimitPoint.java +++ b/framework/src/main/java/cn/lili/common/cache/limit/annotation/LimitPoint.java @@ -1,7 +1,7 @@ -package cn.lili.common.aop.limiter.annotation; +package cn.lili.common.cache.limit.annotation; -import cn.lili.common.aop.limiter.LimitType; +import cn.lili.common.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/common/cache/limit/enums/LimitTypeEnums.java similarity index 76% rename from framework/src/main/java/cn/lili/common/aop/limiter/LimitType.java rename to framework/src/main/java/cn/lili/common/cache/limit/enums/LimitTypeEnums.java index 110f21957..5448ee6a8 100644 --- a/framework/src/main/java/cn/lili/common/aop/limiter/LimitType.java +++ b/framework/src/main/java/cn/lili/common/cache/limit/enums/LimitTypeEnums.java @@ -1,4 +1,4 @@ -package cn.lili.common.aop.limiter; +package cn.lili.common.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/common/cache/limit/interceptor/LimitInterceptor.java similarity index 92% rename from framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java rename to framework/src/main/java/cn/lili/common/cache/limit/interceptor/LimitInterceptor.java index f6e5397da..f319ead8e 100644 --- a/framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java +++ b/framework/src/main/java/cn/lili/common/cache/limit/interceptor/LimitInterceptor.java @@ -1,6 +1,7 @@ -package cn.lili.common.aop.limiter; +package cn.lili.common.cache.limit.interceptor; -import cn.lili.common.aop.limiter.annotation.LimitPoint; +import cn.lili.common.cache.limit.enums.LimitTypeEnums; +import cn.lili.common.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/security/context/UserContext.java b/framework/src/main/java/cn/lili/common/security/context/UserContext.java index af1c46230..a0737b062 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 @@ -5,7 +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.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/token/PermissionEnum.java similarity index 84% rename from framework/src/main/java/cn/lili/common/token/PermissionEnum.java rename to framework/src/main/java/cn/lili/common/security/token/PermissionEnum.java index be6e1d28c..33a74909e 100644 --- a/framework/src/main/java/cn/lili/common/token/PermissionEnum.java +++ b/framework/src/main/java/cn/lili/common/security/token/PermissionEnum.java @@ -1,4 +1,4 @@ -package cn.lili.common.token; +package cn.lili.common.security.token; /** * 权限枚举值 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 99% 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 fbf85423a..388d285df 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,4 +1,4 @@ -package cn.lili.common.token; +package cn.lili.common.security.token; import cn.lili.common.cache.Cache; import cn.lili.common.cache.CachePrefix; 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 ff22fd0c1..08912782d 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/common/token/base/generate/ManagerTokenGenerate.java b/framework/src/main/java/cn/lili/common/security/token/base/generate/ManagerTokenGenerate.java similarity index 94% rename from framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java rename to framework/src/main/java/cn/lili/common/security/token/base/generate/ManagerTokenGenerate.java index e4c629b62..37ef66447 100644 --- a/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java +++ b/framework/src/main/java/cn/lili/common/security/token/base/generate/ManagerTokenGenerate.java @@ -1,13 +1,13 @@ -package cn.lili.common.token.base.generate; +package cn.lili.common.security.token.base.generate; import cn.lili.common.cache.Cache; import cn.lili.common.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.token.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/token/base/generate/MemberTokenGenerate.java b/framework/src/main/java/cn/lili/common/security/token/base/generate/MemberTokenGenerate.java similarity index 90% rename from framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java rename to framework/src/main/java/cn/lili/common/security/token/base/generate/MemberTokenGenerate.java index 003c0db12..ba0c53c90 100644 --- a/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java +++ b/framework/src/main/java/cn/lili/common/security/token/base/generate/MemberTokenGenerate.java @@ -1,10 +1,10 @@ -package cn.lili.common.token.base.generate; +package cn.lili.common.security.token.base.generate; 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.config.context.ThreadContextHolder; import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.member.entity.dos.Member; diff --git a/framework/src/main/java/cn/lili/common/token/base/generate/StoreTokenGenerate.java b/framework/src/main/java/cn/lili/common/security/token/base/generate/StoreTokenGenerate.java similarity index 89% rename from framework/src/main/java/cn/lili/common/token/base/generate/StoreTokenGenerate.java rename to framework/src/main/java/cn/lili/common/security/token/base/generate/StoreTokenGenerate.java index 28b94c862..22b5de823 100644 --- a/framework/src/main/java/cn/lili/common/token/base/generate/StoreTokenGenerate.java +++ b/framework/src/main/java/cn/lili/common/security/token/base/generate/StoreTokenGenerate.java @@ -1,12 +1,12 @@ -package cn.lili.common.token.base.generate; +package cn.lili.common.security.token.base.generate; 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/common/sms/SmsUtil.java b/framework/src/main/java/cn/lili/common/sms/SmsUtil.java index 2f2cf4a21..0e17b56dd 100644 --- a/framework/src/main/java/cn/lili/common/sms/SmsUtil.java +++ b/framework/src/main/java/cn/lili/common/sms/SmsUtil.java @@ -1,6 +1,6 @@ package cn.lili.common.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/common/sms/impl/SmsUtilAliImplService.java index adf9c1242..7e6da0649 100644 --- a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java +++ b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java @@ -10,7 +10,7 @@ import cn.lili.common.security.context.UserContext; import cn.lili.common.sms.AliSmsUtil; import cn.lili.common.sms.SmsUtil; import cn.lili.common.utils.CommonUtil; -import cn.lili.common.verification.enums.VerificationEnums; +import cn.lili.modules.verification.enums.VerificationEnums; import cn.lili.config.properties.SmsTemplateSetting; import cn.lili.config.properties.SystemSetting; import cn.lili.modules.connect.util.Base64Utils; 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/service/ConnectService.java b/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java index 61e7487d6..3186f7bac 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.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..3a78216d1 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 @@ -8,8 +8,8 @@ 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.common.security.token.base.generate.MemberTokenGenerate; import cn.lili.common.utils.CookieUtil; import cn.lili.common.utils.StringUtils; import cn.lili.config.context.ThreadContextHolder; 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..e185ca04e 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 @@ -6,7 +6,7 @@ import cn.lili.common.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; 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 7615e1946..3493b16a9 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 9bfa342ba..0f70d2985 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/file/entity/File.java b/framework/src/main/java/cn/lili/modules/file/entity/File.java index 5ad4ad11f..2834dfd9d 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/goods/entity/dos/Brand.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java index 934c0493d..520cca17f 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 d7653ea7a..9619dd797 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 3737862d1..a820ce36d 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 d286db1a2..3fbf608bc 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 5d0539959..92c1cef26 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 df07486c8..6a0e73a2c 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 a0982129f..d45405e2e 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 056e587df..034862a00 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 f8d7d72a6..12b9811a1 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 02579a789..1433229fb 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 96fcc1f8e..692c1ecc6 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 b4e8a272b..7d971bf7c 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 90dcdd73e..37e2becf2 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/member/entity/dos/FootPrint.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java index 9c68a4256..fe5b6db5f 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 6b95367da..a40f005ba 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 ad78c35bb..d2da0d28e 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 7e9f35c0d..94ad9a217 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 e65abef7d..6222bc9ed 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 12fdb810f..544eb701b 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 44dfe4027..1acf6d8f6 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 e7c8d4c86..88474f69d 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 cf7c3a35a..54b2cde17 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 5d3a779c5..ef38caa94 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 09aba9b85..25be346b1 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 6f6ed6b54..acbe240bf 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/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index f8fb9bcd2..466a68951 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 @@ -11,9 +11,9 @@ import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder; import cn.lili.common.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.common.security.token.base.generate.MemberTokenGenerate; +import cn.lili.common.security.token.base.generate.StoreTokenGenerate; import cn.lili.common.utils.*; import cn.lili.common.vo.PageVO; import cn.lili.config.context.ThreadContextHolder; 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 4ccb3fdd2..ca0cb2ca7 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 5ff116088..86777ec6e 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 2422fed75..d220604a9 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/order/order/entity/dos/AfterSale.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java index 575da8801..0afe6b784 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 bfbd7a4e6..77dd3dd63 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 d936bca4e..d689e91b5 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; 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 0ef83e449..cff493077 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 f4b4df72d..4695eeac1 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 20966d8c9..2fef40d1e 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 a38ca62a9..4e437e7e8 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 58ae9189b..ce73de796 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 @@ -2,7 +2,7 @@ package cn.lili.modules.order.order.serviceimpl; import cn.hutool.core.util.StrUtil; 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.rocketmq.RocketmqSendCallbackBuilder; 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 3bc505d89..a653fcf98 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,7 +1,7 @@ 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; 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 d8fff356a..fe4919254 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,7 +8,7 @@ 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.modules.system.aspect.annotation.SystemLogPoint; import cn.lili.common.trigger.util.DelayQueueTools; import cn.lili.common.trigger.enums.DelayTypeEnums; import cn.lili.common.trigger.message.PintuanOrderMessage; 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 6a3d756c6..aaa91c965 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 1ef9e6803..8e48d4466 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 432df5f23..f60e8eaac 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 fd30ba499..6eafbac49 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 9381253a3..d4a55b09c 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/permission/entity/dos/AdminUser.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java index 52993199f..1cef03ddb 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 090c633ff..87e28d727 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 892747ab6..e6752b30e 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 8d34b045d..fb8a858e3 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 72e33f86a..51a7664c9 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 46177b63d..59c14553a 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 7ce231823..5fa1a3fd8 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 d6cf62472..3a7e6a69b 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 4423c85e8..1ee25e7e1 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 5deb5d46f..a15a5e076 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.common.security.token.base.generate.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/promotion/entity/dos/CouponActivityItem.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java index 0bb06e678..70ae1725c 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 de6f5eb05..7684d6d8f 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 d3693cb5d..67ff374e7 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 ad85dcde7..df548e8a1 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,7 @@ package cn.lili.modules.promotion.entity.dos; import cn.hutool.core.bean.BeanUtil; -import cn.lili.base.BaseEntity; +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; 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 754e0c4cc..107784bd4 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 42351d0ec..4e0c1ad62 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/purchase/entity/dos/PurchaseOrder.java b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java index 0eac781db..8c876cdaa 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 5bfb23310..07e4d9ef3 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 c7908e438..831221169 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/store/entity/dos/FreightTemplate.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java index ffdbc8b0e..cdaabb4a4 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 8cbe4ef9b..357ad0de6 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 27c2c9be0..c578aca3e 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 b2b917826..0fc883067 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 25da3db96..87c27bba1 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 814ce4d50..52d477238 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/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 eb2d87694..764e91023 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 88% 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..7ee11eca7 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.modules.system.aspect.DemoSite; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.springframework.beans.factory.annotation.Autowired; 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..f764d8a15 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; @@ -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 324aaf6df..e457b721e 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 bdb99e350..de65c6e45 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 2b52d99ec..d46298b19 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 6bc02c3a7..08bff6234 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 d1d714211..4823fc505 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 9acdfb9a3..da6e0719f 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 9ae3fd047..70625ff3e 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/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 98891ec53..05b885c7a 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 69339d02c..cec4a4870 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 95% 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 4508033ab..9cf2f4575 100644 --- a/framework/src/main/java/cn/lili/common/verification/VerificationSDK.java +++ b/framework/src/main/java/cn/lili/modules/verification/VerificationSDK.java @@ -1,4 +1,4 @@ -package cn.lili.common.verification; +package cn.lili.modules.verification; import cn.lili.common.cache.Cache; import cn.lili.common.cache.CachePrefix; 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 382a6868a..561616d75 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 96% 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..0c8960081 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.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 b87c511a4..e5e1076ba 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/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/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/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..019e34065 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.security.token.Token; import cn.lili.common.utils.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/security/ManagerAuthenticationFilter.java b/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java index 5f311c2f2..e24b82816 100755 --- a/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java +++ b/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java @@ -6,7 +6,7 @@ import cn.lili.common.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/controller/passport/StorePassportController.java b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java index d9c977628..e3cbb0358 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/security/StoreAuthenticationFilter.java b/seller-api/src/main/java/cn/lili/security/StoreAuthenticationFilter.java index 30439eaa8..89718806d 100755 --- a/seller-api/src/main/java/cn/lili/security/StoreAuthenticationFilter.java +++ b/seller-api/src/main/java/cn/lili/security/StoreAuthenticationFilter.java @@ -6,7 +6,7 @@ import cn.lili.common.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;