From 50a3c40b887cde569d0533b71fd07517e1eb8ea7 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Mon, 3 Jun 2024 15:08:47 +0800 Subject: [PATCH] ConstsOperateAction to ConstsAct --- ...onstsOperateAction.java => ConstsAct.java} | 9 ++++--- ...perateResult.java => ConstsActResult.java} | 2 +- .../web/contorller/AccountsController.java | 20 ++++++++-------- .../web/idm/contorller/GroupsController.java | 16 ++++++------- .../contorller/OrganizationsController.java | 16 ++++++------- .../idm/contorller/UserInfoController.java | 24 +++++++++---------- .../contorller/ResourcesController.java | 16 ++++++------- 7 files changed, 53 insertions(+), 50 deletions(-) rename maxkey-core/src/main/java/org/dromara/maxkey/constants/{ConstsOperateAction.java => ConstsAct.java} (87%) rename maxkey-core/src/main/java/org/dromara/maxkey/constants/{ConstsOperateResult.java => ConstsActResult.java} (95%) diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsOperateAction.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsAct.java similarity index 87% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsOperateAction.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsAct.java index 3a273d25a..b5ba3b5e7 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsOperateAction.java +++ b/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 statusActon ; + public static final ConcurrentMap statusActon ; static { - statusActon= new ConcurrentHashMap(); + statusActon = new ConcurrentHashMap<>(); statusActon.put(ConstsStatus.ACTIVE, ENABLE); statusActon.put(ConstsStatus.INACTIVE, INACTIVE); statusActon.put(ConstsStatus.DISABLED, DISABLE); diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsOperateResult.java b/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsActResult.java similarity index 95% rename from maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsOperateResult.java rename to maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsActResult.java index 1f4957bf7..25e0bdce8 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/constants/ConstsOperateResult.java +++ b/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"; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java index f6c90db8d..0a50adb50 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java +++ b/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(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(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(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(Message.SUCCESS).buildResponse(); } else { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupsController.java index 22857144c..7f31131cf 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupsController.java +++ b/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(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(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(Message.SUCCESS).buildResponse(); } else { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java index d18767d07..1cb835016 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java +++ b/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(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(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(Message.SUCCESS).buildResponse(); } else { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java index e17310703..5344ce945 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java +++ b/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(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(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(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(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(Message.SUCCESS).buildResponse(); } else { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java index cda892ae1..28cbcd28b 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java +++ b/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(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(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(Message.SUCCESS).buildResponse(); } else {