From 45d37a6febb87837a6daa65429703a37e437d257 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 17 七月 2023 19:58:39 +0800
Subject: [PATCH] bug
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/QwH5Controller.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/QwH5Controller.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/QwH5Controller.java
index 0ca7174..6c749ca 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/QwH5Controller.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/QwH5Controller.java
@@ -1,8 +1,11 @@
package com.ruoyi.auth.controller;
+import com.alibaba.fastjson.JSONObject;
import com.ruoyi.auth.service.QywxInnerService;
import com.ruoyi.auth.service.SysLoginService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.system.api.model.*;
import io.swagger.annotations.Api;
@@ -62,9 +65,12 @@
//JSONObject result = qywxInnerService.getOauthUser(code);
//QwUserDetailDto qwUserDetail = JSONObject.parseObject(result.toJSONString(), QwUserDetailDto.class);
QwUserDetailDto qwUserDetail = new QwUserDetailDto();
- qwUserDetail.setMobile("13882237106");
+ qwUserDetail.setMobile("17780704874");
+ if(StringUtils.isBlank(qwUserDetail.getMobile())){
+ throw new ServiceException("企业微信未授权手机号，无法登录");
+ }
// 1、查数据库获取人员
- QwH5LoginVo qwH5LoginVo = sysLoginService.qwH5Login(qwUserDetail);
+ QwH5LoginVo qwH5LoginVo = sysLoginService.qwH5StaffLogin(qwUserDetail);
// 2、生成Token
return R.ok(tokenService.createQwH5Token(qwH5LoginVo));
}
@@ -73,12 +79,15 @@
@ApiOperation("通过code获取商户端用户登录")
public R<OauthUserVo> oauthUser(@ApiParam(value = "成员授权获取到的code", required = true) @RequestParam("code") String code) throws IOException {
// 通过code获取访问用户敏感信息
- //JSONObject result = qywxInnerService.getOauthUser(code);
- //QwUserDetailDto qwUserDetail = JSONObject.parseObject(result.toJSONString(), QwUserDetailDto.class);
- QwUserDetailDto qwUserDetail = new QwUserDetailDto();
- qwUserDetail.setMobile("13882237106");
+ JSONObject result = qywxInnerService.getOauthUser(code);
+ QwUserDetailDto qwUserDetail = JSONObject.parseObject(result.toJSONString(), QwUserDetailDto.class);
+ if(StringUtils.isBlank(qwUserDetail.getMobile())){
+ throw new ServiceException("企业微信未授权手机号，无法登录");
+ }
+ //QwUserDetailDto qwUserDetail = new QwUserDetailDto();
+ //qwUserDetail.setMobile("13882237106");
// 1、查数据库获取人员
- QwH5LoginVo qwH5LoginVo = sysLoginService.qwH5StaffLogin(qwUserDetail);
+ QwH5LoginVo qwH5LoginVo = sysLoginService.qwH5Login(qwUserDetail);
// 2、生成Token
return R.ok(tokenService.createQwH5Token(qwH5LoginVo));
}
--
Gitblit v1.7.1