(incubator-streampark) branch conf updated: [Improve] mybatisConfig improvements

[benjobs]

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

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


The following commit(s) were added to refs/heads/conf by this push:
     new 653276dca [Improve] mybatisConfig improvements
653276dca is described below

commit 653276dcac5ee6bc6436bee053734d109642ae5f
Author: benjobs <benj...@gmail.com>
AuthorDate: Sat Mar 30 20:07:20 2024 +0800

    [Improve] mybatisConfig improvements
---
 .../java/org/apache/streampark/console/base/config/MybatisConfig.java | 4 ++--
 .../streampark/flink/kubernetes/watcher/FlinkCheckpointWatcher.scala  | 1 -
 2 files changed, 2 insertions(+), 3 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 4ac1921e7..b1798193a 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
@@ -56,7 +56,7 @@ public class MybatisConfig {
    * @return {@linkplain PostgreSQLQueryInterceptor}
    */
   @Bean
-  @ConditionalOnProperty(name = "spring.profiles.active", havingValue = 
"pgsql")
+  @ConditionalOnProperty(name = "datasource.dialect", havingValue = "pgsql")
   public PostgreSQLQueryInterceptor postgreSQLQueryInterceptor() {
     return new PostgreSQLQueryInterceptor();
   }
@@ -67,7 +67,7 @@ public class MybatisConfig {
    * @return {@linkplain PostgreSQLPrepareInterceptor}
    */
   @Bean
-  @ConditionalOnProperty(name = "spring.profiles.active", havingValue = 
"pgsql")
+  @ConditionalOnProperty(name = "datasource.dialect", havingValue = "pgsql")
   public PostgreSQLPrepareInterceptor postgreSQLPrepareInterceptor() {
     return new PostgreSQLPrepareInterceptor();
   }
diff --git 
a/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/watcher/FlinkCheckpointWatcher.scala
 
b/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/watcher/FlinkCheckpointWatcher.scala
index 0b344d764..6335379e2 100644
--- 
a/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/watcher/FlinkCheckpointWatcher.scala
+++ 
b/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/watcher/FlinkCheckpointWatcher.scala
@@ -23,7 +23,6 @@ import 
org.apache.streampark.flink.kubernetes.event.FlinkJobCheckpointChangeEven
 import org.apache.streampark.flink.kubernetes.model.{CheckpointCV, ClusterKey, 
TrackId}
 
 import org.apache.hc.client5.http.fluent.Request
-import org.apache.hc.core5.util.Timeout
 import org.json4s.{DefaultFormats, JNull}
 import org.json4s.JsonAST.JNothing
 import org.json4s.jackson.JsonMethods.parse