From 7cedcc1480dcb9370b47d141d447b6d0028e41ed Mon Sep 17 00:00:00 2001 From: haotianmingyue <2421912570@qq.com> Date: Fri, 10 Oct 2025 10:21:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E7=AB=AF?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=80=BB=E8=BE=91?= =?UTF-8?q?,=E7=8E=B0=E6=B2=A1=E6=9C=89app=E7=AB=AF=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E7=9A=84=E5=BE=AE=E4=BF=A1=E7=94=A8=E6=88=B7,=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wxController/WxAuthController.java | 36 ++++++++++++++----- .../src/main/resources/application-druid.yml | 4 ++- .../src/main/resources/application.yml | 2 +- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wxController/WxAuthController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wxController/WxAuthController.java index 46d87e34..be25fdf7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wxController/WxAuthController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wxController/WxAuthController.java @@ -70,19 +70,37 @@ public class WxAuthController { // 绑定手机号 System.out.println("登录者手机"+xmLoginDto.getPhone()); - //---------------------------20241206 测试时先注释掉短信验证------------------------------------ - //---获取手机验证码------ - String sms = redisCache.getCacheObject("SMSCODE:" + xmLoginDto.getPhone()); - System.out.println("SMSCODE:" + xmLoginDto.getPhone()); - System.out.println("验证码"+sms); - if (!sms.equals(xmLoginDto.getSmsCode())) { - return AjaxResult.error("短信验证码错误"); - } - //-------------------------------end 验证码---------------------------------------------- +// //---------------------------20241206 测试时先注释掉短信验证------------------------------------ +// //---获取手机验证码------ +// String sms = redisCache.getCacheObject("SMSCODE:" + xmLoginDto.getPhone()); +// System.out.println("SMSCODE:" + xmLoginDto.getPhone()); +// System.out.println("验证码"+sms); +// if (!sms.equals(xmLoginDto.getSmsCode())) { +// return AjaxResult.error("短信验证码错误"); +// } +// //-------------------------------end 验证码---------------------------------------------- // 以前用户名应该是手机号 SysUser sysUser = sysUserService.selectUserByUserName(xmLoginDto.getPhone()); + + // 若用户不存在app端账号, 直接更新数据库中用户手机号 + if (sysUser == null) { + + // 当前用户的微信账号id + Long userId = SecurityUtils.getUserId(); + // 微信用户账号 + SysUser sysUserWx = sysUserService.selectUserById(userId); + sysUserWx.setPhonenumber(xmLoginDto.getPhone()); + int infoUser = sysUserService.updateUser(sysUserWx); + + if(infoUser == 0){ + return AjaxResult.error("绑定手机号失败, 请联系管理员"); + } + return AjaxResult.success("绑定成功"); + + } + SysSignIn sysSignInApp = sysSignInService.selectSysSignInByUId(sysUser.getUserId()); // 当前用户的微信账号id diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index a322606f..8da4d143 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -14,8 +14,10 @@ spring: # # 测算腾讯云 mysql地址 url: jdbc:mysql://172.17.0.4:3306/xingming?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false + # 82.156.153.112 +# url: jdbc:mysql://82.156.153.112:3306/xingming?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false username: root - password: dnxxkj + password: dnxxkj # 线上数据库密码 # password: root # 从库数据源 slave: diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 6210fa6d..e00d570c 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -73,7 +73,7 @@ spring: devtools: restart: # 热部署开关 - enabled: true + enabled: false # redis 配置 redis: # 地址 郑老师腾讯云姓名学