caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
lifenlong 2021-07-23 19:45:21 +08:00
commit abdc74c773
354 changed files with 648 additions and 909 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java
View File

@ -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;

2
buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java
View File

@ -1,7 +1,7 @@
package cn.lili.controller.member;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.PageUtil;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;

2
buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java
View File

@ -1,6 +1,6 @@
package cn.lili.controller.member;
import cn.lili.common.utils.PageUtil;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;

2
buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java
View File

@ -1,7 +1,7 @@
package cn.lili.controller.other;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.PageUtil;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.system.entity.dos.AppVersion;

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

@ -2,10 +2,10 @@ package cn.lili.controller.passport;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.sms.SmsUtil;
import cn.lili.modules.system.sms.SmsUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.verification.enums.VerificationEnums;
import cn.lili.common.verification.service.VerificationService;
import cn.lili.modules.verification.enums.VerificationEnums;
import cn.lili.modules.verification.service.VerificationService;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.entity.dto.MemberEditDTO;

2
buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java
View File

@ -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;

2
buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java
View File

@ -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;

2
buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java
View File

@ -6,7 +6,7 @@ import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO;
import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
import cn.lili.common.enums.PromotionTypeEnum;
import cn.lili.modules.promotion.entity.vos.PintuanMemberVO;
import cn.lili.modules.promotion.entity.vos.PintuanShareVO;
import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams;

2
buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java
View File

@ -2,7 +2,7 @@ package cn.lili.controller.trade;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.PageUtil;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;

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

@ -1,12 +1,12 @@
package cn.lili.security;
import cn.hutool.core.util.StrUtil;
import cn.lili.common.cache.Cache;
import cn.lili.common.cache.CachePrefix;
import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.enums.SecurityEnum;
import cn.lili.common.security.enums.UserEnums;
import cn.lili.common.token.SecretKeyUtil;
import cn.lili.common.security.token.SecretKeyUtil;
import cn.lili.common.utils.ResponseUtil;
import com.google.gson.Gson;
import io.jsonwebtoken.Claims;

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

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

4
buyer-api/src/main/resources/application.yml
View File

@ -118,9 +118,9 @@ spring:
# standard:
# sharding-column: create_time
# #分表策略
# precise-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# precise-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
# #范围查询实现
# range-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# range-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
props:
#是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
sql:

4
buyer-api/src/test/resources/application.yml
View File

@ -115,9 +115,9 @@ spring:
# standard:
# sharding-column: create_time
# #分表策略
# precise-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# precise-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
# #范围查询实现
# range-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# range-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
props:
#是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
sql:

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

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

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

@ -1,11 +1,11 @@
package cn.lili.controller.common;
import cn.lili.common.aop.limiter.annotation.LimitPoint;
import cn.lili.cache.limit.annotation.LimitPoint;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.verification.enums.VerificationEnums;
import cn.lili.common.verification.service.VerificationService;
import cn.lili.modules.verification.enums.VerificationEnums;
import cn.lili.modules.verification.service.VerificationService;
import cn.lili.common.vo.ResultMessage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

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

@ -1,12 +1,12 @@
package cn.lili.controller.common;
import cn.lili.common.aop.limiter.annotation.LimitPoint;
import cn.lili.cache.limit.annotation.LimitPoint;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.sms.SmsUtil;
import cn.lili.modules.system.sms.SmsUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.verification.enums.VerificationEnums;
import cn.lili.common.verification.service.VerificationService;
import cn.lili.modules.verification.enums.VerificationEnums;
import cn.lili.modules.verification.service.VerificationService;
import cn.lili.common.vo.ResultMessage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

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

