From c7641d2b253e28634a8af5ea8330f8e01e88561c Mon Sep 17 00:00:00 2001 From: zzp <34701892@qq.com> Date: Mon, 16 Dec 2024 21:07:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=99=BB=E5=BD=95=E4=B8=8D?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/AdminUserService.java | 34 +++++++++---------- admin/src/main/resources/application.yml | 14 +++++--- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/admin/src/main/java/com/jinrui/reference/admin/service/AdminUserService.java b/admin/src/main/java/com/jinrui/reference/admin/service/AdminUserService.java index ea342ad..06ea165 100644 --- a/admin/src/main/java/com/jinrui/reference/admin/service/AdminUserService.java +++ b/admin/src/main/java/com/jinrui/reference/admin/service/AdminUserService.java @@ -142,21 +142,21 @@ public class AdminUserService { jedis.decr(redisLockKey); // return ResultObject.failed("验证码错误，请重新输入!"); } - + // 暂时去掉验证码校验 // String[] split = captchaList.split(","); // for (String available : split) { // if (Objects.equals(captcha, available)) { - log.info("手机号{}验证码校验成功！", phone); - AdminUser adminUser = adminUserMapper.getAdminUserByPhone(phone); - if (adminUser == null) { - return ResultObject.failed("用户不存在，请联系系统管理员!"); - } - if (!adminUser.isActive()) { - return ResultObject.failed("用户已被禁用，请联系系统管理员!"); - } - LoginVO loginVO = new LoginVO(adminUser); - jedis.del(redisLockKey, redisCaptchaListKey); - return ResultObject.success(loginVO); + log.info("手机号{}验证码校验成功！", phone); + AdminUser adminUser = adminUserMapper.getAdminUserByPhone(phone); + if (adminUser == null) { + return ResultObject.failed("用户不存在，请联系系统管理员!"); + } + if (!adminUser.isActive()) { + return ResultObject.failed("用户已被禁用，请联系系统管理员!"); + } + LoginVO loginVO = new LoginVO(adminUser); + jedis.del(redisLockKey, redisCaptchaListKey); + return ResultObject.success(loginVO); // } // } // log.info("没有给手机{}发送过验证码{}, 已发送过的验证码是[{}]", phone, captcha, captchaList); @@ -171,11 +171,11 @@ public class AdminUserService { /** * 查询管理后台用户 * - * @param name 用户名 模糊匹配 - * @param phone 手机号 模糊匹配 - * @param page 当前页码 默认第一页 - * @param size 每页长度 默认10条 - * @param orderBy 排序参数 要排序的字段 + * @param name 用户名 模糊匹配 + * @param phone 手机号 模糊匹配 + * @param page 当前页码 默认第一页 + * @param size 每页长度 默认10条 + * @param orderBy 排序参数 要排序的字段 * @param direction 排序参数 排序方向 * @return 查询结果 */ diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml index fe544c1..083ce49 100644 --- a/admin/src/main/resources/application.yml +++ b/admin/src/main/resources/application.yml @@ -19,10 +19,16 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://121.37.185.246:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai - username: root - password: Xgf_8000 + url: jdbc:mysql://192.168.0.142:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai + username: financial_prod + password: mmTFncqmDal5HLRGY0BV +# url: jdbc:mysql://121.37.185.246:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai +# username: root +# password: Xgf_8000 redis: - host: 123.60.153.169 + host: 192.168.0.172 port: 6379 password: Xgf_redis +# host: 123.60.153.169 +# port: 6379 +# password: Xgf_redis