清除注解@DataPermission

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CommonMapper.java

@@ -49,7 +49,6 @@ public interface CommonMapper {
      * 网点列表
      * @return
      */
-    @DataPermission
     @SqlParser(filter = true)
     public List<WebsitVO> websitList(
             @Param("lng") String lng,

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/MyProfitMapper.java

@@ -17,7 +17,6 @@ public interface MyProfitMapper {
     @SqlParser(filter = true)
     MyProfitBean queryProfitSum(@Param("userId") String userId);
 
-    @DataPermission
     @SqlParser(filter = true)
     IPage<OrderShareBean> queryOrderShareList(IPage page, @Param("userId") String userId, @Param("status") String status);
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/stock/WorkerStockCMapper.java

@@ -16,7 +16,6 @@ import java.util.List;
 public interface WorkerStockCMapper {
 
 
-    @DataPermission
     @SqlParser(filter = true)
     List<WebsitGoodsCategory> queryWebsitGoodsCategoryList(
             @Param("websitId") String websitId,
@@ -24,8 +23,6 @@ public interface WorkerStockCMapper {
             @Param("goodsType") String goodsType
     );
 
-
-    @DataPermission
     @SqlParser(filter = true)
     IPage<WorkerStockBean> queryWorkerStockList(
             IPage page,

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -3,7 +3,6 @@ package com.gree.mall.manager.commonmapper;
 import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.annotation.DataPermission;
 import com.gree.mall.manager.bean.activity.PromotionActivityVO;
 import com.gree.mall.manager.bean.admin.AdminCompanyPayConfigVO;
 import com.gree.mall.manager.bean.charging.ChargingStandardBean;
@@ -121,7 +120,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     @SqlParser(filter = true)
     public IPage<WebsitStockVO> websitStockList(IPage page,@Param("ex") ZfireParamBean zfireParamBean);
 
@@ -131,7 +129,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     @SqlParser(filter = true)
     public IPage<WebsitStockPVO> websitStockPList(IPage page, @Param("ex") ZfireParamBean zfireParamBean);
 
@@ -141,7 +138,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     @SqlParser(filter = true)
     public IPage<WebsitStockAccVO> websitStockAccList(IPage page, @Param("ex") ZfireParamBean zfireParamBean);
 
@@ -152,7 +148,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     @SqlParser(filter = true)
     public IPage<WebsitStockAccPVO> websitStockAccPList(IPage page, @Param("ex") ZfireParamBean zfireParamBean);
 
@@ -162,7 +157,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     @SqlParser(filter = true)
     public IPage<WorkerStockVO> workerStockList(IPage page, @Param("ex") ZfireParamBean zfireParamBean);
 
@@ -172,7 +166,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     @SqlParser(filter = true)
     public IPage<WorkerStockAccVO> workerStockAccList(IPage page, @Param("ex") ZfireParamBean zfireParamBean);
 
@@ -183,7 +176,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     @SqlParser(filter = true)
     public IPage<WorkerStockPVO> workerStockPList(IPage page, @Param("ex") ZfireParamBean zfireParamBean);
 
@@ -194,7 +186,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     @SqlParser(filter = true)
     public IPage<WorkerStockAccPVO> workerStockAccPList(IPage page, @Param("ex") ZfireParamBean zfireParamBean);
 
@@ -207,7 +198,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     @SqlParser(filter = true)
     public IPage<OrderSmallTypeVO> orderSmallTypeList(IPage page,@Param("ex") ZfireParamBean zfireParamBean);
 
@@ -217,7 +207,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     @SqlParser(filter = true)
     public IPage<OrderBaseVO> orderBaseList(IPage page, @Param("ex") WorkOrderZfireParam zfireParamBean,@Param("adminUserType") Integer adminUserType);
 
@@ -315,7 +304,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<UserWaitVO> userWaitList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -333,7 +321,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<IncreOrderVO> increOrderSettleList(Page page, @Param("ex") ZfireParamBean zfireParamBean, @Param("isSettleList") Boolean isSettleList);
 
     /**
@@ -342,7 +329,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<WebsitOrderSettleCountVO> websitOrderSettleCountList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -359,7 +345,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     @SqlParser(filter = true)
     IPage<OrderBase2VO> orderBaseList2(Page page, @Param("ex") WorkOrderZfireParam zfireParamBean, @Param("adminUserType") Integer adminUserType);
 
@@ -369,7 +354,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<WorkerOrderSettleCountVO> workerOrderSettleCountList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -378,7 +362,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<GoodsMaterialVO> goodsMaterialList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -387,7 +370,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<GoodsPurchaseVO> goodsPurchaseList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -396,7 +378,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<GoodsPurchaseItemVO> goodsPurchaseItemList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -405,7 +386,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<GoodsPurchaseCodeVO> goodsPurchaseCodeList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
 
@@ -415,7 +395,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<OrderInfoVO> queryOrderInfoList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -424,7 +403,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<GoodsPurchaseRetVO> goodsPurchaseRetList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -433,7 +411,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<GoodsPurchaseRetItemVO> goodsPurchaseRetItemList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -442,7 +419,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<GoodsPurchaseRetCodeVO> goodsPurchaseRetCodeList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
 
@@ -452,7 +428,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<GoodsMaterialStockAccVO> goodsMaterialStockAccList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -461,7 +436,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<OrderEnginBaseVO> orderEnginBaseList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -470,14 +444,12 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<PunishOrderVO> punishOrderList(Page page,@Param("ex") ExamineZfireParamBean zfireParamBean);
 
 
     /**
      * 线下销售退货单
      */
-    @DataPermission
     IPage<OrderOfflineRefundVO> orderOfflineRefundList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
 
@@ -487,7 +459,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<SettleExpenseVO> workerSettleExpenseGatherList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -496,7 +467,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<SettleExpenseItemVO> workerSettleExpenseList(Page page, @Param("ex") ZfireParamBean zfireParamBean, @Param("workerId") String workerId);
 
     /**
@@ -505,7 +475,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<SettleMonthWagesVO> settleMonthWagesGatherList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -514,7 +483,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<SettleMonthWagesWorkerVO> settleMonthWagesList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
@@ -531,7 +499,6 @@ public interface CommonMapper {
      * @param companyWechatIds
      * @return
      */
-    @DataPermission
     IPage<GoodsLeaseBean> goodsLeaseList(Page<Object> objectPage, @Param("keyword") String keyword,
                                          @Param("categoryIds") List<String> categoryIds,
                                          @Param("startPrice") BigDecimal startPrice,
@@ -557,7 +524,6 @@ public interface CommonMapper {
      * @param companyWechatIds
      * @return
      */
-    @DataPermission
     IPage<LeaseOrderVO> leaseOrderList(Page<Object> objectPage,
                                        @Param("orderId") String orderId,
                                        @Param("goodsName") String goodsName,
@@ -585,7 +551,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<PromotionQuestionnairVO> promotionQuestionnairList(Page page,@Param("ex") ZfireParamBean zfireParamBean,@Param("status") Integer status);
 
     /**
@@ -594,7 +559,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<PromotionActivityVO> promotionActivityList(Page page, @Param("ex") ZfireParamBean zfireParamBean, @Param("websitId") String websitId);
 
     /**
@@ -603,7 +567,6 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    @DataPermission
     IPage<ESGoodsVO> esGoodsList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**

mall-server-api/src/main/java/com/gree/mall/manager/config/MyBatisPlusConfig.java

@@ -1,18 +1,19 @@
 package com.gree.mall.manager.config;
 
-import com.baomidou.mybatisplus.core.parser.ISqlParser;
-import com.baomidou.mybatisplus.extension.parsers.BlockAttackSqlParser;
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.gree.mall.manager.constant.Constant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.ArrayList;
-import java.util.List;
-
 
 @Configuration
+@AutoConfigureAfter()
 public class MyBatisPlusConfig {
     private final static Logger logger = LoggerFactory.getLogger(MyBatisPlusConfig.class);
 
@@ -24,19 +25,19 @@ public class MyBatisPlusConfig {
      * @param: []
      * @return: com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor
      */
-    @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        logger.debug("注册分页插件");
-        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
-
-
-        // 攻击 SQL 阻断解析器、加入解析链,阻止恶意的全表更新删除
-        List<ISqlParser> sqlParserList = new ArrayList<>();
-        sqlParserList.add(new BlockAttackSqlParser());
-        paginationInterceptor.setSqlParserList(sqlParserList);
-        paginationInterceptor.setLimit(10000);
-        return paginationInterceptor;
-    }
+//    @Bean
+//    public PaginationInterceptor paginationInterceptor() {
+//        logger.debug("注册分页插件");
+//        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+//
+//
+//        // 攻击 SQL 阻断解析器、加入解析链,阻止恶意的全表更新删除
+//        List<ISqlParser> sqlParserList = new ArrayList<>();
+//        sqlParserList.add(new BlockAttackSqlParser());
+//        paginationInterceptor.setSqlParserList(sqlParserList);
+//        paginationInterceptor.setLimit(10000);
+//        return paginationInterceptor;
+//    }
 
 
     /**
@@ -56,4 +57,28 @@ public class MyBatisPlusConfig {
 //        return performanceInterceptor;
 //    }
 
+    @Bean
+    public PaginationInnerInterceptor paginationInnerInterceptor() {
+        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+        paginationInnerInterceptor.setMaxLimit(Long.valueOf(Constant.PAGE_SIZE));
+        paginationInnerInterceptor.setDbType(DbType.MYSQL);
+        return paginationInnerInterceptor;
+    }
+
+    /**
+     * 添加分页插件
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(paginationInnerInterceptor());
+        // 添加非法SQL拦截器
+//        interceptor.addInnerInterceptor(new IllegalSQLInnerInterceptor());
+        // 阻止全表更新删除
+        interceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
+        // 自定义权限拦截器
+//        interceptor.addInnerInterceptor(new DataScopeInnerInterceptor());
+        // 如果有多数据源可以不配具体类型, 否则都建议配上具体的 DbType
+        return interceptor;
+    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/config/datascope/DataScopeInnerInterceptor.java

@@ -20,6 +20,9 @@ import java.lang.reflect.Method;
 import java.sql.SQLException;
 import java.util.List;
 
+/**
+ * 此数据权限添加不启用（无需启用）
+ */
 @Order(200)
 @Component
 public class DataScopeInnerInterceptor implements InnerInterceptor {

mall-server-api/src/main/java/com/gree/mall/manager/constant/Constant.java

@@ -16,6 +16,8 @@ public class Constant {
     //短信验证码过期时间
     public static final Integer SMS_EXPIRE = 10 * 60;
 
+    public final static Integer PAGE_SIZE = 100000;
+
     public class Ali {
         public final static String ACCESS_KEY_ID = "LTAI4GK1q4mnpCFbonMd1pji";
         public final static String ACCESS_KEY_SECERT = "E5LW0V1H8HBxqjKkExIxaXUgSyex6C";

mall-server-api/src/main/java/com/gree/mall/manager/zfire/util/FieldUtils.java

@@ -16,6 +16,7 @@ import com.google.common.collect.Lists;
 import com.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
+import com.gree.mall.manager.constant.Constant;
 import com.gree.mall.manager.plus.entity.AdminField;
 import com.gree.mall.manager.zfire.bean.QueryParamBean;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
@@ -89,8 +90,8 @@ public class FieldUtils {
 
     public static ZfireParamBean supplyParam(ZfireParamBean bean, Class cls) {
         //限制最多查询10w条
-        if (bean.getPageSize() != null && (bean.getPageSize().equals(-1) || bean.getPageSize().intValue() > 100000)) {
-            bean.setPageSize(100000);
+        if (bean.getPageSize() != null && (bean.getPageSize().equals(-1) || bean.getPageSize() > Constant.PAGE_SIZE)) {
+            bean.setPageSize(Constant.PAGE_SIZE);
         }
         //todo 框架自带防注入
         bean.setQuery(supplyParam(bean.getParams()));
@@ -114,8 +115,8 @@ public class FieldUtils {
         }
         bean.setAdminWebsitIds(adminUser.getAdminWebsitIds());
         //限制最多查询10w条
-        if (bean.getPageSize() != null && (bean.getPageSize().equals(-1) || bean.getPageSize() > 100000)) {
-            bean.setPageSize(100000);
+        if (bean.getPageSize() != null && (bean.getPageSize().equals(-1) || bean.getPageSize() > Constant.PAGE_SIZE)) {
+            bean.setPageSize(Constant.PAGE_SIZE);
         }
         //todo 框架自带防注入
         bean.setQuery(supplyParam(bean.getParams()));