diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index f566b4a..bc47b1e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -14,15 +14,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; public class RuoYiApplication { public static void main (String[] args) { SpringApplication.run(RuoYiApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ"); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java index 7ce673d..358eaa6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java @@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.model.CaptchaModel; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.sign.Base64; import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.system.service.ISysConfigService; +import com.ruoyi.system.service.SysConfigServic; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.FastByteArrayOutputStream; import org.springframework.web.bind.annotation.GetMapping; @@ -39,7 +39,7 @@ public class CaptchaController { private RedisCache redisCache; @Autowired - private ISysConfigService configService; + private SysConfigServic configService; /** * 生成验证码 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java index 45a4f08..305a154 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java @@ -8,7 +8,7 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.web.service.SysPasswordService; import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.service.ISysLogininforService; +import com.ruoyi.system.service.SysLogininforService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -25,7 +25,7 @@ import java.util.List; @RequestMapping("/monitor/logininfor") public class SysLogininforController extends BaseController { @Autowired - private ISysLogininforService logininforService; + private SysLogininforService logininforService; @Autowired private SysPasswordService passwordService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java index e83c032..bcb3863 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.service.ISysOperLogService; +import com.ruoyi.system.service.SysOperLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -24,7 +24,7 @@ import java.util.List; @RequestMapping("/monitor/operlog") public class SysOperlogController extends BaseController { @Autowired - private ISysOperLogService operLogService; + private SysOperLogService operLogService; @PreAuthorize("@ss.hasPermi('monitor:operlog:list')") @GetMapping("/list") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java index 61a0b6c..a6707df 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java @@ -10,7 +10,7 @@ import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.ruoyi.system.service.SysUserOnlineService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -29,7 +29,7 @@ import java.util.List; @RequestMapping("/monitor/online") public class SysUserOnlineController extends BaseController { @Autowired - private ISysUserOnlineService userOnlineService; + private SysUserOnlineService userOnlineService; @Autowired private RedisCache redisCache; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java index da56dc5..a67b020 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.service.ISysConfigService; +import com.ruoyi.system.service.SysConfigServic; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -25,7 +25,7 @@ import java.util.List; @RequestMapping("/system/config") public class SysConfigController extends BaseController { @Autowired - private ISysConfigService configService; + private SysConfigServic configService; /** * 获取参数配置列表 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index 734c54f..876f2d4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.Result; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysDeptService; +import com.ruoyi.system.service.SysDeptService; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -25,7 +25,7 @@ import java.util.List; @RequestMapping("/system/dept") public class SysDeptController extends BaseController { @Autowired - private ISysDeptService deptService; + private SysDeptService deptService; /** * 获取部门列表 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index 50dce75..a928ded 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -8,8 +8,8 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDictDataService; -import com.ruoyi.system.service.ISysDictTypeService; +import com.ruoyi.system.service.SysDictDataService; +import com.ruoyi.system.service.SysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -28,10 +28,10 @@ import java.util.List; @RequestMapping("/system/dict/data") public class SysDictDataController extends BaseController { @Autowired - private ISysDictDataService dictDataService; + private SysDictDataService dictDataService; @Autowired - private ISysDictTypeService dictTypeService; + private SysDictTypeService dictTypeService; @PreAuthorize("@ss.hasPermi('system:dict:list')") @GetMapping("/list") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java index 317160a..e4d43d4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.entity.SysDictType; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDictTypeService; +import com.ruoyi.system.service.SysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -25,7 +25,7 @@ import java.util.List; @RequestMapping("/system/dict/type") public class SysDictTypeController extends BaseController { @Autowired - private ISysDictTypeService dictTypeService; + private SysDictTypeService dictTypeService; @PreAuthorize("@ss.hasPermi('system:dict:list')") @GetMapping("/list") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index 6407d5f..d8b5df3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.resp.UserInfoResp; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.framework.web.service.SysLoginService; import com.ruoyi.framework.web.service.SysPermissionService; -import com.ruoyi.system.service.ISysMenuService; +import com.ruoyi.system.service.SysMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -29,7 +29,7 @@ public class SysLoginController { private SysLoginService loginService; @Autowired - private ISysMenuService menuService; + private SysMenuService menuService; @Autowired private SysPermissionService permissionService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java index 847e966..88cb38d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java @@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.resp.RoleMenuTreeResp; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysMenuService; +import com.ruoyi.system.service.SysMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -25,7 +25,7 @@ import java.util.List; @RequestMapping("/system/menu") public class SysMenuController extends BaseController { @Autowired - private ISysMenuService menuService; + private SysMenuService menuService; /** * 获取菜单列表 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java index 7310b5e..461ecdf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java @@ -6,7 +6,7 @@ import com.ruoyi.common.core.domain.Result; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.service.ISysNoticeService; +import com.ruoyi.system.service.SysNoticeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -23,7 +23,7 @@ import java.util.List; @RequestMapping("/system/notice") public class SysNoticeController extends BaseController { @Autowired - private ISysNoticeService noticeService; + private SysNoticeService noticeService; /** * 获取通知公告列表 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java index 01efc33..18e7f2c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.service.ISysPostService; +import com.ruoyi.system.service.SysPostService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -25,7 +25,7 @@ import java.util.List; @RequestMapping("/system/post") public class SysPostController extends BaseController { @Autowired - private ISysPostService postService; + private SysPostService postService; /** * 获取岗位列表 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index ba87de0..7c84df9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -13,7 +13,7 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.MimeTypeUtils; import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.service.ISysUserService; +import com.ruoyi.system.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -27,7 +27,7 @@ import org.springframework.web.multipart.MultipartFile; @RequestMapping("/system/user/profile") public class SysProfileController extends BaseController { @Autowired - private ISysUserService userService; + private SysUserService userService; @Autowired private TokenService tokenService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java index 440eef2..82780b7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java @@ -5,7 +5,7 @@ import com.ruoyi.common.core.domain.Result; import com.ruoyi.common.core.domain.model.RegisterBody; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.framework.web.service.SysRegisterService; -import com.ruoyi.system.service.ISysConfigService; +import com.ruoyi.system.service.SysConfigServic; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -22,7 +22,7 @@ public class SysRegisterController extends BaseController { private SysRegisterService registerService; @Autowired - private ISysConfigService configService; + private SysConfigServic configService; @PostMapping("/register") public Result register (@RequestBody RegisterBody user) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index 0747457..c0494fd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -15,9 +15,9 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.web.service.SysPermissionService; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.service.ISysDeptService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.ruoyi.system.service.SysDeptService; +import com.ruoyi.system.service.SysRoleService; +import com.ruoyi.system.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -35,7 +35,7 @@ import java.util.List; @RequestMapping("/system/role") public class SysRoleController extends BaseController { @Autowired - private ISysRoleService roleService; + private SysRoleService roleService; @Autowired private TokenService tokenService; @@ -44,10 +44,10 @@ public class SysRoleController extends BaseController { private SysPermissionService permissionService; @Autowired - private ISysUserService userService; + private SysUserService userService; @Autowired - private ISysDeptService deptService; + private SysDeptService deptService; @PreAuthorize("@ss.hasPermi('system:role:list')") @GetMapping("/list") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index d4924a1..5bc9068 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -13,10 +13,10 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDeptService; -import com.ruoyi.system.service.ISysPostService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.ruoyi.system.service.SysDeptService; +import com.ruoyi.system.service.SysPostService; +import com.ruoyi.system.service.SysRoleService; +import com.ruoyi.system.service.SysUserService; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -37,16 +37,16 @@ import java.util.stream.Collectors; @RequestMapping("/system/user") public class SysUserController extends BaseController { @Autowired - private ISysUserService userService; + private SysUserService userService; @Autowired - private ISysRoleService roleService; + private SysRoleService roleService; @Autowired - private ISysDeptService deptService; + private SysDeptService deptService; @Autowired - private ISysPostService postService; + private SysPostService postService; /** * 获取用户列表 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java index 4e7fd50..e3d0b97 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java @@ -9,8 +9,8 @@ import com.ruoyi.common.utils.ip.IpUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.system.domain.SysLogininfor; import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.service.ISysLogininforService; -import com.ruoyi.system.service.ISysOperLogService; +import com.ruoyi.system.service.SysLogininforService; +import com.ruoyi.system.service.SysOperLogService; import eu.bitwalker.useragentutils.UserAgent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,7 +70,7 @@ public class AsyncFactory { logininfor.setStatus(Constants.FAIL); } // 插入数据 - SpringUtils.getBean(ISysLogininforService.class).insertLogininfor(logininfor); + SpringUtils.getBean(SysLogininforService.class).insertLogininfor(logininfor); } }; } @@ -88,7 +88,7 @@ public class AsyncFactory { public void run () { // 远程查询操作地点 operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp())); - SpringUtils.getBean(ISysOperLogService.class).insertOperlog(operLog); + SpringUtils.getBean(SysOperLogService.class).insertOperlog(operLog); } }; } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index 1964202..2baba6c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -15,8 +15,8 @@ import com.ruoyi.common.utils.ip.IpUtils; import com.ruoyi.framework.manager.AsyncManager; import com.ruoyi.framework.manager.factory.AsyncFactory; import com.ruoyi.framework.security.context.AuthenticationContextHolder; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysUserService; +import com.ruoyi.system.service.SysConfigServic; +import com.ruoyi.system.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.BadCredentialsException; @@ -43,10 +43,10 @@ public class SysLoginService { private RedisCache redisCache; @Autowired - private ISysUserService userService; + private SysUserService userService; @Autowired - private ISysConfigService configService; + private SysConfigServic configService; /** * 登录验证 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java index dd1613e..1edaafe 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java @@ -2,8 +2,8 @@ package com.ruoyi.framework.web.service; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.system.service.ISysMenuService; -import com.ruoyi.system.service.ISysRoleService; +import com.ruoyi.system.service.SysMenuService; +import com.ruoyi.system.service.SysRoleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; @@ -20,10 +20,10 @@ import java.util.Set; @Component public class SysPermissionService { @Autowired - private ISysRoleService roleService; + private SysRoleService roleService; @Autowired - private ISysMenuService menuService; + private SysMenuService menuService; /** * 获取角色数据权限 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java index 3ce12f3..fef6b1d 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java @@ -13,8 +13,8 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.framework.manager.AsyncManager; import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysUserService; +import com.ruoyi.system.service.SysConfigServic; +import com.ruoyi.system.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -26,10 +26,10 @@ import org.springframework.stereotype.Component; @Component public class SysRegisterService { @Autowired - private ISysUserService userService; + private SysUserService userService; @Autowired - private ISysConfigService configService; + private SysConfigServic configService; @Autowired private RedisCache redisCache; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java index b10d415..2265820 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java @@ -6,7 +6,7 @@ import com.ruoyi.common.enums.UserStatus; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysUserService; +import com.ruoyi.system.service.SysUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +25,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class); @Autowired - private ISysUserService userService; + private SysUserService userService; @Autowired private SysPasswordService passwordService; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java index 2d4f0fb..167f7a3 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java @@ -8,8 +8,8 @@ import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.generator.domain.GenTable; import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.service.IGenTableColumnService; -import com.ruoyi.generator.service.IGenTableService; +import com.ruoyi.generator.service.GenTableColumnService; +import com.ruoyi.generator.service.GenTableService; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -31,10 +31,10 @@ import java.util.Map; @RequestMapping("/tool/gen") public class GenController extends BaseController { @Autowired - private IGenTableService genTableService; + private GenTableService genTableService; @Autowired - private IGenTableColumnService genTableColumnService; + private GenTableColumnService genTableColumnService; /** * 查询代码生成列表 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnService.java similarity index 95% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java rename to ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnService.java index 7f5b8ce..662e112 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnService.java @@ -9,7 +9,7 @@ import java.util.List; * * @author ruoyi */ -public interface IGenTableColumnService { +public interface GenTableColumnService { /** * 查询业务字段列表 * diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableService.java similarity index 98% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java rename to ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableService.java index 5bed59a..2923cd0 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableService.java @@ -10,7 +10,7 @@ import java.util.Map; * * @author ruoyi */ -public interface IGenTableService { +public interface GenTableService { /** * 查询业务列表 * diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableColumnServiceImpl.java similarity index 90% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java rename to ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableColumnServiceImpl.java index e22258a..6e4ebd5 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableColumnServiceImpl.java @@ -1,8 +1,9 @@ -package com.ruoyi.generator.service; +package com.ruoyi.generator.service.impl; import com.ruoyi.common.core.text.Convert; import com.ruoyi.generator.domain.GenTableColumn; import com.ruoyi.generator.mapper.GenTableColumnMapper; +import com.ruoyi.generator.service.GenTableColumnService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,7 +15,7 @@ import java.util.List; * @author ruoyi */ @Service -public class GenTableColumnServiceImpl implements IGenTableColumnService { +public class GenTableColumnServiceImpl implements GenTableColumnService { @Autowired private GenTableColumnMapper genTableColumnMapper; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java similarity index 99% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java rename to ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java index 40b5f53..b029740 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.service; +package com.ruoyi.generator.service.impl; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; @@ -12,6 +12,7 @@ import com.ruoyi.generator.domain.GenTable; import com.ruoyi.generator.domain.GenTableColumn; import com.ruoyi.generator.mapper.GenTableColumnMapper; import com.ruoyi.generator.mapper.GenTableMapper; +import com.ruoyi.generator.service.GenTableService; import com.ruoyi.generator.util.GenUtils; import com.ruoyi.generator.util.VelocityInitializer; import com.ruoyi.generator.util.VelocityUtils; @@ -44,7 +45,7 @@ import java.util.zip.ZipOutputStream; * @author ruoyi */ @Service -public class GenTableServiceImpl implements IGenTableService { +public class GenTableServiceImpl implements GenTableService { private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class); @Autowired diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java index 72c756b..854c68f 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java @@ -10,7 +10,7 @@ import com.ruoyi.common.exception.job.TaskException; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.service.ISysJobService; +import com.ruoyi.quartz.service.SysJobService; import com.ruoyi.quartz.util.CronUtils; import com.ruoyi.quartz.util.ScheduleUtils; import org.quartz.SchedulerException; @@ -30,7 +30,7 @@ import java.util.List; @RequestMapping("/monitor/job") public class SysJobController extends BaseController { @Autowired - private ISysJobService jobService; + private SysJobService jobService; /** * 查询定时任务列表 diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java index 2a7cf75..164a1c1 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.service.ISysJobLogService; +import com.ruoyi.quartz.service.SysJobLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -24,7 +24,7 @@ import java.util.List; @RequestMapping("/monitor/jobLog") public class SysJobLogController extends BaseController { @Autowired - private ISysJobLogService jobLogService; + private SysJobLogService jobLogService; /** * 查询定时任务调度日志列表 diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/SysJobLogService.java similarity index 96% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java rename to ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/SysJobLogService.java index 22b22b9..dd07725 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/SysJobLogService.java @@ -9,7 +9,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysJobLogService { +public interface SysJobLogService { /** * 获取quartz调度器日志的计划任务 * diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/SysJobService.java similarity index 98% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java rename to ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/SysJobService.java index ab4f56f..a09fad3 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/SysJobService.java @@ -11,7 +11,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysJobService { +public interface SysJobService { /** * 获取quartz调度器的计划任务 * diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java index 3baca47..f6deafc 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java @@ -2,7 +2,7 @@ package com.ruoyi.quartz.service.impl; import com.ruoyi.quartz.domain.SysJobLog; import com.ruoyi.quartz.mapper.SysJobLogMapper; -import com.ruoyi.quartz.service.ISysJobLogService; +import com.ruoyi.quartz.service.SysJobLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,7 +14,7 @@ import java.util.List; * @author ruoyi */ @Service -public class SysJobLogServiceImpl implements ISysJobLogService { +public class SysJobLogServiceImpl implements SysJobLogService { @Autowired private SysJobLogMapper jobLogMapper; diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java index ec1b3bf..17cc65f 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java @@ -4,7 +4,7 @@ import com.ruoyi.common.constant.ScheduleConstants; import com.ruoyi.common.exception.job.TaskException; import com.ruoyi.quartz.domain.SysJob; import com.ruoyi.quartz.mapper.SysJobMapper; -import com.ruoyi.quartz.service.ISysJobService; +import com.ruoyi.quartz.service.SysJobService; import com.ruoyi.quartz.util.CronUtils; import com.ruoyi.quartz.util.ScheduleUtils; import org.quartz.JobDataMap; @@ -24,7 +24,7 @@ import java.util.List; * @author ruoyi */ @Service -public class SysJobServiceImpl implements ISysJobService { +public class SysJobServiceImpl implements SysJobService { @Autowired private Scheduler scheduler; diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java index 4a16487..ce5067b 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java @@ -8,7 +8,7 @@ import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.quartz.domain.SysJob; import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.service.ISysJobLogService; +import com.ruoyi.quartz.service.SysJobLogService; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -83,7 +83,7 @@ public abstract class AbstractQuartzJob implements Job { } // 写入数据库当中 - SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog); + SpringUtils.getBean(SysJobLogService.class).addJobLog(sysJobLog); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysConfigServic.java similarity index 98% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service/SysConfigServic.java index a231b27..bbf9caa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysConfigServic.java @@ -9,7 +9,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysConfigService { +public interface SysConfigServic { /** * 查询参数配置信息 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysDeptService.java similarity index 98% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service/SysDeptService.java index 7dfe2f8..d52771f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysDeptService.java @@ -10,7 +10,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysDeptService { +public interface SysDeptService { /** * 查询部门管理数据 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysDictDataService.java similarity index 97% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service/SysDictDataService.java index 747f415..b2be353 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysDictDataService.java @@ -9,7 +9,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysDictDataService { +public interface SysDictDataService { /** * 根据条件分页查询字典数据 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysDictTypeService.java similarity index 98% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service/SysDictTypeService.java index 06e6b5c..d9dfae8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysDictTypeService.java @@ -10,7 +10,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysDictTypeService { +public interface SysDictTypeService { /** * 根据条件分页查询字典类型 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLogininforService.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service/SysLogininforService.java index 2a9a480..0ded06e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLogininforService.java @@ -9,7 +9,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysLogininforService { +public interface SysLogininforService { /** * 新增系统登录日志 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysMenuService.java similarity index 98% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service/SysMenuService.java index 659eeea..7dac91c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysMenuService.java @@ -12,7 +12,7 @@ import java.util.Set; * * @author ruoyi */ -public interface ISysMenuService { +public interface SysMenuService { /** * 根据用户查询系统菜单列表 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysNoticeService.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service/SysNoticeService.java index 7fbbc46..013e647 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysNoticeService.java @@ -9,7 +9,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysNoticeService { +public interface SysNoticeService { /** * 查询公告信息 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysOperLogService.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service/SysOperLogService.java index 3feb147..32ee7ad 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysOperLogService.java @@ -9,7 +9,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysOperLogService { +public interface SysOperLogService { /** * 新增操作日志 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPostService.java similarity index 98% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service/SysPostService.java index d8ef21e..de3ec30 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPostService.java @@ -9,7 +9,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysPostService { +public interface SysPostService { /** * 查询岗位信息集合 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRoleService.java similarity index 99% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service/SysRoleService.java index 69ea1ae..f05bb42 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRoleService.java @@ -11,7 +11,7 @@ import java.util.Set; * * @author ruoyi */ -public interface ISysRoleService { +public interface SysRoleService { /** * 根据条件分页查询角色数据 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysUserOnlineService.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service/SysUserOnlineService.java index 2b78436..e9a330c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysUserOnlineService.java @@ -8,7 +8,7 @@ import com.ruoyi.system.domain.SysUserOnline; * * @author ruoyi */ -public interface ISysUserOnlineService { +public interface SysUserOnlineService { /** * 通过登录地址查询信息 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysUserService.java similarity index 99% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service/SysUserService.java index 1523274..9c79b36 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysUserService.java @@ -9,7 +9,7 @@ import java.util.List; * * @author ruoyi */ -public interface ISysUserService { +public interface SysUserService { /** * 根据条件分页查询用户列表 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index fdd470f..40c6edf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -10,7 +10,7 @@ import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.mapper.SysConfigMapper; -import com.ruoyi.system.service.ISysConfigService; +import com.ruoyi.system.service.SysConfigServic; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,7 +24,7 @@ import java.util.List; * @author ruoyi */ @Service -public class SysConfigServiceImpl implements ISysConfigService { +public class SysConfigServiceImpl implements SysConfigServic { @Autowired private SysConfigMapper configMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 4d68077..71757ff 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -13,7 +13,7 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.system.mapper.SysDeptMapper; import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.service.ISysDeptService; +import com.ruoyi.system.service.SysDeptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,7 +28,7 @@ import java.util.stream.Collectors; * @author ruoyi */ @Service -public class SysDeptServiceImpl implements ISysDeptService { +public class SysDeptServiceImpl implements SysDeptService { @Autowired private SysDeptMapper deptMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java index db3712b..84e00d5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.system.service.impl; import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.utils.DictUtils; import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.service.ISysDictDataService; +import com.ruoyi.system.service.SysDictDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; * @author ruoyi */ @Service -public class SysDictDataServiceImpl implements ISysDictDataService { +public class SysDictDataServiceImpl implements SysDictDataService { @Autowired private SysDictDataMapper dictDataMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index 6e19e2a..4d7ec2b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -8,7 +8,7 @@ import com.ruoyi.common.utils.DictUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.mapper.SysDictTypeMapper; -import com.ruoyi.system.service.ISysDictTypeService; +import com.ruoyi.system.service.SysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -25,7 +25,7 @@ import java.util.stream.Collectors; * @author ruoyi */ @Service -public class SysDictTypeServiceImpl implements ISysDictTypeService { +public class SysDictTypeServiceImpl implements SysDictTypeService { @Autowired private SysDictTypeMapper dictTypeMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java index 08d5beb..1738da1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl; import com.ruoyi.system.domain.SysLogininfor; import com.ruoyi.system.mapper.SysLogininforMapper; -import com.ruoyi.system.service.ISysLogininforService; +import com.ruoyi.system.service.SysLogininforService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,7 +14,7 @@ import java.util.List; * @author ruoyi */ @Service -public class SysLogininforServiceImpl implements ISysLogininforService { +public class SysLogininforServiceImpl implements SysLogininforService { @Autowired private SysLogininforMapper logininforMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index 31d6107..1f488b6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -13,7 +13,7 @@ import com.ruoyi.system.domain.vo.RouterVo; import com.ruoyi.system.mapper.SysMenuMapper; import com.ruoyi.system.mapper.SysRoleMapper; import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.service.ISysMenuService; +import com.ruoyi.system.service.SysMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,7 +26,7 @@ import java.util.stream.Collectors; * @author ruoyi */ @Service -public class SysMenuServiceImpl implements ISysMenuService { +public class SysMenuServiceImpl implements SysMenuService { public static final String PREMISSION_STRING = "perms[\"{0}\"]"; @Autowired diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java index db7a566..00cd636 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java @@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl; import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.mapper.SysNoticeMapper; -import com.ruoyi.system.service.ISysNoticeService; +import com.ruoyi.system.service.SysNoticeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,7 +14,7 @@ import java.util.List; * @author ruoyi */ @Service -public class SysNoticeServiceImpl implements ISysNoticeService { +public class SysNoticeServiceImpl implements SysNoticeService { @Autowired private SysNoticeMapper noticeMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java index fe81abd..799a759 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java @@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl; import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.mapper.SysOperLogMapper; -import com.ruoyi.system.service.ISysOperLogService; +import com.ruoyi.system.service.SysOperLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,7 +14,7 @@ import java.util.List; * @author ruoyi */ @Service -public class SysOperLogServiceImpl implements ISysOperLogService { +public class SysOperLogServiceImpl implements SysOperLogService { @Autowired private SysOperLogMapper operLogMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java index 21131c7..67efa69 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java @@ -6,7 +6,7 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.mapper.SysPostMapper; import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.service.ISysPostService; +import com.ruoyi.system.service.SysPostService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -18,7 +18,7 @@ import java.util.List; * @author ruoyi */ @Service -public class SysPostServiceImpl implements ISysPostService { +public class SysPostServiceImpl implements SysPostService { @Autowired private SysPostMapper postMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index 80642c8..5b70204 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -15,7 +15,7 @@ import com.ruoyi.system.mapper.SysRoleDeptMapper; import com.ruoyi.system.mapper.SysRoleMapper; import com.ruoyi.system.mapper.SysRoleMenuMapper; import com.ruoyi.system.mapper.SysUserRoleMapper; -import com.ruoyi.system.service.ISysRoleService; +import com.ruoyi.system.service.SysRoleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,7 +28,7 @@ import java.util.*; * @author ruoyi */ @Service -public class SysRoleServiceImpl implements ISysRoleService { +public class SysRoleServiceImpl implements SysRoleService { @Autowired private SysRoleMapper roleMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java index b0681a7..39dee32 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.system.service.impl; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.ruoyi.system.service.SysUserOnlineService; import org.springframework.stereotype.Service; /** @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; * @author ruoyi */ @Service -public class SysUserOnlineServiceImpl implements ISysUserOnlineService { +public class SysUserOnlineServiceImpl implements SysUserOnlineService { /** * 通过登录地址查询信息 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 9ee01ae..aa094f8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -13,8 +13,8 @@ import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysUserPost; import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.mapper.*; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysUserService; +import com.ruoyi.system.service.SysConfigServic; +import com.ruoyi.system.service.SysUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +33,7 @@ import java.util.stream.Collectors; * @author ruoyi */ @Service -public class SysUserServiceImpl implements ISysUserService { +public class SysUserServiceImpl implements SysUserService { private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); @Autowired protected Validator validator; @@ -48,7 +48,7 @@ public class SysUserServiceImpl implements ISysUserService { @Autowired private SysUserPostMapper userPostMapper; @Autowired - private ISysConfigService configService; + private SysConfigServic configService; /** * 根据条件分页查询用户列表