diff --git a/src/api/sys/model/userModel.ts b/src/api/sys/model/userModel.ts index 5cad2f0..dab4e74 100644 --- a/src/api/sys/model/userModel.ts +++ b/src/api/sys/model/userModel.ts @@ -10,6 +10,7 @@ export interface LoginParams { export interface ThirdLoginParams { token: string; thirdType: string; + grant_type: string; } export interface RoleInfo { diff --git a/src/api/sys/user.ts b/src/api/sys/user.ts index 0b485bf..50f0b85 100644 --- a/src/api/sys/user.ts +++ b/src/api/sys/user.ts @@ -35,7 +35,7 @@ enum Api { //修改密码 passwordChange = '/sys/user/passwordChange', //第三方登录 - thirdLogin = '/sys/thirdLogin/getLoginUser', + thirdLogin = '/oauth2/token', //第三方登录 getThirdCaptcha = '/sys/thirdSms', //获取二维码信息 @@ -172,12 +172,19 @@ export function thirdLogin(params, mode: ErrorMessageMode = 'modal') { tenantId = params.tenantId; } //==========end 第三方登录/auth2登录需要传递租户id=========== - return defHttp.get( + return defHttp.post( { - url: `${Api.thirdLogin}/${params.token}/${params.thirdType}/${tenantId}`, + url: `${Api.thirdLogin}`, + params, + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + 'Authorization': 'Basic amVlY2ctY2xpZW50OnNlY3JldA==' + }, }, { + isTransformResponse: false, errorMessageMode: mode, + } ); } diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index cbcadc9..218b506 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -321,10 +321,11 @@ export const useUserStore = defineStore({ ): Promise { try { const { goHome = true, mode, ...ThirdLoginParams } = params; + ThirdLoginParams.grant_type = "social"; const data = await thirdLogin(ThirdLoginParams, mode); - const { token } = data; + const { access_token } = data; // save token - this.setToken(token); + this.setToken(access_token); return this.afterLoginAction(goHome, data); } catch (error) { return Promise.reject(error);