Commit 10ba70e1079d9a068c054ee677a7accc0b1209fe
1 parent
75928525
错误码存在重复的问题
Showing
7 changed files
with
92 additions
and
98 deletions
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
| ... | ... | @@ -43,8 +43,8 @@ public interface ErrorCodeConstants { |
| 43 | 43 | ErrorCode PROCESS_INSTANCE_CANCEL_FAIL_NOT_SELF = new ErrorCode(1009004002, "流程取消失败，该流程不是你发起的"); |
| 44 | 44 | |
| 45 | 45 | // ========== 流程任务 1-009-005-000 ========== |
| 46 | - ErrorCode TASK_COMPLETE_FAIL_NOT_EXISTS = new ErrorCode(1009004000, "审批任务失败，原因：该任务不处于未审批"); | |
| 47 | - ErrorCode TASK_COMPLETE_FAIL_ASSIGN_NOT_SELF = new ErrorCode(1009004001, "审批任务失败，原因：该任务的审批人不是你"); | |
| 46 | + ErrorCode TASK_COMPLETE_FAIL_NOT_EXISTS = new ErrorCode(1009005000, "审批任务失败，原因：该任务不处于未审批"); | |
| 47 | + ErrorCode TASK_COMPLETE_FAIL_ASSIGN_NOT_SELF = new ErrorCode(1009005001, "审批任务失败，原因：该任务的审批人不是你"); | |
| 48 | 48 | |
| 49 | 49 | // ========== 流程任务分配规则 1-009-006-000 ========== |
| 50 | 50 | ErrorCode TASK_ASSIGN_RULE_EXISTS = new ErrorCode(1009006000, "流程({}) 的任务({}) 已经存在分配规则"); |
| ... | ... | @@ -55,7 +55,7 @@ public interface ErrorCodeConstants { |
| 55 | 55 | |
| 56 | 56 | // ========== 动态表单模块 1-009-010-000 ========== |
| 57 | 57 | ErrorCode FORM_NOT_EXISTS = new ErrorCode(1009010000, "动态表单不存在"); |
| 58 | - ErrorCode FORM_FIELD_REPEAT = new ErrorCode(1009010000, "表单项({}) 和 ({}) 使用了相同的字段名({})"); | |
| 58 | + ErrorCode FORM_FIELD_REPEAT = new ErrorCode(1009010001, "表单项({}) 和 ({}) 使用了相同的字段名({})"); | |
| 59 | 59 | |
| 60 | 60 | // ========== 用户组模块 1-009-011-000 ========== |
| 61 | 61 | ErrorCode USER_GROUP_NOT_EXISTS = new ErrorCode(1009011000, "用户组不存在"); | ... | ... |
yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ErrorCodeConstants.java
| ... | ... | @@ -30,5 +30,6 @@ public interface ErrorCodeConstants { |
| 30 | 30 | // ========= 文件相关 1001003000================= |
| 31 | 31 | ErrorCode FILE_PATH_EXISTS = new ErrorCode(1001003000, "文件路径已存在"); |
| 32 | 32 | ErrorCode FILE_NOT_EXISTS = new ErrorCode(1001003001, "文件不存在"); |
| 33 | + ErrorCode FILE_IS_EMPTY = new ErrorCode(1001003002, "文件为空"); | |
| 33 | 34 | |
| 34 | 35 | } | ... | ... |
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
| ... | ... | @@ -13,9 +13,6 @@ public interface ErrorCodeConstants { |
| 13 | 13 | ErrorCode USER_NOT_EXISTS = new ErrorCode(1004001000, "用户不存在"); |
| 14 | 14 | ErrorCode USER_PASSWORD_FAILED = new ErrorCode(1004001001, "密码校验失败"); |
| 15 | 15 | |
| 16 | - // ========== 文件相关 1004002000 =========== | |
| 17 | - // TODO 芋艿：可以删除 | |
| 18 | - ErrorCode FILE_IS_EMPTY = new ErrorCode(1004002000, "文件为空"); | |
| 19 | 16 | |
| 20 | 17 | // ========== AUTH 模块 1004003000 ========== |
| 21 | 18 | ErrorCode AUTH_LOGIN_BAD_CREDENTIALS = new ErrorCode(1004003000, "登录失败，账号密码不正确"); | ... | ... |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java
| ... | ... | @@ -21,7 +21,7 @@ import java.io.IOException; |
| 21 | 21 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.*; |
| 22 | 22 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 23 | 23 | import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 24 | -import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.FILE_IS_EMPTY; | |
| 24 | +import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.FILE_IS_EMPTY; | |
| 25 | 25 | |
| 26 | 26 | @Api(tags = "用户 APP - 用户个人中心") |
| 27 | 27 | @RestController | ... | ... |
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
| ... | ... | @@ -18,54 +18,54 @@ public interface ErrorCodeConstants { |
| 18 | 18 | ErrorCode AUTH_THIRD_LOGIN_NOT_BIND = new ErrorCode(1002000005, "未绑定账号，需要进行绑定"); |
| 19 | 19 | ErrorCode AUTH_TOKEN_EXPIRED = new ErrorCode(1002000006, "Token 已经过期"); |
| 20 | 20 | |
| 21 | - // ========== 菜单模块 1002002000 ========== | |
| 22 | - ErrorCode MENU_NAME_DUPLICATE = new ErrorCode(1002002000, "已经存在该名字的菜单"); | |
| 23 | - ErrorCode MENU_PARENT_NOT_EXISTS = new ErrorCode(1002002001, "父菜单不存在"); | |
| 24 | - ErrorCode MENU_PARENT_ERROR = new ErrorCode(1002002002, "不能设置自己为父菜单"); | |
| 25 | - ErrorCode MENU_NOT_EXISTS = new ErrorCode(1002002003, "菜单不存在"); | |
| 26 | - ErrorCode MENU_EXISTS_CHILDREN = new ErrorCode(1002002004, "存在子菜单，无法删除"); | |
| 27 | - ErrorCode MENU_PARENT_NOT_DIR_OR_MENU = new ErrorCode(1002002005, "父菜单的类型必须是目录或者菜单"); | |
| 28 | - | |
| 29 | - // ========== 角色模块 1002003000 ========== | |
| 30 | - ErrorCode ROLE_NOT_EXISTS = new ErrorCode(1002003000, "角色不存在"); | |
| 31 | - ErrorCode ROLE_NAME_DUPLICATE = new ErrorCode(1002003001, "已经存在名为【{}】的角色"); | |
| 32 | - ErrorCode ROLE_CODE_DUPLICATE = new ErrorCode(1002003002, "已经存在编码为【{}】的角色"); | |
| 33 | - ErrorCode ROLE_CAN_NOT_UPDATE_SYSTEM_TYPE_ROLE = new ErrorCode(1002003004, "不能操作类型为系统内置的角色"); | |
| 34 | - ErrorCode ROLE_IS_DISABLE = new ErrorCode(1002003005, "名字为【{}】的角色已被禁用"); | |
| 35 | - ErrorCode ROLE_ADMIN_CODE_ERROR = new ErrorCode(1002003006, "编码【{}】不能使用"); | |
| 36 | - | |
| 37 | - // ========== 用户模块 1002004000 ========== | |
| 38 | - ErrorCode USER_USERNAME_EXISTS = new ErrorCode(1002004000, "用户账号已经存在"); | |
| 39 | - ErrorCode USER_MOBILE_EXISTS = new ErrorCode(1002004001, "手机号已经存在"); | |
| 40 | - ErrorCode USER_EMAIL_EXISTS = new ErrorCode(1002004002, "邮箱已经存在"); | |
| 41 | - ErrorCode USER_NOT_EXISTS = new ErrorCode(1002004003, "用户不存在"); | |
| 42 | - ErrorCode USER_IMPORT_LIST_IS_EMPTY = new ErrorCode(1002004004, "导入用户数据不能为空！"); | |
| 43 | - ErrorCode USER_PASSWORD_FAILED = new ErrorCode(1002004005, "用户密码校验失败"); | |
| 44 | - ErrorCode USER_IS_DISABLE = new ErrorCode(1002004006, "名字为【{}】的用户已被禁用"); | |
| 45 | - ErrorCode USER_COUNT_MAX = new ErrorCode(1002004007, "创建用户失败，原因：超过租户最大租户配额({})！"); | |
| 46 | - | |
| 47 | - // ========== 部门模块 1002005000 ========== | |
| 48 | - ErrorCode DEPT_NAME_DUPLICATE = new ErrorCode(1002004001, "已经存在该名字的部门"); | |
| 49 | - ErrorCode DEPT_PARENT_NOT_EXITS = new ErrorCode(1002004002,"父级部门不存在"); | |
| 50 | - ErrorCode DEPT_NOT_FOUND = new ErrorCode(1002004003, "当前部门不存在"); | |
| 51 | - ErrorCode DEPT_EXITS_CHILDREN = new ErrorCode(1002004004, "存在子部门，无法删除"); | |
| 52 | - ErrorCode DEPT_PARENT_ERROR = new ErrorCode(1002004005, "不能设置自己为父部门"); | |
| 53 | - ErrorCode DEPT_EXISTS_USER = new ErrorCode(1002004006, "部门中存在员工，无法删除"); | |
| 54 | - ErrorCode DEPT_NOT_ENABLE = new ErrorCode(1002004007, "部门不处于开启状态，不允许选择"); | |
| 55 | - ErrorCode DEPT_PARENT_IS_CHILD = new ErrorCode(1002004008, "不能设置自己的子部门为父部门"); | |
| 21 | + // ========== 菜单模块 1002001000 ========== | |
| 22 | + ErrorCode MENU_NAME_DUPLICATE = new ErrorCode(1002001000, "已经存在该名字的菜单"); | |
| 23 | + ErrorCode MENU_PARENT_NOT_EXISTS = new ErrorCode(1002001001, "父菜单不存在"); | |
| 24 | + ErrorCode MENU_PARENT_ERROR = new ErrorCode(1002001002, "不能设置自己为父菜单"); | |
| 25 | + ErrorCode MENU_NOT_EXISTS = new ErrorCode(1002001003, "菜单不存在"); | |
| 26 | + ErrorCode MENU_EXISTS_CHILDREN = new ErrorCode(1002001004, "存在子菜单，无法删除"); | |
| 27 | + ErrorCode MENU_PARENT_NOT_DIR_OR_MENU = new ErrorCode(1002001005, "父菜单的类型必须是目录或者菜单"); | |
| 28 | + | |
| 29 | + // ========== 角色模块 1002002000 ========== | |
| 30 | + ErrorCode ROLE_NOT_EXISTS = new ErrorCode(1002002000, "角色不存在"); | |
| 31 | + ErrorCode ROLE_NAME_DUPLICATE = new ErrorCode(1002002001, "已经存在名为【{}】的角色"); | |
| 32 | + ErrorCode ROLE_CODE_DUPLICATE = new ErrorCode(1002002002, "已经存在编码为【{}】的角色"); | |
| 33 | + ErrorCode ROLE_CAN_NOT_UPDATE_SYSTEM_TYPE_ROLE = new ErrorCode(1002002003, "不能操作类型为系统内置的角色"); | |
| 34 | + ErrorCode ROLE_IS_DISABLE = new ErrorCode(1002002004, "名字为【{}】的角色已被禁用"); | |
| 35 | + ErrorCode ROLE_ADMIN_CODE_ERROR = new ErrorCode(1002002005, "编码【{}】不能使用"); | |
| 36 | + | |
| 37 | + // ========== 用户模块 1002003000 ========== | |
| 38 | + ErrorCode USER_USERNAME_EXISTS = new ErrorCode(1002003000, "用户账号已经存在"); | |
| 39 | + ErrorCode USER_MOBILE_EXISTS = new ErrorCode(1002003001, "手机号已经存在"); | |
| 40 | + ErrorCode USER_EMAIL_EXISTS = new ErrorCode(1002003002, "邮箱已经存在"); | |
| 41 | + ErrorCode USER_NOT_EXISTS = new ErrorCode(1002003003, "用户不存在"); | |
| 42 | + ErrorCode USER_IMPORT_LIST_IS_EMPTY = new ErrorCode(1002003004, "导入用户数据不能为空！"); | |
| 43 | + ErrorCode USER_PASSWORD_FAILED = new ErrorCode(1002003005, "用户密码校验失败"); | |
| 44 | + ErrorCode USER_IS_DISABLE = new ErrorCode(1002003006, "名字为【{}】的用户已被禁用"); | |
| 45 | + ErrorCode USER_COUNT_MAX = new ErrorCode(1002003008, "创建用户失败，原因：超过租户最大租户配额({})！"); | |
| 46 | + | |
| 47 | + // ========== 部门模块 1002004000 ========== | |
| 48 | + ErrorCode DEPT_NAME_DUPLICATE = new ErrorCode(1002004000, "已经存在该名字的部门"); | |
| 49 | + ErrorCode DEPT_PARENT_NOT_EXITS = new ErrorCode(1002004001,"父级部门不存在"); | |
| 50 | + ErrorCode DEPT_NOT_FOUND = new ErrorCode(1002004002, "当前部门不存在"); | |
| 51 | + ErrorCode DEPT_EXITS_CHILDREN = new ErrorCode(1002004003, "存在子部门，无法删除"); | |
| 52 | + ErrorCode DEPT_PARENT_ERROR = new ErrorCode(1002004004, "不能设置自己为父部门"); | |
| 53 | + ErrorCode DEPT_EXISTS_USER = new ErrorCode(1002004005, "部门中存在员工，无法删除"); | |
| 54 | + ErrorCode DEPT_NOT_ENABLE = new ErrorCode(1002004006, "部门不处于开启状态，不允许选择"); | |
| 55 | + ErrorCode DEPT_PARENT_IS_CHILD = new ErrorCode(1002004007, "不能设置自己的子部门为父部门"); | |
| 56 | 56 | |
| 57 | 57 | // ========== 岗位模块 1002005000 ========== |
| 58 | - ErrorCode POST_NOT_FOUND = new ErrorCode(1002005001, "当前岗位不存在"); | |
| 59 | - ErrorCode POST_NOT_ENABLE = new ErrorCode(1002005002, "岗位({}) 不处于开启状态，不允许选择"); | |
| 60 | - ErrorCode POST_NAME_DUPLICATE = new ErrorCode(1002005001, "已经存在该名字的岗位"); | |
| 61 | - ErrorCode POST_CODE_DUPLICATE = new ErrorCode(1002005001, "已经存在该标识的岗位"); | |
| 58 | + ErrorCode POST_NOT_FOUND = new ErrorCode(1002005000, "当前岗位不存在"); | |
| 59 | + ErrorCode POST_NOT_ENABLE = new ErrorCode(1002005001, "岗位({}) 不处于开启状态，不允许选择"); | |
| 60 | + ErrorCode POST_NAME_DUPLICATE = new ErrorCode(1002005002, "已经存在该名字的岗位"); | |
| 61 | + ErrorCode POST_CODE_DUPLICATE = new ErrorCode(1002005003, "已经存在该标识的岗位"); | |
| 62 | 62 | |
| 63 | 63 | // ========== 字典类型 1002006000 ========== |
| 64 | 64 | ErrorCode DICT_TYPE_NOT_EXISTS = new ErrorCode(1002006001, "当前字典类型不存在"); |
| 65 | 65 | ErrorCode DICT_TYPE_NOT_ENABLE = new ErrorCode(1002006002, "字典类型不处于开启状态，不允许选择"); |
| 66 | 66 | ErrorCode DICT_TYPE_NAME_DUPLICATE = new ErrorCode(1002006003, "已经存在该名字的字典类型"); |
| 67 | 67 | ErrorCode DICT_TYPE_TYPE_DUPLICATE = new ErrorCode(1002006004, "已经存在该类型的字典类型"); |
| 68 | - ErrorCode DICT_TYPE_HAS_CHILDREN = new ErrorCode(1002006004, "无法删除，该字典类型还有字典数据"); | |
| 68 | + ErrorCode DICT_TYPE_HAS_CHILDREN = new ErrorCode(1002006005, "无法删除，该字典类型还有字典数据"); | |
| 69 | 69 | |
| 70 | 70 | // ========== 字典数据 1002007000 ========== |
| 71 | 71 | ErrorCode DICT_DATA_NOT_EXISTS = new ErrorCode(1002007001, "当前字典数据不存在"); |
| ... | ... | @@ -75,53 +75,48 @@ public interface ErrorCodeConstants { |
| 75 | 75 | // ========== 通知公告 1002008000 ========== |
| 76 | 76 | ErrorCode NOTICE_NOT_FOUND = new ErrorCode(1002008001, "当前通知公告不存在"); |
| 77 | 77 | |
| 78 | - // ========== 文件 1002009000 ========== | |
| 79 | - ErrorCode FILE_PATH_EXISTS = new ErrorCode(1002009001, "文件路径已经存在"); | |
| 80 | - ErrorCode FILE_UPLOAD_FAILED = new ErrorCode(1002009002, "文件上传失败"); | |
| 81 | - ErrorCode FILE_IS_EMPTY= new ErrorCode(1002009003, "文件为空"); | |
| 82 | - | |
| 83 | 78 | // ========== 短信渠道 1002011000 ========== |
| 84 | 79 | ErrorCode SMS_CHANNEL_NOT_EXISTS = new ErrorCode(1002011000, "短信渠道不存在"); |
| 85 | 80 | ErrorCode SMS_CHANNEL_DISABLE = new ErrorCode(1002011001, "短信渠道不处于开启状态，不允许选择"); |
| 86 | 81 | ErrorCode SMS_CHANNEL_HAS_CHILDREN = new ErrorCode(1002011002, "无法删除，该短信渠道还有短信模板"); |
| 87 | 82 | |
| 88 | - // ========== 短信模板 1002011000 ========== | |
| 89 | - ErrorCode SMS_TEMPLATE_NOT_EXISTS = new ErrorCode(1002011000, "短信模板不存在"); | |
| 90 | - ErrorCode SMS_TEMPLATE_CODE_DUPLICATE = new ErrorCode(1002011001, "已经存在编码为【{}】的短信模板"); | |
| 91 | - | |
| 92 | - // ========== 短信发送 1002012000 ========== | |
| 93 | - ErrorCode SMS_SEND_MOBILE_NOT_EXISTS = new ErrorCode(1002012000, "手机号不存在"); | |
| 94 | - ErrorCode SMS_SEND_MOBILE_TEMPLATE_PARAM_MISS = new ErrorCode(1002012001, "模板参数({})缺失"); | |
| 95 | - ErrorCode SMS_SEND_TEMPLATE_NOT_EXISTS = new ErrorCode(1002012002, "短信模板不存在"); | |
| 96 | - | |
| 97 | - // ========== 短信验证码 1002013000 ========== | |
| 98 | - ErrorCode SMS_CODE_NOT_FOUND = new ErrorCode(1002013000, "验证码不存在"); | |
| 99 | - ErrorCode SMS_CODE_EXPIRED = new ErrorCode(1002013001, "验证码已过期"); | |
| 100 | - ErrorCode SMS_CODE_USED = new ErrorCode(1002013002, "验证码已使用"); | |
| 101 | - ErrorCode SMS_CODE_NOT_CORRECT = new ErrorCode(1002013004, "验证码不正确"); | |
| 102 | - ErrorCode SMS_CODE_EXCEED_SEND_MAXIMUM_QUANTITY_PER_DAY = new ErrorCode(1002013005, "超过每日短信发送数量"); | |
| 103 | - ErrorCode SMS_CODE_SEND_TOO_FAST = new ErrorCode(1002013006, "短信发送过于频率"); | |
| 104 | - ErrorCode SMS_CODE_IS_EXISTS = new ErrorCode(1002013007, "手机号已被使用"); | |
| 105 | - ErrorCode SMS_CODE_IS_UNUSED = new ErrorCode(1002013008, "验证码未被使用"); | |
| 106 | - | |
| 107 | - // ========== 租户信息 1002014000 ========== | |
| 108 | - ErrorCode TENANT_NOT_EXISTS = new ErrorCode(1002014000, "租户不存在"); | |
| 109 | - ErrorCode TENANT_DISABLE = new ErrorCode(1002014001, "名字为【{}】的租户已被禁用"); | |
| 110 | - ErrorCode TENANT_EXPIRE = new ErrorCode(1002014002, "名字为【{}】的租户已过期"); | |
| 111 | - ErrorCode TENANT_CAN_NOT_UPDATE_SYSTEM = new ErrorCode(1002014003, "系统租户不能进行修改、删除等操作！"); | |
| 112 | - | |
| 113 | - // ========== 租户套餐 1002015000 ========== | |
| 114 | - ErrorCode TENANT_PACKAGE_NOT_EXISTS = new ErrorCode(1002015000, "租户套餐不存在"); | |
| 115 | - ErrorCode TENANT_PACKAGE_USED = new ErrorCode(1002015001, "租户正在使用该套餐，请给租户重新设置套餐后再尝试删除"); | |
| 116 | - ErrorCode TENANT_PACKAGE_DISABLE = new ErrorCode(1002015002, "名字为【{}】的租户套餐已被禁用"); | |
| 117 | - | |
| 118 | - // ========== 错误码模块 1002016000 ========== | |
| 119 | - ErrorCode ERROR_CODE_NOT_EXISTS = new ErrorCode(1002016000, "错误码不存在"); | |
| 120 | - ErrorCode ERROR_CODE_DUPLICATE = new ErrorCode(1002016001, "已经存在编码为【{}】的错误码"); | |
| 121 | - | |
| 122 | - // ========== 社交用户 1002017000 ========== | |
| 123 | - ErrorCode SOCIAL_USER_AUTH_FAILURE = new ErrorCode(1002017000, "社交授权失败，原因是：{}"); | |
| 124 | - ErrorCode SOCIAL_USER_UNBIND_NOT_SELF = new ErrorCode(1002017001, "社交解绑失败，非当前用户绑定"); | |
| 125 | - ErrorCode SOCIAL_USER_NOT_FOUND = new ErrorCode(1002017001, "社交授权失败，找不到对应的用户"); | |
| 83 | + // ========== 短信模板 1002012000 ========== | |
| 84 | + ErrorCode SMS_TEMPLATE_NOT_EXISTS = new ErrorCode(1002012000, "短信模板不存在"); | |
| 85 | + ErrorCode SMS_TEMPLATE_CODE_DUPLICATE = new ErrorCode(1002012001, "已经存在编码为【{}】的短信模板"); | |
| 86 | + | |
| 87 | + // ========== 短信发送 1002013000 ========== | |
| 88 | + ErrorCode SMS_SEND_MOBILE_NOT_EXISTS = new ErrorCode(1002013000, "手机号不存在"); | |
| 89 | + ErrorCode SMS_SEND_MOBILE_TEMPLATE_PARAM_MISS = new ErrorCode(1002013001, "模板参数({})缺失"); | |
| 90 | + ErrorCode SMS_SEND_TEMPLATE_NOT_EXISTS = new ErrorCode(1002013002, "短信模板不存在"); | |
| 91 | + | |
| 92 | + // ========== 短信验证码 1002014000 ========== | |
| 93 | + ErrorCode SMS_CODE_NOT_FOUND = new ErrorCode(1002014000, "验证码不存在"); | |
| 94 | + ErrorCode SMS_CODE_EXPIRED = new ErrorCode(1002014001, "验证码已过期"); | |
| 95 | + ErrorCode SMS_CODE_USED = new ErrorCode(1002014002, "验证码已使用"); | |
| 96 | + ErrorCode SMS_CODE_NOT_CORRECT = new ErrorCode(1002014003, "验证码不正确"); | |
| 97 | + ErrorCode SMS_CODE_EXCEED_SEND_MAXIMUM_QUANTITY_PER_DAY = new ErrorCode(1002014004, "超过每日短信发送数量"); | |
| 98 | + ErrorCode SMS_CODE_SEND_TOO_FAST = new ErrorCode(1002014005, "短信发送过于频率"); | |
| 99 | + ErrorCode SMS_CODE_IS_EXISTS = new ErrorCode(1002014006, "手机号已被使用"); | |
| 100 | + ErrorCode SMS_CODE_IS_UNUSED = new ErrorCode(1002014007, "验证码未被使用"); | |
| 101 | + | |
| 102 | + // ========== 租户信息 1002015000 ========== | |
| 103 | + ErrorCode TENANT_NOT_EXISTS = new ErrorCode(1002015000, "租户不存在"); | |
| 104 | + ErrorCode TENANT_DISABLE = new ErrorCode(1002015001, "名字为【{}】的租户已被禁用"); | |
| 105 | + ErrorCode TENANT_EXPIRE = new ErrorCode(1002015002, "名字为【{}】的租户已过期"); | |
| 106 | + ErrorCode TENANT_CAN_NOT_UPDATE_SYSTEM = new ErrorCode(1002015003, "系统租户不能进行修改、删除等操作！"); | |
| 107 | + | |
| 108 | + // ========== 租户套餐 1002016000 ========== | |
| 109 | + ErrorCode TENANT_PACKAGE_NOT_EXISTS = new ErrorCode(1002016000, "租户套餐不存在"); | |
| 110 | + ErrorCode TENANT_PACKAGE_USED = new ErrorCode(1002016001, "租户正在使用该套餐，请给租户重新设置套餐后再尝试删除"); | |
| 111 | + ErrorCode TENANT_PACKAGE_DISABLE = new ErrorCode(1002016002, "名字为【{}】的租户套餐已被禁用"); | |
| 112 | + | |
| 113 | + // ========== 错误码模块 1002017000 ========== | |
| 114 | + ErrorCode ERROR_CODE_NOT_EXISTS = new ErrorCode(1002017000, "错误码不存在"); | |
| 115 | + ErrorCode ERROR_CODE_DUPLICATE = new ErrorCode(1002017001, "已经存在编码为【{}】的错误码"); | |
| 116 | + | |
| 117 | + // ========== 社交用户 1002018000 ========== | |
| 118 | + ErrorCode SOCIAL_USER_AUTH_FAILURE = new ErrorCode(1002018000, "社交授权失败，原因是：{}"); | |
| 119 | + ErrorCode SOCIAL_USER_UNBIND_NOT_SELF = new ErrorCode(1002018001, "社交解绑失败，非当前用户绑定"); | |
| 120 | + ErrorCode SOCIAL_USER_NOT_FOUND = new ErrorCode(1002018002, "社交授权失败，找不到对应的用户"); | |
| 126 | 121 | |
| 127 | 122 | } | ... | ... |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java
| 1 | 1 | package cn.iocoder.yudao.module.system.controller.admin.user; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | |
| 5 | +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | |
| 6 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | 7 | import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileRespVO; |
| 5 | 8 | import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO; |
| 6 | 9 | import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; |
| 7 | 10 | import cn.iocoder.yudao.module.system.convert.user.UserConvert; |
| 8 | 11 | import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; |
| 12 | +import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO; | |
| 13 | +import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; | |
| 9 | 14 | import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserDO; |
| 10 | 15 | import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; |
| 11 | 16 | import cn.iocoder.yudao.module.system.service.dept.DeptService; |
| 12 | 17 | import cn.iocoder.yudao.module.system.service.dept.PostService; |
| 13 | 18 | import cn.iocoder.yudao.module.system.service.permission.PermissionService; |
| 14 | 19 | import cn.iocoder.yudao.module.system.service.permission.RoleService; |
| 15 | -import cn.iocoder.yudao.module.system.service.user.AdminUserService; | |
| 16 | -import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO; | |
| 17 | -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; | |
| 18 | 20 | import cn.iocoder.yudao.module.system.service.social.SocialUserService; |
| 19 | -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | |
| 20 | -import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | |
| 21 | -import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 21 | +import cn.iocoder.yudao.module.system.service.user.AdminUserService; | |
| 22 | 22 | import io.swagger.annotations.Api; |
| 23 | 23 | import io.swagger.annotations.ApiOperation; |
| 24 | 24 | import lombok.extern.slf4j.Slf4j; |
| ... | ... | @@ -31,9 +31,9 @@ import javax.validation.Valid; |
| 31 | 31 | import java.io.IOException; |
| 32 | 32 | import java.util.List; |
| 33 | 33 | |
| 34 | -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.FILE_IS_EMPTY; | |
| 35 | 34 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 36 | 35 | import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 36 | +import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.FILE_IS_EMPTY; | |
| 37 | 37 | |
| 38 | 38 | @Api(tags = "管理后台 - 用户个人中心") |
| 39 | 39 | @RestController | ... | ... |
更新日志.md
| ... | ... | @@ -35,7 +35,8 @@ TODO |
| 35 | 35 | |
| 36 | 36 | ### 🐞 Bug Fixes |
| 37 | 37 | |
| 38 | -* 【修复】修复不支持根部门的问题 [commmit](https://gitee.com/zhijiantianya/ruoyi-vue-pro/commit/fa62ace6af5ecc2f3030fa86d2ce222a1392f1a6) | |
| 38 | +* 【修复】修复不支持根部门的问题 [commit](https://gitee.com/zhijiantianya/ruoyi-vue-pro/commit/fa62ace6af5ecc2f3030fa86d2ce222a1392f1a6) | |
| 39 | +* 【修复】错误码存在重复的问题 [commit]() | |
| 39 | 40 | |
| 40 | 41 | ### 🔨 Dependency Upgrades |
| 41 | 42 | ... | ... |