同步 master

framework/pom.xml

@@ -45,15 +45,18 @@
         <de.codecentric>2.3.1</de.codecentric>
         <userAgentUtils>1.21</userAgentUtils>
         <interceptor-api>1.2</interceptor-api>
+<<<<<<< HEAD
         <poi-version>5.0.0</poi-version>
         <poi-ooxml-version>5.0.0</poi-ooxml-version>
         <logstash-logback-encoder>6.6</logstash-logback-encoder>
         <zxing>3.4.1</zxing>
         <slf4j-api>1.7.28</slf4j-api>
         <xk-time>2.2.0</xk-time>
+=======
+        <commons-text>1.4</commons-text>
+>>>>>>> master
     </properties>
 
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -342,6 +345,7 @@
             <artifactId>UserAgentUtils</artifactId>
             <version>${userAgentUtils}</version>
         </dependency>
+<<<<<<< HEAD
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
@@ -389,6 +393,14 @@
             <groupId>com.github.xkzhangsan</groupId>
             <artifactId>xk-time</artifactId>
             <version>${xk-time}</version>
+=======
+
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>${commons-text}</version>
+>>>>>>> master
         </dependency>
     </dependencies>
 

framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java

@@ -1,10 +1,15 @@
 package cn.lili.base.mybatisplus;
 
+import com.baomidou.mybatisplus.core.parser.ISqlParser;
+import com.baomidou.mybatisplus.extension.parsers.BlockAttackSqlParser;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author Chopper
  */
@@ -16,6 +21,12 @@ public class MybatisPlusConfig {
      */
     @Bean
     public PaginationInterceptor paginationInterceptor() {
-        return new PaginationInterceptor();
+        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+
+        List<ISqlParser> sqlParserList = new ArrayList<>();
+        // 攻击 SQL 阻断解析器、加入解析链
+        sqlParserList.add(new BlockAttackSqlParser());
+        paginationInterceptor.setSqlParserList(sqlParserList);
+        return paginationInterceptor;
     }
 }

framework/src/main/java/cn/lili/common/security/filter/XssAndSqlHttpServletRequestWrapper.java

@@ -0,0 +1,46 @@
+package cn.lili.common.security.filter;
+
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+
+/**
+ * 防止Xss sql注入
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2021-06-04 10:39
+ */
+public class XssAndSqlHttpServletRequestWrapper extends HttpServletRequestWrapper {
+    private HttpServletRequest request;
+
+    public XssAndSqlHttpServletRequestWrapper(HttpServletRequest request) {
+        super(request);
+        this.request = request;
+    }
+
+    @Override
+    public String getParameter(String name) {
+        String value = request.getParameter(name);
+        if (!StringUtils.isEmpty(value)) {
+            value = StringEscapeUtils.escapeHtml4(value);
+        }
+        return value;
+    }
+
+    @Override
+    public String[] getParameterValues(String name) {
+        String[] parameterValues = super.getParameterValues(name);
+        if (parameterValues == null) {
+            return null;
+        }
+        for (int i = 0; i < parameterValues.length; i++) {
+            String value = parameterValues[i];
+            parameterValues[i] = StringEscapeUtils.escapeHtml4(value);
+        }
+        return parameterValues;
+    }
+}

framework/src/main/java/cn/lili/common/security/filter/XssFilter.java

@@ -0,0 +1,60 @@
+package cn.lili.common.security.filter;
+
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+/**
+ * 防止XSS攻击过滤器
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2021-06-04 10:37
+ */
+@WebFilter
+@Component
+public class XssFilter implements Filter {
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException {
+        HttpServletRequest req = (HttpServletRequest) request;
+        XssAndSqlHttpServletRequestWrapper xssRequestWrapper = new XssAndSqlHttpServletRequestWrapper(req);
+        chain.doFilter(xssRequestWrapper, response);
+    }
+
+    @Override
+    public void destroy() {
+    }
+
+    /**
+     * 过滤json类型的
+     *
+     * @param builder
+     * @return
+     */
+    @Bean
+    @Primary
+    public ObjectMapper xssObjectMapper(Jackson2ObjectMapperBuilder builder) {
+        //解析器
+        ObjectMapper objectMapper = builder.createXmlMapper(false).build();
+        //注册xss解析器
+        SimpleModule xssModule = new SimpleModule("XssStringJsonSerializer");
+        xssModule.addSerializer(new XssStringJsonSerializer());
+        objectMapper.registerModule(xssModule);
+        //返回
+        return objectMapper;
+    }
+}

