重新设置依赖，整合日志模块

service-backend/pom.xml

@@ -12,7 +12,8 @@
     <packaging>pom</packaging>
     <version>0.0.1</version>
 
-<modules>  <module>service-backend-biz</module>
+<modules>
+    <module>service-backend-biz</module>
     <module>service-backend-api</module>
   </modules>
 </project>

service-backend/service-backend-biz/pom.xml

@@ -9,80 +9,20 @@
 
     <artifactId>service-backend-biz</artifactId>
     <dependencies>
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-<!--        &lt;!&ndash; SpringCloud Alibaba Sentinel &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>-->
-<!--        </dependency>-->
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.usky</groupId>
-            <artifactId>usky-common-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>usky-common-spring</artifactId>
+            <artifactId>common-cloud-starter</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.usky</groupId>
-            <artifactId>usky-common-mvc</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>6.0.18.Final</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-generator</artifactId>
-            <version>3.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-            <version>2.1</version>
-        </dependency>
-
-        <!-- mysql 驱动 -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
-
+        <!-- Pagehelper -->
         <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
         </dependency>
 
 

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

@@ -1,7 +1,9 @@
 package com.usky.backend.mapper;
 
 import com.usky.backend.domain.SysConfig;
-import com.usky.common.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
+
 
 /**
  * <p>
@@ -11,6 +13,7 @@ import com.usky.common.mvc.base.CrudMapper;
  * @author ya
  * @since 2022-04-29
  */
+@Repository
 public interface SysConfigMapper extends CrudMapper<SysConfig> {
 
 }

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

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

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.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.CrudMapper;
 
 /**
  * <p>

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

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

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.mvc.base.CrudService;
+import com.usky.common.mybatis.core.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.mvc.base.CrudService;
+import com.usky.common.mybatis.core.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.mvc.base.AbstractCrudService;
+import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -2,7 +2,6 @@ package com.usky.backend.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.usky.backend.constant.SysConfigLoginEnum;
 import com.usky.backend.domain.SysConfig;
 import com.usky.backend.domain.SysTenant;
 import com.usky.backend.domain.vo.SysConfigLoginVo;
@@ -10,12 +9,9 @@ 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.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessException;
-import com.usky.common.mvc.base.AbstractCrudService;
+import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 

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.mvc.base.AbstractCrudService;
+import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 /**

service-system/service-system-api/pom.xml

@@ -18,10 +18,6 @@
             <groupId>com.usky</groupId>
             <artifactId>usky-common-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.usky</groupId>
-            <artifactId>usky-common-mvc</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

service-system/service-system-api/src/main/java/com/usky/system/RemoteLogService.java

@@ -1,42 +1,37 @@
-//package com.usky.system;
-//
-//
-//import com.baomidou.mybatisplus.extension.api.R;
-//import com.usky.common.core.bean.ApiResult;
-//import com.usky.system.domain.SysLogininforVO;
-//import com.usky.system.domain.SysOperLogVO;
-//import com.usky.system.factory.RemoteLogFallbackFactory;
-//import org.springframework.cloud.openfeign.FeignClient;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RequestHeader;
-//import sun.security.util.SecurityConstants;
-//
-///**
-// * 日志服务
-// *
-// * @author ruoyi
-// */
-//@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class)
-//public interface RemoteLogService
-//{
-//    /**
-//     * 保存系统日志
-//     *
-//     * @param sysOperLog 日志实体
-//     * @param source 请求来源
-//     * @return 结果
-//     */
-//    @PostMapping("/operlog")
-//    public ApiResult<Boolean> saveLog(@RequestBody SysOperLogVO sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-//
-//    /**
-//     * 保存访问记录
-//     *
-//     * @param sysLogininfor 访问实体
-//     * @param source 请求来源
-//     * @return 结果
-//     */
-//    @PostMapping("/logininfor")
-//    public ApiResult<Boolean> saveLogininfor(@RequestBody SysLogininforVO sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-//}
+package com.usky.system;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.system.domain.SysLogininforVO;
+import com.usky.system.domain.SysOperLogVO;
+import com.usky.system.factory.RemoteLogFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 日志服务
+ *
+ * @author ruoyi
+ */
+@FeignClient(contextId = "remoteLogService", value = "usky-system", fallbackFactory = RemoteLogFallbackFactory.class)
+public interface RemoteLogService
+{
+    /**
+     * 保存系统日志
+     *
+     * @param sysOperLog 日志实体
+     * @return 结果
+     */
+    @PostMapping("/operlog")
+    public ApiResult<Boolean> saveLog(@RequestBody SysOperLogVO sysOperLog);
+
+    /**
+     * 保存访问记录
+     *
+     * @param sysLogininfor 访问实体
+     * @return 结果
+     */
+    @PostMapping("/logininfor")
+    public ApiResult<Boolean> saveLogininfor(@RequestBody SysLogininforVO sysLogininfor);
+}

