暂时备份一下代码，准备切换master

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

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

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

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

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

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

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

@@ -3,7 +3,7 @@
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.security.token.Token;
+import cn.lili.cache.token.Token;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.connect.entity.dto.AuthCallback;

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

@@ -1,6 +1,6 @@
 package cn.lili.controller.passport.connect;
 
-import cn.lili.common.security.token.Token;
+import cn.lili.cache.token.Token;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.connect.entity.dto.WechatMPLoginParams;

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

@@ -6,7 +6,7 @@
 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;

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

@@ -2,7 +2,7 @@
 
 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;

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

@@ -6,7 +6,7 @@
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.SecurityEnum;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.security.token.SecretKeyUtil;
+import cn.lili.cache.token.SecretKeyUtil;
 import cn.lili.common.utils.ResponseUtil;
 import com.google.gson.Gson;
 import io.jsonwebtoken.Claims;

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

@@ -3,7 +3,7 @@
 import cn.lili.cache.Cache;
 import cn.lili.common.security.CustomAccessDeniedHandler;
 import cn.lili.common.utils.SpringContextUtil;
-import cn.lili.common.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;

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

@@ -12,7 +12,7 @@
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.common.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 ResultMessage<Object> upload(MultipartFile file,
     @ApiOperation(value = "返回licences")
     @PostMapping(value = "/licences")
     public ResultMessage<Object> licences() {
-        return ResultUtil.data(systemSetting.getLicences());
+        return ResultUtil.data(systemSettingProperties.getLicences());
     }
 }

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

@@ -2,7 +2,7 @@
 
 import cn.lili.cache.Cache;
 import cn.lili.common.security.CustomAccessDeniedHandler;
-import cn.lili.common.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;

consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java

@@ -11,7 +11,7 @@
 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;

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

@@ -3,7 +3,7 @@
 import cn.lili.cache.Cache;
 import cn.lili.cache.CachePrefix;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.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;

consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java

@@ -7,7 +7,7 @@
 import cn.lili.trigger.message.PromotionMessage;
 import cn.lili.trigger.model.TimeExecuteConstant;
 import cn.lili.trigger.model.TimeTriggerMsg;
-import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
+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;

framework/pom.xml

@@ -73,11 +73,11 @@
             <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>

framework/src/main/java/cn/lili/cache/CachePrefix.java

@@ -1,7 +1,7 @@
 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;
 
 /**
  * 缓存前缀

framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java → framework/src/main/java/cn/lili/cache/token/SecretKeyUtil.java

@@ -1,4 +1,4 @@
-package cn.lili.common.security.token;
+package cn.lili.cache.token;
 
 import com.google.api.client.repackaged.org.apache.commons.codec.binary.Base64;
 import io.jsonwebtoken.io.Decoders;

framework/src/main/java/cn/lili/common/security/token/Token.java → framework/src/main/java/cn/lili/cache/token/Token.java

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

framework/src/main/java/cn/lili/common/security/token/TokenUtil.java → framework/src/main/java/cn/lili/cache/token/TokenUtil.java

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

framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java → framework/src/main/java/cn/lili/cache/token/base/AbstractTokenGenerate.java

@@ -1,7 +1,7 @@
-package cn.lili.common.security.token.base;
+package cn.lili.cache.token.base;
 
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.security.token.Token;
+import cn.lili.cache.token.Token;
 
 /**
  * AbstractToken

framework/src/main/java/cn/lili/common/utils/RedisUtil.java → framework/src/main/java/cn/lili/cache/util/RedisUtil.java

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
-package cn.lili.common.config.interceptor;
+package cn.lili.common.context.interceptor;
 
-import cn.lili.common.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;

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

@@ -1,6 +1,6 @@
-package cn.lili.common.config.interceptor;
+package cn.lili.common.context.interceptor;
 
-import cn.lili.common.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;

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

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