@ -1,7 +1,7 @@
package cn.lili.controller.common;
import cn.hutool.core.util.StrUtil;
import cn.lili.common.cache.Cache;
import cn.lili.cache.Cache;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.AuthUser;
@ -12,7 +12,7 @@ import cn.lili.common.utils.CommonUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.ResultMessage;
import cn.lili.config.properties.SystemSetting;
import cn.lili.common.properties.SystemSettingProperties;
import cn.lili.modules.file.entity.File;
import cn.lili.modules.file.plugin.FileManagerPlugin;
import cn.lili.modules.file.service.FileService;
@ -53,7 +53,7 @@ public class UploadController {
private Cache cache;
@Autowired
private SystemSetting systemSetting;
private SystemSettingProperties systemSettingProperties;
@ApiOperation(value = "文件上传")
@PostMapping(value = "/file")
@ -109,6 +109,6 @@ public class UploadController {
@ApiOperation(value = "返回licences")
@PostMapping(value = "/licences")
public ResultMessage<Object> licences() {
return ResultUtil.data(systemSetting.getLicences());
return ResultUtil.data(systemSettingProperties.getLicences());
}
}

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

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

4
common-api/src/main/resources/application.yml
View File

@ -115,9 +115,9 @@ spring:
# standard:
# sharding-column: create_time
# #分表策略
# precise-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# precise-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
# #范围查询实现
# range-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# range-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
props:
#是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
sql:

4
config/application.yml
View File

@ -115,9 +115,9 @@ spring:
# standard:
# sharding-column: create_time
# #分表策略
# precise-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# precise-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
# #范围查询实现
# range-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# range-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
props:
#是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
sql:

4
consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java
View File

@ -1,7 +1,7 @@
package cn.lili.event.impl;
import cn.hutool.core.convert.Convert;
import cn.lili.common.cache.Cache;
import cn.lili.cache.Cache;
import cn.lili.event.OrderStatusChangeEvent;
import cn.lili.modules.goods.entity.dos.GoodsSku;
import cn.lili.modules.goods.service.GoodsSkuService;
@ -11,7 +11,7 @@ import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.promotion.entity.dos.PromotionGoods;
import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
import cn.lili.common.enums.PromotionTypeEnum;
import cn.lili.modules.promotion.service.PromotionGoodsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

2
consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java
View File

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

2
consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java
View File

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

2
consumer/src/main/java/cn/lili/listener/MemberMessageListener.java
View File

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

4
consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java
View File

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

4
consumer/src/main/java/cn/lili/listener/OrderMessageListener.java
View File

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

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

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

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

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

2
consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java
View File

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

6
consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java
View File

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

4
consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java
View File

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

12
consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java
View File

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

6
consumer/src/main/java/cn/lili/trigger/listen/PromotionDelayQueueListen.java
View File

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

4
consumer/src/main/resources/application.yml
View File

@ -118,9 +118,9 @@ spring:
# standard:
# sharding-column: create_time
# #分表策略
# precise-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# precise-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
# #范围查询实现
# range-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# range-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
props:
#是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
sql:

15
framework/pom.xml
View File

@ -63,21 +63,16 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
<!-- Thymeleaf -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<!-- JPA -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<!-- Websocket -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<!-- &lt;!&ndash; Websocket &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-websocket</artifactId>-->
<!-- </dependency>-->
<!-- MybatisPlus -->
<dependency>
<groupId>com.baomidou</groupId>

2
framework/src/main/java/cn/lili/common/cache/Cache.java → framework/src/main/java/cn/lili/cache/Cache.java vendored
View File

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

4
framework/src/main/java/cn/lili/common/cache/CachePrefix.java → framework/src/main/java/cn/lili/cache/CachePrefix.java vendored
View File

@ -1,7 +1,7 @@
package cn.lili.common.cache;
package cn.lili.cache;
import cn.lili.common.security.enums.UserEnums;
import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
import cn.lili.common.enums.PromotionTypeEnum;
/**
* 缓存前缀

2
framework/src/main/java/cn/lili/config/mongo/MongoConfig.java → framework/src/main/java/cn/lili/cache/config/mongo/MongoConfig.java vendored
View File

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

2
framework/src/main/java/cn/lili/config/cache/FastJsonRedisSerializer.java → framework/src/main/java/cn/lili/cache/config/redis/FastJsonRedisSerializer.java vendored
View File

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

2
framework/src/main/java/cn/lili/config/cache/RedisConfig.java → framework/src/main/java/cn/lili/cache/config/redis/RedisConfig.java vendored
View File

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

4
framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java → framework/src/main/java/cn/lili/cache/impl/RedisCache.java vendored
View File

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

6
framework/src/main/java/cn/lili/common/aop/limiter/annotation/LimitPoint.java → framework/src/main/java/cn/lili/cache/limit/annotation/LimitPoint.java vendored
View File

@ -1,7 +1,7 @@
package cn.lili.common.aop.limiter.annotation;
package cn.lili.cache.limit.annotation;
import cn.lili.common.aop.limiter.LimitType;
import cn.lili.cache.limit.enums.LimitTypeEnums;
import java.lang.annotation.*;
@ -60,5 +60,5 @@ public @interface LimitPoint {
*
* @return LimitType
*/
LimitType limitType() default LimitType.IP;
LimitTypeEnums limitType() default LimitTypeEnums.IP;
}

