[inlong] branch master updated: [INLONG-7810][Manager] Fix no token field in the return result of getAllConfig (#7811)

[gosonzhang]

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

gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 71dbfd550 [INLONG-7810][Manager] Fix no token field in the return 
result of getAllConfig (#7811)
71dbfd550 is described below

commit 71dbfd55042b7ce47b624a5ffafb7c531106a598
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Mon Apr 10 15:28:09 2023 +0800

    [INLONG-7810][Manager] Fix no token field in the return result of 
getAllConfig (#7811)
---
 .../common/pojo/dataproxy/CacheClusterObject.java     | 19 +++++++++++++++++++
 .../src/main/resources/mappers/ClusterSetMapper.xml   |  1 +
 .../inlong/manager/pojo/dataproxy/CacheCluster.java   | 19 +++++++++++++++++++
 .../service/repository/DataProxyConfigRepository.java |  1 +
 4 files changed, 40 insertions(+)

diff --git 
a/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/CacheClusterObject.java
 
b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/CacheClusterObject.java
index b2591c903..44e27f694 100644
--- 
a/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/CacheClusterObject.java
+++ 
b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/CacheClusterObject.java
@@ -26,6 +26,7 @@ import java.util.Map;
 public class CacheClusterObject {
 
     private String name;
+    private String token;
     private String zone;
     private Map<String, String> params = new HashMap<>();
 
@@ -65,6 +66,24 @@ public class CacheClusterObject {
         this.zone = zone;
     }
 
+    /**
+     * get token
+     *
+     * @return the token
+     */
+    public String getToken() {
+        return token;
+    }
+
+    /**
+     * set token
+     *
+     * @param token the token to set
+     */
+    public void setToken(String token) {
+        this.token = token;
+    }
+
     /**
      * get params
      *
diff --git 
a/inlong-manager/manager-dao/src/main/resources/mappers/ClusterSetMapper.xml 
b/inlong-manager/manager-dao/src/main/resources/mappers/ClusterSetMapper.xml
index 05abcff7f..b3c08fb45 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/ClusterSetMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/ClusterSetMapper.xml
@@ -29,6 +29,7 @@
     <select id="selectCacheCluster" 
resultType="org.apache.inlong.manager.pojo.dataproxy.CacheCluster">
         select name as cluster_name,
                type,
+               token,
                cluster_tags,
                ext_tag,
                ext_params
diff --git 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/dataproxy/CacheCluster.java
 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/dataproxy/CacheCluster.java
index 360e26d92..fb227b1ea 100644
--- 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/dataproxy/CacheCluster.java
+++ 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/dataproxy/CacheCluster.java
@@ -24,6 +24,7 @@ public class CacheCluster {
 
     private String clusterName;
     private String type;
+    private String token;
     private String clusterTags;
     private String extTag;
     private String extParams;
@@ -64,6 +65,24 @@ public class CacheCluster {
         this.type = type;
     }
 
+    /**
+     * get token
+     *
+     * @return the token
+     */
+    public String getToken() {
+        return token;
+    }
+
+    /**
+     * set token
+     *
+     * @param token the token to set
+     */
+    public void setToken(String token) {
+        this.token = token;
+    }
+
     /**
      * get clusterTag
      *
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/repository/DataProxyConfigRepository.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/repository/DataProxyConfigRepository.java
index a7ff17d93..c05833ad5 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/repository/DataProxyConfigRepository.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/repository/DataProxyConfigRepository.java
@@ -284,6 +284,7 @@ public class DataProxyConfigRepository implements 
IRepository {
                             CacheClusterObject obj = new CacheClusterObject();
                             obj.setName(cacheCluster.getClusterName());
                             obj.setZone(cacheCluster.getExtTag());
+                            obj.setToken(cacheCluster.getToken());
                             
obj.setParams(fromJsonToMap(cacheCluster.getExtParams()));
                             cacheClusters.add(obj);
                         }