diff --git a/src/main/java/com/chinaweal/aiccs/org/controller/OAuth2Controller.java b/src/main/java/com/chinaweal/aiccs/org/controller/OAuth2Controller.java index 47d89fd..a798df1 100644 --- a/src/main/java/com/chinaweal/aiccs/org/controller/OAuth2Controller.java +++ b/src/main/java/com/chinaweal/aiccs/org/controller/OAuth2Controller.java @@ -3,6 +3,7 @@ package com.chinaweal.aiccs.org.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.chinaweal.aiccs.common.base.controller.BaseController; +import com.chinaweal.aiccs.common.base.entity.dto.login.LoginMessage; import com.chinaweal.aiccs.common.util.OAuthTokenUtils; import com.chinaweal.aiccs.common.util.SM4Utils; import com.chinaweal.aiccs.common.util.StringUtils; @@ -522,11 +523,14 @@ public class OAuth2Controller extends BaseController { @ApiOperation("获取一个加密登录的登录用数据串") @GetMapping("sm4/encrypted/data") public RestResult getSm4EncryptedData(HttpServletRequest request) { - AICUser loginUser = getLoginUser(request); - if (loginUser == null) { + LoginMessage loginMessage = getLoginMessage(request); + if (loginMessage == null) { return RestResult.error(ResultCode.USER_NOT_LOGGED_IN); } - JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(loginUser)); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("userId", loginMessage.getUserId()); + jsonObject.put("username", loginMessage.getUsername()); + jsonObject.put("nickname", loginMessage.getNickName()); jsonObject.put("expired", System.currentTimeMillis() + 1000 * 60 * 5);// 增加有效期 return RestResult.ok(SM4Utils.encrypt(jsonObject.toJSONString(), sm4Key)); }