diff --git a/common-api/src/main/java/cn/lili/controller/common/RegionController.java b/common-api/src/main/java/cn/lili/controller/common/RegionController.java index 99f571e9..96a45dee 100644 --- a/common-api/src/main/java/cn/lili/controller/common/RegionController.java +++ b/common-api/src/main/java/cn/lili/controller/common/RegionController.java @@ -2,7 +2,7 @@ package cn.lili.controller.common; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.base.service.RegionService; +import cn.lili.modules.system.service.RegionService; import cn.lili.modules.system.entity.dos.Region; import cn.lili.modules.system.entity.vo.RegionVO; import io.swagger.annotations.Api; diff --git a/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java b/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java index c61cc7ef..f74fd0dc 100644 --- a/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java +++ b/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java @@ -6,7 +6,7 @@ import cn.lili.common.token.Token; import cn.lili.common.token.TokenUtil; import cn.lili.common.token.base.AbstractTokenGenerate; import cn.lili.config.context.ThreadContextHolder; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java b/framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java index 53a87813..023734a9 100644 --- a/framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java +++ b/framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java @@ -9,9 +9,9 @@ import cn.lili.common.verification.SliderImageUtil; import cn.lili.common.verification.enums.VerificationEnums; import cn.lili.common.verification.service.VerificationService; import cn.lili.common.vo.SerializableStream; -import cn.lili.modules.base.entity.dos.VerificationSource; -import cn.lili.modules.base.entity.vo.VerificationVO; -import cn.lili.modules.base.service.VerificationSourceService; +import cn.lili.modules.system.entity.dos.VerificationSource; +import cn.lili.modules.system.entity.vo.VerificationVO; +import cn.lili.modules.system.service.VerificationSourceService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/framework/src/main/java/cn/lili/modules/base/entity/vo/RedisVo.java b/framework/src/main/java/cn/lili/modules/base/entity/vo/RedisVo.java deleted file mode 100644 index 638da988..00000000 --- a/framework/src/main/java/cn/lili/modules/base/entity/vo/RedisVo.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.lili.modules.base.entity.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; - -/** - * REDIS VO - * @author Chopper - * @date 2020/12/2 17:50 - */ -@Data -@AllArgsConstructor -public class RedisVo { - - private String key; - - private String value; -} diff --git a/framework/src/main/java/cn/lili/modules/base/entity/enums/ClientTypeEnum.java b/framework/src/main/java/cn/lili/modules/base/enums/ClientTypeEnum.java similarity index 93% rename from framework/src/main/java/cn/lili/modules/base/entity/enums/ClientTypeEnum.java rename to framework/src/main/java/cn/lili/modules/base/enums/ClientTypeEnum.java index ba8de6ba..44f26aee 100644 --- a/framework/src/main/java/cn/lili/modules/base/entity/enums/ClientTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/base/enums/ClientTypeEnum.java @@ -1,4 +1,4 @@ -package cn.lili.modules.base.entity.enums; +package cn.lili.modules.base.enums; /** diff --git a/framework/src/main/java/cn/lili/modules/broadcast/util/WechatLivePlayerUtil.java b/framework/src/main/java/cn/lili/modules/broadcast/util/WechatLivePlayerUtil.java index 6253615d..d982b318 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/util/WechatLivePlayerUtil.java +++ b/framework/src/main/java/cn/lili/modules/broadcast/util/WechatLivePlayerUtil.java @@ -2,7 +2,7 @@ package cn.lili.modules.broadcast.util; import cn.hutool.json.JSONObject; import cn.lili.common.exception.ServiceException; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.broadcast.entity.dos.Commodity; import cn.lili.modules.broadcast.entity.dos.Studio; import cn.lili.modules.broadcast.entity.dto.GoodsInfo; diff --git a/framework/src/main/java/cn/lili/modules/broadcast/util/WechatMediaUtil.java b/framework/src/main/java/cn/lili/modules/broadcast/util/WechatMediaUtil.java index bce45f9b..a4c12296 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/util/WechatMediaUtil.java +++ b/framework/src/main/java/cn/lili/modules/broadcast/util/WechatMediaUtil.java @@ -3,7 +3,7 @@ package cn.lili.modules.broadcast.util; import cn.hutool.json.JSONObject; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.message.util.WechatAccessTokenUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; 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 e9aa36f5..a7c1b80a 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 @@ -13,7 +13,7 @@ import cn.lili.common.token.base.generate.MemberTokenGenerate; import cn.lili.common.utils.CookieUtil; import cn.lili.common.utils.StringUtils; import cn.lili.config.context.ThreadContextHolder; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; 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/util/ConnectUtil.java b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java index f149e30b..a774e883 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 @@ -10,7 +10,7 @@ import cn.lili.common.token.Token; import cn.lili.common.vo.ResultMessage; import cn.lili.config.properties.ApiProperties; import cn.lili.config.properties.DomainProperties; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.connect.config.AuthConfig; import cn.lili.modules.connect.config.ConnectAuthEnum; import cn.lili.modules.connect.entity.dto.AuthCallback; 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 dab8b591..73d3dc76 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,7 @@ package cn.lili.modules.member.entity.dos; import cn.lili.base.BaseEntity; +import cn.lili.modules.base.enums.ClientTypeEnum; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -76,7 +77,7 @@ public class Member extends BaseEntity { private String storeId; /** - * @see cn.lili.modules.base.entity.enums.ClientTypeEnum + * @see ClientTypeEnum */ @ApiModelProperty(value = "客户端") private String clientEnum; diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java index 48fa1943..806e2c06 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java @@ -6,7 +6,7 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.message.entity.dos.WechatMPMessage; import cn.lili.modules.message.entity.enums.WechatMessageItemEnums; import cn.lili.modules.message.mapper.WechatMPMessageMapper; diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java index 3e4db127..2281053a 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java @@ -5,7 +5,7 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.message.entity.dos.WechatMessage; import cn.lili.modules.message.entity.enums.WechatMessageItemEnums; import cn.lili.modules.message.mapper.WechatMessageMapper; diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java b/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java index 36fa901d..e6a38619 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java +++ b/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java @@ -6,7 +6,7 @@ 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.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.connect.util.HttpUtils; import cn.lili.modules.system.entity.dos.Setting; import cn.lili.modules.system.entity.dto.connect.WechatConnectSetting; @@ -14,7 +14,6 @@ import cn.lili.modules.system.entity.dto.connect.dto.WechatConnectSettingItem; import cn.lili.modules.system.entity.enums.SettingEnum; import cn.lili.modules.system.service.SettingService; import com.google.gson.Gson; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java index f9babe15..ae3a4fc7 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java +++ b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java @@ -7,7 +7,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.DateUtil; import cn.lili.common.utils.StringUtils; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.connect.entity.Connect; import cn.lili.modules.connect.entity.enums.ConnectEnum; import cn.lili.modules.connect.service.ConnectService; diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java b/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java index b965ce2d..b65e5ad1 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java +++ b/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java @@ -2,7 +2,7 @@ package cn.lili.modules.message.util; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.message.entity.dos.ShortLink; import cn.lili.modules.message.service.ShortLinkService; import com.alibaba.fastjson.JSON; diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java index 29c3cd9c..59e7d9f7 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java @@ -1,5 +1,6 @@ package cn.lili.modules.order.cart.entity.vo; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.order.cart.entity.dto.StoreRemarkDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,7 +23,7 @@ public class TradeParams implements Serializable { private String way; /** - * @see cn.lili.modules.base.entity.enums.ClientTypeEnum + * @see ClientTypeEnum */ @ApiModelProperty(value = "客户端：H5/移动端 PC/PC端,WECHAT_MP/小程序端,APP/移动应用端") private String client; 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 7185f402..dea2f29c 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 @@ -3,7 +3,7 @@ package cn.lili.modules.order.order.entity.dos; import cn.hutool.json.JSONUtil; import cn.lili.base.BaseEntity; import cn.lili.common.utils.BeanUtil; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.goods.entity.enums.GoodsTypeEnum; import cn.lili.modules.order.cart.entity.enums.CartTypeEnum; import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java index 8e5b28cd..b36d0fec 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java @@ -1,7 +1,7 @@ package cn.lili.modules.order.order.entity.vo; import cn.lili.common.utils.StringUtils; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.order.order.entity.enums.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; 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 b222a1ce..6f733c0a 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,7 +1,7 @@ package cn.lili.modules.order.order.entity.vo; import cn.lili.base.BaseEntity; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.order.order.entity.enums.OrderTypeEnum; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; import com.fasterxml.jackson.annotation.JsonFormat; 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 b60afe60..25f6fba6 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 @@ -3,6 +3,7 @@ package cn.lili.modules.page.entity.dos; import cn.lili.base.BaseEntity; import cn.lili.common.security.context.UserContext; import cn.lili.common.enums.SwitchEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.page.entity.enums.PageEnum; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -49,7 +50,7 @@ public class PageData extends BaseEntity { private String pageType; /** - * @see cn.lili.modules.base.entity.enums.ClientTypeEnum + * @see ClientTypeEnum */ @ApiModelProperty(value = "客户端类型", allowableValues = "PC,H5,WECHAT_MP,APP") private String pageClientType; 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 62a8531e..371338ff 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,7 @@ package cn.lili.modules.page.entity.dos; import cn.lili.base.BaseEntity; +import cn.lili.modules.base.enums.ClientTypeEnum; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -26,7 +27,7 @@ public class Special extends BaseEntity { private String specialName; /** - * @see cn.lili.modules.base.entity.enums.ClientTypeEnum + * @see ClientTypeEnum */ @ApiModelProperty(value = "楼层对应连接端类型", allowableValues = "PC,H5,WECHAT_MP,APP") private String clientType; diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dto/PageDataDTO.java b/framework/src/main/java/cn/lili/modules/page/entity/dto/PageDataDTO.java index 98af786b..2967140b 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dto/PageDataDTO.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dto/PageDataDTO.java @@ -1,5 +1,6 @@ package cn.lili.modules.page.entity.dto; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.page.entity.enums.PageEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -25,7 +26,7 @@ public class PageDataDTO { private String pageType; /** - * @see cn.lili.modules.base.entity.enums.ClientTypeEnum + * @see ClientTypeEnum */ @ApiModelProperty(value = "客户端类型", allowableValues = "PC,H5,WECHAT_MP,APP") private String pageClientType; diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java index 60a14f62..3bc89bfa 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java @@ -5,7 +5,7 @@ import cn.lili.common.enums.SwitchEnum; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.PageUtil; import cn.lili.common.vo.PageVO; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.page.entity.dos.PageData; import cn.lili.modules.page.entity.dto.PageDataDTO; import cn.lili.modules.page.entity.enums.PageEnum; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java b/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java index 3538385a..b7678f6b 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java @@ -6,7 +6,7 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.SpringContextUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.member.service.MemberWalletService; import cn.lili.modules.payment.kit.dto.PayParam; import cn.lili.modules.payment.kit.enums.PaymentClientEnum; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java index 126726a8..c9b23757 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java @@ -1,6 +1,6 @@ package cn.lili.modules.payment.kit.plugin.bank; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.payment.entity.RefundLog; import cn.lili.modules.payment.kit.Payment; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java index 6d6ff965..c3e4ef6a 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java @@ -16,7 +16,7 @@ import cn.lili.common.utils.SnowFlake; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.ResultMessage; import cn.lili.config.properties.ApiProperties; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.connect.entity.Connect; import cn.lili.modules.connect.entity.enums.ConnectEnum; import cn.lili.modules.connect.service.ConnectService; diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java index 0cecb039..4effefa4 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java @@ -7,7 +7,7 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.security.enums.UserEnums; import cn.lili.common.utils.CurrencyUtil; import cn.lili.config.properties.StatisticsProperties; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.member.entity.vo.MemberDistributionVO; import cn.lili.modules.member.service.MemberService; import cn.lili.modules.statistics.mapper.PlatformViewDataMapper; diff --git a/framework/src/main/java/cn/lili/modules/base/entity/dos/VerificationSource.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java similarity index 85% rename from framework/src/main/java/cn/lili/modules/base/entity/dos/VerificationSource.java rename to framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java index 77ac279f..9acdfb9a 100644 --- a/framework/src/main/java/cn/lili/modules/base/entity/dos/VerificationSource.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java @@ -1,6 +1,7 @@ -package cn.lili.modules.base.entity.dos; +package cn.lili.modules.system.entity.dos; import cn.lili.base.BaseEntity; +import cn.lili.modules.system.entity.enums.VerificationSourceEnum; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -30,7 +31,7 @@ public class VerificationSource extends BaseEntity { private String resource; /** - * @see cn.lili.modules.base.entity.enums.VerificationSourceEnum + * @see VerificationSourceEnum */ @ApiModelProperty(value = "验证码资源类型 SLIDER/SOURCE") private String type; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java index e5a512ea..60d492c7 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java @@ -1,6 +1,6 @@ package cn.lili.modules.system.entity.dto.payment; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportForm; import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportItem; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java index 9897cf72..0b35f6e6 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java @@ -1,6 +1,6 @@ package cn.lili.modules.system.entity.dto.payment.dto; -import cn.lili.modules.base.entity.enums.ClientTypeEnum; +import cn.lili.modules.base.enums.ClientTypeEnum; import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; import lombok.Data; import lombok.experimental.Accessors; diff --git a/framework/src/main/java/cn/lili/modules/base/entity/enums/VerificationSourceEnum.java b/framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java similarity index 88% rename from framework/src/main/java/cn/lili/modules/base/entity/enums/VerificationSourceEnum.java rename to framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java index e8557ed0..a107cf7f 100644 --- a/framework/src/main/java/cn/lili/modules/base/entity/enums/VerificationSourceEnum.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java @@ -1,4 +1,4 @@ -package cn.lili.modules.base.entity.enums; +package cn.lili.modules.system.entity.enums; /** diff --git a/framework/src/main/java/cn/lili/modules/base/entity/vo/VerificationVO.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationVO.java similarity index 79% rename from framework/src/main/java/cn/lili/modules/base/entity/vo/VerificationVO.java rename to framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationVO.java index df5a1bca..02633434 100644 --- a/framework/src/main/java/cn/lili/modules/base/entity/vo/VerificationVO.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationVO.java @@ -1,6 +1,6 @@ -package cn.lili.modules.base.entity.vo; +package cn.lili.modules.system.entity.vo; -import cn.lili.modules.base.entity.dos.VerificationSource; +import cn.lili.modules.system.entity.dos.VerificationSource; import lombok.Data; import java.io.Serializable; diff --git a/framework/src/main/java/cn/lili/modules/base/mapper/RegionMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/RegionMapper.java similarity index 86% rename from framework/src/main/java/cn/lili/modules/base/mapper/RegionMapper.java rename to framework/src/main/java/cn/lili/modules/system/mapper/RegionMapper.java index 9e1e5751..809f8fae 100644 --- a/framework/src/main/java/cn/lili/modules/base/mapper/RegionMapper.java +++ b/framework/src/main/java/cn/lili/modules/system/mapper/RegionMapper.java @@ -1,4 +1,4 @@ -package cn.lili.modules.base.mapper; +package cn.lili.modules.system.mapper; import cn.lili.modules.system.entity.dos.Region; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/framework/src/main/java/cn/lili/modules/base/mapper/VerificationSourceMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java similarity index 70% rename from framework/src/main/java/cn/lili/modules/base/mapper/VerificationSourceMapper.java rename to framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java index 23928931..13fa054f 100644 --- a/framework/src/main/java/cn/lili/modules/base/mapper/VerificationSourceMapper.java +++ b/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java @@ -1,6 +1,6 @@ -package cn.lili.modules.base.mapper; +package cn.lili.modules.system.mapper; -import cn.lili.modules.base.entity.dos.VerificationSource; +import cn.lili.modules.system.entity.dos.VerificationSource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/framework/src/main/java/cn/lili/modules/base/service/RegionService.java b/framework/src/main/java/cn/lili/modules/system/service/RegionService.java similarity index 96% rename from framework/src/main/java/cn/lili/modules/base/service/RegionService.java rename to framework/src/main/java/cn/lili/modules/system/service/RegionService.java index f66f5de9..dc71e82e 100644 --- a/framework/src/main/java/cn/lili/modules/base/service/RegionService.java +++ b/framework/src/main/java/cn/lili/modules/system/service/RegionService.java @@ -1,4 +1,4 @@ -package cn.lili.modules.base.service; +package cn.lili.modules.system.service; import cn.lili.modules.system.entity.dos.Region; import cn.lili.modules.system.entity.vo.RegionVO; diff --git a/framework/src/main/java/cn/lili/modules/base/service/VerificationSourceService.java b/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java similarity index 79% rename from framework/src/main/java/cn/lili/modules/base/service/VerificationSourceService.java rename to framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java index 1527f9b9..4dc5b478 100644 --- a/framework/src/main/java/cn/lili/modules/base/service/VerificationSourceService.java +++ b/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java @@ -1,8 +1,8 @@ -package cn.lili.modules.base.service; +package cn.lili.modules.system.service; import cn.lili.common.cache.CachePrefix; -import cn.lili.modules.base.entity.dos.VerificationSource; -import cn.lili.modules.base.entity.vo.VerificationVO; +import cn.lili.modules.system.entity.dos.VerificationSource; +import cn.lili.modules.system.entity.vo.VerificationVO; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java similarity index 98% rename from framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java rename to framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java index 4ce4e765..896f8489 100644 --- a/framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java @@ -1,11 +1,11 @@ -package cn.lili.modules.base.serviceimpl; +package cn.lili.modules.system.serviceimpl; import cn.lili.common.cache.Cache; import cn.lili.common.utils.HttpClientUtils; import cn.lili.common.utils.SnowFlake; import cn.lili.common.utils.StringUtils; -import cn.lili.modules.base.mapper.RegionMapper; -import cn.lili.modules.base.service.RegionService; +import cn.lili.modules.system.mapper.RegionMapper; +import cn.lili.modules.system.service.RegionService; import cn.lili.modules.system.entity.dos.Region; import cn.lili.modules.system.entity.vo.RegionVO; import com.alibaba.fastjson.JSONArray; diff --git a/framework/src/main/java/cn/lili/modules/base/serviceimpl/VerificationSourceServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java similarity index 82% rename from framework/src/main/java/cn/lili/modules/base/serviceimpl/VerificationSourceServiceImpl.java rename to framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java index 9a595b11..dd7f0b39 100644 --- a/framework/src/main/java/cn/lili/modules/base/serviceimpl/VerificationSourceServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java @@ -1,13 +1,12 @@ -package cn.lili.modules.base.serviceimpl; +package cn.lili.modules.system.serviceimpl; import cn.lili.common.cache.Cache; -import cn.lili.modules.base.entity.dos.VerificationSource; -import cn.lili.modules.base.entity.enums.VerificationSourceEnum; -import cn.lili.modules.base.entity.vo.VerificationVO; -import cn.lili.modules.base.mapper.VerificationSourceMapper; -import cn.lili.modules.base.service.VerificationSourceService; +import cn.lili.modules.system.entity.dos.VerificationSource; +import cn.lili.modules.system.entity.enums.VerificationSourceEnum; +import cn.lili.modules.system.entity.vo.VerificationVO; +import cn.lili.modules.system.mapper.VerificationSourceMapper; +import cn.lili.modules.system.service.VerificationSourceService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java index 5dcbe2e3..92f8a6ec 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java @@ -5,8 +5,8 @@ import cn.lili.common.utils.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; -import cn.lili.modules.base.entity.dos.VerificationSource; -import cn.lili.modules.base.service.VerificationSourceService; +import cn.lili.modules.system.entity.dos.VerificationSource; +import cn.lili.modules.system.service.VerificationSourceService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java index 003cab68..8355e098 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java @@ -3,7 +3,7 @@ package cn.lili.controller.setting; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.base.aspect.DemoSite; -import cn.lili.modules.base.service.RegionService; +import cn.lili.modules.system.service.RegionService; import cn.lili.modules.system.entity.dos.Region; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam;