|
@@ -8,6 +8,7 @@ import com.miaxis.common.core.domain.model.LoginBody;
|
|
import com.miaxis.common.core.domain.model.LoginBodyNoCode;
|
|
import com.miaxis.common.core.domain.model.LoginBodyNoCode;
|
|
import com.miaxis.common.core.domain.model.LoginUser;
|
|
import com.miaxis.common.core.domain.model.LoginUser;
|
|
import com.miaxis.common.enums.StudentLoginTypeEnum;
|
|
import com.miaxis.common.enums.StudentLoginTypeEnum;
|
|
|
|
+import com.miaxis.common.exception.CustomException;
|
|
import com.miaxis.common.utils.SecurityUtils;
|
|
import com.miaxis.common.utils.SecurityUtils;
|
|
import com.miaxis.common.utils.ServletUtils;
|
|
import com.miaxis.common.utils.ServletUtils;
|
|
import com.miaxis.framework.web.service.SysLoginService;
|
|
import com.miaxis.framework.web.service.SysLoginService;
|
|
@@ -111,10 +112,12 @@ public class SysLoginController
|
|
@PostMapping("/login/code")
|
|
@PostMapping("/login/code")
|
|
@ApiOperation("用户授权码模式登录")
|
|
@ApiOperation("用户授权码模式登录")
|
|
public Response<TokenDTO> loginByAuthorizationCode(String authorizationCode ){
|
|
public Response<TokenDTO> loginByAuthorizationCode(String authorizationCode ){
|
|
-
|
|
|
|
-
|
|
|
|
- WxResult wxResult = wxService.getWxToken(appid, appSecret, authorizationCode, "authorization_code");
|
|
|
|
|
|
+ String wxResultStr = wxService.getWxToken(appid, appSecret, authorizationCode, "authorization_code");
|
|
|
|
+ WxResult wxResult = JSONObject.parseObject(wxResultStr,WxResult.class);
|
|
// 生成令牌
|
|
// 生成令牌
|
|
|
|
+ if (wxResult.getErrcode() != null){
|
|
|
|
+ throw new CustomException(wxResult.getErrmsg());
|
|
|
|
+ }
|
|
String token = loginService.login(wxResult.getOpenid(),null, StudentLoginTypeEnum.OPENID_LOGIN.getCode());
|
|
String token = loginService.login(wxResult.getOpenid(),null, StudentLoginTypeEnum.OPENID_LOGIN.getCode());
|
|
TokenDTO tokenDTO = new TokenDTO();
|
|
TokenDTO tokenDTO = new TokenDTO();
|
|
tokenDTO.setToken(token);
|
|
tokenDTO.setToken(token);
|