From 1bbb4c2c951861960d84452ffbf797e8b020af51 Mon Sep 17 00:00:00 2001 From: valarchie <343928303@qq.com> Date: Wed, 12 Oct 2022 21:59:21 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20domain=E7=9A=84Service=E5=91=BD?= =?UTF-8?q?=E5=90=8D=20=20=E4=BC=9A=E8=AE=A9=E4=BA=BA=E6=84=9F=E5=88=B0?= =?UTF-8?q?=E6=AD=A7=E4=B9=89=E4=BB=A5=E4=B8=BA=E6=98=AFDDD=E5=BD=93?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=A2=86=E5=9F=9F=E6=9C=8D=E5=8A=A1=20?= =?UTF-8?q?=E6=94=B9=E6=88=90applicationService=E6=9B=B4=E5=8A=A0=E8=B4=B4?= =?UTF-8?q?=E5=88=87=E4=B8=80=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/common/LoginController.java | 14 ++++---- .../controller/monitor/MonitorController.java | 10 +++--- .../system/SysConfigController.java | 10 +++--- .../controller/system/SysDeptController.java | 22 ++++++------ .../system/SysLoginInfoController.java | 12 +++---- .../controller/system/SysMenuController.java | 20 +++++------ .../system/SysNoticeController.java | 16 ++++----- .../system/SysOperationLogController.java | 12 +++---- .../controller/system/SysPostController.java | 18 +++++----- .../system/SysProfileController.java | 14 ++++---- .../controller/system/SysRoleController.java | 30 ++++++++-------- .../controller/system/SysUserController.java | 26 +++++++------- .../{ => command}/BulkOperationCommand.java | 2 +- .../dto}/TreeSelectedDTO.java | 2 +- .../common/{ => dto}/UploadFileDTO.java | 2 +- ...ice.java => ConfigApplicationService.java} | 2 +- ...rvice.java => DeptApplicationService.java} | 4 +-- ....java => LoginInfoApplicationService.java} | 4 +-- ...rvice.java => MenuApplicationService.java} | 24 ++++++------- .../menu/dto/{MetaVo.java => MetaDTO.java} | 8 ++--- .../dto/{RouterVo.java => RouterDTO.java} | 6 ++-- .../domain/system/menu/model/RouterModel.java | 36 +++++++++---------- ...ce.java => MonitorApplicationService.java} | 5 ++- ...ice.java => NoticeApplicationService.java} | 4 +-- ...va => OperationLogApplicationService.java} | 4 +-- ...rvice.java => PostApplicationService.java} | 4 +-- ...rvice.java => RoleApplicationService.java} | 5 ++- ...rvice.java => UserApplicationService.java} | 7 ++-- .../web/service/UserDetailsServiceImpl.java | 1 - 29 files changed, 166 insertions(+), 158 deletions(-) rename agileboot-domain/src/main/java/com/agileboot/domain/common/{ => command}/BulkOperationCommand.java (91%) rename agileboot-domain/src/main/java/com/agileboot/domain/{system => common/dto}/TreeSelectedDTO.java (87%) rename agileboot-domain/src/main/java/com/agileboot/domain/common/{ => dto}/UploadFileDTO.java (84%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/config/{ConfigDomainService.java => ConfigApplicationService.java} (98%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/dept/{DeptDomainService.java => DeptApplicationService.java} (97%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/{LoginInfoDomainService.java => LoginInfoApplicationService.java} (92%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/menu/{MenuDomainService.java => MenuApplicationService.java} (88%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/{MetaVo.java => MetaDTO.java} (82%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/{RouterVo.java => RouterDTO.java} (92%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/{MonitorDomainService.java => MonitorApplicationService.java} (98%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/notice/{NoticeDomainService.java => NoticeApplicationService.java} (95%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/{OperationLogDomainService.java => OperationLogApplicationService.java} (91%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/post/{PostDomainService.java => PostApplicationService.java} (97%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/role/{RoleDomainService.java => RoleApplicationService.java} (99%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/user/{UserDomainService.java => UserApplicationService.java} (98%) diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/common/LoginController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/common/LoginController.java index 9f2c38b..0724ded 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/common/LoginController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/common/LoginController.java @@ -9,8 +9,8 @@ import com.agileboot.common.config.AgileBootConfig; import com.agileboot.common.constant.Constants.Token; import com.agileboot.common.core.dto.ResponseDTO; import com.agileboot.common.exception.error.ErrorCode.Business; -import com.agileboot.domain.system.menu.MenuDomainService; -import com.agileboot.domain.system.menu.dto.RouterVo; +import com.agileboot.domain.system.menu.MenuApplicationService; +import com.agileboot.domain.system.menu.dto.RouterDTO; import com.agileboot.domain.system.user.dto.UserDTO; import com.agileboot.infrastructure.cache.map.MapCache; import com.agileboot.infrastructure.web.domain.login.CaptchaDTO; @@ -35,16 +35,16 @@ public class LoginController { private final LoginService loginService; - private final MenuDomainService menuDomainService; + private final MenuApplicationService menuApplicationService; /** * 系统基础配置 */ private final AgileBootConfig agileBootConfig; public LoginController(LoginService loginService, - MenuDomainService menuDomainService, AgileBootConfig agileBootConfig) { + MenuApplicationService menuApplicationService, AgileBootConfig agileBootConfig) { this.loginService = loginService; - this.menuDomainService = menuDomainService; + this.menuApplicationService = menuApplicationService; this.agileBootConfig = agileBootConfig; } @@ -105,9 +105,9 @@ public class LoginController { * @return 路由信息 */ @GetMapping("/getRouters") - public ResponseDTO> getRouters() { + public ResponseDTO> getRouters() { Long userId = AuthenticationUtils.getUserId(); - List routerTree = menuDomainService.getRouterTree(userId); + List routerTree = menuApplicationService.getRouterTree(userId); return ResponseDTO.ok(routerTree); } diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/monitor/MonitorController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/monitor/MonitorController.java index 5703e23..ad7414c 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/monitor/MonitorController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/monitor/MonitorController.java @@ -3,7 +3,7 @@ package com.agileboot.admin.controller.monitor; import com.agileboot.common.core.base.BaseController; import com.agileboot.common.core.dto.ResponseDTO; import com.agileboot.common.core.page.PageDTO; -import com.agileboot.domain.system.monitor.MonitorDomainService; +import com.agileboot.domain.system.monitor.MonitorApplicationService; import com.agileboot.domain.system.monitor.dto.RedisCacheInfoDTO; import com.agileboot.infrastructure.annotations.AccessLog; import com.agileboot.infrastructure.cache.redis.RedisCacheService; @@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController; public class MonitorController extends BaseController { @Autowired - private MonitorDomainService monitorDomainService; + private MonitorApplicationService monitorApplicationService; @Autowired private RedisCacheService redisCacheService; @@ -37,7 +37,7 @@ public class MonitorController extends BaseController { @PreAuthorize("@ss.hasPerm('monitor:cache:list')") @GetMapping("/cacheInfo") public ResponseDTO getRedisCacheInfo() { - RedisCacheInfoDTO redisCacheInfo = monitorDomainService.getRedisCacheInfo(); + RedisCacheInfoDTO redisCacheInfo = monitorApplicationService.getRedisCacheInfo(); return ResponseDTO.ok(redisCacheInfo); } @@ -45,7 +45,7 @@ public class MonitorController extends BaseController { @PreAuthorize("@ss.hasPerm('monitor:server:list')") @GetMapping("/serverInfo") public ResponseDTO getServerInfo() { - ServerInfo serverInfo = monitorDomainService.getServerInfo(); + ServerInfo serverInfo = monitorApplicationService.getServerInfo(); return ResponseDTO.ok(serverInfo); } @@ -58,7 +58,7 @@ public class MonitorController extends BaseController { @PreAuthorize("@ss.hasPerm('monitor:online:list')") @GetMapping("/onlineUser/list") public ResponseDTO list(String ipaddr, String userName) { - List onlineUserList = monitorDomainService.getOnlineUserList(userName, ipaddr); + List onlineUserList = monitorApplicationService.getOnlineUserList(userName, ipaddr); return ResponseDTO.ok(new PageDTO(onlineUserList)); } diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysConfigController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysConfigController.java index 30625b4..11598e3 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysConfigController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysConfigController.java @@ -4,7 +4,7 @@ import com.agileboot.common.core.base.BaseController; import com.agileboot.common.core.dto.ResponseDTO; import com.agileboot.common.core.page.PageDTO; import com.agileboot.domain.system.config.dto.ConfigDTO; -import com.agileboot.domain.system.config.ConfigDomainService; +import com.agileboot.domain.system.config.ConfigApplicationService; import com.agileboot.domain.system.config.query.ConfigQuery; import com.agileboot.domain.system.config.command.ConfigUpdateCommand; import com.agileboot.infrastructure.annotations.AccessLog; @@ -37,7 +37,7 @@ import org.springframework.web.bind.annotation.RestController; public class SysConfigController extends BaseController { @Autowired - private ConfigDomainService configDomainService; + private ConfigApplicationService configApplicationService; @Autowired private GuavaCacheService guavaCacheService; @@ -48,7 +48,7 @@ public class SysConfigController extends BaseController { @PreAuthorize("@ss.hasPerm('system:config:list')") @GetMapping("/list") public ResponseDTO list(ConfigQuery query) { - PageDTO page = configDomainService.getConfigList(query); + PageDTO page = configApplicationService.getConfigList(query); return ResponseDTO.ok(page); } @@ -69,7 +69,7 @@ public class SysConfigController extends BaseController { @PreAuthorize("@ss.hasPerm('system:config:query')") @GetMapping(value = "/{configId}") public ResponseDTO getInfo(@NotNull @Positive @PathVariable Long configId) { - ConfigDTO config = configDomainService.getConfigInfo(configId); + ConfigDTO config = configApplicationService.getConfigInfo(configId); return ResponseDTO.ok(config); } @@ -81,7 +81,7 @@ public class SysConfigController extends BaseController { @AccessLog(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping public ResponseDTO edit(@RequestBody ConfigUpdateCommand config) { - configDomainService.updateConfig(config, AuthenticationUtils.getLoginUser()); + configApplicationService.updateConfig(config, AuthenticationUtils.getLoginUser()); return ResponseDTO.ok(); } diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysDeptController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysDeptController.java index bc881e8..819cddc 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysDeptController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysDeptController.java @@ -3,10 +3,10 @@ package com.agileboot.admin.controller.system; import cn.hutool.core.lang.tree.Tree; import com.agileboot.common.core.base.BaseController; import com.agileboot.common.core.dto.ResponseDTO; -import com.agileboot.domain.system.TreeSelectedDTO; +import com.agileboot.domain.common.dto.TreeSelectedDTO; import com.agileboot.domain.system.dept.command.AddDeptCommand; import com.agileboot.domain.system.dept.dto.DeptDTO; -import com.agileboot.domain.system.dept.DeptDomainService; +import com.agileboot.domain.system.dept.DeptApplicationService; import com.agileboot.domain.system.dept.query.DeptQuery; import com.agileboot.domain.system.dept.command.UpdateDeptCommand; import com.agileboot.infrastructure.annotations.AccessLog; @@ -37,7 +37,7 @@ import org.springframework.web.bind.annotation.RestController; public class SysDeptController extends BaseController { @Autowired - private DeptDomainService deptDomainService; + private DeptApplicationService deptApplicationService; /** * 获取部门列表 @@ -45,7 +45,7 @@ public class SysDeptController extends BaseController { @PreAuthorize("@ss.hasPerm('system:dept:list')") @GetMapping("/list") public ResponseDTO list(DeptQuery query) { - List deptList = deptDomainService.getDeptList(query); + List deptList = deptApplicationService.getDeptList(query); return ResponseDTO.ok(deptList); } @@ -59,7 +59,7 @@ public class SysDeptController extends BaseController { query.setDeptId(deptId); query.setExcludeCurrentDept(true); - List deptList = deptDomainService.getDeptList(query); + List deptList = deptApplicationService.getDeptList(query); return ResponseDTO.ok(deptList); } @@ -69,7 +69,7 @@ public class SysDeptController extends BaseController { @PreAuthorize("@ss.hasPerm('system:dept:query')") @GetMapping(value = "/{deptId}") public ResponseDTO getInfo(@PathVariable Long deptId) { - DeptDTO dept = deptDomainService.getDeptInfo(deptId); + DeptDTO dept = deptApplicationService.getDeptInfo(deptId); return ResponseDTO.ok(dept); } @@ -78,7 +78,7 @@ public class SysDeptController extends BaseController { */ @GetMapping("/dropdownList") public ResponseDTO dropdownList() { - List> deptTree = deptDomainService.getDeptTree(); + List> deptTree = deptApplicationService.getDeptTree(); return ResponseDTO.ok(deptTree); } @@ -87,7 +87,7 @@ public class SysDeptController extends BaseController { */ @GetMapping(value = "/dropdownList/role/{roleId}") public ResponseDTO dropdownListForRole(@PathVariable("roleId") Long roleId) { - TreeSelectedDTO deptTreeForRole = deptDomainService.getDeptTreeForRole(roleId); + TreeSelectedDTO deptTreeForRole = deptApplicationService.getDeptTreeForRole(roleId); return ResponseDTO.ok(deptTreeForRole); } @@ -98,7 +98,7 @@ public class SysDeptController extends BaseController { @AccessLog(title = "部门管理", businessType = BusinessType.INSERT) @PostMapping public ResponseDTO add(@RequestBody AddDeptCommand addCommand) { - deptDomainService.addDept(addCommand, AuthenticationUtils.getLoginUser()); + deptApplicationService.addDept(addCommand, AuthenticationUtils.getLoginUser()); return ResponseDTO.ok(); } @@ -109,7 +109,7 @@ public class SysDeptController extends BaseController { @AccessLog(title = "部门管理", businessType = BusinessType.UPDATE) @PutMapping public ResponseDTO edit(@RequestBody UpdateDeptCommand updateCommand) { - deptDomainService.updateDept(updateCommand, AuthenticationUtils.getLoginUser()); + deptApplicationService.updateDept(updateCommand, AuthenticationUtils.getLoginUser()); return ResponseDTO.ok(); } @@ -120,7 +120,7 @@ public class SysDeptController extends BaseController { @AccessLog(title = "部门管理", businessType = BusinessType.DELETE) @DeleteMapping("/{deptId}") public ResponseDTO remove(@PathVariable @NotNull Long deptId) { - deptDomainService.removeDept(deptId); + deptApplicationService.removeDept(deptId); return ResponseDTO.ok(); } } diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysLoginInfoController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysLoginInfoController.java index 10281f6..430e355 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysLoginInfoController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysLoginInfoController.java @@ -6,9 +6,9 @@ import com.agileboot.common.core.dto.ResponseDTO; import com.agileboot.common.core.page.PageDTO; import com.agileboot.common.exception.error.ErrorCode; import com.agileboot.common.utils.poi.CustomExcelUtil; -import com.agileboot.domain.common.BulkOperationCommand; +import com.agileboot.domain.common.command.BulkOperationCommand; import com.agileboot.domain.system.loginInfo.dto.LoginInfoDTO; -import com.agileboot.domain.system.loginInfo.LoginInfoDomainService; +import com.agileboot.domain.system.loginInfo.LoginInfoApplicationService; import com.agileboot.domain.system.loginInfo.query.LoginInfoQuery; import com.agileboot.infrastructure.annotations.AccessLog; import com.agileboot.orm.enums.BusinessType; @@ -37,12 +37,12 @@ import org.springframework.web.bind.annotation.RestController; public class SysLoginInfoController extends BaseController { @Autowired - private LoginInfoDomainService loginInfoDomainService; + private LoginInfoApplicationService loginInfoApplicationService; @PreAuthorize("@ss.hasPerm('monitor:logininfor:list')") @GetMapping("/list") public ResponseDTO list(LoginInfoQuery query) { - PageDTO pageDTO = loginInfoDomainService.getLoginInfoList(query); + PageDTO pageDTO = loginInfoApplicationService.getLoginInfoList(query); return ResponseDTO.ok(pageDTO); } @@ -50,7 +50,7 @@ public class SysLoginInfoController extends BaseController { @PreAuthorize("@ss.hasPerm('monitor:logininfor:export')") @PostMapping("/export") public void export(HttpServletResponse response, LoginInfoQuery query) { - PageDTO pageDTO = loginInfoDomainService.getLoginInfoList(query); + PageDTO pageDTO = loginInfoApplicationService.getLoginInfoList(query); CustomExcelUtil.writeToResponse(pageDTO.getRows(), LoginInfoDTO.class, response); } @@ -58,7 +58,7 @@ public class SysLoginInfoController extends BaseController { @AccessLog(title = "登录日志", businessType = BusinessType.DELETE) @DeleteMapping("/{infoIds}") public ResponseDTO remove(@PathVariable @NotNull @NotEmpty List infoIds) { - loginInfoDomainService.deleteLoginInfo(new BulkOperationCommand<>(infoIds)); + loginInfoApplicationService.deleteLoginInfo(new BulkOperationCommand<>(infoIds)); return ResponseDTO.ok(); } diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysMenuController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysMenuController.java index 30c043a..ba51d43 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysMenuController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysMenuController.java @@ -3,10 +3,10 @@ package com.agileboot.admin.controller.system; import cn.hutool.core.lang.tree.Tree; import com.agileboot.common.core.base.BaseController; import com.agileboot.common.core.dto.ResponseDTO; -import com.agileboot.domain.system.TreeSelectedDTO; +import com.agileboot.domain.common.dto.TreeSelectedDTO; import com.agileboot.domain.system.menu.command.AddMenuCommand; import com.agileboot.domain.system.menu.dto.MenuDTO; -import com.agileboot.domain.system.menu.MenuDomainService; +import com.agileboot.domain.system.menu.MenuApplicationService; import com.agileboot.domain.system.menu.query.MenuQuery; import com.agileboot.domain.system.menu.command.UpdateMenuCommand; import com.agileboot.infrastructure.annotations.AccessLog; @@ -39,7 +39,7 @@ import org.springframework.web.bind.annotation.RestController; public class SysMenuController extends BaseController { @Autowired - MenuDomainService menuDomainService; + MenuApplicationService menuApplicationService; /** * 获取菜单列表 @@ -47,7 +47,7 @@ public class SysMenuController extends BaseController { @PreAuthorize("@ss.hasPerm('system:menu:list')") @GetMapping("/list") public ResponseDTO list(MenuQuery query) { - List menuList = menuDomainService.getMenuList(query); + List menuList = menuApplicationService.getMenuList(query); return ResponseDTO.ok(menuList); } @@ -57,7 +57,7 @@ public class SysMenuController extends BaseController { @PreAuthorize("@ss.hasPerm('system:menu:query')") @GetMapping(value = "/{menuId}") public ResponseDTO getInfo(@PathVariable @NotNull @PositiveOrZero Long menuId) { - MenuDTO menu = menuDomainService.getMenuInfo(menuId); + MenuDTO menu = menuApplicationService.getMenuInfo(menuId); return ResponseDTO.ok(menu); } @@ -67,7 +67,7 @@ public class SysMenuController extends BaseController { @GetMapping("/dropdownList") public ResponseDTO dropdownList() { LoginUser loginUser = AuthenticationUtils.getLoginUser(); - List> dropdownList = menuDomainService.getDropdownList(loginUser); + List> dropdownList = menuApplicationService.getDropdownList(loginUser); return ResponseDTO.ok(dropdownList); } @@ -77,7 +77,7 @@ public class SysMenuController extends BaseController { @GetMapping(value = "/roleMenuTreeSelect/{roleId}") public ResponseDTO roleMenuTreeSelect(@PathVariable("roleId") Long roleId) { LoginUser loginUser = AuthenticationUtils.getLoginUser(); - TreeSelectedDTO roleDropdownList = menuDomainService.getRoleDropdownList(loginUser, roleId); + TreeSelectedDTO roleDropdownList = menuApplicationService.getRoleDropdownList(loginUser, roleId); return ResponseDTO.ok(roleDropdownList); } @@ -89,7 +89,7 @@ public class SysMenuController extends BaseController { @PostMapping public ResponseDTO add(@RequestBody AddMenuCommand addCommand) { LoginUser loginUser = AuthenticationUtils.getLoginUser(); - menuDomainService.addMenu(addCommand, loginUser); + menuApplicationService.addMenu(addCommand, loginUser); return ResponseDTO.ok(); } @@ -101,7 +101,7 @@ public class SysMenuController extends BaseController { @PutMapping public ResponseDTO edit(@RequestBody UpdateMenuCommand updateCommand) { LoginUser loginUser = AuthenticationUtils.getLoginUser(); - menuDomainService.updateMenu(updateCommand, loginUser); + menuApplicationService.updateMenu(updateCommand, loginUser); return ResponseDTO.ok(); } @@ -112,7 +112,7 @@ public class SysMenuController extends BaseController { @AccessLog(title = "菜单管理", businessType = BusinessType.DELETE) @DeleteMapping("/{menuId}") public ResponseDTO remove(@PathVariable("menuId") Long menuId) { - menuDomainService.remove(menuId); + menuApplicationService.remove(menuId); return ResponseDTO.ok(); } diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysNoticeController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysNoticeController.java index 3f04534..4248fd9 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysNoticeController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysNoticeController.java @@ -3,10 +3,10 @@ package com.agileboot.admin.controller.system; import com.agileboot.common.core.base.BaseController; import com.agileboot.common.core.dto.ResponseDTO; import com.agileboot.common.core.page.PageDTO; -import com.agileboot.domain.common.BulkOperationCommand; +import com.agileboot.domain.common.command.BulkOperationCommand; import com.agileboot.domain.system.notice.command.NoticeAddCommand; import com.agileboot.domain.system.notice.dto.NoticeDTO; -import com.agileboot.domain.system.notice.NoticeDomainService; +import com.agileboot.domain.system.notice.NoticeApplicationService; import com.agileboot.domain.system.notice.query.NoticeQuery; import com.agileboot.domain.system.notice.command.NoticeUpdateCommand; import com.agileboot.infrastructure.annotations.AccessLog; @@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.RestController; public class SysNoticeController extends BaseController { @Autowired - private NoticeDomainService noticeDomainService; + private NoticeApplicationService noticeApplicationService; /** * 获取通知公告列表 @@ -46,7 +46,7 @@ public class SysNoticeController extends BaseController { @PreAuthorize("@ss.hasPerm('system:notice:list')") @GetMapping("/list") public ResponseDTO list(NoticeQuery query) { - PageDTO pageDTO = noticeDomainService.getNoticeList(query); + PageDTO pageDTO = noticeApplicationService.getNoticeList(query); return ResponseDTO.ok(pageDTO); } @@ -56,7 +56,7 @@ public class SysNoticeController extends BaseController { @PreAuthorize("@ss.hasPerm('system:notice:query')") @GetMapping(value = "/{noticeId}") public ResponseDTO getInfo(@PathVariable @NotNull @Positive Long noticeId) { - return ResponseDTO.ok(noticeDomainService.getNoticeInfo(noticeId)); + return ResponseDTO.ok(noticeApplicationService.getNoticeInfo(noticeId)); } /** @@ -66,7 +66,7 @@ public class SysNoticeController extends BaseController { @AccessLog(title = "通知公告", businessType = BusinessType.INSERT) @PostMapping public ResponseDTO add(@RequestBody NoticeAddCommand addCommand) { - noticeDomainService.addNotice(addCommand, AuthenticationUtils.getLoginUser()); + noticeApplicationService.addNotice(addCommand, AuthenticationUtils.getLoginUser()); return ResponseDTO.ok(); } @@ -77,7 +77,7 @@ public class SysNoticeController extends BaseController { @AccessLog(title = "通知公告", businessType = BusinessType.UPDATE) @PutMapping public ResponseDTO edit(@RequestBody NoticeUpdateCommand updateCommand) { - noticeDomainService.updateNotice(updateCommand, AuthenticationUtils.getLoginUser()); + noticeApplicationService.updateNotice(updateCommand, AuthenticationUtils.getLoginUser()); return ResponseDTO.ok(); } @@ -88,7 +88,7 @@ public class SysNoticeController extends BaseController { @AccessLog(title = "通知公告", businessType = BusinessType.DELETE) @DeleteMapping("/{noticeIds}") public ResponseDTO remove(@PathVariable List noticeIds) { - noticeDomainService.deleteNotice(new BulkOperationCommand<>(noticeIds)); + noticeApplicationService.deleteNotice(new BulkOperationCommand<>(noticeIds)); return ResponseDTO.ok(); } diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysOperationLogController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysOperationLogController.java index 28d77a1..00387ac 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysOperationLogController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysOperationLogController.java @@ -5,9 +5,9 @@ import com.agileboot.common.core.dto.ResponseDTO; import com.agileboot.common.core.page.PageDTO; import com.agileboot.common.exception.error.ErrorCode; import com.agileboot.common.utils.poi.CustomExcelUtil; -import com.agileboot.domain.common.BulkOperationCommand; +import com.agileboot.domain.common.command.BulkOperationCommand; import com.agileboot.domain.system.operationLog.dto.OperationLogDTO; -import com.agileboot.domain.system.operationLog.OperationLogDomainService; +import com.agileboot.domain.system.operationLog.OperationLogApplicationService; import com.agileboot.domain.system.operationLog.query.OperationLogQuery; import com.agileboot.infrastructure.annotations.AccessLog; import com.agileboot.orm.enums.BusinessType; @@ -33,12 +33,12 @@ import org.springframework.web.bind.annotation.RestController; public class SysOperationLogController extends BaseController { @Autowired - private OperationLogDomainService operationLogDomainService; + private OperationLogApplicationService operationLogApplicationService; @PreAuthorize("@ss.hasPerm('monitor:operlog:list')") @GetMapping("/list") public ResponseDTO list(OperationLogQuery query, HttpServletRequest request) { - PageDTO pageDTO = operationLogDomainService.getOperationLogList(query); + PageDTO pageDTO = operationLogApplicationService.getOperationLogList(query); return ResponseDTO.ok(pageDTO); } @@ -46,7 +46,7 @@ public class SysOperationLogController extends BaseController { @PreAuthorize("@ss.hasPerm('monitor:operlog:export')") @PostMapping("/export") public void export(HttpServletResponse response, OperationLogQuery query) { - PageDTO pageDTO = operationLogDomainService.getOperationLogList(query); + PageDTO pageDTO = operationLogApplicationService.getOperationLogList(query); CustomExcelUtil.writeToResponse(pageDTO.getRows(), OperationLogDTO.class, response); } @@ -54,7 +54,7 @@ public class SysOperationLogController extends BaseController { @PreAuthorize("@ss.hasPerm('monitor:operlog:remove')") @DeleteMapping("/{operationIds}") public ResponseDTO remove(@PathVariable List operationIds) { - operationLogDomainService.deleteOperationLog(new BulkOperationCommand<>(operationIds)); + operationLogApplicationService.deleteOperationLog(new BulkOperationCommand<>(operationIds)); return ResponseDTO.ok(); } diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java index 8501e40..0e5aab5 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java @@ -4,10 +4,10 @@ import com.agileboot.common.core.base.BaseController; import com.agileboot.common.core.dto.ResponseDTO; import com.agileboot.common.core.page.PageDTO; import com.agileboot.common.utils.poi.CustomExcelUtil; -import com.agileboot.domain.common.BulkOperationCommand; +import com.agileboot.domain.common.command.BulkOperationCommand; import com.agileboot.domain.system.post.command.AddPostCommand; import com.agileboot.domain.system.post.dto.PostDTO; -import com.agileboot.domain.system.post.PostDomainService; +import com.agileboot.domain.system.post.PostApplicationService; import com.agileboot.domain.system.post.query.PostQuery; import com.agileboot.domain.system.post.command.UpdatePostCommand; import com.agileboot.infrastructure.annotations.AccessLog; @@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.RestController; public class SysPostController extends BaseController { @Autowired - private PostDomainService postDomainService; + private PostApplicationService postApplicationService; /** * 获取岗位列表 @@ -46,7 +46,7 @@ public class SysPostController extends BaseController { @PreAuthorize("@ss.hasPerm('system:post:list')") @GetMapping("/list") public ResponseDTO list(PostQuery query) { - PageDTO pageDTO = postDomainService.getPostList(query); + PageDTO pageDTO = postApplicationService.getPostList(query); return ResponseDTO.ok(pageDTO); } @@ -54,7 +54,7 @@ public class SysPostController extends BaseController { @PreAuthorize("@ss.hasPerm('system:post:export')") @PostMapping("/export") public void export(HttpServletResponse response, PostQuery query) { - PageDTO pageDTO = postDomainService.getPostList(query); + PageDTO pageDTO = postApplicationService.getPostList(query); CustomExcelUtil.writeToResponse(pageDTO.getRows(), PostDTO.class, response); } @@ -64,7 +64,7 @@ public class SysPostController extends BaseController { @PreAuthorize("@ss.hasPerm('system:post:query')") @GetMapping(value = "/{postId}") public ResponseDTO getInfo(@PathVariable Long postId) { - PostDTO post = postDomainService.getPostInfo(postId); + PostDTO post = postApplicationService.getPostInfo(postId); return ResponseDTO.ok(post); } @@ -75,7 +75,7 @@ public class SysPostController extends BaseController { @AccessLog(title = "岗位管理", businessType = BusinessType.INSERT) @PostMapping public ResponseDTO add(@RequestBody AddPostCommand addCommand) { - postDomainService.addPost(addCommand, AuthenticationUtils.getLoginUser()); + postApplicationService.addPost(addCommand, AuthenticationUtils.getLoginUser()); return ResponseDTO.ok(); } @@ -86,7 +86,7 @@ public class SysPostController extends BaseController { @AccessLog(title = "岗位管理", businessType = BusinessType.UPDATE) @PutMapping public ResponseDTO edit(@RequestBody UpdatePostCommand updateCommand) { - postDomainService.updatePost(updateCommand, AuthenticationUtils.getLoginUser()); + postApplicationService.updatePost(updateCommand, AuthenticationUtils.getLoginUser()); return ResponseDTO.ok(); } @@ -97,7 +97,7 @@ public class SysPostController extends BaseController { @AccessLog(title = "岗位管理", businessType = BusinessType.DELETE) @DeleteMapping("/{postIds}") public ResponseDTO remove(@PathVariable List postIds) { - postDomainService.deletePost(new BulkOperationCommand<>(postIds)); + postApplicationService.deletePost(new BulkOperationCommand<>(postIds)); return ResponseDTO.ok(); } diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysProfileController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysProfileController.java index 82190c0..c0c229e 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysProfileController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysProfileController.java @@ -6,8 +6,8 @@ import com.agileboot.common.core.dto.ResponseDTO; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; import com.agileboot.common.utils.file.FileUploadUtils; -import com.agileboot.domain.common.UploadFileDTO; -import com.agileboot.domain.system.user.UserDomainService; +import com.agileboot.domain.common.dto.UploadFileDTO; +import com.agileboot.domain.system.user.UserApplicationService; import com.agileboot.domain.system.user.dto.UserProfileDTO; import com.agileboot.domain.system.user.command.UpdateProfileCommand; import com.agileboot.domain.system.user.command.UpdateUserAvatarCommand; @@ -37,7 +37,7 @@ import org.springframework.web.multipart.MultipartFile; public class SysProfileController extends BaseController { @Autowired - private UserDomainService userDomainService; + private UserApplicationService userApplicationService; /** * 个人信息 @@ -45,7 +45,7 @@ public class SysProfileController extends BaseController { @GetMapping public ResponseDTO profile() { LoginUser user = AuthenticationUtils.getLoginUser(); - UserProfileDTO userProfile = userDomainService.getUserProfile(user.getUserId()); + UserProfileDTO userProfile = userApplicationService.getUserProfile(user.getUserId()); return ResponseDTO.ok(userProfile); } @@ -57,7 +57,7 @@ public class SysProfileController extends BaseController { public ResponseDTO updateProfile(@RequestBody UpdateProfileCommand command) { LoginUser loginUser = AuthenticationUtils.getLoginUser(); command.setUserId(loginUser.getUserId()); - userDomainService.updateUserProfile(command, loginUser); + userApplicationService.updateUserProfile(command, loginUser); return ResponseDTO.ok(); } @@ -69,7 +69,7 @@ public class SysProfileController extends BaseController { public ResponseDTO updatePassword(@RequestBody UpdateUserPasswordCommand command) { LoginUser loginUser = AuthenticationUtils.getLoginUser(); command.setUserId(loginUser.getUserId()); - userDomainService.updateUserPassword(loginUser, command); + userApplicationService.updateUserPassword(loginUser, command); return ResponseDTO.ok(); } @@ -85,7 +85,7 @@ public class SysProfileController extends BaseController { LoginUser loginUser = AuthenticationUtils.getLoginUser(); String avatar = FileUploadUtils.upload(AgileBootConfig.getAvatarPath(), file); - userDomainService.updateUserAvatar(loginUser, new UpdateUserAvatarCommand(loginUser.getUserId(), avatar)); + userApplicationService.updateUserAvatar(loginUser, new UpdateUserAvatarCommand(loginUser.getUserId(), avatar)); return ResponseDTO.ok(new UploadFileDTO(avatar)); } } diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysRoleController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysRoleController.java index 17a5226..a205926 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysRoleController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysRoleController.java @@ -7,7 +7,7 @@ import com.agileboot.common.utils.poi.CustomExcelUtil; import com.agileboot.domain.system.role.command.AddRoleCommand; import com.agileboot.domain.system.role.query.AllocatedRoleQuery; import com.agileboot.domain.system.role.dto.RoleDTO; -import com.agileboot.domain.system.role.RoleDomainService; +import com.agileboot.domain.system.role.RoleApplicationService; import com.agileboot.domain.system.role.query.RoleQuery; import com.agileboot.domain.system.role.query.UnallocatedRoleQuery; import com.agileboot.domain.system.role.command.UpdateDataScopeCommand; @@ -43,12 +43,12 @@ import org.springframework.web.bind.annotation.RestController; public class SysRoleController extends BaseController { @Autowired - private RoleDomainService roleDomainService; + private RoleApplicationService roleApplicationService; @PreAuthorize("@ss.hasPerm('system:role:list')") @GetMapping("/list") public ResponseDTO list(RoleQuery query) { - PageDTO pageDTO = roleDomainService.getRoleList(query); + PageDTO pageDTO = roleApplicationService.getRoleList(query); return ResponseDTO.ok(pageDTO); } @@ -56,7 +56,7 @@ public class SysRoleController extends BaseController { @PreAuthorize("@ss.hasPerm('system:role:export')") @PostMapping("/export") public void export(HttpServletResponse response, RoleQuery query) { - PageDTO pageDTO = roleDomainService.getRoleList(query); + PageDTO pageDTO = roleApplicationService.getRoleList(query); CustomExcelUtil.writeToResponse(pageDTO.getRows(), RoleDTO.class, response); } @@ -66,7 +66,7 @@ public class SysRoleController extends BaseController { @PreAuthorize("@ss.hasPerm('system:role:query')") @GetMapping(value = "/{roleId}") public ResponseDTO getInfo(@PathVariable @NotNull Long roleId) { - RoleDTO roleInfo = roleDomainService.getRoleInfo(roleId); + RoleDTO roleInfo = roleApplicationService.getRoleInfo(roleId); return ResponseDTO.ok(roleInfo); } @@ -78,7 +78,7 @@ public class SysRoleController extends BaseController { @PostMapping public ResponseDTO add(@RequestBody AddRoleCommand addCommand) { LoginUser loginUser = AuthenticationUtils.getLoginUser(); - roleDomainService.addRole(addCommand, loginUser); + roleApplicationService.addRole(addCommand, loginUser); return ResponseDTO.ok(); } @@ -90,7 +90,7 @@ public class SysRoleController extends BaseController { @DeleteMapping(value = "/{roleId}") public ResponseDTO remove(@PathVariable("roleId")List roleIds) { LoginUser loginUser = AuthenticationUtils.getLoginUser(); - roleDomainService.deleteRoleByBulk(roleIds, loginUser); + roleApplicationService.deleteRoleByBulk(roleIds, loginUser); return ResponseDTO.ok(); } @@ -102,7 +102,7 @@ public class SysRoleController extends BaseController { @PutMapping public ResponseDTO edit(@Validated @RequestBody UpdateRoleCommand updateCommand) { LoginUser loginUser = AuthenticationUtils.getLoginUser(); - roleDomainService.updateRole(updateCommand, loginUser); + roleApplicationService.updateRole(updateCommand, loginUser); return ResponseDTO.ok(); } @@ -115,7 +115,7 @@ public class SysRoleController extends BaseController { public ResponseDTO dataScope(@PathVariable("roleId")Long roleId, @RequestBody UpdateDataScopeCommand command) { command.setRoleId(roleId); - roleDomainService.updateDataScope(command); + roleApplicationService.updateDataScope(command); return ResponseDTO.ok(); } @@ -129,7 +129,7 @@ public class SysRoleController extends BaseController { LoginUser loginUser = AuthenticationUtils.getLoginUser(); command.setRoleId(roleId); - roleDomainService.updateStatus(command, loginUser); + roleApplicationService.updateStatus(command, loginUser); return ResponseDTO.ok(); } @@ -141,7 +141,7 @@ public class SysRoleController extends BaseController { @GetMapping("/{roleId}/allocated/list") public ResponseDTO allocatedUserList(@PathVariable("roleId")Long roleId, AllocatedRoleQuery query) { query.setRoleId(roleId); - PageDTO page = roleDomainService.getAllocatedUserList(query); + PageDTO page = roleApplicationService.getAllocatedUserList(query); return ResponseDTO.ok(page); } @@ -152,7 +152,7 @@ public class SysRoleController extends BaseController { @GetMapping("/{roleId}/unallocated/list") public ResponseDTO unallocatedUserList(@PathVariable("roleId")Long roleId, UnallocatedRoleQuery query) { query.setRoleId(roleId); - PageDTO page = roleDomainService.getUnallocatedUserList(query); + PageDTO page = roleApplicationService.getUnallocatedUserList(query); return ResponseDTO.ok(page); } @@ -163,7 +163,7 @@ public class SysRoleController extends BaseController { @AccessLog(title = "角色管理", businessType = BusinessType.GRANT) @DeleteMapping("/{roleId}/user/grant") public ResponseDTO deleteRoleOfUser(@PathVariable("roleId")Long roleId, @RequestBody Long userId) { - roleDomainService.deleteRoleOfUser(userId); + roleApplicationService.deleteRoleOfUser(userId); return ResponseDTO.ok(); } @@ -174,7 +174,7 @@ public class SysRoleController extends BaseController { @AccessLog(title = "角色管理", businessType = BusinessType.GRANT) @DeleteMapping("/users/{userIds}/grant/bulk") public ResponseDTO deleteRoleOfUserByBulk(@PathVariable("userIds") List userIds) { - roleDomainService.deleteRoleOfUserByBulk(userIds); + roleApplicationService.deleteRoleOfUserByBulk(userIds); return ResponseDTO.ok(); } @@ -186,7 +186,7 @@ public class SysRoleController extends BaseController { @PostMapping("/{roleId}/users/{userIds}/grant/bulk") public ResponseDTO addRoleForUserByBulk(@PathVariable("roleId") Long roleId, @PathVariable("userIds") List userIds) { - roleDomainService.addRoleOfUserByBulk(roleId, userIds); + roleApplicationService.addRoleOfUserByBulk(roleId, userIds); return ResponseDTO.ok(); } } diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysUserController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysUserController.java index dc4ba19..9f9e400 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysUserController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysUserController.java @@ -5,11 +5,11 @@ import com.agileboot.common.core.base.BaseController; import com.agileboot.common.core.dto.ResponseDTO; import com.agileboot.common.core.page.PageDTO; import com.agileboot.common.utils.poi.CustomExcelUtil; -import com.agileboot.domain.common.BulkOperationCommand; +import com.agileboot.domain.common.command.BulkOperationCommand; import com.agileboot.domain.system.loginInfo.query.SearchUserQuery; import com.agileboot.domain.system.user.dto.UserDTO; import com.agileboot.domain.system.user.dto.UserDetailDTO; -import com.agileboot.domain.system.user.UserDomainService; +import com.agileboot.domain.system.user.UserApplicationService; import com.agileboot.domain.system.user.dto.UserInfoDTO; import com.agileboot.domain.system.user.command.AddUserCommand; import com.agileboot.domain.system.user.command.ChangeStatusCommand; @@ -44,7 +44,7 @@ import org.springframework.web.multipart.MultipartFile; public class SysUserController extends BaseController { @Autowired - private UserDomainService userDomainService; + private UserApplicationService userApplicationService; /** * 获取用户列表 @@ -52,7 +52,7 @@ public class SysUserController extends BaseController { @PreAuthorize("@ss.hasPerm('system:user:list') AND @ss.checkDataScopeWithDeptId(#query.deptId)") @GetMapping("/list") public ResponseDTO list(SearchUserQuery query) { - PageDTO page = userDomainService.getUserList(query); + PageDTO page = userApplicationService.getUserList(query); return ResponseDTO.ok(page); } @@ -60,7 +60,7 @@ public class SysUserController extends BaseController { @PreAuthorize("@ss.hasPerm('system:user:export')") @PostMapping("/export") public void export(HttpServletResponse response, SearchUserQuery query) { - PageDTO userList = userDomainService.getUserList(query); + PageDTO userList = userApplicationService.getUserList(query); CustomExcelUtil.writeToResponse(userList.getRows(), UserDTO.class, response); } @@ -73,7 +73,7 @@ public class SysUserController extends BaseController { for (Object command : commands) { AddUserCommand addUserCommand = (AddUserCommand) command; - userDomainService.addUser(loginUser, addUserCommand); + userApplicationService.addUser(loginUser, addUserCommand); } return ResponseDTO.ok(); } @@ -89,7 +89,7 @@ public class SysUserController extends BaseController { @PreAuthorize("@ss.hasPerm('system:user:query')") @GetMapping(value = {"/", "/{userId}"}) public ResponseDTO getUserDetailInfo(@PathVariable(value = "userId", required = false) Long userId) { - UserDetailDTO userDetailInfo = userDomainService.getUserDetailInfo(userId); + UserDetailDTO userDetailInfo = userApplicationService.getUserDetailInfo(userId); return ResponseDTO.ok(userDetailInfo); } @@ -101,7 +101,7 @@ public class SysUserController extends BaseController { @PostMapping public ResponseDTO add(@Validated @RequestBody AddUserCommand command) { LoginUser loginUser = AuthenticationUtils.getLoginUser(); - userDomainService.addUser(loginUser, command); + userApplicationService.addUser(loginUser, command); return ResponseDTO.ok(); } @@ -113,7 +113,7 @@ public class SysUserController extends BaseController { @PutMapping public ResponseDTO edit(@Validated @RequestBody UpdateUserCommand command) { LoginUser loginUser = AuthenticationUtils.getLoginUser(); - userDomainService.updateUser(loginUser, command); + userApplicationService.updateUser(loginUser, command); return ResponseDTO.ok(); } @@ -126,7 +126,7 @@ public class SysUserController extends BaseController { public ResponseDTO remove(@PathVariable List userIds) { BulkOperationCommand bulkDeleteCommand = new BulkOperationCommand(userIds); LoginUser loginUser = AuthenticationUtils.getLoginUser(); - userDomainService.deleteUsers(loginUser, bulkDeleteCommand); + userApplicationService.deleteUsers(loginUser, bulkDeleteCommand); return ResponseDTO.ok(); } @@ -139,7 +139,7 @@ public class SysUserController extends BaseController { public ResponseDTO resetPassword(@PathVariable Long userId, @RequestBody ResetPasswordCommand command) { command.setUserId(userId); LoginUser loginUser = AuthenticationUtils.getLoginUser(); - userDomainService.resetUserPassword(loginUser, command); + userApplicationService.resetUserPassword(loginUser, command); return ResponseDTO.ok(); } @@ -152,7 +152,7 @@ public class SysUserController extends BaseController { public ResponseDTO changeStatus(@PathVariable Long userId, @RequestBody ChangeStatusCommand command) { command.setUserId(userId); LoginUser loginUser = AuthenticationUtils.getLoginUser(); - userDomainService.changeUserStatus(loginUser, command); + userApplicationService.changeUserStatus(loginUser, command); return ResponseDTO.ok(); } @@ -162,7 +162,7 @@ public class SysUserController extends BaseController { @PreAuthorize("@ss.hasPerm('system:user:query')") @GetMapping("/{userId}/role") public ResponseDTO getRoleOfUser(@PathVariable("userId") Long userId) { - UserInfoDTO userWithRole = userDomainService.getUserWithRole(userId); + UserInfoDTO userWithRole = userApplicationService.getUserWithRole(userId); return ResponseDTO.ok(userWithRole); } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/common/BulkOperationCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/common/command/BulkOperationCommand.java similarity index 91% rename from agileboot-domain/src/main/java/com/agileboot/domain/common/BulkOperationCommand.java rename to agileboot-domain/src/main/java/com/agileboot/domain/common/command/BulkOperationCommand.java index f270bc2..07ac167 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/common/BulkOperationCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/common/command/BulkOperationCommand.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.common; +package com.agileboot.domain.common.command; import cn.hutool.core.collection.CollUtil; import com.agileboot.common.exception.ApiException; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/TreeSelectedDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/common/dto/TreeSelectedDTO.java similarity index 87% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/TreeSelectedDTO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/common/dto/TreeSelectedDTO.java index 2d73028..7adbc8f 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/TreeSelectedDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/common/dto/TreeSelectedDTO.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system; +package com.agileboot.domain.common.dto; import cn.hutool.core.lang.tree.Tree; import java.util.List; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/common/UploadFileDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/common/dto/UploadFileDTO.java similarity index 84% rename from agileboot-domain/src/main/java/com/agileboot/domain/common/UploadFileDTO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/common/dto/UploadFileDTO.java index ab5efc5..cc8db6f 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/common/UploadFileDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/common/dto/UploadFileDTO.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.common; +package com.agileboot.domain.common.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigApplicationService.java similarity index 98% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigDomainService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigApplicationService.java index 81665f9..9f6f107 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigApplicationService.java @@ -21,7 +21,7 @@ import org.springframework.transaction.annotation.Transactional; * @author valarchie */ @Service -public class ConfigDomainService { +public class ConfigApplicationService { @Autowired private ISysConfigService configService; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptApplicationService.java similarity index 97% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptDomainService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptApplicationService.java index 097da49..9d1d9b5 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptApplicationService.java @@ -5,7 +5,7 @@ import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.util.StrUtil; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; -import com.agileboot.domain.system.TreeSelectedDTO; +import com.agileboot.domain.common.dto.TreeSelectedDTO; import com.agileboot.domain.system.dept.command.AddDeptCommand; import com.agileboot.domain.system.dept.command.UpdateDeptCommand; import com.agileboot.domain.system.dept.dto.DeptDTO; @@ -29,7 +29,7 @@ import org.springframework.transaction.annotation.Transactional; */ @SuppressWarnings("AlibabaTransactionMustHaveRollback") @Service -public class DeptDomainService { +public class DeptApplicationService { @Autowired private ISysDeptService deptService; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/LoginInfoDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/LoginInfoApplicationService.java similarity index 92% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/LoginInfoDomainService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/LoginInfoApplicationService.java index 2fbae71..d5871cb 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/LoginInfoDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/LoginInfoApplicationService.java @@ -1,7 +1,7 @@ package com.agileboot.domain.system.loginInfo; import com.agileboot.common.core.page.PageDTO; -import com.agileboot.domain.common.BulkOperationCommand; +import com.agileboot.domain.common.command.BulkOperationCommand; import com.agileboot.domain.system.loginInfo.dto.LoginInfoDTO; import com.agileboot.domain.system.loginInfo.query.LoginInfoQuery; import com.agileboot.orm.entity.SysLoginInfoEntity; @@ -17,7 +17,7 @@ import org.springframework.stereotype.Service; * @author valarchie */ @Service -public class LoginInfoDomainService { +public class LoginInfoApplicationService { @Autowired private ISysLoginInfoService loginInfoService; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuApplicationService.java similarity index 88% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuDomainService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuApplicationService.java index 0b4388f..8ff8fa5 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuApplicationService.java @@ -7,11 +7,11 @@ import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeUtil; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; -import com.agileboot.domain.system.TreeSelectedDTO; +import com.agileboot.domain.common.dto.TreeSelectedDTO; import com.agileboot.domain.system.menu.command.AddMenuCommand; import com.agileboot.domain.system.menu.command.UpdateMenuCommand; import com.agileboot.domain.system.menu.dto.MenuDTO; -import com.agileboot.domain.system.menu.dto.RouterVo; +import com.agileboot.domain.system.menu.dto.RouterDTO; import com.agileboot.domain.system.menu.model.MenuModel; import com.agileboot.domain.system.menu.model.RouterModel; import com.agileboot.domain.system.menu.query.MenuQuery; @@ -29,7 +29,7 @@ import org.springframework.stereotype.Service; * @author valarchie */ @Service -public class MenuDomainService { +public class MenuApplicationService { @Autowired private ISysMenuService menuService; @@ -150,11 +150,11 @@ public class MenuDomainService { } - public List buildRouterTree(List> trees) { - List routers = new LinkedList(); + public List buildRouterTree(List> trees) { + List routers = new LinkedList(); if (CollUtil.isNotEmpty(trees)) { for (Tree tree : trees) { - RouterVo routerVo = null; + RouterDTO routerDTO = null; Object entity = tree.get("entity"); @@ -162,21 +162,21 @@ public class MenuDomainService { RouterModel model = new RouterModel(); BeanUtil.copyProperties(entity, model, true); - routerVo = model.produceDefaultRouterVO(); + routerDTO = model.produceDefaultRouterVO(); if(model.isMultipleLevelMenu(tree)) { - routerVo = model.produceDirectoryRouterVO(buildRouterTree(tree.getChildren())); + routerDTO = model.produceDirectoryRouterVO(buildRouterTree(tree.getChildren())); } if(model.isSingleLevelMenu()) { - routerVo = model.produceMenuFrameRouterVO(); + routerDTO = model.produceMenuFrameRouterVO(); } if(model.getParentId() == 0L && model.isInnerLink()) { - routerVo = model.produceInnerLinkRouterVO(); + routerDTO = model.produceInnerLinkRouterVO(); } - routers.add(routerVo); + routers.add(routerDTO); } } @@ -186,7 +186,7 @@ public class MenuDomainService { } - public List getRouterTree(Long userId) { + public List getRouterTree(Long userId) { List> trees = buildMenuEntityTree(userId); return buildRouterTree(trees); } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MetaVo.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MetaDTO.java similarity index 82% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MetaVo.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MetaDTO.java index 6212ad5..27f18c4 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MetaVo.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MetaDTO.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; */ @Data @NoArgsConstructor -public class MetaVo { +public class MetaDTO { /** * 设置该路由在侧边栏和面包屑中展示的名字 @@ -33,13 +33,13 @@ public class MetaVo { */ private String link; - public MetaVo(String title, String icon) { + public MetaDTO(String title, String icon) { this.title = title; this.icon = icon; } - public MetaVo(String title, String icon, String link) { + public MetaDTO(String title, String icon, String link) { this.title = title; this.icon = icon; if (HttpUtil.isHttp(link)) { @@ -47,7 +47,7 @@ public class MetaVo { } } - public MetaVo(String title, String icon, boolean noCache, String link) { + public MetaDTO(String title, String icon, boolean noCache, String link) { this.title = title; this.icon = icon; this.noCache = noCache; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/RouterVo.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/RouterDTO.java similarity index 92% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/RouterVo.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/RouterDTO.java index bac24a7..2b4c157 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/RouterVo.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/RouterDTO.java @@ -11,7 +11,7 @@ import lombok.Data; */ @JsonInclude(JsonInclude.Include.NON_EMPTY) @Data -public class RouterVo { +public class RouterDTO { /** * 路由名字 @@ -51,11 +51,11 @@ public class RouterVo { /** * 其他元素 */ - private MetaVo meta; + private MetaDTO meta; /** * 子路由 */ - private List children; + private List children; } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/RouterModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/RouterModel.java index 04d1922..e07dc19 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/RouterModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/RouterModel.java @@ -5,8 +5,8 @@ import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; import com.agileboot.common.constant.Constants; -import com.agileboot.domain.system.menu.dto.MetaVo; -import com.agileboot.domain.system.menu.dto.RouterVo; +import com.agileboot.domain.system.menu.dto.MetaDTO; +import com.agileboot.domain.system.menu.dto.RouterDTO; import com.agileboot.orm.entity.SysMenuEntity; import com.agileboot.orm.enums.MenuComponentEnum; import com.agileboot.orm.enums.MenuTypeEnum; @@ -17,9 +17,9 @@ import java.util.Objects; public class RouterModel extends SysMenuEntity { - public RouterVo produceDirectoryRouterVO(List children) { + public RouterDTO produceDirectoryRouterVO(List children) { - RouterVo router = produceDefaultRouterVO(); + RouterDTO router = produceDefaultRouterVO(); if (CollUtil.isNotEmpty(children) && Objects.equals(MenuTypeEnum.DIRECTORY.getValue(), getMenuType())) { router.setAlwaysShow(true); @@ -31,16 +31,16 @@ public class RouterModel extends SysMenuEntity { } - public RouterVo produceMenuFrameRouterVO() { - RouterVo router = new RouterVo(); + public RouterDTO produceMenuFrameRouterVO() { + RouterDTO router = new RouterDTO(); router.setMeta(null); - List childrenList = new ArrayList<>(); - RouterVo children = new RouterVo(); + List childrenList = new ArrayList<>(); + RouterDTO children = new RouterDTO(); children.setPath(getPath()); children.setComponent(getComponent()); children.setName(StrUtil.upperFirst(getPath())); - children.setMeta(new MetaVo(getMenuName(), getIcon(), !getIsCache(), getPath())); + children.setMeta(new MetaDTO(getMenuName(), getIcon(), !getIsCache(), getPath())); children.setQuery(getQuery()); childrenList.add(children); router.setChildren(childrenList); @@ -49,33 +49,33 @@ public class RouterModel extends SysMenuEntity { } - public RouterVo produceInnerLinkRouterVO() { + public RouterDTO produceInnerLinkRouterVO() { - RouterVo router = new RouterVo(); + RouterDTO router = new RouterDTO(); - router.setMeta(new MetaVo(getMenuName(), getIcon())); + router.setMeta(new MetaDTO(getMenuName(), getIcon())); router.setPath("/"); - List childrenList = new ArrayList<>(); - RouterVo children = new RouterVo(); + List childrenList = new ArrayList<>(); + RouterDTO children = new RouterDTO(); String routerPath = trimHttpPrefixForInnerLink(getPath()); children.setPath(routerPath); children.setComponent(MenuComponentEnum.INNER_LINK.description()); children.setName(StrUtil.upperFirst(routerPath)); - children.setMeta(new MetaVo(getMenuName(), getIcon(), getPath())); + children.setMeta(new MetaDTO(getMenuName(), getIcon(), getPath())); childrenList.add(children); router.setChildren(childrenList); return router; } - public RouterVo produceDefaultRouterVO() { - RouterVo router = new RouterVo(); + public RouterDTO produceDefaultRouterVO() { + RouterDTO router = new RouterDTO(); router.setHidden(!getIsVisible()); router.setName(getRouteName()); router.setPath(getRouterPath()); router.setComponent(getComponentTypeForFrontEnd()); router.setQuery(getQuery()); - router.setMeta(new MetaVo(getMenuName(), getIcon(), !getIsCache(), getPath())); + router.setMeta(new MetaDTO(getMenuName(), getIcon(), !getIsCache(), getPath())); return router; } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/MonitorDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/MonitorApplicationService.java similarity index 98% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/MonitorDomainService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/MonitorApplicationService.java index 916d2ef..4987547 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/MonitorDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/MonitorApplicationService.java @@ -25,8 +25,11 @@ import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; +/** + * @author valarchie + */ @Service -public class MonitorDomainService { +public class MonitorApplicationService { @Autowired private RedisTemplate redisTemplate; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeApplicationService.java similarity index 95% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeDomainService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeApplicationService.java index 16f1c70..abadf69 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeApplicationService.java @@ -3,7 +3,7 @@ package com.agileboot.domain.system.notice; import com.agileboot.common.core.page.PageDTO; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; -import com.agileboot.domain.common.BulkOperationCommand; +import com.agileboot.domain.common.command.BulkOperationCommand; import com.agileboot.domain.system.notice.command.NoticeAddCommand; import com.agileboot.domain.system.notice.command.NoticeUpdateCommand; import com.agileboot.domain.system.notice.dto.NoticeDTO; @@ -22,7 +22,7 @@ import org.springframework.stereotype.Service; * @author valarchie */ @Service -public class NoticeDomainService { +public class NoticeApplicationService { @Autowired private ISysNoticeService noticeService; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/OperationLogDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/OperationLogApplicationService.java similarity index 91% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/OperationLogDomainService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/OperationLogApplicationService.java index f01d345..adc2dc7 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/OperationLogDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/OperationLogApplicationService.java @@ -1,7 +1,7 @@ package com.agileboot.domain.system.operationLog; import com.agileboot.common.core.page.PageDTO; -import com.agileboot.domain.common.BulkOperationCommand; +import com.agileboot.domain.common.command.BulkOperationCommand; import com.agileboot.domain.system.operationLog.dto.OperationLogDTO; import com.agileboot.domain.system.operationLog.query.OperationLogQuery; import com.agileboot.orm.entity.SysOperationLogEntity; @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; * @author valarchie */ @Service -public class OperationLogDomainService { +public class OperationLogApplicationService { @Autowired private ISysOperationLogService operationLogService; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostApplicationService.java similarity index 97% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostDomainService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostApplicationService.java index f3ea3bb..4a90e4e 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostApplicationService.java @@ -4,7 +4,7 @@ import com.agileboot.common.core.page.PageDTO; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; import com.agileboot.common.exception.error.ErrorCode.Business; -import com.agileboot.domain.common.BulkOperationCommand; +import com.agileboot.domain.common.command.BulkOperationCommand; import com.agileboot.domain.system.post.command.AddPostCommand; import com.agileboot.domain.system.post.command.UpdatePostCommand; import com.agileboot.domain.system.post.dto.PostDTO; @@ -23,7 +23,7 @@ import org.springframework.stereotype.Service; * @author valarchie */ @Service -public class PostDomainService { +public class PostApplicationService { @Autowired private ISysPostService postService; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleApplicationService.java similarity index 99% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleDomainService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleApplicationService.java index f1075dc..fee129c 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleApplicationService.java @@ -30,8 +30,11 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +/** + * @author valarchie + */ @Service -public class RoleDomainService { +public class RoleApplicationService { @Autowired private ISysRoleService roleService; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserApplicationService.java similarity index 98% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserDomainService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserApplicationService.java index d246d5b..805d2ca 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserApplicationService.java @@ -5,7 +5,7 @@ import cn.hutool.core.convert.Convert; import com.agileboot.common.core.page.PageDTO; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; -import com.agileboot.domain.common.BulkOperationCommand; +import com.agileboot.domain.common.command.BulkOperationCommand; import com.agileboot.domain.system.loginInfo.query.SearchUserQuery; import com.agileboot.domain.system.post.dto.PostDTO; import com.agileboot.domain.system.role.dto.RoleDTO; @@ -38,8 +38,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +/** + * @author valarchie + */ @Service -public class UserDomainService { +public class UserApplicationService { @Autowired private ISysUserService userService; diff --git a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/web/service/UserDetailsServiceImpl.java b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/web/service/UserDetailsServiceImpl.java index e663d40..4a4d7a1 100644 --- a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/web/service/UserDetailsServiceImpl.java +++ b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/web/service/UserDetailsServiceImpl.java @@ -29,7 +29,6 @@ public class UserDetailsServiceImpl implements UserDetailsService { @Autowired private ISysUserService userService; - @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { SysUserEntity userEntity = userService.getUserByUserName(username);