[Feature] Improve the search_owner when query the app list

apache · Oct 15, 2022 · e6bc850 · e6bc850
1 parent 09d689d
commit e6bc850
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/streampark-common/src/main/scala/org/apache/streampark/common/conf/ConfigConst.scala b/streampark-common/src/main/scala/org/apache/streampark/common/conf/ConfigConst.scala
@@ -19,6 +19,14 @@ package org.apache.streampark.common.conf
 import java.time.LocalDateTime
 
 object ConfigConst {
+
+  /**
+   * common const
+   *
+   */
+
+  val DEFAULT_DATAMASK_STRING = "********"
+
   /**
    *
    * about parameter...

diff --git a/...ampark-common/src/main/scala/org/apache/streampark/common/conf/InternalConfigHolder.scala b/...ampark-common/src/main/scala/org/apache/streampark/common/conf/InternalConfigHolder.scala
@@ -176,7 +176,7 @@ object InternalConfigHolder extends Logger {
     logInfo(
       s"""registered configs:
          |ConfigHub collected configs: ${configKeys.size}
-         |  ${configKeys.map(key => s"$key = ${if (key.contains("password")) "********" else get(key)}").mkString("\n  ")}""".stripMargin)
+         |  ${configKeys.map(key => s"$key = ${if (key.contains("password")) ConfigConst.DEFAULT_DATAMASK_STRING else get(key)}").mkString("\n  ")}""".stripMargin)
   }
 
 

diff --git a/streampark-common/src/main/scala/org/apache/streampark/common/util/RedisClient.scala b/streampark-common/src/main/scala/org/apache/streampark/common/util/RedisClient.scala
@@ -17,6 +17,7 @@
 
 package org.apache.streampark.common.util
 
+import org.apache.streampark.common.conf.ConfigConst
 import redis.clients.jedis._
 import redis.clients.jedis.exceptions.JedisConnectionException
 
@@ -86,7 +87,7 @@ object RedisClient extends Logger {
    * @return
    */
   def createJedisPool(endpoint: RedisEndpoint): JedisPool = {
-    val endpointEn: RedisEndpoint = endpoint.copy(auth = "********")
+    val endpointEn: RedisEndpoint = endpoint.copy(auth = ConfigConst.DEFAULT_DATAMASK_STRING)
     logInfo(s"[StreamPark] RedisClient: createJedisPool with $endpointEn ")
     new JedisPool(poolConfig, endpoint.host, endpoint.port, endpoint.timeout, endpoint.auth, endpoint.db)
   }

diff --git a/...mpark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java b/...mpark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java
@@ -17,6 +17,7 @@
 
 package org.apache.streampark.console.system.entity;
 
+import org.apache.streampark.common.conf.ConfigConst;
 import org.apache.streampark.console.core.enums.UserType;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -103,8 +104,9 @@ public class User implements Serializable {
     private Long teamId;
 
     public void dataMasking() {
-        this.setPassword("******");
-        this.setSalt("******");
+        String dataMask = ConfigConst.DEFAULT_DATAMASK_STRING();
+        this.setPassword(dataMask);
+        this.setSalt(dataMask);
     }
 
 }
diff --git a/...in/scala/org/apache/streampark/flink/connector/clickhouse/conf/ClickHouseHttpConfig.scala b/...in/scala/org/apache/streampark/flink/connector/clickhouse/conf/ClickHouseHttpConfig.scala
@@ -17,6 +17,7 @@
 
 package org.apache.streampark.flink.connector.clickhouse.conf
 
+import org.apache.streampark.common.conf.ConfigConst
 import org.apache.streampark.flink.connector.conf.ThresholdConf
 
 import java.util.{Base64, Properties}
@@ -67,7 +68,7 @@ class ClickHouseHttpConfig(parameters: Properties) extends ThresholdConf(ClickHo
 
   override def toString: String = {
     s"""
-       |{ user: $user, password: ******, hosts: ${hosts.mkString(",")} }
+       |{ user: $user, password: ${ConfigConst.DEFAULT_DATAMASK_STRING}, hosts: ${hosts.mkString(",")} }
        |""".stripMargin
   }
 }
diff --git a/...nnector-doris/src/main/scala/org/apache/streampark/connector/doris/conf/DorisConfig.scala b/...nnector-doris/src/main/scala/org/apache/streampark/connector/doris/conf/DorisConfig.scala
@@ -16,8 +16,9 @@
  */
 package org.apache.streampark.connector.doris.conf
 
-import java.util.Properties
+import org.apache.streampark.common.conf.ConfigConst
 
+import java.util.Properties
 import scala.collection.JavaConversions._
 
 object DorisConfig {
@@ -83,7 +84,7 @@ class DorisConfig(parameters: Properties) {
 
   override def toString: String = {
     s"""
-       |{ doris user: $user, password: ******, hosts: ${loadUrl.mkString(",")} }
+       |{ doris user: $user, password: ${ConfigConst.DEFAULT_DATAMASK_STRING}, hosts: ${loadUrl.mkString(",")} }
        |""".stripMargin
   }
 }