暂时备份一下代码，准备切换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 @@ package cn.lili.controller.passport.connect;
 
 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.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;

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

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

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

@@ -6,7 +6,7 @@ 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.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 @@ package cn.lili.security;
 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.utils.CommonUtil;
 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 class UploadController {
     @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 @@ package cn.lili.controller.security;
 
 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.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;

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

@@ -3,7 +3,7 @@ package cn.lili.timetask.handler.impl.statistics;
 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.PintuanOrderMessage;
 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/cache/MybatisRedisCache.java

@@ -1,101 +0,0 @@
-package cn.lili.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;
-    }
-}

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/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/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.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.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/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/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/websocket/WebSocketStompConfig.java

@@ -1,41 +0,0 @@
-package cn.lili.common.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");
-    }
-}

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/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/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/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/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/common/enums/PromotionTypeEnum.java

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

framework/src/main/java/cn/lili/common/properties/ApiProperties.java

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

framework/src/main/java/cn/lili/common/properties/DomainProperties.java

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

framework/src/main/java/cn/lili/common/properties/IgnoredUrlsProperties.java

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

framework/src/main/java/cn/lili/common/properties/JWTTokenProperties.java

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

framework/src/main/java/cn/lili/common/properties/RocketmqCustomProperties.java

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

framework/src/main/java/cn/lili/common/properties/SmsTemplateProperties.java