service-system/service-system-api/src/main/java/com/usky/system/domain/SysDeptVO.java

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

service-system/service-system-api/src/main/java/com/usky/system/domain/SysDictDataVO.java

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

service-system/service-system-api/src/main/java/com/usky/system/domain/SysDictTypeVO.java

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

service-system/service-system-api/src/main/java/com/usky/system/domain/SysLogininforVO.java

@@ -1,7 +1,7 @@
 package com.usky.system.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.usky.common.mvc.domain.BaseEntity;
+import com.usky.common.core.bean.BaseEntity;
 
 import java.util.Date;
 

service-system/service-system-api/src/main/java/com/usky/system/domain/SysOperLogVO.java

@@ -1,7 +1,7 @@
 package com.usky.system.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.usky.common.mvc.domain.BaseEntity;
+import com.usky.common.core.bean.BaseEntity;
 
 import java.util.Date;
 

service-system/service-system-api/src/main/java/com/usky/system/domain/SysRoleVO.java

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

service-system/service-system-api/src/main/java/com/usky/system/domain/SysUserVO.java

@@ -1,7 +1,7 @@
 package com.usky.system.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.usky.common.mvc.domain.BaseEntity;
+import com.usky.common.core.bean.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

service-system/service-system-api/src/main/java/com/usky/system/factory/RemoteLogFallbackFactory.java

@@ -1,42 +1,42 @@
-//package com.usky.system.factory;
-//
-//import com.usky.common.core.bean.ApiResult;
-//import com.usky.system.RemoteLogService;
-//import com.usky.system.domain.SysLogininforVO;
-//import com.usky.system.domain.SysOperLogVO;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.cloud.openfeign.FallbackFactory;
-//import org.springframework.stereotype.Component;
-//
-///**
-// * 日志服务降级处理
-// *
-// * @author ruoyi
-// */
-//@Component
-//public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogService>
-//{
-//    private static final Logger log = LoggerFactory.getLogger(RemoteLogFallbackFactory.class);
-//
-//    @Override
-//    public RemoteLogService create(Throwable throwable)
-//    {
-//        log.error("日志服务调用失败:{}", throwable.getMessage());
-//        return new RemoteLogService()
-//        {
-//            @Override
-//            public ApiResult<Boolean> saveLog(SysOperLogVO sysOperLog, String source)
-//            {
-//                return ApiResult.error("500","保存日志失败");
-//            }
-//
-//            @Override
-//            public ApiResult<Boolean> saveLogininfor(SysLogininforVO sysLogininfor, String source)
-//            {
-//                return ApiResult.error("500","保存日志失败");
-//            }
-//        };
-//
-//    }
-//}
+package com.usky.system.factory;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.system.RemoteLogService;
+import com.usky.system.domain.SysLogininforVO;
+import com.usky.system.domain.SysOperLogVO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 日志服务降级处理
+ *
+ * @author ruoyi
+ */
+@Component
+public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteLogFallbackFactory.class);
+
+    @Override
+    public RemoteLogService create(Throwable throwable)
+    {
+        log.error("日志服务调用失败:{}", throwable.getMessage());
+        return new RemoteLogService()
+        {
+            @Override
+            public ApiResult<Boolean> saveLog(SysOperLogVO sysOperLog)
+            {
+                return ApiResult.error("500","保存日志失败");
+            }
+
+            @Override
+            public ApiResult<Boolean> saveLogininfor(SysLogininforVO sysLogininfor)
+            {
+                return ApiResult.error("500","保存日志失败");
+            }
+        };
+
+    }
+}

