diff --git a/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java b/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java index b0eedd4..fca3eb5 100644 --- a/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java +++ b/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java @@ -165,18 +165,6 @@ public class RedisKeys { return rootPrefix.concat("options:dept:user:").concat(rootAreaCode).concat(":").concat(rootAreaLevel); } - /** - * 管理员有数据权限的部门层级关系 - * - * @param userId 用户id - * @return java.lang.String - * @author work@yujt.net.cn - * @date 2019/11/28 09:56 - */ - public static String getAdminUserDeptAuthOptionKey(Long userId) { - return rootPrefix.concat("options:dept:userAuth:").concat(String.valueOf(userId)); - } - /** * 管理员完整部门层级关系 * diff --git a/epdc-commons-tools/src/main/resources/i18n/messages_common.properties b/epdc-commons-tools/src/main/resources/i18n/messages_common.properties index c95e013..ab5c4db 100644 --- a/epdc-commons-tools/src/main/resources/i18n/messages_common.properties +++ b/epdc-commons-tools/src/main/resources/i18n/messages_common.properties @@ -1,5 +1,5 @@ #Default -500=\u670D\u52A1\u5668\u5185\u90E8\u5F02\u5E38 +500=\u7F51\u7EDC\u5F00\u5C0F\u5DEE\u4E86\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5 401=\u672A\u6388\u6743 403=\u62D2\u7EDD\u8BBF\u95EE\uFF0C\u6CA1\u6709\u6743\u9650 10001={0}\u4E0D\u80FD\u4E3A\u7A7A diff --git a/epdc-commons-tools/src/main/resources/i18n/messages_common_en_US.properties b/epdc-commons-tools/src/main/resources/i18n/messages_common_en_US.properties index 8573769..14fc6d7 100644 --- a/epdc-commons-tools/src/main/resources/i18n/messages_common_en_US.properties +++ b/epdc-commons-tools/src/main/resources/i18n/messages_common_en_US.properties @@ -1,5 +1,5 @@ #English -500=Internal Server Error +500=The network has strayed. Please try again later 401=Unauthorized 403=Denied access, no permission 10001={0} can not be empty diff --git a/epdc-commons-tools/src/main/resources/i18n/messages_common_zh_CN.properties b/epdc-commons-tools/src/main/resources/i18n/messages_common_zh_CN.properties index c54bffb..79f048d 100644 --- a/epdc-commons-tools/src/main/resources/i18n/messages_common_zh_CN.properties +++ b/epdc-commons-tools/src/main/resources/i18n/messages_common_zh_CN.properties @@ -1,5 +1,5 @@ #\u7B80\u4F53\u4E2D\u6587 -500=\u670D\u52A1\u5668\u5185\u90E8\u5F02\u5E38 +500=\u7F51\u7EDC\u5F00\u5C0F\u5DEE\u4E86\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5 401=\u672A\u6388\u6743 403=\u62D2\u7EDD\u8BBF\u95EE\uFF0C\u6CA1\u6709\u6743\u9650 10001={0}\u4E0D\u80FD\u4E3A\u7A7A diff --git a/epdc-commons-tools/src/main/resources/i18n/messages_common_zh_TW.properties b/epdc-commons-tools/src/main/resources/i18n/messages_common_zh_TW.properties index aedf118..8bed108 100644 --- a/epdc-commons-tools/src/main/resources/i18n/messages_common_zh_TW.properties +++ b/epdc-commons-tools/src/main/resources/i18n/messages_common_zh_TW.properties @@ -1,5 +1,5 @@ #\u7E41\u4F53\u4E2D\u6587 -500=\u670D\u52D9\u5668\u5167\u90E8\u7570\u5E38 +500=\u7DB2\u7D61\u958B\u5C0F\u5DEE\u4E86\uFF0C\u8ACB\u7A0D\u5F8C\u91CD\u8A66 401=\u672A\u6388\u6B0A 403=\u62D2\u7D55\u8A2A\u554F\uFF0C\u6C92\u6709\u6B0A\u9650 10001={0}\u4E0D\u80FD\u70BA\u7A7A