diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mq/MqIdentityAction.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mq/MqProvisionAction.java similarity index 96% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mq/MqIdentityAction.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mq/MqProvisionAction.java index b7df751bebdc45d340c69883cbc35d792dd3f2ac..1fae05c7b4d4a121c199e43a0b107343c64a3c1e 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mq/MqIdentityAction.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mq/MqProvisionAction.java @@ -17,7 +17,7 @@ package org.maxkey.persistence.mq; -public class MqIdentityAction { +public class MqProvisionAction { public static String CREATE_ACTION = "CREATE_ACTION"; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mq/MqIdentityTopic.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mq/MqProvisionTopic.java similarity index 98% rename from maxkey-persistence/src/main/java/org/maxkey/persistence/mq/MqIdentityTopic.java rename to maxkey-persistence/src/main/java/org/maxkey/persistence/mq/MqProvisionTopic.java index 9a7f54a1b99f430e1f48661784d952bed8151f31..b8ebf2f34032078eabaa3e6e19d57afd43d3d51b 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mq/MqIdentityTopic.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mq/MqProvisionTopic.java @@ -17,7 +17,7 @@ package org.maxkey.persistence.mq; -public class MqIdentityTopic { +public class MqProvisionTopic { public final static String USERINFO_TOPIC = "MXK_IDENTITY_USERINFO_TOPIC"; diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java index 4446fe2a06303b6216e973e4716f50058c678428..9ec586c3f0c0ddc1e4c3e127c6811f9f4e213f8a 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java @@ -27,8 +27,8 @@ import org.maxkey.entity.AccountsStrategy; import org.maxkey.entity.OrganizationsCast; import org.maxkey.entity.UserInfo; import org.maxkey.persistence.mapper.AccountsMapper; -import org.maxkey.persistence.mq.MqIdentityAction; -import org.maxkey.persistence.mq.MqIdentityTopic; +import org.maxkey.persistence.mq.MqProvisionAction; +import org.maxkey.persistence.mq.MqProvisionTopic; import org.maxkey.persistence.mq.MessageQueueService; import org.maxkey.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -79,9 +79,9 @@ public class AccountsService extends JpaBaseService{ cast.setOrgId(loadUserInfo.getDepartmentId()); account.setOrgCast(organizationsCastService.query(cast)); mqPersistService.send( - MqIdentityTopic.ACCOUNT_TOPIC, + MqProvisionTopic.ACCOUNT_TOPIC, account, - MqIdentityAction.CREATE_ACTION); + MqProvisionAction.CREATE_ACTION); } return true; @@ -99,9 +99,9 @@ public class AccountsService extends JpaBaseService{ cast.setOrgId(loadUserInfo.getDepartmentId()); account.setOrgCast(organizationsCastService.query(cast)); mqPersistService.send( - MqIdentityTopic.ACCOUNT_TOPIC, + MqProvisionTopic.ACCOUNT_TOPIC, account, - MqIdentityAction.UPDATE_ACTION); + MqProvisionAction.UPDATE_ACTION); } return true; @@ -117,9 +117,9 @@ public class AccountsService extends JpaBaseService{ loadUserInfo = userInfoService.findUserRelated(account.getUserId()); account.setUserInfo(loadUserInfo); mqPersistService.send( - MqIdentityTopic.ACCOUNT_TOPIC, + MqProvisionTopic.ACCOUNT_TOPIC, account, - MqIdentityAction.DELETE_ACTION); + MqProvisionAction.DELETE_ACTION); } return true; 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 d449b8bcd36f5124c5d89f1d2f03dc7b3510505b..7f69a322888b807e265f0c124a9a5f3afd06cb87 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 @@ -24,8 +24,8 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; import org.maxkey.entity.Organizations; import org.maxkey.persistence.mapper.OrganizationsMapper; -import org.maxkey.persistence.mq.MqIdentityAction; -import org.maxkey.persistence.mq.MqIdentityTopic; +import org.maxkey.persistence.mq.MqProvisionAction; +import org.maxkey.persistence.mq.MqProvisionTopic; import org.maxkey.persistence.mq.MessageQueueService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @@ -52,7 +52,7 @@ public class OrganizationsService extends JpaBaseService{ public boolean insert(Organizations organization) { if(super.insert(organization)){ messageQueueService.send( - MqIdentityTopic.ORG_TOPIC, organization, MqIdentityAction.CREATE_ACTION); + MqProvisionTopic.ORG_TOPIC, organization, MqProvisionAction.CREATE_ACTION); return true; } return false; @@ -61,7 +61,7 @@ public class OrganizationsService extends JpaBaseService{ public boolean update(Organizations organization) { if(super.update(organization)){ messageQueueService.send( - MqIdentityTopic.ORG_TOPIC, organization, MqIdentityAction.UPDATE_ACTION); + MqProvisionTopic.ORG_TOPIC, organization, MqProvisionAction.UPDATE_ACTION); return true; } return false; @@ -85,7 +85,7 @@ public class OrganizationsService extends JpaBaseService{ public boolean delete(Organizations organization) { if(super.delete(organization)){ messageQueueService.send( - MqIdentityTopic.ORG_TOPIC, organization, MqIdentityAction.DELETE_ACTION); + MqProvisionTopic.ORG_TOPIC, organization, MqProvisionAction.DELETE_ACTION); return true; } return false; 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 f3d50dc5782b78ccf4091b7944561962fa81cb89..d6c02ac0c26b1b50e2fd039526daf5a45c2718c8 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 @@ -27,8 +27,8 @@ import org.maxkey.entity.Accounts; import org.maxkey.entity.ChangePassword; import org.maxkey.entity.UserInfo; import org.maxkey.persistence.mapper.UserInfoMapper; -import org.maxkey.persistence.mq.MqIdentityAction; -import org.maxkey.persistence.mq.MqIdentityTopic; +import org.maxkey.persistence.mq.MqProvisionAction; +import org.maxkey.persistence.mq.MqProvisionTopic; import org.maxkey.persistence.mq.MessageQueueService; import org.maxkey.persistence.repository.PasswordPolicyValidator; import org.maxkey.util.DateUtils; @@ -78,9 +78,9 @@ public class UserInfoService extends JpaBaseService { if(messageQueueService.getApplicationConfig().isMessageQueueSupport()) { UserInfo loadUserInfo = findUserRelated(userInfo.getId()); messageQueueService.send( - MqIdentityTopic.USERINFO_TOPIC, + MqProvisionTopic.USERINFO_TOPIC, loadUserInfo, - MqIdentityAction.CREATE_ACTION); + MqProvisionAction.CREATE_ACTION); } return true; @@ -96,9 +96,9 @@ public class UserInfoService extends JpaBaseService { UserInfo loadUserInfo = findUserRelated(userInfo.getId()); accountUpdate(loadUserInfo); messageQueueService.send( - MqIdentityTopic.USERINFO_TOPIC, + MqProvisionTopic.USERINFO_TOPIC, loadUserInfo, - MqIdentityAction.UPDATE_ACTION); + MqProvisionAction.UPDATE_ACTION); } changePasswordProvisioning(changePassword); @@ -115,9 +115,9 @@ public class UserInfoService extends JpaBaseService { if( super.delete(userInfo)){ messageQueueService.send( - MqIdentityTopic.USERINFO_TOPIC, + MqProvisionTopic.USERINFO_TOPIC, loadUserInfo, - MqIdentityAction.DELETE_ACTION); + MqProvisionAction.DELETE_ACTION); accountUpdate(loadUserInfo); return true; } @@ -310,9 +310,9 @@ public class UserInfoService extends JpaBaseService { UserInfo loadUserInfo = findByUsername(changePassworded.getUsername()); ChangePassword changePassword = new ChangePassword(loadUserInfo); messageQueueService.send( - MqIdentityTopic.PASSWORD_TOPIC, + MqProvisionTopic.PASSWORD_TOPIC, changePassword, - MqIdentityAction.PASSWORD_ACTION); + MqProvisionAction.PASSWORD_ACTION); } } diff --git a/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-CN.json b/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-CN.json index f5dae8add4499571dbb484292c16596294e7109e..68bd71e8c8a33b03bdd6f5e9a38f1a07f2ee0afe 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-CN.json +++ b/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-CN.json @@ -1,7 +1,7 @@ { - "app.title": "单点登录系统", + "app.title": "单点登录认证系统", "mxk":{ - "title": "单点登录系统", + "title": "单点登录认证系统", "login":{ "title": "MaxKey", "title.sub": "业界领先的IAM身份管理和认证产品",