From 618aba8b745bc641a4ac202deac8bc43fd46fcab Mon Sep 17 00:00:00 2001 From: MaxKey Date: Sat, 20 Feb 2021 22:00:19 +0800 Subject: [PATCH] kafka Persist --- .../maxkey-authentication-core/build.gradle | 2 -- .../maxkey-identity-kafka/build.gradle | 12 ------------ maxkey-persistence/build.gradle | 1 - .../persistence}/kafka/KafkaIdentityAction.java | 2 +- .../persistence}/kafka/KafkaIdentityTopic.java | 2 +- .../maxkey/persistence}/kafka/KafkaMessage.java | 2 +- .../persistence/kafka/KafkaPersistService.java | 6 +++--- .../service/OrganizationsService.java | 14 +++++++------- .../persistence/service/UserInfoService.java | 16 ++++++++-------- maxkey-web-manage/build.gradle | 1 - maxkey-web-maxkey/build.gradle | 1 - settings.gradle | 1 - 12 files changed, 21 insertions(+), 39 deletions(-) delete mode 100644 maxkey-identitys/maxkey-identity-kafka/build.gradle rename {maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity => maxkey-persistence/src/main/java/org/maxkey/persistence}/kafka/KafkaIdentityAction.java (96%) rename {maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity => maxkey-persistence/src/main/java/org/maxkey/persistence}/kafka/KafkaIdentityTopic.java (96%) rename {maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity => maxkey-persistence/src/main/java/org/maxkey/persistence}/kafka/KafkaMessage.java (97%) rename maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaProvisioningService.java => maxkey-persistence/src/main/java/org/maxkey/persistence/kafka/KafkaPersistService.java (96%) diff --git a/maxkey-authentications/maxkey-authentication-core/build.gradle b/maxkey-authentications/maxkey-authentication-core/build.gradle index 9c9624981..89c30ba60 100644 --- a/maxkey-authentications/maxkey-authentication-core/build.gradle +++ b/maxkey-authentications/maxkey-authentication-core/build.gradle @@ -9,8 +9,6 @@ dependencies { compile project(":maxkey-common") compile project(":maxkey-core") compile project(":maxkey-persistence") - compile project(":maxkey-protocols:maxkey-protocol-oauth-2.0") - compile project(":maxkey-protocols:maxkey-protocol-saml-2.0") compile project(":maxkey-authentications:maxkey-authentication-otp") } \ No newline at end of file diff --git a/maxkey-identitys/maxkey-identity-kafka/build.gradle b/maxkey-identitys/maxkey-identity-kafka/build.gradle deleted file mode 100644 index fff56801e..000000000 --- a/maxkey-identitys/maxkey-identity-kafka/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -description = "maxkey-identity-kafka" - -apply plugin: 'java' - -dependencies { - //local jars - compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - - compile project(":maxkey-common") - compile project(":maxkey-core") - -} \ No newline at end of file diff --git a/maxkey-persistence/build.gradle b/maxkey-persistence/build.gradle index 63ae6e95d..b62b22cd2 100644 --- a/maxkey-persistence/build.gradle +++ b/maxkey-persistence/build.gradle @@ -6,5 +6,4 @@ dependencies { compile project(":maxkey-common") compile project(":maxkey-core") - compile project(":maxkey-identitys:maxkey-identity-kafka") } \ No newline at end of file diff --git a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaIdentityAction.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/kafka/KafkaIdentityAction.java similarity index 96% rename from maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaIdentityAction.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/kafka/KafkaIdentityAction.java index af2afb303..e1702d351 100644 --- a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaIdentityAction.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/kafka/KafkaIdentityAction.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.kafka; +package org.maxkey.persistence.kafka; public class KafkaIdentityAction { diff --git a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaIdentityTopic.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/kafka/KafkaIdentityTopic.java similarity index 96% rename from maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaIdentityTopic.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/kafka/KafkaIdentityTopic.java index f442f24b7..645caa311 100644 --- a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaIdentityTopic.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/kafka/KafkaIdentityTopic.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.kafka; +package org.maxkey.persistence.kafka; public class KafkaIdentityTopic { diff --git a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaMessage.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/kafka/KafkaMessage.java similarity index 97% rename from maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaMessage.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/kafka/KafkaMessage.java index 558560206..e1cb4796a 100644 --- a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaMessage.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/kafka/KafkaMessage.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.kafka; +package org.maxkey.persistence.kafka; public class KafkaMessage { diff --git a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaProvisioningService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/kafka/KafkaPersistService.java similarity index 96% rename from maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaProvisioningService.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/kafka/KafkaPersistService.java index 3de0229fc..e3dd39c5a 100644 --- a/maxkey-identitys/maxkey-identity-kafka/src/main/java/org/maxkey/identity/kafka/KafkaProvisioningService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/kafka/KafkaPersistService.java @@ -15,7 +15,7 @@ */ -package org.maxkey.identity.kafka; +package org.maxkey.persistence.kafka; import java.util.UUID; @@ -29,9 +29,9 @@ import org.springframework.kafka.core.KafkaTemplate; import org.springframework.stereotype.Component; @Component -public class KafkaProvisioningService { +public class KafkaPersistService { - private static final Logger _logger = LoggerFactory.getLogger(KafkaProvisioningService.class); + private static final Logger _logger = LoggerFactory.getLogger(KafkaPersistService.class); @Autowired protected ApplicationConfig applicationConfig; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java index 4c51d3eaa..e0404b91c 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java @@ -34,9 +34,9 @@ import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.maxkey.domain.Organizations; -import org.maxkey.identity.kafka.KafkaIdentityAction; -import org.maxkey.identity.kafka.KafkaIdentityTopic; -import org.maxkey.identity.kafka.KafkaProvisioningService; +import org.maxkey.persistence.kafka.KafkaIdentityAction; +import org.maxkey.persistence.kafka.KafkaIdentityTopic; +import org.maxkey.persistence.kafka.KafkaPersistService; import org.maxkey.persistence.mapper.OrganizationsMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -49,7 +49,7 @@ import com.google.common.collect.Lists; public class OrganizationsService extends JpaBaseService{ @Autowired - KafkaProvisioningService kafkaProvisioningService; + KafkaPersistService kafkaPersistService; public OrganizationsService() { super(OrganizationsMapper.class); @@ -66,7 +66,7 @@ public class OrganizationsService extends JpaBaseService{ public boolean insert(Organizations organization) { if(super.insert(organization)){ - kafkaProvisioningService.send( + kafkaPersistService.send( KafkaIdentityTopic.ORG_TOPIC, organization, KafkaIdentityAction.CREATE_ACTION); return true; } @@ -75,7 +75,7 @@ public class OrganizationsService extends JpaBaseService{ public boolean update(Organizations organization) { if(super.update(organization)){ - kafkaProvisioningService.send( + kafkaPersistService.send( KafkaIdentityTopic.ORG_TOPIC, organization, KafkaIdentityAction.UPDATE_ACTION); return true; } @@ -84,7 +84,7 @@ public class OrganizationsService extends JpaBaseService{ public boolean delete(Organizations organization) { if(super.delete(organization)){ - kafkaProvisioningService.send( + kafkaPersistService.send( KafkaIdentityTopic.ORG_TOPIC, organization, KafkaIdentityAction.DELETE_ACTION); return true; } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java index c2fbd18cf..199e3f37b 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java @@ -40,10 +40,10 @@ import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.crypto.password.PasswordReciprocal; import org.maxkey.domain.ChangePassword; import org.maxkey.domain.UserInfo; -import org.maxkey.identity.kafka.KafkaIdentityAction; -import org.maxkey.identity.kafka.KafkaIdentityTopic; -import org.maxkey.identity.kafka.KafkaProvisioningService; import org.maxkey.persistence.db.PasswordPolicyValidator; +import org.maxkey.persistence.kafka.KafkaIdentityAction; +import org.maxkey.persistence.kafka.KafkaIdentityTopic; +import org.maxkey.persistence.kafka.KafkaPersistService; import org.maxkey.persistence.mapper.UserInfoMapper; import org.maxkey.util.DateUtils; import org.maxkey.util.StringUtils; @@ -76,7 +76,7 @@ public class UserInfoService extends JpaBaseService { PasswordPolicyValidator passwordPolicyValidator; @Autowired - KafkaProvisioningService kafkaProvisioningService; + KafkaPersistService kafkaPersistService; @Autowired protected JdbcTemplate jdbcTemplate; @@ -96,7 +96,7 @@ public class UserInfoService extends JpaBaseService { public boolean insert(UserInfo userInfo) { userInfo = passwordEncoder(userInfo); if (super.insert(userInfo)) { - kafkaProvisioningService.send( + kafkaPersistService.send( KafkaIdentityTopic.USERINFO_TOPIC, userInfo, KafkaIdentityAction.CREATE_ACTION); @@ -109,7 +109,7 @@ public class UserInfoService extends JpaBaseService { public boolean update(UserInfo userInfo) { userInfo = passwordEncoder(userInfo); if (super.update(userInfo)) { - kafkaProvisioningService.send( + kafkaPersistService.send( KafkaIdentityTopic.USERINFO_TOPIC, userInfo, KafkaIdentityAction.UPDATE_ACTION); @@ -122,7 +122,7 @@ public class UserInfoService extends JpaBaseService { public boolean delete(UserInfo userInfo) { if( super.delete(userInfo)){ - kafkaProvisioningService.send( + kafkaPersistService.send( KafkaIdentityTopic.USERINFO_TOPIC, userInfo, KafkaIdentityAction.DELETE_ACTION); @@ -283,7 +283,7 @@ public class UserInfoService extends JpaBaseService { changePassword.setUsername(userInfo.getUsername()); changePassword.setDecipherable(userInfo.getDecipherable()); changePassword.setPassword(userInfo.getPassword()); - kafkaProvisioningService.send( + kafkaPersistService.send( KafkaIdentityTopic.PASSWORD_TOPIC, changePassword, KafkaIdentityAction.PASSWORD_ACTION); diff --git a/maxkey-web-manage/build.gradle b/maxkey-web-manage/build.gradle index 7a433428f..ad5cdd6fd 100644 --- a/maxkey-web-manage/build.gradle +++ b/maxkey-web-manage/build.gradle @@ -69,7 +69,6 @@ dependencies { compile project(":maxkey-protocols:maxkey-protocol-oauth-2.0") compile project(":maxkey-protocols:maxkey-protocol-saml-2.0") compile project(":maxkey-identitys:maxkey-identity-scim") - compile project(":maxkey-identitys:maxkey-identity-kafka") compile project(":maxkey-identitys:maxkey-identity-rest") } diff --git a/maxkey-web-maxkey/build.gradle b/maxkey-web-maxkey/build.gradle index e476e78fe..20e03b958 100644 --- a/maxkey-web-maxkey/build.gradle +++ b/maxkey-web-maxkey/build.gradle @@ -80,7 +80,6 @@ dependencies { compile project(":maxkey-protocols:maxkey-protocol-oauth-2.0") compile project(":maxkey-protocols:maxkey-protocol-saml-2.0") compile project(":maxkey-protocols:maxkey-protocol-jwt") - compile project(":maxkey-identitys:maxkey-identity-kafka") } /* diff --git a/settings.gradle b/settings.gradle index 0ccdffb2b..b03562265 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,7 +15,6 @@ include 'maxkey-authentications:maxkey-authentication-otp' //identity include 'maxkey-identitys:maxkey-identity-scim' -include 'maxkey-identitys:maxkey-identity-kafka' include 'maxkey-identitys:maxkey-identity-rest' //Protocol