|
|
@@ -5,6 +5,7 @@ import cn.iselab.mooctest.site.configure.realm.DefaultUsernamepasswordToken;
|
|
|
import cn.iselab.mooctest.site.dao.MobileVerificationDao;
|
|
|
import cn.iselab.mooctest.site.models.MobileVerification;
|
|
|
import cn.iselab.mooctest.site.models.User;
|
|
|
+import cn.iselab.mooctest.site.service.OpenId2UserIdService;
|
|
|
import cn.iselab.mooctest.site.service.UserService;
|
|
|
import cn.iselab.mooctest.site.web.data.ManagerPropertyVO;
|
|
|
import cn.iselab.mooctest.site.web.data.UserVO;
|
|
|
@@ -52,6 +53,9 @@ public class UserController {
|
|
|
@Autowired
|
|
|
private ManagerPropertyLogic managerPropertyLogic;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private OpenId2UserIdService openId2UserIdService;
|
|
|
+
|
|
|
private Logger LOG = LoggerFactory.getLogger(getClass());
|
|
|
|
|
|
@RequiresPermissions("personInfo:update")
|
|
|
@@ -131,6 +135,7 @@ public class UserController {
|
|
|
userVO = userVOWrapper.wrap(user);
|
|
|
userVO.setPassword("");
|
|
|
userVO.setMenuVOs(menuLogic.getMenuListByUserId(user.getId()));
|
|
|
+ userVO.setOpenId(openId2UserIdService.findOpenIdByUserId(userVO.getId()));
|
|
|
currentUser.getSession().setAttribute("User", user);
|
|
|
return userVO;
|
|
|
} else {
|