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 a798df1..15b6b67 100644 --- a/src/main/java/com/chinaweal/aiccs/org/controller/OAuth2Controller.java +++ b/src/main/java/com/chinaweal/aiccs/org/controller/OAuth2Controller.java @@ -523,14 +523,14 @@ public class OAuth2Controller extends BaseController { @ApiOperation("获取一个加密登录的登录用数据串") @GetMapping("sm4/encrypted/data") public RestResult getSm4EncryptedData(HttpServletRequest request) { - LoginMessage loginMessage = getLoginMessage(request); - if (loginMessage == null) { + AICUser loginUser = getLoginUser(request); + if (loginUser == null) { return RestResult.error(ResultCode.USER_NOT_LOGGED_IN); } JSONObject jsonObject = new JSONObject(); - jsonObject.put("userId", loginMessage.getUserId()); - jsonObject.put("username", loginMessage.getUsername()); - jsonObject.put("nickname", loginMessage.getNickName()); + jsonObject.put("userId", loginUser.getPrimaryKey()); + jsonObject.put("username", loginUser.getEname()); + jsonObject.put("nickname", loginUser.getName()); jsonObject.put("expired", System.currentTimeMillis() + 1000 * 60 * 5);// 增加有效期 return RestResult.ok(SM4Utils.encrypt(jsonObject.toJSONString(), sm4Key)); }