Merge remote-tracking branch 'origin/release' into release

dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java

@@ -453,7 +453,12 @@ public class SsoLoginServiceImpl implements SsoLoginService {
             String post = HttpUtil.post(AdminConfig.queryUserUrl, jsonObject.toString(), 300000);
             log.info("获取菜单信息返回：{}", post);
             if (StringUtils.isNotBlank(post)) {
-                SsoReturnUserModel ssoReturnUserModel = JSON.parseObject(post, SsoReturnUserModel.class);
+                jsonObject = JSONObject.parseObject(post);
+                SsoReturnUserModel ssoReturnUserModel = new SsoReturnUserModel();
+                ssoReturnUserModel.setCode(jsonObject.getString("code"));
+                ssoReturnUserModel.setMessage(jsonObject.getString("message"));
+                ssoReturnUserModel.setData(JSON.parseObject(jsonObject.getString("data"), SsoUser.class));
+                //SsoReturnUserModel ssoReturnUserModel = JSON.parseObject(post, SsoReturnUserModel.class);
                 if ("0000".equals(ssoReturnUserModel.getCode())) {
                     List<SysMenuEntity> sysMenuEntities = this.toMenu(ssoReturnUserModel.getData());