odboy/cutejava
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(system): 重构系统模块代码

Browse Source
This commit is contained in:
odboy
2025-06-24 18:02:15 +08:00
parent ce71eb65dd
commit 34f2edcda2
119 changed files with 337 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cutejava/cutejava-starter/src/main/java/cn/odboy/monitor/HealthCheckPointerImpl.java
+1 -1
View File
@@ -1,6 +1,6 @@
package cn.odboy.monitor; package cn.odboy.monitor;
import cn.odboy.core.service.system.SystemDictService; import cn.odboy.core.service.SystemDictService;
import cn.odboy.monitor.service.CsHealthCheckPointService; import cn.odboy.monitor.service.CsHealthCheckPointService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/LoginCodeEnum.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/CaptchaCodeEnum.java
+1 -1
View File
@@ -3,7 +3,7 @@ package cn.odboy.core.constant;
/** /**
* 验证码配置枚举 * 验证码配置枚举
*/ */
public enum LoginCodeEnum { public enum CaptchaCodeEnum {
/** /**
* 算数 * 算数
*/ */
cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/system/SystemCaptchaBizEnum.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemCaptchaBizEnum.java
+5 -5
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.constant.system; package cn.odboy.core.constant;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
@@ -11,16 +11,16 @@ import lombok.Getter;
public enum SystemCaptchaBizEnum { public enum SystemCaptchaBizEnum {
/* 通过手机号码重置邮箱 */ /* 通过手机号码重置邮箱 */
PHONE_RESET_EMAIL_CODE("10000", "phone_reset_email_code_", "email.ftl", "通过手机号码重置邮箱"), PHONE_RESET_EMAIL_CODE("10000", "phone_reset_email_code_", "SystemEmailCaptchaTemplate.ftl", "通过手机号码重置邮箱"),
/* 通过旧邮箱重置邮箱 */ /* 通过旧邮箱重置邮箱 */
EMAIL_RESET_EMAIL_CODE("10001", "email_reset_email_code_", "email.ftl", "通过旧邮箱重置邮箱"), EMAIL_RESET_EMAIL_CODE("10001", "email_reset_email_code_", "SystemEmailCaptchaTemplate.ftl", "通过旧邮箱重置邮箱"),
/* 通过手机号码重置密码 */ /* 通过手机号码重置密码 */
PHONE_RESET_PWD_CODE("10002", "phone_reset_pwd_code_", "email.ftl", "通过手机号码重置密码"), PHONE_RESET_PWD_CODE("10002", "phone_reset_pwd_code_", "SystemEmailCaptchaTemplate.ftl", "通过手机号码重置密码"),
/* 通过邮箱重置密码 */ /* 通过邮箱重置密码 */
EMAIL_RESET_PWD_CODE("10003", "email_reset_pwd_code_", "email.ftl", "通过邮箱重置密码"); EMAIL_RESET_PWD_CODE("10003", "email_reset_pwd_code_", "SystemEmailCaptchaTemplate.ftl", "通过邮箱重置密码");
/** /**
* 业务编码 * 业务编码
cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/system/SystemDataScopeEnum.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemDataScopeEnum.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.constant.system; package cn.odboy.core.constant;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemAuthController.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemAuthController.java
+8 -8
View File
@@ -1,15 +1,15 @@
package cn.odboy.core.controller.system; package cn.odboy.core.controller;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.odboy.annotation.AnonymousPostMapping; import cn.odboy.annotation.AnonymousPostMapping;
import cn.odboy.constant.SystemConst; import cn.odboy.constant.SystemConst;
import cn.odboy.core.constant.LoginCodeEnum; import cn.odboy.core.constant.CaptchaCodeEnum;
import cn.odboy.core.dal.model.system.SystemUserInfoVo; import cn.odboy.core.dal.model.SystemUserInfoVo;
import cn.odboy.core.dal.model.system.SystemUserJwtVo; import cn.odboy.core.dal.model.SystemUserJwtVo;
import cn.odboy.core.dal.model.system.SystemUserLoginArgs; import cn.odboy.core.dal.model.SystemUserLoginArgs;
import cn.odboy.core.dal.redis.system.SystemRedisKey; import cn.odboy.core.dal.redis.SystemRedisKey;
import cn.odboy.core.dal.redis.system.SystemUserOnlineInfoDAO; import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO;
import cn.odboy.core.framework.permission.core.SecurityHelper; import cn.odboy.core.framework.permission.core.SecurityHelper;
import cn.odboy.core.framework.permission.core.handler.TokenProvider; import cn.odboy.core.framework.permission.core.handler.TokenProvider;
import cn.odboy.core.framework.permission.core.handler.UserDetailsHandler; import cn.odboy.core.framework.permission.core.handler.UserDetailsHandler;
@@ -112,7 +112,7 @@ public class SystemAuthController {
String uuid = SystemRedisKey.CAPTCHA_LOGIN + IdUtil.simpleUUID(); String uuid = SystemRedisKey.CAPTCHA_LOGIN + IdUtil.simpleUUID();
//当验证码类型为 arithmetic时且长度 >= 2 时，captcha.text()的结果有几率为浮点型 //当验证码类型为 arithmetic时且长度 >= 2 时，captcha.text()的结果有几率为浮点型
String captchaValue = captcha.text(); String captchaValue = captcha.text();
if (captcha.getCharType() - 1 == LoginCodeEnum.ARITHMETIC.ordinal() && captchaValue.contains(SystemConst.SYMBOL_DOT)) { if (captcha.getCharType() - 1 == CaptchaCodeEnum.ARITHMETIC.ordinal() && captchaValue.contains(SystemConst.SYMBOL_DOT)) {
captchaValue = captchaValue.split("\\.")[0]; captchaValue = captchaValue.split("\\.")[0];
} }
// 保存 // 保存
cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemCaptchaController.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemCaptchaController.java
+3 -3
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.controller.system; package cn.odboy.core.controller;
import cn.odboy.core.constant.system.SystemCaptchaBizEnum; import cn.odboy.core.constant.SystemCaptchaBizEnum;
import cn.odboy.core.service.system.SystemEmailService; import cn.odboy.core.service.SystemEmailService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDeptController.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDeptController.java
+5 -5
View File
@@ -1,10 +1,10 @@
package cn.odboy.core.controller.system; package cn.odboy.core.controller;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.core.dal.dataobject.system.SystemDeptTb; import cn.odboy.core.dal.dataobject.SystemDeptTb;
import cn.odboy.core.dal.model.system.CreateSystemDeptArgs; import cn.odboy.core.dal.model.CreateSystemDeptArgs;
import cn.odboy.core.dal.model.system.QuerySystemDeptArgs; import cn.odboy.core.dal.model.QuerySystemDeptArgs;
import cn.odboy.core.service.system.SystemDeptService; import cn.odboy.core.service.SystemDeptService;
import cn.odboy.util.CsPageUtil; import cn.odboy.util.CsPageUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDictController.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictController.java
+5 -5
View File
@@ -1,10 +1,10 @@
package cn.odboy.core.controller.system; package cn.odboy.core.controller;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.core.dal.dataobject.system.SystemDictTb; import cn.odboy.core.dal.dataobject.SystemDictTb;
import cn.odboy.core.dal.model.system.CreateSystemDictArgs; import cn.odboy.core.dal.model.CreateSystemDictArgs;
import cn.odboy.core.dal.model.system.QuerySystemDictArgs; import cn.odboy.core.dal.model.QuerySystemDictArgs;
import cn.odboy.core.service.system.SystemDictService; import cn.odboy.core.service.SystemDictService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDictDetailController.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictDetailController.java
+5 -5
View File
@@ -1,10 +1,10 @@
package cn.odboy.core.controller.system; package cn.odboy.core.controller;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.core.dal.dataobject.system.SystemDictDetailTb; import cn.odboy.core.dal.dataobject.SystemDictDetailTb;
import cn.odboy.core.dal.model.system.CreateSystemDictDetailArgs; import cn.odboy.core.dal.model.CreateSystemDictDetailArgs;
import cn.odboy.core.dal.model.system.QuerySystemDictDetailArgs; import cn.odboy.core.dal.model.QuerySystemDictDetailArgs;
import cn.odboy.core.service.system.SystemDictDetailService; import cn.odboy.core.service.SystemDictDetailService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemEmailController.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemEmailController.java
+4 -4
View File
@@ -1,8 +1,8 @@
package cn.odboy.core.controller.system; package cn.odboy.core.controller;
import cn.odboy.core.dal.dataobject.system.SystemEmailConfigTb; import cn.odboy.core.dal.dataobject.SystemEmailConfigTb;
import cn.odboy.core.dal.model.system.SendSystemEmailArgs; import cn.odboy.core.dal.model.SendSystemEmailArgs;
import cn.odboy.core.service.system.SystemEmailService; import cn.odboy.core.service.SystemEmailService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemJobController.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemJobController.java
+5 -5
View File
@@ -1,10 +1,10 @@
package cn.odboy.core.controller.system; package cn.odboy.core.controller;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.core.dal.dataobject.system.SystemJobTb; import cn.odboy.core.dal.dataobject.SystemJobTb;
import cn.odboy.core.dal.model.system.CreateSystemJobArgs; import cn.odboy.core.dal.model.CreateSystemJobArgs;
import cn.odboy.core.dal.model.system.QuerySystemJobArgs; import cn.odboy.core.dal.model.QuerySystemJobArgs;
import cn.odboy.core.service.system.SystemJobService; import cn.odboy.core.service.SystemJobService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemLocalStorageController.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemLocalStorageController.java
+4 -4
View File
@@ -1,10 +1,10 @@
package cn.odboy.core.controller.system; package cn.odboy.core.controller;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.constant.FileTypeEnum; import cn.odboy.constant.FileTypeEnum;
import cn.odboy.core.dal.dataobject.system.SystemLocalStorageTb; import cn.odboy.core.dal.dataobject.SystemLocalStorageTb;
import cn.odboy.core.dal.model.system.QuerySystemLocalStorageArgs; import cn.odboy.core.dal.model.QuerySystemLocalStorageArgs;
import cn.odboy.core.service.system.SystemLocalStorageService; import cn.odboy.core.service.SystemLocalStorageService;
import cn.odboy.exception.BadRequestException; import cn.odboy.exception.BadRequestException;
import cn.odboy.util.FileUtil; import cn.odboy.util.FileUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemMenuController.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMenuController.java
+5 -5
View File
@@ -1,12 +1,12 @@
package cn.odboy.core.controller.system; package cn.odboy.core.controller;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.core.dal.dataobject.system.SystemMenuTb; import cn.odboy.core.dal.dataobject.SystemMenuTb;
import cn.odboy.core.dal.model.system.QuerySystemMenuArgs; import cn.odboy.core.dal.model.QuerySystemMenuArgs;
import cn.odboy.core.dal.model.system.SystemMenuVo; import cn.odboy.core.dal.model.SystemMenuVo;
import cn.odboy.core.framework.permission.core.SecurityHelper; import cn.odboy.core.framework.permission.core.SecurityHelper;
import cn.odboy.core.service.system.SystemMenuService; import cn.odboy.core.service.SystemMenuService;
import cn.odboy.exception.BadRequestException; import cn.odboy.exception.BadRequestException;
import cn.odboy.util.CsPageUtil; import cn.odboy.util.CsPageUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemMonitorController.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMonitorController.java
+2 -2
View File
@@ -1,6 +1,6 @@
package cn.odboy.core.controller.system; package cn.odboy.core.controller;
import cn.odboy.core.service.system.SystemMonitorService; import cn.odboy.core.service.SystemMonitorService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemOnlineController.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemOnlineController.java
+3 -3
View File
@@ -1,8 +1,8 @@
package cn.odboy.core.controller.system; package cn.odboy.core.controller;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.core.dal.model.system.SystemUserOnlineVo; import cn.odboy.core.dal.model.SystemUserOnlineVo;
import cn.odboy.core.dal.redis.system.SystemUserOnlineInfoDAO; import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO;
import cn.odboy.util.DesEncryptUtil; import cn.odboy.util.DesEncryptUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemQiniuController.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQiniuController.java
+6 -6
View File
@@ -1,11 +1,11 @@
package cn.odboy.core.controller.system; package cn.odboy.core.controller;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.core.dal.dataobject.system.SystemQiniuConfigTb; import cn.odboy.core.dal.dataobject.SystemQiniuConfigTb;
import cn.odboy.core.dal.dataobject.system.SystemQiniuContentTb; import cn.odboy.core.dal.dataobject.SystemQiniuContentTb;
import cn.odboy.core.dal.model.system.QuerySystemQiniuArgs; import cn.odboy.core.dal.model.QuerySystemQiniuArgs;
import cn.odboy.core.service.system.SystemQiniuConfigService; import cn.odboy.core.service.SystemQiniuConfigService;
import cn.odboy.core.service.system.SystemQiniuContentService; import cn.odboy.core.service.SystemQiniuContentService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemQuartzJobController.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQuartzJobController.java
+6 -6
View File
@@ -1,12 +1,12 @@
package cn.odboy.core.controller.system; package cn.odboy.core.controller;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.context.SpringBeanHolder; import cn.odboy.context.SpringBeanHolder;
import cn.odboy.core.dal.dataobject.system.SystemQuartzJobTb; import cn.odboy.core.dal.dataobject.SystemQuartzJobTb;
import cn.odboy.core.dal.dataobject.system.SystemQuartzLogTb; import cn.odboy.core.dal.dataobject.SystemQuartzLogTb;
import cn.odboy.core.dal.model.system.QuerySystemQuartzJobArgs; import cn.odboy.core.dal.model.QuerySystemQuartzJobArgs;
import cn.odboy.core.dal.model.system.UpdateSystemQuartzJobArgs; import cn.odboy.core.dal.model.UpdateSystemQuartzJobArgs;
import cn.odboy.core.service.system.SystemQuartzJobService; import cn.odboy.core.service.SystemQuartzJobService;
import cn.odboy.exception.BadRequestException; import cn.odboy.exception.BadRequestException;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemRoleController.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemRoleController.java
+5 -5
View File
@@ -1,12 +1,12 @@
package cn.odboy.core.controller.system; package cn.odboy.core.controller;
import cn.hutool.core.lang.Dict; import cn.hutool.core.lang.Dict;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.core.dal.dataobject.system.SystemRoleTb; import cn.odboy.core.dal.dataobject.SystemRoleTb;
import cn.odboy.core.dal.model.system.CreateSystemRoleArgs; import cn.odboy.core.dal.model.CreateSystemRoleArgs;
import cn.odboy.core.dal.model.system.QuerySystemRoleArgs; import cn.odboy.core.dal.model.QuerySystemRoleArgs;
import cn.odboy.core.framework.permission.core.SecurityHelper; import cn.odboy.core.framework.permission.core.SecurityHelper;
import cn.odboy.core.service.system.SystemRoleService; import cn.odboy.core.service.SystemRoleService;
import cn.odboy.exception.BadRequestException; import cn.odboy.exception.BadRequestException;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemUserController.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemUserController.java
+8 -7
View File
@@ -1,16 +1,17 @@
package cn.odboy.core.controller.system; package cn.odboy.core.controller;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.base.CsSelectOptionItemVo; import cn.odboy.base.CsSelectOptionItemVo;
import cn.odboy.core.constant.system.SystemCaptchaBizEnum; import cn.odboy.core.constant.SystemCaptchaBizEnum;
import cn.odboy.core.dal.dataobject.system.SystemDeptTb; import cn.odboy.core.dal.dataobject.SystemDeptTb;
import cn.odboy.core.dal.dataobject.system.SystemRoleTb; import cn.odboy.core.dal.dataobject.SystemRoleTb;
import cn.odboy.core.dal.dataobject.system.SystemUserTb; import cn.odboy.core.dal.dataobject.SystemUserTb;
import cn.odboy.core.dal.model.system.QuerySystemUserArgs; import cn.odboy.core.dal.model.QuerySystemUserArgs;
import cn.odboy.core.dal.model.system.UpdateSystemUserPasswordArgs; import cn.odboy.core.dal.model.UpdateSystemUserPasswordArgs;
import cn.odboy.core.framework.permission.core.SecurityHelper; import cn.odboy.core.framework.permission.core.SecurityHelper;
import cn.odboy.core.framework.properties.AppProperties; import cn.odboy.core.framework.properties.AppProperties;
import cn.odboy.core.service.*;
import cn.odboy.core.service.system.*; import cn.odboy.core.service.system.*;
import cn.odboy.exception.BadRequestException; import cn.odboy.exception.BadRequestException;
import cn.odboy.util.CsPageUtil; import cn.odboy.util.CsPageUtil;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemDeptTb.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDeptTb.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.dataobject.system; package cn.odboy.core.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb; import cn.odboy.base.CsBaseUserTimeTb;
import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemDictDetailTb.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDictDetailTb.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.dataobject.system; package cn.odboy.core.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb; import cn.odboy.base.CsBaseUserTimeTb;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemDictTb.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDictTb.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.dataobject.system; package cn.odboy.core.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb; import cn.odboy.base.CsBaseUserTimeTb;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemEmailConfigTb.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemEmailConfigTb.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.dataobject.system; package cn.odboy.core.dal.dataobject;
import cn.odboy.base.CsSerializeObject; import cn.odboy.base.CsSerializeObject;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemJobTb.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemJobTb.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.dataobject.system; package cn.odboy.core.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb; import cn.odboy.base.CsBaseUserTimeTb;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemLocalStorageTb.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemLocalStorageTb.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.dataobject.system; package cn.odboy.core.dal.dataobject;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.CopyOptions;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemMenuTb.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemMenuTb.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.dataobject.system; package cn.odboy.core.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb; import cn.odboy.base.CsBaseUserTimeTb;
import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemQiniuConfigTb.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQiniuConfigTb.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.dataobject.system; package cn.odboy.core.dal.dataobject;
import cn.odboy.base.CsSerializeObject; import cn.odboy.base.CsSerializeObject;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemQiniuContentTb.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQiniuContentTb.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.dataobject.system; package cn.odboy.core.dal.dataobject;
import cn.odboy.base.CsSerializeObject; import cn.odboy.base.CsSerializeObject;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemQuartzJobTb.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQuartzJobTb.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.dataobject.system; package cn.odboy.core.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb; import cn.odboy.base.CsBaseUserTimeTb;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemQuartzLogTb.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQuartzLogTb.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.dataobject.system; package cn.odboy.core.dal.dataobject;
import cn.odboy.base.CsSerializeObject; import cn.odboy.base.CsSerializeObject;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemRoleTb.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemRoleTb.java
+2 -2
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.dal.dataobject.system; package cn.odboy.core.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb; import cn.odboy.base.CsBaseUserTimeTb;
import cn.odboy.core.constant.system.SystemDataScopeEnum; import cn.odboy.core.constant.SystemDataScopeEnum;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemUserTb.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemUserTb.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.dataobject.system; package cn.odboy.core.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb; import cn.odboy.base.CsBaseUserTimeTb;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemDeptArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDeptArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import cn.odboy.base.CsSerializeObject; import cn.odboy.base.CsSerializeObject;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemDictArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDictArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import cn.odboy.base.CsSerializeObject; import cn.odboy.base.CsSerializeObject;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemDictDetailArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDictDetailArgs.java
+2 -2
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import cn.odboy.base.CsSerializeObject; import cn.odboy.base.CsSerializeObject;
import cn.odboy.core.dal.dataobject.system.SystemDictTb; import cn.odboy.core.dal.dataobject.SystemDictTb;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemJobArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemJobArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import cn.odboy.base.CsSerializeObject; import cn.odboy.base.CsSerializeObject;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemRoleArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemRoleArgs.java
+2 -2
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import cn.odboy.base.CsSerializeObject; import cn.odboy.base.CsSerializeObject;
import cn.odboy.core.dal.dataobject.system.SystemDeptTb; import cn.odboy.core.dal.dataobject.SystemDeptTb;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemDeptArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDeptArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemDictArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDictArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemDictDetailArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDictDetailArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemJobArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemJobArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemLocalStorageArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemLocalStorageArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemMenuArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemMenuArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemQiniuArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemQiniuArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemQuartzJobArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemQuartzJobArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemRoleArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemRoleArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemUserArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemUserArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import cn.odboy.base.CsSerializeObject; import cn.odboy.base.CsSerializeObject;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SendSystemEmailArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SendSystemEmailArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemMenuMetaVo.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemMenuMetaVo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import cn.odboy.base.CsSerializeObject; import cn.odboy.base.CsSerializeObject;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemMenuVo.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemMenuVo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import cn.odboy.base.CsSerializeObject; import cn.odboy.base.CsSerializeObject;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemRoleCodeVo.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemRoleCodeVo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemSimpleUserVo.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemSimpleUserVo.java
+4 -4
View File
@@ -1,9 +1,9 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import cn.odboy.base.CsSerializeObject; import cn.odboy.base.CsSerializeObject;
import cn.odboy.core.dal.dataobject.system.SystemDeptTb; import cn.odboy.core.dal.dataobject.SystemDeptTb;
import cn.odboy.core.dal.dataobject.system.SystemJobTb; import cn.odboy.core.dal.dataobject.SystemJobTb;
import cn.odboy.core.dal.dataobject.system.SystemRoleTb; import cn.odboy.core.dal.dataobject.SystemRoleTb;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemUserInfoVo.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserInfoVo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import cn.odboy.base.CsSerializeObject; import cn.odboy.base.CsSerializeObject;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemUserJwtVo.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserJwtVo.java
+2 -2
View File
@@ -1,6 +1,6 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import cn.odboy.core.dal.dataobject.system.SystemUserTb; import cn.odboy.core.dal.dataobject.SystemUserTb;
import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemUserLoginArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserLoginArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemUserOnlineVo.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserOnlineVo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/UpdateSystemQuartzJobArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateSystemQuartzJobArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import cn.odboy.base.CsSerializeObject; import cn.odboy.base.CsSerializeObject;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/UpdateSystemUserPasswordArgs.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateSystemUserPasswordArgs.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.model.system; package cn.odboy.core.dal.model;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemDeptMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDeptMapper.java
+3 -3
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemDeptTb; import cn.odboy.core.dal.dataobject.SystemDeptTb;
import cn.odboy.core.dal.model.system.QuerySystemDeptArgs; import cn.odboy.core.dal.model.QuerySystemDeptArgs;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemDictDetailMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDictDetailMapper.java
+3 -3
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemDictDetailTb; import cn.odboy.core.dal.dataobject.SystemDictDetailTb;
import cn.odboy.core.dal.model.system.QuerySystemDictDetailArgs; import cn.odboy.core.dal.model.QuerySystemDictDetailArgs;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemDictMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDictMapper.java
+3 -3
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemDictTb; import cn.odboy.core.dal.dataobject.SystemDictTb;
import cn.odboy.core.dal.model.system.QuerySystemDictArgs; import cn.odboy.core.dal.model.QuerySystemDictArgs;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemEmailConfigMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemEmailConfigMapper.java
+2 -2
View File
@@ -1,6 +1,6 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemEmailConfigTb; import cn.odboy.core.dal.dataobject.SystemEmailConfigTb;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemJobMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemJobMapper.java
+3 -3
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemJobTb; import cn.odboy.core.dal.dataobject.SystemJobTb;
import cn.odboy.core.dal.model.system.QuerySystemJobArgs; import cn.odboy.core.dal.model.QuerySystemJobArgs;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemLocalStorageMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemLocalStorageMapper.java
+3 -3
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemLocalStorageTb; import cn.odboy.core.dal.dataobject.SystemLocalStorageTb;
import cn.odboy.core.dal.model.system.QuerySystemLocalStorageArgs; import cn.odboy.core.dal.model.QuerySystemLocalStorageArgs;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemMenuMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemMenuMapper.java
+3 -3
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemMenuTb; import cn.odboy.core.dal.dataobject.SystemMenuTb;
import cn.odboy.core.dal.model.system.QuerySystemMenuArgs; import cn.odboy.core.dal.model.QuerySystemMenuArgs;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemQiniuConfigMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQiniuConfigMapper.java
+2 -2
View File
@@ -1,6 +1,6 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemQiniuConfigTb; import cn.odboy.core.dal.dataobject.SystemQiniuConfigTb;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemQiniuContentMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQiniuContentMapper.java
+3 -3
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemQiniuContentTb; import cn.odboy.core.dal.dataobject.SystemQiniuContentTb;
import cn.odboy.core.dal.model.system.QuerySystemQiniuArgs; import cn.odboy.core.dal.model.QuerySystemQiniuArgs;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemQuartzJobMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQuartzJobMapper.java
+3 -3
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemQuartzJobTb; import cn.odboy.core.dal.dataobject.SystemQuartzJobTb;
import cn.odboy.core.dal.model.system.QuerySystemQuartzJobArgs; import cn.odboy.core.dal.model.QuerySystemQuartzJobArgs;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemQuartzLogMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQuartzLogMapper.java
+3 -3
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemQuartzLogTb; import cn.odboy.core.dal.dataobject.SystemQuartzLogTb;
import cn.odboy.core.dal.model.system.QuerySystemQuartzJobArgs; import cn.odboy.core.dal.model.QuerySystemQuartzJobArgs;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemRoleDeptMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleDeptMapper.java
+2 -2
View File
@@ -1,6 +1,6 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemDeptTb; import cn.odboy.core.dal.dataobject.SystemDeptTb;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemRoleMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleMapper.java
+3 -3
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemRoleTb; import cn.odboy.core.dal.dataobject.SystemRoleTb;
import cn.odboy.core.dal.model.system.QuerySystemRoleArgs; import cn.odboy.core.dal.model.QuerySystemRoleArgs;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemRoleMenuMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleMenuMapper.java
+2 -2
View File
@@ -1,6 +1,6 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemMenuTb; import cn.odboy.core.dal.dataobject.SystemMenuTb;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemUserJobMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserJobMapper.java
+2 -2
View File
@@ -1,6 +1,6 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemJobTb; import cn.odboy.core.dal.dataobject.SystemJobTb;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemUserMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserMapper.java
+3 -3
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemUserTb; import cn.odboy.core.dal.dataobject.SystemUserTb;
import cn.odboy.core.dal.model.system.QuerySystemUserArgs; import cn.odboy.core.dal.model.QuerySystemUserArgs;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemUserRoleMapper.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserRoleMapper.java
+2 -2
View File
@@ -1,6 +1,6 @@
package cn.odboy.core.dal.mysql.system; package cn.odboy.core.dal.mysql;
import cn.odboy.core.dal.dataobject.system.SystemRoleTb; import cn.odboy.core.dal.dataobject.SystemRoleTb;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemRedisKey.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemRedisKey.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.dal.redis.system; package cn.odboy.core.dal.redis;
/** /**
* 关于缓存的Key集合 * 关于缓存的Key集合
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserInfoDAO.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemUserInfoDAO.java
+2 -2
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.dal.redis.system; package cn.odboy.core.dal.redis;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import cn.odboy.core.dal.model.system.SystemUserJwtVo; import cn.odboy.core.dal.model.SystemUserJwtVo;
import cn.odboy.redis.RedisHelper; import cn.odboy.redis.RedisHelper;
import cn.odboy.util.StringUtil; import cn.odboy.util.StringUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserOnlineInfoDAO.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemUserOnlineInfoDAO.java
+3 -3
View File
@@ -1,8 +1,8 @@
package cn.odboy.core.dal.redis.system; package cn.odboy.core.dal.redis;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.core.dal.model.system.SystemUserJwtVo; import cn.odboy.core.dal.model.SystemUserJwtVo;
import cn.odboy.core.dal.model.system.SystemUserOnlineVo; import cn.odboy.core.dal.model.SystemUserOnlineVo;
import cn.odboy.core.framework.permission.core.handler.TokenProvider; import cn.odboy.core.framework.permission.core.handler.TokenProvider;
import cn.odboy.core.framework.properties.AppProperties; import cn.odboy.core.framework.properties.AppProperties;
import cn.odboy.redis.RedisHelper; import cn.odboy.redis.RedisHelper;
cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/SpringSecurityConfig.java
+1 -1
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.framework.permission.config; package cn.odboy.core.framework.permission.config;
import cn.odboy.constant.RequestMethodEnum; import cn.odboy.constant.RequestMethodEnum;
import cn.odboy.core.dal.redis.system.SystemUserOnlineInfoDAO; import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO;
import cn.odboy.core.framework.permission.core.handler.JwtAccessDeniedHandler; import cn.odboy.core.framework.permission.core.handler.JwtAccessDeniedHandler;
import cn.odboy.core.framework.permission.core.handler.JwtAuthenticationEntryPoint; import cn.odboy.core.framework.permission.core.handler.JwtAuthenticationEntryPoint;
import cn.odboy.core.framework.permission.core.handler.TokenProvider; import cn.odboy.core.framework.permission.core.handler.TokenProvider;
cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/TokenConfigurer.java
+1 -1
View File
@@ -1,6 +1,6 @@
package cn.odboy.core.framework.permission.config; package cn.odboy.core.framework.permission.config;
import cn.odboy.core.dal.redis.system.SystemUserOnlineInfoDAO; import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO;
import cn.odboy.core.framework.permission.core.handler.TokenFilter; import cn.odboy.core.framework.permission.core.handler.TokenFilter;
import cn.odboy.core.framework.permission.core.handler.TokenProvider; import cn.odboy.core.framework.permission.core.handler.TokenProvider;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/SecurityHelper.java
+1 -1
View File
@@ -5,7 +5,7 @@ import cn.hutool.jwt.JWT;
import cn.hutool.jwt.JWTUtil; import cn.hutool.jwt.JWTUtil;
import cn.odboy.constant.SystemConst; import cn.odboy.constant.SystemConst;
import cn.odboy.context.SpringBeanHolder; import cn.odboy.context.SpringBeanHolder;
import cn.odboy.core.constant.system.SystemDataScopeEnum; import cn.odboy.core.constant.SystemDataScopeEnum;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenFilter.java
+2 -2
View File
@@ -2,8 +2,8 @@ package cn.odboy.core.framework.permission.core.handler;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.odboy.constant.SystemConst; import cn.odboy.constant.SystemConst;
import cn.odboy.core.dal.model.system.SystemUserOnlineVo; import cn.odboy.core.dal.model.SystemUserOnlineVo;
import cn.odboy.core.dal.redis.system.SystemUserOnlineInfoDAO; import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenProvider.java
+2 -2
View File
@@ -4,8 +4,8 @@ import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.odboy.constant.SystemConst; import cn.odboy.constant.SystemConst;
import cn.odboy.core.dal.model.system.SystemUserJwtVo; import cn.odboy.core.dal.model.SystemUserJwtVo;
import cn.odboy.core.dal.redis.system.SystemRedisKey; import cn.odboy.core.dal.redis.SystemRedisKey;
import cn.odboy.core.framework.properties.AppProperties; import cn.odboy.core.framework.properties.AppProperties;
import cn.odboy.redis.RedisHelper; import cn.odboy.redis.RedisHelper;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/UserDetailsHandler.java
+7 -7
View File
@@ -1,12 +1,12 @@
package cn.odboy.core.framework.permission.core.handler; package cn.odboy.core.framework.permission.core.handler;
import cn.odboy.core.dal.dataobject.system.SystemUserTb; import cn.odboy.core.dal.dataobject.SystemUserTb;
import cn.odboy.core.dal.model.system.SystemRoleCodeVo; import cn.odboy.core.dal.model.SystemRoleCodeVo;
import cn.odboy.core.dal.model.system.SystemUserJwtVo; import cn.odboy.core.dal.model.SystemUserJwtVo;
import cn.odboy.core.dal.redis.system.SystemUserInfoDAO; import cn.odboy.core.dal.redis.SystemUserInfoDAO;
import cn.odboy.core.service.system.SystemDataService; import cn.odboy.core.service.SystemDataService;
import cn.odboy.core.service.system.SystemRoleService; import cn.odboy.core.service.SystemRoleService;
import cn.odboy.core.service.system.SystemUserService; import cn.odboy.core.service.SystemUserService;
import cn.odboy.exception.BadRequestException; import cn.odboy.exception.BadRequestException;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/UserLoginCaptchaSettingModel.java
+2 -2
View File
@@ -1,6 +1,6 @@
package cn.odboy.core.framework.properties.model; package cn.odboy.core.framework.properties.model;
import cn.odboy.core.constant.LoginCodeEnum; import cn.odboy.core.constant.CaptchaCodeEnum;
import cn.odboy.exception.BadRequestException; import cn.odboy.exception.BadRequestException;
import cn.odboy.util.StringUtil; import cn.odboy.util.StringUtil;
import com.wf.captcha.*; import com.wf.captcha.*;
@@ -18,7 +18,7 @@ import java.awt.*;
@Getter @Getter
@Setter @Setter
public class UserLoginCaptchaSettingModel { public class UserLoginCaptchaSettingModel {
private LoginCodeEnum codeType; private CaptchaCodeEnum codeType;
/** /**
* 验证码有效期 分钟 * 验证码有效期 分钟
cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/ExecutionJobBean.java
+7 -7
View File
@@ -6,12 +6,12 @@ import cn.hutool.extra.template.TemplateConfig;
import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateEngine;
import cn.hutool.extra.template.TemplateUtil; import cn.hutool.extra.template.TemplateUtil;
import cn.odboy.context.SpringBeanHolder; import cn.odboy.context.SpringBeanHolder;
import cn.odboy.core.dal.dataobject.system.SystemQuartzJobTb; import cn.odboy.core.dal.dataobject.SystemQuartzJobTb;
import cn.odboy.core.dal.dataobject.system.SystemQuartzLogTb; import cn.odboy.core.dal.dataobject.SystemQuartzLogTb;
import cn.odboy.core.dal.model.system.SendSystemEmailArgs; import cn.odboy.core.dal.model.SendSystemEmailArgs;
import cn.odboy.core.dal.mysql.system.SystemQuartzLogMapper; import cn.odboy.core.dal.mysql.SystemQuartzLogMapper;
import cn.odboy.core.service.system.SystemEmailService; import cn.odboy.core.service.SystemEmailService;
import cn.odboy.core.service.system.SystemQuartzJobService; import cn.odboy.core.service.SystemQuartzJobService;
import cn.odboy.redis.RedisHelper; import cn.odboy.redis.RedisHelper;
import cn.odboy.util.StringUtil; import cn.odboy.util.StringUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -106,7 +106,7 @@ public class ExecutionJobBean extends QuartzJobBean {
data.put("task", quartzJob); data.put("task", quartzJob);
data.put("msg", msg); data.put("msg", msg);
TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH)); TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH));
Template template = engine.getTemplate("taskAlarm.ftl"); Template template = engine.getTemplate("SystemQuartzJobTaskAlarmTemplate.ftl");
sendEmailRequest.setContent(template.render(data)); sendEmailRequest.setContent(template.render(data));
List<String> emails = Arrays.asList(quartzJob.getEmail().split("[,，]")); List<String> emails = Arrays.asList(quartzJob.getEmail().split("[,，]"));
sendEmailRequest.setTos(emails); sendEmailRequest.setTos(emails);
cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/InitialActiveJobApplicationRunner.java
+2 -2
View File
@@ -1,7 +1,7 @@
package cn.odboy.core.framework.quartz.core; package cn.odboy.core.framework.quartz.core;
import cn.odboy.core.dal.dataobject.system.SystemQuartzJobTb; import cn.odboy.core.dal.dataobject.SystemQuartzJobTb;
import cn.odboy.core.dal.mysql.system.SystemQuartzJobMapper; import cn.odboy.core.dal.mysql.SystemQuartzJobMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationArguments;
cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/QuartzManage.java
+1 -1
View File
@@ -1,6 +1,6 @@
package cn.odboy.core.framework.quartz.core; package cn.odboy.core.framework.quartz.core;
import cn.odboy.core.dal.dataobject.system.SystemQuartzJobTb; import cn.odboy.core.dal.dataobject.SystemQuartzJobTb;
import cn.odboy.exception.BadRequestException; import cn.odboy.exception.BadRequestException;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.quartz.*; import org.quartz.*;
cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDataService.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDataService.java
+5 -5
View File
@@ -1,10 +1,10 @@
package cn.odboy.core.service.system; package cn.odboy.core.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.odboy.core.constant.system.SystemDataScopeEnum; import cn.odboy.core.constant.SystemDataScopeEnum;
import cn.odboy.core.dal.dataobject.system.SystemDeptTb; import cn.odboy.core.dal.dataobject.SystemDeptTb;
import cn.odboy.core.dal.dataobject.system.SystemRoleTb; import cn.odboy.core.dal.dataobject.SystemRoleTb;
import cn.odboy.core.dal.dataobject.system.SystemUserTb; import cn.odboy.core.dal.dataobject.SystemUserTb;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDeptService.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDeptService.java
+8 -8
View File
@@ -1,17 +1,17 @@
package cn.odboy.core.service.system; package cn.odboy.core.service;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.core.constant.system.SystemDataScopeEnum; import cn.odboy.core.constant.SystemDataScopeEnum;
import cn.odboy.core.dal.dataobject.system.SystemDeptTb; import cn.odboy.core.dal.dataobject.SystemDeptTb;
import cn.odboy.core.dal.model.system.CreateSystemDeptArgs; import cn.odboy.core.dal.model.CreateSystemDeptArgs;
import cn.odboy.core.dal.model.system.QuerySystemDeptArgs; import cn.odboy.core.dal.model.QuerySystemDeptArgs;
import cn.odboy.core.dal.mysql.system.SystemDeptMapper; import cn.odboy.core.dal.mysql.SystemDeptMapper;
import cn.odboy.core.dal.mysql.system.SystemRoleMapper; import cn.odboy.core.dal.mysql.SystemRoleMapper;
import cn.odboy.core.dal.mysql.system.SystemUserMapper; import cn.odboy.core.dal.mysql.SystemUserMapper;
import cn.odboy.core.framework.permission.core.SecurityHelper; import cn.odboy.core.framework.permission.core.SecurityHelper;
import cn.odboy.exception.BadRequestException; import cn.odboy.exception.BadRequestException;
import cn.odboy.util.ClassUtil; import cn.odboy.util.ClassUtil;
cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictDetailService.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDictDetailService.java
+5 -5
View File
@@ -1,11 +1,11 @@
package cn.odboy.core.service.system; package cn.odboy.core.service;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.core.dal.dataobject.system.SystemDictDetailTb; import cn.odboy.core.dal.dataobject.SystemDictDetailTb;
import cn.odboy.core.dal.model.system.CreateSystemDictDetailArgs; import cn.odboy.core.dal.model.CreateSystemDictDetailArgs;
import cn.odboy.core.dal.model.system.QuerySystemDictDetailArgs; import cn.odboy.core.dal.model.QuerySystemDictDetailArgs;
import cn.odboy.core.dal.mysql.system.SystemDictDetailMapper; import cn.odboy.core.dal.mysql.SystemDictDetailMapper;
import cn.odboy.util.CsPageUtil; import cn.odboy.util.CsPageUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictService.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDictService.java
+8 -8
View File
@@ -1,15 +1,15 @@
package cn.odboy.core.service.system; package cn.odboy.core.service;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.core.dal.dataobject.system.SystemDictDetailTb; import cn.odboy.core.dal.dataobject.SystemDictDetailTb;
import cn.odboy.core.dal.dataobject.system.SystemDictTb; import cn.odboy.core.dal.dataobject.SystemDictTb;
import cn.odboy.core.dal.model.system.CreateSystemDictArgs; import cn.odboy.core.dal.model.CreateSystemDictArgs;
import cn.odboy.core.dal.model.system.QuerySystemDictArgs; import cn.odboy.core.dal.model.QuerySystemDictArgs;
import cn.odboy.core.dal.model.system.QuerySystemDictDetailArgs; import cn.odboy.core.dal.model.QuerySystemDictDetailArgs;
import cn.odboy.core.dal.mysql.system.SystemDictDetailMapper; import cn.odboy.core.dal.mysql.SystemDictDetailMapper;
import cn.odboy.core.dal.mysql.system.SystemDictMapper; import cn.odboy.core.dal.mysql.SystemDictMapper;
import cn.odboy.util.CsPageUtil; import cn.odboy.util.CsPageUtil;
import cn.odboy.util.FileUtil; import cn.odboy.util.FileUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemEmailService.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemEmailService.java
+5 -5
View File
@@ -1,13 +1,13 @@
package cn.odboy.core.service.system; package cn.odboy.core.service;
import cn.hutool.core.lang.Dict; import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import cn.hutool.extra.mail.Mail; import cn.hutool.extra.mail.Mail;
import cn.hutool.extra.mail.MailAccount; import cn.hutool.extra.mail.MailAccount;
import cn.odboy.core.constant.system.SystemCaptchaBizEnum; import cn.odboy.core.constant.SystemCaptchaBizEnum;
import cn.odboy.core.dal.dataobject.system.SystemEmailConfigTb; import cn.odboy.core.dal.dataobject.SystemEmailConfigTb;
import cn.odboy.core.dal.model.system.SendSystemEmailArgs; import cn.odboy.core.dal.model.SendSystemEmailArgs;
import cn.odboy.core.dal.mysql.system.SystemEmailConfigMapper; import cn.odboy.core.dal.mysql.SystemEmailConfigMapper;
import cn.odboy.core.framework.templatefile.CsResourceTemplateUtil; import cn.odboy.core.framework.templatefile.CsResourceTemplateUtil;
import cn.odboy.exception.BadRequestException; import cn.odboy.exception.BadRequestException;
import cn.odboy.redis.RedisHelper; import cn.odboy.redis.RedisHelper;
cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemJobService.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemJobService.java
+6 -6
View File
@@ -1,12 +1,12 @@
package cn.odboy.core.service.system; package cn.odboy.core.service;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.core.dal.dataobject.system.SystemJobTb; import cn.odboy.core.dal.dataobject.SystemJobTb;
import cn.odboy.core.dal.model.system.CreateSystemJobArgs; import cn.odboy.core.dal.model.CreateSystemJobArgs;
import cn.odboy.core.dal.model.system.QuerySystemJobArgs; import cn.odboy.core.dal.model.QuerySystemJobArgs;
import cn.odboy.core.dal.mysql.system.SystemJobMapper; import cn.odboy.core.dal.mysql.SystemJobMapper;
import cn.odboy.core.dal.mysql.system.SystemUserMapper; import cn.odboy.core.dal.mysql.SystemUserMapper;
import cn.odboy.exception.BadRequestException; import cn.odboy.exception.BadRequestException;
import cn.odboy.util.CsPageUtil; import cn.odboy.util.CsPageUtil;
import cn.odboy.util.FileUtil; import cn.odboy.util.FileUtil;
cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemLocalStorageService.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemLocalStorageService.java
+4 -4
View File
@@ -1,10 +1,10 @@
package cn.odboy.core.service.system; package cn.odboy.core.service;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.core.dal.dataobject.system.SystemLocalStorageTb; import cn.odboy.core.dal.dataobject.SystemLocalStorageTb;
import cn.odboy.core.dal.model.system.QuerySystemLocalStorageArgs; import cn.odboy.core.dal.model.QuerySystemLocalStorageArgs;
import cn.odboy.core.dal.mysql.system.SystemLocalStorageMapper; import cn.odboy.core.dal.mysql.SystemLocalStorageMapper;
import cn.odboy.core.framework.properties.AppProperties; import cn.odboy.core.framework.properties.AppProperties;
import cn.odboy.exception.BadRequestException; import cn.odboy.exception.BadRequestException;
import cn.odboy.util.CsPageUtil; import cn.odboy.util.CsPageUtil;
cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMenuService.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemMenuService.java
+8 -9
View File
@@ -1,17 +1,16 @@
package cn.odboy.core.service.system; package cn.odboy.core.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.odboy.core.constant.TransferProtocolConst; import cn.odboy.core.constant.TransferProtocolConst;
import cn.odboy.core.dal.dataobject.system.SystemMenuTb; import cn.odboy.core.dal.dataobject.SystemMenuTb;
import cn.odboy.core.dal.dataobject.system.SystemRoleTb; import cn.odboy.core.dal.dataobject.SystemRoleTb;
import cn.odboy.core.dal.model.system.QuerySystemMenuArgs; import cn.odboy.core.dal.model.QuerySystemMenuArgs;
import cn.odboy.core.dal.model.system.SystemMenuMetaVo; import cn.odboy.core.dal.model.SystemMenuMetaVo;
import cn.odboy.core.dal.model.system.SystemMenuVo; import cn.odboy.core.dal.model.SystemMenuVo;
import cn.odboy.core.dal.mysql.system.SystemMenuMapper; import cn.odboy.core.dal.mysql.SystemMenuMapper;
import cn.odboy.core.dal.mysql.system.SystemRoleMenuMapper; import cn.odboy.core.dal.mysql.SystemRoleMenuMapper;
import cn.odboy.core.dal.mysql.system.SystemUserMapper;
import cn.odboy.exception.BadRequestException; import cn.odboy.exception.BadRequestException;
import cn.odboy.util.ClassUtil; import cn.odboy.util.ClassUtil;
import cn.odboy.util.FileUtil; import cn.odboy.util.FileUtil;
cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMonitorService.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemMonitorService.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cn.odboy.core.service.system; package cn.odboy.core.service;
import cn.hutool.core.date.BetweenFormatter.Level; import cn.hutool.core.date.BetweenFormatter.Level;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuConfigService.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQiniuConfigService.java
+3 -3
View File
@@ -1,8 +1,8 @@
package cn.odboy.core.service.system; package cn.odboy.core.service;
import cn.odboy.core.constant.TransferProtocolConst; import cn.odboy.core.constant.TransferProtocolConst;
import cn.odboy.core.dal.dataobject.system.SystemQiniuConfigTb; import cn.odboy.core.dal.dataobject.SystemQiniuConfigTb;
import cn.odboy.core.dal.mysql.system.SystemQiniuConfigMapper; import cn.odboy.core.dal.mysql.SystemQiniuConfigMapper;
import cn.odboy.exception.BadRequestException; import cn.odboy.exception.BadRequestException;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuContentService.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQiniuContentService.java
+5 -5
View File
@@ -1,10 +1,10 @@
package cn.odboy.core.service.system; package cn.odboy.core.service;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.core.dal.dataobject.system.SystemQiniuConfigTb; import cn.odboy.core.dal.dataobject.SystemQiniuConfigTb;
import cn.odboy.core.dal.dataobject.system.SystemQiniuContentTb; import cn.odboy.core.dal.dataobject.SystemQiniuContentTb;
import cn.odboy.core.dal.model.system.QuerySystemQiniuArgs; import cn.odboy.core.dal.model.QuerySystemQiniuArgs;
import cn.odboy.core.dal.mysql.system.SystemQiniuContentMapper; import cn.odboy.core.dal.mysql.SystemQiniuContentMapper;
import cn.odboy.core.util.QiniuUtil; import cn.odboy.core.util.QiniuUtil;
import cn.odboy.exception.BadRequestException; import cn.odboy.exception.BadRequestException;
import cn.odboy.util.CsPageUtil; import cn.odboy.util.CsPageUtil;
cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQuartzJobService.java → cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQuartzJobService.java
+7 -7
View File
@@ -1,15 +1,15 @@
package cn.odboy.core.service.system; package cn.odboy.core.service;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.odboy.base.CsResultVo; import cn.odboy.base.CsResultVo;
import cn.odboy.core.dal.dataobject.system.SystemQuartzJobTb; import cn.odboy.core.dal.dataobject.SystemQuartzJobTb;
import cn.odboy.core.dal.dataobject.system.SystemQuartzLogTb; import cn.odboy.core.dal.dataobject.SystemQuartzLogTb;
import cn.odboy.core.dal.model.system.QuerySystemQuartzJobArgs; import cn.odboy.core.dal.model.QuerySystemQuartzJobArgs;
import cn.odboy.core.dal.model.system.UpdateSystemQuartzJobArgs; import cn.odboy.core.dal.model.UpdateSystemQuartzJobArgs;
import cn.odboy.core.dal.mysql.system.SystemQuartzJobMapper; import cn.odboy.core.dal.mysql.SystemQuartzJobMapper;
import cn.odboy.core.dal.mysql.system.SystemQuartzLogMapper; import cn.odboy.core.dal.mysql.SystemQuartzLogMapper;
import cn.odboy.core.framework.quartz.core.QuartzManage; import cn.odboy.core.framework.quartz.core.QuartzManage;
import cn.odboy.exception.BadRequestException; import cn.odboy.exception.BadRequestException;
import cn.odboy.redis.RedisHelper; import cn.odboy.redis.RedisHelper;

Some files were not shown because too many files have changed in this diff Show More