ConstsOperateAction to ConstsAct

maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsOperateAction.java → maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsAct.java

@@ -18,8 +18,9 @@
 package org.dromara.maxkey.constants;
 
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
-public final class ConstsOperateAction {
+public final class ConstsAct {
 
     public static final String CREATE 			= "create";
 
@@ -28,6 +29,8 @@ public final class ConstsOperateAction {
     public static final String UPDATE 			= "update";
 
     public static final String CHANGE_PASSWORD 	= "change_password";
+    
+    public static final String FORGOT_PASSWORD 	= "forgot_password";
 
     public static final String ADD_MEMBER 		= "add_member";
 
@@ -45,10 +48,10 @@ public final class ConstsOperateAction {
 
     public static final String VIEW 			= "view";
     
-    public static ConcurrentHashMap<Integer,String> statusActon ;
+    public static final ConcurrentMap<Integer,String> statusActon ;
     
     static {
-    	statusActon= new ConcurrentHashMap<Integer,String>();
+    	statusActon = new ConcurrentHashMap<>();
     	statusActon.put(ConstsStatus.ACTIVE, ENABLE);
     	statusActon.put(ConstsStatus.INACTIVE, INACTIVE);
     	statusActon.put(ConstsStatus.DISABLED, DISABLE);

maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsOperateResult.java → maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsActResult.java

@@ -17,7 +17,7 @@
 
 package org.dromara.maxkey.constants;
 
-public final class ConstsOperateResult {
+public final class ConstsActResult {
     public static final String SUCCESS 	= "success";
     public static final String ERROR 	= "error";
     public static final String FAIL 	= "fail";

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java

@@ -19,8 +19,8 @@ package org.dromara.maxkey.web.contorller;
 
 import org.dromara.maxkey.authn.annotation.CurrentUser;
 import org.dromara.maxkey.constants.ConstsEntryType;
-import org.dromara.maxkey.constants.ConstsOperateAction;
-import org.dromara.maxkey.constants.ConstsOperateResult;
+import org.dromara.maxkey.constants.ConstsAct;
+import org.dromara.maxkey.constants.ConstsActResult;
 import org.dromara.maxkey.crypto.password.PasswordReciprocal;
 import org.dromara.maxkey.entity.Accounts;
 import org.dromara.maxkey.entity.AccountsStrategy;
@@ -104,8 +104,8 @@ public class AccountsController {
 			systemLog.insert(
 					ConstsEntryType.ACCOUNT, 
 					account, 
-					ConstsOperateAction.CREATE, 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.CREATE, 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 		    return new Message<Accounts>(Message.SUCCESS).buildResponse();
 		} else {
@@ -123,8 +123,8 @@ public class AccountsController {
 			systemLog.insert(
 					ConstsEntryType.ACCOUNT, 
 					account, 
-					ConstsOperateAction.UPDATE, 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.UPDATE, 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 		    return new Message<Accounts>(Message.SUCCESS).buildResponse();
 		} else {
@@ -149,8 +149,8 @@ public class AccountsController {
 			systemLog.insert(
 					ConstsEntryType.ACCOUNT, 
 					accounts, 
-					ConstsOperateAction.statusActon.get(accounts.getStatus()), 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.statusActon.get(accounts.getStatus()), 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 		    return new Message<Accounts>(Message.SUCCESS).buildResponse();
 		} else {
@@ -167,8 +167,8 @@ public class AccountsController {
 			systemLog.insert(
 					ConstsEntryType.ACCOUNT, 
 					ids, 
-					ConstsOperateAction.DELETE, 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.DELETE, 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 			 return new Message<Accounts>(Message.SUCCESS).buildResponse();
 		} else {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupsController.java

@@ -19,8 +19,8 @@ package org.dromara.maxkey.web.idm.contorller;
 
 import org.dromara.maxkey.authn.annotation.CurrentUser;
 import org.dromara.maxkey.constants.ConstsEntryType;
-import org.dromara.maxkey.constants.ConstsOperateAction;
-import org.dromara.maxkey.constants.ConstsOperateResult;
+import org.dromara.maxkey.constants.ConstsAct;
+import org.dromara.maxkey.constants.ConstsActResult;
 import org.dromara.maxkey.entity.Groups;
 import org.dromara.maxkey.entity.Message;
 import org.dromara.maxkey.entity.Roles;
@@ -98,8 +98,8 @@ public class GroupsController {
 		    systemLog.insert(
 					ConstsEntryType.ROLE, 
 					group, 
-					ConstsOperateAction.CREATE, 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.CREATE, 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 		    return new Message<Groups>(Message.SUCCESS).buildResponse();
 		} else {
@@ -120,8 +120,8 @@ public class GroupsController {
 		    systemLog.insert(
 					ConstsEntryType.ROLE, 
 					group, 
-					ConstsOperateAction.UPDATE, 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.UPDATE, 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 		    return new Message<Roles>(Message.SUCCESS).buildResponse();
 		} else {
@@ -138,8 +138,8 @@ public class GroupsController {
 			systemLog.insert(
 					ConstsEntryType.ROLE, 
 					ids, 
-					ConstsOperateAction.DELETE, 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.DELETE, 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 			 return new Message<Roles>(Message.SUCCESS).buildResponse();
 		} else {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java

@@ -29,8 +29,8 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.dromara.maxkey.authn.annotation.CurrentUser;
 import org.dromara.maxkey.constants.ConstsEntryType;
-import org.dromara.maxkey.constants.ConstsOperateAction;
-import org.dromara.maxkey.constants.ConstsOperateResult;
+import org.dromara.maxkey.constants.ConstsAct;
+import org.dromara.maxkey.constants.ConstsActResult;
 import org.dromara.maxkey.entity.ExcelImport;
 import org.dromara.maxkey.entity.Message;
 import org.dromara.maxkey.entity.Organizations;
@@ -106,8 +106,8 @@ public class OrganizationsController {
 			systemLog.insert(
 					ConstsEntryType.ORGANIZATION, 
 					org, 
-					ConstsOperateAction.CREATE, 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.CREATE, 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 			return new Message<Organizations>(Message.SUCCESS).buildResponse();
 		} else {
@@ -124,8 +124,8 @@ public class OrganizationsController {
 			systemLog.insert(
 					ConstsEntryType.ORGANIZATION, 
 					org, 
-					ConstsOperateAction.UPDATE, 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.UPDATE, 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 		    return new Message<Organizations>(Message.SUCCESS).buildResponse();
 		} else {
@@ -141,8 +141,8 @@ public class OrganizationsController {
 			systemLog.insert(
 					ConstsEntryType.ORGANIZATION, 
 					ids, 
-					ConstsOperateAction.DELETE, 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.DELETE, 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 			 return new Message<Organizations>(Message.SUCCESS).buildResponse();
 		} else {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java

@@ -34,8 +34,8 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.dromara.maxkey.authn.annotation.CurrentUser;
 import org.dromara.maxkey.constants.ConstsEntryType;
-import org.dromara.maxkey.constants.ConstsOperateAction;
-import org.dromara.maxkey.constants.ConstsOperateResult;
+import org.dromara.maxkey.constants.ConstsAct;
+import org.dromara.maxkey.constants.ConstsActResult;
 import org.dromara.maxkey.constants.ConstsPasswordSetType;
 import org.dromara.maxkey.entity.ChangePassword;
 import org.dromara.maxkey.entity.ExcelImport;
@@ -134,8 +134,8 @@ public class UserInfoController {
 			systemLog.insert(
 					ConstsEntryType.USERINFO, 
 					userInfo, 
-					ConstsOperateAction.CREATE, 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.CREATE, 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 			return new Message<UserInfo>(Message.SUCCESS).buildResponse();
 		} else {
@@ -162,8 +162,8 @@ public class UserInfoController {
 			systemLog.insert(
 					ConstsEntryType.USERINFO, 
 					userInfo, 
-					ConstsOperateAction.UPDATE, 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.UPDATE, 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 		    return new Message<UserInfo>(Message.SUCCESS).buildResponse();
 		} else {
@@ -180,8 +180,8 @@ public class UserInfoController {
 			systemLog.insert(
 					ConstsEntryType.USERINFO, 
 					ids, 
-					ConstsOperateAction.DELETE, 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.DELETE, 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 			 return new Message<UserInfo>(Message.SUCCESS).buildResponse();
 		} else {
@@ -225,8 +225,8 @@ public class UserInfoController {
 			systemLog.insert(
 					ConstsEntryType.USERINFO, 
 					changePassword, 
-					ConstsOperateAction.CHANGE_PASSWORD, 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.CHANGE_PASSWORD, 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 			return new Message<UserInfo>(Message.SUCCESS).buildResponse();
 		} else {
@@ -246,8 +246,8 @@ public class UserInfoController {
 			systemLog.insert(
 					ConstsEntryType.USERINFO, 
 					userInfo, 
-					ConstsOperateAction.statusActon.get(userInfo.getStatus()), 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.statusActon.get(userInfo.getStatus()), 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 			return new Message<UserInfo>(Message.SUCCESS).buildResponse();
 		} else {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java

@@ -21,8 +21,8 @@ import java.util.List;
 
 import org.dromara.maxkey.authn.annotation.CurrentUser;
 import org.dromara.maxkey.constants.ConstsEntryType;
-import org.dromara.maxkey.constants.ConstsOperateAction;
-import org.dromara.maxkey.constants.ConstsOperateResult;
+import org.dromara.maxkey.constants.ConstsAct;
+import org.dromara.maxkey.constants.ConstsActResult;
 import org.dromara.maxkey.entity.Message;
 import org.dromara.maxkey.entity.Resources;
 import org.dromara.maxkey.entity.UserInfo;
@@ -94,8 +94,8 @@ public class ResourcesController {
 			systemLog.insert(
 					ConstsEntryType.RESOURCE, 
 					resource, 
-					ConstsOperateAction.CREATE, 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.CREATE, 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 			return new Message<Resources>(Message.SUCCESS).buildResponse();
 		} else {
@@ -112,8 +112,8 @@ public class ResourcesController {
 			systemLog.insert(
 					ConstsEntryType.RESOURCE, 
 					resource, 
-					ConstsOperateAction.UPDATE, 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.UPDATE, 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 		    return new Message<Resources>(Message.SUCCESS).buildResponse();
 		} else {
@@ -129,8 +129,8 @@ public class ResourcesController {
 			systemLog.insert(
 					ConstsEntryType.RESOURCE, 
 					ids, 
-					ConstsOperateAction.DELETE, 
-					ConstsOperateResult.SUCCESS, 
+					ConstsAct.DELETE, 
+					ConstsActResult.SUCCESS, 
 					currentUser);
 			 return new Message<Resources>(Message.SUCCESS).buildResponse();
 		} else {