From 53eaef9fbdfd6d0866a3d5e424d783e2e7bc0e17 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Mon, 29 Apr 2024 21:27:30 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=E5=AF=B9=E9=83=A8?= =?UTF-8?q?=E5=88=86=20API=20=E9=87=8D=E5=A4=8D=E7=9A=84=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../top/continew/admin/common/model/resp/CaptchaResp.java | 3 +++ .../java/top/continew/admin/webapi/system/MenuController.java | 3 --- .../top/continew/admin/webapi/system/NoticeController.java | 3 --- .../java/top/continew/admin/webapi/system/UserController.java | 4 +--- .../top/continew/admin/webapi/tool/GeneratorController.java | 2 -- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/model/resp/CaptchaResp.java b/continew-admin-common/src/main/java/top/continew/admin/common/model/resp/CaptchaResp.java index 4adb6889..dd52ad54 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/model/resp/CaptchaResp.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/model/resp/CaptchaResp.java @@ -49,6 +49,9 @@ public class CaptchaResp implements Serializable { @Schema(description = "验证码图片（Base64编码，带图片格式：data:image/gif;base64）", example = "data:image/png;base64,iVBORw0KGgoAAAAN...") private String img; + /** + * 过期时间戳 + */ @Schema(description = "过期时间戳", example = "1714376969409") private Long expireTime; } diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/MenuController.java b/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/MenuController.java index 63036cf6..d6df9605 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/MenuController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/MenuController.java @@ -16,7 +16,6 @@ package top.continew.admin.webapi.system; -import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import io.swagger.v3.oas.annotations.tags.Tag; @@ -49,14 +48,12 @@ import top.continew.starter.web.model.R; public class MenuController extends BaseController { @Override - @SaCheckPermission("system:menu:add") public R add(@Validated(ValidateGroup.Crud.Add.class) @RequestBody MenuReq req) { this.checkPath(req); return super.add(req); } @Override - @SaCheckPermission("system:menu:update") public R update(@Validated(ValidateGroup.Crud.Update.class) @RequestBody MenuReq req, @PathVariable Long id) { this.checkPath(req); return super.update(req, id); diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/NoticeController.java b/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/NoticeController.java index 7db3419f..3f616401 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/NoticeController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/NoticeController.java @@ -16,7 +16,6 @@ package top.continew.admin.webapi.system; -import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PathVariable; @@ -48,14 +47,12 @@ import java.time.LocalDateTime; public class NoticeController extends BaseController { @Override - @SaCheckPermission("system:notice:add") public R add(@Validated(ValidateGroup.Crud.Add.class) @RequestBody NoticeReq req) { this.checkTime(req); return super.add(req); } @Override - @SaCheckPermission("system:notice:update") public R update(@Validated(ValidateGroup.Crud.Update.class) @RequestBody NoticeReq req, @PathVariable Long id) { this.checkTime(req); diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserController.java b/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserController.java index 78b8e8bb..250396a1 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserController.java @@ -57,15 +57,13 @@ import top.continew.starter.web.model.R; public class UserController extends BaseController { @Override - @SaCheckPermission("system:user:add") public R add(@Validated(ValidateGroup.Crud.Add.class) @RequestBody UserReq req) { String rawPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(req.getPassword())); ValidationUtils.throwIfNull(rawPassword, "密码解密失败"); ValidationUtils.throwIf(!ReUtil .isMatch(RegexConstants.PASSWORD, rawPassword), "密码长度为 6 到 32 位，可以包含字母、数字、下划线，特殊字符，同时包含字母和数字"); req.setPassword(rawPassword); - Long id = baseService.add(req); - return R.ok("新增成功", id); + return super.add(req); } @Operation(summary = "重置密码", description = "重置用户登录密码") diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/tool/GeneratorController.java b/continew-admin-webapi/src/main/java/top/continew/admin/webapi/tool/GeneratorController.java index f429afd2..8e30bf93 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/webapi/tool/GeneratorController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/webapi/tool/GeneratorController.java @@ -33,7 +33,6 @@ import top.continew.admin.generator.model.req.GenConfigReq; import top.continew.admin.generator.model.resp.GeneratePreviewResp; import top.continew.admin.generator.model.resp.TableResp; import top.continew.admin.generator.service.GeneratorService; -import top.continew.starter.core.autoconfigure.project.ProjectProperties; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.web.model.R; @@ -54,7 +53,6 @@ import java.util.List; @RequestMapping("/generator") public class GeneratorController { - private final ProjectProperties projectProperties; private final GeneratorService generatorService; @Operation(summary = "分页查询数据表", description = "分页查询数据表")