冲突修改

service-backend/service-backend-biz/src/main/java/com/usky/backend/mapper/SysConfigMapper.java

@@ -1,7 +1,7 @@
 package com.usky.backend.mapper;
 
 import com.usky.backend.domain.SysConfig;
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 import org.springframework.stereotype.Repository;
 
 

service-backend/service-backend-biz/src/main/java/com/usky/backend/mapper/SysTenantMapper.java

@@ -1,7 +1,7 @@
 package com.usky.backend.mapper;
 
 import com.usky.backend.domain.SysTenant;
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 
 
 /**

service-backend/service-backend-biz/src/main/java/com/usky/backend/mapper/SysUserMapper.java

@@ -1,7 +1,7 @@
 package com.usky.backend.mapper;
 
 import com.usky.backend.domain.SysUser;
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 
 /**
  * <p>

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/SysConfigService.java

@@ -1,7 +1,7 @@
 package com.usky.backend.service;
 
 import com.usky.backend.domain.SysConfig;
-import com.usky.common.mybatis.core.CrudService;
+import com.usky.common.mvc.base.CrudService;
 
 
 /**

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/SysTenantService.java

@@ -3,7 +3,7 @@ package com.usky.backend.service;
 import com.usky.backend.domain.SysTenant;
 import com.usky.backend.domain.vo.SysConfigLoginVo;
 import com.usky.backend.domain.vo.SysConfigTenantVo;
-import com.usky.common.mybatis.core.CrudService;
+import com.usky.common.mvc.base.CrudService;
 
 /**
  * <p>

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/SysUserService.java

@@ -1,7 +1,7 @@
 package com.usky.backend.service;
 
 import com.usky.backend.domain.SysUser;
-import com.usky.common.mybatis.core.CrudService;
+import com.usky.common.mvc.base.CrudService;
 
 /**
  * <p>

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/SysConfigServiceImpl.java

@@ -3,7 +3,7 @@ package com.usky.backend.service.impl;
 import com.usky.backend.domain.SysConfig;
 import com.usky.backend.mapper.SysConfigMapper;
 import com.usky.backend.service.SysConfigService;
-import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 /**

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/SysTenantServiceImpl.java

@@ -9,7 +9,7 @@ import com.usky.backend.domain.vo.SysConfigTenantVo;
 import com.usky.backend.mapper.SysConfigMapper;
 import com.usky.backend.mapper.SysTenantMapper;
 import com.usky.backend.service.SysTenantService;
-import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.mvc.base.AbstractCrudService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/SysUserServiceImpl.java

@@ -3,7 +3,7 @@ package com.usky.backend.service.impl;
 import com.usky.backend.domain.SysUser;
 import com.usky.backend.mapper.SysUserMapper;
 import com.usky.backend.service.SysUserService;
-import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 /**

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysConfigController.java

@@ -1,9 +1,9 @@
 package com.usky.system.controller.web;
 
 
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessErrorCode;
-import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.controller.web.page.TableDataInfo;
 import com.usky.system.domain.SysConfig;
 import com.usky.system.domain.constants.UserConstants;

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysDictDataController.java

@@ -1,8 +1,8 @@
 package com.usky.system.controller.web;
 
 
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
-import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.controller.web.page.TableDataInfo;
 import com.usky.system.domain.SysDictData;
 import com.usky.system.service.ISysDictDataService;

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysDictTypeController.java

@@ -1,9 +1,9 @@
 package com.usky.system.controller.web;
 
 
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessErrorCode;
-import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.controller.web.page.TableDataInfo;
 import com.usky.system.domain.SysDictType;
 import com.usky.system.domain.constants.UserConstants;

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysMenuController.java

@@ -1,13 +1,13 @@
 package com.usky.system.controller.web;
 
 
+import com.ruoyi.common.core.utils.ServletUtils;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.constants.CommonConst;
 import com.usky.common.core.exception.BusinessErrorCode;
-import com.usky.common.core.util.ServletUtils;
 import com.usky.common.core.util.StringUtils;
-import com.usky.common.security.service.TokenService;
-import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.domain.SysMenu;
 import com.usky.system.domain.SysUser;
 import com.usky.system.domain.constants.UserConstants;

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysNoticeController.java

@@ -1,8 +1,8 @@
 package com.usky.system.controller.web;
 
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
-import com.usky.common.security.annotation.RequiresPermissions;
-import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.controller.web.page.TableDataInfo;
 import com.usky.system.domain.SysNotice;
 import com.usky.system.service.ISysNoticeService;

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysPostController.java

@@ -1,9 +1,9 @@
 package com.usky.system.controller.web;
 
 
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessErrorCode;
-import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.controller.web.page.TableDataInfo;
 import com.usky.system.domain.SysPost;
 import com.usky.system.domain.constants.UserConstants;

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysRoleController.java

@@ -1,9 +1,9 @@
 package com.usky.system.controller.web;
 
 
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessErrorCode;
-import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.controller.web.page.TableDataInfo;
 import com.usky.system.domain.SysRole;
 import com.usky.system.domain.SysUser;

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysUserController.java

@@ -1,12 +1,9 @@
 package com.usky.system.controller.web;
 
 
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessErrorCode;
-import com.usky.common.core.util.StringUtils;
-import com.usky.common.log.annotation.Log;
-import com.usky.common.log.enums.BusinessType;
-import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.controller.web.page.TableDataInfo;
 import com.usky.system.domain.SysRole;
 import com.usky.system.domain.SysUser;
@@ -46,7 +43,7 @@ public class SysUserController extends BaseController
     /**
      * 获取用户列表
      */
