From cc2f21dc3273584598c73393765e17328800a08a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 九月 2023 14:15:07 +0800
Subject: [PATCH] 修改bug

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
index b4f607e..420370b 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -113,6 +113,9 @@
 
     private String salt = "&a.s";
 
+    @Autowired
+    private SMSUtil smsUtil;
+
 
     /**
      * 获取短信验证码
@@ -129,24 +132,22 @@
                 sb.append((int) (random.nextDouble() * 10));
             }
             String authCode = sb.toString();
-            String sms = "短信验证码【" + authCode + "】已发到您的手机,验证码将在5分钟后失效,请及时登录!";
+            String sms = "";
 
             //发送验证码短信
             redisUtil.setStrValue(phone, authCode, 5 * 60);//设置五分钟过期
-            String templateId = "";
             switch (language){
                 case 1:
-                    templateId = "b793ae3d41a049059197bfe92cf8bc83";
+                    sms = "您的验证码为:" + authCode + ",该验证码5分钟内有效,请勿泄漏于他人!";
                     break;
                 case 2:
-                    templateId = "058c7d11ce594d668841cceb49fb5c9a";
+                    sms = "Your verification code is: " + authCode + ", the verification code is valid within 5 minutes, do not leak to others!";
                     break;
                 case 3:
-                    templateId = "4edbe604da6546808ffda582085b3c83";
+                    sms = "Votre code de vérification est: " + authCode + ". Ce code est valide pendant 5 minutes. Ne le divulguez pas aux autres!";
                     break;
             }
-            SMSUtil.send_huawei_sms(templateId, "+" + phone, "[\"" + authCode + "\"]");
-            System.out.println(sms);
+            smsUtil.sendCellulantMessage(phone, sms);
         }
         return ResultUtil.success();
     }
@@ -467,6 +468,7 @@
         loginWarpper.setId(userInfo.getId());
         loginWarpper.setToken(token);
         loginWarpper.setAppid(UUIDUtil.getRandomCode());
+        loginWarpper.setEmail(userInfo.getEmail());
         loginWarpper.setEmergencyContact(userInfo.getEmergencyContact());
         loginWarpper.setEmergencyContactNumber(userInfo.getEmergencyContactNumber());
         return ResultUtil.success(loginWarpper);
@@ -1631,6 +1633,7 @@
      * @param id
      */
     private void singlePointLogin(Integer id) throws Exception{
+        pushUtil.pushOffline(id, 1);
         //开始验证当前账号是否在别处登录
         String value = redisUtil.getValue("USER_" + id);
         if(ToolUtil.isNotEmpty(value)){//将另外设备上的强迫下线

--
Gitblit v1.7.1