4
framework/src/main/java/cn/lili/common/aop/limiter/LimitType.java → framework/src/main/java/cn/lili/cache/limit/enums/LimitTypeEnums.java vendored
View File

@ -1,4 +1,4 @@
package cn.lili.common.aop.limiter;
package cn.lili.cache.limit.enums;
/**
@ -8,7 +8,7 @@ package cn.lili.common.aop.limiter;
* @since 2018年2月02日 下午4:58:52
*/
public enum LimitType {
public enum LimitTypeEnums {
/**
* 自定义key(即全局限流)
*/

9
framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java → framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java vendored
View File

@ -1,6 +1,7 @@
package cn.lili.common.aop.limiter;
package cn.lili.cache.limit.interceptor;
import cn.lili.common.aop.limiter.annotation.LimitPoint;
import cn.lili.cache.limit.enums.LimitTypeEnums;
import cn.lili.cache.limit.annotation.LimitPoint;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import com.google.common.collect.ImmutableList;
@ -43,12 +44,12 @@ public class LimitInterceptor {
@Before("@annotation(limitPointAnnotation)")
public void interceptor(LimitPoint limitPointAnnotation) {
LimitType limitType = limitPointAnnotation.limitType();
LimitTypeEnums limitTypeEnums = limitPointAnnotation.limitType();
String name = limitPointAnnotation.name();
String key;
int limitPeriod = limitPointAnnotation.period();
int limitCount = limitPointAnnotation.limit();
switch (limitType) {
switch (limitTypeEnums) {
case CUSTOMER:
key = limitPointAnnotation.key();
break;

2
framework/src/main/java/cn/lili/common/utils/RedisUtil.java → framework/src/main/java/cn/lili/cache/util/RedisUtil.java vendored
View File

@ -1,4 +1,4 @@
package cn.lili.common.utils;
package cn.lili.cache.util;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

101
framework/src/main/java/cn/lili/common/cache/MybatisRedisCache.java vendored
View File

@ -1,101 +0,0 @@
package cn.lili.common.cache;
import cn.lili.common.utils.SpringContextUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.cache.Cache;
import org.springframework.data.redis.connection.RedisServerCommands;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.util.CollectionUtils;
import java.util.Set;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
* MybatisRedisCache
*
* @author Chopper
* @version v1.0
* @since
* 2020-04-01 2:59 下午
* 不赞成使用此方式注解，统一使用Cacheable 更为合适
*
* 使用方法 @CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
*/
@Deprecated
@Slf4j
public class MybatisRedisCache implements Cache {
private final ReadWriteLock readWriteLock = new ReentrantReadWriteLock(true);
private RedisTemplate<Object, Object> getRedisTemplate() {
return (RedisTemplate<Object, Object>) SpringContextUtil.getBean("redisTemplate");
}
private final String id;
public MybatisRedisCache(final String id) {
if (id == null) {
throw new IllegalArgumentException("Cache instances require an ID");
}
this.id = id;
}
@Override
public String getId() {
return this.id;
}
@Override
public void putObject(Object key, Object value) {
try {
if (value != null) {
log.info("写入缓存：" + key.toString()+"----"+value.toString());
getRedisTemplate().opsForValue().set(key.toString(), value);
}
} catch (Exception e) {
log.error("写入mybatis缓存异常 ", e);
}
}
@Override
public Object getObject(Object key) {
try {
if (key != null) {
log.info("获取缓存：" + key);
return getRedisTemplate().opsForValue().get(key.toString());
}
} catch (Exception e) {
log.error("mybatis缓存获取异常 ", e);
}
return null;
}
@Override
public Object removeObject(Object key) {
if (key != null) {
getRedisTemplate().delete(key.toString());
}
return null;
}
@Override
public void clear() {
Set<Object> keys = getRedisTemplate().keys("*:" + this.id + "*");
if (!CollectionUtils.isEmpty(keys)) {
getRedisTemplate().delete(keys);
}
}
@Override
public int getSize() {
Long size = getRedisTemplate().execute(RedisServerCommands::dbSize);
return size.intValue();
}
@Override
public ReadWriteLock getReadWriteLock() {
return this.readWriteLock;
}
}

2
framework/src/main/java/cn/lili/config/context/ContextConfiguration.java → framework/src/main/java/cn/lili/common/context/ContextConfiguration.java
View File

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

2
framework/src/main/java/cn/lili/config/context/ThreadContextHolder.java → framework/src/main/java/cn/lili/common/context/ThreadContextHolder.java
View File

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

2
framework/src/main/java/cn/lili/config/context/ThreadContextHolderInterceptorAdapter.java → framework/src/main/java/cn/lili/common/context/ThreadContextHolderInterceptorAdapter.java
View File

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

4
framework/src/main/java/cn/lili/config/interceptor/RequestInterceptorAdapter.java → framework/src/main/java/cn/lili/common/context/interceptor/RequestInterceptorAdapter.java
View File

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

4
framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java → framework/src/main/java/cn/lili/common/context/interceptor/UrlConfiguration.java
View File

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

2
framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionTypeEnum.java → framework/src/main/java/cn/lili/common/enums/PromotionTypeEnum.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.promotion.entity.enums;
package cn.lili.common.enums;
/**

2
framework/src/main/java/cn/lili/config/properties/ApiProperties.java → framework/src/main/java/cn/lili/common/properties/ApiProperties.java
View File

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

2
framework/src/main/java/cn/lili/config/properties/DomainProperties.java → framework/src/main/java/cn/lili/common/properties/DomainProperties.java
View File

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

2
framework/src/main/java/cn/lili/config/properties/IgnoredUrlsProperties.java → framework/src/main/java/cn/lili/common/properties/IgnoredUrlsProperties.java
View File

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

2
framework/src/main/java/cn/lili/config/properties/JWTTokenProperties.java → framework/src/main/java/cn/lili/common/properties/JWTTokenProperties.java
View File

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

2
framework/src/main/java/cn/lili/config/rocketmq/RocketmqCustomProperties.java → framework/src/main/java/cn/lili/common/properties/RocketmqCustomProperties.java
View File

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

4
framework/src/main/java/cn/lili/config/properties/SmsTemplateSetting.java → framework/src/main/java/cn/lili/common/properties/SmsTemplateProperties.java
View File

@ -1,4 +1,4 @@
package cn.lili.config.properties;
package cn.lili.common.properties;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
@Data
@Configuration
@ConfigurationProperties(prefix = "lili.sms")
public class SmsTemplateSetting {
public class SmsTemplateProperties {
/**
* 登录
*/

2
framework/src/main/java/cn/lili/config/properties/StatisticsProperties.java → framework/src/main/java/cn/lili/common/properties/StatisticsProperties.java
View File

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

4
framework/src/main/java/cn/lili/config/properties/SystemSetting.java → framework/src/main/java/cn/lili/common/properties/SystemSettingProperties.java
View File

@ -1,4 +1,4 @@
package cn.lili.config.properties;
package cn.lili.common.properties;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
@Data
@Configuration
@ConfigurationProperties(prefix = "lili.system")
public class SystemSetting {
public class SystemSettingProperties {
/**

2
framework/src/main/java/cn/lili/config/properties/ThreadProperties.java → framework/src/main/java/cn/lili/common/properties/ThreadProperties.java
View File

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

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

@ -1,11 +1,11 @@
package cn.lili.common.security.context;
import cn.lili.common.cache.Cache;
import cn.lili.cache.Cache;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.enums.SecurityEnum;
import cn.lili.common.token.SecretKeyUtil;
import cn.lili.common.security.token.SecretKeyUtil;
import com.google.gson.Gson;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;

2
framework/src/main/java/cn/lili/common/token/PermissionEnum.java → framework/src/main/java/cn/lili/common/security/enums/PermissionEnum.java
View File

@ -1,4 +1,4 @@
package cn.lili.common.token;
package cn.lili.common.security.enums;
/**
* 权限枚举值

2
framework/src/main/java/cn/lili/common/token/SecretKeyUtil.java → framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java
View File

@ -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;

2
framework/src/main/java/cn/lili/common/token/Token.java → framework/src/main/java/cn/lili/common/security/token/Token.java
View File

@ -1,4 +1,4 @@
package cn.lili.common.token;
package cn.lili.common.security.token;
import lombok.Data;

8
framework/src/main/java/cn/lili/common/token/TokenUtil.java → framework/src/main/java/cn/lili/common/security/token/TokenUtil.java
View File

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

4
framework/src/main/java/cn/lili/common/token/base/AbstractTokenGenerate.java → framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java
View File

@ -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

2
framework/src/main/java/cn/lili/config/swagger/Swagger2Config.java → framework/src/main/java/cn/lili/common/swagger/Swagger2Config.java
View File

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

36
framework/src/main/java/cn/lili/common/test/BaseTest.java
View File

@ -1,36 +0,0 @@
package cn.lili.common.test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestContext;
import org.springframework.test.context.TestExecutionListener;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;
/**
* BaseTest
*
* @author Chopper
* @version v1.0
* @since
* 2020-06-13 12:17
*/
@RunWith(SpringRunner.class)
@SpringBootTest
@Transactional(rollbackFor = Exception.class)
@Rollback()
@ContextConfiguration
@Configuration
@ComponentScan("cn.lili")
public class BaseTest implements TestExecutionListener {
@Override
public void beforeTestClass(TestContext testContext) throws Exception {
//设置环境变量 解决es冲突
System.setProperty("es.set.netty.runtime.available.processors", "false");
}
}

4
framework/src/main/java/cn/lili/config/thread/ThreadConfig.java → framework/src/main/java/cn/lili/common/thread/ThreadConfig.java
View File

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

2
framework/src/main/java/cn/lili/modules/connect/util/Base64Utils.java → framework/src/main/java/cn/lili/common/utils/Base64Utils.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.connect.util;
package cn.lili.common.utils;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;

56
framework/src/main/java/cn/lili/common/utils/HibernateProxyTypeAdapter.java
View File

@ -1,56 +0,0 @@
package cn.lili.common.utils;
import com.google.gson.Gson;
import com.google.gson.TypeAdapter;
import com.google.gson.TypeAdapterFactory;
import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import org.hibernate.Hibernate;
import org.hibernate.proxy.HibernateProxy;
import java.io.IOException;
/**
* 代理对象实例化
* @author Chopper
*/
public class HibernateProxyTypeAdapter extends TypeAdapter<HibernateProxy> {
public static final TypeAdapterFactory FACTORY = new TypeAdapterFactory() {
@Override
@SuppressWarnings("unchecked")
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
return (HibernateProxy.class.isAssignableFrom(type.getRawType()) ? (TypeAdapter<T>) new HibernateProxyTypeAdapter(gson) : null);
}
};
private final Gson context;
private HibernateProxyTypeAdapter(Gson context) {
this.context = context;
}
@Override
public HibernateProxy read(JsonReader in) throws IOException {
throw new UnsupportedOperationException("Not supported");
}
@SuppressWarnings({"rawtypes", "unchecked"})
@Override
public void write(JsonWriter out, HibernateProxy value) throws IOException {
if (value == null) {
out.nullValue();
return;
}
//Retrieve the original (not proxy) class
Class<?> baseType = Hibernate.getClass(value);
//Get the TypeAdapter of the original class, to delegate the serialization
TypeAdapter delegate = context.getAdapter(TypeToken.get(baseType));
//Get a filled instance of the original class
Object unproxiedValue = ((HibernateProxy) value).getHibernateLazyInitializer()
.getImplementation();
//Serialize the value
delegate.write(out, unproxiedValue);
}
}

2
framework/src/main/java/cn/lili/modules/connect/util/HttpUtils.java → framework/src/main/java/cn/lili/common/utils/HttpUtils.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.connect.util;
package cn.lili.common.utils;
import com.xkcoding.http.HttpUtil;
import com.xkcoding.http.config.HttpConfig;

1
framework/src/main/java/cn/lili/common/utils/IpHelper.java
View File

@ -4,7 +4,6 @@ package cn.lili.common.utils;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.http.HttpUtil;
import cn.lili.modules.connect.util.IpUtils;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import lombok.extern.slf4j.Slf4j;

2
framework/src/main/java/cn/lili/modules/connect/util/IpUtils.java → framework/src/main/java/cn/lili/common/utils/IpUtils.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.connect.util;
package cn.lili.common.utils;
import lombok.extern.slf4j.Slf4j;

41
framework/src/main/java/cn/lili/config/websocket/WebSocketStompConfig.java
View File

@ -1,41 +0,0 @@
package cn.lili.config.websocket;
import org.springframework.context.annotation.Configuration;
import org.springframework.messaging.simp.config.MessageBrokerRegistry;
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
/**
* @author Chopper
*/
@Configuration
@EnableWebSocketMessageBroker
public class WebSocketStompConfig implements WebSocketMessageBrokerConfigurer {
/**
* 注册stomp端点
* @param registry
*/
@Override
public void registerStompEndpoints(StompEndpointRegistry registry) {
//允许使用socketJs方式访问 即可通过http://IP:PORT/manager/ws来和服务端websocket连接
registry.addEndpoint("/ws").setAllowedOrigins("*").withSockJS();
}
/**
* 配置信息代理
* @param registry
*/
@Override
public void configureMessageBroker(MessageBrokerRegistry registry) {
//订阅Broker名称 user点对点 topic广播即群发
registry.enableSimpleBroker("/user","/topic");
//全局(客户端)使用的消息前缀
registry.setApplicationDestinationPrefixes("/app");
//点对点使用的前缀 无需配置 默认/user
registry.setUserDestinationPrefix("/user");
}
}

4
framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java → framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java
View File

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

2
framework/src/main/java/cn/lili/common/elasticsearch/EsSuffix.java → framework/src/main/java/cn/lili/elasticsearch/EsSuffix.java
View File

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

2
framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchConfig.java → framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java
View File

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

2
framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchProperties.java → framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchProperties.java
View File

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

2
framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java
View File

@ -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;

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

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

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

@ -1,6 +1,6 @@
package cn.lili.modules.connect.request;
import cn.lili.common.cache.Cache;
import cn.lili.cache.Cache;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.utils.UrlBuilder;
import cn.lili.modules.connect.config.AuthConfig;
@ -12,7 +12,7 @@ import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
import cn.lili.modules.connect.entity.enums.AuthResponseStatus;
import cn.lili.modules.connect.exception.AuthException;
import cn.lili.modules.connect.util.AuthChecker;
import cn.lili.modules.connect.util.HttpUtils;
import cn.lili.common.utils.HttpUtils;
import cn.lili.modules.connect.util.UuidUtils;
import com.xkcoding.http.util.UrlUtil;
import lombok.extern.slf4j.Slf4j;

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

@ -1,7 +1,7 @@
package cn.lili.modules.connect.request;
import cn.hutool.core.convert.Convert;
import cn.lili.common.cache.Cache;
import cn.lili.cache.Cache;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.utils.UrlBuilder;
import cn.lili.modules.connect.config.AuthConfig;
@ -14,7 +14,7 @@ import cn.lili.modules.connect.entity.enums.AuthResponseStatus;
import cn.lili.modules.connect.entity.enums.AuthUserGender;
import cn.lili.modules.connect.exception.AuthException;
import cn.lili.modules.connect.util.GlobalAuthUtils;
import cn.lili.modules.connect.util.HttpUtils;
import cn.lili.common.utils.HttpUtils;
import com.alibaba.fastjson.JSONObject;
import java.util.Map;

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

@ -1,6 +1,6 @@
package cn.lili.modules.connect.request;
import cn.lili.common.cache.Cache;
import cn.lili.cache.Cache;
import cn.lili.common.utils.UrlBuilder;
import cn.lili.modules.connect.config.AuthConfig;
import cn.lili.modules.connect.config.ConnectAuthEnum;
@ -11,7 +11,7 @@ import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
import cn.lili.modules.connect.entity.enums.AuthResponseStatus;
import cn.lili.modules.connect.entity.enums.AuthUserGender;
import cn.lili.modules.connect.exception.AuthException;
import cn.lili.modules.connect.util.HttpUtils;
import cn.lili.common.utils.HttpUtils;
import com.alibaba.fastjson.JSONObject;
/**

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

@ -1,6 +1,6 @@
package cn.lili.modules.connect.request;
import cn.lili.common.cache.Cache;
import cn.lili.cache.Cache;
import cn.lili.common.utils.UrlBuilder;
import cn.lili.modules.connect.config.AuthConfig;
import cn.lili.modules.connect.config.ConnectAuthEnum;
@ -12,7 +12,7 @@ import cn.lili.modules.connect.entity.enums.AuthResponseStatus;
import cn.lili.modules.connect.entity.enums.AuthUserGender;
import cn.lili.modules.connect.exception.AuthException;
import cn.lili.modules.connect.util.GlobalAuthUtils;
import cn.lili.modules.connect.util.HttpUtils;
import cn.lili.common.utils.HttpUtils;
import com.alibaba.fastjson.JSONObject;
/**

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

@ -1,7 +1,7 @@
package cn.lili.modules.connect.request;
import cn.lili.common.cache.Cache;
import cn.lili.cache.Cache;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.utils.UrlBuilder;
import cn.lili.modules.connect.config.AuthConfig;
@ -13,8 +13,8 @@ import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
import cn.lili.modules.connect.entity.enums.AuthResponseStatus;
import cn.lili.modules.connect.entity.enums.AuthUserGender;
import cn.lili.modules.connect.exception.AuthException;
import cn.lili.modules.connect.util.HttpUtils;
import cn.lili.modules.connect.util.IpUtils;
import cn.lili.common.utils.HttpUtils;
import cn.lili.common.utils.IpUtils;
import com.alibaba.fastjson.JSONObject;
import com.xkcoding.http.support.HttpHeader;

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

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

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

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

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

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

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

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

1
framework/src/main/java/cn/lili/modules/connect/util/GlobalAuthUtils.java
View File

@ -1,5 +1,6 @@
package cn.lili.modules.connect.util;
import cn.lili.common.utils.Base64Utils;
import cn.lili.common.utils.StringUtils;
import cn.lili.modules.connect.exception.AuthException;
import com.alibaba.fastjson.JSON;

2
framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java
View File

@ -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;

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

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

2
framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java
View File

@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.security.enums.UserEnums;
import cn.lili.common.utils.PageUtil;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.modules.distribution.entity.dos.Distribution;
import cn.lili.modules.distribution.entity.dos.DistributionGoods;
import cn.lili.modules.distribution.entity.dto.DistributionGoodsSearchParams;

2
framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java
View File

@ -4,7 +4,7 @@ import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime;
import cn.hutool.json.JSONUtil;
import cn.lili.common.utils.CurrencyUtil;
import cn.lili.common.utils.PageUtil;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.modules.distribution.entity.dos.Distribution;
import cn.lili.modules.distribution.entity.dos.DistributionOrder;
import cn.lili.modules.distribution.entity.enums.DistributionOrderStatusEnum;

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

@ -1,13 +1,13 @@
package cn.lili.modules.distribution.serviceimpl;
import cn.hutool.json.JSONUtil;
import cn.lili.common.cache.Cache;
import cn.lili.common.cache.CachePrefix;
import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.BeanUtil;
import cn.lili.common.utils.PageUtil;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.modules.distribution.entity.dos.Distribution;
import cn.lili.modules.distribution.entity.dto.DistributionApplyDTO;

2
framework/src/main/java/cn/lili/modules/file/entity/File.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java
View File

@ -3,7 +3,7 @@ package cn.lili.modules.file.serviceimpl;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.AuthUser;
import cn.lili.common.utils.PageUtil;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.SearchVO;

Some files were not shown because too many files have changed in this diff Show More