扫码登陆

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/CbsQrCodeScanServiceImpl.java

@@ -42,7 +42,7 @@ public class CbsQrCodeScanServiceImpl implements CbsQrCodeScanService {
         OAuth2AccessToken oAuth2AccessToken = redisTokenStore.readAccessToken(req.getPassword());
         if (oAuth2AccessToken != null) {
             OAuth2Authentication authentication = redisTokenStore.readAuthentication(req.getPassword());
-            Map<String,String> hashMap = objectMapper.convertValue(authentication.getPrincipal(), HashMap.class);
+            Map<String,String> hashMap = objectMapper.convertValue(authentication.getUserAuthentication().getPrincipal(), HashMap.class);
             String userId = hashMap.get("userId");
             SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
             if (sysUser == null) {

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -93,6 +93,11 @@ public class UserController extends BaseController {
 	public CbsQrCodeScanWrapper.QrCodeScanToken login(@RequestBody CbsQrCodeScanWrapper.QrCodeScanReq req) {
 		return cbsQrCodeScanService.login(req);
 	}
+	@ApiOperation(value = "查询用户信息接口")
+	@PostMapping("/userInfo")
+	public CbsQrCodeScanWrapper.UserInfo userInfo(@RequestBody CbsQrCodeScanWrapper.QrCodeScanUserInfoReq req) {
+		return cbsQrCodeScanService.userInfo(req);
+	}
 
 	@ApiOperation(value = "根据用户编号获取用户基本信息")
 	@GetMapping("/getBasic")