8x48/KnowStreaming
1
0
Fork 0
mirror of https://github.com/didi/KnowStreaming.git synced 2026-01-06 21:52:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #191 from didi/dev

Browse Source 
Dev
This commit is contained in:
EricZeng
2021-02-28 22:04:34 +08:00
committed by GitHub
parent d30b90dfd0 9a5b18c4e6
commit 77f3096e0d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java
View File

@@ -57,7 +57,7 @@ public class BaseSessionSignOn extends AbstractSingleSignOn {
return null; return null;
} }
if(ValidateUtils.isNull(accountResult) && authUserRegistration){ if((ValidateUtils.isNull(accountResult) || ValidateUtils.isNull(accountResult.getData())) && authUserRegistration){
//自动注册 //自动注册
AccountDO accountDO = new AccountDO(); AccountDO accountDO = new AccountDO();
accountDO.setUsername(dto.getUsername()); accountDO.setUsername(dto.getUsername());
@@ -105,4 +105,4 @@ public class BaseSessionSignOn extends AbstractSingleSignOn {
response.setStatus(AbstractSingleSignOn.REDIRECT_CODE); response.setStatus(AbstractSingleSignOn.REDIRECT_CODE);
response.addHeader(AbstractSingleSignOn.HEADER_REDIRECT_KEY, ""); response.addHeader(AbstractSingleSignOn.HEADER_REDIRECT_KEY, "");
} }
} }

2
kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/op/SyncTopic2DB.java
View File

@@ -125,7 +125,7 @@ public class SyncTopic2DB extends AbstractScheduledTask<EmptyEntry> {
if (ValidateUtils.isNull(syncTopic2DBConfig.isAddAuthority()) || !syncTopic2DBConfig.isAddAuthority()) { if (ValidateUtils.isNull(syncTopic2DBConfig.isAddAuthority()) || !syncTopic2DBConfig.isAddAuthority()) {
// 不增加权限信息, 则直接忽略 // 不增加权限信息, 则直接忽略
return; continue;
} }
// TODO 当前添加 Topic 和 添加 Authority 是非事务的, 中间出现异常之后, 会导致数据错误, 后续还需要优化一下 // TODO 当前添加 Topic 和 添加 Authority 是非事务的, 中间出现异常之后, 会导致数据错误, 后续还需要优化一下