-    @Log(title = "用户管理", businessType = BusinessType.OTHER)
+//    @Log(title = "用户管理", businessType = BusinessType.OTHER)
     @GetMapping("/list")
     public ApiResult<TableDataInfo> list(SysUser user)
     {
@@ -77,7 +74,7 @@ public class SysUserController extends BaseController
     /**
      * 新增用户
      */
-    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+//    @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @Transactional
     @PostMapping
     public ApiResult<Void> add(@Validated @RequestBody SysUser user)
@@ -97,7 +94,7 @@ public class SysUserController extends BaseController
     /**
      * 修改用户
      */
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+//    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @Transactional
     @PutMapping
     public ApiResult<Void> edit(@Validated @RequestBody SysUser user)
@@ -110,7 +107,7 @@ public class SysUserController extends BaseController
     /**
      * 删除用户
      */
-    @Log(title = "用户管理", businessType = BusinessType.DELETE)
+//    @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     public ApiResult<Void> remove(@PathVariable Long[] userIds)
     {

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TokenController.java

@@ -1,11 +1,11 @@
 package com.usky.system.controller.web;
 
+import com.ruoyi.common.core.utils.JwtUtils;
+import com.ruoyi.common.security.auth.AuthUtil;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.util.JwtUtils;
 import com.usky.common.core.util.StringUtils;
-import com.usky.common.security.auth.AuthUtil;
-import com.usky.common.security.service.TokenService;
-import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.model.LoginUser;
 import com.usky.system.service.ISysPermissionService;
 import com.usky.system.service.ISysUserService;

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysConfig.java

@@ -1,7 +1,7 @@
 package com.usky.system.domain;
 
 
-import com.usky.common.core.bean.BaseEntity;
+import com.ruoyi.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysDept.java

@@ -2,7 +2,7 @@ package com.usky.system.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.usky.common.core.bean.BaseEntity;
+import com.ruoyi.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysDictData.java

@@ -1,7 +1,7 @@
 package com.usky.system.domain;
 
 
-import com.usky.common.core.bean.BaseEntity;
+import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.usky.system.domain.constants.UserConstants;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysDictType.java

@@ -1,7 +1,7 @@
 package com.usky.system.domain;
 
 
-import com.usky.common.core.bean.BaseEntity;
+import com.ruoyi.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysMenu.java

@@ -1,7 +1,7 @@
 package com.usky.system.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.usky.common.core.bean.BaseEntity;
+import com.ruoyi.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysNotice.java

@@ -1,7 +1,7 @@
 package com.usky.system.domain;
 
 
-import com.usky.common.core.bean.BaseEntity;
+import com.ruoyi.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysPost.java

@@ -1,7 +1,7 @@
 package com.usky.system.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.usky.common.core.bean.BaseEntity;
+import com.ruoyi.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysRole.java

@@ -1,7 +1,7 @@
 package com.usky.system.domain;
 
 
-import com.usky.common.core.bean.BaseEntity;
+import com.ruoyi.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysUser.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.usky.common.core.bean.BaseEntity;
+import com.ruoyi.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysConfigMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysConfig;
 import org.springframework.stereotype.Repository;
 

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysDictDataMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysDictData;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysDictTypeMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysDictType;
 import org.springframework.stereotype.Repository;
 

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysLogininforMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysLogininfor;
 import org.springframework.stereotype.Repository;
 

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysMenuMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysMenu;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysNoticeMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysNotice;
 import org.springframework.stereotype.Repository;
 

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysOperLogMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysOperLog;
 import org.springframework.stereotype.Repository;
 

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysPostMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysPost;
 import org.springframework.stereotype.Repository;
 

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysRoleDeptMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysRoleDept;
 import org.springframework.stereotype.Repository;
 

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysRoleMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysRole;
 import org.springframework.stereotype.Repository;
 

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysRoleMenuMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysRoleMenu;
 import org.springframework.stereotype.Repository;
 

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysUser;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserPostMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysUserPost;
 import org.springframework.stereotype.Repository;
 

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserRoleMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.common.mvc.base.CrudMapper;
 import com.usky.system.domain.SysUserRole;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysConfigService.java

@@ -1,7 +1,7 @@
 package com.usky.system.service;
 
 
-import com.usky.common.mybatis.core.CrudService;
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysConfig;
 
 import java.util.List;

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysDictDataService.java

@@ -1,7 +1,7 @@
 package com.usky.system.service;
 
 
-import com.usky.common.mybatis.core.CrudService;
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysDictData;
 
 import java.util.List;

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysDictTypeService.java

@@ -1,7 +1,7 @@
 package com.usky.system.service;
 
 
-import com.usky.common.mybatis.core.CrudService;
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysDictData;
 import com.usky.system.domain.SysDictType;
 

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysLogininforService.java

@@ -1,7 +1,7 @@
 package com.usky.system.service;
 
 
-import com.usky.common.mybatis.core.CrudService;
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysLogininfor;
 
 import java.util.List;

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysMenuService.java

@@ -1,7 +1,7 @@
 package com.usky.system.service;
 
 
-import com.usky.common.mybatis.core.CrudService;
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysMenu;
 import com.usky.system.service.vo.RouterVo;
 import com.usky.system.service.vo.TreeSelect;

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysNoticeService.java

@@ -1,7 +1,7 @@
 package com.usky.system.service;
 
 
-import com.usky.common.mybatis.core.CrudService;
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysNotice;
 
 import java.util.List;

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysOperLogService.java

@@ -1,7 +1,7 @@
 package com.usky.system.service;
 
 
-import com.usky.common.mybatis.core.CrudService;
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysOperLog;
 
 import java.util.List;

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysPostService.java

@@ -1,7 +1,7 @@
 package com.usky.system.service;
 
 
-import com.usky.common.mybatis.core.CrudService;
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysPost;
 
 import java.util.List;

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysRoleService.java

@@ -1,7 +1,7 @@
 package com.usky.system.service;
 
 
-import com.usky.common.mybatis.core.CrudService;
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysRole;
 import com.usky.system.domain.SysUserRole;
 

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysUserService.java

@@ -1,7 +1,7 @@
 package com.usky.system.service;
 
 import com.usky.common.core.bean.CommonPage;
-import com.usky.common.mybatis.core.CrudService;
+import com.usky.common.mvc.base.CrudService;
 import com.usky.system.domain.SysUser;
 import com.usky.system.model.LoginUser;
 

service-system/service-system-biz/src/main/java/com/usky/system/service/SysLoginService.java

@@ -1,12 +1,12 @@
 package com.usky.system.service;
 
-import com.usky.common.core.constants.Constants;
+import com.ruoyi.common.core.constant.Constants;
+import com.ruoyi.common.core.utils.ServletUtils;
+import com.ruoyi.common.core.utils.ip.IpUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.util.BeanMapperUtils;
-import com.usky.common.core.util.IpUtils;
-import com.usky.common.core.util.ServletUtils;
 import com.usky.common.core.util.StringUtils;
-import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.domain.SysLogininfor;
 import com.usky.system.domain.SysLogininforVO;
 import com.usky.system.domain.SysUser;

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysConfigServiceImpl.java

@@ -1,12 +1,12 @@
 package com.usky.system.service.impl;
 
 
-import com.usky.common.core.constants.Constants;
+import com.ruoyi.common.core.constant.Constants;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.util.Convert;
 import com.usky.common.core.util.StringUtils;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import com.usky.common.redis.core.RedisHelper;
+import com.usky.common.mvc.base.AbstractCrudService;
+import com.usky.common.spring.config.redis.RedisHelper;
 import com.usky.system.domain.SysConfig;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysConfigMapper;

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDeptServiceImpl.java

@@ -1,11 +1,11 @@
 package com.usky.system.service.impl;
 
 
-import com.usky.common.security.utils.SecurityUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.util.Convert;
 import com.usky.common.core.util.StringUtils;
-import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysDept;
 import com.usky.system.domain.SysRole;
 import com.usky.system.domain.constants.UserConstants;

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDictDataServiceImpl.java

@@ -1,7 +1,7 @@
 package com.usky.system.service.impl;
 
 
-import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysDictData;
 import com.usky.system.mapper.SysDictDataMapper;
 import com.usky.system.service.ISysDictDataService;

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDictTypeServiceImpl.java

@@ -1,9 +1,9 @@
 package com.usky.system.service.impl;
 
 
-import com.usky.common.security.utils.SecurityUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.exception.BusinessException;
-import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysDictData;
 import com.usky.system.domain.SysDictType;
 import com.usky.system.domain.constants.UserConstants;

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysLogininforServiceImpl.java

@@ -1,7 +1,7 @@
 package com.usky.system.service.impl;
 
 
-import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysLogininfor;
 import com.usky.system.mapper.SysLogininforMapper;
 import com.usky.system.service.ISysLogininforService;

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysMenuServiceImpl.java

@@ -1,8 +1,8 @@
 package com.usky.system.service.impl;
 
-import com.usky.common.core.constants.Constants;
+import com.ruoyi.common.core.constant.Constants;
 import com.usky.common.core.util.StringUtils;
-import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysMenu;
 import com.usky.system.domain.SysRole;
 import com.usky.system.domain.SysUserVO;

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysNoticeServiceImpl.java

@@ -1,7 +1,7 @@
 package com.usky.system.service.impl;
 
 
-import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysNotice;
 import com.usky.system.mapper.SysNoticeMapper;
 import com.usky.system.service.ISysNoticeService;

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysOperLogServiceImpl.java

@@ -1,7 +1,7 @@
 package com.usky.system.service.impl;
 
 
-import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysOperLog;
 import com.usky.system.mapper.SysOperLogMapper;
 import com.usky.system.service.ISysOperLogService;

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysPostServiceImpl.java

@@ -1,13 +1,8 @@
 package com.usky.system.service.impl;
 
-
-<<<<<<< HEAD
-
 import com.ruoyi.common.security.utils.SecurityUtils;
-=======
->>>>>>> master
 import com.usky.common.core.exception.BusinessException;
-import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysPost;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysPostMapper;

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysRoleServiceImpl.java

@@ -1,14 +1,9 @@
 package com.usky.system.service.impl;
 
-
-<<<<<<< HEAD
-
 import com.ruoyi.common.security.utils.SecurityUtils;
-=======
->>>>>>> master
 import com.usky.common.core.exception.BusinessException;
-import com.usky.common.core.util.SpringContextUtils;
-import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.mvc.base.AbstractCrudService;
+import com.usky.common.spring.util.SpringContextUtils;
 import com.usky.system.domain.SysRole;
 import com.usky.system.domain.SysRoleDept;
 import com.usky.system.domain.SysRoleMenu;

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -6,7 +6,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.util.BeanMapperUtils;
 import com.usky.common.core.util.StringUtils;
-import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.*;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.*;

service-system/service-system-biz/src/main/java/com/usky/system/service/vo/MetaVo.java

@@ -1,7 +1,7 @@
 package com.usky.system.service.vo;
 
 
-import com.usky.common.core.constants.Constants;
+import com.ruoyi.common.core.constant.Constants;
 import com.usky.common.core.util.StringUtils;