From dd7508a5e1c542e12c7f4b1100134c2a747fc1d9 Mon Sep 17 00:00:00 2001
From: qiaozhanwei <qiaozhanwei@outlook.com>
Date: Fri, 15 Nov 2019 19:28:45 +0800
Subject: [PATCH] ConnectionFactory add paging intercepter (#1250)

---
 .../apache/dolphinscheduler/dao/config/MybatisPlusConfig.java   | 2 +-
 .../dolphinscheduler/dao/datasource/ConnectionFactory.java      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/config/MybatisPlusConfig.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/config/MybatisPlusConfig.java
index 43dfb9c250..21d2349a06 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/config/MybatisPlusConfig.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/config/MybatisPlusConfig.java
@@ -33,7 +33,7 @@ public class MybatisPlusConfig {
      * @return pagination interceptor
      */
     @Bean
-    public PaginationInterceptor paginationInterceptor() {
+    public static PaginationInterceptor paginationInterceptor() {
         return new PaginationInterceptor();
     }
 
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/ConnectionFactory.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/ConnectionFactory.java
index aa4429d2c6..f437d8b2d9 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/ConnectionFactory.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/ConnectionFactory.java
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.dolphinscheduler.common.Constants;
+import org.apache.dolphinscheduler.dao.config.MybatisPlusConfig;
 import org.apache.ibatis.mapping.Environment;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -122,6 +123,7 @@ public class ConnectionFactory {
                     configuration.setEnvironment(environment);
                     configuration.setLazyLoadingEnabled(true);
                     configuration.addMappers("org.apache.dolphinscheduler.dao.mapper");
+                    configuration.addInterceptor(MybatisPlusConfig.paginationInterceptor());
 
                     MybatisSqlSessionFactoryBean sqlSessionFactoryBean = new MybatisSqlSessionFactoryBean();
                     sqlSessionFactoryBean.setConfiguration(configuration);