MaxKey 3 vuotta sitten
vanhempi
commit
585fa606de

+ 1 - 1
maxkey-persistence/src/main/java/org/maxkey/persistence/mq/MqIdentityAction.java → 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";
     

+ 1 - 1
maxkey-persistence/src/main/java/org/maxkey/persistence/mq/MqIdentityTopic.java → 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";
     

+ 8 - 8
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<Accounts>{
                     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<Accounts>{
                     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<Accounts>{
                   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;

+ 5 - 5
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<Organizations>{
 	 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<Organizations>{
 	 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<Organizations>{
 	 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;

+ 10 - 10
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<UserInfo> {
         	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> {
                 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<UserInfo> {
 	    
 		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> {
 	    	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);
 	    }
 	}
 	

+ 2 - 2
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身份管理和认证产品",