framework/src/main/java/cn/lili/common/security/filter/XssStringJsonSerializer.java

@@ -0,0 +1,32 @@
+package cn.lili.common.security.filter;
+
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import org.apache.commons.text.StringEscapeUtils;
+
+import java.io.IOException;
+
+/**
+ * 防止xss攻击 过滤字符串解析
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2021-06-04 10:40
+ */
+public class XssStringJsonSerializer extends JsonSerializer<String> {
+    @Override
+    public Class<String> handledType() {
+        return String.class;
+    }
+
+    @Override
+    public void serialize(String value, JsonGenerator jsonGenerator,
+                          SerializerProvider serializerProvider) throws IOException {
+        if (value != null) {
+            String encodedValue = StringEscapeUtils.escapeHtml4(value);
+            jsonGenerator.writeString(encodedValue);
+        }
+    }
+}

framework/src/main/java/cn/lili/modules/goods/mapper/SpecificationMapper.java

@@ -3,10 +3,13 @@ package cn.lili.modules.goods.mapper;
 
 import cn.lili.modules.goods.entity.dos.Specification;
 import cn.lili.modules.goods.entity.vos.SpecificationVO;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 规格数据处理层
@@ -18,8 +21,9 @@ public interface SpecificationMapper extends BaseMapper<Specification> {
 
     /**
      * 查询规格信息列表
-     * @param param
      * @return
      */
-    List<SpecificationVO> findSpecList(Map<String,Object> param);
+    @Select("SELECT s.id, s.spec_name,s.create_time ,GROUP_CONCAT(sv.spec_value SEPARATOR ',') AS spec_value" +
+            " FROM li_specification s LEFT JOIN li_spec_values sv ON s.id = sv.spec_id ${ew.customSqlSegment} ")
+    List<SpecificationVO> findSpecList(@Param(Constants.WRAPPER) Wrapper queryWrapper);
 }

