还原消费组重置失败的提示文案

zengqiao · ZQKC · commit da00c8c877e7 · 2022-10-29T13:55:07.000+08:00
diff --git a/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/group/impl/GroupManagerImpl.java b/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/group/impl/GroupManagerImpl.java
@@ -209,7 +209,7 @@ public Result<Void> resetGroupOffsets(GroupOffsetResetDTO dto, String operator)
         }
 
         if (!ConsumerGroupState.EMPTY.equals(description.state()) && !ConsumerGroupState.DEAD.equals(description.state())) {
-            return Result.buildFromRSAndMsg(ResultStatus.KAFKA_OPERATE_FAILED, String.format("group处于%s, 重置失败(仅Empty情况可重置)", GroupStateEnum.getByRawState(description.state()).getState()));
+            return Result.buildFromRSAndMsg(ResultStatus.KAFKA_OPERATE_FAILED, String.format("group处于%s, 重置失败(仅Empty | Dead 情况可重置)", GroupStateEnum.getByRawState(description.state()).getState()));
         }
 
         // 获取offset

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public Result<Void> resetGroupOffsets(GroupOffsetResetDTO dto, String operator)`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`if (!ConsumerGroupState.EMPTY.equals(description.state()) && !ConsumerGroupState.DEAD.equals(description.state())) {`
`212`		`- return Result.buildFromRSAndMsg(ResultStatus.KAFKA_OPERATE_FAILED, String.format("group处于%s, 重置失败(仅Empty情况可重置)", GroupStateEnum.getByRawState(description.state()).getState()));`
	`212`	`+ return Result.buildFromRSAndMsg(ResultStatus.KAFKA_OPERATE_FAILED, String.format("group处于%s, 重置失败(仅Empty \| Dead 情况可重置)", GroupStateEnum.getByRawState(description.state()).getState()));`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`// 获取offset`