service-system/service-system-biz/src/main/java/com/usky/system/controller/api/SysLogControllerApi.java

@@ -0,0 +1,38 @@
+package com.usky.system.controller.api;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.util.BeanMapperUtils;
+import com.usky.system.RemoteLogService;
+import com.usky.system.domain.SysLogininfor;
+import com.usky.system.domain.SysLogininforVO;
+import com.usky.system.domain.SysOperLog;
+import com.usky.system.domain.SysOperLogVO;
+import com.usky.system.service.ISysLogininforService;
+import com.usky.system.service.ISysOperLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author yq
+ * @date 2022/7/1 11:08
+ */
+@RequestMapping("/logApi")
+@RestController
+public class SysLogControllerApi implements RemoteLogService {
+
+    @Autowired
+    private ISysOperLogService sysOperLogService;
+
+    @Autowired
+    private ISysLogininforService sysLogininforService;
+    @Override
+    public ApiResult<Boolean> saveLog(SysOperLogVO sysOperLog) {
+        return ApiResult.success(sysOperLogService.save(BeanMapperUtils.map(sysOperLog, SysOperLog.class)));
+    }
+
+    @Override
+    public ApiResult<Boolean> saveLogininfor(SysLogininforVO sysLogininfor) {
+        return ApiResult.success(sysLogininforService.save(BeanMapperUtils.map(sysLogininfor, SysLogininfor.class)));
+    }
+}

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/SysDeptController.java

@@ -1,10 +1,10 @@
 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.security.utils.SecurityUtils;
 import com.usky.system.domain.SysDept;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.service.ISysDeptService;

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.constants.UserConstants;
 import com.usky.system.model.LoginUser;

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

@@ -1,10 +1,9 @@
 package com.usky.system.controller.web;
 
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-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;
 import org.springframework.beans.factory.annotation.Autowired;

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,10 +1,12 @@
 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;
@@ -44,6 +46,7 @@ public class SysUserController extends BaseController
     /**
      * 获取用户列表
      */
