chuangte/share-space-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
邱贞招 2025-03-24 17:28:52 +08:00
parent 0f95feef4f
commit 2ac6e09579
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share-space-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
View File

@ -182,11 +182,11 @@ public class SysLoginController extends BaseController
* 微信登录 * 微信登录
*/ */
@PostMapping("/wxlogin") @PostMapping("/wxlogin")
public AjaxResult wxlogin(String mobileCode,String jsCode) { public AjaxResult wxlogin(String mobileCode,String jsCode, Long appid) {
log.info("【微信登录/wxlogin】areaId参数：【mobileCode={}】", mobileCode); log.info("【微信登录/wxlogin】areaId参数：【mobileCode={}】", mobileCode);
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
// 生成令牌 // 生成令牌
String token = loginService.wxloing(mobileCode,jsCode); String token = loginService.wxloing(mobileCode,jsCode,appid);
ajax.put(Constants.TOKEN, token); ajax.put(Constants.TOKEN, token);
return ajax; return ajax;
} }

29
share-space-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
View File

@ -101,7 +101,7 @@ public class SysLoginService
if(!StrUtil.isBlank(jsCode)){ if(!StrUtil.isBlank(jsCode)){
User updatedUser = new User(); User updatedUser = new User();
updatedUser.setPhonenumber(username); updatedUser.setPhonenumber(username);
// updatedUser.setWxopenid(getOpenId(jsCode,app.getConfig().getAppId(),app.getConfig().getAppSecret())); updatedUser.setWxopenid(getOpenId(jsCode,app.getConfig().getAppId(),app.getConfig().getAppSecret()));
int i = eUserService.updateUserByPhone(updatedUser); int i = eUserService.updateUserByPhone(updatedUser);
ServiceUtil.assertion(i == 0, "更新用户openid失败"); ServiceUtil.assertion(i == 0, "更新用户openid失败");
} }
@ -270,16 +270,17 @@ public class SysLoginService
/** /**
* 微信登录 * 微信登录
*/ */
public String wxloing(String mobileCode,String jsCode) { public String wxloing(String mobileCode,String jsCode,Long appid) {
//根据jsCode换取openid
String openId = getOpenId(jsCode);
String url = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token="; String url = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=";
String phoneNumber = null; String phoneNumber = null;
User user = null; User user = null;
/** 根据手机号获取到用户名*/ /** 根据手机号获取到用户名*/
AppVO app = appService.selectAppById(appid);
String token = AccessTokenUtil.getToken(appId,appSecret); ServiceUtil.assertion(app == null, "ID为%s的APP信息不存在，请联系管理员", appid);
//根据jsCode换取openid
String openId = getOpenId(jsCode,app.getConfig().getAppId(),app.getConfig().getAppSecret());
String token = AccessTokenUtil.getToken(app.getConfig().getAppId(),app.getConfig().getAppSecret());
url = url+token; url = url+token;
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("code",mobileCode); jsonObject.put("code",mobileCode);
@ -355,8 +356,7 @@ public class SysLoginService
AppVO app = appService.selectAppById(appid); AppVO app = appService.selectAppById(appid);
ServiceUtil.assertion(app == null, "ID为%s的APP信息不存在，请联系管理员", appid); ServiceUtil.assertion(app == null, "ID为%s的APP信息不存在，请联系管理员", appid);
// String openId = getOpenId(jsCode, app.getConfig().getAppId(),app.getConfig().getAppSecret()); String openId = getOpenId(jsCode, app.getConfig().getAppId(),app.getConfig().getAppSecret());
String openId = null;
User user = eUserService.selectUserByWxopenid(openId); User user = eUserService.selectUserByWxopenid(openId);
ServiceUtil.assertion(ObjectUtils.isEmpty(user),"未查询到用户信息"); ServiceUtil.assertion(ObjectUtils.isEmpty(user),"未查询到用户信息");
Authentication authentication = null; // 用户验证 Authentication authentication = null; // 用户验证
@ -383,7 +383,7 @@ public class SysLoginService
return tokenService.createToken(loginUser); return tokenService.createToken(loginUser);
} }
public String getOpenId(String jsCode) { public String getOpenId(String jsCode, String appId, String appSecret) {
//根据jsCode换取openid //根据jsCode换取openid
String url = StrUtil.format("https://api.weixin.qq.com/sns/jscode2session?appid={}&secret={}&js_code={}&grant_type=authorization_code", appId, appSecret, jsCode); String url = StrUtil.format("https://api.weixin.qq.com/sns/jscode2session?appid={}&secret={}&js_code={}&grant_type=authorization_code", appId, appSecret, jsCode);
String s = HttpUtils.sendGet(url); String s = HttpUtils.sendGet(url);
@ -400,12 +400,11 @@ public class SysLoginService
String uuid =loginBody.getUuid(); String uuid =loginBody.getUuid();
String jsCode = loginBody.getJsCode(); String jsCode = loginBody.getJsCode();
// // 查询APP信息 // 查询APP信息
// AppVO app = appService.selectAppById(loginBody.getAppid()); AppVO app = appService.selectAppById(loginBody.getAppid());
// ServiceUtil.assertion(app == null, "ID为%s的APP信息不存在，请联系管理员", loginBody.getAppid()); ServiceUtil.assertion(app == null, "ID为%s的APP信息不存在，请联系管理员", loginBody.getAppid());
//
// String openId = getOpenId(jsCode,app.getConfig().getAppId(),app.getConfig().getAppSecret()); String openId = getOpenId(jsCode,app.getConfig().getAppId(),app.getConfig().getAppSecret());
String openId = null;
User user = eUserService.selectUserByPhoneAndAppId(loginBody.getPhone()); User user = eUserService.selectUserByPhoneAndAppId(loginBody.getPhone());
if(ObjectUtils.isEmpty(user)){ if(ObjectUtils.isEmpty(user)){

2
share-space-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
View File

@ -94,7 +94,7 @@ public class SysRegisterService
{ {
AppVO appVO = appService.selectAppById(registerBody.getAppid()); AppVO appVO = appService.selectAppById(registerBody.getAppid());
ServiceUtil.assertion(appVO == null, "ID为%s的APP信息不存在，请联系管理员", registerBody.getAppid()); ServiceUtil.assertion(appVO == null, "ID为%s的APP信息不存在，请联系管理员", registerBody.getAppid());
// sysUser.setWxopenid(loginService.getOpenId(jsCode,appVO.getConfig().getAppId(),appVO.getConfig().getAppSecret())); sysUser.setWxopenid(loginService.getOpenId(jsCode,appVO.getConfig().getAppId(),appVO.getConfig().getAppSecret()));
sysUser.setPhonenumber(username); sysUser.setPhonenumber(username);
sysUser.setPassword(SecurityUtils.encryptPassword(password)); sysUser.setPassword(SecurityUtils.encryptPassword(password));
sysUser.setAppId(registerBody.getAppid()); sysUser.setAppId(registerBody.getAppid());