ProvisionAction 改为ProvisionAct

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java

@@ -27,7 +27,7 @@ import org.dromara.maxkey.entity.AccountsStrategy;
 import org.dromara.maxkey.entity.OrganizationsCast;
 import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.maxkey.persistence.mapper.AccountsMapper;
-import org.dromara.maxkey.provision.ProvisionAction;
+import org.dromara.maxkey.provision.ProvisionAct;
 import org.dromara.maxkey.provision.ProvisionService;
 import org.dromara.maxkey.provision.ProvisionTopic;
 import org.dromara.mybatis.jpa.JpaService;
@@ -81,7 +81,7 @@ public class AccountsService  extends JpaService<Accounts>{
                     provisionService.send(
 	                        ProvisionTopic.ACCOUNT_TOPIC, 
 	                        account,
-	                        ProvisionAction.CREATE_ACTION);
+	                        ProvisionAct.CREATE);
 	            }
 	            
 	            return true;
@@ -102,7 +102,7 @@ public class AccountsService  extends JpaService<Accounts>{
                     provisionService.send(
                             ProvisionTopic.ACCOUNT_TOPIC, 
                             account,
-                            ProvisionAction.UPDATE_ACTION);
+                            ProvisionAct.UPDATE);
                 }
                 
                 return true;
@@ -124,7 +124,7 @@ public class AccountsService  extends JpaService<Accounts>{
                   provisionService.send(
                           ProvisionTopic.ACCOUNT_TOPIC, 
                           account,
-                          ProvisionAction.DELETE_ACTION);
+                          ProvisionAct.DELETE);
               }
               
               return true;
