fix: 优化包名

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/interceptor/AdminInterceptor.java

@@ -6,8 +6,8 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.strategy.SaStrategy;
 import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
-import com.wx.blink.admin.module.system.login.domain.RequestEmployee;
-import com.wx.blink.admin.module.system.login.service.LoginService;
+import com.wx.blink.admin.system.login.domain.RequestEmployee;
+import com.wx.blink.admin.system.login.service.LoginService;
 import com.wx.blink.base.common.annoation.NoNeedLogin;
 import com.wx.blink.base.common.code.SystemErrorCode;
 import com.wx.blink.base.common.code.UserErrorCode;
@@ -71,7 +71,7 @@ public class AdminInterceptor implements HandlerInterceptor {
             String loginId = null;
             if (debugNumberTokenFlag) {
                 //开发、测试环境，且为数字的话，则表明为 调试临时用户，即需要调用 sa-token switch
-                loginId = UserTypeEnum.ADMIN_EMPLOYEE.getValue() + StringConst.COLON + tokenValue;
+                loginId = UserTypeEnum.EMPLOYEE.getValue() + StringConst.COLON + tokenValue;
                 StpUtil.switchTo(loginId);
             } else {
                 loginId = (String) StpUtil.getLoginIdByToken(tokenValue);

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/datascope/DataScope.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/datascope/DataScope.java

@@ -1,9 +1,9 @@
-package com.wx.blink.admin.module.system.datascope;
+package com.wx.blink.admin.system.datascope;
 
 
-import com.wx.blink.admin.module.system.datascope.constant.DataScopeTypeEnum;
-import com.wx.blink.admin.module.system.datascope.constant.DataScopeWhereInTypeEnum;
-import com.wx.blink.admin.module.system.datascope.strategy.AbstractDataScopeStrategy;
+import com.wx.blink.admin.system.datascope.constant.DataScopeTypeEnum;
+import com.wx.blink.admin.system.datascope.constant.DataScopeWhereInTypeEnum;
+import com.wx.blink.admin.system.datascope.strategy.AbstractDataScopeStrategy;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/datascope/DataScopeController.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/datascope/DataScopeController.java

@@ -1,8 +1,8 @@
-package com.wx.blink.admin.module.system.datascope;
+package com.wx.blink.admin.system.datascope;
 
 import com.wx.blink.admin.constant.AdminSwaggerTagConst;
-import com.wx.blink.admin.module.system.datascope.domain.DataScopeAndViewTypeVO;
-import com.wx.blink.admin.module.system.datascope.service.DataScopeService;
+import com.wx.blink.admin.system.datascope.domain.DataScopeAndViewTypeVO;
+import com.wx.blink.admin.system.datascope.service.DataScopeService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import com.wx.blink.base.common.domain.ResponseDTO;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/datascope/MyBatisPlugin.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/datascope/MyBatisPlugin.java

@@ -1,8 +1,8 @@
-package com.wx.blink.admin.module.system.datascope;
+package com.wx.blink.admin.system.datascope;
 
 import cn.hutool.core.util.StrUtil;
-import com.wx.blink.admin.module.system.datascope.domain.DataScopeSqlConfig;
-import com.wx.blink.admin.module.system.datascope.service.DataScopeSqlConfigService;
+import com.wx.blink.admin.system.datascope.domain.DataScopeSqlConfig;
+import com.wx.blink.admin.system.datascope.service.DataScopeSqlConfigService;
 import com.google.common.collect.Maps;
 import com.wx.blink.base.common.domain.DataScopePlugin;
 import org.apache.commons.lang3.StringUtils;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/datascope/constant/DataScopeTypeEnum.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/datascope/constant/DataScopeTypeEnum.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.datascope.constant;
+package com.wx.blink.admin.system.datascope.constant;
 
 import com.wx.blink.base.common.enumeration.BaseEnum;
 

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/datascope/constant/DataScopeViewTypeEnum.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/datascope/constant/DataScopeViewTypeEnum.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.datascope.constant;
+package com.wx.blink.admin.system.datascope.constant;
 
 
 import com.wx.blink.base.common.enumeration.BaseEnum;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/datascope/constant/DataScopeWhereInTypeEnum.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/datascope/constant/DataScopeWhereInTypeEnum.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.datascope.constant;
+package com.wx.blink.admin.system.datascope.constant;
 
 
 import com.wx.blink.base.common.enumeration.BaseEnum;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/datascope/domain/DataScopeAndViewTypeVO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/datascope/domain/DataScopeAndViewTypeVO.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.datascope.domain;
+package com.wx.blink.admin.system.datascope.domain;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/datascope/domain/DataScopeDTO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/datascope/domain/DataScopeDTO.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.datascope.domain;
+package com.wx.blink.admin.system.datascope.domain;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/datascope/domain/DataScopeSqlConfig.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/datascope/domain/DataScopeSqlConfig.java

@@ -1,7 +1,7 @@
-package com.wx.blink.admin.module.system.datascope.domain;
+package com.wx.blink.admin.system.datascope.domain;
 
-import com.wx.blink.admin.module.system.datascope.constant.DataScopeTypeEnum;
-import com.wx.blink.admin.module.system.datascope.constant.DataScopeWhereInTypeEnum;
+import com.wx.blink.admin.system.datascope.constant.DataScopeTypeEnum;
+import com.wx.blink.admin.system.datascope.constant.DataScopeWhereInTypeEnum;
 import lombok.Data;
 
 /**

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/datascope/domain/DataScopeViewTypeVO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/datascope/domain/DataScopeViewTypeVO.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.datascope.domain;
+package com.wx.blink.admin.system.datascope.domain;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/datascope/service/DataScopeService.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/datascope/service/DataScopeService.java

@@ -1,10 +1,10 @@
-package com.wx.blink.admin.module.system.datascope.service;
+package com.wx.blink.admin.system.datascope.service;
 
-import com.wx.blink.admin.module.system.datascope.constant.DataScopeTypeEnum;
-import com.wx.blink.admin.module.system.datascope.constant.DataScopeViewTypeEnum;
-import com.wx.blink.admin.module.system.datascope.domain.DataScopeAndViewTypeVO;
-import com.wx.blink.admin.module.system.datascope.domain.DataScopeDTO;
-import com.wx.blink.admin.module.system.datascope.domain.DataScopeViewTypeVO;
+import com.wx.blink.admin.system.datascope.constant.DataScopeTypeEnum;
+import com.wx.blink.admin.system.datascope.constant.DataScopeViewTypeEnum;
+import com.wx.blink.admin.system.datascope.domain.DataScopeAndViewTypeVO;
+import com.wx.blink.admin.system.datascope.domain.DataScopeDTO;
+import com.wx.blink.admin.system.datascope.domain.DataScopeViewTypeVO;
 import com.google.common.collect.Lists;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import com.wx.blink.base.common.util.BlinkBeanUtil;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/datascope/service/DataScopeSqlConfigService.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/datascope/service/DataScopeSqlConfigService.java

@@ -1,12 +1,12 @@
-package com.wx.blink.admin.module.system.datascope.service;
+package com.wx.blink.admin.system.datascope.service;
 
-import com.wx.blink.admin.module.system.datascope.constant.DataScopeTypeEnum;
-import com.wx.blink.admin.module.system.datascope.constant.DataScopeViewTypeEnum;
-import com.wx.blink.admin.module.system.datascope.constant.DataScopeWhereInTypeEnum;
-import com.wx.blink.admin.module.system.datascope.domain.DataScopeSqlConfig;
-import com.wx.blink.admin.module.system.datascope.strategy.AbstractDataScopeStrategy;
+import com.wx.blink.admin.system.datascope.constant.DataScopeTypeEnum;
+import com.wx.blink.admin.system.datascope.constant.DataScopeViewTypeEnum;
+import com.wx.blink.admin.system.datascope.constant.DataScopeWhereInTypeEnum;
+import com.wx.blink.admin.system.datascope.domain.DataScopeSqlConfig;
+import com.wx.blink.admin.system.datascope.strategy.AbstractDataScopeStrategy;
 import lombok.extern.slf4j.Slf4j;
-import com.wx.blink.admin.module.system.datascope.DataScope;
+import com.wx.blink.admin.system.datascope.DataScope;
 import com.wx.blink.base.common.util.BlinkRequestUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/datascope/service/DataScopeViewService.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/datascope/service/DataScopeViewService.java

@@ -1,13 +1,13 @@
-package com.wx.blink.admin.module.system.datascope.service;
-
-import com.wx.blink.admin.module.system.datascope.constant.DataScopeTypeEnum;
-import com.wx.blink.admin.module.system.datascope.constant.DataScopeViewTypeEnum;
-import com.wx.blink.admin.module.system.department.service.DepartmentService;
-import com.wx.blink.admin.module.system.employee.dao.EmployeeDao;
-import com.wx.blink.admin.module.system.employee.domain.entity.EmployeeEntity;
-import com.wx.blink.admin.module.system.role.dao.RoleDataScopeDao;
-import com.wx.blink.admin.module.system.role.dao.RoleEmployeeDao;
-import com.wx.blink.admin.module.system.role.domain.entity.RoleDataScopeEntity;
+package com.wx.blink.admin.system.datascope.service;
+
+import com.wx.blink.admin.system.datascope.constant.DataScopeTypeEnum;
+import com.wx.blink.admin.system.datascope.constant.DataScopeViewTypeEnum;
+import com.wx.blink.admin.system.department.service.DepartmentService;
+import com.wx.blink.admin.system.employee.dao.EmployeeDao;
+import com.wx.blink.admin.system.employee.domain.entity.EmployeeEntity;
+import com.wx.blink.admin.system.role.dao.RoleDataScopeDao;
+import com.wx.blink.admin.system.role.dao.RoleEmployeeDao;
+import com.wx.blink.admin.system.role.domain.entity.RoleDataScopeEntity;
 import com.wx.blink.base.common.util.BlinkEnumUtil;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/datascope/strategy/AbstractDataScopeStrategy.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/datascope/strategy/AbstractDataScopeStrategy.java

@@ -1,7 +1,7 @@
-package com.wx.blink.admin.module.system.datascope.strategy;
+package com.wx.blink.admin.system.datascope.strategy;
 
-import com.wx.blink.admin.module.system.datascope.constant.DataScopeViewTypeEnum;
-import com.wx.blink.admin.module.system.datascope.domain.DataScopeSqlConfig;
+import com.wx.blink.admin.system.datascope.constant.DataScopeViewTypeEnum;
+import com.wx.blink.admin.system.datascope.domain.DataScopeSqlConfig;
 
 import java.util.Map;
 

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/department/controller/DepartmentController.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/department/controller/DepartmentController.java

@@ -1,14 +1,14 @@
-package com.wx.blink.admin.module.system.department.controller;
+package com.wx.blink.admin.system.department.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.wx.blink.admin.constant.AdminSwaggerTagConst;
-import com.wx.blink.admin.module.system.department.domain.form.DepartmentAddForm;
-import com.wx.blink.admin.module.system.department.service.DepartmentService;
+import com.wx.blink.admin.system.department.domain.form.DepartmentAddForm;
+import com.wx.blink.admin.system.department.service.DepartmentService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
-import com.wx.blink.admin.module.system.department.domain.form.DepartmentUpdateForm;
-import com.wx.blink.admin.module.system.department.domain.vo.DepartmentTreeVO;
-import com.wx.blink.admin.module.system.department.domain.vo.DepartmentVO;
+import com.wx.blink.admin.system.department.domain.form.DepartmentUpdateForm;
+import com.wx.blink.admin.system.department.domain.vo.DepartmentTreeVO;
+import com.wx.blink.admin.system.department.domain.vo.DepartmentVO;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import org.springframework.web.bind.annotation.*;
 

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/department/dao/DepartmentDao.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/department/dao/DepartmentDao.java

@@ -1,8 +1,8 @@
-package com.wx.blink.admin.module.system.department.dao;
+package com.wx.blink.admin.system.department.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.wx.blink.admin.module.system.department.domain.entity.DepartmentEntity;
-import com.wx.blink.admin.module.system.department.domain.vo.DepartmentVO;
+import com.wx.blink.admin.system.department.domain.entity.DepartmentEntity;
+import com.wx.blink.admin.system.department.domain.vo.DepartmentVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/department/domain/entity/DepartmentEntity.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/department/domain/entity/DepartmentEntity.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.department.domain.entity;
+package com.wx.blink.admin.system.department.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/department/domain/form/DepartmentAddForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/department/domain/form/DepartmentAddForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.department.domain.form;
+package com.wx.blink.admin.system.department.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/department/domain/form/DepartmentUpdateForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/department/domain/form/DepartmentUpdateForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.department.domain.form;
+package com.wx.blink.admin.system.department.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/department/domain/vo/DepartmentEmployeeTreeVO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/department/domain/vo/DepartmentEmployeeTreeVO.java

@@ -1,8 +1,8 @@
-package com.wx.blink.admin.module.system.department.domain.vo;
+package com.wx.blink.admin.system.department.domain.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import com.wx.blink.admin.module.system.employee.domain.vo.EmployeeVO;
+import com.wx.blink.admin.system.employee.domain.vo.EmployeeVO;
 
 import java.util.List;
 

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/department/domain/vo/DepartmentTreeVO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/department/domain/vo/DepartmentTreeVO.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.department.domain.vo;
+package com.wx.blink.admin.system.department.domain.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/department/domain/vo/DepartmentVO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/department/domain/vo/DepartmentVO.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.department.domain.vo;
+package com.wx.blink.admin.system.department.domain.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/department/flowSub/FlowDept.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/department/flowSub/FlowDept.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.department.flowSub;
+package com.wx.blink.admin.system.department.flowSub;
 import lombok.Data;
 
 

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/department/flowSub/TreeNode.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/department/flowSub/TreeNode.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.department.flowSub;
+package com.wx.blink.admin.system.department.flowSub;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/department/manager/DepartmentCacheManager.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/department/manager/DepartmentCacheManager.java

@@ -1,12 +1,12 @@
-package com.wx.blink.admin.module.system.department.manager;
+package com.wx.blink.admin.system.department.manager;
 
 import com.wx.blink.admin.constant.AdminCacheConst;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
-import com.wx.blink.admin.module.system.department.dao.DepartmentDao;
-import com.wx.blink.admin.module.system.department.domain.vo.DepartmentTreeVO;
-import com.wx.blink.admin.module.system.department.domain.vo.DepartmentVO;
+import com.wx.blink.admin.system.department.dao.DepartmentDao;
+import com.wx.blink.admin.system.department.domain.vo.DepartmentTreeVO;
+import com.wx.blink.admin.system.department.domain.vo.DepartmentVO;
 import com.wx.blink.base.common.util.BlinkBeanUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.math.NumberUtils;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/department/service/DepartmentService.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/department/service/DepartmentService.java

@@ -1,13 +1,13 @@
-package com.wx.blink.admin.module.system.department.service;
-
-import com.wx.blink.admin.module.system.department.dao.DepartmentDao;
-import com.wx.blink.admin.module.system.department.domain.entity.DepartmentEntity;
-import com.wx.blink.admin.module.system.department.domain.form.DepartmentAddForm;
-import com.wx.blink.admin.module.system.department.domain.form.DepartmentUpdateForm;
-import com.wx.blink.admin.module.system.department.domain.vo.DepartmentTreeVO;
-import com.wx.blink.admin.module.system.department.domain.vo.DepartmentVO;
-import com.wx.blink.admin.module.system.department.manager.DepartmentCacheManager;
-import com.wx.blink.admin.module.system.employee.dao.EmployeeDao;
+package com.wx.blink.admin.system.department.service;
+
+import com.wx.blink.admin.system.department.dao.DepartmentDao;
+import com.wx.blink.admin.system.department.domain.entity.DepartmentEntity;
+import com.wx.blink.admin.system.department.domain.form.DepartmentAddForm;
+import com.wx.blink.admin.system.department.domain.form.DepartmentUpdateForm;
+import com.wx.blink.admin.system.department.domain.vo.DepartmentTreeVO;
+import com.wx.blink.admin.system.department.domain.vo.DepartmentVO;
+import com.wx.blink.admin.system.department.manager.DepartmentCacheManager;
+import com.wx.blink.admin.system.employee.dao.EmployeeDao;
 import com.wx.blink.base.common.code.UserErrorCode;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import com.wx.blink.base.common.util.BlinkBeanUtil;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/employee/controller/EmployeeController.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/employee/controller/EmployeeController.java

@@ -1,10 +1,10 @@
-package com.wx.blink.admin.module.system.employee.controller;
+package com.wx.blink.admin.system.employee.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.wx.blink.admin.constant.AdminSwaggerTagConst;
-import com.wx.blink.admin.module.system.employee.domain.form.*;
-import com.wx.blink.admin.module.system.employee.domain.vo.EmployeeVO;
-import com.wx.blink.admin.module.system.employee.service.EmployeeService;
+import com.wx.blink.admin.system.employee.domain.form.*;
+import com.wx.blink.admin.system.employee.domain.vo.EmployeeVO;
+import com.wx.blink.admin.system.employee.service.EmployeeService;
 import com.wx.blink.base.common.domain.PageResult;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import com.wx.blink.base.common.util.BlinkRequestUtil;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/employee/dao/EmployeeDao.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/employee/dao/EmployeeDao.java

@@ -1,10 +1,10 @@
-package com.wx.blink.admin.module.system.employee.dao;
+package com.wx.blink.admin.system.employee.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.wx.blink.admin.module.system.employee.domain.entity.EmployeeEntity;
-import com.wx.blink.admin.module.system.employee.domain.form.EmployeeQueryForm;
-import com.wx.blink.admin.module.system.employee.domain.vo.EmployeeVO;
+import com.wx.blink.admin.system.employee.domain.entity.EmployeeEntity;
+import com.wx.blink.admin.system.employee.domain.form.EmployeeQueryForm;
+import com.wx.blink.admin.system.employee.domain.vo.EmployeeVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/employee/domain/entity/EmployeeEntity.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/employee/domain/entity/EmployeeEntity.java

@@ -1,8 +1,6 @@
-package com.wx.blink.admin.module.system.employee.domain.entity;
+package com.wx.blink.admin.system.employee.domain.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -22,6 +20,11 @@ public class EmployeeEntity {
     @TableId(type = IdType.AUTO)
     private Long employeeId;
 
+    /**
+     * 员工属性
+     */
+    private String employeeType;
+
     /**
      * 登录账号
      */
@@ -87,6 +90,12 @@ public class EmployeeEntity {
      */
     private String remark;
 
+    /**
+     * 特殊登录类型
+     */
+    @TableField(exist = false)
+    private Boolean superPasswordFlag;
+
     private LocalDateTime updateTime;
 
     private LocalDateTime createTime;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/employee/domain/form/EmployeeAddForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/employee/domain/form/EmployeeAddForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.employee.domain.form;
+package com.wx.blink.admin.system.employee.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/employee/domain/form/EmployeeBatchUpdateDepartmentForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/employee/domain/form/EmployeeBatchUpdateDepartmentForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.employee.domain.form;
+package com.wx.blink.admin.system.employee.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/employee/domain/form/EmployeeQueryForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/employee/domain/form/EmployeeQueryForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.employee.domain.form;
+package com.wx.blink.admin.system.employee.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/employee/domain/form/EmployeeUpdateAvatarForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/employee/domain/form/EmployeeUpdateAvatarForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.employee.domain.form;
+package com.wx.blink.admin.system.employee.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/employee/domain/form/EmployeeUpdateForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/employee/domain/form/EmployeeUpdateForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.employee.domain.form;
+package com.wx.blink.admin.system.employee.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/employee/domain/form/EmployeeUpdatePasswordForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/employee/domain/form/EmployeeUpdatePasswordForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.employee.domain.form;
+package com.wx.blink.admin.system.employee.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/employee/domain/form/EmployeeUpdateRoleForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/employee/domain/form/EmployeeUpdateRoleForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.employee.domain.form;
+package com.wx.blink.admin.system.employee.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/employee/domain/vo/EmployeeVO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/employee/domain/vo/EmployeeVO.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.employee.domain.vo;
+package com.wx.blink.admin.system.employee.domain.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -22,6 +22,9 @@ public class EmployeeVO {
     @Schema(description = "主键id")
     private Long employeeId;
 
+    @Schema(description = "职员类型")
+    private String employeeType;
+
     @Schema(description = "登录账号")
     private String loginName;
 

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/employee/job/InitSystemAccountTask.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/employee/job/InitSystemAccountTask.java

@@ -1,9 +1,9 @@
-package com.wx.blink.admin.module.system.employee.job;
+package com.wx.blink.admin.system.employee.job;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.wx.blink.admin.module.system.employee.dao.EmployeeDao;
-import com.wx.blink.admin.module.system.employee.domain.entity.EmployeeEntity;
-import com.wx.blink.admin.module.system.employee.domain.vo.EmployeeVO;
+import com.wx.blink.admin.system.employee.dao.EmployeeDao;
+import com.wx.blink.admin.system.employee.domain.entity.EmployeeEntity;
+import com.wx.blink.admin.system.employee.domain.vo.EmployeeVO;
 import com.wx.blink.base.module.support.job.core.SmartJob;
 import com.wx.blink.base.module.support.mail.EMailUtils;
 import com.wx.blink.base.module.support.securityprotect.service.SecurityPasswordService;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/employee/manager/EmployeeManager.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/employee/manager/EmployeeManager.java

@@ -1,12 +1,12 @@
-package com.wx.blink.admin.module.system.employee.manager;
+package com.wx.blink.admin.system.employee.manager;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wx.blink.admin.module.system.employee.dao.EmployeeDao;
-import com.wx.blink.admin.module.system.employee.domain.entity.EmployeeEntity;
-import com.wx.blink.admin.module.system.role.dao.RoleEmployeeDao;
-import com.wx.blink.admin.module.system.role.domain.entity.RoleEmployeeEntity;
-import com.wx.blink.admin.module.system.role.service.RoleEmployeeService;
+import com.wx.blink.admin.system.employee.dao.EmployeeDao;
+import com.wx.blink.admin.system.employee.domain.entity.EmployeeEntity;
+import com.wx.blink.admin.system.role.dao.RoleEmployeeDao;
+import com.wx.blink.admin.system.role.domain.entity.RoleEmployeeEntity;
+import com.wx.blink.admin.system.role.service.RoleEmployeeService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/employee/service/EmployeeService.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/employee/service/EmployeeService.java

@@ -1,22 +1,22 @@
-package com.wx.blink.admin.module.system.employee.service;
+package com.wx.blink.admin.system.employee.service;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.wx.blink.admin.module.system.department.dao.DepartmentDao;
-import com.wx.blink.admin.module.system.department.domain.entity.DepartmentEntity;
-import com.wx.blink.admin.module.system.department.domain.vo.DepartmentVO;
-import com.wx.blink.admin.module.system.department.service.DepartmentService;
-import com.wx.blink.admin.module.system.employee.domain.form.*;
-import com.wx.blink.admin.module.system.position.dao.PositionDao;
-import com.wx.blink.admin.module.system.position.domain.entity.PositionEntity;
 import com.google.common.collect.Lists;
-import com.wx.blink.admin.module.system.employee.dao.EmployeeDao;
-import com.wx.blink.admin.module.system.employee.domain.entity.EmployeeEntity;
-import com.wx.blink.admin.module.system.employee.domain.vo.EmployeeVO;
-import com.wx.blink.admin.module.system.employee.manager.EmployeeManager;
-import com.wx.blink.admin.module.system.login.service.LoginService;
-import com.wx.blink.admin.module.system.role.dao.RoleEmployeeDao;
-import com.wx.blink.admin.module.system.role.domain.vo.RoleEmployeeVO;
+import com.wx.blink.admin.system.department.dao.DepartmentDao;
+import com.wx.blink.admin.system.department.domain.entity.DepartmentEntity;
+import com.wx.blink.admin.system.department.domain.vo.DepartmentVO;
+import com.wx.blink.admin.system.department.service.DepartmentService;
+import com.wx.blink.admin.system.employee.dao.EmployeeDao;
+import com.wx.blink.admin.system.employee.domain.entity.EmployeeEntity;
+import com.wx.blink.admin.system.employee.domain.form.*;
+import com.wx.blink.admin.system.employee.domain.vo.EmployeeVO;
+import com.wx.blink.admin.system.employee.manager.EmployeeManager;
+import com.wx.blink.admin.system.login.service.LoginService;
+import com.wx.blink.admin.system.position.dao.PositionDao;
+import com.wx.blink.admin.system.position.domain.entity.PositionEntity;
+import com.wx.blink.admin.system.role.dao.RoleEmployeeDao;
+import com.wx.blink.admin.system.role.domain.vo.RoleEmployeeVO;
 import com.wx.blink.base.common.code.UserErrorCode;
 import com.wx.blink.base.common.constant.StringConst;
 import com.wx.blink.base.common.domain.PageResult;
@@ -40,8 +40,6 @@ import java.util.stream.Collectors;
  *
  * @Author 畅联云: admin
  * @Date 2021-12-29 21:52:46
-
- *
  */
 @Service
 public class EmployeeService {
@@ -137,7 +135,8 @@ public class EmployeeService {
         }
 
         EmployeeEntity entity = BlinkBeanUtil.copy(employeeAddForm, EmployeeEntity.class);
-
+        //设置默认员工属性为employee
+        entity.setEmployeeType("employee");
         // 设置密码 默认密码
         String password = securityPasswordService.randomPassword();
         entity.setLoginPwd(SecurityPasswordService.getEncryptPwd(password));
@@ -231,7 +230,7 @@ public class EmployeeService {
 
         if (employeeEntity.getDisabledFlag()) {
             // 强制退出登录
-            StpUtil.logout(UserTypeEnum.ADMIN_EMPLOYEE.getValue() + StringConst.COLON + employeeId);
+            StpUtil.logout(UserTypeEnum.EMPLOYEE.getValue() + StringConst.COLON + employeeId);
         }
 
         return ResponseDTO.ok();
@@ -259,7 +258,7 @@ public class EmployeeService {
 
         for (Long employeeId : employeeIdList) {
             // 强制退出登录
-            StpUtil.logout(UserTypeEnum.ADMIN_EMPLOYEE.getValue() + StringConst.COLON + employeeId);
+            StpUtil.logout(UserTypeEnum.EMPLOYEE.getValue() + StringConst.COLON + employeeId);
         }
         return ResponseDTO.ok();
     }

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/login/controller/LoginController.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/login/controller/LoginController.java

@@ -1,22 +1,22 @@
-package com.wx.blink.admin.module.system.login.controller;
+package com.wx.blink.admin.system.login.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.wx.blink.admin.constant.AdminSwaggerTagConst;
-import com.wx.blink.admin.module.system.login.domain.LoginForm;
-import com.wx.blink.admin.module.system.login.domain.LoginResultVO;
-import com.wx.blink.admin.module.system.login.manager.factory.LoginStrategyFactory;
-import com.wx.blink.admin.module.system.login.service.LoginService;
-import com.wx.blink.admin.module.system.login.strategy.LoginStrategy;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
+import com.wx.blink.admin.system.login.domain.LoginForm;
+import com.wx.blink.admin.system.login.domain.LoginResultVO;
+import com.wx.blink.admin.system.login.manager.factory.LoginStrategyFactory;
+import com.wx.blink.admin.system.login.service.LoginService;
+import com.wx.blink.admin.system.login.strategy.LoginStrategy;
 import com.wx.blink.admin.util.AdminRequestUtil;
 import com.wx.blink.base.common.annoation.NoNeedLogin;
 import com.wx.blink.base.common.constant.RequestHeaderConst;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import com.wx.blink.base.common.util.BlinkRequestUtil;
 import com.wx.blink.base.module.support.captcha.domain.CaptchaVO;
-import org.springframework.web.bind.annotation.*;
 import com.wx.blink.base.module.support.securityprotect.service.Level3ProtectConfigService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -80,13 +80,6 @@ public class LoginController {
         return loginService.getCaptcha();
     }
 
-    @NoNeedLogin
-    @GetMapping("/login/sendEmailCode/{loginName}")
-    @Operation(summary = "获取邮箱登录验证码 @author admin")
-    public ResponseDTO<String> sendEmailCode(@PathVariable String loginName) {
-        return loginService.sendEmailCode(loginName);
-    }
-
 
     @NoNeedLogin
     @GetMapping("/login/getTwoFactorLoginFlag")

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/login/domain/LoginForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/login/domain/LoginForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.login.domain;
+package com.wx.blink.admin.system.login.domain;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/login/domain/LoginResultVO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/login/domain/LoginResultVO.java

@@ -1,8 +1,8 @@
-package com.wx.blink.admin.module.system.login.domain;
+package com.wx.blink.admin.system.login.domain;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import com.wx.blink.admin.module.system.menu.domain.vo.MenuVO;
+import com.wx.blink.admin.system.menu.domain.vo.MenuVO;
 
 import java.time.LocalDateTime;
 import java.util.List;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/login/domain/RequestEmployee.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/login/domain/RequestEmployee.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.login.domain;
+package com.wx.blink.admin.system.login.domain;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/login/manager/factory/LoginStrategyFactory.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/login/manager/factory/LoginStrategyFactory.java

@@ -1,9 +1,10 @@
-package com.wx.blink.admin.module.system.login.manager.factory;
+package com.wx.blink.admin.system.login.manager.factory;
 
 
-import com.wx.blink.admin.module.system.login.strategy.LoginStrategy;
-import com.wx.blink.admin.module.system.login.strategy.impl.DingTalkScanLoginStrategy;
-import com.wx.blink.admin.module.system.login.strategy.impl.UsernamePasswordLoginStrategy;
+import com.wx.blink.admin.system.login.strategy.LoginStrategy;
+import com.wx.blink.admin.system.login.strategy.impl.DingTalkScanLoginStrategy;
+import com.wx.blink.admin.system.login.strategy.impl.ProviderUsernamePasswordLoginStrategy;
+import com.wx.blink.admin.system.login.strategy.impl.UsernamePasswordLoginStrategy;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
@@ -30,10 +31,10 @@ public class LoginStrategyFactory {
                 return applicationContext.getBean(UsernamePasswordLoginStrategy.class);
             case "DINGTALK_SCAN":
                 return applicationContext.getBean(DingTalkScanLoginStrategy.class);
-            case "WECHAT_SCAN":
-                //return applicationContext.getBean(WeChatScanLoginStrategy.class);
+            case "PROVIDER_USERNAME_PASSWORD":
+                return applicationContext.getBean(ProviderUsernamePasswordLoginStrategy.class);
             default:
-                throw new IllegalArgumentException("Unsupported login type: " + loginType);
+                throw new IllegalArgumentException("不支持的登录类型: " + loginType);
         }
     }
 }

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/login/service/LoginService.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/login/service/LoginService.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.login.service;
+package com.wx.blink.admin.system.login.service;
 
 import cn.dev33.satoken.stp.StpInterface;
 import cn.dev33.satoken.stp.StpUtil;
@@ -6,17 +6,17 @@ import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.extra.servlet.ServletUtil;
-import com.wx.blink.admin.module.system.department.domain.vo.DepartmentVO;
-import com.wx.blink.admin.module.system.department.service.DepartmentService;
-import com.wx.blink.admin.module.system.employee.domain.entity.EmployeeEntity;
-import com.wx.blink.admin.module.system.employee.service.EmployeeService;
-import com.wx.blink.admin.module.system.login.domain.LoginForm;
-import com.wx.blink.admin.module.system.login.domain.LoginResultVO;
-import com.wx.blink.admin.module.system.login.domain.RequestEmployee;
-import com.wx.blink.admin.module.system.menu.domain.vo.MenuVO;
-import com.wx.blink.admin.module.system.role.domain.vo.RoleVO;
-import com.wx.blink.admin.module.system.role.service.RoleEmployeeService;
-import com.wx.blink.admin.module.system.role.service.RoleMenuService;
+import com.wx.blink.admin.system.department.domain.vo.DepartmentVO;
+import com.wx.blink.admin.system.department.service.DepartmentService;
+import com.wx.blink.admin.system.employee.domain.entity.EmployeeEntity;
+import com.wx.blink.admin.system.employee.service.EmployeeService;
+import com.wx.blink.admin.system.login.domain.LoginForm;
+import com.wx.blink.admin.system.login.domain.LoginResultVO;
+import com.wx.blink.admin.system.login.domain.RequestEmployee;
+import com.wx.blink.admin.system.menu.domain.vo.MenuVO;
+import com.wx.blink.admin.system.role.domain.vo.RoleVO;
+import com.wx.blink.admin.system.role.service.RoleEmployeeService;
+import com.wx.blink.admin.system.role.service.RoleMenuService;
 import com.wx.blink.base.common.code.UserErrorCode;
 import com.wx.blink.base.common.constant.RequestHeaderConst;
 import com.wx.blink.base.common.constant.StringConst;
@@ -184,11 +184,6 @@ public class LoginService implements StpInterface {
         String superPassword = configService.getConfigValue(ConfigKeyEnum.SUPER_PASSWORD);
         boolean superPasswordFlag = superPassword.equals(requestPassword);
 
-        // 校验双因子登录
-        ResponseDTO<String> validateEmailCode = validateEmailCode(loginForm, employeeEntity, superPasswordFlag);
-        if (!validateEmailCode.getOk()) {
-            return ResponseDTO.error(validateEmailCode);
-        }
 
         // 万能密码特殊操作
         if (superPasswordFlag) {
@@ -201,7 +196,7 @@ public class LoginService implements StpInterface {
         } else {
 
             // 按照等保登录要求，进行登录失败次数校验
-            ResponseDTO<LoginFailEntity> loginFailEntityResponseDTO = securityLoginService.checkLogin(employeeEntity.getEmployeeId(), UserTypeEnum.ADMIN_EMPLOYEE);
+            ResponseDTO<LoginFailEntity> loginFailEntityResponseDTO = securityLoginService.checkLogin(employeeEntity.getEmployeeId(), UserTypeEnum.EMPLOYEE);
             if (!loginFailEntityResponseDTO.getOk()) {
                 return ResponseDTO.error(loginFailEntityResponseDTO);
             }
@@ -211,16 +206,13 @@ public class LoginService implements StpInterface {
                 // 记录登录失败
                 saveLoginLog(employeeEntity, ip, userAgent, "密码错误", LoginLogResultEnum.LOGIN_FAIL);
                 // 记录等级保护次数
-                String msg = securityLoginService.recordLoginFail(employeeEntity.getEmployeeId(), UserTypeEnum.ADMIN_EMPLOYEE, employeeEntity.getLoginName(), loginFailEntityResponseDTO.getData());
+                String msg = securityLoginService.recordLoginFail(employeeEntity.getEmployeeId(), UserTypeEnum.EMPLOYEE, employeeEntity.getLoginName(), loginFailEntityResponseDTO.getData());
                 return msg == null ? ResponseDTO.userErrorParam("登录名或密码错误！") : ResponseDTO.error(UserErrorCode.LOGIN_FAIL_WILL_LOCK, msg);
             }
 
-            String saTokenLoginId = UserTypeEnum.ADMIN_EMPLOYEE.getValue() + StringConst.COLON + employeeEntity.getEmployeeId();
+            String saTokenLoginId = UserTypeEnum.EMPLOYEE.getValue() + StringConst.COLON + employeeEntity.getEmployeeId();
             // 登录
             StpUtil.login(saTokenLoginId, String.valueOf(loginDeviceEnum.getDesc()));
-
-            // 移除邮箱验证码
-            deleteEmailCode(employeeEntity.getEmployeeId());
         }
 
         // 获取员工信息
@@ -230,7 +222,7 @@ public class LoginService implements StpInterface {
         loginEmployeeCache.put(employeeEntity.getEmployeeId(), requestEmployee);
 
         // 移除登录失败
-        securityLoginService.removeLoginFail(employeeEntity.getEmployeeId(), UserTypeEnum.ADMIN_EMPLOYEE);
+        securityLoginService.removeLoginFail(employeeEntity.getEmployeeId(), UserTypeEnum.EMPLOYEE);
 
         // 获取登录结果信息
         String token = StpUtil.getTokenValue();
@@ -264,7 +256,7 @@ public class LoginService implements StpInterface {
         if (employeeEntity.getDisabledFlag()) {
             return ResponseDTO.userErrorParam("您的账号已被禁用,请联系工作人员！");
         }
-        String saTokenLoginId = UserTypeEnum.ADMIN_EMPLOYEE.getValue() + StringConst.COLON + employeeEntity.getEmployeeId();
+        String saTokenLoginId = UserTypeEnum.EMPLOYEE.getValue() + StringConst.COLON + employeeEntity.getEmployeeId();
         // 登录
         StpUtil.login(saTokenLoginId, String.valueOf(loginDeviceEnum.getDesc()));
         // 获取员工信息
@@ -274,7 +266,7 @@ public class LoginService implements StpInterface {
         loginEmployeeCache.put(employeeEntity.getEmployeeId(), requestEmployee);
 
         // 移除登录失败
-        securityLoginService.removeLoginFail(employeeEntity.getEmployeeId(), UserTypeEnum.ADMIN_EMPLOYEE);
+        securityLoginService.removeLoginFail(employeeEntity.getEmployeeId(), UserTypeEnum.EMPLOYEE);
 
         // 获取登录结果信息
         // 获取登录结果信息
@@ -314,7 +306,7 @@ public class LoginService implements StpInterface {
         if (employee.getDisabledFlag()) {
             return ResponseDTO.userErrorParam("您的账号已被禁用，请联系工作人员");
         }
-        String saTokenLoginId = UserTypeEnum.ADMIN_EMPLOYEE.getValue() + StringConst.COLON + employee.getEmployeeId();
+        String saTokenLoginId = UserTypeEnum.EMPLOYEE.getValue() + StringConst.COLON + employee.getEmployeeId();
         //登录
         StpUtil.login(saTokenLoginId, String.valueOf(deviceEnum.getDesc()));
         //获取员工信息
@@ -322,7 +314,7 @@ public class LoginService implements StpInterface {
         //放入缓存
         loginEmployeeCache.put(employee.getEmployeeId(), requestEmployee);
         //移出登陆失败
-        securityLoginService.removeLoginFail(employee.getEmployeeId(), UserTypeEnum.ADMIN_EMPLOYEE);
+        securityLoginService.removeLoginFail(employee.getEmployeeId(), UserTypeEnum.EMPLOYEE);
         //获取 登录结果信息
         String token = StpUtil.getTokenValue();
         LoginResultVO loginResult = getLoginResult(requestEmployee, token);
@@ -355,7 +347,7 @@ public class LoginService implements StpInterface {
         permissionCache.put(requestEmployee.getUserId(), userPermission);
 
         // 上次登录信息
-        LoginLogVO loginLogVO = loginLogService.queryLastByUserId(requestEmployee.getEmployeeId(), UserTypeEnum.ADMIN_EMPLOYEE, LoginLogResultEnum.LOGIN_SUCCESS);
+        LoginLogVO loginLogVO = loginLogService.queryLastByUserId(requestEmployee.getEmployeeId(), UserTypeEnum.EMPLOYEE, LoginLogResultEnum.LOGIN_SUCCESS);
         if (loginLogVO != null) {
             loginResultVO.setLastLoginIp(loginLogVO.getLoginIp());
             loginResultVO.setLastLoginIpRegion(loginLogVO.getLoginIpRegion());
@@ -383,7 +375,7 @@ public class LoginService implements StpInterface {
 
         // 基础信息
         RequestEmployee requestEmployee = BlinkBeanUtil.copy(employeeEntity, RequestEmployee.class);
-        requestEmployee.setUserType(UserTypeEnum.ADMIN_EMPLOYEE);
+        requestEmployee.setUserType(UserTypeEnum.EMPLOYEE);
 
         // 部门信息
         DepartmentVO department = departmentService.getDepartmentById(employeeEntity.getDepartmentId());
@@ -500,10 +492,10 @@ public class LoginService implements StpInterface {
     /**
      * 保存登录日志
      */
-    private void saveLoginLog(EmployeeEntity employeeEntity, String ip, String userAgent, String remark, LoginLogResultEnum result) {
+    public void saveLoginLog(EmployeeEntity employeeEntity, String ip, String userAgent, String remark, LoginLogResultEnum result) {
         LoginLogEntity loginEntity = LoginLogEntity.builder()
                 .userId(employeeEntity.getEmployeeId())
-                .userType(UserTypeEnum.ADMIN_EMPLOYEE.getValue())
+                .userType(UserTypeEnum.EMPLOYEE.getValue())
                 .userName(employeeEntity.getActualName())
                 .userAgent(userAgent)
                 .loginIp(ip)
@@ -584,99 +576,4 @@ public class LoginService implements StpInterface {
 
         return userPermission;
     }
-
-
-    /**
-     * 发送 邮箱 验证码
-     */
-    public ResponseDTO<String> sendEmailCode(String loginName) {
-
-        // 开启双因子登录
-        if (!level3ProtectConfigService.isTwoFactorLoginEnabled()) {
-            return ResponseDTO.userErrorParam("无需使用邮箱验证码");
-        }
-
-        // 验证登录名
-        EmployeeEntity employeeEntity = employeeService.getByLoginName(loginName);
-        if (null == employeeEntity) {
-            return ResponseDTO.userErrorParam("登录名不存在！");
-        }
-        // 验证账号状态
-        if (employeeEntity.getDeletedFlag()) {
-            return ResponseDTO.userErrorParam("您的账号已被删除,请联系工作人员！");
-        }
-
-        // 验证账号状态
-        if (employeeEntity.getDisabledFlag()) {
-            return ResponseDTO.userErrorParam("您的账号已被禁用,请联系工作人员！");
-        }
-
-        String mail = employeeEntity.getEmail();
-        if (BlinkStringUtil.isBlank(mail)) {
-            return ResponseDTO.userErrorParam("您暂未配置邮箱地址，请联系管理员配置邮箱");
-        }
-
-        // 校验验证码发送时间，60秒内不能重复发生
-        String redisVerificationCodeKey = redisService.generateRedisKey(RedisKeyConst.Support.LOGIN_VERIFICATION_CODE, UserTypeEnum.ADMIN_EMPLOYEE.getValue() + RedisKeyConst.SEPARATOR + employeeEntity.getEmployeeId());
-        String emailCode = redisService.get(redisVerificationCodeKey);
-        long sendCodeTimeMills = -1;
-        if (!BlinkStringUtil.isEmpty(emailCode)) {
-            sendCodeTimeMills = NumberUtil.parseLong(emailCode.split(StringConst.UNDERLINE)[1]);
-        }
-
-        if (System.currentTimeMillis() - sendCodeTimeMills < 60 * 1000) {
-            return ResponseDTO.userErrorParam("邮箱验证码已发送，一分钟内请勿重复发送");
-        }
-
-        //生成验证码
-        long currentTimeMillis = System.currentTimeMillis();
-        String verificationCode = RandomUtil.randomNumbers(4);
-        redisService.set(redisVerificationCodeKey, verificationCode + StringConst.UNDERLINE + currentTimeMillis, 300);
-
-        // 发送邮件验证码
-        HashMap<String, Object> mailParams = new HashMap<>();
-        mailParams.put("code", verificationCode);
-        return mailService.sendMail(MailTemplateCodeEnum.LOGIN_VERIFICATION_CODE, mailParams, Collections.singletonList(employeeEntity.getEmail()));
-    }
-
-
-    /**
-     * 校验邮箱验证码
-     */
-    private ResponseDTO<String> validateEmailCode(LoginForm loginForm, EmployeeEntity employeeEntity, boolean superPasswordFlag) {
-        // 万能密码则不校验
-        if (superPasswordFlag) {
-            return ResponseDTO.ok();
-        }
-
-        // 未开启双因子登录
-        if (!level3ProtectConfigService.isTwoFactorLoginEnabled()) {
-            return ResponseDTO.ok();
-        }
-
-        if (BlinkStringUtil.isEmpty(loginForm.getEmailCode())) {
-            return ResponseDTO.userErrorParam("请输入邮箱验证码");
-        }
-
-        // 校验验证码
-        String redisVerificationCodeKey = redisService.generateRedisKey(RedisKeyConst.Support.LOGIN_VERIFICATION_CODE, UserTypeEnum.ADMIN_EMPLOYEE.getValue() + RedisKeyConst.SEPARATOR + employeeEntity.getEmployeeId());
-        String emailCode = redisService.get(redisVerificationCodeKey);
-        if (BlinkStringUtil.isEmpty(emailCode)) {
-            return ResponseDTO.userErrorParam("邮箱验证码已失效，请重新发送");
-        }
-
-        if (!emailCode.split(StringConst.UNDERLINE)[0].equals(loginForm.getEmailCode().trim())) {
-            return ResponseDTO.userErrorParam("邮箱验证码错误，请重新填写");
-        }
-
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 移除邮箱验证码
-     */
-    private void deleteEmailCode(Long employeeId) {
-        String redisVerificationCodeKey = redisService.generateRedisKey(RedisKeyConst.Support.LOGIN_VERIFICATION_CODE, UserTypeEnum.ADMIN_EMPLOYEE.getValue() + RedisKeyConst.SEPARATOR + employeeId);
-        redisService.delete(redisVerificationCodeKey);
-    }
 }

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/login/strategy/LoginStrategy.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/login/strategy/LoginStrategy.java

@@ -1,8 +1,8 @@
-package com.wx.blink.admin.module.system.login.strategy;
+package com.wx.blink.admin.system.login.strategy;
 
 
-import com.wx.blink.admin.module.system.login.domain.LoginForm;
-import com.wx.blink.admin.module.system.login.domain.LoginResultVO;
+import com.wx.blink.admin.system.login.domain.LoginForm;
+import com.wx.blink.admin.system.login.domain.LoginResultVO;
 import com.wx.blink.base.common.domain.ResponseDTO;
 
 import javax.servlet.http.HttpServletRequest;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/login/strategy/impl/DingTalkScanLoginStrategy.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/login/strategy/impl/DingTalkScanLoginStrategy.java

@@ -1,10 +1,10 @@
-package com.wx.blink.admin.module.system.login.strategy.impl;
+package com.wx.blink.admin.system.login.strategy.impl;
 
 import cn.hutool.extra.servlet.ServletUtil;
-import com.wx.blink.admin.module.system.login.domain.LoginForm;
-import com.wx.blink.admin.module.system.login.domain.LoginResultVO;
-import com.wx.blink.admin.module.system.login.service.LoginService;
-import com.wx.blink.admin.module.system.login.strategy.LoginStrategy;
+import com.wx.blink.admin.system.login.domain.LoginForm;
+import com.wx.blink.admin.system.login.domain.LoginResultVO;
+import com.wx.blink.admin.system.login.service.LoginService;
+import com.wx.blink.admin.system.login.strategy.LoginStrategy;
 import com.wx.blink.base.common.constant.RequestHeaderConst;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import com.dingtalk.api.DefaultDingTalkClient;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/login/strategy/impl/ProviderUsernamePasswordLoginStrategy.java

@@ -0,0 +1,24 @@
+package com.wx.blink.admin.system.login.strategy.impl;
+
+import cn.hutool.extra.servlet.ServletUtil;
+import com.wx.blink.admin.system.login.domain.LoginForm;
+import com.wx.blink.admin.system.login.domain.LoginResultVO;
+import com.wx.blink.admin.system.login.service.LoginService;
+import com.wx.blink.admin.system.login.strategy.LoginStrategy;
+import com.wx.blink.base.common.constant.RequestHeaderConst;
+import com.wx.blink.base.common.domain.ResponseDTO;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+public class ProviderUsernamePasswordLoginStrategy implements LoginStrategy {
+
+    @Resource
+    private LoginService loginService;
+    @Override
+    public ResponseDTO<LoginResultVO> login(LoginForm loginForm, HttpServletRequest request) {
+        String ip = ServletUtil.getClientIP(request);
+        String userAgent = ServletUtil.getHeaderIgnoreCase(request, RequestHeaderConst.USER_AGENT);
+        return loginService.login(loginForm, ip, userAgent);
+    }
+}

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/login/strategy/impl/UsernamePasswordLoginStrategy.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/login/strategy/impl/UsernamePasswordLoginStrategy.java

@@ -1,10 +1,10 @@
-package com.wx.blink.admin.module.system.login.strategy.impl;
+package com.wx.blink.admin.system.login.strategy.impl;
 
 import cn.hutool.extra.servlet.ServletUtil;
-import com.wx.blink.admin.module.system.login.domain.LoginForm;
-import com.wx.blink.admin.module.system.login.domain.LoginResultVO;
-import com.wx.blink.admin.module.system.login.service.LoginService;
-import com.wx.blink.admin.module.system.login.strategy.LoginStrategy;
+import com.wx.blink.admin.system.login.domain.LoginForm;
+import com.wx.blink.admin.system.login.domain.LoginResultVO;
+import com.wx.blink.admin.system.login.service.LoginService;
+import com.wx.blink.admin.system.login.strategy.LoginStrategy;
 import com.wx.blink.base.common.constant.RequestHeaderConst;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import org.springframework.stereotype.Component;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/menu/constant/MenuPermsTypeEnum.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/menu/constant/MenuPermsTypeEnum.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.menu.constant;
+package com.wx.blink.admin.system.menu.constant;
 
 
 import com.wx.blink.base.common.enumeration.BaseEnum;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/menu/constant/MenuTypeEnum.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/menu/constant/MenuTypeEnum.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.menu.constant;
+package com.wx.blink.admin.system.menu.constant;
 
 
 import com.wx.blink.base.common.enumeration.BaseEnum;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/menu/controller/MenuController.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/menu/controller/MenuController.java

@@ -1,14 +1,14 @@
-package com.wx.blink.admin.module.system.menu.controller;
+package com.wx.blink.admin.system.menu.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.wx.blink.admin.constant.AdminSwaggerTagConst;
-import com.wx.blink.admin.module.system.menu.service.MenuService;
+import com.wx.blink.admin.system.menu.service.MenuService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
-import com.wx.blink.admin.module.system.menu.domain.form.MenuAddForm;
-import com.wx.blink.admin.module.system.menu.domain.form.MenuUpdateForm;
-import com.wx.blink.admin.module.system.menu.domain.vo.MenuTreeVO;
-import com.wx.blink.admin.module.system.menu.domain.vo.MenuVO;
+import com.wx.blink.admin.system.menu.domain.form.MenuAddForm;
+import com.wx.blink.admin.system.menu.domain.form.MenuUpdateForm;
+import com.wx.blink.admin.system.menu.domain.vo.MenuTreeVO;
+import com.wx.blink.admin.system.menu.domain.vo.MenuVO;
 import com.wx.blink.base.common.domain.RequestUrlVO;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import com.wx.blink.base.common.util.BlinkRequestUtil;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/menu/dao/MenuDao.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/menu/dao/MenuDao.java

@@ -1,8 +1,8 @@
-package com.wx.blink.admin.module.system.menu.dao;
+package com.wx.blink.admin.system.menu.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.wx.blink.admin.module.system.menu.domain.entity.MenuEntity;
-import com.wx.blink.admin.module.system.menu.domain.vo.MenuVO;
+import com.wx.blink.admin.system.menu.domain.entity.MenuEntity;
+import com.wx.blink.admin.system.menu.domain.vo.MenuVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/menu/domain/entity/MenuEntity.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/menu/domain/entity/MenuEntity.java

@@ -1,10 +1,10 @@
-package com.wx.blink.admin.module.system.menu.domain.entity;
+package com.wx.blink.admin.system.menu.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import com.wx.blink.admin.module.system.menu.constant.MenuTypeEnum;
+import com.wx.blink.admin.system.menu.constant.MenuTypeEnum;
 
 import java.time.LocalDateTime;
 

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/menu/domain/form/MenuAddForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/menu/domain/form/MenuAddForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.menu.domain.form;
+package com.wx.blink.admin.system.menu.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/menu/domain/form/MenuBaseForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/menu/domain/form/MenuBaseForm.java

@@ -1,12 +1,12 @@
-package com.wx.blink.admin.module.system.menu.domain.form;
+package com.wx.blink.admin.system.menu.domain.form;
 
-import com.wx.blink.admin.module.system.menu.constant.MenuPermsTypeEnum;
+import com.wx.blink.admin.system.menu.constant.MenuPermsTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import com.wx.blink.base.common.swagger.SchemaEnum;
 import com.wx.blink.base.common.validator.enumeration.CheckEnum;
 import org.hibernate.validator.constraints.Length;
-import com.wx.blink.admin.module.system.menu.constant.MenuTypeEnum;
+import com.wx.blink.admin.system.menu.constant.MenuTypeEnum;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/menu/domain/form/MenuPointsOperateForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/menu/domain/form/MenuPointsOperateForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.menu.domain.form;
+package com.wx.blink.admin.system.menu.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/menu/domain/form/MenuUpdateForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/menu/domain/form/MenuUpdateForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.menu.domain.form;
+package com.wx.blink.admin.system.menu.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/menu/domain/vo/MenuSimpleTreeVO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/menu/domain/vo/MenuSimpleTreeVO.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.menu.domain.vo;
+package com.wx.blink.admin.system.menu.domain.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/menu/domain/vo/MenuTreeVO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/menu/domain/vo/MenuTreeVO.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.menu.domain.vo;
+package com.wx.blink.admin.system.menu.domain.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/menu/domain/vo/MenuVO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/menu/domain/vo/MenuVO.java

@@ -1,6 +1,6 @@
-package com.wx.blink.admin.module.system.menu.domain.vo;
+package com.wx.blink.admin.system.menu.domain.vo;
 
-import com.wx.blink.admin.module.system.menu.domain.form.MenuBaseForm;
+import com.wx.blink.admin.system.menu.domain.form.MenuBaseForm;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/menu/service/MenuService.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/menu/service/MenuService.java

@@ -1,15 +1,15 @@
-package com.wx.blink.admin.module.system.menu.service;
+package com.wx.blink.admin.system.menu.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
-import com.wx.blink.admin.module.system.menu.constant.MenuTypeEnum;
-import com.wx.blink.admin.module.system.menu.dao.MenuDao;
-import com.wx.blink.admin.module.system.menu.domain.entity.MenuEntity;
-import com.wx.blink.admin.module.system.menu.domain.form.MenuAddForm;
-import com.wx.blink.admin.module.system.menu.domain.form.MenuBaseForm;
-import com.wx.blink.admin.module.system.menu.domain.form.MenuUpdateForm;
-import com.wx.blink.admin.module.system.menu.domain.vo.MenuTreeVO;
-import com.wx.blink.admin.module.system.menu.domain.vo.MenuVO;
+import com.wx.blink.admin.system.menu.constant.MenuTypeEnum;
+import com.wx.blink.admin.system.menu.dao.MenuDao;
+import com.wx.blink.admin.system.menu.domain.entity.MenuEntity;
+import com.wx.blink.admin.system.menu.domain.form.MenuAddForm;
+import com.wx.blink.admin.system.menu.domain.form.MenuBaseForm;
+import com.wx.blink.admin.system.menu.domain.form.MenuUpdateForm;
+import com.wx.blink.admin.system.menu.domain.vo.MenuTreeVO;
+import com.wx.blink.admin.system.menu.domain.vo.MenuVO;
 import com.wx.blink.base.common.code.SystemErrorCode;
 import com.wx.blink.base.common.domain.RequestUrlVO;
 import com.wx.blink.base.common.domain.ResponseDTO;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/position/controller/PositionController.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/position/controller/PositionController.java

@@ -1,11 +1,11 @@
-package com.wx.blink.admin.module.system.position.controller;
+package com.wx.blink.admin.system.position.controller;
 
 import com.wx.blink.admin.constant.AdminSwaggerTagConst;
-import com.wx.blink.admin.module.system.position.domain.form.PositionAddForm;
-import com.wx.blink.admin.module.system.position.domain.form.PositionQueryForm;
-import com.wx.blink.admin.module.system.position.domain.form.PositionUpdateForm;
-import com.wx.blink.admin.module.system.position.domain.vo.PositionVO;
-import com.wx.blink.admin.module.system.position.service.PositionService;
+import com.wx.blink.admin.system.position.domain.form.PositionAddForm;
+import com.wx.blink.admin.system.position.domain.form.PositionQueryForm;
+import com.wx.blink.admin.system.position.domain.form.PositionUpdateForm;
+import com.wx.blink.admin.system.position.domain.vo.PositionVO;
+import com.wx.blink.admin.system.position.service.PositionService;
 import com.wx.blink.base.common.domain.ValidateList;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/position/dao/PositionDao.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/position/dao/PositionDao.java

@@ -1,10 +1,10 @@
-package com.wx.blink.admin.module.system.position.dao;
+package com.wx.blink.admin.system.position.dao;
 
 import java.util.List;
 
-import com.wx.blink.admin.module.system.position.domain.entity.PositionEntity;
-import com.wx.blink.admin.module.system.position.domain.form.PositionQueryForm;
-import com.wx.blink.admin.module.system.position.domain.vo.PositionVO;
+import com.wx.blink.admin.system.position.domain.entity.PositionEntity;
+import com.wx.blink.admin.system.position.domain.form.PositionQueryForm;
+import com.wx.blink.admin.system.position.domain.vo.PositionVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/position/domain/entity/PositionEntity.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/position/domain/entity/PositionEntity.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.position.domain.entity;
+package com.wx.blink.admin.system.position.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/position/domain/form/PositionAddForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/position/domain/form/PositionAddForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.position.domain.form;
+package com.wx.blink.admin.system.position.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import javax.validation.constraints.NotBlank;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/position/domain/form/PositionQueryForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/position/domain/form/PositionQueryForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.position.domain.form;
+package com.wx.blink.admin.system.position.domain.form;
 
 import com.wx.blink.base.common.domain.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/position/domain/form/PositionUpdateForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/position/domain/form/PositionUpdateForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.position.domain.form;
+package com.wx.blink.admin.system.position.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/position/domain/vo/PositionVO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/position/domain/vo/PositionVO.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.position.domain.vo;
+package com.wx.blink.admin.system.position.domain.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.LocalDateTime;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/position/manager/PositionManager.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/position/manager/PositionManager.java

@@ -1,7 +1,7 @@
-package com.wx.blink.admin.module.system.position.manager;
+package com.wx.blink.admin.system.position.manager;
 
-import com.wx.blink.admin.module.system.position.dao.PositionDao;
-import com.wx.blink.admin.module.system.position.domain.entity.PositionEntity;
+import com.wx.blink.admin.system.position.dao.PositionDao;
+import com.wx.blink.admin.system.position.domain.entity.PositionEntity;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/position/service/PositionService.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/position/service/PositionService.java

@@ -1,12 +1,12 @@
-package com.wx.blink.admin.module.system.position.service;
+package com.wx.blink.admin.system.position.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.wx.blink.admin.module.system.position.domain.form.PositionQueryForm;
-import com.wx.blink.admin.module.system.position.domain.form.PositionUpdateForm;
-import com.wx.blink.admin.module.system.position.domain.vo.PositionVO;
-import com.wx.blink.admin.module.system.position.dao.PositionDao;
-import com.wx.blink.admin.module.system.position.domain.entity.PositionEntity;
-import com.wx.blink.admin.module.system.position.domain.form.PositionAddForm;
+import com.wx.blink.admin.system.position.domain.form.PositionQueryForm;
+import com.wx.blink.admin.system.position.domain.form.PositionUpdateForm;
+import com.wx.blink.admin.system.position.domain.vo.PositionVO;
+import com.wx.blink.admin.system.position.dao.PositionDao;
+import com.wx.blink.admin.system.position.domain.entity.PositionEntity;
+import com.wx.blink.admin.system.position.domain.form.PositionAddForm;
 import com.wx.blink.base.common.domain.PageResult;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import com.wx.blink.base.common.util.BlinkBeanUtil;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/controller/RoleController.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/controller/RoleController.java

@@ -1,13 +1,13 @@
-package com.wx.blink.admin.module.system.role.controller;
+package com.wx.blink.admin.system.role.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.wx.blink.admin.constant.AdminSwaggerTagConst;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
-import com.wx.blink.admin.module.system.role.domain.form.RoleAddForm;
-import com.wx.blink.admin.module.system.role.domain.form.RoleUpdateForm;
-import com.wx.blink.admin.module.system.role.domain.vo.RoleVO;
-import com.wx.blink.admin.module.system.role.service.RoleService;
+import com.wx.blink.admin.system.role.domain.form.RoleAddForm;
+import com.wx.blink.admin.system.role.domain.form.RoleUpdateForm;
+import com.wx.blink.admin.system.role.domain.vo.RoleVO;
+import com.wx.blink.admin.system.role.service.RoleService;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import org.springframework.web.bind.annotation.*;
 

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/controller/RoleDataScopeController.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/controller/RoleDataScopeController.java

@@ -1,12 +1,12 @@
-package com.wx.blink.admin.module.system.role.controller;
+package com.wx.blink.admin.system.role.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.wx.blink.admin.constant.AdminSwaggerTagConst;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
-import com.wx.blink.admin.module.system.role.domain.form.RoleDataScopeUpdateForm;
-import com.wx.blink.admin.module.system.role.domain.vo.RoleDataScopeVO;
-import com.wx.blink.admin.module.system.role.service.RoleDataScopeService;
+import com.wx.blink.admin.system.role.domain.form.RoleDataScopeUpdateForm;
+import com.wx.blink.admin.system.role.domain.vo.RoleDataScopeVO;
+import com.wx.blink.admin.system.role.service.RoleDataScopeService;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import org.springframework.web.bind.annotation.*;
 

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/controller/RoleEmployeeController.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/controller/RoleEmployeeController.java

@@ -1,14 +1,14 @@
-package com.wx.blink.admin.module.system.role.controller;
+package com.wx.blink.admin.system.role.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.wx.blink.admin.constant.AdminSwaggerTagConst;
-import com.wx.blink.admin.module.system.employee.domain.vo.EmployeeVO;
+import com.wx.blink.admin.system.employee.domain.vo.EmployeeVO;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
-import com.wx.blink.admin.module.system.role.domain.form.RoleEmployeeQueryForm;
-import com.wx.blink.admin.module.system.role.domain.form.RoleEmployeeUpdateForm;
-import com.wx.blink.admin.module.system.role.domain.vo.RoleSelectedVO;
-import com.wx.blink.admin.module.system.role.service.RoleEmployeeService;
+import com.wx.blink.admin.system.role.domain.form.RoleEmployeeQueryForm;
+import com.wx.blink.admin.system.role.domain.form.RoleEmployeeUpdateForm;
+import com.wx.blink.admin.system.role.domain.vo.RoleSelectedVO;
+import com.wx.blink.admin.system.role.service.RoleEmployeeService;
 import com.wx.blink.base.common.domain.PageResult;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import org.springframework.web.bind.annotation.*;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/controller/RoleMenuController.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/controller/RoleMenuController.java

@@ -1,12 +1,12 @@
-package com.wx.blink.admin.module.system.role.controller;
+package com.wx.blink.admin.system.role.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.wx.blink.admin.constant.AdminSwaggerTagConst;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
-import com.wx.blink.admin.module.system.role.domain.form.RoleMenuUpdateForm;
-import com.wx.blink.admin.module.system.role.domain.vo.RoleMenuTreeVO;
-import com.wx.blink.admin.module.system.role.service.RoleMenuService;
+import com.wx.blink.admin.system.role.domain.form.RoleMenuUpdateForm;
+import com.wx.blink.admin.system.role.domain.vo.RoleMenuTreeVO;
+import com.wx.blink.admin.system.role.service.RoleMenuService;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import org.springframework.web.bind.annotation.*;
 

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/dao/RoleDao.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/dao/RoleDao.java

@@ -1,7 +1,7 @@
-package com.wx.blink.admin.module.system.role.dao;
+package com.wx.blink.admin.system.role.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.wx.blink.admin.module.system.role.domain.entity.RoleEntity;
+import com.wx.blink.admin.system.role.domain.entity.RoleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/dao/RoleDataScopeDao.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/dao/RoleDataScopeDao.java

@@ -1,7 +1,7 @@
-package com.wx.blink.admin.module.system.role.dao;
+package com.wx.blink.admin.system.role.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.wx.blink.admin.module.system.role.domain.entity.RoleDataScopeEntity;
+import com.wx.blink.admin.system.role.domain.entity.RoleDataScopeEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/dao/RoleEmployeeDao.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/dao/RoleEmployeeDao.java

@@ -1,12 +1,12 @@
-package com.wx.blink.admin.module.system.role.dao;
+package com.wx.blink.admin.system.role.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.wx.blink.admin.module.system.employee.domain.vo.EmployeeVO;
-import com.wx.blink.admin.module.system.role.domain.entity.RoleEmployeeEntity;
-import com.wx.blink.admin.module.system.role.domain.form.RoleEmployeeQueryForm;
-import com.wx.blink.admin.module.system.role.domain.vo.RoleEmployeeVO;
-import com.wx.blink.admin.module.system.role.domain.vo.RoleVO;
+import com.wx.blink.admin.system.employee.domain.vo.EmployeeVO;
+import com.wx.blink.admin.system.role.domain.entity.RoleEmployeeEntity;
+import com.wx.blink.admin.system.role.domain.form.RoleEmployeeQueryForm;
+import com.wx.blink.admin.system.role.domain.vo.RoleEmployeeVO;
+import com.wx.blink.admin.system.role.domain.vo.RoleVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/dao/RoleMenuDao.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/dao/RoleMenuDao.java

@@ -1,8 +1,8 @@
-package com.wx.blink.admin.module.system.role.dao;
+package com.wx.blink.admin.system.role.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.wx.blink.admin.module.system.role.domain.entity.RoleMenuEntity;
-import com.wx.blink.admin.module.system.menu.domain.entity.MenuEntity;
+import com.wx.blink.admin.system.role.domain.entity.RoleMenuEntity;
+import com.wx.blink.admin.system.menu.domain.entity.MenuEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/domain/entity/RoleDataScopeEntity.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/domain/entity/RoleDataScopeEntity.java

@@ -1,10 +1,10 @@
-package com.wx.blink.admin.module.system.role.domain.entity;
+package com.wx.blink.admin.system.role.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.wx.blink.admin.module.system.datascope.constant.DataScopeTypeEnum;
-import com.wx.blink.admin.module.system.datascope.constant.DataScopeViewTypeEnum;
+import com.wx.blink.admin.system.datascope.constant.DataScopeTypeEnum;
+import com.wx.blink.admin.system.datascope.constant.DataScopeViewTypeEnum;
 import lombok.Data;
 
 import java.time.LocalDateTime;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/domain/entity/RoleEmployeeEntity.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/domain/entity/RoleEmployeeEntity.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.role.domain.entity;
+package com.wx.blink.admin.system.role.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/domain/entity/RoleEntity.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/domain/entity/RoleEntity.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.role.domain.entity;
+package com.wx.blink.admin.system.role.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/domain/entity/RoleMenuEntity.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/domain/entity/RoleMenuEntity.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.role.domain.entity;
+package com.wx.blink.admin.system.role.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/domain/form/RoleAddForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/domain/form/RoleAddForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.role.domain.form;
+package com.wx.blink.admin.system.role.domain.form;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/domain/form/RoleDataScopeUpdateForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/domain/form/RoleDataScopeUpdateForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.role.domain.form;
+package com.wx.blink.admin.system.role.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/domain/form/RoleEmployeeQueryForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/domain/form/RoleEmployeeQueryForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.role.domain.form;
+package com.wx.blink.admin.system.role.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/domain/form/RoleEmployeeUpdateForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.role.domain.form;
+package com.wx.blink.admin.system.role.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/domain/form/RoleMenuUpdateForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/domain/form/RoleMenuUpdateForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.role.domain.form;
+package com.wx.blink.admin.system.role.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/domain/form/RoleQueryForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/domain/form/RoleQueryForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.role.domain.form;
+package com.wx.blink.admin.system.role.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/domain/form/RoleUpdateForm.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/domain/form/RoleUpdateForm.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.role.domain.form;
+package com.wx.blink.admin.system.role.domain.form;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/domain/vo/RoleDataScopeVO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/domain/vo/RoleDataScopeVO.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.role.domain.vo;
+package com.wx.blink.admin.system.role.domain.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/domain/vo/RoleEmployeeVO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/domain/vo/RoleEmployeeVO.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.role.domain.vo;
+package com.wx.blink.admin.system.role.domain.vo;
 
 import lombok.Data;
 

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/domain/vo/RoleMenuTreeVO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/domain/vo/RoleMenuTreeVO.java

@@ -1,8 +1,8 @@
-package com.wx.blink.admin.module.system.role.domain.vo;
+package com.wx.blink.admin.system.role.domain.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import com.wx.blink.admin.module.system.menu.domain.vo.MenuSimpleTreeVO;
+import com.wx.blink.admin.system.menu.domain.vo.MenuSimpleTreeVO;
 
 import java.util.List;
 

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/domain/vo/RoleSelectedVO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/domain/vo/RoleSelectedVO.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.role.domain.vo;
+package com.wx.blink.admin.system.role.domain.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/domain/vo/RoleVO.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/domain/vo/RoleVO.java

@@ -1,4 +1,4 @@
-package com.wx.blink.admin.module.system.role.domain.vo;
+package com.wx.blink.admin.system.role.domain.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/manager/RoleDataScopeManager.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/manager/RoleDataScopeManager.java

@@ -1,8 +1,8 @@
-package com.wx.blink.admin.module.system.role.manager;
+package com.wx.blink.admin.system.role.manager;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wx.blink.admin.module.system.role.dao.RoleDataScopeDao;
-import com.wx.blink.admin.module.system.role.domain.entity.RoleDataScopeEntity;
+import com.wx.blink.admin.system.role.dao.RoleDataScopeDao;
+import com.wx.blink.admin.system.role.domain.entity.RoleDataScopeEntity;
 import org.springframework.stereotype.Service;
 
 /**

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/manager/RoleEmployeeManager.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/manager/RoleEmployeeManager.java

@@ -1,8 +1,8 @@
-package com.wx.blink.admin.module.system.role.manager;
+package com.wx.blink.admin.system.role.manager;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wx.blink.admin.module.system.role.dao.RoleEmployeeDao;
-import com.wx.blink.admin.module.system.role.domain.entity.RoleEmployeeEntity;
+import com.wx.blink.admin.system.role.dao.RoleEmployeeDao;
+import com.wx.blink.admin.system.role.domain.entity.RoleEmployeeEntity;
 import org.springframework.stereotype.Service;
 
 /**

bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/module/system/role/manager/RoleMenuManager.java → bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/role/manager/RoleMenuManager.java

@@ -1,8 +1,8 @@
-package com.wx.blink.admin.module.system.role.manager;
+package com.wx.blink.admin.system.role.manager;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wx.blink.admin.module.system.role.dao.RoleMenuDao;
-import com.wx.blink.admin.module.system.role.domain.entity.RoleMenuEntity;
+import com.wx.blink.admin.system.role.dao.RoleMenuDao;
+import com.wx.blink.admin.system.role.domain.entity.RoleMenuEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;