+    @Log(title = "用户管理", businessType = BusinessType.OTHER)
     @GetMapping("/list")
     public ApiResult<TableDataInfo> list(SysUser user)
     {
@@ -74,6 +77,7 @@ public class SysUserController extends BaseController
     /**
      * 新增用户
      */
+    @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @Transactional
     @PostMapping
     public ApiResult<Void> add(@Validated @RequestBody SysUser user)
@@ -101,6 +105,7 @@ public class SysUserController extends BaseController
     /**
      * 修改用户
      */
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @Transactional
     @PutMapping
     public ApiResult<Void> edit(@Validated @RequestBody SysUser user)
@@ -123,6 +128,7 @@ public class SysUserController extends BaseController
     /**
      * 删除用户
      */
+    @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.core.utils.StringUtils;
-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;
@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -76,7 +77,7 @@ public class TokenController
     public ApiResult<?> refresh(HttpServletRequest request)
     {
         LoginUser loginUser = tokenService.getLoginUser(request);
-        if (StringUtils.isNotNull(loginUser))
+        if (Objects.nonNull(loginUser))
         {
             // 刷新令牌有效期
             tokenService.refreshToken(loginUser);

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

@@ -1,7 +1,7 @@
 package com.usky.system.controller.web.page;
 
 
-import com.usky.common.mvc.utils.ServletUtils;
+import com.usky.common.core.util.ServletUtils;
 
 /**
  * 表格数据处理

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.mvc.domain.BaseEntity;
+import com.usky.common.core.bean.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

@@ -1,8 +1,8 @@
 package com.usky.system.domain;
 
-import  com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.usky.common.mvc.domain.BaseEntity;
+import com.usky.common.core.bean.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.mvc.domain.BaseEntity;
+import com.usky.common.core.bean.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.mvc.domain.BaseEntity;
+import com.usky.common.core.bean.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.mvc.domain.BaseEntity;
+import com.usky.common.core.bean.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.mvc.domain.BaseEntity;
+import com.usky.common.core.bean.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.mvc.domain.BaseEntity;
+import com.usky.common.core.bean.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,6 +1,7 @@
 package com.usky.system.domain;
 
-import com.usky.common.mvc.domain.BaseEntity;
+
+import com.usky.common.core.bean.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

@@ -1,10 +1,10 @@
 package com.usky.system.domain;
 
-import  com.baomidou.mybatisplus.annotation.TableField;
+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.mvc.domain.BaseEntity;
+import com.usky.common.core.bean.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/constants/Constants.java

@@ -1,147 +0,0 @@
-package com.usky.system.domain.constants;
-
-
-/**
- * 通用常量信息
- * 
- * @author yq
- */
-public class Constants
-{
-    /**
-     * UTF-8 字符集
-     */
-    public static final String UTF8 = "UTF-8";
-
-    /**
-     * GBK 字符集
-     */
-    public static final String GBK = "GBK";
-
-    /**
-     * http请求
-     */
-    public static final String HTTP = "http://";
-
-    /**
-     * https请求
-     */
-    public static final String HTTPS = "https://";
-
-    /**
-     * 通用成功标识
-     */
-    public static final String SUCCESS = "0";
-
-    /**
-     * 通用失败标识
-     */
-    public static final String FAIL = "1";
-
-    /**
-     * 登录成功
-     */
-    public static final String LOGIN_SUCCESS = "Success";
-
-    /**
-     * 注销
-     */
-    public static final String LOGOUT = "Logout";
-
-    /**
-     * 注册
-     */
-    public static final String REGISTER = "Register";
-
-    /**
-     * 登录失败
-     */
-    public static final String LOGIN_FAIL = "Error";
-
-    public static final String LOGIN_SUCCESS_STATUS = "0";
-
-    /**
-     * 登录失败状态
-     */
-    public static final String LOGIN_FAIL_STATUS = "1";
-
-    /**
-     * 验证码 redis key
-     */
-    public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
-
-    /**
-     * 登录用户 redis key
-     */
-    public static final String LOGIN_TOKEN_KEY = "login_tokens:";
-    
-    /**
-     * 防重提交 redis key
-     */
-    public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";
-
-    /**
-     * 验证码有效期（分钟）
-     */
-    public static final Integer CAPTCHA_EXPIRATION = 2;
-
-    /**
-     * 令牌
-     */
-    public static final String TOKEN = "token";
-
-    /**
-     * 令牌前缀
-     */
-    public static final String TOKEN_PREFIX = "Bearer ";
-
-    /**
-     * 令牌前缀
-     */
-    public static final String LOGIN_USER_KEY = "login_user_key";
-
-    /**
-     * 用户ID
-     */
-    public static final String JWT_USERID = "userid";
-
-//    /**
-//     * 用户名称
-//     */
-//    public static final String JWT_USERNAME = Claims.SUBJECT;
-
-    /**
-     * 用户头像
-     */
-    public static final String JWT_AVATAR = "avatar";
-
-    /**
-     * 创建时间
-     */
-    public static final String JWT_CREATED = "created";
-
-    /**
-     * 用户权限
-     */
-    public static final String JWT_AUTHORITIES = "authorities";
-
-    /**
-     * 参数管理 cache key
-     */
-    public static final String SYS_CONFIG_KEY = "sys_config:";
-
-    /**
-     * 字典管理 cache key
-     */
-    public static final String SYS_DICT_KEY = "sys_dict:";
-
-    /**
-     * 资源映射路径 前缀
-     */
-    public static final String RESOURCE_PREFIX = "/profile";
-
-    /**
-     * RMI 远程方法调用
-     */
-    public static final String LOOKUP_RMI = "rmi://";
-}

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.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.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.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.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.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.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.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.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.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.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.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.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.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.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.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.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.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.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.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.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.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.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.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.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,10 +1,8 @@
 package com.usky.system.mapper;
 
 
-
-import com.usky.common.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.CrudMapper;
 import com.usky.system.domain.SysUserPost;
-import com.usky.system.domain.SysUserRole;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

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.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.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,9 +1,7 @@
 package com.usky.system.service;
 
 
-
-
-import com.usky.common.mvc.base.CrudService;
+import com.usky.common.mybatis.core.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.mvc.base.CrudService;
+import com.usky.common.mybatis.core.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,11 +1,7 @@
 package com.usky.system.service;
 
 
-
-
-
-
-import com.usky.common.mvc.base.CrudService;
+import com.usky.common.mybatis.core.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,9 +1,7 @@
 package com.usky.system.service;
 
 
-
-
-import com.usky.common.mvc.base.CrudService;
+import com.usky.common.mybatis.core.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,10 +1,8 @@
 package com.usky.system.service;
 
 
-
-import com.usky.common.mvc.base.CrudService;
+import com.usky.common.mybatis.core.CrudService;
 import com.usky.system.domain.SysMenu;
-import com.usky.system.domain.SysPost;
 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.mvc.base.CrudService;
+import com.usky.common.mybatis.core.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,9 +1,7 @@
 package com.usky.system.service;
 
 
-
-
-import com.usky.common.mvc.base.CrudService;
+import com.usky.common.mybatis.core.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,6 +1,7 @@
 package com.usky.system.service;
 
-import com.usky.common.mvc.base.CrudService;
+
+import com.usky.common.mybatis.core.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.mvc.base.CrudService;
+import com.usky.common.mybatis.core.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,6 @@
 package com.usky.system.service;
 
-
-import com.usky.common.mvc.base.CrudService;
+import com.usky.common.mybatis.core.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,19 +1,19 @@
 package com.usky.system.service;
 
-import com.ruoyi.common.core.enums.UserStatus;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.usky.common.core.constants.Constants;
 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.mvc.utils.IpUtils;
-import com.usky.common.mvc.utils.ServletUtils;
+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;
 import com.usky.system.domain.SysUserVO;
-import com.usky.system.domain.constants.Constants;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.model.LoginUser;
+import com.usky.system.service.enums.UserStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

service-system/service-system-biz/src/main/java/com/usky/system/service/enums/UserStatus.java

@@ -0,0 +1,30 @@
+package com.usky.system.service.enums;
+
+/**
+ * 用户状态
+ * 
+ * @author ruoyi
+ */
+public enum UserStatus
+{
+    OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");
+
+    private final String code;
+    private final String info;
+
+    UserStatus(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

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

@@ -1,14 +1,13 @@
 package com.usky.system.service.impl;
 
 
-
+import com.usky.common.core.constants.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.mvc.base.AbstractCrudService;
-import com.usky.common.spring.config.redis.RedisHelper;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.redis.core.RedisHelper;
 import com.usky.system.domain.SysConfig;
-import com.usky.system.domain.constants.Constants;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysConfigMapper;
 import com.usky.system.service.ISysConfigService;

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

@@ -1,11 +1,10 @@
 package com.usky.system.service.impl;
 
 
-
 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.mvc.base.AbstractCrudService;
+import com.usky.common.mybatis.core.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.mvc.base.AbstractCrudService;
+import com.usky.common.mybatis.core.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,8 @@
 package com.usky.system.service.impl;
 
 
-
 import com.usky.common.core.exception.BusinessException;
-import com.usky.common.mvc.base.AbstractCrudService;
+import com.usky.common.mybatis.core.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,8 +1,7 @@
 package com.usky.system.service.impl;
 
 
-
-import com.usky.common.mvc.base.AbstractCrudService;
+import com.usky.common.mybatis.core.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,11 +1,11 @@
 package com.usky.system.service.impl;
 
+import com.usky.common.core.constants.Constants;
 import com.usky.common.core.util.StringUtils;
-import com.usky.common.mvc.base.AbstractCrudService;
+import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.system.domain.SysMenu;
 import com.usky.system.domain.SysRole;
 import com.usky.system.domain.SysUserVO;
-import com.usky.system.domain.constants.Constants;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysMenuMapper;
 import com.usky.system.mapper.SysRoleMapper;

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

@@ -1,6 +1,7 @@
 package com.usky.system.service.impl;
 
-import com.usky.common.mvc.base.AbstractCrudService;
+
+import com.usky.common.mybatis.core.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,8 +1,7 @@
 package com.usky.system.service.impl;
 
 
-
-import com.usky.common.mvc.base.AbstractCrudService;
+import com.usky.common.mybatis.core.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,9 +1,8 @@
 package com.usky.system.service.impl;
 
 
-
 import com.usky.common.core.exception.BusinessException;
-import com.usky.common.mvc.base.AbstractCrudService;
+import com.usky.common.mybatis.core.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,13 +1,18 @@
 package com.usky.system.service.impl;
 
 
-
 import com.usky.common.core.exception.BusinessException;
-import com.usky.common.mvc.base.AbstractCrudService;
-import com.usky.common.spring.util.SpringContextUtils;
-import com.usky.system.domain.*;
+import com.usky.common.core.util.SpringContextUtils;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.system.domain.SysRole;
+import com.usky.system.domain.SysRoleDept;
+import com.usky.system.domain.SysRoleMenu;
+import com.usky.system.domain.SysUserRole;
 import com.usky.system.domain.constants.UserConstants;
-import com.usky.system.mapper.*;
+import com.usky.system.mapper.SysRoleDeptMapper;
+import com.usky.system.mapper.SysRoleMapper;
+import com.usky.system.mapper.SysRoleMenuMapper;
+import com.usky.system.mapper.SysUserRoleMapper;
 import com.usky.system.service.ISysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -4,7 +4,7 @@ package com.usky.system.service.impl;
 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.mvc.base.AbstractCrudService;
+import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.system.domain.*;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.*;
@@ -434,7 +434,7 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
     public LoginUser getUserInfo(String username)
     {
         SysUser sysUser = this.selectUserByUserName(username);
-        if (com.ruoyi.common.core.utils.StringUtils.isNull(sysUser))
+        if (Objects.isNull(sysUser))
         {
             throw new BusinessException("用户信息/密码不存在");
         }
@@ -457,7 +457,7 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         {
             throw new BusinessException("当前系统没有开启注册功能！");
         }
-        if (com.ruoyi.common.core.constant.UserConstants.NOT_UNIQUE.equals(this.checkUserNameUnique(username)))
+        if (UserConstants.NOT_UNIQUE.equals(this.checkUserNameUnique(username)))
         {
             throw new BusinessException("保存用户'" + username + "'失败，注册账号已存在");
         }

service-system/service-system-biz/src/main/java/com/usky/system/service/util/DictUtils.java

@@ -1,12 +1,11 @@
 package com.usky.system.service.util;
 
 
-
+import com.usky.common.core.constants.Constants;
+import com.usky.common.core.util.SpringContextUtils;
 import com.usky.common.core.util.StringUtils;
-import com.usky.common.spring.config.redis.RedisHelper;
-import com.usky.common.spring.util.SpringContextUtils;
+import com.usky.common.redis.core.RedisHelper;
 import com.usky.system.domain.SysDictData;
-import com.usky.system.domain.constants.Constants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

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

@@ -1,8 +1,9 @@
 package com.usky.system.service.vo;
 
 
+import com.usky.common.core.constants.Constants;
 import com.usky.common.core.util.StringUtils;
-import com.usky.system.domain.constants.Constants;
+
 
 /**
  * 路由显示信息

usky-module-demo/usky-module-demo-biz/pom.xml

@@ -11,87 +11,20 @@
 
     <artifactId>usky-module-demo-biz</artifactId>
     <dependencies>
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-<!--        &lt;!&ndash; SpringCloud Alibaba Sentinel &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>-->
-<!--        </dependency>-->
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.usky</groupId>
-            <artifactId>usky-common-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.usky</groupId>
-            <artifactId>usky-common-spring</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>usky-common-mvc</artifactId>
+            <artifactId>common-cloud-starter</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>6.0.18.Final</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-generator</artifactId>
-            <version>3.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-            <version>2.1</version>
-        </dependency>
-
-        <!-- mysql 驱动 -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
-
-
+        <!-- Pagehelper -->
         <dependency>
-            <groupId>com.usky</groupId>
-            <artifactId>usky-module-demo-api</artifactId>
-            <version>0.0.1</version>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
         </dependency>
 
 

usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/controller/MybatisGeneratorUtils.java

@@ -1,5 +1,6 @@
 package com.usky.demo.controller;//package com.usky.demo.controller;//package com.usky.dm.controller.web.business;//package com.usky.dm.controller.web;
 
+
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
@@ -7,7 +8,6 @@ import com.baomidou.mybatisplus.generator.config.*;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 

usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/controller/api/SysUserControllerApi.java

@@ -1,60 +1,60 @@
-package com.usky.demo.controller.api;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessException;
-import com.usky.common.core.util.BeanMapperUtils;
-import com.usky.common.core.util.FileUtils;
-import com.usky.common.spring.util.GlobalUtils;
-import com.usky.demo.RemoteUserService;
-import com.usky.demo.domain.SysUserVO;
-import com.usky.demo.domain.SysUser;
-import com.usky.demo.service.SysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-@RestController
-public class SysUserControllerApi implements RemoteUserService {
-
-    @Autowired
-    private SysUserService sysUserService;
-    @Override
-    public ApiResult<List<SysUserVO>> getByUserName(String userName) {
-        LambdaQueryWrapper<SysUser> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(SysUser::getUserName,userName);
-        return ApiResult.success(BeanMapperUtils.mapList(sysUserService.list(queryWrapper),SysUser.class,SysUserVO.class));
-    }
-
-    @Override
-    public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
-        sysUserService.save(BeanMapperUtils.map(sysUserVO, SysUser.class));
-        return ApiResult.success(new ArrayList<>());
-    }
-
-    @Override
-    public ApiResult<String> upload(MultipartFile multipartFile) {
-        Optional.ofNullable(multipartFile).orElseThrow(() ->  new BusinessException("文件为空"));
-        String originalFilename = multipartFile.getOriginalFilename();
-        String newFileName = System.currentTimeMillis() + originalFilename;
-        File file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), newFileName);
-        String urlPath = "";
-        try {
-            try {
-                multipartFile.transferTo(file);
-            } catch (IOException e) {
-                throw new BusinessException("文件上传失败");
-            }
-        } catch (Exception e) {
-
-        }
-        return ApiResult.success(urlPath);
-    }
-}
+//package com.usky.demo.controller.api;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+//import com.usky.common.core.bean.ApiResult;
+//import com.usky.common.core.exception.BusinessException;
+//import com.usky.common.core.util.BeanMapperUtils;
+//import com.usky.common.core.util.FileUtils;
+//import com.usky.common.core.util.GlobalUtils;
+//import com.usky.demo.domain.SysUser;
+//import com.usky.demo.service.SysUserService;
+//import com.usky.system.RemoteUserService;
+//import com.usky.system.domain.SysUserVO;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.RestController;
+//import org.springframework.web.multipart.MultipartFile;
+//
+//import java.io.File;
+//import java.io.IOException;
+//import java.util.ArrayList;
+//import java.util.List;
+//import java.util.Optional;
+//
+//@RestController
+//public class SysUserControllerApi implements RemoteUserService {
+//
+//    @Autowired
+//    private SysUserService sysUserService;
+//    @Override
+//    public ApiResult<List<SysUserVO>> getByUserName(String userName) {
+//        LambdaQueryWrapper<SysUser> queryWrapper = Wrappers.lambdaQuery();
+//        queryWrapper.eq(SysUser::getUserName,userName);
+//        return ApiResult.success(BeanMapperUtils.mapList(sysUserService.list(queryWrapper),SysUser.class,SysUserVO.class));
+//    }
+//
+//    @Override
+//    public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
+//        sysUserService.save(BeanMapperUtils.map(sysUserVO, SysUser.class));
+//        return ApiResult.success(new ArrayList<>());
+//    }
+//
+//    @Override
+//    public ApiResult<String> upload(MultipartFile multipartFile) {
+//        Optional.ofNullable(multipartFile).orElseThrow(() ->  new BusinessException("文件为空"));
+//        String originalFilename = multipartFile.getOriginalFilename();
+//        String newFileName = System.currentTimeMillis() + originalFilename;
+//        File file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), newFileName);
+//        String urlPath = "";
+//        try {
+//            try {
+//                multipartFile.transferTo(file);
+//            } catch (IOException e) {
+//                throw new BusinessException("文件上传失败");
+//            }
+//        } catch (Exception e) {
+//
+//        }
+//        return ApiResult.success(urlPath);
+//    }
+//}

usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/mapper/SysUserMapper.java

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

usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/service/SysUserService.java

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

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

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