@@ -1,4 +1,4 @@
-package cn.lili.common.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 {
     /**
      * 登录
      */

framework/src/main/java/cn/lili/common/properties/StatisticsProperties.java

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

framework/src/main/java/cn/lili/common/properties/SystemSettingProperties.java

@@ -1,4 +1,4 @@
-package cn.lili.common.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 {
 
 
     /**

framework/src/main/java/cn/lili/common/properties/ThreadProperties.java

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

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

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

framework/src/main/java/cn/lili/common/security/enums/PermissionEnum.java

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

framework/src/main/java/cn/lili/common/swagger/Swagger2Config.java

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

framework/src/main/java/cn/lili/common/test/BaseTest.java

@@ -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");
-    }
-
-}

framework/src/main/java/cn/lili/common/thread/ThreadConfig.java

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

framework/src/main/java/cn/lili/common/utils/Base64Utils.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.connect.util;
+package cn.lili.common.utils;
 
 import sun.misc.BASE64Decoder;
 import sun.misc.BASE64Encoder;

framework/src/main/java/cn/lili/common/utils/HibernateProxyTypeAdapter.java

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

framework/src/main/java/cn/lili/common/utils/HttpUtils.java

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

framework/src/main/java/cn/lili/common/utils/IpHelper.java

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

framework/src/main/java/cn/lili/common/utils/IpUtils.java

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 package cn.lili.modules.connect.service;
 
 import cn.lili.cache.CachePrefix;
-import cn.lili.common.security.token.Token;
+import cn.lili.cache.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;

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

@@ -8,11 +8,11 @@ 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.security.token.Token;
-import cn.lili.common.security.token.base.generate.MemberTokenGenerate;
+import cn.lili.cache.token.Token;
+import cn.lili.modules.member.token.MemberTokenGenerate;
 import cn.lili.common.utils.CookieUtil;
 import cn.lili.common.utils.StringUtils;
-import cn.lili.common.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;

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

@@ -6,10 +6,10 @@ 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.security.token.Token;
+import cn.lili.cache.token.Token;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.common.config.properties.ApiProperties;
-import cn.lili.common.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;

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

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

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

@@ -5,10 +5,10 @@ import cn.lili.common.exception.ServiceException;
 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.common.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;

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

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

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

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

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

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

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

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

framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java

@@ -2,7 +2,7 @@ package cn.lili.modules.goods.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.modules.goods.entity.dos.Brand;
 import cn.lili.modules.goods.entity.dos.CategoryBrand;
 import cn.lili.modules.goods.entity.dto.BrandPageDTO;

framework/src/main/java/cn/lili/modules/goods/serviceimpl/CommodityServiceImpl.java

@@ -8,7 +8,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.common.vo.PageVO;
 import cn.lili.modules.goods.entity.dos.Commodity;
 import cn.lili.modules.goods.entity.dto.CommodityDTO;

framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java

@@ -3,7 +3,7 @@ package cn.lili.modules.goods.serviceimpl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.goods.entity.dos.*;
 import cn.lili.modules.goods.entity.dto.DraftGoodsDTO;

framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java

@@ -10,9 +10,9 @@ import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.GoodsTagsEnum;
 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.common.utils.StringUtils;
-import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.Category;
 import cn.lili.modules.goods.entity.dos.Goods;
 import cn.lili.modules.goods.entity.dos.GoodsGallery;

framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java

@@ -10,9 +10,9 @@ import cn.lili.common.exception.ServiceException;
 import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.GoodsTagsEnum;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
-import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.Goods;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;

framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java

@@ -14,9 +14,9 @@ import cn.lili.trigger.model.TimeTriggerMsg;
 import cn.lili.trigger.util.DelayQueueTools;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.DateUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.Studio;
 import cn.lili.modules.goods.entity.dos.StudioCommodity;
 import cn.lili.modules.goods.entity.enums.StudioStatusEnum;

framework/src/main/java/cn/lili/modules/member/service/MemberService.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.member.service;
 
 
-import cn.lili.common.security.token.Token;
+import cn.lili.cache.token.Token;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
 import cn.lili.modules.member.entity.dos.Member;

framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.member.serviceimpl;
 
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.member.entity.dos.FootPrint;
 import cn.lili.modules.member.mapper.FootprintMapper;

framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java

@@ -6,9 +6,9 @@ import cn.lili.common.exception.ServiceException;
 import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.GoodsTagsEnum;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.member.entity.dos.GoodsCollection;
 import cn.lili.modules.member.entity.vo.GoodsCollectionVO;
 import cn.lili.modules.member.mapper.GoodsCollectionMapper;

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java

@@ -10,9 +10,9 @@ import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.GoodsTagsEnum;
 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.common.utils.StringUtils;
-import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.service.GoodsSkuService;
 import cn.lili.modules.member.entity.dos.Member;

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.member.serviceimpl;
 
 
-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.modules.member.entity.dos.MemberPointsHistory;
@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 会员积分历史业务层实现

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java

@@ -4,7 +4,7 @@ package cn.lili.modules.member.serviceimpl;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 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.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dos.MemberReceipt;
@@ -17,10 +17,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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;
 
 import java.util.List;
 

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java

@@ -7,17 +7,18 @@ import cn.lili.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.SwitchEnum;
 import cn.lili.common.exception.ServiceException;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.MemberTagsEnum;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.security.token.Token;
-import cn.lili.common.security.token.base.generate.MemberTokenGenerate;
-import cn.lili.common.security.token.base.generate.StoreTokenGenerate;
+import cn.lili.cache.token.Token;
+import cn.lili.modules.member.token.MemberTokenGenerate;
+import cn.lili.modules.member.token.StoreTokenGenerate;
 import cn.lili.common.utils.*;
 import cn.lili.common.vo.PageVO;
-import cn.lili.common.config.context.ThreadContextHolder;
-import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.context.ThreadContextHolder;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.connect.config.ConnectAuthEnum;
 import cn.lili.modules.connect.entity.Connect;
 import cn.lili.modules.connect.entity.dto.ConnectAuthUser;

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java

@@ -9,7 +9,7 @@ import cn.lili.common.security.context.UserContext;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.common.utils.DateUtil;
 import cn.lili.common.utils.StringUtils;
-import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.member.entity.dos.MemberSign;
 import cn.lili.modules.member.mapper.MemberSignMapper;
 import cn.lili.modules.member.service.MemberService;

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java

@@ -3,7 +3,7 @@ package cn.lili.modules.member.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-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.modules.member.entity.dos.MemberWithdrawApply;

framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java

@@ -3,7 +3,7 @@ package cn.lili.modules.member.serviceimpl;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.member.entity.dos.StoreCollection;
 import cn.lili.modules.member.entity.vo.StoreCollectionVO;

framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java

@@ -1,11 +1,11 @@
-package cn.lili.common.security.token.base.generate;
+package cn.lili.modules.member.token;
 
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.security.token.Token;
-import cn.lili.common.security.token.TokenUtil;
-import cn.lili.common.security.token.base.AbstractTokenGenerate;
-import cn.lili.common.config.context.ThreadContextHolder;
+import cn.lili.cache.token.Token;
+import cn.lili.cache.token.TokenUtil;
+import cn.lili.cache.token.base.AbstractTokenGenerate;
+import cn.lili.common.context.ThreadContextHolder;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.service.MemberService;

framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java

@@ -1,12 +1,12 @@
-package cn.lili.common.security.token.base.generate;
+package cn.lili.modules.member.token;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.security.token.Token;
-import cn.lili.common.security.token.TokenUtil;
-import cn.lili.common.security.token.base.AbstractTokenGenerate;
+import cn.lili.cache.token.Token;
+import cn.lili.cache.token.TokenUtil;
+import cn.lili.cache.token.base.AbstractTokenGenerate;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.service.MemberService;
 import cn.lili.modules.store.entity.dos.Store;

framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.message.serviceimpl;
 
 
-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.modules.message.entity.dos.MemberMessage;
@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 

framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java

@@ -2,9 +2,9 @@ package cn.lili.modules.message.serviceimpl;
 
 import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.OtherTagsEnum;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.message.entity.dos.Message;
 import cn.lili.modules.message.entity.vos.MessageVO;
 import cn.lili.modules.message.mapper.MessageMapper;

framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.message.serviceimpl;
 
 import cn.lili.common.enums.SwitchEnum;
-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.modules.member.entity.dos.MemberNotice;
@@ -17,7 +17,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Map;
 

framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.json.JSONUtil;
 import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.OtherTagsEnum;
 import cn.lili.common.utils.BeanUtil;
-import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.message.entity.dos.SmsReach;
 import cn.lili.modules.message.entity.dto.SmsReachDTO;
 import cn.lili.modules.message.mapper.SmsReachMapper;

framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java

@@ -3,7 +3,7 @@ package cn.lili.modules.message.serviceimpl;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.modules.system.sms.AliSmsUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.message.entity.dos.SmsSign;
 import cn.lili.modules.message.mapper.SmsSignMapper;

framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.message.serviceimpl;
 
 import cn.lili.modules.system.sms.AliSmsUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.message.entity.dos.SmsTemplate;
 import cn.lili.modules.message.mapper.SmsTemplateMapper;

framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java

@@ -3,7 +3,7 @@ package cn.lili.modules.message.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.security.context.UserContext;
-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.modules.message.entity.dos.StoreMessage;

framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java

@@ -7,7 +7,7 @@ import cn.lili.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.enums.ClientTypeEnum;
-import cn.lili.modules.connect.util.HttpUtils;
+import cn.lili.common.utils.HttpUtils;
 import cn.lili.modules.system.entity.dos.Setting;
 import cn.lili.modules.system.entity.dto.connect.WechatConnectSetting;
 import cn.lili.modules.system.entity.dto.connect.dto.WechatConnectSettingItem;

framework/src/main/java/cn/lili/modules/order/cart/entity/vo/GoodsPromotionVO.java

@@ -1,5 +1,6 @@
 package cn.lili.modules.order.cart.entity.vo;
 
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -30,7 +31,7 @@ public class GoodsPromotionVO implements Serializable {
     private String promotionId;
 
     /**
-     * @see cn.lili.modules.promotion.entity.enums.PromotionTypeEnum
+     * @see PromotionTypeEnum
      */
     @ApiModelProperty(value = "活动工具类型")
     private String promotionType;

framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java

@@ -20,7 +20,7 @@ import cn.lili.modules.promotion.entity.dto.GoodsSkuPromotionPriceDTO;
 import cn.lili.modules.promotion.entity.dto.PromotionPriceDTO;
 import cn.lili.modules.promotion.entity.dto.PromotionPriceParamDTO;
 import cn.lili.modules.promotion.entity.dto.StorePromotionPriceDTO;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.service.PintuanService;
 import cn.lili.modules.promotion.service.PromotionGoodsService;
 import cn.lili.modules.promotion.service.PromotionPriceService;

framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java

@@ -28,7 +28,7 @@ import cn.lili.modules.promotion.entity.dos.Pintuan;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.enums.CouponScopeTypeEnum;
 import cn.lili.modules.promotion.entity.enums.MemberCouponStatusEnum;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.service.MemberAddressService;
 import cn.lili.modules.promotion.service.MemberCouponService;
 import cn.lili.modules.promotion.service.PintuanService;

framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java

@@ -12,7 +12,7 @@ import cn.lili.modules.order.cart.entity.vo.CartVO;
 import cn.lili.modules.order.order.entity.dto.PriceDetailDTO;
 import cn.lili.modules.order.order.entity.enums.*;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
+import cn.lili.common.enums.PromotionTypeEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java

@@ -2,9 +2,11 @@ package cn.lili.modules.order.order.serviceimpl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import cn.lili.modules.system.utils.OperationalJudgment;
 import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.AfterSaleTagsEnum;
 import cn.lili.common.security.AuthUser;
@@ -12,7 +14,7 @@ import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.utils.*;
 import cn.lili.common.vo.PageVO;
-import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.order.order.aop.AfterSaleLogPoint;
 import cn.lili.modules.order.order.entity.dos.AfterSale;
 import cn.lili.modules.order.order.entity.dos.Order;

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintCommunicationServiceImpl.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.serviceimpl;
 
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.order.order.entity.dos.OrderComplaintCommunication;
 import cn.lili.modules.order.order.entity.vo.OrderComplaintCommunicationSearchParams;
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import javax.transaction.Transactional;
-
 /**
  * 交易投诉通信业务层实现
  *

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java

@@ -6,8 +6,8 @@ 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.BeanUtil;
-import cn.lili.common.utils.OperationalJudgment;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.modules.system.utils.OperationalJudgment;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.goods.entity.dos.GoodsSku;

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java

@@ -5,7 +5,7 @@ import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.CurrencyUtil;
-import cn.lili.common.utils.OperationalJudgment;
+import cn.lili.modules.system.utils.OperationalJudgment;
 import cn.lili.modules.goods.service.CategoryService;
 import cn.lili.modules.order.order.aop.OrderLogPoint;
 import cn.lili.modules.order.order.entity.dos.Order;

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java

@@ -22,12 +22,12 @@ import cn.lili.common.security.enums.UserEnums;
 import cn.lili.trigger.interfaces.TimeTrigger;
 import cn.lili.trigger.model.TimeExecuteConstant;
 import cn.lili.trigger.model.TimeTriggerMsg;
-import cn.lili.common.utils.OperationalJudgment;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.modules.system.utils.OperationalJudgment;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
-import cn.lili.common.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage;
 import cn.lili.modules.goods.service.GoodsSkuService;

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java

@@ -2,7 +2,7 @@ package cn.lili.modules.order.order.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.order.order.entity.dos.Receipt;
 import cn.lili.modules.order.order.entity.dto.OrderReceiptDTO;
@@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 发票业务层实现

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java

@@ -14,6 +14,7 @@ import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.order.order.service.StoreFlowService;
 import cn.lili.modules.payment.entity.RefundLog;
 import cn.lili.modules.payment.service.RefundLogService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;