@@ -188,17 +188,17 @@ public class AccountsService  extends JpaService<Accounts>{
    	String shortAccount = generateAccount(userInfo,accountsStrategy,true);
    	String account = generateAccount(userInfo,accountsStrategy,false);
    	String accountResult = shortAccount;
-   	List<Accounts> AccountsList =getMapper().queryByAppIdAndAccount(accountsStrategy.getAppId(),shortAccount +accountsStrategy.getSuffixes());
-   	if(!AccountsList.isEmpty()) {
+   	List<Accounts> accountsList =getMapper().queryByAppIdAndAccount(accountsStrategy.getAppId(),shortAccount +accountsStrategy.getSuffixes());
+   	if(!accountsList.isEmpty()) {
    		if(accountsStrategy.getMapping().equalsIgnoreCase("email")) {
    			accountResult = account;
-   			AccountsList =getMapper().queryByAppIdAndAccount(accountsStrategy.getAppId(),account + accountsStrategy.getSuffixes());
+   			accountsList =getMapper().queryByAppIdAndAccount(accountsStrategy.getAppId(),account + accountsStrategy.getSuffixes());
    		}
-   		if(!AccountsList.isEmpty()) {
+   		if(!accountsList.isEmpty()) {
 	    		for(int i =1 ;i < 100 ;i++) {
 	    			accountResult = account + i;
-	    			AccountsList =getMapper().queryByAppIdAndAccount(accountsStrategy.getAppId(),accountResult + accountsStrategy.getSuffixes());
-	    			if(AccountsList.isEmpty()) {
+	    			accountsList =getMapper().queryByAppIdAndAccount(accountsStrategy.getAppId(),accountResult + accountsStrategy.getSuffixes());
+	    			if(accountsList.isEmpty()) {
 	    				break;
 	    			}
 	    		}

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java

@@ -37,7 +37,6 @@ public class AccountsStrategyService  extends JpaService<AccountsStrategy> imple
     
     static final  Logger _logger = LoggerFactory.getLogger(AccountsStrategyService.class);
    /*
-    @JsonIgnore
     @Autowired
     @Qualifier("groupMemberService")
     GroupMemberService accountsStrategyService;

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsService.java

@@ -27,7 +27,7 @@ import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
 import org.dromara.maxkey.entity.idm.Organizations;
 import org.dromara.maxkey.persistence.mapper.OrganizationsMapper;
-import org.dromara.maxkey.provision.ProvisionAction;
+import org.dromara.maxkey.provision.ProvisionAct;
 import org.dromara.maxkey.provision.ProvisionService;
 import org.dromara.maxkey.provision.ProvisionTopic;
 import org.dromara.mybatis.jpa.JpaService;
@@ -61,7 +61,7 @@ public class OrganizationsService  extends JpaService<Organizations>{
 	 public boolean insert(Organizations organization) {
 	     if(super.insert(organization)){
 	    	 provisionService.send(
-                     ProvisionTopic.ORG_TOPIC, organization, ProvisionAction.CREATE_ACTION);
+                     ProvisionTopic.ORG_TOPIC, organization, ProvisionAct.CREATE);
              return true;
          }
          return false;
@@ -71,7 +71,7 @@ public class OrganizationsService  extends JpaService<Organizations>{
 	 public boolean update(Organizations organization) {
 	     if(super.update(organization)){
 	    	 provisionService.send(
-                     ProvisionTopic.ORG_TOPIC, organization, ProvisionAction.UPDATE_ACTION);
+                     ProvisionTopic.ORG_TOPIC, organization, ProvisionAct.UPDATE);
              return true;
          }
          return false;
@@ -95,7 +95,7 @@ public class OrganizationsService  extends JpaService<Organizations>{
 	 public boolean delete(Organizations organization) {
 	     if(super.delete(organization.getId())){
 	    	 provisionService.send(
-                     ProvisionTopic.ORG_TOPIC, organization, ProvisionAction.DELETE_ACTION);
+                     ProvisionTopic.ORG_TOPIC, organization, ProvisionAct.DELETE);
              return true;
          }
          return false;

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java

@@ -29,7 +29,7 @@ import org.dromara.maxkey.entity.ChangePassword;
 import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.maxkey.persistence.mapper.UserInfoMapper;
 import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator;
-import org.dromara.maxkey.provision.ProvisionAction;
+import org.dromara.maxkey.provision.ProvisionAct;
 import org.dromara.maxkey.provision.ProvisionService;
 import org.dromara.maxkey.provision.ProvisionTopic;
 import org.dromara.maxkey.web.WebContext;
@@ -81,7 +81,7 @@ public class UserInfoService extends JpaService<UserInfo> {
                 provisionService.send(
                         ProvisionTopic.USERINFO_TOPIC, 
                         loadUserInfo,
-                        ProvisionAction.CREATE_ACTION);
+                        ProvisionAct.CREATE);
             }
             
             return true;
@@ -100,7 +100,7 @@ public class UserInfoService extends JpaService<UserInfo> {
                 provisionService.send(
                         ProvisionTopic.USERINFO_TOPIC, 
                         loadUserInfo,
-                        ProvisionAction.CREATE_ACTION);
+                        ProvisionAct.CREATE);
             }
             
             return true;
@@ -119,7 +119,7 @@ public class UserInfoService extends JpaService<UserInfo> {
                 provisionService.send(
                         ProvisionTopic.USERINFO_TOPIC, 
                         loadUserInfo,
-                        ProvisionAction.UPDATE_ACTION);
+                        ProvisionAct.UPDATE);
             }
             if(userInfo.getPassword() != null) {
             	changePasswordProvisioning(changePassword);
@@ -139,7 +139,7 @@ public class UserInfoService extends JpaService<UserInfo> {
 			provisionService.send(
 		            ProvisionTopic.USERINFO_TOPIC, 
 		            loadUserInfo, 
-		            ProvisionAction.DELETE_ACTION);
+		            ProvisionAct.DELETE);
 			accountUpdate(loadUserInfo);
 			 return true;
 		}
@@ -336,7 +336,7 @@ public class UserInfoService extends JpaService<UserInfo> {
     	    provisionService.send(
                     ProvisionTopic.PASSWORD_TOPIC, 
                     changePassword, 
-                    ProvisionAction.PASSWORD_ACTION);
+                    ProvisionAct.PASSWORD);
 	    }
 	}
 	

maxkey-persistence/src/main/java/org/dromara/maxkey/provision/ProvisionAction.java → maxkey-persistence/src/main/java/org/dromara/maxkey/provision/ProvisionAct.java

@@ -17,14 +17,14 @@
 
 package org.dromara.maxkey.provision;
 
-public class ProvisionAction {
+public class ProvisionAct {
     
-    public static final String  CREATE_ACTION     = "CREATE_ACTION";
+    public static final String  CREATE     = "CREATE";
     
-    public static final String  DELETE_ACTION     = "DELETE_ACTION";
+    public static final String  DELETE     = "DELETE";
     
-    public static final String  UPDATE_ACTION     = "UPDATE_ACTION";
+    public static final String  UPDATE     = "UPDATE";
     
-    public static final String  PASSWORD_ACTION   = "PASSWORD_ACTION";
+    public static final String  PASSWORD   = "PASSWORD";
     
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/provision/ProvisionTopic.java

@@ -27,11 +27,17 @@ public class ProvisionTopic {
     
     public static final  String  ACCOUNT_TOPIC                      = "MXK_IDENTITY_ACCOUNT_TOPIC";
     
+    public static final  String  GROUP_TOPIC               			= "MXK_GROUP_TOPIC";
+    
+    public static final  String  GROUP_MEMBER_TOPIC        			= "MXK_GROUP_MEMBER_TOPIC";
+    
+    public static final  String  GROUP_PERMISSIONS_TOPIC    		= "MXK_GROUP_PERMISSIONS_TOPIC";
+    
     public static final  String  ROLE_TOPIC               			= "MXK_ROLE_TOPIC";
     
     public static final  String  ROLE_MEMBER_TOPIC        			= "MXK_ROLE_MEMBER_TOPIC";
     
-    public static final  String  ROLE_PRIVILEGES_TOPIC    			= "MXK_ROLE_PRIVILEGES_TOPIC";
+    public static final  String  ROLE_PERMISSIONS_TOPIC    			= "MXK_ROLE_PERMISSIONS_TOPIC";
     
     public static final  String  RESOURCE_TOPIC           			= "MXK_RESOURCE_TOPIC";
     

maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningRunner.java

@@ -28,7 +28,7 @@ import org.dromara.maxkey.entity.Message;
 import org.dromara.maxkey.entity.idm.Organizations;
 import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.maxkey.persistence.service.ConnectorsService;
-import org.dromara.maxkey.provision.ProvisionAction;
+import org.dromara.maxkey.provision.ProvisionAct;
 import org.dromara.maxkey.provision.ProvisionMessage;
 import org.dromara.maxkey.provision.ProvisionTopic;
 import org.dromara.maxkey.util.DateUtils;
@@ -160,11 +160,11 @@ public class ProvisioningRunner {
 	}
 	
 	public String getActionType(String actionType) {
-		if(actionType.equalsIgnoreCase(ProvisionAction.CREATE_ACTION)) {
+		if(actionType.equalsIgnoreCase(ProvisionAct.CREATE)) {
 			return "create";
-		}else if(actionType.equalsIgnoreCase(ProvisionAction.UPDATE_ACTION)) {
+		}else if(actionType.equalsIgnoreCase(ProvisionAct.UPDATE)) {
 			return "update";
-		}else if(actionType.equalsIgnoreCase(ProvisionAction.DELETE_ACTION)) {
+		}else if(actionType.equalsIgnoreCase(ProvisionAct.DELETE)) {
 			return "delete";
 		}
 		return "";