1、增加手机+密码登录时需要效验验证码

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/ErrorCodeConstants.java

@@ -11,57 +11,70 @@ public interface ErrorCodeConstants {
 
 
     // ========== 人员信息-个人档案 1_100_001_000 ==========
-    ErrorCode USER_INFO_NOT_EXISTS = new ErrorCode(1_100_001_001, "人员信息-个人档案不存在");
+    ErrorCode MDE_USER_INFO_NOT_EXISTS = new ErrorCode(1_100_001_001, "人员信息-个人档案不存在");
 
     // ========== 行业信息 1_100_002_000 ==========
-    ErrorCode INDUSTRY_NOT_EXISTS = new ErrorCode(1_100_002_001, "行业信息不存在");
+    ErrorCode MDE_INDUSTRY_NOT_EXISTS = new ErrorCode(1_100_002_001, "行业信息不存在");
 
     // ========== 职位信息 1_100_003_000 ==========
-    ErrorCode POSITION_NOT_EXISTS = new ErrorCode(1_100_002_003, "职位信息不存在");
+    ErrorCode MDE_POSITION_NOT_EXISTS = new ErrorCode(1_100_002_003, "职位信息不存在");
 
     // ========== 地区 1_100_004_000 ==========
-    ErrorCode AREA_NOT_EXISTS = new ErrorCode(1_100_004_001, "地区不存在");
+    ErrorCode MDE_AREA_NOT_EXISTS = new ErrorCode(1_100_004_001, "地区不存在");
 
     // ========== 简历附件 1_100_005_000 ==========
-    ErrorCode CV_ATTACHMENT_NOT_EXISTS = new ErrorCode(1_100_005_001, "简历附件不存在");
+    ErrorCode MDE_CV_ATTACHMENT_NOT_EXISTS = new ErrorCode(1_100_005_001, "简历附件不存在");
 
     // ========== 教育经历 1_100_006_000 ==========
-    ErrorCode EDU_EXP_NOT_EXISTS = new ErrorCode(1_100_006_001, "教育经历不存在");
+    ErrorCode MDE_EDU_EXP_NOT_EXISTS = new ErrorCode(1_100_006_001, "教育经历不存在");
 
     // ========== 求职意向 1_100_007_000 ==========
-    ErrorCode JOB_INTERESTED_NOT_EXISTS = new ErrorCode(1_100_007_001, "求职意向不存在");
+    ErrorCode MDE_JOB_INTERESTED_NOT_EXISTS = new ErrorCode(1_100_007_001, "求职意向不存在");
 
     // ========== 专业 1_100_008_000 ==========
-    ErrorCode MAJOR_NOT_EXISTS = new ErrorCode(1_100_008_001, "专业不存在");
+    ErrorCode MDE_MAJOR_NOT_EXISTS = new ErrorCode(1_100_008_001, "专业不存在");
 
     // ========== 职位标签 1_100_009_000 ==========
-    ErrorCode POSITION_TAG_NOT_EXISTS = new ErrorCode(1_100_009_001, "职位标签不存在");
+    ErrorCode MDE_POSITION_TAG_NOT_EXISTS = new ErrorCode(1_100_009_001, "职位标签不存在");
 
     // ========== 学校 1_100_010_000 ==========
-    ErrorCode SCHOOL_NOT_EXISTS = new ErrorCode(1_100_010_001, "学校不存在");
+    ErrorCode MDE_SCHOOL_NOT_EXISTS = new ErrorCode(1_100_010_001, "学校不存在");
 
     // ========== 人员证书 1_100_011_000 ==========
-    ErrorCode USER_CERTIFICATE_NOT_EXISTS = new ErrorCode(1_100_011_001, "人员证书不存在");
+    ErrorCode MDE_USER_CERTIFICATE_NOT_EXISTS = new ErrorCode(1_100_011_001, "人员证书不存在");
 
     // ========== 工作经历 1_100_012_000 ==========
-    ErrorCode WORK_EXP_NOT_EXISTS = new ErrorCode(1_100_012_001, "工作经历不存在");
+    ErrorCode MDE_WORK_EXP_NOT_EXISTS = new ErrorCode(1_100_012_001, "工作经历不存在");
 
     // ========== 人员技能 1_100_013_000 ==========
-    ErrorCode USER_SKILL_NOT_EXISTS = new ErrorCode(1_100_013_001, "人员技能不存在");
+    ErrorCode MDE_USER_SKILL_NOT_EXISTS = new ErrorCode(1_100_013_001, "人员技能不存在");
 
     // ========== 证书 1_100_014_000 ==========
-    ErrorCode CERTIFICATE_NOT_EXISTS = new ErrorCode(1_100_014_000, "证书不存在");
+    ErrorCode MDE_CERTIFICATE_NOT_EXISTS = new ErrorCode(1_100_014_000, "证书不存在");
 
     // ========== 门墩儿-用户登录 1_200_001_000 ==========
-    ErrorCode MDE_USER_NOT_EXISTS = new ErrorCode(1_200_001_001, "门墩儿-用户登录不存在");
+    ErrorCode MDE_USER_NOT_EXISTS = new ErrorCode(1_200_001_001, "用户不存在");
     ErrorCode MDE_USER_MOBILE_NOT_EXISTS = new ErrorCode(1_200_001_002, "手机号未注册用户");
     ErrorCode MDE_USER_MOBILE_USED = new ErrorCode(1_200_001_003, "修改手机失败，该手机号({})已经被使用");
 
+    ErrorCode MDE_USER_USERNAME_EXISTS = new ErrorCode(1_200_001_004, "用户账号已经存在");
+    ErrorCode MDE_USER_MOBILE_EXISTS = new ErrorCode(1_200_001_005, "手机号已经存在");
+    ErrorCode MDE_USER_EMAIL_EXISTS = new ErrorCode(1_200_001_006, "邮箱已经存在");
+    ErrorCode MDE_USER_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_200_001_008, "导入用户数据不能为空！");
+    ErrorCode MDE_USER_PASSWORD_FAILED = new ErrorCode(1_200_001_009, "用户密码校验失败");
+    ErrorCode MDE_USER_IS_DISABLE = new ErrorCode(1_200_001_010, "名字为【{}】的用户已被禁用");
+    ErrorCode MDE_USER_COUNT_MAX = new ErrorCode(1_200_001_011, "创建用户失败，原因：超过租户最大租户配额({})！");
+
     // ========== AUTH 模块 1_200_002_000 ==========
-    ErrorCode AUTH_LOGIN_BAD_CREDENTIALS = new ErrorCode(1_200_002_001, "登录失败，账号密码不正确");
-    ErrorCode AUTH_LOGIN_USER_DISABLED = new ErrorCode(1_200_002_002, "登录失败，账号被禁用");
-    ErrorCode AUTH_SOCIAL_USER_NOT_FOUND = new ErrorCode(1_200_002_003, "登录失败，解析不到三方登录信息");
-    ErrorCode AUTH_MOBILE_USED = new ErrorCode(1_200_002_004, "手机号已经被使用");
+    ErrorCode MDE_AUTH_LOGIN_BAD_CREDENTIALS = new ErrorCode(1_200_002_001, "登录失败，账号密码不正确");
+    ErrorCode MDE_AUTH_LOGIN_USER_DISABLED = new ErrorCode(1_200_002_002, "登录失败，账号被禁用");
+    ErrorCode MDE_AUTH_SOCIAL_USER_NOT_FOUND = new ErrorCode(1_200_002_003, "登录失败，解析不到三方登录信息");
+    ErrorCode MDE_AUTH_MOBILE_USED = new ErrorCode(1_200_002_004, "手机号已经被使用");
+
+    ErrorCode MDE_AUTH_LOGIN_CAPTCHA_CODE_ERROR = new ErrorCode(1_002_000_004, "验证码不正确，原因：{}");
+    ErrorCode MDE_AUTH_THIRD_LOGIN_NOT_BIND = new ErrorCode(1_002_000_005, "未绑定账号，需要进行绑定");
+    ErrorCode MDE_AUTH_TOKEN_EXPIRED = new ErrorCode(1_002_000_006, "Token 已经过期");
+    ErrorCode MDE_AUTH_MOBILE_NOT_EXISTS = new ErrorCode(1_002_000_007, "手机号不存在");
 
     // ========== 角色模块 1_200_003_000 ==========
     ErrorCode MDE_ROLE_NOT_EXISTS = new ErrorCode(1_200_003_001, "角色不存在");
