From 17d714633edaf92b668b503c91668cf76e8d467d Mon Sep 17 00:00:00 2001
From: ruying408 <1877972603@qq.com>
Date: Fri, 6 Sep 2024 00:14:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/{service/WxService.java => proxy/WxProxy.java}   | 4 ++--
 .../modules/user/service/impl/UserLoginServiceImpl.java   | 6 +++---
 .../cool/modules/user/service/impl/UserWxServiceImpl.java | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename src/main/java/com/cool/modules/user/{service/WxService.java => proxy/WxProxy.java} (95%)

diff --git a/src/main/java/com/cool/modules/user/service/WxService.java b/src/main/java/com/cool/modules/user/proxy/WxProxy.java
similarity index 95%
rename from src/main/java/com/cool/modules/user/service/WxService.java
rename to src/main/java/com/cool/modules/user/proxy/WxProxy.java
index 78be7f6..ffcba4c 100644
--- a/src/main/java/com/cool/modules/user/service/WxService.java
+++ b/src/main/java/com/cool/modules/user/proxy/WxProxy.java
@@ -1,4 +1,4 @@
-package com.cool.modules.user.service;
+package com.cool.modules.user.proxy;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
@@ -10,7 +10,7 @@ import me.chanjar.weixin.mp.api.WxMpService;
 import org.springframework.stereotype.Service;
 
 @Service
-public class WxService {
+public class WxProxy {
     public WxMaService getWxMaService() {
         return (WxMaService)CoolPluginInvokers.invoke("wx", "getWxMaService");
     }
diff --git a/src/main/java/com/cool/modules/user/service/impl/UserLoginServiceImpl.java b/src/main/java/com/cool/modules/user/service/impl/UserLoginServiceImpl.java
index c1c9a04..d8202a6 100644
--- a/src/main/java/com/cool/modules/user/service/impl/UserLoginServiceImpl.java
+++ b/src/main/java/com/cool/modules/user/service/impl/UserLoginServiceImpl.java
@@ -15,10 +15,10 @@ import com.cool.core.security.jwt.JwtUser;
 import com.cool.modules.base.service.sys.BaseSysLoginService;
 import com.cool.modules.user.entity.UserInfoEntity;
 import com.cool.modules.user.entity.UserWxEntity;
+import com.cool.modules.user.proxy.WxProxy;
 import com.cool.modules.user.service.UserInfoService;
 import com.cool.modules.user.service.UserLoginService;
 import com.cool.modules.user.service.UserWxService;
-import com.cool.modules.user.service.WxService;
 import com.cool.modules.user.util.UserSmsUtil;
 import com.cool.modules.user.util.UserSmsUtil.SendSceneEnum;
 import com.mybatisflex.core.query.QueryWrapper;
@@ -45,7 +45,7 @@ public class UserLoginServiceImpl implements UserLoginService {
 
     private final UserWxService userWxService;
 
-    private final WxService wxService;
+    private final WxProxy wxProxy;
     private final static List<GrantedAuthority> authority =
       List.of(new SimpleGrantedAuthority("ROLE_" + UserTypeEnum.APP.name()));
 
@@ -115,7 +115,7 @@ public class UserLoginServiceImpl implements UserLoginService {
     @Override
     public Object miniPhone(String code, String encryptedData, String iv) {
         try {
-            WxMaPhoneNumberInfo phoneNumber = wxService.getPhoneNumber(code);
+            WxMaPhoneNumberInfo phoneNumber = wxProxy.getPhoneNumber(code);
             CoolPreconditions.checkEmpty(phoneNumber, "微信登录失败");
             return generateTokenByPhone(phoneNumber.getPhoneNumber());
         } catch (WxErrorException e) {
diff --git a/src/main/java/com/cool/modules/user/service/impl/UserWxServiceImpl.java b/src/main/java/com/cool/modules/user/service/impl/UserWxServiceImpl.java
index ed185e3..6b8286c 100644
--- a/src/main/java/com/cool/modules/user/service/impl/UserWxServiceImpl.java
+++ b/src/main/java/com/cool/modules/user/service/impl/UserWxServiceImpl.java
@@ -8,8 +8,8 @@ import com.cool.core.base.BaseServiceImpl;
 import com.cool.core.exception.CoolPreconditions;
 import com.cool.modules.user.entity.UserWxEntity;
 import com.cool.modules.user.mapper.UserWxMapper;
+import com.cool.modules.user.proxy.WxProxy;
 import com.cool.modules.user.service.UserWxService;
-import com.cool.modules.user.service.WxService;
 import com.mybatisflex.core.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -22,7 +22,7 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class UserWxServiceImpl extends BaseServiceImpl<UserWxMapper, UserWxEntity> implements UserWxService {
 
-    private final WxService wxService;
+    private final WxProxy wxProxy;
 
     /**
      * 获得小程序用户信息
@@ -31,9 +31,9 @@ public class UserWxServiceImpl extends BaseServiceImpl<UserWxMapper, UserWxEntit
         // 获取 session
         WxMaJscode2SessionResult result = null;
         try {
-            result = wxService.getSessionInfo(code);
+            result = wxProxy.getSessionInfo(code);
             // 解密数据
-            WxMaUserInfo wxMaUserInfo = wxService.getUserInfo(result.getSessionKey(), encryptedData, iv);
+            WxMaUserInfo wxMaUserInfo = wxProxy.getUserInfo(result.getSessionKey(), encryptedData, iv);
             if (ObjUtil.isNotEmpty(wxMaUserInfo)) {
                 UserWxEntity userWxEntity = BeanUtil.copyProperties(wxMaUserInfo, UserWxEntity.class);
                 userWxEntity.setOpenid(result.getOpenid());