You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2022/11/26 02:57:33 UTC

[incubator-streampark] branch dev updated: [improve] move mybatis plus setting into MybatisConfig (#2099)

This is an automated email from the ASF dual-hosted git repository.

benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/dev by this push:
     new 0b100cea8 [improve] move mybatis plus setting into MybatisConfig (#2099)
0b100cea8 is described below

commit 0b100cea803e267505065de9e980256943a90cd2
Author: VampireAchao <ac...@gmail.com>
AuthorDate: Fri Nov 25 20:57:27 2022 -0600

    [improve] move mybatis plus setting into MybatisConfig (#2099)
---
 .../console/base/config/MybatisConfig.java         | 26 ++++++++++++++++++++++
 .../src/main/resources/application.yml             | 12 ----------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/MybatisConfig.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/MybatisConfig.java
index 94bddca28..36244be3a 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/MybatisConfig.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/MybatisConfig.java
@@ -20,6 +20,11 @@ package org.apache.streampark.console.base.config;
 import org.apache.streampark.console.base.mybatis.interceptor.PostgreSQLPrepareInterceptor;
 import org.apache.streampark.console.base.mybatis.interceptor.PostgreSQLQueryInterceptor;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.autoconfigure.MybatisPlusPropertiesCustomizer;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
+import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
@@ -63,4 +68,25 @@ public class MybatisConfig {
         return new PostgreSQLPrepareInterceptor();
     }
 
+    /**
+     * mybatis plus setting
+     *
+     * @return MybatisPlusPropertiesCustomizer
+     */
+    @Bean
+    public MybatisPlusPropertiesCustomizer mybatisPlusPropertiesCustomizer() {
+        return properties -> {
+            properties.setTypeAliasesPackage("org.apache.streampark.console.*.entity");
+            properties.setMapperLocations(new String[]{"classpath:mapper/*/*.xml"});
+            MybatisConfiguration mybatisConfiguration = new MybatisConfiguration();
+            mybatisConfiguration.setJdbcTypeForNull(null);
+            properties.setConfiguration(mybatisConfiguration);
+            GlobalConfig globalConfig = GlobalConfigUtils.getGlobalConfig(mybatisConfiguration);
+            GlobalConfig.DbConfig dbConfig = globalConfig.getDbConfig();
+            dbConfig.setIdType(IdType.AUTO);
+            // close mybatis-plus banner
+            globalConfig.setBanner(false);
+            properties.setGlobalConfig(globalConfig);
+        };
+    }
 }
diff --git a/streampark-console/streampark-console-service/src/main/resources/application.yml b/streampark-console/streampark-console-service/src/main/resources/application.yml
index a7560a715..58b8cba58 100644
--- a/streampark-console/streampark-console-service/src/main/resources/application.yml
+++ b/streampark-console/streampark-console-service/src/main/resources/application.yml
@@ -71,18 +71,6 @@ management:
       probes:
         enabled: true
 
-# mybatis plus setting
-mybatis-plus:
-  type-aliases-package: org.apache.streampark.console.*.entity
-  mapper-locations: classpath:mapper/*/*.xml
-  configuration:
-    jdbc-type-for-null: null
-  global-config:
-    db-config:
-      id-type: auto
-    # close mybatis-plus banner
-    banner: false
-
 streampark:
   proxy:
     # knox process address https://cdpsit02.example.cn:8443/gateway/cdp-proxy/yarn