NCZY/WAI_Project_BACKEND
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整：优化代码结构

Browse Source
This commit is contained in:
ruying408
2024-09-06 00:14:09 +08:00
parent a92e0d7a88
commit 17d714633e
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/cool/modules/user/service/WxService.java → src/main/java/com/cool/modules/user/proxy/WxProxy.java
View File

@@ -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.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
@@ -10,7 +10,7 @@ import me.chanjar.weixin.mp.api.WxMpService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
public class WxService { public class WxProxy {
public WxMaService getWxMaService() { public WxMaService getWxMaService() {
return (WxMaService)CoolPluginInvokers.invoke("wx", "getWxMaService"); return (WxMaService)CoolPluginInvokers.invoke("wx", "getWxMaService");
} }

6
src/main/java/com/cool/modules/user/service/impl/UserLoginServiceImpl.java
View File

@@ -15,10 +15,10 @@ import com.cool.core.security.jwt.JwtUser;
import com.cool.modules.base.service.sys.BaseSysLoginService; import com.cool.modules.base.service.sys.BaseSysLoginService;
import com.cool.modules.user.entity.UserInfoEntity; import com.cool.modules.user.entity.UserInfoEntity;
import com.cool.modules.user.entity.UserWxEntity; 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.UserInfoService;
import com.cool.modules.user.service.UserLoginService; import com.cool.modules.user.service.UserLoginService;
import com.cool.modules.user.service.UserWxService; 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;
import com.cool.modules.user.util.UserSmsUtil.SendSceneEnum; import com.cool.modules.user.util.UserSmsUtil.SendSceneEnum;
import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.query.QueryWrapper;
@@ -45,7 +45,7 @@ public class UserLoginServiceImpl implements UserLoginService {
private final UserWxService userWxService; private final UserWxService userWxService;
private final WxService wxService; private final WxProxy wxProxy;
private final static List<GrantedAuthority> authority = private final static List<GrantedAuthority> authority =
List.of(new SimpleGrantedAuthority("ROLE_" + UserTypeEnum.APP.name())); List.of(new SimpleGrantedAuthority("ROLE_" + UserTypeEnum.APP.name()));
@@ -115,7 +115,7 @@ public class UserLoginServiceImpl implements UserLoginService {
@Override @Override
public Object miniPhone(String code, String encryptedData, String iv) { public Object miniPhone(String code, String encryptedData, String iv) {
try { try {
WxMaPhoneNumberInfo phoneNumber = wxService.getPhoneNumber(code); WxMaPhoneNumberInfo phoneNumber = wxProxy.getPhoneNumber(code);
CoolPreconditions.checkEmpty(phoneNumber, "微信登录失败"); CoolPreconditions.checkEmpty(phoneNumber, "微信登录失败");
return generateTokenByPhone(phoneNumber.getPhoneNumber()); return generateTokenByPhone(phoneNumber.getPhoneNumber());
} catch (WxErrorException e) { } catch (WxErrorException e) {

8
src/main/java/com/cool/modules/user/service/impl/UserWxServiceImpl.java
View File

@@ -8,8 +8,8 @@ import com.cool.core.base.BaseServiceImpl;
import com.cool.core.exception.CoolPreconditions; import com.cool.core.exception.CoolPreconditions;
import com.cool.modules.user.entity.UserWxEntity; import com.cool.modules.user.entity.UserWxEntity;
import com.cool.modules.user.mapper.UserWxMapper; 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.UserWxService;
import com.cool.modules.user.service.WxService;
import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.query.QueryWrapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.error.WxErrorException;
@@ -22,7 +22,7 @@ import org.springframework.stereotype.Service;
@RequiredArgsConstructor @RequiredArgsConstructor
public class UserWxServiceImpl extends BaseServiceImpl<UserWxMapper, UserWxEntity> implements UserWxService { 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 // 获取 session
WxMaJscode2SessionResult result = null; WxMaJscode2SessionResult result = null;
try { 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)) { if (ObjUtil.isNotEmpty(wxMaUserInfo)) {
UserWxEntity userWxEntity = BeanUtil.copyProperties(wxMaUserInfo, UserWxEntity.class); UserWxEntity userWxEntity = BeanUtil.copyProperties(wxMaUserInfo, UserWxEntity.class);
userWxEntity.setOpenid(result.getOpenid()); userWxEntity.setOpenid(result.getOpenid());