From a966dafb8877552267a94fe8c544c5ea72cf5650 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 16 六月 2025 09:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/QwH5Controller.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 b975a1e..32643d7 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
@@ -75,10 +75,10 @@
@ApiOperation("通过code获取员工端用户登录")
public R<OauthUserVo> oauthStaff(@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("17780704874");
+ JSONObject result = qywxInnerService.getOauthUser(code);
+ QwUserDetailDto qwUserDetail = JSONObject.parseObject(result.toJSONString(), QwUserDetailDto.class);
+ //QwUserDetailDto qwUserDetail = new QwUserDetailDto();
+ //qwUserDetail.setMobile("17780704874");
if(StringUtils.isBlank(qwUserDetail.getMobile())){
throw new ServiceException("企业微信未授权手机号，无法登录");
}
@@ -87,9 +87,9 @@
// 2、生成Token
return R.ok(tokenService.createQwH5Token(qwH5LoginVo));
}
-
+
@GetMapping("/h5/oauthUser")
- @ApiOperation("通过code获取商户端用户登录")
+ @ApiOperation("通过code获取商户端用户登录【2.0】")
public R<OauthUserVo> oauthUser(@ApiParam(value = "成员授权获取到的code", required = true) @RequestParam("code") String code) throws IOException {
// 通过code获取访问用户敏感信息
JSONObject result = qywxInnerService.getOauthUser(code);
--
Gitblit v1.7.1