@@ -39,7 +39,7 @@
8.5.10
- 4.8.1
+ 4.12.0
3.16.3
@@ -47,7 +47,7 @@
4.1.0
- 3.5.6
+ 3.5.15
2.3
@@ -57,7 +57,7 @@
4.7.6
2.2.1
- 2.9.3
+ 3.2.0
2.14.5
diff --git a/src/main/java/com/youlai/boot/auth/controller/AuthController.java b/src/main/java/com/youlai/boot/auth/controller/AuthController.java
index f3884f0e..64977a50 100644
--- a/src/main/java/com/youlai/boot/auth/controller/AuthController.java
+++ b/src/main/java/com/youlai/boot/auth/controller/AuthController.java
@@ -5,8 +5,8 @@ import com.youlai.boot.common.enums.ActionTypeEnum;
import com.youlai.boot.common.enums.LogModuleEnum;
import com.youlai.boot.common.result.Result;
import com.youlai.boot.auth.service.AuthService;
-import com.youlai.boot.common.annotation.Log;
-import com.youlai.boot.common.annotation.RateLimit;
+import com.youlai.boot.framework.annotation.Log;
+import com.youlai.boot.framework.annotation.RateLimit;
import com.youlai.boot.framework.captcha.model.CaptchaInfo;
import com.youlai.boot.framework.security.model.AuthenticationToken;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/src/main/java/com/youlai/boot/auth/controller/WxMaAuthController.java b/src/main/java/com/youlai/boot/auth/controller/WxMaAuthController.java
index 760295fe..44e5ab9b 100644
--- a/src/main/java/com/youlai/boot/auth/controller/WxMaAuthController.java
+++ b/src/main/java/com/youlai/boot/auth/controller/WxMaAuthController.java
@@ -4,8 +4,8 @@ import com.youlai.boot.auth.model.form.WxMaBindMobileForm;
import com.youlai.boot.auth.model.form.WxMaPhoneLoginForm;
import com.youlai.boot.auth.model.vo.WxMaLoginVO;
import com.youlai.boot.auth.service.WxMaAuthService;
-import com.youlai.boot.common.annotation.Log;
-import com.youlai.boot.common.annotation.RateLimit;
+import com.youlai.boot.framework.annotation.Log;
+import com.youlai.boot.framework.annotation.RateLimit;
import com.youlai.boot.common.enums.ActionTypeEnum;
import com.youlai.boot.common.enums.LogModuleEnum;
import com.youlai.boot.common.result.Result;
diff --git a/src/main/java/com/youlai/boot/auth/qrcode/controller/QrCodeLoginController.java b/src/main/java/com/youlai/boot/auth/qrcode/controller/QrCodeLoginController.java
index 58570bca..22765993 100644
--- a/src/main/java/com/youlai/boot/auth/qrcode/controller/QrCodeLoginController.java
+++ b/src/main/java/com/youlai/boot/auth/qrcode/controller/QrCodeLoginController.java
@@ -5,7 +5,7 @@ import com.youlai.boot.auth.qrcode.model.form.QrCodeTicketForm;
import com.youlai.boot.auth.qrcode.model.vo.QrCodeGenerateVO;
import com.youlai.boot.auth.qrcode.model.vo.QrCodeStatusVO;
import com.youlai.boot.auth.qrcode.service.QrCodeLoginService;
-import com.youlai.boot.common.annotation.RateLimit;
+import com.youlai.boot.framework.annotation.RateLimit;
import com.youlai.boot.common.result.Result;
import com.youlai.boot.framework.security.model.AuthenticationToken;
import com.youlai.boot.framework.security.util.SecurityUtils;
diff --git a/src/main/java/com/youlai/boot/codegen/controller/CodegenController.java b/src/main/java/com/youlai/boot/codegen/controller/CodegenController.java
index 7e589f1a..e9746d53 100644
--- a/src/main/java/com/youlai/boot/codegen/controller/CodegenController.java
+++ b/src/main/java/com/youlai/boot/codegen/controller/CodegenController.java
@@ -11,7 +11,7 @@ import com.youlai.boot.codegen.model.form.GenConfigForm;
import com.youlai.boot.codegen.model.query.TableQuery;
import com.youlai.boot.codegen.model.vo.CodegenPreviewVO;
import com.youlai.boot.codegen.model.vo.TablePageVO;
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.framework.annotation.Log;
import com.youlai.boot.codegen.service.GenTableService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
diff --git a/src/main/java/com/youlai/boot/codegen/model/entity/GenTable.java b/src/main/java/com/youlai/boot/codegen/model/entity/GenTable.java
index 51f5f289..188bbd26 100644
--- a/src/main/java/com/youlai/boot/codegen/model/entity/GenTable.java
+++ b/src/main/java/com/youlai/boot/codegen/model/entity/GenTable.java
@@ -2,7 +2,7 @@ package com.youlai.boot.codegen.model.entity;
import com.baomidou.mybatisplus.annotation.*;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
import lombok.Getter;
import lombok.Setter;
diff --git a/src/main/java/com/youlai/boot/codegen/model/entity/GenTableColumn.java b/src/main/java/com/youlai/boot/codegen/model/entity/GenTableColumn.java
index a2640747..fdebd6d4 100644
--- a/src/main/java/com/youlai/boot/codegen/model/entity/GenTableColumn.java
+++ b/src/main/java/com/youlai/boot/codegen/model/entity/GenTableColumn.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
import com.youlai.boot.codegen.enums.FormTypeEnum;
import com.youlai.boot.codegen.enums.QueryTypeEnum;
import lombok.Getter;
diff --git a/src/main/java/com/youlai/boot/common/base/BaseQuery.java b/src/main/java/com/youlai/boot/common/base/BaseQuery.java
index 7548937d..40b6a78e 100644
--- a/src/main/java/com/youlai/boot/common/base/BaseQuery.java
+++ b/src/main/java/com/youlai/boot/common/base/BaseQuery.java
@@ -1,6 +1,6 @@
package com.youlai.boot.common.base;
-import com.youlai.boot.common.annotation.ValidField;
+import com.youlai.boot.framework.annotation.ValidField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/src/main/java/com/youlai/boot/common/validator/FieldValidator.java b/src/main/java/com/youlai/boot/common/validator/FieldValidator.java
index 200e67c8..9659627f 100644
--- a/src/main/java/com/youlai/boot/common/validator/FieldValidator.java
+++ b/src/main/java/com/youlai/boot/common/validator/FieldValidator.java
@@ -1,6 +1,6 @@
package com.youlai.boot.common.validator;
-import com.youlai.boot.common.annotation.ValidField;
+import com.youlai.boot.framework.annotation.ValidField;
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
diff --git a/src/main/java/com/youlai/boot/common/annotation/DataPermission.java b/src/main/java/com/youlai/boot/framework/annotation/DataPermission.java
similarity index 91%
rename from src/main/java/com/youlai/boot/common/annotation/DataPermission.java
rename to src/main/java/com/youlai/boot/framework/annotation/DataPermission.java
index f63832c8..d3fd0b4c 100644
--- a/src/main/java/com/youlai/boot/common/annotation/DataPermission.java
+++ b/src/main/java/com/youlai/boot/framework/annotation/DataPermission.java
@@ -1,4 +1,4 @@
-package com.youlai.boot.common.annotation;
+package com.youlai.boot.framework.annotation;
import java.lang.annotation.*;
@@ -25,4 +25,3 @@ public @interface DataPermission {
String userIdColumnName() default "create_by";
}
-
diff --git a/src/main/java/com/youlai/boot/common/annotation/Log.java b/src/main/java/com/youlai/boot/framework/annotation/Log.java
similarity index 95%
rename from src/main/java/com/youlai/boot/common/annotation/Log.java
rename to src/main/java/com/youlai/boot/framework/annotation/Log.java
index c02d5608..16e9ec06 100644
--- a/src/main/java/com/youlai/boot/common/annotation/Log.java
+++ b/src/main/java/com/youlai/boot/framework/annotation/Log.java
@@ -1,4 +1,4 @@
-package com.youlai.boot.common.annotation;
+package com.youlai.boot.framework.annotation;
import com.youlai.boot.common.enums.ActionTypeEnum;
import com.youlai.boot.common.enums.LogModuleEnum;
diff --git a/src/main/java/com/youlai/boot/common/annotation/RateLimit.java b/src/main/java/com/youlai/boot/framework/annotation/RateLimit.java
similarity index 93%
rename from src/main/java/com/youlai/boot/common/annotation/RateLimit.java
rename to src/main/java/com/youlai/boot/framework/annotation/RateLimit.java
index e7e73424..1605d977 100644
--- a/src/main/java/com/youlai/boot/common/annotation/RateLimit.java
+++ b/src/main/java/com/youlai/boot/framework/annotation/RateLimit.java
@@ -1,4 +1,4 @@
-package com.youlai.boot.common.annotation;
+package com.youlai.boot.framework.annotation;
import java.lang.annotation.*;
diff --git a/src/main/java/com/youlai/boot/common/annotation/RepeatSubmit.java b/src/main/java/com/youlai/boot/framework/annotation/RepeatSubmit.java
similarity index 90%
rename from src/main/java/com/youlai/boot/common/annotation/RepeatSubmit.java
rename to src/main/java/com/youlai/boot/framework/annotation/RepeatSubmit.java
index 053f1320..f489a982 100644
--- a/src/main/java/com/youlai/boot/common/annotation/RepeatSubmit.java
+++ b/src/main/java/com/youlai/boot/framework/annotation/RepeatSubmit.java
@@ -1,4 +1,4 @@
-package com.youlai.boot.common.annotation;
+package com.youlai.boot.framework.annotation;
import java.lang.annotation.*;
diff --git a/src/main/java/com/youlai/boot/common/annotation/ValidField.java b/src/main/java/com/youlai/boot/framework/annotation/ValidField.java
similarity index 93%
rename from src/main/java/com/youlai/boot/common/annotation/ValidField.java
rename to src/main/java/com/youlai/boot/framework/annotation/ValidField.java
index 559b06e1..b7be969d 100644
--- a/src/main/java/com/youlai/boot/common/annotation/ValidField.java
+++ b/src/main/java/com/youlai/boot/framework/annotation/ValidField.java
@@ -1,4 +1,4 @@
-package com.youlai.boot.common.annotation;
+package com.youlai.boot.framework.annotation;
import com.youlai.boot.common.validator.FieldValidator;
import jakarta.validation.Constraint;
diff --git a/src/main/java/com/youlai/boot/common/base/BaseEntity.java b/src/main/java/com/youlai/boot/framework/base/BaseEntity.java
similarity index 76%
rename from src/main/java/com/youlai/boot/common/base/BaseEntity.java
rename to src/main/java/com/youlai/boot/framework/base/BaseEntity.java
index 70cd1a92..7b3fb9b5 100644
--- a/src/main/java/com/youlai/boot/common/base/BaseEntity.java
+++ b/src/main/java/com/youlai/boot/framework/base/BaseEntity.java
@@ -1,12 +1,11 @@
-package com.youlai.boot.common.base;
+package com.youlai.boot.framework.base;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonInclude;
import java.io.Serial;
import java.io.Serializable;
@@ -15,7 +14,8 @@ import java.time.LocalDateTime;
/**
* 基础实体类
*
- * 实体类的基类，包含了实体类的公共属性，如创建时间、更新时间、逻辑删除标识等
+ * 包含主键和创建/更新时间，适用于所有实体（含关联表）
+ * 审计字段（createBy/updateBy）和逻辑删除字段（isDeleted）由需要的实体自行声明
*
* @author Ray.Hao
* @since 4.3.1
@@ -37,7 +37,6 @@ public class BaseEntity implements Serializable {
*/
@TableField(fill = FieldFill.INSERT)
@JsonInclude(value = JsonInclude.Include.NON_NULL)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
@@ -45,7 +44,6 @@ public class BaseEntity implements Serializable {
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonInclude(value = JsonInclude.Include.NON_NULL)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
}
diff --git a/src/main/java/com/youlai/boot/framework/mybatis/exception/DataPermissionException.java b/src/main/java/com/youlai/boot/framework/mybatis/exception/DataPermissionException.java
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/main/java/com/youlai/boot/framework/mybatis/handler/AutoFillMetaObjectHandler.java b/src/main/java/com/youlai/boot/framework/mybatis/handler/AutoFillMetaObjectHandler.java
index f5e9d893..80d260e6 100644
--- a/src/main/java/com/youlai/boot/framework/mybatis/handler/AutoFillMetaObjectHandler.java
+++ b/src/main/java/com/youlai/boot/framework/mybatis/handler/AutoFillMetaObjectHandler.java
@@ -1,6 +1,7 @@
package com.youlai.boot.framework.mybatis.handler;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.youlai.boot.framework.security.util.SecurityUtils;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;
@@ -9,6 +10,9 @@ import java.time.LocalDateTime;
/**
* MyBatis-Plus 字段自动填充
*
+ * 自动填充 createTime/updateTime（时间戳）和 createBy/updateBy（操作人ID）
+ * 实体字段需标注 {@code @TableField(fill = FieldFill.INSERT)} 或 {@code FieldFill.INSERT_UPDATE} 才会触发
+ *
* @author Ray.Hao
* @since 3.0.0
*/
@@ -18,11 +22,14 @@ public class AutoFillMetaObjectHandler implements MetaObjectHandler {
@Override
public void insertFill(MetaObject metaObject) {
this.strictInsertFill(metaObject, "createTime", LocalDateTime::now, LocalDateTime.class);
+ this.strictInsertFill(metaObject, "createBy", SecurityUtils::getUserId, Long.class);
this.strictUpdateFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class);
+ this.strictUpdateFill(metaObject, "updateBy", SecurityUtils::getUserId, Long.class);
}
@Override
public void updateFill(MetaObject metaObject) {
this.strictUpdateFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class);
+ this.strictUpdateFill(metaObject, "updateBy", SecurityUtils::getUserId, Long.class);
}
}
diff --git a/src/main/java/com/youlai/boot/framework/mybatis/interceptor/MyDataPermissionHandler.java b/src/main/java/com/youlai/boot/framework/mybatis/interceptor/MyDataPermissionHandler.java
index bc2a48b9..74d6ad33 100644
--- a/src/main/java/com/youlai/boot/framework/mybatis/interceptor/MyDataPermissionHandler.java
+++ b/src/main/java/com/youlai/boot/framework/mybatis/interceptor/MyDataPermissionHandler.java
@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
-import com.youlai.boot.common.annotation.DataPermission;
+import com.youlai.boot.framework.annotation.DataPermission;
import com.youlai.boot.common.enums.DataScopeEnum;
import com.youlai.boot.framework.security.model.RoleDataScope;
import com.youlai.boot.framework.security.model.SecurityUserDetails;
diff --git a/src/main/java/com/youlai/boot/framework/web/aspect/LogAspect.java b/src/main/java/com/youlai/boot/framework/web/aspect/LogAspect.java
index 6642a503..00093330 100644
--- a/src/main/java/com/youlai/boot/framework/web/aspect/LogAspect.java
+++ b/src/main/java/com/youlai/boot/framework/web/aspect/LogAspect.java
@@ -3,7 +3,7 @@ package com.youlai.boot.framework.web.aspect;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil;
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.framework.annotation.Log;
import com.youlai.boot.common.enums.ActionTypeEnum;
import com.youlai.boot.common.enums.LogModuleEnum;
import com.youlai.boot.common.util.IPUtils;
diff --git a/src/main/java/com/youlai/boot/framework/web/aspect/RateLimitAspect.java b/src/main/java/com/youlai/boot/framework/web/aspect/RateLimitAspect.java
index 31639b96..a58fe6e2 100644
--- a/src/main/java/com/youlai/boot/framework/web/aspect/RateLimitAspect.java
+++ b/src/main/java/com/youlai/boot/framework/web/aspect/RateLimitAspect.java
@@ -2,7 +2,7 @@ package com.youlai.boot.framework.web.aspect;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.digest.DigestUtil;
-import com.youlai.boot.common.annotation.RateLimit;
+import com.youlai.boot.framework.annotation.RateLimit;
import com.youlai.boot.common.constant.RedisConstants;
import com.youlai.boot.common.constant.SecurityConstants;
import com.youlai.boot.common.result.ResultCode;
diff --git a/src/main/java/com/youlai/boot/framework/web/aspect/RepeatSubmitAspect.java b/src/main/java/com/youlai/boot/framework/web/aspect/RepeatSubmitAspect.java
index 78eaf1ff..dbea1303 100644
--- a/src/main/java/com/youlai/boot/framework/web/aspect/RepeatSubmitAspect.java
+++ b/src/main/java/com/youlai/boot/framework/web/aspect/RepeatSubmitAspect.java
@@ -7,7 +7,7 @@ import com.youlai.boot.common.constant.RedisConstants;
import com.youlai.boot.common.constant.SecurityConstants;
import com.youlai.boot.common.result.ResultCode;
import com.youlai.boot.common.exception.BusinessException;
-import com.youlai.boot.common.annotation.RepeatSubmit;
+import com.youlai.boot.framework.annotation.RepeatSubmit;
import com.youlai.boot.common.util.IPUtils;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/youlai/boot/message/event/DictChangeEvent.java b/src/main/java/com/youlai/boot/message/event/DictChangeEvent.java
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/main/java/com/youlai/boot/system/controller/ConfigController.java b/src/main/java/com/youlai/boot/system/controller/ConfigController.java
index e68280a8..d4559240 100644
--- a/src/main/java/com/youlai/boot/system/controller/ConfigController.java
+++ b/src/main/java/com/youlai/boot/system/controller/ConfigController.java
@@ -5,7 +5,7 @@ import com.youlai.boot.common.enums.ActionTypeEnum;
import com.youlai.boot.common.enums.LogModuleEnum;
import com.youlai.boot.common.result.PageResult;
import com.youlai.boot.common.result.Result;
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.framework.annotation.Log;
import com.youlai.boot.system.model.form.ConfigForm;
import com.youlai.boot.system.model.query.ConfigQuery;
import com.youlai.boot.system.model.vo.ConfigVO;
@@ -53,11 +53,11 @@ public class ConfigController {
}
@Operation(summary = "获取系统配置表单数据")
- @GetMapping("/{id}/form")
+ @GetMapping("/{configId}/form")
public Result getConfigForm(
- @Parameter(description = "系统配置ID") @PathVariable Long id
+ @Parameter(description = "系统配置ID") @PathVariable Long configId
) {
- ConfigForm formData = configService.getConfigFormData(id);
+ ConfigForm formData = configService.getConfigFormData(configId);
return Result.success(formData);
}
@@ -70,19 +70,19 @@ public class ConfigController {
}
@Operation(summary = "修改系统配置")
- @PutMapping(value = "/{id}")
+ @PutMapping(value = "/{configId}")
@PreAuthorize("@ss.hasPerm('sys:config:update')")
@Log(module = LogModuleEnum.CONFIG, value = ActionTypeEnum.UPDATE)
- public Result update(@Valid @PathVariable Long id, @RequestBody ConfigForm configForm) {
- return Result.judge(configService.edit(id, configForm));
+ public Result update(@Valid @PathVariable Long configId, @RequestBody ConfigForm configForm) {
+ return Result.judge(configService.edit(configId, configForm));
}
@Operation(summary = "删除系统配置")
- @DeleteMapping("/{id}")
+ @DeleteMapping("/{configId}")
@PreAuthorize("@ss.hasPerm('sys:config:delete')")
@Log(module = LogModuleEnum.CONFIG, value = ActionTypeEnum.DELETE)
- public Result delete(@PathVariable Long id) {
- return Result.judge(configService.delete(id));
+ public Result delete(@PathVariable Long configId) {
+ return Result.judge(configService.delete(configId));
}
}
diff --git a/src/main/java/com/youlai/boot/system/controller/DeptController.java b/src/main/java/com/youlai/boot/system/controller/DeptController.java
index 7a54a8fd..2475b702 100644
--- a/src/main/java/com/youlai/boot/system/controller/DeptController.java
+++ b/src/main/java/com/youlai/boot/system/controller/DeptController.java
@@ -2,13 +2,13 @@ package com.youlai.boot.system.controller;
import com.youlai.boot.common.enums.ActionTypeEnum;
import com.youlai.boot.common.enums.LogModuleEnum;
-import com.youlai.boot.common.annotation.RepeatSubmit;
+import com.youlai.boot.framework.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.Log;
+import com.youlai.boot.framework.annotation.Log;
import com.youlai.boot.system.service.DeptService;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
diff --git a/src/main/java/com/youlai/boot/system/controller/DictController.java b/src/main/java/com/youlai/boot/system/controller/DictController.java
index ef55538d..c905411e 100644
--- a/src/main/java/com/youlai/boot/system/controller/DictController.java
+++ b/src/main/java/com/youlai/boot/system/controller/DictController.java
@@ -12,9 +12,9 @@ import com.youlai.boot.system.model.query.DictQuery;
import com.youlai.boot.system.model.vo.DictItemOptionVO;
import com.youlai.boot.system.model.vo.DictItemPageVO;
import com.youlai.boot.system.model.vo.DictPageVO;
-import com.youlai.boot.common.annotation.RepeatSubmit;
+import com.youlai.boot.framework.annotation.RepeatSubmit;
import com.youlai.boot.system.model.form.DictForm;
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.framework.annotation.Log;
import com.youlai.boot.system.service.DictItemService;
import com.youlai.boot.system.service.DictService;
import com.youlai.boot.message.service.SseService;
@@ -67,11 +67,11 @@ public class DictController {
}
@Operation(summary = "获取字典表单数据")
- @GetMapping("/{id}/form")
+ @GetMapping("/{dictId}/form")
public Result getDictForm(
- @Parameter(description = "字典ID") @PathVariable Long id
+ @Parameter(description = "字典ID") @PathVariable Long dictId
) {
- DictForm formData = dictService.getDictForm(id);
+ DictForm formData = dictService.getDictForm(dictId);
return Result.success(formData);
}
@@ -90,14 +90,14 @@ public class DictController {
}
@Operation(summary = "修改字典")
- @PutMapping("/{id}")
+ @PutMapping("/{dictId}")
@PreAuthorize("@ss.hasPerm('sys:dict:update')")
@Log(module = LogModuleEnum.DICT, value = ActionTypeEnum.UPDATE)
public Result updateDict(
- @PathVariable Long id,
+ @PathVariable Long dictId,
@RequestBody DictForm dictForm
) {
- boolean status = dictService.updateDict(id, dictForm);
+ boolean status = dictService.updateDict(dictId, dictForm);
// 发送字典更新通知
if (status && dictForm.getDictCode() != null) {
sseService.sendDictChange(dictForm.getDictCode());
diff --git a/src/main/java/com/youlai/boot/system/controller/LogController.java b/src/main/java/com/youlai/boot/system/controller/LogController.java
index c717b80e..34d70307 100644
--- a/src/main/java/com/youlai/boot/system/controller/LogController.java
+++ b/src/main/java/com/youlai/boot/system/controller/LogController.java
@@ -1,7 +1,7 @@
package com.youlai.boot.system.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.framework.annotation.Log;
import com.youlai.boot.common.enums.ActionTypeEnum;
import com.youlai.boot.common.enums.LogModuleEnum;
import com.youlai.boot.common.result.PageResult;
diff --git a/src/main/java/com/youlai/boot/system/controller/MenuController.java b/src/main/java/com/youlai/boot/system/controller/MenuController.java
index 1050803c..5000344f 100644
--- a/src/main/java/com/youlai/boot/system/controller/MenuController.java
+++ b/src/main/java/com/youlai/boot/system/controller/MenuController.java
@@ -1,7 +1,7 @@
package com.youlai.boot.system.controller;
-import com.youlai.boot.common.annotation.Log;
-import com.youlai.boot.common.annotation.RepeatSubmit;
+import com.youlai.boot.framework.annotation.Log;
+import com.youlai.boot.framework.annotation.RepeatSubmit;
import com.youlai.boot.common.enums.ActionTypeEnum;
import com.youlai.boot.common.enums.LogModuleEnum;
import com.youlai.boot.common.model.Option;
@@ -62,12 +62,12 @@ public class MenuController {
}
@Operation(summary = "菜单表单数据")
- @GetMapping("/{id}/form")
+ @GetMapping("/{menuId}/form")
@PreAuthorize("@ss.hasPerm('sys:menu:update')")
public Result getMenuForm(
- @Parameter(description = "菜单ID") @PathVariable Long id
+ @Parameter(description = "菜单ID") @PathVariable Long menuId
) {
- MenuForm menu = menuService.getMenuForm(id);
+ MenuForm menu = menuService.getMenuForm(menuId);
return Result.success(menu);
}
@@ -82,10 +82,11 @@ public class MenuController {
}
@Operation(summary = "修改菜单")
- @PutMapping(value = "/{id}")
+ @PutMapping(value = "/{menuId}")
@PreAuthorize("@ss.hasPerm('sys:menu:update')")
@Log(module = LogModuleEnum.MENU, value = ActionTypeEnum.UPDATE)
public Result updateMenu(
+ @Parameter(description = "菜单ID") @PathVariable Long menuId,
@RequestBody MenuForm menuForm
) {
boolean result = menuService.saveMenu(menuForm);
@@ -93,13 +94,13 @@ public class MenuController {
}
@Operation(summary = "删除菜单")
- @DeleteMapping("/{id}")
+ @DeleteMapping("/{menuId}")
@PreAuthorize("@ss.hasPerm('sys:menu:delete')")
@Log(module = LogModuleEnum.MENU, value = ActionTypeEnum.DELETE)
public Result deleteMenu(
- @Parameter(description = "菜单ID，多个以英文(,)分割") @PathVariable("id") Long id
+ @Parameter(description = "菜单ID，多个以英文(,)分割") @PathVariable Long menuId
) {
- boolean result = menuService.deleteMenu(id);
+ boolean result = menuService.deleteMenu(menuId);
return Result.judge(result);
}
diff --git a/src/main/java/com/youlai/boot/system/controller/NoticeController.java b/src/main/java/com/youlai/boot/system/controller/NoticeController.java
index eafcad68..95e38a98 100644
--- a/src/main/java/com/youlai/boot/system/controller/NoticeController.java
+++ b/src/main/java/com/youlai/boot/system/controller/NoticeController.java
@@ -1,7 +1,7 @@
package com.youlai.boot.system.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.framework.annotation.Log;
import com.youlai.boot.common.enums.ActionTypeEnum;
import com.youlai.boot.common.enums.LogModuleEnum;
import com.youlai.boot.common.result.PageResult;
@@ -57,55 +57,55 @@ public class NoticeController {
}
@Operation(summary = "获取通知公告表单数据")
- @GetMapping("/{id}/form")
+ @GetMapping("/{noticeId}/form")
@PreAuthorize("@ss.hasPerm('sys:notice:update')")
public Result getNoticeForm(
- @Parameter(description = "通知公告ID") @PathVariable Long id
+ @Parameter(description = "通知公告ID") @PathVariable Long noticeId
) {
- NoticeForm formData = noticeService.getNoticeFormData(id);
+ NoticeForm formData = noticeService.getNoticeFormData(noticeId);
return Result.success(formData);
}
@Operation(summary = "阅读获取通知公告详情")
- @GetMapping("/{id}/detail")
+ @GetMapping("/{noticeId}/detail")
public Result getNoticeDetail(
- @Parameter(description = "通知公告ID") @PathVariable Long id
+ @Parameter(description = "通知公告ID") @PathVariable Long noticeId
) {
- NoticeDetailVO detailVo = noticeService.getNoticeDetail(id);
+ NoticeDetailVO detailVo = noticeService.getNoticeDetail(noticeId);
return Result.success(detailVo);
}
@Operation(summary = "修改通知公告")
- @PutMapping(value = "/{id}")
+ @PutMapping(value = "/{noticeId}")
@PreAuthorize("@ss.hasPerm('sys:notice:update')")
@Log(module = LogModuleEnum.NOTICE, value = ActionTypeEnum.UPDATE)
public Result updateNotice(
- @Parameter(description = "通知公告ID") @PathVariable Long id,
+ @Parameter(description = "通知公告ID") @PathVariable Long noticeId,
@RequestBody @Validated NoticeForm formData
) {
- boolean result = noticeService.updateNotice(id, formData);
+ boolean result = noticeService.updateNotice(noticeId, formData);
return Result.judge(result);
}
@Operation(summary = "发布通知公告")
- @PutMapping("/{id}/publish")
+ @PutMapping("/{noticeId}/publish")
@PreAuthorize("@ss.hasPerm('sys:notice:publish')")
@Log(module = LogModuleEnum.NOTICE, value = ActionTypeEnum.UPDATE)
public Result publishNotice(
- @Parameter(description = "通知公告ID") @PathVariable Long id
+ @Parameter(description = "通知公告ID") @PathVariable Long noticeId
) {
- boolean result = noticeService.publishNotice(id);
+ boolean result = noticeService.publishNotice(noticeId);
return Result.judge(result);
}
@Operation(summary = "撤回通知公告")
- @PutMapping("/{id}/revoke")
+ @PutMapping("/{noticeId}/revoke")
@PreAuthorize("@ss.hasPerm('sys:notice:revoke')")
@Log(module = LogModuleEnum.NOTICE, value = ActionTypeEnum.UPDATE)
public Result revokeNotice(
- @Parameter(description = "通知公告ID") @PathVariable Long id
+ @Parameter(description = "通知公告ID") @PathVariable Long noticeId
) {
- boolean result = noticeService.revokeNotice(id);
+ boolean result = noticeService.revokeNotice(noticeId);
return Result.judge(result);
}
diff --git a/src/main/java/com/youlai/boot/system/controller/RoleController.java b/src/main/java/com/youlai/boot/system/controller/RoleController.java
index edc7665a..be215f53 100644
--- a/src/main/java/com/youlai/boot/system/controller/RoleController.java
+++ b/src/main/java/com/youlai/boot/system/controller/RoleController.java
@@ -3,14 +3,14 @@ package com.youlai.boot.system.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.common.enums.ActionTypeEnum;
import com.youlai.boot.common.enums.LogModuleEnum;
-import com.youlai.boot.common.annotation.RepeatSubmit;
+import com.youlai.boot.framework.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.RoleQuery;
import com.youlai.boot.system.model.vo.RolePageVO;
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.framework.annotation.Log;
import com.youlai.boot.system.service.RoleService;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -75,10 +75,12 @@ public class RoleController {
}
@Operation(summary = "修改角色")
- @PutMapping(value = "/{id}")
+ @PutMapping(value = "/{roleId}")
@PreAuthorize("@ss.hasPerm('sys:role:update')")
@Log(module = LogModuleEnum.ROLE, value = ActionTypeEnum.UPDATE)
- public Result updateRole(@Valid @RequestBody RoleForm roleForm) {
+ public Result updateRole(
+ @Parameter(description = "角色ID") @PathVariable Long roleId,
+ @Valid @RequestBody RoleForm roleForm) {
boolean result = roleService.saveRole(roleForm);
return Result.judge(result);
}
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..f9deca1b 100644
--- a/src/main/java/com/youlai/boot/system/controller/UserController.java
+++ b/src/main/java/com/youlai/boot/system/controller/UserController.java
@@ -2,8 +2,8 @@ package com.youlai.boot.system.controller;
import cn.idev.excel.EasyExcel;
import cn.idev.excel.ExcelWriter;
-import com.youlai.boot.common.annotation.Log;
-import com.youlai.boot.common.annotation.RepeatSubmit;
+import com.youlai.boot.framework.annotation.Log;
+import com.youlai.boot.framework.annotation.RepeatSubmit;
import com.youlai.boot.common.enums.ActionTypeEnum;
import com.youlai.boot.common.enums.LogModuleEnum;
import com.youlai.boot.common.enums.StatusEnum;
diff --git a/src/main/java/com/youlai/boot/system/mapper/DeptMapper.java b/src/main/java/com/youlai/boot/system/mapper/DeptMapper.java
index e00f27bf..f92e6ae6 100644
--- a/src/main/java/com/youlai/boot/system/mapper/DeptMapper.java
+++ b/src/main/java/com/youlai/boot/system/mapper/DeptMapper.java
@@ -3,7 +3,7 @@ package com.youlai.boot.system.mapper;
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.framework.annotation.DataPermission;
import com.youlai.boot.system.model.entity.Dept;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/src/main/java/com/youlai/boot/system/mapper/UserMapper.java b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java
index dd6a3d20..1da5402d 100644
--- a/src/main/java/com/youlai/boot/system/mapper/UserMapper.java
+++ b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.entity.SysUser;
import com.youlai.boot.system.model.query.UserQuery;
import com.youlai.boot.system.model.form.UserForm;
-import com.youlai.boot.common.annotation.DataPermission;
+import com.youlai.boot.framework.annotation.DataPermission;
import com.youlai.boot.framework.security.model.SecurityUser;
import com.youlai.boot.system.model.vo.UserExportVO;
import com.youlai.boot.system.model.vo.UserPageVO;
@@ -50,10 +50,6 @@ public interface UserMapper extends BaseMapper {
*/
SecurityUser getAuthInfoByUsername(String username);
- default SecurityUser getAuthCredentialsByUsername(String username) {
- return getAuthInfoByUsername(username);
- }
-
/**
* 根据手机号获取用户认证信息
*
@@ -62,10 +58,6 @@ public interface UserMapper extends BaseMapper {
*/
SecurityUser getAuthInfoByMobile(String mobile);
- default SecurityUser getAuthCredentialsByMobile(String mobile) {
- return getAuthInfoByMobile(mobile);
- }
-
/**
* 获取导出用户列表
*
diff --git a/src/main/java/com/youlai/boot/system/model/entity/Config.java b/src/main/java/com/youlai/boot/system/model/entity/Config.java
index 93033f56..586901a7 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/Config.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/Config.java
@@ -1,7 +1,7 @@
package com.youlai.boot.system.model.entity;
import com.baomidou.mybatisplus.annotation.*;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.EqualsAndHashCode;
@@ -42,11 +42,13 @@ public class Config extends BaseEntity {
/**
* 创建人ID
*/
+ @TableField(fill = FieldFill.INSERT)
private Long createBy;
/**
* 更新人ID
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateBy;
/**
diff --git a/src/main/java/com/youlai/boot/system/model/entity/Dept.java b/src/main/java/com/youlai/boot/system/model/entity/Dept.java
index 9c95c6a3..44517148 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/Dept.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/Dept.java
@@ -1,9 +1,9 @@
package com.youlai.boot.system.model.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -51,11 +51,13 @@ public class Dept extends BaseEntity {
/**
* 创建人 ID
*/
+ @TableField(fill = FieldFill.INSERT)
private Long createBy;
/**
* 更新人 ID
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateBy;
/**
diff --git a/src/main/java/com/youlai/boot/system/model/entity/Dict.java b/src/main/java/com/youlai/boot/system/model/entity/Dict.java
index 1085e4f2..42b47bce 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/Dict.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/Dict.java
@@ -1,7 +1,7 @@
package com.youlai.boot.system.model.entity;
import com.baomidou.mybatisplus.annotation.*;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/youlai/boot/system/model/entity/DictItem.java b/src/main/java/com/youlai/boot/system/model/entity/DictItem.java
index 0871dd41..fe066941 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/DictItem.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/DictItem.java
@@ -1,7 +1,7 @@
package com.youlai.boot.system.model.entity;
import com.baomidou.mybatisplus.annotation.*;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -56,10 +56,12 @@ public class DictItem extends BaseEntity {
/**
* 创建人 ID
*/
+ @TableField(fill = FieldFill.INSERT)
private Long createBy;
/**
* 更新人 ID
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateBy;
}
\ No newline at end of file
diff --git a/src/main/java/com/youlai/boot/system/model/entity/Menu.java b/src/main/java/com/youlai/boot/system/model/entity/Menu.java
index 2eb8d833..4f3fdac5 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/Menu.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/Menu.java
@@ -2,7 +2,7 @@ package com.youlai.boot.system.model.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/youlai/boot/system/model/entity/Notice.java b/src/main/java/com/youlai/boot/system/model/entity/Notice.java
index 68f37b75..345bde11 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/Notice.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/Notice.java
@@ -1,8 +1,7 @@
package com.youlai.boot.system.model.entity;
import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -75,11 +74,13 @@ public class Notice extends BaseEntity {
/**
* 创建人ID
*/
+ @TableField(fill = FieldFill.INSERT)
private Long createBy;
/**
* 更新人ID
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateBy;
/**
diff --git a/src/main/java/com/youlai/boot/system/model/entity/Role.java b/src/main/java/com/youlai/boot/system/model/entity/Role.java
index d4f17ee8..130c96f3 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/Role.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/Role.java
@@ -1,9 +1,9 @@
package com.youlai.boot.system.model.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -46,11 +46,13 @@ public class Role extends BaseEntity {
/**
* 创建人 ID
*/
+ @TableField(fill = FieldFill.INSERT)
private Long createBy;
/**
* 更新人 ID
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateBy;
/**
diff --git a/src/main/java/com/youlai/boot/system/model/entity/RoleMenu.java b/src/main/java/com/youlai/boot/system/model/entity/RoleMenu.java
index 38109693..e16825d6 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/RoleMenu.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/RoleMenu.java
@@ -2,7 +2,6 @@ package com.youlai.boot.system.model.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/src/main/java/com/youlai/boot/system/model/entity/SysUser.java b/src/main/java/com/youlai/boot/system/model/entity/SysUser.java
index add52dc4..c1457e7d 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/SysUser.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/SysUser.java
@@ -1,7 +1,7 @@
package com.youlai.boot.system.model.entity;
import com.baomidou.mybatisplus.annotation.*;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -64,11 +64,13 @@ public class SysUser extends BaseEntity {
/**
* 创建人 ID
*/
+ @TableField(fill = FieldFill.INSERT)
private Long createBy;
/**
* 更新人 ID
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateBy;
/**
diff --git a/src/main/java/com/youlai/boot/system/model/entity/UserNotice.java b/src/main/java/com/youlai/boot/system/model/entity/UserNotice.java
index e3032595..d6ebbd73 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/UserNotice.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/UserNotice.java
@@ -3,8 +3,7 @@ package com.youlai.boot.system.model.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/youlai/boot/system/model/entity/UserSocial.java b/src/main/java/com/youlai/boot/system/model/entity/UserSocial.java
index c5bbd7fc..c88b2717 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/UserSocial.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/UserSocial.java
@@ -1,7 +1,7 @@
package com.youlai.boot.system.model.entity;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
import com.youlai.boot.common.enums.SocialPlatformEnum;
import lombok.Getter;
import lombok.Setter;
diff --git a/src/main/java/com/youlai/boot/system/model/vo/DeptVO.java b/src/main/java/com/youlai/boot/system/model/vo/DeptVO.java
index 6cded325..7da69882 100644
--- a/src/main/java/com/youlai/boot/system/model/vo/DeptVO.java
+++ b/src/main/java/com/youlai/boot/system/model/vo/DeptVO.java
@@ -1,8 +1,8 @@
package com.youlai.boot.system.model.vo;
-import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
import java.time.LocalDateTime;
import java.util.List;
diff --git a/src/main/java/com/youlai/boot/system/model/vo/LogPageVO.java b/src/main/java/com/youlai/boot/system/model/vo/LogPageVO.java
index cd8fd342..5d9670ab 100644
--- a/src/main/java/com/youlai/boot/system/model/vo/LogPageVO.java
+++ b/src/main/java/com/youlai/boot/system/model/vo/LogPageVO.java
@@ -1,6 +1,5 @@
package com.youlai.boot.system.model.vo;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.youlai.boot.common.enums.ActionTypeEnum;
import com.youlai.boot.common.enums.LogModuleEnum;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -70,7 +69,6 @@ public class LogPageVO implements Serializable {
@Schema(description = "错误信息")
private String errorMsg;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
}
diff --git a/src/main/java/com/youlai/boot/system/model/vo/RolePageVO.java b/src/main/java/com/youlai/boot/system/model/vo/RolePageVO.java
index 92a975bb..27b96916 100644
--- a/src/main/java/com/youlai/boot/system/model/vo/RolePageVO.java
+++ b/src/main/java/com/youlai/boot/system/model/vo/RolePageVO.java
@@ -1,6 +1,5 @@
package com.youlai.boot.system.model.vo;
-import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -31,9 +30,7 @@ public class RolePageVO {
@Schema(description="数据权限名称")
private String dataScopeLabel;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
}
\ No newline at end of file
diff --git a/src/main/java/com/youlai/boot/system/model/vo/UserPageVO.java b/src/main/java/com/youlai/boot/system/model/vo/UserPageVO.java
index d911182e..a74d1118 100644
--- a/src/main/java/com/youlai/boot/system/model/vo/UserPageVO.java
+++ b/src/main/java/com/youlai/boot/system/model/vo/UserPageVO.java
@@ -1,8 +1,8 @@
package com.youlai.boot.system.model.vo;
-import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
import java.time.LocalDateTime;
diff --git a/src/main/java/com/youlai/boot/system/model/vo/UserProfileVO.java b/src/main/java/com/youlai/boot/system/model/vo/UserProfileVO.java
index 39ebd9a7..5caa4dda 100644
--- a/src/main/java/com/youlai/boot/system/model/vo/UserProfileVO.java
+++ b/src/main/java/com/youlai/boot/system/model/vo/UserProfileVO.java
@@ -1,8 +1,8 @@
package com.youlai.boot.system.model.vo;
-import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
diff --git a/src/main/java/com/youlai/boot/system/service/UserService.java b/src/main/java/com/youlai/boot/system/service/UserService.java
index 35f30fa9..0505cf3f 100644
--- a/src/main/java/com/youlai/boot/system/service/UserService.java
+++ b/src/main/java/com/youlai/boot/system/service/UserService.java
@@ -82,11 +82,6 @@ public interface UserService extends IService {
*/
SecurityUser getAuthInfoByUsername(String username);
- default SecurityUser getAuthCredentialsByUsername(String username) {
- return getAuthInfoByUsername(username);
- }
-
-
/**
* 获取导出用户列表
*
@@ -198,8 +193,4 @@ public interface UserService extends IService {
*/
SecurityUser getAuthInfoByMobile(String mobile);
- default SecurityUser getAuthCredentialsByMobile(String mobile) {
- return getAuthInfoByMobile(mobile);
- }
-
}
diff --git a/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java
index 21962565..1702bfc7 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/ConfigServiceImpl.java
@@ -12,7 +12,6 @@ import com.youlai.boot.system.model.form.ConfigForm;
import com.youlai.boot.system.model.query.ConfigQuery;
import com.youlai.boot.system.model.vo.ConfigVO;
import com.youlai.boot.system.service.ConfigService;
-import com.youlai.boot.framework.security.util.SecurityUtils;
import jakarta.annotation.PostConstruct;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
@@ -78,7 +77,6 @@ public class ConfigServiceImpl extends ServiceImpl impleme
super.count(new LambdaQueryWrapper().eq(Config::getConfigKey, configForm.getConfigKey())) == 0,
"配置键已存在");
Config config = configConverter.toEntity(configForm);
- config.setCreateBy(SecurityUtils.getUserId());
return this.save(config);
}
@@ -107,7 +105,6 @@ public class ConfigServiceImpl extends ServiceImpl impleme
super.count(new LambdaQueryWrapper().eq(Config::getConfigKey, configForm.getConfigKey()).ne(Config::getId, id)) == 0,
"配置键已存在");
Config config = configConverter.toEntity(configForm);
- config.setUpdateBy(SecurityUtils.getUserId());
return this.updateById(config);
}
diff --git a/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java
index b2495bfe..c003d5ed 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/DeptServiceImpl.java
@@ -84,7 +84,7 @@ public class DeptServiceImpl extends ServiceImpl implements De
* @param deptList 部门列表
* @return 部门树形列表
*/
- public List recurDeptList(Long parentId, List deptList) {
+ private List recurDeptList(Long parentId, List deptList) {
return deptList.stream()
.filter(dept -> dept.getParentId().equals(parentId))
.map(dept -> {
@@ -150,7 +150,6 @@ public class DeptServiceImpl extends ServiceImpl implements De
String treePath = generateDeptTreePath(formData.getParentId());
entity.setTreePath(treePath);
- entity.setCreateBy(SecurityUtils.getUserId());
// 保存部门并返回部门ID
boolean result = this.save(entity);
Assert.isTrue(result, "部门保存失败");
@@ -236,7 +235,7 @@ public class DeptServiceImpl extends ServiceImpl implements De
* @param deptList 部门列表
* @return 部门表格层级列表
*/
- public static List> recurDeptTreeOptions(long parentId, List deptList) {
+ private static List> recurDeptTreeOptions(long parentId, List deptList) {
return CollectionUtil.emptyIfNull(deptList).stream()
.filter(dept -> dept.getParentId().equals(parentId))
.map(dept -> {
diff --git a/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java
index 5052c03c..d4e23147 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java
@@ -95,7 +95,6 @@ public class NoticeServiceImpl extends ServiceImpl impleme
}
}
Notice entity = noticeConverter.toEntity(formData);
- entity.setCreateBy(SecurityUtils.getUserId());
return this.save(entity);
}
@@ -250,7 +249,6 @@ public class NoticeServiceImpl extends ServiceImpl impleme
notice.setPublishStatus(NoticePublishStatusEnum.REVOKED.getValue());
notice.setRevokeTime(LocalDateTime.now());
- notice.setUpdateBy(SecurityUtils.getUserId());
boolean revokeResult = this.updateById(notice);
diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
index a9f37574..84b80775 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
@@ -133,7 +133,6 @@ public class UserServiceImpl extends ServiceImpl implements
// 设置默认加密密码
String defaultEncryptPwd = passwordEncoder.encode(SystemConstants.DEFAULT_PASSWORD);
entity.setPassword(defaultEncryptPwd);
- entity.setCreateBy(SecurityUtils.getUserId());
// 新增用户
boolean result = this.save(entity);
@@ -171,7 +170,6 @@ public class UserServiceImpl extends ServiceImpl implements
// form -> entity
SysUser entity = userConverter.toEntity(userForm);
- entity.setUpdateBy(SecurityUtils.getUserId());
// 修改用户
boolean result = this.updateById(entity);
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 046ee72d..8729f67b 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -170,8 +170,9 @@ springdoc:
packages-to-scan: # 扫描的 Controller 包，限制只生成指定包的接口文档
- com.youlai.boot.auth.controller
- com.youlai.boot.system.controller
- - com.youlai.boot.module.file.controller
- - com.youlai.boot.module.codegen.controller
+ - com.youlai.boot.file.controller
+ - com.youlai.boot.codegen.controller
+ - com.youlai.boot.message.controller
default-flat-param-object: true # 将对象参数扁平化显示在文档中
# knife4j 配置
diff --git a/src/main/resources/mapper/codegen/GenTableColumnMapper.xml b/src/main/resources/mapper/codegen/GenTableColumnMapper.xml
index 8cb86c3d..6a09a381 100644
--- a/src/main/resources/mapper/codegen/GenTableColumnMapper.xml
+++ b/src/main/resources/mapper/codegen/GenTableColumnMapper.xml
@@ -2,6 +2,6 @@
-
+
diff --git a/src/main/resources/mapper/codegen/GenTableMapper.xml b/src/main/resources/mapper/codegen/GenTableMapper.xml
index 0271fa20..74e7ca3e 100644
--- a/src/main/resources/mapper/codegen/GenTableMapper.xml
+++ b/src/main/resources/mapper/codegen/GenTableMapper.xml
@@ -2,6 +2,6 @@
-
+
diff --git a/src/main/resources/mapper/system/ConfigMapper.xml b/src/main/resources/mapper/system/ConfigMapper.xml
deleted file mode 100644
index f291b895..00000000
--- a/src/main/resources/mapper/system/ConfigMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/src/main/resources/mapper/system/DeptMapper.xml b/src/main/resources/mapper/system/DeptMapper.xml
deleted file mode 100644
index fadf8a06..00000000
--- a/src/main/resources/mapper/system/DeptMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/src/main/resources/templates/codegen/backend/entity.java.vm b/src/main/resources/templates/codegen/backend/entity.java.vm
index 15a8dd43..7bb0d76e 100644
--- a/src/main/resources/templates/codegen/backend/entity.java.vm
+++ b/src/main/resources/templates/codegen/backend/entity.java.vm
@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
import java.math.BigDecimal;
#end
import com.baomidou.mybatisplus.annotation.TableName;
-import ${packageName}.common.base.BaseEntity;
+import ${packageName}.framework.base.BaseEntity;
/**
* $!{businessName}实体对象