@@ -72,20 +85,20 @@ public interface ErrorCodeConstants {
     ErrorCode MDE_ROLE_ADMIN_CODE_ERROR = new ErrorCode(1_200_003_005, "编码【{}】不能使用");
 
     // ========== 门墩儿-企业信息 1_200_004_000 ==========
-    ErrorCode ENTERPRISE_NOT_EXISTS = new ErrorCode(1_200_004_001, "门墩儿-企业信息不存在");
+    ErrorCode MDE_ENTERPRISE_NOT_EXISTS = new ErrorCode(1_200_004_001, "门墩儿-企业信息不存在");
 
     // ========== 门墩儿-企业工商信息  1_200_005_001 ==========
-    ErrorCode ENTERPRISE_BUSINESS_NOT_EXISTS = new ErrorCode(1_200_005_001, "门墩儿-企业工商信息不存在");
+    ErrorCode MDE_ENTERPRISE_BUSINESS_NOT_EXISTS = new ErrorCode(1_200_005_001, "门墩儿-企业工商信息不存在");
 
     // ========== 门墩儿-企业注册申请 1_200_006_000 ==========
-    ErrorCode ENTERPRISE_REGISTER_NOT_EXISTS = new ErrorCode(1_200_006_001, "门墩儿-企业注册申请不存在");
+    ErrorCode MDE_ENTERPRISE_REGISTER_NOT_EXISTS = new ErrorCode(1_200_006_001, "门墩儿-企业注册申请不存在");
 
     // ========== 门墩儿-企业地址 1_200_007_001 ==========
-    ErrorCode ENTERPRISE_ADDRESS_NOT_EXISTS = new ErrorCode(1_200_007_001, "门墩儿-企业地址不存在");
+    ErrorCode MDE_ENTERPRISE_ADDRESS_NOT_EXISTS = new ErrorCode(1_200_007_001, "门墩儿-企业地址不存在");
 
     // ========== 门墩儿-企业登录用户 1_200_008_000 ==========
-    ErrorCode ENTERPRISE_USER_BIND_NOT_EXISTS = new ErrorCode(1_200_008_001, "门墩儿-企业登录用户不存在");
+    ErrorCode MDE_ENTERPRISE_USER_BIND_NOT_EXISTS = new ErrorCode(1_200_008_001, "门墩儿-企业登录用户不存在");
 
     // ========== 门墩儿-招聘职位 1_200_010_000 ==========
-    ErrorCode JOB_ADVERTISED_NOT_EXISTS = new ErrorCode(1_200_010_001, "门墩儿-招聘职位不存在");
+    ErrorCode MDE_JOB_ADVERTISED_NOT_EXISTS = new ErrorCode(1_200_010_001, "门墩儿-招聘职位不存在");
 }

menduner/menduner-system-biz/pom.xml

@@ -52,6 +52,11 @@
             <artifactId>citu-spring-boot-starter-biz-tenant</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.xingyuv</groupId>
+            <artifactId>spring-boot-starter-captcha-plus</artifactId> <!-- 验证码，一般用于登录使用 -->
+        </dependency>
+
         <!-- Web 相关 -->
         <dependency>
             <groupId>com.citu</groupId>

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/auth/vo/MdeAuthLoginReqVO.java

