diff --git a/src/main/java/com/youlai/boot/framework/security/port/PermissionPort.java b/src/main/java/com/youlai/boot/framework/security/port/PermissionPort.java index c26f1af8..9417eded 100644 --- a/src/main/java/com/youlai/boot/framework/security/port/PermissionPort.java +++ b/src/main/java/com/youlai/boot/framework/security/port/PermissionPort.java @@ -8,7 +8,7 @@ import java.util.Set; * 由 system 模块提供适配器实现,framework 层通过此接口获取角色权限集合, * 不直接依赖 system 模块的 {@code RoleMenuService}。 * - * @see com.youlai.boot.system.security.port.PermissionAdapter + * @see com.youlai.boot.system.security.adapter.PermissionAdapter */ public interface PermissionPort { diff --git a/src/main/java/com/youlai/boot/framework/security/port/UserAuthenticationPort.java b/src/main/java/com/youlai/boot/framework/security/port/UserAuthenticationPort.java index 29bdbf22..82acea2c 100644 --- a/src/main/java/com/youlai/boot/framework/security/port/UserAuthenticationPort.java +++ b/src/main/java/com/youlai/boot/framework/security/port/UserAuthenticationPort.java @@ -9,7 +9,7 @@ import com.youlai.boot.framework.security.model.SecurityUser; * 由 system 模块提供适配器实现,framework 层通过此接口获取认证数据, * 不直接依赖 system 模块的 {@code UserService} / {@code UserSocialService}。 * - * @see com.youlai.boot.system.security.port.UserAuthenticationAdapter + * @see com.youlai.boot.system.security.adapter.UserAuthenticationAdapter */ public interface UserAuthenticationPort { diff --git a/src/main/java/com/youlai/boot/system/controller/UserController.java b/src/main/java/com/youlai/boot/system/controller/UserController.java index ce9a926c..b3abe52e 100644 --- a/src/main/java/com/youlai/boot/system/controller/UserController.java +++ b/src/main/java/com/youlai/boot/system/controller/UserController.java @@ -13,7 +13,7 @@ import com.youlai.boot.common.result.ExcelResult; import com.youlai.boot.common.result.PageResult; import com.youlai.boot.common.result.Result; import com.youlai.boot.common.util.ExcelUtils; -import com.youlai.boot.system.listener.UserImportListener; +import com.youlai.boot.system.service.UserImportReader; import com.youlai.boot.system.model.form.EmailUpdateForm; import com.youlai.boot.system.model.form.MobileUpdateForm; import com.youlai.boot.system.model.form.PasswordUpdateForm; @@ -184,9 +184,9 @@ public class UserController { @PreAuthorize("@ss.hasPerm('sys:user:import')") @Log(module = LogModuleEnum.USER, value = ActionTypeEnum.IMPORT) public Result importUsers(MultipartFile file) throws IOException { - UserImportListener listener = new UserImportListener(); - ExcelUtils.importExcel(file.getInputStream(), UserImportForm.class, listener); - return Result.success(listener.getExcelResult()); + UserImportReader reader = new UserImportReader(); + ExcelUtils.importExcel(file.getInputStream(), UserImportForm.class, reader); + return Result.success(reader.getExcelResult()); } @Operation(summary = "导出用户") diff --git a/src/main/java/com/youlai/boot/system/handler/XxlJobSampleHandler.java b/src/main/java/com/youlai/boot/system/handler/XxlJobSampleHandler.java deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/java/com/youlai/boot/system/job/OnlineUserCountTask.java b/src/main/java/com/youlai/boot/system/schedule/OnlineUserCountTask.java similarity index 93% rename from src/main/java/com/youlai/boot/system/job/OnlineUserCountTask.java rename to src/main/java/com/youlai/boot/system/schedule/OnlineUserCountTask.java index 025f9532..9eb60767 100644 --- a/src/main/java/com/youlai/boot/system/job/OnlineUserCountTask.java +++ b/src/main/java/com/youlai/boot/system/schedule/OnlineUserCountTask.java @@ -1,4 +1,4 @@ -package com.youlai.boot.system.job; +package com.youlai.boot.system.schedule; import com.youlai.boot.support.sse.SseService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/boot/system/schedule/XxlJobSample.java b/src/main/java/com/youlai/boot/system/schedule/XxlJobSample.java new file mode 100644 index 00000000..bfaa3481 --- /dev/null +++ b/src/main/java/com/youlai/boot/system/schedule/XxlJobSample.java @@ -0,0 +1,23 @@ +package com.youlai.boot.system.schedule; + +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * XXL-JOB 示例任务。 + *

+ * 需在调度中心配置同名任务后方可执行。 + * + * @author Ray.Hao + * @since 3.1.0 + */ +@Component +@Slf4j +public class XxlJobSample { + + @XxlJob("sampleJob") + public void execute() { + log.info("XXL-JOB 示例任务执行"); + } +} diff --git a/src/main/java/com/youlai/boot/system/security/port/PermissionAdapter.java b/src/main/java/com/youlai/boot/system/security/adapter/PermissionAdapter.java similarity index 93% rename from src/main/java/com/youlai/boot/system/security/port/PermissionAdapter.java rename to src/main/java/com/youlai/boot/system/security/adapter/PermissionAdapter.java index 498f2f23..386fd4e3 100644 --- a/src/main/java/com/youlai/boot/system/security/port/PermissionAdapter.java +++ b/src/main/java/com/youlai/boot/system/security/adapter/PermissionAdapter.java @@ -1,4 +1,4 @@ -package com.youlai.boot.system.security.port; +package com.youlai.boot.system.security.adapter; import com.youlai.boot.framework.security.port.PermissionPort; import com.youlai.boot.system.service.RoleMenuService; diff --git a/src/main/java/com/youlai/boot/system/security/port/UserAuthenticationAdapter.java b/src/main/java/com/youlai/boot/system/security/adapter/UserAuthenticationAdapter.java similarity index 96% rename from src/main/java/com/youlai/boot/system/security/port/UserAuthenticationAdapter.java rename to src/main/java/com/youlai/boot/system/security/adapter/UserAuthenticationAdapter.java index 22555298..6726f7d1 100644 --- a/src/main/java/com/youlai/boot/system/security/port/UserAuthenticationAdapter.java +++ b/src/main/java/com/youlai/boot/system/security/adapter/UserAuthenticationAdapter.java @@ -1,4 +1,4 @@ -package com.youlai.boot.system.security.port; +package com.youlai.boot.system.security.adapter; import com.youlai.boot.common.enums.SocialPlatformEnum; import com.youlai.boot.framework.security.model.SecurityUser; diff --git a/src/main/java/com/youlai/boot/system/listener/UserImportListener.java b/src/main/java/com/youlai/boot/system/service/UserImportReader.java similarity index 95% rename from src/main/java/com/youlai/boot/system/listener/UserImportListener.java rename to src/main/java/com/youlai/boot/system/service/UserImportReader.java index 236a86ea..3cd3f909 100644 --- a/src/main/java/com/youlai/boot/system/listener/UserImportListener.java +++ b/src/main/java/com/youlai/boot/system/service/UserImportReader.java @@ -1,4 +1,4 @@ -package com.youlai.boot.system.listener; +package com.youlai.boot.system.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; @@ -17,7 +17,6 @@ import com.youlai.boot.system.enums.DictCodeEnum; import com.youlai.boot.system.model.entity.SysUser; import com.youlai.boot.system.model.entity.*; import com.youlai.boot.system.model.form.UserImportForm; -import com.youlai.boot.system.service.*; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.springframework.security.crypto.password.PasswordEncoder; @@ -28,15 +27,15 @@ import java.util.List; import java.util.stream.Collectors; /** - * 用户导入监听器 + * 用户导入读取器。 *

- * 最简单的读的监听器 + * 基于 EasyExcel 的 {@link AnalysisEventListener},逐行读取 Excel 并完成校验、持久化。 * * @author Ray * @since 2022/4/10 */ @Slf4j -public class UserImportListener extends AnalysisEventListener { +public class UserImportReader extends AnalysisEventListener { /** * Excel 导入结果 @@ -62,7 +61,7 @@ public class UserImportListener extends AnalysisEventListener { * 构造方法 *

在构造方法中给需要查询的内容查询好,尽量避免每条数据查询一次

*/ - public UserImportListener() { + public UserImportReader() { this.userService = SpringUtil.getBean(UserService.class); this.passwordEncoder = SpringUtil.getBean(PasswordEncoder.class); this.userRoleService = SpringUtil.getBean(UserRoleService.class);