bugfix/fix console portal npe&add credis hetero type

ctripcorp · Nov 9, 2023 · 4f35139 · 4f35139
1 parent 269a4fe
commit 4f35139
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/core/src/main/java/com/ctrip/xpipe/api/migration/OuterClientService.java b/core/src/main/java/com/ctrip/xpipe/api/migration/OuterClientService.java
@@ -692,6 +692,12 @@ public com.ctrip.xpipe.cluster.ClusterType innerType() {
 			public com.ctrip.xpipe.cluster.ClusterType innerType() {
 				return com.ctrip.xpipe.cluster.ClusterType.CROSS_DC;
 			}
+		},
+		HETERO(6) {
+			@Override
+			public com.ctrip.xpipe.cluster.ClusterType innerType() {
+				return com.ctrip.xpipe.cluster.ClusterType.HETERO;
+			}
 		};
 
 		private Integer intVal;

diff --git a/...onsole/src/main/java/com/ctrip/xpipe/redis/console/service/impl/DcClusterServiceImpl.java b/...onsole/src/main/java/com/ctrip/xpipe/redis/console/service/impl/DcClusterServiceImpl.java
@@ -241,7 +241,9 @@ public DcClusterModel findDcClusterModelByClusterAndDc(String clusterName, Strin
 
 		result.setShards(shardModelService.getAllShardModel(dcName, clusterName));
 		ClusterType azGroupType = azGroupClusterRepository.selectAzGroupTypeById(dcClusterTbl.getAzGroupClusterId());
-		result.setAzGroupClusterType(azGroupType.name());
+		if (azGroupType != null) {
+			result.setAzGroupClusterType(azGroupType.name());
+		}
 		if (azGroupType == ClusterType.SINGLE_DC) {
 			result.setSources(sourceModelService.getAllSourceModels(dcName, clusterName));
 		}

diff --git a/redis/redis-console/src/main/resources/static/scripts/ClusterType.ts b/redis/redis-console/src/main/resources/static/scripts/ClusterType.ts
@@ -67,7 +67,7 @@ function ClusterType() {
                 useKeeper: true,
                 healthCheck: true,
                 supportMigration: true,
-                isCrossDc:true,
+                isCrossDc:false,
                 supportApplier:false,
                 useAzGroupType:true,
             }