From 05c1b69b9a694cf99e9f07f12ebf034cb2450f5f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 10 二月 2025 10:15:38 +0800
Subject: [PATCH] websocket改造

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java |   59 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
index 32e551d..ba48a02 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
@@ -195,7 +195,8 @@
                         sysUser.setNickName("白金用户");
                         sysUser.setUserType("03");
                         sysUser.setPhonenumber(response.getOpenId());
-                        sysUser.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
+                        sysUser.setAvatar(
+                                "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/ca8552a34fb64d4d846afa1b5b173cf9.png");
                         String password = "123456";
                         sysUser.setPassword(SecurityUtils.encryptPassword(password));
                         sysUser = sysUserService.registerUser(sysUser).getData();
@@ -207,7 +208,8 @@
                         member.setDelFlag(0);
                         member.setNickname("白酒用户");
                         member.setPhone(appMiniLoginDto.getPhone());
-                        member.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
+                        member.setAvatar(
+                                "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/ca8552a34fb64d4d846afa1b5b173cf9.png");
                         member.setZfbOpenid(response.getOpenId());
                         this.save(member);
                         appMiniLoginVo.setZfbuserid(response.getUserId());
@@ -259,7 +261,7 @@
                     sysUser.setNickName("白金用户");
                     sysUser.setUserType("03");
                     sysUser.setAvatar(
-                            "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
+                            "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/ca8552a34fb64d4d846afa1b5b173cf9.png");
                     String password = "123456";
                     sysUser.setPassword(SecurityUtils.encryptPassword(password));
                     sysUser = sysUserService.registerUser(sysUser).getData();
@@ -271,7 +273,7 @@
                     member.setDelFlag(0);
                     member.setNickname("白酒用户");
                     member.setAvatar(
-                            "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
+                            "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/ca8552a34fb64d4d846afa1b5b173cf9.png");
                     member.setWxUnionid(unionid);
                     member.setPhone(appMiniLoginDto.getPhone());
                     member.setMiniOpenid(openid);
@@ -455,32 +457,33 @@
                 mobile=openapiResult1.get("mobile");
             }
         }else{
-            String responseAccessToken = null;
-            try {
-                responseAccessToken = getAccessTokenByWX();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
+            if (StringUtils.isNotBlank(mobileDTO.getCode())) {
+                String responseAccessToken = null;
+                try {
+                    responseAccessToken = getAccessTokenByWX();
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
 
-            JSONObject jsonAccessToken = JSONObject.parseObject(responseAccessToken);
-            String accessToken = jsonAccessToken.getString("access_token");
-            String errmsg = jsonAccessToken.getString("errmsg");
-            Long expiresIn = jsonAccessToken.getLong("expires_in");
-            if (StringUtils.isBlank(accessToken)) {
-                throw new ServiceException(errmsg);
+                JSONObject jsonAccessToken = JSONObject.parseObject(responseAccessToken);
+                String accessToken = jsonAccessToken.getString("access_token");
+                String errmsg = jsonAccessToken.getString("errmsg");
+                Long expiresIn = jsonAccessToken.getLong("expires_in");
+                if (StringUtils.isBlank(accessToken)) {
+                    throw new ServiceException(errmsg);
+                }
+                String responseUserPhoneNumber = null;
+                try {
+                    responseUserPhoneNumber = getMobileByWX(accessToken, mobileDTO.getCode());
+                    log.info("微信获取手机号返回值:{}", JSON.toJSONString(responseUserPhoneNumber));
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+                JSONObject jsonUserPhoneNumber = JSONObject.parseObject(responseUserPhoneNumber);
+                String phoneInfo = jsonUserPhoneNumber.getString("phone_info");
+                JSONObject jsonUserPhoneInfo = JSONObject.parseObject(phoneInfo);
+                mobile = jsonUserPhoneInfo.getString("purePhoneNumber");
             }
-            String responseUserPhoneNumber = null;
-            try {
-                responseUserPhoneNumber = getMobileByWX(accessToken, mobileDTO.getCode());
-                log.info("微信获取手机号返回值:{}", JSON.toJSONString(responseUserPhoneNumber));
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-            JSONObject jsonUserPhoneNumber = JSONObject.parseObject(responseUserPhoneNumber);
-            String phoneInfo = jsonUserPhoneNumber.getString("phone_info");
-            JSONObject jsonUserPhoneInfo = JSONObject.parseObject(phoneInfo);
-            mobile= jsonUserPhoneInfo.getString("purePhoneNumber");
-
         }
         return mobile;
     }

--
Gitblit v1.7.1