@@ -31,6 +31,14 @@ public class MdeAuthLoginReqVO {
     @Length(min = 4, max = 16, message = "密码长度为 4-16 位")
     private String password;
 
+
+    // ========== 图片验证码相关 ==========
+
+    @Schema(description = "验证码，验证码开启时，需要传递", requiredMode = Schema.RequiredMode.REQUIRED,
+            example = "PfcH6mgr8tpXuMWFjvW6YVaqrswIuwmWI5dsVZSg7sGpWtDCUbHuDEXl3cFB1+VvCC/rAkSwK8Fad52FSuncVg==")
+    @NotEmpty(message = "验证码不能为空", groups = CodeEnableGroup.class)
+    private String captchaVerification;
+
     // ========== 绑定社交登录时，需要传递如下参数 ==========
 
     @Schema(description = "社交平台的类型，参见 SocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
@@ -53,4 +61,12 @@ public class MdeAuthLoginReqVO {
         return socialType == null || StrUtil.isNotEmpty(socialState);
     }
 
+
+    /**
+     * 开启验证码的 Group
+     */
+    public interface CodeEnableGroup {}
+
+
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/permission/MdePermissionController.java

@@ -33,7 +33,7 @@ public class MdePermissionController {
 
     @PostMapping("/assign-role-data-scope")
     @Operation(summary = "赋予角色数据权限")
-    @PreAuthorize("@ss.hasPermission('system:permission:assign-role-data-scope')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:permission:assign-role-data-scope')")
     public CommonResult<Boolean> assignRoleDataScope(@Valid @RequestBody MdePermissionAssignRoleDataScopeReqVO reqVO) {
         permissionService.assignRoleDataScope(reqVO.getRoleId(), reqVO.getDataScope(), reqVO.getDataScopeDeptIds());
         return success(true);
@@ -42,14 +42,14 @@ public class MdePermissionController {
     @Operation(summary = "获得管理员拥有的角色编号列表")
     @Parameter(name = "userId", description = "用户编号", required = true)
     @GetMapping("/list-user-roles")
-    @PreAuthorize("@ss.hasPermission('system:permission:assign-user-role')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:permission:assign-user-role')")
     public CommonResult<Set<Long>> listAdminRoles(@RequestParam("userId") Long userId) {
         return success(permissionService.getUserRoleIdListByUserId(userId));
     }
 
     @Operation(summary = "赋予用户角色")
     @PostMapping("/assign-user-role")
-    @PreAuthorize("@ss.hasPermission('system:permission:assign-user-role')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:permission:assign-user-role')")
     public CommonResult<Boolean> assignUserRole(@Validated @RequestBody MdePermissionAssignUserRoleReqVO reqVO) {
         permissionService.assignUserRole(reqVO.getUserId(), reqVO.getRoleIds());
         return success(true);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/permission/MdeRoleController.java

@@ -41,14 +41,14 @@ public class MdeRoleController {
 
     @PostMapping("/create")
     @Operation(summary = "创建角色")
-    @PreAuthorize("@ss.hasPermission('system:mde-role:create')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:mde-role:create')")
     public CommonResult<Long> createRole(@Valid @RequestBody MdeRoleSaveReqVO createReqVO) {
         return success(roleService.createRole(createReqVO, null));
     }
 
     @PutMapping("/update")
     @Operation(summary = "修改角色")
-    @PreAuthorize("@ss.hasPermission('system:mde-role:update')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:mde-role:update')")
     public CommonResult<Boolean> updateRole(@Valid @RequestBody MdeRoleSaveReqVO updateReqVO) {
         roleService.updateRole(updateReqVO);
         return success(true);
@@ -57,7 +57,7 @@ public class MdeRoleController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除角色")
     @Parameter(name = "id", description = "角色编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('system:mde-role:delete')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:mde-role:delete')")
     public CommonResult<Boolean> deleteRole(@RequestParam("id") Long id) {
         roleService.deleteRole(id);
         return success(true);
@@ -65,7 +65,7 @@ public class MdeRoleController {
 
     @GetMapping("/get")
     @Operation(summary = "获得角色信息")
-    @PreAuthorize("@ss.hasPermission('system:mde-role:query')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:mde-role:query')")
     public CommonResult<MdeRoleRespVO> getRole(@RequestParam("id") Long id) {
         MdeRoleDO role = roleService.getRole(id);
         return success(BeanUtils.toBean(role, MdeRoleRespVO.class));
@@ -73,7 +73,7 @@ public class MdeRoleController {
 
     @GetMapping("/page")
     @Operation(summary = "获得角色分页")
-    @PreAuthorize("@ss.hasPermission('system:mde-role:query')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:mde-role:query')")
     public CommonResult<PageResult<MdeRoleRespVO>> getRolePage(MdeRolePageReqVO pageReqVO) {
         PageResult<MdeRoleDO> pageResult = roleService.getRolePage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, MdeRoleRespVO.class));
@@ -90,7 +90,7 @@ public class MdeRoleController {
     @GetMapping("/export-excel")
     @Operation(summary = "导出角色 Excel")
     @ApiAccessLog(operateType = EXPORT)
-    @PreAuthorize("@ss.hasPermission('system:mde-role:export')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:mde-role:export')")
     public void export(HttpServletResponse response, @Validated MdeRolePageReqVO exportReqVO) throws IOException {
         exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<MdeRoleDO> list = roleService.getRolePage(exportReqVO).getList();

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/user/MdeUserMapper.java

@@ -30,4 +30,12 @@ public interface MdeUserMapper extends BaseMapperX<MdeUserDO> {
                 .orderByDesc(MdeUserDO::getId));
     }
 
+    default MdeUserDO selectByEmail(String email) {
+        return selectOne(MdeUserDO::getEmail, email);
+    }
+
+    default MdeUserDO selectByUsername(String username) {
+        return selectOne(MdeUserDO::getUsername, username);
+    }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/area/AreaServiceImpl.java

@@ -14,7 +14,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.AREA_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_AREA_NOT_EXISTS;
 
 /**
  * 地区 Service 实现类
@@ -56,7 +56,7 @@ public class AreaServiceImpl implements AreaService {
 
     private void validateAreaExists(Long id) {
         if (areaMapper.selectById(id) == null) {
-            throw exception(AREA_NOT_EXISTS);
+            throw exception(MDE_AREA_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/auth/MdeAuthServiceImpl.java

@@ -7,6 +7,7 @@ import com.citu.framework.common.enums.TerminalEnum;
 import com.citu.framework.common.enums.UserTypeEnum;
 import com.citu.framework.common.util.monitor.TracerUtils;
 import com.citu.framework.common.util.servlet.ServletUtils;
+import com.citu.framework.common.util.validation.ValidationUtils;
 import com.citu.module.menduner.system.controller.admin.auth.vo.*;
 import com.citu.module.menduner.system.convert.MdeAuthConvert;
 import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
@@ -27,18 +28,23 @@ import com.citu.module.system.enums.logger.LoginResultEnum;
 import com.citu.module.system.enums.oauth2.OAuth2ClientConstants;
 import com.citu.module.system.enums.sms.SmsSceneEnum;
 import com.citu.module.system.enums.social.SocialTypeEnum;
+import com.google.common.annotations.VisibleForTesting;
+import com.xingyuv.captcha.model.common.ResponseModel;
+import com.xingyuv.captcha.model.vo.CaptchaVO;
+import com.xingyuv.captcha.service.CaptchaService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.validation.Validator;
 import java.util.Objects;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.framework.common.util.servlet.ServletUtils.getClientIP;
 import static com.citu.framework.web.core.util.WebFrameworkUtils.getTerminal;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
-import static com.citu.module.system.enums.ErrorCodeConstants.USER_NOT_EXISTS;
 
 /**
  * menduner的认证 Service 接口 实现
@@ -62,8 +68,40 @@ public class MdeAuthServiceImpl implements MdeAuthService {
     @Resource
     private OAuth2TokenApi oauth2TokenApi;
 
+    /**
+     * 验证码的开关，默认为 true
+     */
+    @Value("${citu.captcha.enable:true}")
+    private Boolean captchaEnable;
+    @Resource
+    private Validator validator;
+
+    @Resource
+    private CaptchaService captchaService;
+
+    @VisibleForTesting
+    void validateCaptcha(MdeAuthLoginReqVO reqVO) {
+        // 如果验证码关闭，则不进行校验
+        if (!captchaEnable) {
+            return;
+        }
+        // 校验验证码
+        ValidationUtils.validate(validator, reqVO, MdeAuthLoginReqVO.CodeEnableGroup.class);
+        CaptchaVO captchaVO = new CaptchaVO();
+        captchaVO.setCaptchaVerification(reqVO.getCaptchaVerification());
+        ResponseModel response = captchaService.verification(captchaVO);
+        // 验证不通过
+        if (!response.isSuccess()) {
+            // 创建登录失败日志（验证码不正确)
+            createLoginLog(null, reqVO.getPhone(), LoginLogTypeEnum.LOGIN_USERNAME, LoginResultEnum.CAPTCHA_CODE_ERROR);
+            throw exception(MDE_AUTH_LOGIN_CAPTCHA_CODE_ERROR, response.getRepMsg());
+        }
+    }
+
     @Override
     public MdeAuthLoginRespVO login(MdeAuthLoginReqVO reqVO) {
+        // 校验验证码
+        validateCaptcha(reqVO);
         // 使用手机 + 密码，进行登录。
         MdeUserDO user = check(reqVO.getPhone(), reqVO.getPassword());
 
@@ -84,16 +122,16 @@ public class MdeAuthServiceImpl implements MdeAuthService {
         MdeUserDO user = userService.getUserByPhone(mobile);
         if (user == null) {
             createLoginLog(null, mobile, logTypeEnum, LoginResultEnum.BAD_CREDENTIALS);
-            throw exception(AUTH_LOGIN_BAD_CREDENTIALS);
+            throw exception(MDE_AUTH_LOGIN_BAD_CREDENTIALS);
         }
         if (!userService.isPasswordMatch(password, user.getPassword())) {
             createLoginLog(user.getId(), mobile, logTypeEnum, LoginResultEnum.BAD_CREDENTIALS);
-            throw exception(AUTH_LOGIN_BAD_CREDENTIALS);
+            throw exception(MDE_AUTH_LOGIN_BAD_CREDENTIALS);
         }
         // 校验是否禁用
         if (ObjectUtil.notEqual(user.getStatus(), CommonStatusEnum.ENABLE.getStatus())) {
             createLoginLog(user.getId(), mobile, logTypeEnum, LoginResultEnum.USER_DISABLED);
-            throw exception(AUTH_LOGIN_USER_DISABLED);
+            throw exception(MDE_AUTH_LOGIN_USER_DISABLED);
         }
         return user;
     }
@@ -151,7 +189,7 @@ public class MdeAuthServiceImpl implements MdeAuthService {
         SocialUserRespDTO socialUser = socialUserApi.getSocialUserByCode(UserTypeEnum.MEMBER.getValue(), reqVO.getType(),
                 reqVO.getCode(), reqVO.getState()).getCheckedData();
         if (socialUser == null) {
-            throw exception(AUTH_SOCIAL_USER_NOT_FOUND);
+            throw exception(MDE_AUTH_SOCIAL_USER_NOT_FOUND);
         }
 
         // 情况一：已绑定，直接读取用户信息
@@ -165,7 +203,7 @@ public class MdeAuthServiceImpl implements MdeAuthService {
                     reqVO.getType(), reqVO.getCode(), reqVO.getState()));
         }
         if (user == null) {
-            throw exception(USER_NOT_EXISTS);
+            throw exception(MDE_USER_NOT_EXISTS);
         }
 
         // 创建 Token 令牌，记录登录日志
@@ -204,7 +242,7 @@ public class MdeAuthServiceImpl implements MdeAuthService {
         if (Objects.equals(reqVO.getScene(), SmsSceneEnum.MEMBER_UPDATE_MOBILE.getScene())) {
             MdeUserDO user = userService.getUserByPhone(reqVO.getPhone());
             if (user != null && !Objects.equals(user.getId(), userId)) {
-                throw exception(AUTH_MOBILE_USED);
+                throw exception(MDE_AUTH_MOBILE_USED);
             }
         }
         // 情况 2：如果是重置密码场景，需要校验手机号是存在的

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/certificate/CertificateServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.CERTIFICATE_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_CERTIFICATE_NOT_EXISTS;
 
 /**
  * 证书 Service 实现类
@@ -54,7 +54,7 @@ public class CertificateServiceImpl implements CertificateService {
 
     private void validateCertificateExists(Long id) {
         if (certificateMapper.selectById(id) == null) {
-            throw exception(CERTIFICATE_NOT_EXISTS);
+            throw exception(MDE_CERTIFICATE_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/cvattachment/CvAttachmentServiceImpl.java

@@ -13,7 +13,7 @@ import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.dal.mysql.cvattachment.CvAttachmentMapper;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.CV_ATTACHMENT_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_CV_ATTACHMENT_NOT_EXISTS;
 
 /**
  * 简历附件 Service 实现类
@@ -55,7 +55,7 @@ public class CvAttachmentServiceImpl implements CvAttachmentService {
 
     private void validateCvAttachmentExists(Long id) {
         if (cvAttachmentMapper.selectById(id) == null) {
-            throw exception(CV_ATTACHMENT_NOT_EXISTS);
+            throw exception(MDE_CV_ATTACHMENT_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/eduexp/EduExpServiceImpl.java

@@ -13,7 +13,7 @@ import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.dal.mysql.eduexp.EduExpMapper;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.EDU_EXP_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_EDU_EXP_NOT_EXISTS;
 
 /**
  * 教育经历 Service 实现类
@@ -55,7 +55,7 @@ public class EduExpServiceImpl implements EduExpService {
 
     private void validateEduExpExists(Long id) {
         if (eduExpMapper.selectById(id) == null) {
-            throw exception(EDU_EXP_NOT_EXISTS);
+            throw exception(MDE_EDU_EXP_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseAddressServiceImpl.java

@@ -13,7 +13,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.ENTERPRISE_ADDRESS_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_ENTERPRISE_ADDRESS_NOT_EXISTS;
 
 /**
  * 门墩儿-企业地址 Service 实现类
@@ -55,7 +55,7 @@ public class EnterpriseAddressServiceImpl implements EnterpriseAddressService {
 
     private void validateEnterpriseAddressExists(Long id) {
         if (enterpriseAddressMapper.selectById(id) == null) {
-            throw exception(ENTERPRISE_ADDRESS_NOT_EXISTS);
+            throw exception(MDE_ENTERPRISE_ADDRESS_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseBusinessServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.ENTERPRISE_BUSINESS_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_ENTERPRISE_BUSINESS_NOT_EXISTS;
 
 /**
  * 门墩儿-企业工商信息 Service 实现类
@@ -54,7 +54,7 @@ public class EnterpriseBusinessServiceImpl implements EnterpriseBusinessService
 
     private void validateEnterpriseBusinessExists(Long id) {
         if (enterpriseBusinessMapper.selectById(id) == null) {
-            throw exception(ENTERPRISE_BUSINESS_NOT_EXISTS);
+            throw exception(MDE_ENTERPRISE_BUSINESS_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseRegisterServiceImpl.java

@@ -56,7 +56,7 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
 
     private void validateEnterpriseRegisterExists(Long id) {
         if (enterpriseRegisterMapper.selectById(id) == null) {
-            throw exception(ENTERPRISE_REGISTER_NOT_EXISTS);
+            throw exception(MDE_ENTERPRISE_REGISTER_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.framework.common.util.collection.CollectionUtils.convertSet;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.ENTERPRISE_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_ENTERPRISE_NOT_EXISTS;
 
 /**
  * 门墩儿-企业信息 Service 实现类
@@ -62,7 +62,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 
     private void validateEnterpriseExists(Long id) {
         if (enterpriseMapper.selectById(id) == null) {
-            throw exception(ENTERPRISE_NOT_EXISTS);
+            throw exception(MDE_ENTERPRISE_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseUserBindServiceImpl.java

@@ -13,7 +13,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.ENTERPRISE_USER_BIND_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_ENTERPRISE_USER_BIND_NOT_EXISTS;
 
 /**
  * 门墩儿-企业登录用户 Service 实现类
@@ -55,7 +55,7 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
 
     private void validateEnterpriseUserBindExists(Long id) {
         if (enterpriseUserBindMapper.selectById(id) == null) {
-            throw exception(ENTERPRISE_USER_BIND_NOT_EXISTS);
+            throw exception(MDE_ENTERPRISE_USER_BIND_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/industry/IndustryServiceImpl.java

@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.INDUSTRY_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_INDUSTRY_NOT_EXISTS;
 
 
 /**
@@ -67,7 +67,7 @@ public class IndustryServiceImpl implements IndustryService {
 
     private void validateIndustryExists(Long id) {
         if (industryMapper.selectById(id) == null) {
-            throw exception(INDUSTRY_NOT_EXISTS);
+            throw exception(MDE_INDUSTRY_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedServiceImpl.java

@@ -13,7 +13,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.JOB_ADVERTISED_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_JOB_ADVERTISED_NOT_EXISTS;
 
 /**
  * 门墩儿-招聘职位 Service 实现类
@@ -55,7 +55,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
 
     private void validateJobAdvertisedExists(Long id) {
         if (jobAdvertisedMapper.selectById(id) == null) {
-            throw exception(JOB_ADVERTISED_NOT_EXISTS);
+            throw exception(MDE_JOB_ADVERTISED_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobInterestedServiceImpl.java

@@ -13,7 +13,7 @@ import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.dal.mysql.job.JobInterestedMapper;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.JOB_INTERESTED_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_JOB_INTERESTED_NOT_EXISTS;
 
 /**
  * 求职意向 Service 实现类
@@ -55,7 +55,7 @@ public class JobInterestedServiceImpl implements JobInterestedService {
 
     private void validateJobInterestedExists(Long id) {
         if (jobInterestedMapper.selectById(id) == null) {
-            throw exception(JOB_INTERESTED_NOT_EXISTS);
+            throw exception(MDE_JOB_INTERESTED_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/major/MajorServiceImpl.java

@@ -13,7 +13,7 @@ import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.dal.mysql.major.MajorMapper;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MAJOR_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_MAJOR_NOT_EXISTS;
 
 /**
  * 专业 Service 实现类
@@ -55,7 +55,7 @@ public class MajorServiceImpl implements MajorService {
 
     private void validateMajorExists(Long id) {
         if (majorMapper.selectById(id) == null) {
-            throw exception(MAJOR_NOT_EXISTS);
+            throw exception(MDE_MAJOR_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/people/PeopleCertificateServiceImpl.java

@@ -13,7 +13,7 @@ import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.dal.mysql.people.PeopleCertificateMapper;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.USER_CERTIFICATE_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_USER_CERTIFICATE_NOT_EXISTS;
 
 /**
  * 人员证书 Service 实现类
@@ -55,7 +55,7 @@ public class PeopleCertificateServiceImpl implements PeopleCertificateService {
 
     private void validateUserCertificateExists(Long id) {
         if (peopleCertificateMapper.selectById(id) == null) {
-            throw exception(USER_CERTIFICATE_NOT_EXISTS);
+            throw exception(MDE_USER_CERTIFICATE_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/people/PeopleInfoServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.USER_INFO_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_USER_INFO_NOT_EXISTS;
 
 /**
  * 人员信息-个人档案 Service 实现类
@@ -54,7 +54,7 @@ public class PeopleInfoServiceImpl implements PeopleInfoService {
 
     private void validateUserInfoExists(Long id) {
         if (peopleInfoMapper.selectById(id) == null) {
-            throw exception(USER_INFO_NOT_EXISTS);
+            throw exception(MDE_USER_INFO_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/people/PeopleSkillServiceImpl.java

@@ -13,7 +13,7 @@ import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.dal.mysql.people.PeopleSkillMapper;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.USER_SKILL_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_USER_SKILL_NOT_EXISTS;
 
 /**
  * 人员技能 Service 实现类
@@ -55,7 +55,7 @@ public class PeopleSkillServiceImpl implements PeopleSkillService {
 
     private void validateUserSkillExists(Long id) {
         if (peopleSkillMapper.selectById(id) == null) {
-            throw exception(USER_SKILL_NOT_EXISTS);
+            throw exception(MDE_USER_SKILL_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/permission/MdePermissionService.java

@@ -46,6 +46,13 @@ public interface MdePermissionService {
      */
     void assignUserRole(Long userId, Set<Long> roleIds);
 
+    /**
+     * 设置用户默认角色
+     *
+     * @param userId  角色编号
+     */
+    void assignUserRoleByDefault(Long userId);
+
     /**
      * 处理用户删除时，删除关联授权数据
      *

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/permission/MdePermissionServiceImpl.java

@@ -53,9 +53,6 @@ public class MdePermissionServiceImpl implements MdePermissionService {
     @Resource
     private MdeRoleService mdeRoleService;
 
-    @Resource
-    private MdeRoleService roleService;
-
     @Resource
     private MdeUserService userService;
 
@@ -104,7 +101,7 @@ public class MdePermissionServiceImpl implements MdePermissionService {
         // 获得用户拥有的角色编号
         Set<Long> roleIds = getSelf().getUserRoleIdListByUserIdFromCache(userId);
         // 获得角色数组，并移除被禁用的
-        List<MdeRoleDO> roles = roleService.getRoleListFromCache(roleIds);
+        List<MdeRoleDO> roles = mdeRoleService.getRoleListFromCache(roleIds);
         roles.removeIf(role -> !CommonStatusEnum.ENABLE.getStatus().equals(role.getStatus()));
         return roles;
     }
@@ -152,6 +149,17 @@ public class MdePermissionServiceImpl implements MdePermissionService {
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void assignUserRoleByDefault(Long userId) {
+        // 获得默认角色信息
+        MdeRoleDO role = mdeRoleService.getRoleByDefault();
+        MdeUserRoleDO entity = new MdeUserRoleDO();
+        entity.setUserId(userId);
+        entity.setRoleId(role.getId());
+        mdeUserRoleMapper.insert(entity);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Caching(evict = {
@@ -187,7 +195,7 @@ public class MdePermissionServiceImpl implements MdePermissionService {
 
     @Override
     public void assignRoleDataScope(Long roleId, Integer dataScope, Set<Long> dataScopeDataIds) {
-        roleService.updateRoleDataScope(roleId, dataScope, dataScopeDataIds);
+        mdeRoleService.updateRoleDataScope(roleId, dataScope, dataScopeDataIds);
     }
 
     @Override
@@ -253,4 +261,6 @@ public class MdePermissionServiceImpl implements MdePermissionService {
         }
         return result;
     }
+
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/permission/MdeRoleService.java

@@ -58,6 +58,12 @@ public interface MdeRoleService {
      */
     MdeRoleDO getRole(Long id);
 
+    /**
+     * 获得默认角色
+     * @return 角色
+     */
+    MdeRoleDO getRoleByDefault();
+
     /**
      * 获得角色，从缓存中
      *

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/permission/MdeRoleServiceImpl.java

@@ -14,6 +14,7 @@ import com.citu.module.menduner.system.dal.dataobject.permission.MdeRoleDO;
 import com.citu.module.menduner.system.dal.mysql.permission.MdeRoleMapper;
 import com.citu.module.menduner.system.dal.mysql.permission.MdeUserRoleMapper;
 import com.citu.module.menduner.system.dal.redis.RedisKeyConstants;
+import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.enums.permission.MdeRoleCodeEnum;
 import com.citu.module.system.enums.permission.DataScopeEnum;
 import com.citu.module.system.enums.permission.RoleTypeEnum;
@@ -88,7 +89,7 @@ public class MdeRoleServiceImpl implements MdeRoleService {
         roleMapper.updateById(updateObj);
 
         // 3. 记录操作日志上下文
-        LogRecordContext.putVariable("role", role);
+        LogRecordContext.putVariable("mde-role", role);
     }
 
     @Override
@@ -120,7 +121,7 @@ public class MdeRoleServiceImpl implements MdeRoleService {
         permissionService.processRoleDeleted(id);
 
         // 3. 记录操作日志上下文
-        LogRecordContext.putVariable("role", role);
+        LogRecordContext.putVariable("mde-role", role);
     }
 
     /**
@@ -178,6 +179,15 @@ public class MdeRoleServiceImpl implements MdeRoleService {
         return roleMapper.selectById(id);
     }
 
+    @Override
+    public MdeRoleDO getRoleByDefault() {
+        MdeRoleDO role = roleMapper.selectOne(MdeRoleDO::getCode,"menduner_default_role",MdeRoleDO::getStatus, MendunerStatusEnum.NORMAL.getType());
+        if (role == null) {
+            throw exception(MDE_ROLE_NOT_EXISTS);
+        }
+        return role;
+    }
+
     @Override
     @Cacheable(value = RedisKeyConstants.MDE_ROLE, key = "#id",
             unless = "#result == null")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/position/PositionServiceImpl.java

@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.POSITION_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_POSITION_NOT_EXISTS;
 
 /**
  * 职位信息 Service 实现类
@@ -94,7 +94,7 @@ public class PositionServiceImpl implements PositionService {
 
     private void validatePositionExists(Long id) {
         if (positionMapper.selectById(id) == null) {
-            throw exception(POSITION_NOT_EXISTS);
+            throw exception(MDE_POSITION_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/positiontag/PositionTagServiceImpl.java

@@ -13,7 +13,7 @@ import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.dal.mysql.positiontag.PositionTagMapper;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.POSITION_TAG_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_POSITION_TAG_NOT_EXISTS;
 
 /**
  * 职位标签 Service 实现类
@@ -55,7 +55,7 @@ public class PositionTagServiceImpl implements PositionTagService {
 
     private void validatePositionTagExists(Long id) {
         if (positionTagMapper.selectById(id) == null) {
-            throw exception(POSITION_TAG_NOT_EXISTS);
+            throw exception(MDE_POSITION_TAG_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/school/SchoolServiceImpl.java

@@ -23,7 +23,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.SCHOOL_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_SCHOOL_NOT_EXISTS;
 
 /**
  * 学校 Service 实现类
@@ -70,7 +70,7 @@ public class SchoolServiceImpl implements SchoolService {
 
     private void validateSchoolExists(Long id) {
         if (schoolMapper.selectById(id) == null) {
-            throw exception(SCHOOL_NOT_EXISTS);
+            throw exception(MDE_SCHOOL_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/user/MdeUserServiceImpl.java

@@ -9,16 +9,23 @@ import com.citu.framework.common.enums.TerminalEnum;
 import com.citu.framework.common.enums.UserTypeEnum;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.framework.datapermission.core.util.DataPermissionUtils;
 import com.citu.module.menduner.system.controller.admin.user.vo.*;
 import com.citu.module.menduner.system.convert.MdeAuthConvert;
 import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
 import com.citu.module.menduner.system.dal.mysql.user.MdeUserMapper;
+import com.citu.module.menduner.system.service.permission.MdePermissionService;
+import com.citu.module.menduner.system.service.permission.MdePermissionServiceImpl;
 import com.citu.module.system.api.sms.SmsCodeApi;
 import com.citu.module.system.api.sms.dto.code.SmsCodeUseReqDTO;
 import com.citu.module.system.api.social.SocialClientApi;
 import com.citu.module.system.api.social.dto.SocialWxPhoneNumberInfoRespDTO;
 import com.citu.module.system.enums.sms.SmsSceneEnum;
 import com.google.common.annotations.VisibleForTesting;
+import com.mzt.logapi.context.LogRecordContext;
+import com.mzt.logapi.service.impl.DiffParseFunction;
+import com.mzt.logapi.starter.annotation.LogRecord;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +37,8 @@ import java.time.LocalDateTime;
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.framework.common.util.servlet.ServletUtils.getClientIP;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
+import static com.citu.module.menduner.system.enums.MdeLogRecordConstants.*;
+import static com.citu.module.system.enums.ErrorCodeConstants.USER_USERNAME_EXISTS;
 
 /**
  * 门墩儿-用户登录 Service 实现类
@@ -43,6 +52,9 @@ public class MdeUserServiceImpl implements MdeUserService {
     @Resource
     private MdeUserMapper mdeUserMapper;
 
+    @Resource
+    private MdePermissionService mdePermissionService;
+
     @Resource
     private PasswordEncoder passwordEncoder;
 
@@ -52,39 +64,123 @@ public class MdeUserServiceImpl implements MdeUserService {
     @Resource
     private SocialClientApi socialClientApi;
 
+
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @LogRecord(type = MDE_USER_TYPE, subType = MDE_USER_CREATE_SUB_TYPE, bizNo = "{{#user.id}}",
+            success = MDE_USER_CREATE_SUCCESS)
     public Long createMdeUser(MdeUserSaveReqVO createReqVO) {
-        // 插入
-        MdeUserDO mdeUser = BeanUtils.toBean(createReqVO, MdeUserDO.class);
-        mdeUserMapper.insert(mdeUser);
-        // 返回
-        return mdeUser.getId();
+        // 1.2 校验正确性
+        validateUserForCreateOrUpdate(null, createReqVO.getUsername(),
+                createReqVO.getPhone(), createReqVO.getEmail());
+        // 2.1 插入用户
+        MdeUserDO user = BeanUtils.toBean(createReqVO, MdeUserDO.class);
+        user.setStatus(CommonStatusEnum.ENABLE.getStatus()); // 默认开启
+        user.setPassword(encodePassword(createReqVO.getPassword())); // 加密密码
+        mdeUserMapper.insert(user);
+        // 2.2 绑定默认角色
+        mdePermissionService.assignUserRoleByDefault(user.getId());
+        // 3. 记录操作日志上下文
+        LogRecordContext.putVariable("mde-user", user);
+        return user.getId();
+    }
+
+    private MdeUserDO validateUserForCreateOrUpdate(Long id, String username, String mobile, String email) {
+        // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
+        return DataPermissionUtils.executeIgnore(() -> {
+            // 校验用户存在
+            MdeUserDO user = validateUserExists(id);
+            // 校验用户名唯一
+            validateUsernameUnique(id, username);
+            // 校验手机号唯一
+            validatePhoneUnique(id, mobile);
+            // 校验邮箱唯一
+            validateEmailUnique(id, email);
+            return user;
+        });
+    }
+
+    @VisibleForTesting
+    void validateEmailUnique(Long id, String email) {
+        if (StrUtil.isBlank(email)) {
+            return;
+        }
+        MdeUserDO user = mdeUserMapper.selectByEmail(email);
+        if (user == null) {
+            return;
+        }
+        // 如果 id 为空，说明不用比较是否为相同 id 的用户
+        if (id == null) {
+            throw exception(MDE_USER_EMAIL_EXISTS);
+        }
+        if (!user.getId().equals(id)) {
+            throw exception(MDE_USER_EMAIL_EXISTS);
+        }
+    }
+
+    @VisibleForTesting
+    void validateUsernameUnique(Long id, String username) {
+        if (StrUtil.isBlank(username)) {
+            return;
+        }
+        MdeUserDO user = mdeUserMapper.selectByUsername(username);
+        if (user == null) {
+            return;
+        }
+        // 如果 id 为空，说明不用比较是否为相同 id 的用户
+        if (id == null) {
+            throw exception(USER_USERNAME_EXISTS);
+        }
+        if (!user.getId().equals(id)) {
+            throw exception(USER_USERNAME_EXISTS);
+        }
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @LogRecord(type = MDE_USER_TYPE, subType = MDE_USER_UPDATE_SUB_TYPE, bizNo = "{{#updateReqVO.id}}",
+            success = MDE_USER_UPDATE_SUCCESS)
     public void updateMdeUser(MdeUserSaveReqVO updateReqVO) {
-        // 校验存在
-        validateMdeUserExists(updateReqVO.getId());
-        // 更新
+        updateReqVO.setPassword(null); // 特殊：此处不更新密码
+        // 1. 校验正确性
+        MdeUserDO oldUser = validateUserForCreateOrUpdate(updateReqVO.getId(), updateReqVO.getUsername(),
+                updateReqVO.getPhone(), updateReqVO.getEmail());
+
+        // 2.1 更新用户
         MdeUserDO updateObj = BeanUtils.toBean(updateReqVO, MdeUserDO.class);
         mdeUserMapper.updateById(updateObj);
+
+        // 3. 记录操作日志上下文
+        LogRecordContext.putVariable(DiffParseFunction.OLD_OBJECT, BeanUtils.toBean(oldUser, MdeUserSaveReqVO.class));
+        LogRecordContext.putVariable("user", oldUser);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @LogRecord(type = MDE_USER_TYPE, subType = MDE_USER_DELETE_SUB_TYPE, bizNo = "{{#id}}",
+            success = MDE_USER_DELETE_SUCCESS)
     public void deleteMdeUser(Long id) {
         // 校验存在
-        validateMdeUserExists(id);
+        MdeUserDO user = validateMdeUserExists(id);
+        // 2.2 删除用户关联数据
+        mdePermissionService.processUserDeleted(id);
         // 删除
         mdeUserMapper.deleteById(id);
+
+        // 3. 记录操作日志上下文
+        LogRecordContext.putVariable("mde-user", user);
     }
 
-    private void validateMdeUserExists(Long id) {
-        if (mdeUserMapper.selectById(id) == null) {
+    @VisibleForTesting
+    private MdeUserDO validateMdeUserExists(Long id) {
+        if (id == null) {
+            return null;
+        }
+        MdeUserDO user = mdeUserMapper.selectById(id);
+        if (user == null) {
             throw exception(MDE_USER_NOT_EXISTS);
         }
+        return user;
     }
 
     @Override
@@ -143,7 +239,8 @@ public class MdeUserServiceImpl implements MdeUserService {
         user.setAvatar(avtar); // 基础信息
 
         mdeUserMapper.insert(user);
-
+        // 绑定默认角色
+        mdePermissionService.assignUserRoleByDefault(user.getId());
         return user;
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/workexp/WorkExpServiceImpl.java

@@ -13,7 +13,7 @@ import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.dal.mysql.workexp.WorkExpMapper;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.WORK_EXP_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_WORK_EXP_NOT_EXISTS;
 
 /**
  * 工作经历 Service 实现类
@@ -55,7 +55,7 @@ public class WorkExpServiceImpl implements WorkExpService {
 
     private void validateWorkExpExists(Long id) {
         if (workExpMapper.selectById(id) == null) {
-            throw exception(WORK_EXP_NOT_EXISTS);
+            throw exception(MDE_WORK_EXP_NOT_EXISTS);
         }
     }
 

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/area/AreaServiceImplTest.java

@@ -19,7 +19,7 @@ import static com.citu.framework.test.core.util.AssertUtils.*;
 import static com.citu.framework.test.core.util.RandomUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.*;
 import static com.citu.framework.common.util.object.ObjectUtils.*;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.AREA_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_AREA_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -73,7 +73,7 @@ public class AreaServiceImplTest extends BaseDbUnitTest {
         AreaSaveReqVO updateReqVO = randomPojo(AreaSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> areaService.updateArea(updateReqVO), AREA_NOT_EXISTS);
+        assertServiceException(() -> areaService.updateArea(updateReqVO), MDE_AREA_NOT_EXISTS);
     }
 
     @Test
@@ -96,7 +96,7 @@ public class AreaServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> areaService.deleteArea(id), AREA_NOT_EXISTS);
+        assertServiceException(() -> areaService.deleteArea(id), MDE_AREA_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/certificate/CertificateServiceImplTest.java

@@ -19,7 +19,7 @@ import static com.citu.framework.test.core.util.AssertUtils.*;
 import static com.citu.framework.test.core.util.RandomUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.*;
 import static com.citu.framework.common.util.object.ObjectUtils.*;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.CERTIFICATE_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_CERTIFICATE_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -73,7 +73,7 @@ public class CertificateServiceImplTest extends BaseDbUnitTest {
         CertificateSaveReqVO updateReqVO = randomPojo(CertificateSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> certificateService.updateCertificate(updateReqVO), CERTIFICATE_NOT_EXISTS);
+        assertServiceException(() -> certificateService.updateCertificate(updateReqVO), MDE_CERTIFICATE_NOT_EXISTS);
     }
 
     @Test
@@ -96,7 +96,7 @@ public class CertificateServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> certificateService.deleteCertificate(id), CERTIFICATE_NOT_EXISTS);
+        assertServiceException(() -> certificateService.deleteCertificate(id), MDE_CERTIFICATE_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/cvattachment/CvAttachmentServiceImplTest.java

@@ -19,7 +19,7 @@ import static com.citu.framework.test.core.util.AssertUtils.*;
 import static com.citu.framework.test.core.util.RandomUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.*;
 import static com.citu.framework.common.util.object.ObjectUtils.*;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.CV_ATTACHMENT_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_CV_ATTACHMENT_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -73,7 +73,7 @@ public class CvAttachmentServiceImplTest extends BaseDbUnitTest {
         CvAttachmentSaveReqVO updateReqVO = randomPojo(CvAttachmentSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> cvAttachmentService.updateCvAttachment(updateReqVO), CV_ATTACHMENT_NOT_EXISTS);
+        assertServiceException(() -> cvAttachmentService.updateCvAttachment(updateReqVO), MDE_CV_ATTACHMENT_NOT_EXISTS);
     }
 
     @Test
@@ -96,7 +96,7 @@ public class CvAttachmentServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> cvAttachmentService.deleteCvAttachment(id), CV_ATTACHMENT_NOT_EXISTS);
+        assertServiceException(() -> cvAttachmentService.deleteCvAttachment(id), MDE_CV_ATTACHMENT_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/eduexp/EduExpServiceImplTest.java

@@ -19,7 +19,7 @@ import static com.citu.framework.test.core.util.AssertUtils.*;
 import static com.citu.framework.test.core.util.RandomUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.*;
 import static com.citu.framework.common.util.object.ObjectUtils.*;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.EDU_EXP_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_EDU_EXP_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -73,7 +73,7 @@ public class EduExpServiceImplTest extends BaseDbUnitTest {
         EduExpSaveReqVO updateReqVO = randomPojo(EduExpSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> eduExpService.updateEduExp(updateReqVO), EDU_EXP_NOT_EXISTS);
+        assertServiceException(() -> eduExpService.updateEduExp(updateReqVO), MDE_EDU_EXP_NOT_EXISTS);
     }
 
     @Test
@@ -96,7 +96,7 @@ public class EduExpServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> eduExpService.deleteEduExp(id), EDU_EXP_NOT_EXISTS);
+        assertServiceException(() -> eduExpService.deleteEduExp(id), MDE_EDU_EXP_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/enterprise/EnterpriseAddressServiceImplTest.java

@@ -19,7 +19,7 @@ import static com.citu.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static com.citu.framework.test.core.util.AssertUtils.assertServiceException;
 import static com.citu.framework.test.core.util.RandomUtils.randomLongId;
 import static com.citu.framework.test.core.util.RandomUtils.randomPojo;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.ENTERPRISE_ADDRESS_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_ENTERPRISE_ADDRESS_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -73,7 +73,7 @@ public class EnterpriseAddressServiceImplTest extends BaseDbUnitTest {
         EnterpriseAddressSaveReqVO updateReqVO = randomPojo(EnterpriseAddressSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> enterpriseAddressService.updateEnterpriseAddress(updateReqVO), ENTERPRISE_ADDRESS_NOT_EXISTS);
+        assertServiceException(() -> enterpriseAddressService.updateEnterpriseAddress(updateReqVO), MDE_ENTERPRISE_ADDRESS_NOT_EXISTS);
     }
 
     @Test
@@ -96,7 +96,7 @@ public class EnterpriseAddressServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> enterpriseAddressService.deleteEnterpriseAddress(id), ENTERPRISE_ADDRESS_NOT_EXISTS);
+        assertServiceException(() -> enterpriseAddressService.deleteEnterpriseAddress(id), MDE_ENTERPRISE_ADDRESS_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/enterprise/EnterpriseBusinessServiceImplTest.java

@@ -21,6 +21,7 @@ import static com.citu.framework.test.core.util.AssertUtils.*;
 import static com.citu.framework.test.core.util.RandomUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.*;
 import static com.citu.framework.common.util.object.ObjectUtils.*;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_ENTERPRISE_BUSINESS_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -74,7 +75,7 @@ public class EnterpriseBusinessServiceImplTest extends BaseDbUnitTest {
         EnterpriseBusinessSaveReqVO updateReqVO = randomPojo(EnterpriseBusinessSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> enterpriseBusinessService.updateEnterpriseBusiness(updateReqVO), ENTERPRISE_BUSINESS_NOT_EXISTS);
+        assertServiceException(() -> enterpriseBusinessService.updateEnterpriseBusiness(updateReqVO), MDE_ENTERPRISE_BUSINESS_NOT_EXISTS);
     }
 
     @Test
@@ -97,7 +98,7 @@ public class EnterpriseBusinessServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> enterpriseBusinessService.deleteEnterpriseBusiness(id), ENTERPRISE_BUSINESS_NOT_EXISTS);
+        assertServiceException(() -> enterpriseBusinessService.deleteEnterpriseBusiness(id), MDE_ENTERPRISE_BUSINESS_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/enterprise/EnterpriseRegisterServiceImplTest.java

@@ -18,7 +18,7 @@ import static com.citu.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static com.citu.framework.test.core.util.AssertUtils.assertServiceException;
 import static com.citu.framework.test.core.util.RandomUtils.randomLongId;
 import static com.citu.framework.test.core.util.RandomUtils.randomPojo;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.ENTERPRISE_REGISTER_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_ENTERPRISE_REGISTER_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -72,7 +72,7 @@ public class EnterpriseRegisterServiceImplTest extends BaseDbUnitTest {
         EnterpriseRegisterSaveReqVO updateReqVO = randomPojo(EnterpriseRegisterSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> enterpriseRegisterService.updateEnterpriseRegister(updateReqVO), ENTERPRISE_REGISTER_NOT_EXISTS);
+        assertServiceException(() -> enterpriseRegisterService.updateEnterpriseRegister(updateReqVO), MDE_ENTERPRISE_REGISTER_NOT_EXISTS);
     }
 
     @Test
@@ -95,7 +95,7 @@ public class EnterpriseRegisterServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> enterpriseRegisterService.deleteEnterpriseRegister(id), ENTERPRISE_REGISTER_NOT_EXISTS);
+        assertServiceException(() -> enterpriseRegisterService.deleteEnterpriseRegister(id), MDE_ENTERPRISE_REGISTER_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/enterprise/EnterpriseServiceImplTest.java

@@ -19,7 +19,7 @@ import static com.citu.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static com.citu.framework.test.core.util.AssertUtils.assertServiceException;
 import static com.citu.framework.test.core.util.RandomUtils.randomLongId;
 import static com.citu.framework.test.core.util.RandomUtils.randomPojo;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.ENTERPRISE_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_ENTERPRISE_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -73,7 +73,7 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
         EnterpriseSaveReqVO updateReqVO = randomPojo(EnterpriseSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> enterpriseService.updateEnterprise(updateReqVO), ENTERPRISE_NOT_EXISTS);
+        assertServiceException(() -> enterpriseService.updateEnterprise(updateReqVO), MDE_ENTERPRISE_NOT_EXISTS);
     }
 
     @Test
@@ -96,7 +96,7 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> enterpriseService.deleteEnterprise(id), ENTERPRISE_NOT_EXISTS);
+        assertServiceException(() -> enterpriseService.deleteEnterprise(id), MDE_ENTERPRISE_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/enterprise/EnterpriseUserBindServiceImplTest.java

@@ -19,7 +19,7 @@ import static com.citu.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static com.citu.framework.test.core.util.AssertUtils.assertServiceException;
 import static com.citu.framework.test.core.util.RandomUtils.randomLongId;
 import static com.citu.framework.test.core.util.RandomUtils.randomPojo;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.ENTERPRISE_USER_BIND_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_ENTERPRISE_USER_BIND_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -73,7 +73,7 @@ public class EnterpriseUserBindServiceImplTest extends BaseDbUnitTest {
         EnterpriseUserBindSaveReqVO updateReqVO = randomPojo(EnterpriseUserBindSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> enterpriseUserBindService.updateEnterpriseUserBind(updateReqVO), ENTERPRISE_USER_BIND_NOT_EXISTS);
+        assertServiceException(() -> enterpriseUserBindService.updateEnterpriseUserBind(updateReqVO), MDE_ENTERPRISE_USER_BIND_NOT_EXISTS);
     }
 
     @Test
@@ -96,7 +96,7 @@ public class EnterpriseUserBindServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> enterpriseUserBindService.deleteEnterpriseUserBind(id), ENTERPRISE_USER_BIND_NOT_EXISTS);
+        assertServiceException(() -> enterpriseUserBindService.deleteEnterpriseUserBind(id), MDE_ENTERPRISE_USER_BIND_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/industry/IndustryServiceImplTest.java

@@ -19,7 +19,7 @@ import static com.citu.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static com.citu.framework.test.core.util.AssertUtils.assertServiceException;
 import static com.citu.framework.test.core.util.RandomUtils.randomLongId;
 import static com.citu.framework.test.core.util.RandomUtils.randomPojo;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.INDUSTRY_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_INDUSTRY_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 
@@ -74,7 +74,7 @@ public class IndustryServiceImplTest extends BaseDbUnitTest {
         IndustrySaveReqVO updateReqVO = randomPojo(IndustrySaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> industryService.updateIndustry(updateReqVO), INDUSTRY_NOT_EXISTS);
+        assertServiceException(() -> industryService.updateIndustry(updateReqVO), MDE_INDUSTRY_NOT_EXISTS);
     }
 
     @Test
@@ -97,7 +97,7 @@ public class IndustryServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> industryService.deleteIndustry(id), INDUSTRY_NOT_EXISTS);
+        assertServiceException(() -> industryService.deleteIndustry(id), MDE_INDUSTRY_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/job/JobAdvertisedServiceImplTest.java

@@ -18,7 +18,7 @@ import static com.citu.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static com.citu.framework.test.core.util.AssertUtils.assertServiceException;
 import static com.citu.framework.test.core.util.RandomUtils.randomLongId;
 import static com.citu.framework.test.core.util.RandomUtils.randomPojo;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.JOB_ADVERTISED_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_JOB_ADVERTISED_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -72,7 +72,7 @@ public class JobAdvertisedServiceImplTest extends BaseDbUnitTest {
         JobAdvertisedSaveReqVO updateReqVO = randomPojo(JobAdvertisedSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> jobAdvertisedService.updateJobAdvertised(updateReqVO), JOB_ADVERTISED_NOT_EXISTS);
+        assertServiceException(() -> jobAdvertisedService.updateJobAdvertised(updateReqVO), MDE_JOB_ADVERTISED_NOT_EXISTS);
     }
 
     @Test
@@ -95,7 +95,7 @@ public class JobAdvertisedServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> jobAdvertisedService.deleteJobAdvertised(id), JOB_ADVERTISED_NOT_EXISTS);
+        assertServiceException(() -> jobAdvertisedService.deleteJobAdvertised(id), MDE_JOB_ADVERTISED_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/job/JobInterestedServiceImplTest.java

@@ -19,7 +19,7 @@ import static com.citu.framework.test.core.util.AssertUtils.*;
 import static com.citu.framework.test.core.util.RandomUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.*;
 import static com.citu.framework.common.util.object.ObjectUtils.*;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.JOB_INTERESTED_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_JOB_INTERESTED_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -73,7 +73,7 @@ public class JobInterestedServiceImplTest extends BaseDbUnitTest {
         JobInterestedSaveReqVO updateReqVO = randomPojo(JobInterestedSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> jobInterestedService.updateJobInterested(updateReqVO), JOB_INTERESTED_NOT_EXISTS);
+        assertServiceException(() -> jobInterestedService.updateJobInterested(updateReqVO), MDE_JOB_INTERESTED_NOT_EXISTS);
     }
 
     @Test
@@ -96,7 +96,7 @@ public class JobInterestedServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> jobInterestedService.deleteJobInterested(id), JOB_INTERESTED_NOT_EXISTS);
+        assertServiceException(() -> jobInterestedService.deleteJobInterested(id), MDE_JOB_INTERESTED_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/major/MajorServiceImplTest.java

@@ -19,7 +19,7 @@ import static com.citu.framework.test.core.util.AssertUtils.*;
 import static com.citu.framework.test.core.util.RandomUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.*;
 import static com.citu.framework.common.util.object.ObjectUtils.*;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MAJOR_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_MAJOR_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -73,7 +73,7 @@ public class MajorServiceImplTest extends BaseDbUnitTest {
         MajorSaveReqVO updateReqVO = randomPojo(MajorSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> majorService.updateMajor(updateReqVO), MAJOR_NOT_EXISTS);
+        assertServiceException(() -> majorService.updateMajor(updateReqVO), MDE_MAJOR_NOT_EXISTS);
     }
 
     @Test
@@ -96,7 +96,7 @@ public class MajorServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> majorService.deleteMajor(id), MAJOR_NOT_EXISTS);
+        assertServiceException(() -> majorService.deleteMajor(id), MDE_MAJOR_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/people/PeopleCertificateServiceImplTest.java

@@ -19,7 +19,7 @@ import static com.citu.framework.test.core.util.AssertUtils.*;
 import static com.citu.framework.test.core.util.RandomUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.*;
 import static com.citu.framework.common.util.object.ObjectUtils.*;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.USER_CERTIFICATE_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_USER_CERTIFICATE_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -73,7 +73,7 @@ public class PeopleCertificateServiceImplTest extends BaseDbUnitTest {
         PeopleCertificateSaveReqVO updateReqVO = randomPojo(PeopleCertificateSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> userCertificateService.updateUserCertificate(updateReqVO), USER_CERTIFICATE_NOT_EXISTS);
+        assertServiceException(() -> userCertificateService.updateUserCertificate(updateReqVO), MDE_USER_CERTIFICATE_NOT_EXISTS);
     }
 
     @Test
@@ -96,7 +96,7 @@ public class PeopleCertificateServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> userCertificateService.deleteUserCertificate(id), USER_CERTIFICATE_NOT_EXISTS);
+        assertServiceException(() -> userCertificateService.deleteUserCertificate(id), MDE_USER_CERTIFICATE_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/people/PeopleInfoServiceImplTest.java

@@ -73,7 +73,7 @@ public class PeopleInfoServiceImplTest extends BaseDbUnitTest {
         PeopleInfoSaveReqVO updateReqVO = randomPojo(PeopleInfoSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> userInfoService.updateUserInfo(updateReqVO), USER_INFO_NOT_EXISTS);
+        assertServiceException(() -> userInfoService.updateUserInfo(updateReqVO), MDE_USER_INFO_NOT_EXISTS);
     }
 
     @Test
@@ -96,7 +96,7 @@ public class PeopleInfoServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> userInfoService.deleteUserInfo(id), USER_INFO_NOT_EXISTS);
+        assertServiceException(() -> userInfoService.deleteUserInfo(id), MDE_USER_INFO_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/people/PeopleSkillServiceImplTest.java

@@ -19,7 +19,7 @@ import static com.citu.framework.test.core.util.AssertUtils.*;
 import static com.citu.framework.test.core.util.RandomUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.*;
 import static com.citu.framework.common.util.object.ObjectUtils.*;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.USER_SKILL_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_USER_SKILL_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -73,7 +73,7 @@ public class PeopleSkillServiceImplTest extends BaseDbUnitTest {
         PeopleSkillSaveReqVO updateReqVO = randomPojo(PeopleSkillSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> userSkillService.updateUserSkill(updateReqVO), USER_SKILL_NOT_EXISTS);
+        assertServiceException(() -> userSkillService.updateUserSkill(updateReqVO), MDE_USER_SKILL_NOT_EXISTS);
     }
 
     @Test
@@ -96,7 +96,7 @@ public class PeopleSkillServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> userSkillService.deleteUserSkill(id), USER_SKILL_NOT_EXISTS);
+        assertServiceException(() -> userSkillService.deleteUserSkill(id), MDE_USER_SKILL_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/position/PositionServiceImplTest.java

@@ -72,7 +72,7 @@ public class PositionServiceImplTest extends BaseDbUnitTest {
         PositionSaveReqVO updateReqVO = randomPojo(PositionSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> positionService.updatePosition(updateReqVO), POSITION_NOT_EXISTS);
+        assertServiceException(() -> positionService.updatePosition(updateReqVO), MDE_POSITION_NOT_EXISTS);
     }
 
     @Test
@@ -95,7 +95,7 @@ public class PositionServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> positionService.deletePosition(id), POSITION_NOT_EXISTS);
+        assertServiceException(() -> positionService.deletePosition(id), MDE_POSITION_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/positiontag/PositionTagServiceImplTest.java

@@ -19,7 +19,7 @@ import static com.citu.framework.test.core.util.AssertUtils.*;
 import static com.citu.framework.test.core.util.RandomUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.*;
 import static com.citu.framework.common.util.object.ObjectUtils.*;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.POSITION_TAG_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_POSITION_TAG_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -73,7 +73,7 @@ public class PositionTagServiceImplTest extends BaseDbUnitTest {
         PositionTagSaveReqVO updateReqVO = randomPojo(PositionTagSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> positionTagService.updatePositionTag(updateReqVO), POSITION_TAG_NOT_EXISTS);
+        assertServiceException(() -> positionTagService.updatePositionTag(updateReqVO), MDE_POSITION_TAG_NOT_EXISTS);
     }
 
     @Test
@@ -96,7 +96,7 @@ public class PositionTagServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> positionTagService.deletePositionTag(id), POSITION_TAG_NOT_EXISTS);
+        assertServiceException(() -> positionTagService.deletePositionTag(id), MDE_POSITION_TAG_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/school/SchoolServiceImplTest.java

@@ -19,7 +19,7 @@ import static com.citu.framework.test.core.util.AssertUtils.*;
 import static com.citu.framework.test.core.util.RandomUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.*;
 import static com.citu.framework.common.util.object.ObjectUtils.*;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.SCHOOL_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_SCHOOL_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -73,7 +73,7 @@ public class SchoolServiceImplTest extends BaseDbUnitTest {
         SchoolSaveReqVO updateReqVO = randomPojo(SchoolSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> schoolService.updateSchool(updateReqVO), SCHOOL_NOT_EXISTS);
+        assertServiceException(() -> schoolService.updateSchool(updateReqVO), MDE_SCHOOL_NOT_EXISTS);
     }
 
     @Test
@@ -96,7 +96,7 @@ public class SchoolServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> schoolService.deleteSchool(id), SCHOOL_NOT_EXISTS);
+        assertServiceException(() -> schoolService.deleteSchool(id), MDE_SCHOOL_NOT_EXISTS);
     }
 
     @Test

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/workexp/WorkExpServiceImplTest.java

@@ -19,7 +19,7 @@ import static com.citu.framework.test.core.util.AssertUtils.*;
 import static com.citu.framework.test.core.util.RandomUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.*;
 import static com.citu.framework.common.util.object.ObjectUtils.*;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.WORK_EXP_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_WORK_EXP_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -73,7 +73,7 @@ public class WorkExpServiceImplTest extends BaseDbUnitTest {
         WorkExpSaveReqVO updateReqVO = randomPojo(WorkExpSaveReqVO.class);
 
         // 调用, 并断言异常
-        assertServiceException(() -> workExpService.updateWorkExp(updateReqVO), WORK_EXP_NOT_EXISTS);
+        assertServiceException(() -> workExpService.updateWorkExp(updateReqVO), MDE_WORK_EXP_NOT_EXISTS);
     }
 
     @Test
@@ -96,7 +96,7 @@ public class WorkExpServiceImplTest extends BaseDbUnitTest {
         Long id = randomLongId();
 
         // 调用, 并断言异常
-        assertServiceException(() -> workExpService.deleteWorkExp(id), WORK_EXP_NOT_EXISTS);
+        assertServiceException(() -> workExpService.deleteWorkExp(id), MDE_WORK_EXP_NOT_EXISTS);
     }
 
     @Test