framework/src/main/java/cn/lili/modules/goods/service/SpecificationService.java

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 规格业务层
@@ -23,10 +22,10 @@ public interface SpecificationService extends IService<Specification> {
     /**
      * 查询规格信息列表
      *
-     * @param param 查询参数
+     * @param specName 规格名
      * @return 规格列表
      */
-    List<SpecificationVO> getSpecList(Map<String, Object> param);
+    List<SpecificationVO> getSpecList(String specName);
 
     /**
      * 根据分类id获取规格信息

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

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.PageUtil;
+import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.goods.entity.dos.CategorySpecification;
 import cn.lili.modules.goods.entity.dos.SpecValues;
@@ -49,8 +50,13 @@ public class SpecificationServiceImpl extends ServiceImpl<SpecificationMapper, S
     private SpecValuesService specValuesService;
 
     @Override
-    public List<SpecificationVO> getSpecList(Map<String, Object> param) {
-        return this.baseMapper.findSpecList(param);
+    public List<SpecificationVO> getSpecList(String specName) {
+
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq(StringUtils.isNotEmpty(specName), "s.spec_name", specName);
+        queryWrapper.orderByDesc("s.create_time");
+        queryWrapper.groupBy("s.id");
+        return this.baseMapper.findSpecList(queryWrapper);
     }
 
     @Override
@@ -96,9 +102,8 @@ public class SpecificationServiceImpl extends ServiceImpl<SpecificationMapper, S
 
     @Override
     public IPage<SpecificationVO> getSpecificationPage(SpecificationSearchParams searchParams, PageVO pageVo) {
-        Map<String, Object> param = new HashMap<>();
-        param.put("specName", searchParams.getSpecName());
-        List<SpecificationVO> specList = this.getSpecList(param);
+
+        List<SpecificationVO> specList = this.getSpecList(searchParams.getSpecName());
         IPage<SpecificationVO> page = new Page<>(pageVo.getPageNumber(), pageVo.getPageSize(), specList.size());
         page.setRecords(PageUtil.listToPage(pageVo, specList));
         return page;

framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java

@@ -72,7 +72,6 @@ public class PageDataServiceImpl extends ServiceImpl<PageDataMapper, PageData> i
             lambdaUpdateWrapper.set(PageData::getPageShow, SwitchEnum.CLOSE.name());
             this.update(lambdaUpdateWrapper);
         }
-
         LambdaUpdateWrapper<PageData> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
         lambdaUpdateWrapper.set(PageData::getPageData, pageData.getPageData());
         lambdaUpdateWrapper.eq(PageData::getId, pageData.getId());

framework/src/main/resources/mapper/ArticleCategoryMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.page.mapper.ArticleCategoryMapper">
-
-</mapper>

framework/src/main/resources/mapper/ArticleMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.page.mapper.ArticleMapper">
-
-</mapper>

framework/src/main/resources/mapper/BillMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.store.mapper.BillMapper">
-
-</mapper>

framework/src/main/resources/mapper/BrandMapper.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.goods.mapper.BrandMapper">
-
-
-</mapper>

framework/src/main/resources/mapper/CategoryBrandMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.goods.mapper.CategoryBrandMapper">
-
-</mapper>

framework/src/main/resources/mapper/CategoryParameterGroupMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.goods.mapper.CategoryParameterGroupMapper">
-
-</mapper>

framework/src/main/resources/mapper/CategorySpecificationMapper.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.goods.mapper.CategorySpecificationMapper">
-</mapper>

framework/src/main/resources/mapper/ConnectConfigMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.connect.mapper.ConnectConfigMapper">
-
-</mapper>

framework/src/main/resources/mapper/ConnectMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.connect.mapper.ConnectMapper">
-
-</mapper>

framework/src/main/resources/mapper/CouponMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.promotion.mapper.CouponMapper">
-
-</mapper>

framework/src/main/resources/mapper/DepartmentMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.permission1.mapper.DepartmentMapper">
-
-</mapper>

framework/src/main/resources/mapper/DepartmentRoleMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.permission.mapper.DepartmentRoleMapper">
-
-</mapper>

framework/src/main/resources/mapper/DepositLogMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.order.trade.mapper.WalletLogMapper">
-
-</mapper>

framework/src/main/resources/mapper/DistributionCashMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.distribution.mapper.DistributionCashMapper">
-
-</mapper>

framework/src/main/resources/mapper/DistributionGoodsMapper.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.distribution.mapper.DistributionGoodsMapper">
-</mapper>

framework/src/main/resources/mapper/DistributionOrderMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.distribution.mapper.DistributionOrderMapper">
-
-</mapper>

framework/src/main/resources/mapper/ExpressPlatformMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.system.mapper.ExpressPlatformMapper">
-
-</mapper>

framework/src/main/resources/mapper/FocusPictureMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.core.page.mapper.FocusPictureMapper">
-
-</mapper>

framework/src/main/resources/mapper/FootprintMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.member.mapper.FootprintMapper">
-
-</mapper>

framework/src/main/resources/mapper/FullDiscountMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.promotion.mapper.FullDiscountMapper">
-
-</mapper>

framework/src/main/resources/mapper/GoodsCollectionMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.member.mapper.GoodsCollectionMapper">
-
-</mapper>

framework/src/main/resources/mapper/GoodsGalleryMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.goods.mapper.GoodsGalleryMapper">
-
-</mapper>

framework/src/main/resources/mapper/GoodsMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.goods.mapper.GoodsMapper">
-
-</mapper>

framework/src/main/resources/mapper/GoodsParamsMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.goods.mapper.GoodsParamsMapper">
-
-</mapper>

framework/src/main/resources/mapper/GoodsSkuMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.goods.mapper.GoodsSkuMapper">
-
-</mapper>

framework/src/main/resources/mapper/GoodsUnitMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.goods.mapper.GoodsUnitMapper">
-
-</mapper>

framework/src/main/resources/mapper/LogisticsMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.system.mapper.LogisticsMapper">
-
-</mapper>

framework/src/main/resources/mapper/MemberAddressMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.member.mapper.MemberAddressMapper">
-
-</mapper>

framework/src/main/resources/mapper/MemberCouponMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.promotion.mapper.MemberCouponMapper">
-
-</mapper>

framework/src/main/resources/mapper/MemberEvaluationMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.member.mapper.MemberEvaluationMapper">
-
-</mapper>

framework/src/main/resources/mapper/MemberMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.member.mapper.MemberMapper">
-
-</mapper>

framework/src/main/resources/mapper/MemberNoticeLogMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.member.mapper.MemberNoticeLogMapper">
-
-</mapper>

framework/src/main/resources/mapper/MemberNoticeMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.member.mapper.MemberNoticeMapper">
-
-</mapper>

framework/src/main/resources/mapper/MemberNoticeSenterMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.member.mapper.MemberNoticeSenterMapper">
-
-</mapper>

framework/src/main/resources/mapper/MemberPointsHistoryMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.system.mapper.MemberPointsHistoryMapper">
-
-</mapper>

framework/src/main/resources/mapper/MemberSign.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.member.mapper.MemberSignMapper">
-
-</mapper>

framework/src/main/resources/mapper/MemberStatisticsDataMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.statistics.mapper.MemberStatisticsDataMapper">
-
-</mapper>

framework/src/main/resources/mapper/MemberWalletMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.member.mapper.MemberWalletMapper">
-
-</mapper>

framework/src/main/resources/mapper/MessageMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.permission.mapper.MessageMapper">
-
-</mapper>

framework/src/main/resources/mapper/OrderItemMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.order.order.mapper.OrderItemMapper">
-
-</mapper>

framework/src/main/resources/mapper/OrderLogMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.order.trade.mapper.OrderLogMapper">
-
-</mapper>

framework/src/main/resources/mapper/OrderMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.order.order.mapper.OrderMapper">
-
-</mapper>

framework/src/main/resources/mapper/PageMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.page.mapper.PageDataMapper">
-
-</mapper>

framework/src/main/resources/mapper/ParametersMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.goods.mapper.ParametersMapper">
-
-</mapper>

framework/src/main/resources/mapper/PaymentLogMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.payment.mapper.PaymentLogMapper">
-
-</mapper>

framework/src/main/resources/mapper/PermissionMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.menu.mapper.PermissionMapper">
-
-</mapper>

framework/src/main/resources/mapper/PintuanMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.promotion.mapper.PintuanMapper">
-
-</mapper>

framework/src/main/resources/mapper/PlatformSettingMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.system.mapper.PlatformSettingMapper">
-
-</mapper>

framework/src/main/resources/mapper/PointLogMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.member.mapper.PointLogMapper">
-
-</mapper>

framework/src/main/resources/mapper/PromotionGoodsMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.promotion.mapper.PromotionGoodsMapper">
-
-</mapper>

framework/src/main/resources/mapper/PurchaseOrderItemMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.purchase.entity.dos.PurchaseOrderItem">
-
-</mapper>

framework/src/main/resources/mapper/PurchaseOrderMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.purchase.entity.dos.PurchaseOrder">
-
-</mapper>

framework/src/main/resources/mapper/PurchaseQuotedItemMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.purchase.entity.dos.PurchaseQuotedItem">
-
-</mapper>

framework/src/main/resources/mapper/PurchaseQuotedMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.purchase.entity.dos.PurchaseQuoted">
-
-</mapper>

framework/src/main/resources/mapper/ReceiptMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.order.order.mapper.ReceiptMapper">
-
-</mapper>

framework/src/main/resources/mapper/RechargeMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.order.trade.mapper.RechargeMapper">
-
-</mapper>

framework/src/main/resources/mapper/RefundLogMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.payment.mapper.RefundLogMapper">
-
-</mapper>

framework/src/main/resources/mapper/RegionMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.base.mapper.RegionMapper">
-
-</mapper>

framework/src/main/resources/mapper/RoleMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.permission.mapper.RoleMapper">
-
-</mapper>

framework/src/main/resources/mapper/RoleMenuMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.base.mapper.RoleMenuMapper">
-
-</mapper>

framework/src/main/resources/mapper/SeckillApplyMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.promotion.mapper.SeckillApplyMapper">
-
-</mapper>

framework/src/main/resources/mapper/SeckillMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.promotion.mapper.SeckillMapper">
-
-</mapper>

framework/src/main/resources/mapper/SensitiveWordsMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.system.mapper.SensitiveWordsMapper">
-
-</mapper>

framework/src/main/resources/mapper/ServiceNoticeMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.system.mapper.ServiceNoticeMapper">
-
-</mapper>

framework/src/main/resources/mapper/ShippingAddressMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.promotion.mapper.ShippingAddressMapper">
-
-</mapper>

framework/src/main/resources/mapper/ShortLinkMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.message.mapper.ShortLinkMapper">
-
-</mapper>

framework/src/main/resources/mapper/SiteNavigationMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.core.page.mapper.SiteNavigationMapper">
-
-</mapper>

framework/src/main/resources/mapper/SpecValuesMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.goods.mapper.SpecValuesMapper">
-
-</mapper>

framework/src/main/resources/mapper/SpecificationMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.goods.mapper.SpecificationMapper">
-
-
-    <select id="findSpecList" resultType="cn.lili.modules.goods.entity.vos.SpecificationVO" parameterType="map">
-        SELECT s.id, s.spec_name,s.create_time ,GROUP_CONCAT(sv.spec_value SEPARATOR ',') AS spec_value
-        FROM li_specification s
-        LEFT JOIN li_spec_values sv
-        ON s.id = sv.spec_id
-        WHERE 1=1
-        <if test="specName != null and specName!=''">
-            and s.spec_name like concat('%',#{specName},'%')
-        </if>
-        GROUP BY s.id
-        ORDER BY s.create_time desc 
-    </select>
-
-</mapper>

framework/src/main/resources/mapper/StoreAddressMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.store.mapper.StoreAddressMapper">
-
-</mapper>

framework/src/main/resources/mapper/StoreCollectionMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.member.mapper.StoreCollectionMapper">
-
-</mapper>

framework/src/main/resources/mapper/StoreFlowMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.order.order.mapper.StoreFlowMapper">
-
-</mapper>

framework/src/main/resources/mapper/StoreLogisticsMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.system.mapper.StoreLogisticsMapper">
-
-</mapper>

framework/src/main/resources/mapper/StoreMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.store.mapper.StoreMapper">
-
-</mapper>

framework/src/main/resources/mapper/TradeMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.order.order.mapper.TradeMapper">
-
-</mapper>

framework/src/main/resources/mapper/UserRoleMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.menu.mapper.UserRoleMapper">
-
-</mapper>

framework/src/main/resources/mapper/VerificationSourceMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.base.mapper.VerificationSourceMapper">
-
-</mapper>

framework/src/main/resources/mapper/WechatMPMessageMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.message.mapper.WechatMPMessageMapper">
-
-</mapper>

framework/src/main/resources/mapper/WechatMessageMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.lili.modules.message.mapper.WechatMessageMapper">
-
-</mapper>