From b956084da4529bc466aa226962571a0c070a40b3 Mon Sep 17 00:00:00 2001 From: wxc <191104855@qq.com> Date: Fri, 8 Mar 2024 17:39:58 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E7=BE=A4=E4=BC=97=E7=AB=AF=E9=99=90?= =?UTF-8?q?=E5=88=B6=E4=BA=BA=E8=84=B8=E8=AE=A4=E8=AF=81=E6=9C=89=E6=95=88?= =?UTF-8?q?=E6=9C=9F=E4=B8=BA8=E5=B0=8F=E6=97=B6=202.=20=E7=BE=A4=E4=BC=97?= =?UTF-8?q?=E7=AB=AF=E8=B0=83=E6=95=B4=E7=9F=AD=E4=BF=A1=E6=9C=89=E6=95=88?= =?UTF-8?q?=E6=9C=9F=E4=B8=BA10=E5=88=86=E9=92=9F=203.=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8C=89=E9=92=AE=E6=B3=A8=E8=A7=A3=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flow.json | 3 -- .../biutag/lan/config/AdminInterceptor.java | 9 +++++ .../biutag/lan/config/stp/StpInterConfig.java | 2 - .../java/com/biutag/lan/ws/WsController.java | 3 +- .../outer/controller/AuthController.java | 22 +++++++---- .../com/biutag/outer/domain/bo/AuthUser.java | 38 +++++++++++++++++++ .../com/biutag/outer/service/UserService.java | 3 +- .../java/com/biutag/outer/util/CodeUtil.java | 4 +- .../java/com/biutag/outer/util/TokenUtil.java | 9 +++-- .../com/biutag/outer/util/UserHelper.java | 7 ++-- .../java/com/biutag/outer/DurationTest.java | 15 ++++++++ truncate.sql | 1 + 12 files changed, 91 insertions(+), 25 deletions(-) create mode 100644 mailbox-outer/src/main/java/com/biutag/outer/domain/bo/AuthUser.java create mode 100644 mailbox-outer/src/test/java/com/biutag/outer/DurationTest.java diff --git a/flow.json b/flow.json index 752e1f9..e69de29 100644 --- a/flow.json +++ b/flow.json @@ -1,3 +0,0 @@ -{ - "base64": "data:image/jpg;base64,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UgUHkkZJ9zUd3aC8tjbSsRnGWHXjmp3jLQmJWK8YDDqKBElZ13/x+2f++3/oBq7DG0USxs5cqMbm6n61TuLKWe4SdZ2TyySoABHIwetAEt0jOY1SQRtuyM4JPB6A96htpplu5LKZ/M2qHViADg9jjAqa4tROY33bZI+VbAOMjB4PFLb2vkyNM7mSR8AsQBwOgwKAIF/5Crf9ch/OtGs4WMwuzdee2SMbdoxj0rRoBkNxEs0DxMA2R0IyM9uDXLsbOMOY4ogXKgx+XvAIXJHBGDnPeuqliSdPLkGVPUetVLiz3pHHbhVCkk/TaR/WgaMOzkkDRoPNjYkA4SIKMjPHBPSukueLd8+lUIrKeO5ViVMfB9wQuK1HRZEKOMg8GiQluUkvLFYl/fRZCj+IelP08g2cbKchgW49zmpxbwKAoReOOgqUAKMKMCm2IpSTXi3scUcQaAqS755B7CrtVXtne6S4EzqqjBjH3T7mrVIZVvYGurWSBTgsOKxb6W5eK2haIxsJYwScckH+HB6fWuikQSIyEkbhjI61RgsPLMZmlaXyvubgOO2eOtCAWSGWS4cw3Hl/KoIUAkdcZznj8Kz0e5uRBfhd7ws8bqOM84yM/StF7JvOee3kMTSY34AOcdOtMbTlEEcMMjRmJtwYc5POc565zQhlCOVpNTnkmXYiwjcp6456+9QN9ritEMvz2bEEj+NVzxz0I/WtyK0SNX8w72l++x79qhNg7L5LzM0XTZgdPTPWmFzRGMcUUUUiT//R7GiiiszMKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD/0uxooorMzCiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooA/9k=" -} \ No newline at end of file diff --git a/mailbox-lan/src/main/java/com/biutag/lan/config/AdminInterceptor.java b/mailbox-lan/src/main/java/com/biutag/lan/config/AdminInterceptor.java index a5719f9..d7f2e72 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/config/AdminInterceptor.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/config/AdminInterceptor.java @@ -1,5 +1,6 @@ package com.biutag.lan.config; +import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.stp.StpUtil; import com.alibaba.fastjson2.JSON; import com.biutag.aop.NotLogin; @@ -159,6 +160,14 @@ public class AdminInterceptor implements HandlerInterceptor { if (StringUtils.isNotNull(method) && method.isAnnotationPresent(NotPower.class)) { break; } + if (StringUtils.isNotNull(method) && method.isAnnotationPresent(SaCheckPermission.class)) { + String[] auths = method.getAnnotation(SaCheckPermission.class).value(); + for (String auth : auths) { + // 校验权限 + StpUtil.checkPermission(auth); + } + break; + } // 路由转权限 String prefix = "/api/"; String route = uri.replaceFirst(prefix, ""); diff --git a/mailbox-lan/src/main/java/com/biutag/lan/config/stp/StpInterConfig.java b/mailbox-lan/src/main/java/com/biutag/lan/config/stp/StpInterConfig.java index 3715e96..44809b4 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/config/stp/StpInterConfig.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/config/stp/StpInterConfig.java @@ -39,11 +39,9 @@ public class StpInterConfig implements StpInterface { public List getPermissionList(Object loginId, String loginType) { List roleIds = AdminThreadLocal.getRoleIds(); List perms = new LinkedList<>(); - if (roleIds.isEmpty()) { return perms; } - List permList = PermMapper.selectList( new QueryWrapper() .select("id,role_id,menu_id") diff --git a/mailbox-lan/src/main/java/com/biutag/lan/ws/WsController.java b/mailbox-lan/src/main/java/com/biutag/lan/ws/WsController.java index d0b5724..8d2d6f2 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/ws/WsController.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/ws/WsController.java @@ -14,9 +14,10 @@ import org.springframework.stereotype.Controller; public class WsController { @MessageMapping("/con") - public void con(JSONObject message) { + public AjaxResult con(JSONObject message) { System.out.println("con"); System.out.println(message.toJSONString()); + return AjaxResult.success(); } } diff --git a/mailbox-outer/src/main/java/com/biutag/outer/controller/AuthController.java b/mailbox-outer/src/main/java/com/biutag/outer/controller/AuthController.java index 4dc71f7..c3ab15d 100644 --- a/mailbox-outer/src/main/java/com/biutag/outer/controller/AuthController.java +++ b/mailbox-outer/src/main/java/com/biutag/outer/controller/AuthController.java @@ -5,8 +5,10 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.biutag.core.AjaxResult; +import com.biutag.enums.ErrorEnum; import com.biutag.exception.AuthException; import com.biutag.outer.domain.User; +import com.biutag.outer.domain.bo.AuthUser; import com.biutag.outer.domain.bo.FaceAuthBo; import com.biutag.outer.service.FaceAuthService; import com.biutag.outer.service.UserService; @@ -14,7 +16,6 @@ import com.biutag.outer.util.TokenUtil; import com.biutag.outer.util.UserHelper; import com.biutag.outer.util.Weixin; import com.biutag.outer.util.Weixin2; -import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; @@ -48,30 +49,35 @@ public class AuthController { user.setCreateTime(LocalDateTime.now()); userService.save(user); } - return AjaxResult.success(JSONObject.of("token", TokenUtil.set(user), "user", user)); + return AjaxResult.success(JSONObject.of("token", TokenUtil.set(AuthUser.of(user)), "user", user)); } @PostMapping("openid") public AjaxResult openid(@RequestParam String openid) { User user = userService.getByOpenid(openid); - return AjaxResult.success(JSONObject.of("token", TokenUtil.set(user), "user", user)); + AuthUser authUser = AuthUser.of(user); + return AjaxResult.success(JSONObject.of("token", TokenUtil.set(authUser), "user", authUser)); } @GetMapping("user") - public AjaxResult user() { + public AjaxResult user() { return AjaxResult.success(UserHelper.getCurrentUser()); } @GetMapping("realUser") - public AjaxResult realUser(@RequestParam Integer userId) { + public AjaxResult realUser(@RequestParam Integer userId) { log.info("请求 realUser： {}", userId); User user = userService.getById(userId); - if (user != null && StrUtil.isNotBlank(user.getIdCard())) { + if (user == null) { + return new AjaxResult<>(ErrorEnum.SUCCESS.getCode(), ErrorEnum.SUCCESS.getMsg()); + } + AuthUser authUser = AuthUser.of(user); + if (StrUtil.isNotBlank(user.getIdCard())) { log.info("用户信息：{}", JSON.toJSONString(user)); // 更新用户信息 - UserHelper.update(user); + UserHelper.update(authUser); } - return AjaxResult.success(user); + return AjaxResult.success(authUser); } @GetMapping("wx/sign") diff --git a/mailbox-outer/src/main/java/com/biutag/outer/domain/bo/AuthUser.java b/mailbox-outer/src/main/java/com/biutag/outer/domain/bo/AuthUser.java new file mode 100644 index 0000000..591e801 --- /dev/null +++ b/mailbox-outer/src/main/java/com/biutag/outer/domain/bo/AuthUser.java @@ -0,0 +1,38 @@ +package com.biutag.outer.domain.bo; + +import cn.hutool.core.util.StrUtil; +import com.biutag.outer.domain.User; +import lombok.Getter; +import lombok.Setter; +import org.springframework.beans.BeanUtils; + +import java.time.Duration; +import java.time.LocalDateTime; +import java.util.Objects; + +@Setter +@Getter +public class AuthUser { + + private Integer id; + + private String openid; + + private String phone; + + private String realName; + + private String idCard; + + private Boolean faceAuth = false; + + public static AuthUser of(User user) { + AuthUser authUser = new AuthUser(); + BeanUtils.copyProperties(user, authUser); + if (StrUtil.isNotBlank(user.getIdCard()) && Objects.nonNull(user.getFaceAuthTime())) { + // 8小时 + authUser.setFaceAuth(Duration.between(user.getFaceAuthTime(), LocalDateTime.now()).toHours() < 8); + } + return authUser; + } +} diff --git a/mailbox-outer/src/main/java/com/biutag/outer/service/UserService.java b/mailbox-outer/src/main/java/com/biutag/outer/service/UserService.java index a57235b..27bee85 100644 --- a/mailbox-outer/src/main/java/com/biutag/outer/service/UserService.java +++ b/mailbox-outer/src/main/java/com/biutag/outer/service/UserService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.biutag.outer.domain.User; +import com.biutag.outer.domain.bo.AuthUser; import com.biutag.outer.mapper.UserMapper; import com.biutag.outer.util.UserHelper; import org.springframework.stereotype.Service; @@ -17,7 +18,7 @@ public class UserService extends ServiceImpl { } public boolean updatePhoneByCurrent(String phone) { - User currentUser = UserHelper.getCurrentUser(); + AuthUser currentUser = UserHelper.getCurrentUser(); boolean updated = update(new LambdaUpdateWrapper().eq(User::getId, currentUser.getId()).set(User::getPhone, phone)); if (updated) { currentUser.setPhone(phone); diff --git a/mailbox-outer/src/main/java/com/biutag/outer/util/CodeUtil.java b/mailbox-outer/src/main/java/com/biutag/outer/util/CodeUtil.java index 09b28b6..3d1c045 100644 --- a/mailbox-outer/src/main/java/com/biutag/outer/util/CodeUtil.java +++ b/mailbox-outer/src/main/java/com/biutag/outer/util/CodeUtil.java @@ -9,12 +9,10 @@ import java.util.concurrent.TimeUnit; public class CodeUtil { private static final Cache cache = Caffeine.newBuilder() - .expireAfterWrite(5, TimeUnit.MINUTES) // 设置写入后过期时间 + .expireAfterWrite(10, TimeUnit.MINUTES) // 设置写入后过期时间 .maximumSize(1000) // 最多1000人 .build(); - - public static String set(String code) { String key = IdUtil.fastSimpleUUID(); cache.put(key, code); diff --git a/mailbox-outer/src/main/java/com/biutag/outer/util/TokenUtil.java b/mailbox-outer/src/main/java/com/biutag/outer/util/TokenUtil.java index 9d502bd..eed636e 100644 --- a/mailbox-outer/src/main/java/com/biutag/outer/util/TokenUtil.java +++ b/mailbox-outer/src/main/java/com/biutag/outer/util/TokenUtil.java @@ -2,6 +2,7 @@ package com.biutag.outer.util; import cn.hutool.core.util.IdUtil; import com.biutag.outer.domain.User; +import com.biutag.outer.domain.bo.AuthUser; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import org.springframework.util.Assert; @@ -9,23 +10,23 @@ import org.springframework.util.Assert; import java.util.concurrent.TimeUnit; public class TokenUtil { - private static final Cache cache = Caffeine.newBuilder() + private static final Cache cache = Caffeine.newBuilder() .expireAfterWrite(60, TimeUnit.MINUTES) // 设置写入后过期时间 .maximumSize(1000) // 最多1000人 .build(); - public static String set(User user) { + public static String set(AuthUser user) { Assert.notNull(user, "未找到该用户"); String key = IdUtil.fastSimpleUUID(); cache.put(key, user); return key; } - public static User update(String key, User user) { + public static AuthUser update(String key, AuthUser user) { cache.put(key, user); return user; } - public static User get(String key) { + public static AuthUser get(String key) { return cache.getIfPresent(key); } diff --git a/mailbox-outer/src/main/java/com/biutag/outer/util/UserHelper.java b/mailbox-outer/src/main/java/com/biutag/outer/util/UserHelper.java index bf1ffb3..fa5d152 100644 --- a/mailbox-outer/src/main/java/com/biutag/outer/util/UserHelper.java +++ b/mailbox-outer/src/main/java/com/biutag/outer/util/UserHelper.java @@ -2,24 +2,25 @@ package com.biutag.outer.util; import com.biutag.exception.AuthException; import com.biutag.outer.domain.User; +import com.biutag.outer.domain.bo.AuthUser; import jakarta.servlet.http.HttpServletRequest; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; public class UserHelper { - public static User getCurrentUser() { + public static AuthUser getCurrentUser() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); // 获取请求头的值 String authorization = request.getHeader("Authorization"); - User user = TokenUtil.get(authorization); + AuthUser user = TokenUtil.get(authorization); if (user == null) { throw new AuthException(); } return user; } - public static User update(User user) { + public static AuthUser update(AuthUser user) { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); // 获取请求头的值 String authorization = request.getHeader("Authorization"); diff --git a/mailbox-outer/src/test/java/com/biutag/outer/DurationTest.java b/mailbox-outer/src/test/java/com/biutag/outer/DurationTest.java new file mode 100644 index 0000000..d61dcba --- /dev/null +++ b/mailbox-outer/src/test/java/com/biutag/outer/DurationTest.java @@ -0,0 +1,15 @@ +package com.biutag.outer; + +import org.junit.jupiter.api.Test; + +import java.time.Duration; +import java.time.LocalDateTime; + +public class DurationTest { + + @Test + public void testBetween() { + System.out.println(Duration.between(LocalDateTime.of(2024, 3, 8, 7, 0, 0, 0), LocalDateTime.now()).toHours()); + System.out.println(Duration.between(LocalDateTime.of(2024, 3, 8, 16, 0, 0, 0), LocalDateTime.now()).toHours() < 8); + } +} diff --git a/truncate.sql b/truncate.sql index 464b006..3747395 100644 --- a/truncate.sql +++ b/truncate.sql @@ -12,6 +12,7 @@ truncate table mail_mark; truncate table work; truncate table favorite; +truncate table notice; truncate table system_log_operate; truncate table system_log_login;