code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'backup'

Browse Source 
# Conflicts:
#	framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
#	framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
#	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java
#	framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java
This commit is contained in:
Chopper
2021-07-22 12:07:22 +08:00
parent 0ccdc94644 bc6abdbf1a
commit fdb55bc426
354 changed files with 648 additions and 910 deletions
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: