From 9b0ab878df05916e790c5e9046d3333e6bfec0f6 Mon Sep 17 00:00:00 2001 From: Joker Date: Fri, 26 Feb 2021 19:47:03 +0800 Subject: [PATCH 1/2] bug fix: unexpected stop of the topic sync task --- .../xiaojukeji/kafka/manager/task/dispatch/op/SyncTopic2DB.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/op/SyncTopic2DB.java b/kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/op/SyncTopic2DB.java index ae10a21d..bb069aa8 100644 --- a/kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/op/SyncTopic2DB.java +++ b/kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/op/SyncTopic2DB.java @@ -125,7 +125,7 @@ public class SyncTopic2DB extends AbstractScheduledTask { if (ValidateUtils.isNull(syncTopic2DBConfig.isAddAuthority()) || !syncTopic2DBConfig.isAddAuthority()) { // 不增加权限信息, 则直接忽略 - return; + continue; } // TODO 当前添加 Topic 和 添加 Authority 是非事务的, 中间出现异常之后, 会导致数据错误, 后续还需要优化一下 From 0c7112869a9e1aa23fc37fb664be6bd4c6633f7e Mon Sep 17 00:00:00 2001 From: Joker Date: Sat, 27 Feb 2021 22:35:35 +0800 Subject: [PATCH 2/2] bug fix:correct way to judge a user does not exist --- .../manager/account/component/sso/BaseSessionSignOn.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java index 9362d895..3aa0e703 100644 --- a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java +++ b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java @@ -57,7 +57,7 @@ public class BaseSessionSignOn extends AbstractSingleSignOn { return null; } - if(ValidateUtils.isNull(accountResult) && authUserRegistration){ + if((ValidateUtils.isNull(accountResult) || ValidateUtils.isNull(accountResult.getData())) && authUserRegistration){ //自动注册 AccountDO accountDO = new AccountDO(); accountDO.setUsername(dto.getUsername()); @@ -105,4 +105,4 @@ public class BaseSessionSignOn extends AbstractSingleSignOn { response.setStatus(AbstractSingleSignOn.REDIRECT_CODE); response.addHeader(AbstractSingleSignOn.HEADER_REDIRECT_KEY, ""); } -} \ No newline at end of file +}