refactor: 目录结构调整和代码优化

src/main/java/com/youlai/boot/system/controller/ConfigController.java

@@ -6,7 +6,7 @@ import com.youlai.boot.common.result.Result;
 import com.youlai.boot.system.model.form.ConfigForm;
 import com.youlai.boot.system.model.query.ConfigPageQuery;
 import com.youlai.boot.system.model.vo.ConfigVO;
-import com.youlai.boot.system.service.SysConfigService;
+import com.youlai.boot.system.service.ConfigService;
 import io.swagger.v3.oas.annotations.Parameter;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -29,15 +29,15 @@ import org.springframework.security.access.prepost.PreAuthorize;
 @RequiredArgsConstructor
 @Tag(name = "10.系统配置")
 @RequestMapping("/api/v1/config")
-public class SysConfigController {
+public class ConfigController {
 
-    private final SysConfigService sysConfigService;
+    private final ConfigService configService;
 
     @GetMapping("/page")
     @Operation(summary = "系统配置分页列表")
     @PreAuthorize("@ss.hasPerm('sys:config:query')")
     public PageResult<ConfigVO> page(@ParameterObject ConfigPageQuery configPageQuery) {
-        IPage<ConfigVO> result = sysConfigService.page(configPageQuery);
+        IPage<ConfigVO> result = configService.page(configPageQuery);
         return PageResult.success(result);
     }
 
@@ -45,7 +45,7 @@ public class SysConfigController {
     @PostMapping
     @PreAuthorize("@ss.hasPerm('sys:config:add')")
     public Result<?> save(@RequestBody @Valid ConfigForm configForm) {
-        return Result.judge(sysConfigService.save(configForm));
+        return Result.judge(configService.save(configForm));
     }
 
     @Operation(summary = "获取系统配置表单数据")
@@ -53,7 +53,7 @@ public class SysConfigController {
     public Result<ConfigForm> getConfigForm(
             @Parameter(description = "系统配置ID") @PathVariable Long id
     ) {
-        ConfigForm formData = sysConfigService.getConfigFormData(id);
+        ConfigForm formData = configService.getConfigFormData(id);
         return Result.success(formData);
     }
 
@@ -61,21 +61,21 @@ public class SysConfigController {
     @PatchMapping
     @PreAuthorize("@ss.hasPerm('sys:config:refresh')")
     public Result<ConfigForm> refreshCache() {
-        return Result.judge(sysConfigService.refreshCache());
+        return Result.judge(configService.refreshCache());
     }
 
     @PutMapping(value = "/{id}")
     @Operation(summary = "修改系统配置")
     @PreAuthorize("@ss.hasPerm('sys:config:update')")
     public Result<?> update(@Valid @PathVariable Long id, @RequestBody ConfigForm configForm) {
-        return Result.judge(sysConfigService.edit(id, configForm));
+        return Result.judge(configService.edit(id, configForm));
     }
 
     @DeleteMapping("/{id}")
     @Operation(summary = "删除系统配置")
     @PreAuthorize("@ss.hasPerm('sys:config:delete')")
     public Result<?> delete(@PathVariable Long id) {
-        return Result.judge(sysConfigService.delete(id));
+        return Result.judge(configService.delete(id));
     }
 
 }

src/main/java/com/youlai/boot/system/controller/DeptController.java

@@ -1,14 +1,14 @@
 package com.youlai.boot.system.controller;
 
 import com.youlai.boot.common.enums.LogModuleEnum;
-import com.youlai.boot.common.annotation.NoRepeat;
+import com.youlai.boot.common.annotation.RepeatSubmit;
 import com.youlai.boot.common.model.Option;
 import com.youlai.boot.common.result.Result;
 import com.youlai.boot.system.model.form.DeptForm;
 import com.youlai.boot.system.model.query.DeptQuery;
 import com.youlai.boot.system.model.vo.DeptVO;
-import com.youlai.boot.common.annotation.LogAnnotation;
-import com.youlai.boot.system.service.SysDeptService;
+import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.system.service.DeptService;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
@@ -29,13 +29,13 @@ import java.util.List;
 @RestController
 @RequestMapping("/api/v1/dept")
 @RequiredArgsConstructor
-public class SysDeptController {
+public class DeptController {
 
-    private final SysDeptService deptService;
+    private final DeptService deptService;
 
     @Operation(summary = "部门列表")
     @GetMapping
-    @LogAnnotation( value = "部门列表",module = LogModuleEnum.DEPT)
+    @Log( value = "部门列表",module = LogModuleEnum.DEPT)
     public Result<List<DeptVO>> getDeptList(
              DeptQuery queryParams
     ) {
@@ -53,7 +53,7 @@ public class SysDeptController {
     @Operation(summary = "新增部门")
     @PostMapping
     @PreAuthorize("@ss.hasPerm('sys:dept:add')")
-    @NoRepeat
+    @RepeatSubmit
     public Result<?> saveDept(
             @Valid @RequestBody DeptForm formData
     ) {

src/main/java/com/youlai/boot/system/controller/DictController.java

@@ -7,10 +7,10 @@ import com.youlai.boot.common.result.Result;
 import com.youlai.boot.common.enums.LogModuleEnum;
 import com.youlai.boot.system.model.query.DictPageQuery;
 import com.youlai.boot.system.model.vo.DictPageVO;
-import com.youlai.boot.common.annotation.NoRepeat;
+import com.youlai.boot.common.annotation.RepeatSubmit;
 import com.youlai.boot.system.model.form.DictForm;
-import com.youlai.boot.common.annotation.LogAnnotation;
-import com.youlai.boot.system.service.SysDictService;
+import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.system.service.DictService;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
@@ -30,13 +30,13 @@ import java.util.List;
 @RestController
 @RequestMapping("/api/v1/dict")
 @RequiredArgsConstructor
-public class SysDictController {
+public class DictController {
 
-    private final SysDictService dictService;
+    private final DictService dictService;
 
     @Operation(summary = "字典分页列表")
     @GetMapping("/page")
-    @LogAnnotation( value = "字典分页列表",module = LogModuleEnum.DICT)
+    @Log( value = "字典分页列表",module = LogModuleEnum.DICT)
     public PageResult<DictPageVO> getDictPage(
             DictPageQuery queryParams
     ) {
@@ -72,7 +72,7 @@ public class SysDictController {
     @Operation(summary = "新增字典")
     @PostMapping
     @PreAuthorize("@ss.hasPerm('sys:dict:add')")
-    @NoRepeat
+    @RepeatSubmit
     public Result<?> saveDict(@RequestBody DictForm formData) {
         boolean result = dictService.saveDict(formData);
         return Result.judge(result);

src/main/java/com/youlai/boot/system/controller/LogController.java

@@ -7,7 +7,7 @@ import com.youlai.boot.system.model.query.LogPageQuery;
 import com.youlai.boot.system.model.vo.LogPageVO;
 import com.youlai.boot.system.model.vo.VisitStatsVO;
 import com.youlai.boot.system.model.vo.VisitTrendVO;
-import com.youlai.boot.system.service.SysLogService;
+import com.youlai.boot.system.service.LogService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -28,9 +28,9 @@ import java.util.List;
 @RestController
 @RequestMapping("/api/v1/logs")
 @RequiredArgsConstructor
-public class SysLogController {
+public class LogController {
 
-    private final SysLogService logService;
+    private final LogService logService;
 
     @Operation(summary = "日志分页列表")
     @GetMapping("/page")

src/main/java/com/youlai/boot/system/controller/MenuController.java

@@ -2,15 +2,15 @@ package com.youlai.boot.system.controller;
 
 import com.youlai.boot.common.result.Result;
 import com.youlai.boot.common.enums.LogModuleEnum;
-import com.youlai.boot.common.annotation.NoRepeat;
+import com.youlai.boot.common.annotation.RepeatSubmit;
 import com.youlai.boot.system.model.form.MenuForm;
 import com.youlai.boot.system.model.query.MenuQuery;
 import com.youlai.boot.system.model.vo.MenuVO;
 import com.youlai.boot.common.model.Option;
 import com.youlai.boot.system.model.vo.RouteVO;
-import com.youlai.boot.common.annotation.LogAnnotation;
+import com.youlai.boot.common.annotation.Log;
 import com.youlai.boot.core.security.util.SecurityUtils;
-import com.youlai.boot.system.service.SysMenuService;
+import com.youlai.boot.system.service.MenuService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -33,13 +33,13 @@ import java.util.Set;
 @RequestMapping("/api/v1/menus")
 @RequiredArgsConstructor
 @Slf4j
-public class SysMenuController {
+public class MenuController {
 
-    private final SysMenuService menuService;
+    private final MenuService menuService;
 
     @Operation(summary = "菜单列表")
     @GetMapping
-    @LogAnnotation( value = "菜单列表",module = LogModuleEnum.MENU)
+    @Log( value = "菜单列表",module = LogModuleEnum.MENU)
     public Result<List<MenuVO>> listMenus(MenuQuery queryParams) {
         List<MenuVO> menuList = menuService.listMenus(queryParams);
         return Result.success(menuList);
@@ -75,7 +75,7 @@ public class SysMenuController {
     @Operation(summary = "新增菜单")
     @PostMapping
     @PreAuthorize("@ss.hasPerm('sys:menu:add')")
-    @NoRepeat
+    @RepeatSubmit
     public Result<?> addMenu(@RequestBody MenuForm menuForm) {
         boolean result = menuService.saveMenu(menuForm);
         return Result.judge(result);

src/main/java/com/youlai/boot/system/controller/RoleController.java

@@ -2,15 +2,15 @@ package com.youlai.boot.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.youlai.boot.common.enums.LogModuleEnum;
-import com.youlai.boot.common.annotation.NoRepeat;
+import com.youlai.boot.common.annotation.RepeatSubmit;
 import com.youlai.boot.common.model.Option;
 import com.youlai.boot.common.result.PageResult;
 import com.youlai.boot.common.result.Result;
 import com.youlai.boot.system.model.form.RoleForm;
 import com.youlai.boot.system.model.query.RolePageQuery;
 import com.youlai.boot.system.model.vo.RolePageVO;
-import com.youlai.boot.common.annotation.LogAnnotation;
-import com.youlai.boot.system.service.SysRoleService;
+import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.system.service.RoleService;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
@@ -33,13 +33,13 @@ import java.util.List;
 @RestController
 @RequestMapping("/api/v1/roles")
 @RequiredArgsConstructor
-public class SysRoleController {
+public class RoleController {
 
-    private final SysRoleService roleService;
+    private final RoleService roleService;
 
     @Operation(summary = "角色分页列表")
     @GetMapping("/page")
-    @LogAnnotation( value = "角色分页列表",module = LogModuleEnum.ROLE)
+    @Log( value = "角色分页列表",module = LogModuleEnum.ROLE)
     public PageResult<RolePageVO> getRolePage(
              RolePageQuery queryParams
     ) {
@@ -57,7 +57,7 @@ public class SysRoleController {
     @Operation(summary = "新增角色")
     @PostMapping
     @PreAuthorize("@ss.hasPerm('sys:role:add')")
-    @NoRepeat
+    @RepeatSubmit
     public Result<?> addRole(@Valid @RequestBody RoleForm roleForm) {
         boolean result = roleService.saveRole(roleForm);
         return Result.judge(result);

src/main/java/com/youlai/boot/system/controller/UserController.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.youlai.boot.system.model.entity.User;
 import com.youlai.boot.system.model.form.*;
 import com.youlai.boot.common.result.PageResult;
 import com.youlai.boot.common.result.Result;
@@ -13,15 +14,14 @@ import com.youlai.boot.core.security.util.SecurityUtils;
 import com.youlai.boot.common.util.ExcelUtils;
 import com.youlai.boot.common.enums.LogModuleEnum;
 import com.youlai.boot.system.model.dto.UserImportDTO;
-import com.youlai.boot.common.annotation.NoRepeat;
+import com.youlai.boot.common.annotation.RepeatSubmit;
 import com.youlai.boot.system.listener.UserImportListener;
-import com.youlai.boot.system.model.entity.SysUser;
 import com.youlai.boot.system.model.query.UserPageQuery;
 import com.youlai.boot.system.model.dto.UserExportDTO;
 import com.youlai.boot.system.model.vo.UserInfoVO;
 import com.youlai.boot.system.model.vo.UserPageVO;
-import com.youlai.boot.common.annotation.LogAnnotation;
-import com.youlai.boot.system.service.SysUserService;
+import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.system.service.UserService;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
@@ -52,13 +52,13 @@ import java.util.List;
 @RestController
 @RequestMapping("/api/v1/users")
 @RequiredArgsConstructor
-public class SysUserController {
+public class UserController {
 
-    private final SysUserService userService;
+    private final UserService userService;
 
     @Operation(summary = "用户分页列表")
     @GetMapping("/page")
-    @LogAnnotation(value = "用户分页列表", module = LogModuleEnum.USER)
+    @Log(value = "用户分页列表", module = LogModuleEnum.USER)
     public PageResult<UserPageVO> listPagedUsers(
             UserPageQuery queryParams
     ) {
@@ -69,7 +69,7 @@ public class SysUserController {
     @Operation(summary = "新增用户")
     @PostMapping
     @PreAuthorize("@ss.hasPerm('sys:user:add')")
-    @NoRepeat
+    @RepeatSubmit
     public Result<?> saveUser(
             @RequestBody @Valid UserForm userForm
     ) {
@@ -112,9 +112,9 @@ public class SysUserController {
             @Parameter(description = "用户ID") @PathVariable Long userId,
             @Parameter(description = "用户状态(1:启用;0:禁用)") @RequestParam Integer status
     ) {
-        boolean result = userService.update(new LambdaUpdateWrapper<SysUser>()
-                .eq(SysUser::getId, userId)
-                .set(SysUser::getStatus, status)
+        boolean result = userService.update(new LambdaUpdateWrapper<User>()
+                .eq(User::getId, userId)
+                .set(User::getStatus, status)
         );
         return Result.judge(result);
     }

src/main/java/com/youlai/boot/system/controller/WebsocketController.java

@@ -1,61 +0,0 @@
-package com.youlai.boot.system.controller;
-
-import com.youlai.boot.system.model.dto.ChatMessage;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.messaging.handler.annotation.DestinationVariable;
-import org.springframework.messaging.handler.annotation.MessageMapping;
-import org.springframework.messaging.handler.annotation.SendTo;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.security.Principal;
-
-/**
- * WebSocket 测试控制层
- *
- * @author Ray
- * @since 2.3.0
- */
-@RestController
-@RequestMapping("/websocket")
-@RequiredArgsConstructor
-@Slf4j
-public class WebsocketController {
-
-    private final SimpMessagingTemplate messagingTemplate;
-
-
-    /**
-     * 广播发送消息
-     *
-     * @param message 消息内容
-     */
-    @MessageMapping("/sendToAll")
-    @SendTo("/topic/notice")
-    public String sendToAll(String message) {
-        return "服务端通知: " + message;
-    }
-
-    /**
-     * 点对点发送消息
-     * <p>
-     * 模拟 张三 给 李四 发送消息场景
-     *
-     * @param principal 当前用户
-     * @param username  接收消息的用户
-     * @param message   消息内容
-     */
-    @MessageMapping("/sendToUser/{username}")
-    public void sendToUser(Principal principal, @DestinationVariable String username, String message) {
-
-        String sender = principal.getName(); // 发送人
-        String receiver = username; // 接收人
-
-        log.info("发送人:{}; 接收人:{}", sender, receiver);
-        // 发送消息给指定用户，拼接后路径 /user/{receiver}/queue/greeting
-        messagingTemplate.convertAndSendToUser(receiver, "/queue/greeting", new ChatMessage(sender, message));
-    }
-
-}

src/main/java/com/youlai/boot/system/converter/ConfigConverter.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.system.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.system.model.entity.SysConfig;
+import com.youlai.boot.system.model.entity.Config;
 import com.youlai.boot.system.model.vo.ConfigVO;
 import com.youlai.boot.system.model.form.ConfigForm;
 import org.mapstruct.Mapper;
@@ -15,9 +15,9 @@ import org.mapstruct.Mapper;
 @Mapper(componentModel = "spring")
 public interface ConfigConverter {
 
-    Page<ConfigVO> toPageVo(Page<SysConfig> page);
+    Page<ConfigVO> toPageVo(Page<Config> page);
 
-    SysConfig toEntity(ConfigForm configForm);
+    Config toEntity(ConfigForm configForm);
 
-    ConfigForm toForm(SysConfig entity);
+    ConfigForm toForm(Config entity);
 }

src/main/java/com/youlai/boot/system/converter/DeptConverter.java

@@ -1,6 +1,6 @@
 package com.youlai.boot.system.converter;
 
-import com.youlai.boot.system.model.entity.SysDept;
+import com.youlai.boot.system.model.entity.Dept;
 import com.youlai.boot.system.model.vo.DeptVO;
 import com.youlai.boot.system.model.form.DeptForm;
 import org.mapstruct.Mapper;
@@ -14,10 +14,10 @@ import org.mapstruct.Mapper;
 @Mapper(componentModel = "spring")
 public interface DeptConverter {
 
-    DeptForm toForm(SysDept entity);
+    DeptForm toForm(Dept entity);
     
-    DeptVO toVo(SysDept entity);
+    DeptVO toVo(Dept entity);
 
-    SysDept toEntity(DeptForm deptForm);
+    Dept toEntity(DeptForm deptForm);
 
 }

src/main/java/com/youlai/boot/system/converter/DictConverter.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.system.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.system.model.entity.SysDict;
+import com.youlai.boot.system.model.entity.Dict;
 import com.youlai.boot.system.model.vo.DictPageVO;
 import com.youlai.boot.system.model.form.DictForm;
 import org.mapstruct.Mapper;
@@ -15,9 +15,9 @@ import org.mapstruct.Mapper;
 @Mapper(componentModel = "spring")
 public interface DictConverter {
 
-    Page<DictPageVO> toPageVo(Page<SysDict> page);
+    Page<DictPageVO> toPageVo(Page<Dict> page);
 
-    DictForm toForm(SysDict entity);
+    DictForm toForm(Dict entity);
 
-    SysDict toEntity(DictForm entity);
+    Dict toEntity(DictForm entity);
 }

src/main/java/com/youlai/boot/system/converter/DictItemConverter.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.system.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.system.model.entity.SysDictItem;
+import com.youlai.boot.system.model.entity.DictItem;
 import com.youlai.boot.system.model.vo.DictPageVO;
 import com.youlai.boot.common.model.Option;
 import com.youlai.boot.system.model.form.DictForm;
@@ -20,20 +20,20 @@ import java.util.List;
 @Mapper(componentModel = "spring")
 public interface DictItemConverter {
 
-    Page<DictPageVO> toPageVo(Page<SysDictItem> page);
+    Page<DictPageVO> toPageVo(Page<DictItem> page);
 
-    DictForm toForm(SysDictItem entity);
+    DictForm toForm(DictItem entity);
 
-    SysDictItem toEntity(DictForm.DictItem dictItems);
-    List<SysDictItem> toEntity(List<DictForm.DictItem> dictItems);
+    DictItem toEntity(DictForm.DictItem dictItems);
+    List<DictItem> toEntity(List<DictForm.DictItem> dictItems);
 
-    DictForm.DictItem toDictItem(SysDictItem entity);
-    List<DictForm.DictItem> toDictItem(List<SysDictItem> entities);
+    DictForm.DictItem toDictItem(DictItem entity);
+    List<DictForm.DictItem> toDictItem(List<DictItem> entities);
 
     @Mappings({
             @Mapping(target = "value", source = "value"),
             @Mapping(target = "label", source = "name")
     })
-    Option<Long> toOption(SysDictItem dictItem);
-    List<Option<Long>> toOption(List<SysDictItem> dictItems);
+    Option<Long> toOption(DictItem dictItem);
+    List<Option<Long>> toOption(List<DictItem> dictItems);
 }

src/main/java/com/youlai/boot/system/converter/GenConfigConverter.java

@@ -1,8 +1,8 @@
 package com.youlai.boot.system.converter;
 
-import com.youlai.boot.infrastructure.generator.model.entity.GenConfig;
-import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig;
-import com.youlai.boot.infrastructure.generator.model.form.GenConfigForm;
+import com.youlai.boot.platform.generator.model.entity.GenConfig;
+import com.youlai.boot.platform.generator.model.entity.GenFieldConfig;
+import com.youlai.boot.platform.generator.model.form.GenConfigForm;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 

src/main/java/com/youlai/boot/system/converter/MenuConverter.java

@@ -1,6 +1,6 @@
 package com.youlai.boot.system.converter;
 
-import com.youlai.boot.system.model.entity.SysMenu;
+import com.youlai.boot.system.model.entity.Menu;
 import com.youlai.boot.system.model.vo.MenuVO;
 import com.youlai.boot.system.model.form.MenuForm;
 import org.mapstruct.Mapper;
@@ -15,12 +15,12 @@ import org.mapstruct.Mapping;
 @Mapper(componentModel = "spring")
 public interface MenuConverter {
 
-    MenuVO toVo(SysMenu entity);
+    MenuVO toVo(Menu entity);
 
     @Mapping(target = "params", ignore = true)
-    MenuForm toForm(SysMenu entity);
+    MenuForm toForm(Menu entity);
 
     @Mapping(target = "params", ignore = true)
-    SysMenu toEntity(MenuForm menuForm);
+    Menu toEntity(MenuForm menuForm);
 
 }

src/main/java/com/youlai/boot/system/converter/RoleConverter.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.system.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.system.model.entity.SysRole;
+import com.youlai.boot.system.model.entity.Role;
 import com.youlai.boot.system.model.vo.RolePageVO;
 import com.youlai.boot.common.model.Option;
 import com.youlai.boot.system.model.form.RoleForm;
@@ -20,17 +20,17 @@ import java.util.List;
 @Mapper(componentModel = "spring")
 public interface RoleConverter {
 
-    Page<RolePageVO> toPageVo(Page<SysRole> page);
+    Page<RolePageVO> toPageVo(Page<Role> page);
 
     @Mappings({
             @Mapping(target = "value", source = "id"),
             @Mapping(target = "label", source = "name")
     })
-    Option<Long> entity2Option(SysRole role);
+    Option<Long> entity2Option(Role role);
 
-    List<Option<Long>> entities2Options(List<SysRole> roles);
+    List<Option<Long>> entities2Options(List<Role> roles);
 
-    SysRole toEntity(RoleForm roleForm);
+    Role toEntity(RoleForm roleForm);
 
-    RoleForm toForm(SysRole entity);
+    RoleForm toForm(Role entity);
 }

src/main/java/com/youlai/boot/system/converter/UserConverter.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.system.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.system.model.entity.SysUser;
+import com.youlai.boot.system.model.entity.User;
 import com.youlai.boot.system.model.vo.UserInfoVO;
 import com.youlai.boot.system.model.vo.UserPageVO;
 import com.youlai.boot.system.model.vo.UserProfileVO;
@@ -30,20 +30,20 @@ public interface UserConverter {
 
     Page<UserPageVO> toPageVo(Page<UserBO> bo);
 
-    UserForm toForm(SysUser entity);
+    UserForm toForm(User entity);
 
     @InheritInverseConfiguration(name = "toForm")
-    SysUser toEntity(UserForm entity);
+    User toEntity(UserForm entity);
 
     @Mappings({
             @Mapping(target = "userId", source = "id")
     })
-    UserInfoVO toUserInfoVo(SysUser entity);
+    UserInfoVO toUserInfoVo(User entity);
 
-    SysUser toEntity(UserImportDTO vo);
+    User toEntity(UserImportDTO vo);
 
 
     UserProfileVO toProfileVO(UserBO bo);
 
-    SysUser toEntity(UserProfileForm formData);
+    User toEntity(UserProfileForm formData);
 }

src/main/java/com/youlai/boot/system/listener/UserImportListener.java

@@ -8,20 +8,20 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.context.AnalysisContext;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.youlai.boot.common.base.BaseAnalysisEventListener;
-import com.youlai.boot.system.model.entity.SysDept;
-import com.youlai.boot.system.model.entity.SysRole;
-import com.youlai.boot.system.model.entity.SysUser;
-import com.youlai.boot.system.model.entity.SysUserRole;
+import com.youlai.boot.system.model.entity.Dept;
+import com.youlai.boot.system.model.entity.Role;
+import com.youlai.boot.system.model.entity.User;
+import com.youlai.boot.system.model.entity.UserRole;
 import com.youlai.boot.common.base.IBaseEnum;
 import com.youlai.boot.common.constant.SystemConstants;
 import com.youlai.boot.common.enums.GenderEnum;
 import com.youlai.boot.common.enums.StatusEnum;
 import com.youlai.boot.system.converter.UserConverter;
 import com.youlai.boot.system.model.dto.UserImportDTO;
-import com.youlai.boot.system.service.SysDeptService;
-import com.youlai.boot.system.service.SysRoleService;
-import com.youlai.boot.system.service.SysUserRoleService;
-import com.youlai.boot.system.service.SysUserService;
+import com.youlai.boot.system.service.DeptService;
+import com.youlai.boot.system.service.RoleService;
+import com.youlai.boot.system.service.UserRoleService;
+import com.youlai.boot.system.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
@@ -49,19 +49,19 @@ public class UserImportListener extends BaseAnalysisEventListener<UserImportDTO>
     // 导入返回信息
     StringBuilder msg = new StringBuilder();
 
-    private final SysUserService userService;
+    private final UserService userService;
     private final PasswordEncoder passwordEncoder;
     private final UserConverter userConverter;
-    private final SysRoleService roleService;
-    private final SysUserRoleService userRoleService;
-    private final SysDeptService deptService;
+    private final RoleService roleService;
+    private final UserRoleService userRoleService;
+    private final DeptService deptService;
 
     public UserImportListener() {
-        this.userService = SpringUtil.getBean(SysUserService.class);
+        this.userService = SpringUtil.getBean(UserService.class);
         this.passwordEncoder = SpringUtil.getBean(PasswordEncoder.class);
-        this.roleService = SpringUtil.getBean(SysRoleService.class);
-        this.userRoleService = SpringUtil.getBean(SysUserRoleService.class);
-        this.deptService = SpringUtil.getBean(SysDeptService.class);
+        this.roleService = SpringUtil.getBean(RoleService.class);
+        this.userRoleService = SpringUtil.getBean(UserRoleService.class);
+        this.deptService = SpringUtil.getBean(DeptService.class);
         this.userConverter = SpringUtil.getBean(UserConverter.class);
     }
 
@@ -83,7 +83,7 @@ public class UserImportListener extends BaseAnalysisEventListener<UserImportDTO>
         if (StrUtil.isBlank(username)) {
             validationMsg.append("用户名为空；");
         } else {
-            long count = userService.count(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, username));
+            long count = userService.count(new LambdaQueryWrapper<User>().eq(User::getUsername, username));
             if (count > 0) {
                 validationMsg.append("用户名已存在；");
             }
@@ -105,7 +105,7 @@ public class UserImportListener extends BaseAnalysisEventListener<UserImportDTO>
 
         if (validationMsg.isEmpty()) {
             // 校验通过，持久化至数据库
-            SysUser entity = userConverter.toEntity(userImportDTO);
+            User entity = userConverter.toEntity(userImportDTO);
             entity.setPassword(passwordEncoder.encode(SystemConstants.DEFAULT_PASSWORD));   // 默认密码
             // 性别翻译
             String genderLabel = userImportDTO.getGenderLabel();
@@ -119,19 +119,19 @@ public class UserImportListener extends BaseAnalysisEventListener<UserImportDTO>
             List<Long> roleIds = null;
             if (StrUtil.isNotBlank(roleCodes)) {
                 roleIds = roleService.list(
-                                new LambdaQueryWrapper<SysRole>()
-                                        .in(SysRole::getCode, (Object) roleCodes.split(","))
-                                        .eq(SysRole::getStatus, StatusEnum.ENABLE.getValue())
-                                        .select(SysRole::getId)
+                                new LambdaQueryWrapper<Role>()
+                                        .in(Role::getCode, (Object) roleCodes.split(","))
+                                        .eq(Role::getStatus, StatusEnum.ENABLE.getValue())
+                                        .select(Role::getId)
                         ).stream()
-                        .map(SysRole::getId)
+                        .map(Role::getId)
                         .collect(Collectors.toList());
             }
             // 部门解析
             String deptCode = userImportDTO.getDeptCode();
             if (StrUtil.isNotBlank(deptCode)) {
-                SysDept dept = deptService.getOne(new LambdaQueryWrapper<SysDept>().eq(SysDept::getCode, deptCode)
-                        .select(SysDept::getId)
+                Dept dept = deptService.getOne(new LambdaQueryWrapper<Dept>().eq(Dept::getCode, deptCode)
+                        .select(Dept::getId)
                 );
                 if (dept != null) {
                     entity.setDeptId(dept.getId());
@@ -144,8 +144,8 @@ public class UserImportListener extends BaseAnalysisEventListener<UserImportDTO>
                 validCount++;
                 // 保存用户角色关联
                 if (CollectionUtil.isNotEmpty(roleIds)) {
-                    List<SysUserRole> userRoles = roleIds.stream()
-                            .map(roleId -> new SysUserRole(entity.getId(), roleId))
+                    List<UserRole> userRoles = roleIds.stream()
+                            .map(roleId -> new UserRole(entity.getId(), roleId))
                             .collect(Collectors.toList());
                     userRoleService.saveBatch(userRoles);
                 }

src/main/java/com/youlai/boot/system/mapper/ConfigMapper.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.youlai.boot.system.model.entity.SysConfig;
+import com.youlai.boot.system.model.entity.Config;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -11,6 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2024-7-29 11:41:04
  */
 @Mapper
-public interface SysConfigMapper extends BaseMapper<SysConfig> {
+public interface ConfigMapper extends BaseMapper<Config> {
 
 }

src/main/java/com/youlai/boot/system/mapper/DeptMapper.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.youlai.boot.common.annotation.DataPermission;
-import com.youlai.boot.system.model.entity.SysDept;
+import com.youlai.boot.system.model.entity.Dept;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,9 +12,9 @@ import java.util.List;
 
 
 @Mapper
-public interface SysDeptMapper extends BaseMapper<SysDept> {
+public interface DeptMapper extends BaseMapper<Dept> {
 
     @DataPermission(deptIdColumnName = "id")
     @Override
-    List<SysDept> selectList(@Param(Constants.WRAPPER) Wrapper<SysDept> queryWrapper);
+    List<Dept> selectList(@Param(Constants.WRAPPER) Wrapper<Dept> queryWrapper);
 }

src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.youlai.boot.system.model.entity.SysDictItem;
+import com.youlai.boot.system.model.entity.DictItem;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2.9.0
  */
 @Mapper
-public interface SysDictItemMapper extends BaseMapper<SysDictItem> {
+public interface DictItemMapper extends BaseMapper<DictItem> {
 
 }
 

src/main/java/com/youlai/boot/system/mapper/DictMapper.java

@@ -2,7 +2,7 @@ package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.system.model.entity.SysDict;
+import com.youlai.boot.system.model.entity.Dict;
 import com.youlai.boot.system.model.query.DictPageQuery;
 import com.youlai.boot.system.model.vo.DictPageVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2.9.0
  */
 @Mapper
-public interface SysDictMapper extends BaseMapper<SysDict> {
+public interface DictMapper extends BaseMapper<Dict> {
 
     /**
      * 字典分页列表

src/main/java/com/youlai/boot/system/mapper/LogMapper.java

@@ -2,7 +2,7 @@ package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.youlai.boot.system.model.bo.VisitCount;
-import com.youlai.boot.system.model.entity.SysLog;
+import com.youlai.boot.system.model.entity.Log;
 import com.youlai.boot.system.model.query.LogPageQuery;
 import com.youlai.boot.system.model.vo.LogPageVO;
 import com.youlai.boot.system.model.vo.VisitStatsVO;
@@ -19,7 +19,7 @@ import java.util.List;
  * @since 2.10.0
  */
 @Mapper
-public interface SysLogMapper extends BaseMapper<SysLog> {
+public interface LogMapper extends BaseMapper<Log> {
 
     /**
      * 获取日志分页列表

src/main/java/com/youlai/boot/system/mapper/MenuMapper.java

@@ -2,7 +2,7 @@ package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.youlai.boot.system.model.bo.RouteBO;
-import com.youlai.boot.system.model.entity.SysMenu;
+import com.youlai.boot.system.model.entity.Menu;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -16,7 +16,7 @@ import java.util.Set;
  */
 
 @Mapper
-public interface SysMenuMapper extends BaseMapper<SysMenu> {
+public interface MenuMapper extends BaseMapper<Menu> {
 
     /**
      * 获取菜单路由列表

src/main/java/com/youlai/boot/system/mapper/RoleMapper.java

@@ -1,13 +1,13 @@
 package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.youlai.boot.system.model.entity.SysRole;
+import com.youlai.boot.system.model.entity.Role;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Set;
 
 @Mapper
-public interface SysRoleMapper extends BaseMapper<SysRole> {
+public interface RoleMapper extends BaseMapper<Role> {
 
 
     /**

src/main/java/com/youlai/boot/system/mapper/RoleMenuMapper.java

@@ -2,7 +2,7 @@ package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.youlai.boot.system.model.bo.RolePermsBO;
-import com.youlai.boot.system.model.entity.SysRoleMenu;
+import com.youlai.boot.system.model.entity.RoleMenu;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -15,7 +15,7 @@ import java.util.Set;
  * @since 2022/6/4
  */
 @Mapper
-public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
+public interface RoleMenuMapper extends BaseMapper<RoleMenu> {
 
     /**
      * 获取角色拥有的菜单ID集合

src/main/java/com/youlai/boot/system/mapper/UserMapper.java

@@ -3,7 +3,7 @@ package com.youlai.boot.system.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.youlai.boot.system.model.bo.UserBO;
-import com.youlai.boot.system.model.entity.SysUser;
+import com.youlai.boot.system.model.entity.User;
 import com.youlai.boot.system.model.query.UserPageQuery;
 import com.youlai.boot.system.model.form.UserForm;
 import com.youlai.boot.common.annotation.DataPermission;
@@ -20,7 +20,7 @@ import java.util.List;
  * @since 2022/1/14
  */
 @Mapper
-public interface SysUserMapper extends BaseMapper<SysUser> {
+public interface UserMapper extends BaseMapper<User> {
 
     /**
      * 获取用户分页列表

src/main/java/com/youlai/boot/system/mapper/UserRoleMapper.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.youlai.boot.system.model.entity.SysUserRole;
+import com.youlai.boot.system.model.entity.UserRole;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2022/1/15
  */
 @Mapper
-public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
+public interface UserRoleMapper extends BaseMapper<UserRole> {
 
     /**
      * 获取角色绑定的用户数

src/main/java/com/youlai/boot/system/model/entity/Config.java

@@ -14,7 +14,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 @Schema(description = "系统配置")
 @TableName("sys_config")
 @Data
-public class SysConfig extends BaseEntity {
+public class Config extends BaseEntity {
 
     @Schema(description = "配置名称")
     private String configName;

src/main/java/com/youlai/boot/system/model/entity/Dept.java

@@ -1,18 +1,20 @@
 package com.youlai.boot.system.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.youlai.boot.common.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
 /**
- * 部门 实体
+ * 部门实体
  *
  * @author Ray
  * @since 2024/06/23
  */
+@TableName("sys_dept")
 @Getter
 @Setter
-public class SysDept extends BaseEntity {
+public class Dept extends BaseEntity {
 
     /**
      * 部门名称

src/main/java/com/youlai/boot/system/model/entity/Dict.java

@@ -1,5 +1,6 @@
 package com.youlai.boot.system.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.youlai.boot.common.base.BaseEntity;
 import lombok.Data;
 
@@ -9,8 +10,9 @@ import lombok.Data;
  * @author haoxr
  * @since 2022/12/17
  */
+@TableName("sys_dict")
 @Data
-public class SysDict extends BaseEntity {
+public class Dict extends BaseEntity {
 
     /**
      * 类型名称

src/main/java/com/youlai/boot/system/model/entity/DictItem.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**
@@ -13,8 +14,9 @@ import lombok.Data;
  * @author haoxr
  * @since 2022/12/17
  */
+@TableName("sys_dict_item")
 @Data
-public class SysDictItem implements Serializable {
+public class DictItem implements Serializable {
     /**
      * 主键
      */

src/main/java/com/youlai/boot/system/model/entity/Log.java

@@ -14,8 +14,9 @@ import lombok.Data;
  * @author Ray
  * @since 2.10.0
  */
+@TableName("sys_log")
 @Data
-public class SysLog implements Serializable {
+public class Log implements Serializable {
     /**
      * 主键
      */

src/main/java/com/youlai/boot/system/model/entity/Menu.java

@@ -9,14 +9,15 @@ import lombok.Setter;
 import java.time.LocalDateTime;
 
 /**
- * 菜单 实体
+ * 菜单实体
  *
  * @author Ray
  * @since 2023/3/6
  */
+@TableName("sys_menu")
 @Getter
 @Setter
-public class SysMenu {
+public class Menu {
     /**
      * 菜单ID
      */

src/main/java/com/youlai/boot/system/model/entity/Role.java

@@ -1,18 +1,20 @@
 package com.youlai.boot.system.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.youlai.boot.common.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
 /**
- * 角色 实体
+ * 角色实体
  *
  * @author Ray
  * @since 2024/6/23
  */
+@TableName("sys_role")
 @Getter
 @Setter
-public class SysRole extends BaseEntity {
+public class Role extends BaseEntity {
 
     /**
      * 角色名称

src/main/java/com/youlai/boot/system/model/entity/RoleMenu.java

@@ -1,6 +1,7 @@
 package com.youlai.boot.system.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -9,10 +10,11 @@ import lombok.NoArgsConstructor;
 /**
  * 角色和菜单关联表
  */
+@TableName("sys_role_menu")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class SysRoleMenu  {
+public class RoleMenu {
     /**
      * 角色ID
      */

src/main/java/com/youlai/boot/system/model/entity/User.java

@@ -1,15 +1,17 @@
 package com.youlai.boot.system.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.youlai.boot.common.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
 /**
- * 用户 实体
+ * 用户实体
  */
+@TableName("sys_user")
 @Getter
 @Setter
-public class SysUser extends BaseEntity {
+public class User extends BaseEntity {
 
     /**
      * 用户名

src/main/java/com/youlai/boot/system/model/entity/UserRole.java

@@ -1,6 +1,7 @@
 package com.youlai.boot.system.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -12,10 +13,11 @@ import lombok.NoArgsConstructor;
  * @author haoxr
  * @since 2022/12/17
  */
+@TableName("sys_user_role")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class SysUserRole {
+public class UserRole {
     /**
      * 用户ID
      */

src/main/java/com/youlai/boot/system/service/ConfigService.java

@@ -2,7 +2,7 @@ package com.youlai.boot.system.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.youlai.boot.system.model.entity.SysConfig;
+import com.youlai.boot.system.model.entity.Config;
 import com.youlai.boot.system.model.form.ConfigForm;
 import com.youlai.boot.system.model.query.ConfigPageQuery;
 import com.youlai.boot.system.model.vo.ConfigVO;
@@ -13,7 +13,7 @@ import com.youlai.boot.system.model.vo.ConfigVO;
  * @author Theo
  * @since 2024-07-29 11:17:26
  */
-public interface SysConfigService extends IService<SysConfig> {
+public interface ConfigService extends IService<Config> {
 
     /**
      * 分页查询系统配置

src/main/java/com/youlai/boot/system/service/DeptService.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.youlai.boot.system.model.entity.SysDept;
+import com.youlai.boot.system.model.entity.Dept;
 import com.youlai.boot.common.model.Option;
 import com.youlai.boot.system.model.form.DeptForm;
 import com.youlai.boot.system.model.query.DeptQuery;
@@ -15,7 +15,7 @@ import java.util.List;
  * @author haoxr
  * @since 2021/8/22
  */
-public interface SysDeptService extends IService<SysDept> {
+public interface DeptService extends IService<Dept> {
     /**
      * 部门列表
      *

src/main/java/com/youlai/boot/system/service/DictItemService.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.youlai.boot.system.model.entity.SysDictItem;
+import com.youlai.boot.system.model.entity.DictItem;
 
 /**
  * 字典项 接口
@@ -9,6 +9,6 @@ import com.youlai.boot.system.model.entity.SysDictItem;
  * @author Ray Hao
  * @since 2023/3/4
  */
-public interface SysDictItemService extends IService<SysDictItem> {
+public interface DictItemService extends IService<DictItem> {
 
 }

src/main/java/com/youlai/boot/system/service/DictService.java

@@ -3,7 +3,7 @@ package com.youlai.boot.system.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.youlai.boot.common.model.Option;
-import com.youlai.boot.system.model.entity.SysDict;
+import com.youlai.boot.system.model.entity.Dict;
 import com.youlai.boot.system.model.form.DictForm;
 import com.youlai.boot.system.model.query.DictPageQuery;
 import com.youlai.boot.system.model.vo.DictPageVO;
@@ -16,7 +16,7 @@ import java.util.List;
  * @author haoxr
  * @since 2022/10/12
  */
-public interface SysDictService extends IService<SysDict> {
+public interface DictService extends IService<Dict> {
 
     /**
      * 字典分页列表

src/main/java/com/youlai/boot/system/service/LogService.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.system.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.system.model.entity.SysLog;
+import com.youlai.boot.system.model.entity.Log;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.youlai.boot.system.model.query.LogPageQuery;
 import com.youlai.boot.system.model.vo.LogPageVO;
@@ -17,7 +17,7 @@ import java.util.List;
  * @author Ray
  * @since 2.10.0
  */
-public interface SysLogService extends IService<SysLog> {
+public interface LogService extends IService<Log> {
 
     /**
      * 获取日志分页列表

src/main/java/com/youlai/boot/system/service/MenuService.java

@@ -1,10 +1,10 @@
 package com.youlai.boot.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.youlai.boot.infrastructure.generator.model.entity.GenConfig;
+import com.youlai.boot.platform.generator.model.entity.GenConfig;
 import com.youlai.boot.system.model.form.MenuForm;
 import com.youlai.boot.common.model.Option;
-import com.youlai.boot.system.model.entity.SysMenu;
+import com.youlai.boot.system.model.entity.Menu;
 import com.youlai.boot.system.model.query.MenuQuery;
 import com.youlai.boot.system.model.vo.MenuVO;
 import com.youlai.boot.system.model.vo.RouteVO;
@@ -18,7 +18,7 @@ import java.util.Set;
  * @author haoxr
  * @since 2020/11/06
  */
-public interface SysMenuService extends IService<SysMenu> {
+public interface MenuService extends IService<Menu> {
 
     /**
      * 获取菜单表格列表

src/main/java/com/youlai/boot/system/service/RoleMenuService.java

@@ -2,7 +2,7 @@ package com.youlai.boot.system.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.youlai.boot.system.model.entity.SysRoleMenu;
+import com.youlai.boot.system.model.entity.RoleMenu;
 
 import java.util.List;
 import java.util.Set;
@@ -13,7 +13,7 @@ import java.util.Set;
  * @author haoxr
  * @since 2.5.0
  */
-public interface SysRoleMenuService extends IService<SysRoleMenu> {
+public interface RoleMenuService extends IService<RoleMenu> {
 
     /**
      * 获取角色拥有的菜单ID集合

src/main/java/com/youlai/boot/system/service/RoleService.java

@@ -3,7 +3,7 @@ package com.youlai.boot.system.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.youlai.boot.system.model.entity.SysRole;
+import com.youlai.boot.system.model.entity.Role;
 import com.youlai.boot.common.model.Option;
 import com.youlai.boot.system.model.form.RoleForm;
 import com.youlai.boot.system.model.query.RolePageQuery;
@@ -18,7 +18,7 @@ import java.util.Set;
  * @author haoxr
  * @since 2022/6/3
  */
-public interface SysRoleService extends IService<SysRole> {
+public interface RoleService extends IService<Role> {
 
     /**
      * 角色分页列表

src/main/java/com/youlai/boot/system/service/UserRoleService.java

@@ -2,11 +2,11 @@ package com.youlai.boot.system.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.youlai.boot.system.model.entity.SysUserRole;
+import com.youlai.boot.system.model.entity.UserRole;
 
 import java.util.List;
 
-public interface SysUserRoleService extends IService<SysUserRole> {
+public interface UserRoleService extends IService<UserRole> {
 
     /**
      * 保存用户角色

src/main/java/com/youlai/boot/system/service/UserService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.youlai.boot.common.enums.ContactType;
 import com.youlai.boot.system.model.dto.UserAuthInfo;
 import com.youlai.boot.system.model.dto.UserExportDTO;
-import com.youlai.boot.system.model.entity.SysUser;
+import com.youlai.boot.system.model.entity.User;
 import com.youlai.boot.system.model.query.UserPageQuery;
 import com.youlai.boot.system.model.vo.UserInfoVO;
 import com.youlai.boot.system.model.vo.UserPageVO;
@@ -21,7 +21,7 @@ import java.util.List;
  * @author haoxr
  * @since 2022/1/14
  */
-public interface SysUserService extends IService<SysUser> {
+public interface UserService extends IService<User> {
 
     /**
      * 用户分页列表

src/main/java/com/youlai/boot/system/service/WebsocketService.java

@@ -1,9 +0,0 @@
-package com.youlai.boot.system.service;
-
-public interface WebsocketService {
-
-   void addUser(String username);
-
-   void removeUser(String username) ;
-
-}

src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java

@@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.boot.common.constant.RedisConstants;
 import com.youlai.boot.system.converter.ConfigConverter;
-import com.youlai.boot.system.mapper.SysConfigMapper;
-import com.youlai.boot.system.model.entity.SysConfig;
+import com.youlai.boot.system.mapper.ConfigMapper;
+import com.youlai.boot.system.model.entity.Config;
 import com.youlai.boot.system.model.form.ConfigForm;
 import com.youlai.boot.system.model.query.ConfigPageQuery;
 import com.youlai.boot.system.model.vo.ConfigVO;
-import com.youlai.boot.system.service.SysConfigService;
+import com.youlai.boot.system.service.ConfigService;
 import com.youlai.boot.core.security.util.SecurityUtils;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
@@ -32,9 +32,9 @@ import java.util.stream.Collectors;
  */
 @Service
 @RequiredArgsConstructor
-public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements SysConfigService {
+public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, Config> implements ConfigService {
 
-    private final SysConfigMapper sysConfigMapper;
+    private final ConfigMapper configMapper;
 
     private final ConfigConverter configConverter;
 
@@ -57,15 +57,15 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      */
     @Override
     public IPage<ConfigVO> page(ConfigPageQuery configPageQuery) {
-        Page<SysConfig> page = new Page<>(configPageQuery.getPageNum(), configPageQuery.getPageSize());
+        Page<Config> page = new Page<>(configPageQuery.getPageNum(), configPageQuery.getPageSize());
         String keywords = configPageQuery.getKeywords();
-        LambdaQueryWrapper<SysConfig> query = new LambdaQueryWrapper<SysConfig>()
+        LambdaQueryWrapper<Config> query = new LambdaQueryWrapper<Config>()
                 .and(StringUtils.isNotBlank(keywords),
-                    q -> q.like(SysConfig::getConfigKey, keywords)
+                    q -> q.like(Config::getConfigKey, keywords)
                         .or()
-                        .like(SysConfig::getConfigName, keywords)
+                        .like(Config::getConfigName, keywords)
                 );
-        Page<SysConfig> pageList = this.page(page, query);
+        Page<Config> pageList = this.page(page, query);
         return configConverter.toPageVo(pageList);
     }
 
@@ -78,11 +78,11 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
     @Override
     public boolean save(ConfigForm configForm) {
         Assert.isTrue(
-                super.count(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getConfigKey, configForm.getConfigKey())) == 0,
+                super.count(new LambdaQueryWrapper<Config>().eq(Config::getConfigKey, configForm.getConfigKey())) == 0,
                 "配置键已存在");
-        SysConfig sysConfig = configConverter.toEntity(configForm);
-        sysConfig.setCreateBy(SecurityUtils.getUserId());
-        return this.save(sysConfig);
+        Config config = configConverter.toEntity(configForm);
+        config.setCreateBy(SecurityUtils.getUserId());
+        return this.save(config);
     }
 
     /**
@@ -93,7 +93,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      */
     @Override
     public ConfigForm getConfigFormData(Long id) {
-        SysConfig entity = this.getById(id);
+        Config entity = this.getById(id);
         return configConverter.toForm(entity);
     }
 
@@ -107,11 +107,11 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
     @Override
     public boolean edit(Long id, ConfigForm configForm) {
         Assert.isTrue(
-                super.count(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getConfigKey, configForm.getConfigKey()).ne(SysConfig::getId, id)) == 0,
+                super.count(new LambdaQueryWrapper<Config>().eq(Config::getConfigKey, configForm.getConfigKey()).ne(Config::getId, id)) == 0,
                 "配置键已存在");
-        SysConfig sysConfig = configConverter.toEntity(configForm);
-        sysConfig.setUpdateBy(SecurityUtils.getUserId());
-        return this.updateById(sysConfig);
+        Config config = configConverter.toEntity(configForm);
+        config.setUpdateBy(SecurityUtils.getUserId());
+        return this.updateById(config);
     }
 
     /**
@@ -123,7 +123,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
     @Override
     public boolean delete(Long id) {
         if (id != null) {
-            return super.remove(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getId,id));
+            return super.remove(new LambdaQueryWrapper<Config>().eq(Config::getId,id));
         }
         return false;
     }
@@ -136,9 +136,9 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
     @Override
     public boolean refreshCache() {
         redisTemplate.delete(RedisConstants.SYSTEM_CONFIG_KEY);
-        List<SysConfig> list = this.list();
+        List<Config> list = this.list();
         if (list != null) {
-            Map<String, String> map = list.stream().collect(Collectors.toMap(SysConfig::getConfigKey, SysConfig::getConfigValue));
+            Map<String, String> map = list.stream().collect(Collectors.toMap(Config::getConfigKey, Config::getConfigValue));
             redisTemplate.opsForHash().putAll(RedisConstants.SYSTEM_CONFIG_KEY, map);
             return true;
         }

src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java

@@ -6,8 +6,8 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.boot.system.converter.DeptConverter;
-import com.youlai.boot.system.mapper.SysDeptMapper;
-import com.youlai.boot.system.model.entity.SysDept;
+import com.youlai.boot.system.mapper.DeptMapper;
+import com.youlai.boot.system.model.entity.Dept;
 import com.youlai.boot.system.model.form.DeptForm;
 import com.youlai.boot.system.model.query.DeptQuery;
 import com.youlai.boot.system.model.vo.DeptVO;
@@ -15,7 +15,7 @@ import com.youlai.boot.common.constant.SymbolConstant;
 import com.youlai.boot.common.constant.SystemConstants;
 import com.youlai.boot.common.enums.StatusEnum;
 import com.youlai.boot.common.model.Option;
-import com.youlai.boot.system.service.SysDeptService;
+import com.youlai.boot.system.service.DeptService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @RequiredArgsConstructor
-public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> implements SysDeptService {
+public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements DeptService {
 
 
     private final DeptConverter deptConverter;
@@ -47,11 +47,11 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         Integer status = queryParams.getStatus();
 
         // 查询数据
-        List<SysDept> deptList = this.list(
-                new LambdaQueryWrapper<SysDept>()
-                        .like(StrUtil.isNotBlank(keywords), SysDept::getName, keywords)
-                        .eq(status != null, SysDept::getStatus, status)
-                        .orderByAsc(SysDept::getSort)
+        List<Dept> deptList = this.list(
+                new LambdaQueryWrapper<Dept>()
+                        .like(StrUtil.isNotBlank(keywords), Dept::getName, keywords)
+                        .eq(status != null, Dept::getStatus, status)
+                        .orderByAsc(Dept::getSort)
         );
 
         if (CollectionUtil.isEmpty(deptList)) {
@@ -60,11 +60,11 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 
         // 获取所有部门ID
         Set<Long> deptIds = deptList.stream()
-                .map(SysDept::getId)
+                .map(Dept::getId)
                 .collect(Collectors.toSet());
         // 获取父节点ID
         Set<Long> parentIds = deptList.stream()
-                .map(SysDept::getParentId)
+                .map(Dept::getParentId)
                 .collect(Collectors.toSet());
         // 获取根节点ID（递归的起点），即父节点ID中不包含在部门ID中的节点，注意这里不能拿顶级部门 O 作为根节点，因为部门筛选的时候 O 会被过滤掉
         List<Long> rootIds = CollectionUtil.subtractToList(parentIds, deptIds);
@@ -82,7 +82,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      * @param deptList 部门列表
      * @return 部门树形列表
      */
-    public List<DeptVO> recurDeptList(Long parentId, List<SysDept> deptList) {
+    public List<DeptVO> recurDeptList(Long parentId, List<Dept> deptList) {
         return deptList.stream()
                 .filter(dept -> dept.getParentId().equals(parentId))
                 .map(dept -> {
@@ -101,21 +101,21 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     @Override
     public List<Option<Long>> listDeptOptions() {
 
-        List<SysDept> deptList = this.list(new LambdaQueryWrapper<SysDept>()
-                .eq(SysDept::getStatus, StatusEnum.ENABLE.getValue())
-                .select(SysDept::getId, SysDept::getParentId, SysDept::getName)
-                .orderByAsc(SysDept::getSort)
+        List<Dept> deptList = this.list(new LambdaQueryWrapper<Dept>()
+                .eq(Dept::getStatus, StatusEnum.ENABLE.getValue())
+                .select(Dept::getId, Dept::getParentId, Dept::getName)
+                .orderByAsc(Dept::getSort)
         );
         if (CollectionUtil.isEmpty(deptList)) {
             return Collections.EMPTY_LIST;
         }
 
         Set<Long> deptIds = deptList.stream()
-                .map(SysDept::getId)
+                .map(Dept::getId)
                 .collect(Collectors.toSet());
 
         Set<Long> parentIds = deptList.stream()
-                .map(SysDept::getParentId)
+                .map(Dept::getParentId)
                 .collect(Collectors.toSet());
 
         List<Long> rootIds = CollectionUtil.subtractToList(parentIds, deptIds);
@@ -136,13 +136,13 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     public Long saveDept(DeptForm formData) {
         // 校验部门名称是否存在
         String code = formData.getCode();
-        long count = this.count(new LambdaQueryWrapper<SysDept>()
-                .eq(SysDept::getCode, code)
+        long count = this.count(new LambdaQueryWrapper<Dept>()
+                .eq(Dept::getCode, code)
         );
         Assert.isTrue(count == 0, "部门编号已存在");
 
         // form->entity
-        SysDept entity = deptConverter.toEntity(formData);
+        Dept entity = deptConverter.toEntity(formData);
 
         // 生成部门路径(tree_path)，格式：父节点tree_path + , + 父节点ID，用于删除部门时级联删除子部门
         String treePath = generateDeptTreePath(formData.getParentId());
@@ -164,7 +164,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      */
     @Override
     public DeptForm getDeptForm(Long deptId) {
-        SysDept entity = this.getById(deptId);
+        Dept entity = this.getById(deptId);
         return deptConverter.toForm(entity);
     }
 
@@ -180,15 +180,15 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     public Long updateDept(Long deptId, DeptForm formData) {
         // 校验部门名称/部门编号是否存在
         String code = formData.getCode();
-        long count = this.count(new LambdaQueryWrapper<SysDept>()
-                .ne(SysDept::getId, deptId)
-                .eq(SysDept::getCode, code)
+        long count = this.count(new LambdaQueryWrapper<Dept>()
+                .ne(Dept::getId, deptId)
+                .eq(Dept::getCode, code)
         );
         Assert.isTrue(count == 0, "部门编号已存在");
 
 
         // form->entity
-        SysDept entity = deptConverter.toEntity(formData);
+        Dept entity = deptConverter.toEntity(formData);
         entity.setId(deptId);
 
         // 生成部门路径(tree_path)，格式：父节点tree_path + , + 父节点ID，用于删除部门时级联删除子部门
@@ -209,7 +209,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      * @param deptList 部门列表
      * @return 部门表格层级列表
      */
-    public static List<Option<Long>> recurDeptTreeOptions(long parentId, List<SysDept> deptList) {
+    public static List<Option<Long>> recurDeptTreeOptions(long parentId, List<Dept> deptList) {
         return CollectionUtil.emptyIfNull(deptList).stream()
                 .filter(dept -> dept.getParentId().equals(parentId))
                 .map(dept -> {
@@ -236,8 +236,8 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         if (StrUtil.isNotBlank(ids)) {
             String[] menuIds = ids.split(SymbolConstant.COMMA);
             for (String deptId : menuIds) {
-                this.remove(new LambdaQueryWrapper<SysDept>()
-                        .eq(SysDept::getId, deptId)
+                this.remove(new LambdaQueryWrapper<Dept>()
+                        .eq(Dept::getId, deptId)
                         .or()
                         .apply("CONCAT (',',tree_path,',') LIKE CONCAT('%,',{0},',%')", deptId));
             }
@@ -257,7 +257,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         if (SystemConstants.ROOT_NODE_ID.equals(parentId)) {
             treePath = String.valueOf(parentId);
         } else {
-            SysDept parent = this.getById(parentId);
+            Dept parent = this.getById(parentId);
             if (parent != null) {
                 treePath = parent.getTreePath() + SymbolConstant.COMMA + parent.getId();
             }

src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java

@@ -1,9 +1,9 @@
 package com.youlai.boot.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.youlai.boot.system.mapper.SysDictItemMapper;
-import com.youlai.boot.system.model.entity.SysDictItem;
-import com.youlai.boot.system.service.SysDictItemService;
+import com.youlai.boot.system.mapper.DictItemMapper;
+import com.youlai.boot.system.model.entity.DictItem;
+import com.youlai.boot.system.service.DictItemService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @RequiredArgsConstructor
-public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDictItem> implements SysDictItemService {
+public class DictItemServiceImpl extends ServiceImpl<DictItemMapper, DictItem> implements DictItemService {
 
 }
 

src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java

@@ -8,15 +8,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.boot.system.converter.DictConverter;
 import com.youlai.boot.system.converter.DictItemConverter;
-import com.youlai.boot.system.mapper.SysDictMapper;
-import com.youlai.boot.system.model.entity.SysDict;
-import com.youlai.boot.system.model.entity.SysDictItem;
+import com.youlai.boot.system.mapper.DictMapper;
+import com.youlai.boot.system.model.entity.Dict;
+import com.youlai.boot.system.model.entity.DictItem;
 import com.youlai.boot.system.model.form.DictForm;
 import com.youlai.boot.system.model.query.DictPageQuery;
 import com.youlai.boot.system.model.vo.DictPageVO;
 import com.youlai.boot.common.model.Option;
-import com.youlai.boot.system.service.SysDictItemService;
-import com.youlai.boot.system.service.SysDictService;
+import com.youlai.boot.system.service.DictItemService;
+import com.youlai.boot.system.service.DictService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -32,9 +32,9 @@ import java.util.stream.Collectors;
  */
 @Service
 @RequiredArgsConstructor
-public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements SysDictService {
+public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements DictService {
 
-    private final SysDictItemService dictItemService;
+    private final DictItemService dictItemService;
     private final DictConverter dictConverter;
     private final DictItemConverter dictItemConverter;
 
@@ -61,11 +61,11 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
     @Override
     public boolean saveDict(DictForm dictForm) {
         // 保存字典
-        SysDict entity = dictConverter.toEntity(dictForm);
+        Dict entity = dictConverter.toEntity(dictForm);
 
         // 校验 code 是否唯一
-        long count = this.count(new LambdaQueryWrapper<SysDict>()
-                .eq(SysDict::getCode, entity.getCode())
+        long count = this.count(new LambdaQueryWrapper<Dict>()
+                .eq(Dict::getCode, entity.getCode())
         );
         Assert.isTrue(count == 0, "字典编码已存在");
 
@@ -73,7 +73,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         // 保存字典项
         if (result) {
             List<DictForm.DictItem> dictFormDictItems = dictForm.getDictItems();
-            List<SysDictItem> dictItems = dictItemConverter.toEntity(dictFormDictItems);
+            List<DictItem> dictItems = dictItemConverter.toEntity(dictFormDictItems);
             dictItems.forEach(dictItem -> dictItem.setDictId(entity.getId()));
             dictItemService.saveBatch(dictItems);
         }
@@ -89,13 +89,13 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
     @Override
     public DictForm getDictForm(Long id) {
         // 获取字典
-        SysDict entity = this.getById(id);
+        Dict entity = this.getById(id);
         Assert.isTrue(entity != null, "字典不存在");
         DictForm dictForm = dictConverter.toForm(entity);
 
         // 获取字典项集合
-        List<SysDictItem> dictItems = dictItemService.list(new LambdaQueryWrapper<SysDictItem>()
-                .eq(SysDictItem::getDictId, id)
+        List<DictItem> dictItems = dictItemService.list(new LambdaQueryWrapper<DictItem>()
+                .eq(DictItem::getDictId, id)
         );
         // 转换数据项
         List<DictForm.DictItem> dictItemList = dictItemConverter.toDictItem(dictItems);
@@ -112,12 +112,12 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
     @Override
     public boolean updateDict(Long id, DictForm dictForm) {
         // 更新字典
-        SysDict entity = dictConverter.toEntity(dictForm);
+        Dict entity = dictConverter.toEntity(dictForm);
 
         // 校验 code 是否唯一
-        long count = this.count(new LambdaQueryWrapper<SysDict>()
-                .eq(SysDict::getCode, entity.getCode())
-                .ne(SysDict::getId, id)
+        long count = this.count(new LambdaQueryWrapper<Dict>()
+                .eq(Dict::getCode, entity.getCode())
+                .ne(Dict::getId, id)
         );
         Assert.isTrue(count == 0, "字典编码已存在");
 
@@ -126,21 +126,21 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         if (result) {
             // 更新字典项
             List<DictForm.DictItem> dictFormDictItems = dictForm.getDictItems();
-            List<SysDictItem> dictItems = dictItemConverter.toEntity(dictFormDictItems);
+            List<DictItem> dictItems = dictItemConverter.toEntity(dictFormDictItems);
 
             // 获取当前数据库中的字典项
-            List<SysDictItem> currentDictItemEntities = dictItemService.list(new LambdaQueryWrapper<SysDictItem>()
-                    .eq(SysDictItem::getDictId, id)
+            List<DictItem> currentDictItemEntities = dictItemService.list(new LambdaQueryWrapper<DictItem>()
+                    .eq(DictItem::getDictId, id)
             );
 
             // 获取当前数据库中存在的字典项ID集合
             Set<Long> currentDictItemIds = currentDictItemEntities.stream()
-                    .map(SysDictItem::getId)
+                    .map(DictItem::getId)
                     .collect(Collectors.toSet());
 
             // 获取新提交的字典项ID集合
             Set<Long> newAttrIds = dictItems.stream()
-                    .map(SysDictItem::getId)
+                    .map(DictItem::getId)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toSet());
 
@@ -154,7 +154,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
             }
 
             // 更新或新增字典项
-            for (SysDictItem dictItem : dictItems) {
+            for (DictItem dictItem : dictItems) {
                 if (dictItem.getId() != null && currentDictItemIds.contains(dictItem.getId())) {
                     // 更新现有字典项
                     dictItemService.updateById(dictItem);
@@ -187,8 +187,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
             if (result) {
                 // 删除字典下的字典项
                 dictItemService.remove(
-                        new LambdaQueryWrapper<SysDictItem>()
-                                .eq(SysDictItem::getDictId, id)
+                        new LambdaQueryWrapper<DictItem>()
+                                .eq(DictItem::getDictId, id)
                 );
             }
         }
@@ -202,9 +202,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
     @Override
     public List<Option<Long>> listDictItemsByCode(String code) {
         // 根据字典编码获取字典ID
-        SysDict dict = this.getOne(new LambdaQueryWrapper<SysDict>()
-                .eq(SysDict::getCode, code)
-                .select(SysDict::getId)
+        Dict dict = this.getOne(new LambdaQueryWrapper<Dict>()
+                .eq(Dict::getCode, code)
+                .select(Dict::getId)
                 .last("limit 1")
         );
         // 如果字典不存在，则返回空集合
@@ -213,9 +213,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         }
 
         // 获取字典项
-        List<SysDictItem> dictItems = dictItemService.list(
-                new LambdaQueryWrapper<SysDictItem>()
-                        .eq(SysDictItem::getDictId, dict.getId())
+        List<DictItem> dictItems = dictItemService.list(
+                new LambdaQueryWrapper<DictItem>()
+                        .eq(DictItem::getDictId, dict.getId())
         );
 
         // 转换为 Option
@@ -227,9 +227,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
      */
     @Override
     public List<Option<String>> getDictList() {
-        return this.list(new LambdaQueryWrapper<SysDict>()
-                        .eq(SysDict::getStatus, 1)
-                        .select(SysDict::getName, SysDict::getCode)
+        return this.list(new LambdaQueryWrapper<Dict>()
+                        .eq(Dict::getStatus, 1)
+                        .select(Dict::getName, Dict::getCode)
                 ).stream()
                 .map(dict -> new Option<>(dict.getCode(), dict.getName()))
                 .toList();

src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java

@@ -2,14 +2,14 @@ package com.youlai.boot.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.youlai.boot.system.mapper.SysLogMapper;
+import com.youlai.boot.system.mapper.LogMapper;
 import com.youlai.boot.system.model.bo.VisitCount;
-import com.youlai.boot.system.model.entity.SysLog;
+import com.youlai.boot.system.model.entity.Log;
 import com.youlai.boot.system.model.query.LogPageQuery;
 import com.youlai.boot.system.model.vo.LogPageVO;
 import com.youlai.boot.system.model.vo.VisitStatsVO;
 import com.youlai.boot.system.model.vo.VisitTrendVO;
-import com.youlai.boot.system.service.SysLogService;
+import com.youlai.boot.system.service.LogService;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -26,8 +26,8 @@ import java.util.stream.Collectors;
  * @since 2.10.0
  */
 @Service
-public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog>
-        implements SysLogService {
+public class LogServiceImpl extends ServiceImpl<LogMapper, Log>
+        implements LogService {
 
     /**
      * 获取日志分页列表

src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java

@@ -11,10 +11,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.youlai.boot.system.converter.MenuConverter;
-import com.youlai.boot.system.mapper.SysMenuMapper;
+import com.youlai.boot.system.mapper.MenuMapper;
 import com.youlai.boot.system.model.bo.RouteBO;
-import com.youlai.boot.infrastructure.generator.model.entity.GenConfig;
-import com.youlai.boot.system.model.entity.SysMenu;
+import com.youlai.boot.platform.generator.model.entity.GenConfig;
+import com.youlai.boot.system.model.entity.Menu;
 import com.youlai.boot.system.model.form.MenuForm;
 import com.youlai.boot.system.model.query.MenuQuery;
 import com.youlai.boot.system.model.vo.MenuVO;
@@ -24,8 +24,8 @@ import com.youlai.boot.common.enums.MenuTypeEnum;
 import com.youlai.boot.common.enums.StatusEnum;
 import com.youlai.boot.common.model.KeyValue;
 import com.youlai.boot.common.model.Option;
-import com.youlai.boot.system.service.SysMenuService;
-import com.youlai.boot.system.service.SysRoleMenuService;
+import com.youlai.boot.system.service.MenuService;
+import com.youlai.boot.system.service.RoleMenuService;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.cache.annotation.CacheEvict;
@@ -42,11 +42,11 @@ import java.util.stream.Collectors;
  */
 @Service
 @RequiredArgsConstructor
-public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements SysMenuService {
+public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements MenuService {
 
     private final MenuConverter menuConverter;
 
-    private final SysRoleMenuService roleMenuService;
+    private final RoleMenuService roleMenuService;
 
 
     /**
@@ -56,18 +56,18 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
      */
     @Override
     public List<MenuVO> listMenus(MenuQuery queryParams) {
-        List<SysMenu> menus = this.list(new LambdaQueryWrapper<SysMenu>()
-                .like(StrUtil.isNotBlank(queryParams.getKeywords()), SysMenu::getName, queryParams.getKeywords())
-                .orderByAsc(SysMenu::getSort)
+        List<Menu> menus = this.list(new LambdaQueryWrapper<Menu>()
+                .like(StrUtil.isNotBlank(queryParams.getKeywords()), Menu::getName, queryParams.getKeywords())
+                .orderByAsc(Menu::getSort)
         );
         // 获取所有菜单ID
         Set<Long> menuIds = menus.stream()
-                .map(SysMenu::getId)
+                .map(Menu::getId)
                 .collect(Collectors.toSet());
 
         // 获取所有父级ID
         Set<Long> parentIds = menus.stream()
-                .map(SysMenu::getParentId)
+                .map(Menu::getParentId)
                 .collect(Collectors.toSet());
 
         // 获取根节点ID（递归的起点），即父节点ID中不包含在部门ID中的节点，注意这里不能拿顶级菜单 O 作为根节点，因为菜单筛选的时候 O 会被过滤掉
@@ -88,7 +88,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
      * @param menuList 菜单列表
      * @return 菜单列表
      */
-    private List<MenuVO> buildMenuTree(Long parentId, List<SysMenu> menuList) {
+    private List<MenuVO> buildMenuTree(Long parentId, List<Menu> menuList) {
         return CollectionUtil.emptyIfNull(menuList)
                 .stream()
                 .filter(menu -> menu.getParentId().equals(parentId))
@@ -107,9 +107,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
      */
     @Override
     public List<Option> listMenuOptions(boolean onlyParent) {
-        List<SysMenu> menuList = this.list(new LambdaQueryWrapper<SysMenu>()
-                .in(onlyParent, SysMenu::getType, MenuTypeEnum.CATALOG.getValue(), MenuTypeEnum.MENU.getValue())
-                .orderByAsc(SysMenu::getSort)
+        List<Menu> menuList = this.list(new LambdaQueryWrapper<Menu>()
+                .in(onlyParent, Menu::getType, MenuTypeEnum.CATALOG.getValue(), MenuTypeEnum.MENU.getValue())
+                .orderByAsc(Menu::getSort)
         );
         return buildMenuOptions(SystemConstants.ROOT_NODE_ID, menuList);
     }
@@ -121,10 +121,10 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
      * @param menuList 菜单列表
      * @return 菜单下拉列表
      */
-    private List<Option> buildMenuOptions(Long parentId, List<SysMenu> menuList) {
+    private List<Option> buildMenuOptions(Long parentId, List<Menu> menuList) {
         List<Option> menuOptions = new ArrayList<>();
 
-        for (SysMenu menu : menuList) {
+        for (Menu menu : menuList) {
             if (menu.getParentId().equals(parentId)) {
                 Option option = new Option(menu.getId(), menu.getName());
                 List<Option> subMenuOptions = buildMenuOptions(menu.getId(), menuList);
@@ -242,7 +242,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
             menuForm.setComponent(null);
         }
 
-        SysMenu entity = menuConverter.toEntity(menuForm);
+        Menu entity = menuConverter.toEntity(menuForm);
         String treePath = generateMenuTreePath(menuForm.getParentId());
         entity.setTreePath(treePath);
 
@@ -255,9 +255,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
             entity.setParams(null);
         }
         if (menuType != MenuTypeEnum.BUTTON) {
-            Assert.isFalse(this.exists(new LambdaQueryWrapper<SysMenu>()
-                    .eq(SysMenu::getRouteName, entity.getRouteName())
-                    .ne(menuForm.getId() != null, SysMenu::getId, menuForm.getId())
+            Assert.isFalse(this.exists(new LambdaQueryWrapper<Menu>()
+                    .eq(Menu::getRouteName, entity.getRouteName())
+                    .ne(menuForm.getId() != null, Menu::getId, menuForm.getId())
             ), "路由名称已存在");
         }
 
@@ -281,7 +281,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         if (SystemConstants.ROOT_NODE_ID.equals(parentId)) {
             return String.valueOf(parentId);
         } else {
-            SysMenu parent = this.getById(parentId);
+            Menu parent = this.getById(parentId);
             return parent != null ? parent.getTreePath() + "," + parent.getId() : null;
         }
     }
@@ -297,9 +297,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     @Override
     @CacheEvict(cacheNames = "menu", key = "'routes'")
     public boolean updateMenuVisible(Long menuId, Integer visible) {
-        return this.update(new LambdaUpdateWrapper<SysMenu>()
-                .eq(SysMenu::getId, menuId)
-                .set(SysMenu::getVisible, visible)
+        return this.update(new LambdaUpdateWrapper<Menu>()
+                .eq(Menu::getId, menuId)
+                .set(Menu::getVisible, visible)
         );
     }
 
@@ -311,7 +311,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
      */
     @Override
     public MenuForm getMenuForm(Long id) {
-        SysMenu entity = this.getById(id);
+        Menu entity = this.getById(id);
         Assert.isTrue(entity != null, "菜单不存在");
         MenuForm formData = menuConverter.toForm(entity);
         // 路由参数字符串 {"id":"1","name":"张三"} 转换为 [{key:"id", value:"1"}, {key:"name", value:"张三"}]
@@ -347,8 +347,8 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     @Override
     @CacheEvict(cacheNames = "menu", key = "'routes'")
     public boolean deleteMenu(Long id) {
-        boolean result = this.remove(new LambdaQueryWrapper<SysMenu>()
-                .eq(SysMenu::getId, id)
+        boolean result = this.remove(new LambdaQueryWrapper<Menu>()
+                .eq(Menu::getId, id)
                 .or()
                 .apply("CONCAT (',',tree_path,',') LIKE CONCAT('%,',{0},',%')", id));
 
@@ -369,19 +369,19 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
      */
     @Override
     public void saveMenu(Long parentMenuId, GenConfig genConfig) {
-        SysMenu parentMenu = this.getById(parentMenuId);
+        Menu parentMenu = this.getById(parentMenuId);
         Assert.notNull(parentMenu, "上级菜单不存在");
 
         String entityName = genConfig.getEntityName();
 
-        long count = this.count(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getRouteName, entityName));
+        long count = this.count(new LambdaQueryWrapper<Menu>().eq(Menu::getRouteName, entityName));
         if (count > 0) {
             return;
         }
 
         // 获取父级菜单子菜单最带的排序
-        SysMenu maxSortMenu = this.getOne(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getParentId, parentMenuId)
-                .orderByDesc(SysMenu::getSort)
+        Menu maxSortMenu = this.getOne(new LambdaQueryWrapper<Menu>().eq(Menu::getParentId, parentMenuId)
+                .orderByDesc(Menu::getSort)
                 .last("limit 1")
         );
         int sort = 1;
@@ -390,7 +390,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         }
 
 
-        SysMenu menu = new SysMenu();
+        Menu menu = new Menu();
         menu.setParentId(parentMenuId);
         menu.setName(genConfig.getBusinessName());
 
@@ -414,7 +414,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
             String[] perms = {"query", "add", "edit", "delete"};
 
             for (int i = 0; i < actions.length; i++) {
-                SysMenu button = new SysMenu();
+                Menu button = new Menu();
                 button.setParentId(menu.getId());
                 button.setType(MenuTypeEnum.BUTTON);
                 button.setName(actions[i]);

src/main/java/com/youlai/boot/system/service/impl/RoleMenuServiceImpl.java

@@ -2,11 +2,11 @@ package com.youlai.boot.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.youlai.boot.system.mapper.SysRoleMenuMapper;
+import com.youlai.boot.system.mapper.RoleMenuMapper;
 import com.youlai.boot.system.model.bo.RolePermsBO;
-import com.youlai.boot.system.model.entity.SysRoleMenu;
+import com.youlai.boot.system.model.entity.RoleMenu;
 import com.youlai.boot.common.constant.SecurityConstants;
-import com.youlai.boot.system.service.SysRoleMenuService;
+import com.youlai.boot.system.service.RoleMenuService;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -26,7 +26,7 @@ import java.util.Set;
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRoleMenu> implements SysRoleMenuService {
+public class RoleMenuServiceImpl extends ServiceImpl<RoleMenuMapper, RoleMenu> implements RoleMenuService {
 
     private final RedisTemplate<String, Object> redisTemplate;
 

src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java

@@ -8,18 +8,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.boot.system.converter.RoleConverter;
-import com.youlai.boot.system.mapper.SysRoleMapper;
-import com.youlai.boot.system.model.entity.SysRole;
-import com.youlai.boot.system.model.entity.SysRoleMenu;
+import com.youlai.boot.system.mapper.RoleMapper;
+import com.youlai.boot.system.model.entity.Role;
+import com.youlai.boot.system.model.entity.RoleMenu;
 import com.youlai.boot.system.model.form.RoleForm;
 import com.youlai.boot.system.model.query.RolePageQuery;
 import com.youlai.boot.system.model.vo.RolePageVO;
 import com.youlai.boot.common.constant.SystemConstants;
 import com.youlai.boot.common.model.Option;
 import com.youlai.boot.core.security.util.SecurityUtils;
-import com.youlai.boot.system.service.SysRoleMenuService;
-import com.youlai.boot.system.service.SysRoleService;
-import com.youlai.boot.system.service.SysUserRoleService;
+import com.youlai.boot.system.service.RoleMenuService;
+import com.youlai.boot.system.service.RoleService;
+import com.youlai.boot.system.service.UserRoleService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
@@ -37,10 +37,10 @@ import java.util.Set;
  */
 @Service
 @RequiredArgsConstructor
-public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements SysRoleService {
+public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
 
-    private final SysRoleMenuService roleMenuService;
-    private final SysUserRoleService userRoleService;
+    private final RoleMenuService roleMenuService;
+    private final UserRoleService userRoleService;
     private final RoleConverter roleConverter;
 
     /**
@@ -57,15 +57,15 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         String keywords = queryParams.getKeywords();
 
         // 查询数据
-        Page<SysRole> rolePage = this.page(new Page<>(pageNum, pageSize),
-                new LambdaQueryWrapper<SysRole>()
+        Page<Role> rolePage = this.page(new Page<>(pageNum, pageSize),
+                new LambdaQueryWrapper<Role>()
                         .and(StrUtil.isNotBlank(keywords),
                                 wrapper ->
-                                        wrapper.like(StrUtil.isNotBlank(keywords), SysRole::getName, keywords)
+                                        wrapper.like(StrUtil.isNotBlank(keywords), Role::getName, keywords)
                                                 .or()
-                                                .like(StrUtil.isNotBlank(keywords), SysRole::getCode, keywords)
+                                                .like(StrUtil.isNotBlank(keywords), Role::getCode, keywords)
                         )
-                        .ne(!SecurityUtils.isRoot(), SysRole::getCode, SystemConstants.ROOT_ROLE_CODE) // 非超级管理员不显示超级管理员角色
+                        .ne(!SecurityUtils.isRoot(), Role::getCode, SystemConstants.ROOT_ROLE_CODE) // 非超级管理员不显示超级管理员角色
         );
 
         // 实体转换
@@ -80,10 +80,10 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Override
     public List<Option<Long>> listRoleOptions() {
         // 查询数据
-        List<SysRole> roleList = this.list(new LambdaQueryWrapper<SysRole>()
-                .ne(!SecurityUtils.isRoot(), SysRole::getCode, SystemConstants.ROOT_ROLE_CODE)
-                .select(SysRole::getId, SysRole::getName)
-                .orderByAsc(SysRole::getSort)
+        List<Role> roleList = this.list(new LambdaQueryWrapper<Role>()
+                .ne(!SecurityUtils.isRoot(), Role::getCode, SystemConstants.ROOT_ROLE_CODE)
+                .select(Role::getId, Role::getName)
+                .orderByAsc(Role::getSort)
         );
 
         // 实体转换
@@ -102,22 +102,22 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         Long roleId = roleForm.getId();
 
         // 编辑角色时，判断角色是否存在
-        SysRole oldRole = null;
+        Role oldRole = null;
         if (roleId != null) {
             oldRole = this.getById(roleId);
             Assert.isTrue(oldRole != null, "角色不存在");
         }
 
         String roleCode = roleForm.getCode();
-        long count = this.count(new LambdaQueryWrapper<SysRole>()
-                .ne(roleId != null, SysRole::getId, roleId)
+        long count = this.count(new LambdaQueryWrapper<Role>()
+                .ne(roleId != null, Role::getId, roleId)
                 .and(wrapper ->
-                        wrapper.eq(SysRole::getCode, roleCode).or().eq(SysRole::getName, roleForm.getName())
+                        wrapper.eq(Role::getCode, roleCode).or().eq(Role::getName, roleForm.getName())
                 ));
         Assert.isTrue(count == 0, "角色名称或角色编码已存在，请修改后重试！");
 
         // 实体转换
-        SysRole role = roleConverter.toEntity(roleForm);
+        Role role = roleConverter.toEntity(roleForm);
 
         boolean result = this.saveOrUpdate(role);
         if (result) {
@@ -141,7 +141,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
      */
     @Override
     public RoleForm getRoleForm(Long roleId) {
-        SysRole entity = this.getById(roleId);
+        Role entity = this.getById(roleId);
         return roleConverter.toForm(entity);
     }
 
@@ -155,7 +155,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Override
     public boolean updateRoleStatus(Long roleId, Integer status) {
 
-        SysRole role = this.getById(roleId);
+        Role role = this.getById(roleId);
         Assert.isTrue(role != null, "角色不存在");
 
         role.setStatus(status);
@@ -181,7 +181,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
                 .toList();
 
         for (Long roleId : roleIds) {
-            SysRole role = this.getById(roleId);
+            Role role = this.getById(roleId);
             Assert.isTrue(role != null, "角色不存在");
 
             // 判断角色是否被用户关联
@@ -219,19 +219,19 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Transactional
     @CacheEvict(cacheNames = "menu", key = "'routes'")
     public boolean assignMenusToRole(Long roleId, List<Long> menuIds) {
-        SysRole role = this.getById(roleId);
+        Role role = this.getById(roleId);
         Assert.isTrue(role != null, "角色不存在");
 
         // 删除角色菜单
         roleMenuService.remove(
-                new LambdaQueryWrapper<SysRoleMenu>()
-                        .eq(SysRoleMenu::getRoleId, roleId)
+                new LambdaQueryWrapper<RoleMenu>()
+                        .eq(RoleMenu::getRoleId, roleId)
         );
         // 新增角色菜单
         if (CollectionUtil.isNotEmpty(menuIds)) {
-            List<SysRoleMenu> roleMenus = menuIds
+            List<RoleMenu> roleMenus = menuIds
                     .stream()
-                    .map(menuId -> new SysRoleMenu(roleId, menuId))
+                    .map(menuId -> new RoleMenu(roleId, menuId))
                     .toList();
             roleMenuService.saveBatch(roleMenus);
         }

src/main/java/com/youlai/boot/system/service/impl/UserRoleServiceImpl.java

@@ -3,16 +3,16 @@ package com.youlai.boot.system.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.youlai.boot.system.mapper.SysUserRoleMapper;
-import com.youlai.boot.system.model.entity.SysUserRole;
-import com.youlai.boot.system.service.SysUserRoleService;
+import com.youlai.boot.system.mapper.UserRoleMapper;
+import com.youlai.boot.system.model.entity.UserRole;
+import com.youlai.boot.system.service.UserRoleService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
-public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements SysUserRoleService {
+public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements UserRoleService {
 
     /**
      * 保存用户角色
@@ -29,10 +29,10 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
         }
 
         // 用户原角色ID集合
-        List<Long> userRoleIds = this.list(new LambdaQueryWrapper<SysUserRole>()
-                        .eq(SysUserRole::getUserId, userId))
+        List<Long> userRoleIds = this.list(new LambdaQueryWrapper<UserRole>()
+                        .eq(UserRole::getUserId, userId))
                 .stream()
-                .map(SysUserRole::getRoleId)
+                .map(UserRole::getRoleId)
                 .collect(Collectors.toList());
 
         // 新增用户角色
@@ -45,9 +45,9 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
                     .collect(Collectors.toList());
         }
 
-        List<SysUserRole> saveUserRoles = saveRoleIds
+        List<UserRole> saveUserRoles = saveRoleIds
                 .stream()
-                .map(roleId -> new SysUserRole(userId, roleId))
+                .map(roleId -> new UserRole(userId, roleId))
                 .collect(Collectors.toList());
         this.saveBatch(saveUserRoles);
 
@@ -58,9 +58,9 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
                     .collect(Collectors.toList());
 
             if (CollectionUtil.isNotEmpty(removeRoleIds)) {
-                this.remove(new LambdaQueryWrapper<SysUserRole>()
-                        .eq(SysUserRole::getUserId, userId)
-                        .in(SysUserRole::getRoleId, removeRoleIds)
+                this.remove(new LambdaQueryWrapper<UserRole>()
+                        .eq(UserRole::getUserId, userId)
+                        .in(UserRole::getRoleId, removeRoleIds)
                 );
             }
         }

src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java

@@ -11,27 +11,27 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.boot.common.constant.RedisConstants;
 import com.youlai.boot.common.constant.SystemConstants;
 import com.youlai.boot.common.enums.ContactType;
-import com.youlai.boot.infrastructure.mail.service.MailService;
-import com.youlai.boot.infrastructure.sms.service.SmsService;
+import com.youlai.boot.platform.mail.service.MailService;
+import com.youlai.boot.platform.sms.service.SmsService;
+import com.youlai.boot.system.model.entity.User;
 import com.youlai.boot.system.model.form.*;
 import com.youlai.boot.config.property.AliyunSmsProperties;
 import com.youlai.boot.system.converter.UserConverter;
 import com.youlai.boot.common.exception.BusinessException;
 import com.youlai.boot.system.model.vo.UserProfileVO;
 import com.youlai.boot.core.security.util.SecurityUtils;
-import com.youlai.boot.system.mapper.SysUserMapper;
+import com.youlai.boot.system.mapper.UserMapper;
 import com.youlai.boot.system.model.dto.UserAuthInfo;
 import com.youlai.boot.system.model.bo.UserBO;
-import com.youlai.boot.system.model.entity.SysUser;
 import com.youlai.boot.system.model.query.UserPageQuery;
 import com.youlai.boot.system.model.dto.UserExportDTO;
 import com.youlai.boot.system.model.vo.UserInfoVO;
 import com.youlai.boot.system.model.vo.UserPageVO;
 import com.youlai.boot.core.security.service.PermissionService;
-import com.youlai.boot.system.service.SysRoleMenuService;
-import com.youlai.boot.system.service.SysRoleService;
-import com.youlai.boot.system.service.SysUserRoleService;
-import com.youlai.boot.system.service.SysUserService;
+import com.youlai.boot.system.service.RoleMenuService;
+import com.youlai.boot.system.service.RoleService;
+import com.youlai.boot.system.service.UserRoleService;
+import com.youlai.boot.system.service.UserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -52,17 +52,17 @@ import java.util.stream.Collectors;
  */
 @Service
 @RequiredArgsConstructor
-public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
+public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
 
     private final PasswordEncoder passwordEncoder;
 
-    private final SysUserRoleService userRoleService;
+    private final UserRoleService userRoleService;
 
     private final UserConverter userConverter;
 
-    private final SysRoleMenuService roleMenuService;
+    private final RoleMenuService roleMenuService;
 
-    private final SysRoleService roleService;
+    private final RoleService roleService;
 
     private final PermissionService permissionService;
 
@@ -116,11 +116,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         String username = userForm.getUsername();
 
-        long count = this.count(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, username));
+        long count = this.count(new LambdaQueryWrapper<User>().eq(User::getUsername, username));
         Assert.isTrue(count == 0, "用户名已存在");
 
         // 实体转换 form->entity
-        SysUser entity = userConverter.toEntity(userForm);
+        User entity = userConverter.toEntity(userForm);
 
         // 设置默认加密密码
         String defaultEncryptPwd = passwordEncoder.encode(SystemConstants.DEFAULT_PASSWORD);
@@ -149,14 +149,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         String username = userForm.getUsername();
 
-        long count = this.count(new LambdaQueryWrapper<SysUser>()
-                .eq(SysUser::getUsername, username)
-                .ne(SysUser::getId, userId)
+        long count = this.count(new LambdaQueryWrapper<User>()
+                .eq(User::getUsername, username)
+                .ne(User::getId, userId)
         );
         Assert.isTrue(count == 0, "用户名已存在");
 
         // form -> entity
-        SysUser entity = userConverter.toEntity(userForm);
+        User entity = userConverter.toEntity(userForm);
 
         // 修改用户
         boolean result = this.updateById(entity);
@@ -231,13 +231,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String username = SecurityUtils.getUsername();
 
         // 获取登录用户基础信息
-        SysUser user = this.getOne(new LambdaQueryWrapper<SysUser>()
-                .eq(SysUser::getUsername, username)
+        User user = this.getOne(new LambdaQueryWrapper<User>()
+                .eq(User::getUsername, username)
                 .select(
-                        SysUser::getId,
-                        SysUser::getUsername,
-                        SysUser::getNickname,
-                        SysUser::getAvatar
+                        User::getId,
+                        User::getUsername,
+                        User::getNickname,
+                        User::getAvatar
                 )
         );
         // entity->VO
@@ -276,7 +276,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public boolean updateUserProfile(UserProfileForm formData) {
         Long userId = SecurityUtils.getUserId();
-        SysUser entity = userConverter.toEntity(formData);
+        User entity = userConverter.toEntity(formData);
         entity.setId(userId);
         return this.updateById(entity);
     }
@@ -292,7 +292,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public boolean changePassword(Long userId, PasswordChangeForm data) {
 
-        SysUser user = this.getById(userId);
+        User user = this.getById(userId);
         if (user == null) {
             throw new BusinessException("用户不存在");
         }
@@ -309,9 +309,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
 
         String newPassword = data.getNewPassword();
-        return this.update(new LambdaUpdateWrapper<SysUser>()
-                .eq(SysUser::getId, userId)
-                .set(SysUser::getPassword, passwordEncoder.encode(newPassword))
+        return this.update(new LambdaUpdateWrapper<User>()
+                .eq(User::getId, userId)
+                .set(User::getPassword, passwordEncoder.encode(newPassword))
         );
     }
 
@@ -324,9 +324,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public boolean resetPassword(Long userId, String password) {
-        return this.update(new LambdaUpdateWrapper<SysUser>()
-                .eq(SysUser::getId, userId)
-                .set(SysUser::getPassword, passwordEncoder.encode(password))
+        return this.update(new LambdaUpdateWrapper<User>()
+                .eq(User::getId, userId)
+                .set(User::getPassword, passwordEncoder.encode(password))
         );
     }
 
@@ -353,7 +353,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 verificationCodePrefix = RedisConstants.MOBILE_VERIFICATION_CODE_PREFIX;
                 break;
             case EMAIL:
-                mailService.sendSimpleMail(contact, "验证码", "您的验证码是：" + code);
+                mailService.sendMail(contact, "验证码", "您的验证码是：" + code);
                 verificationCodePrefix = RedisConstants.EMAIL_VERIFICATION_CODE_PREFIX;
                 break;
             default:
@@ -373,7 +373,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public boolean bindMobile(MobileBindingForm data) {
         Long userId = SecurityUtils.getUserId();
-        SysUser user = this.getById(userId);
+        User user = this.getById(userId);
         if (user == null) {
             throw new BusinessException("用户不存在");
         }
@@ -386,9 +386,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             throw new BusinessException("验证码错误");
         }
         // 更新手机号码
-        return this.update(new LambdaUpdateWrapper<SysUser>()
-                .eq(SysUser::getId, userId)
-                .set(SysUser::getMobile, contact)
+        return this.update(new LambdaUpdateWrapper<User>()
+                .eq(User::getId, userId)
+                .set(User::getMobile, contact)
         );
     }
 
@@ -401,7 +401,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public boolean bindEmail(EmailChangeForm data) {
         Long userId = SecurityUtils.getUserId();
-        SysUser user = this.getById(userId);
+        User user = this.getById(userId);
         if (user == null) {
             throw new BusinessException("用户不存在");
         }
@@ -414,9 +414,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             throw new BusinessException("验证码错误");
         }
         // 更新邮箱
-        return this.update(new LambdaUpdateWrapper<SysUser>()
-                .eq(SysUser::getId, userId)
-                .set(SysUser::getEmail, email)
+        return this.update(new LambdaUpdateWrapper<User>()
+                .eq(User::getId, userId)
+                .set(User::getEmail, email)
         );
     }
 }

src/main/java/com/youlai/boot/system/service/impl/WebsocketServiceImpl.java

@@ -1,52 +0,0 @@
-package com.youlai.boot.system.service.impl;
-
-import com.youlai.boot.system.event.UserConnectionEvent;
-import com.youlai.boot.system.service.WebsocketService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.event.EventListener;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-@Service
-@Slf4j
-@RequiredArgsConstructor
-public class WebsocketServiceImpl implements WebsocketService {
-
-    private final SimpMessagingTemplate messagingTemplate;
-
-    private final Set<String> onlineUsers = ConcurrentHashMap.newKeySet();
-
-    @Override
-    public void addUser(String username) {
-        onlineUsers.add(username);
-    }
-
-    @Override
-    public void removeUser(String username) {
-        onlineUsers.remove(username);
-    }
-
-    @EventListener
-    public void handleUserConnectionEvent(UserConnectionEvent event) {
-        String username = event.getUsername();
-        if (event.isConnected()) {
-            onlineUsers.add(username);
-            log.info("User connected: {}", username);
-        } else {
-            onlineUsers.remove(username);
-            log.info("User disconnected: {}", username);
-        }
-        // 推送在线用户人数
-        messagingTemplate.convertAndSend("/topic/onlineUserCount", onlineUsers.size());
-    }
-
-    @Scheduled(fixedRate = 5000)
-    public void sendOnlineUserCount() {
-        messagingTemplate.convertAndSend("/topic/onlineUserCount", onlineUsers.size());
-    }
-}