|
@@ -6,6 +6,7 @@ import com.miaxis.common.core.domain.Response;
|
|
|
import com.miaxis.common.core.domain.WxUserInfo;
|
|
|
import com.miaxis.common.core.domain.entity.SysMenu;
|
|
|
import com.miaxis.common.core.domain.entity.SysUser;
|
|
|
+import com.miaxis.common.core.domain.entity.UserInfo;
|
|
|
import com.miaxis.common.core.domain.model.LoginBody;
|
|
|
import com.miaxis.common.core.domain.model.LoginBodyNoCode;
|
|
|
import com.miaxis.common.core.domain.model.LoginUser;
|
|
@@ -180,6 +181,13 @@ public class SysLoginController
|
|
|
ServletUtils.getRequest().setAttribute("xcxOpenid",wxUserInfo.getOpenid());
|
|
|
ServletUtils.getRequest().setAttribute("pUnionId",pUnionId);
|
|
|
String token = loginService.login(wxUserInfo.getUnionid(),null, StudentLoginTypeEnum.AUTHORIZATION_XCX_LOGIN.getCode());
|
|
|
+
|
|
|
+ UserInfo student = SecurityUtils.getLoginUser().getStudent();
|
|
|
+ UserInfo dbUserInfo = userInfoService.getById(student.getId());
|
|
|
+ wxUserInfo.setNickname(dbUserInfo.getNickName());
|
|
|
+ wxUserInfo.setOpenid(dbUserInfo.getXcxOpenid());
|
|
|
+ wxUserInfo.setHeadimgurl(dbUserInfo.getHeadImage());
|
|
|
+
|
|
|
tokenDTO.setToken(token);
|
|
|
tokenDTO.setThirdResult(wxUserInfo);
|
|
|
return Response.success(tokenDTO) ;
|