sas分支前端同步master分支

jeecgboot-vue3/src/api/sys/model/userModel.ts

@@ -4,13 +4,11 @@
 export interface LoginParams {
   username: string;
   password: string;
-  grant_type: string;
 }
 
 export interface ThirdLoginParams {
   token: string;
   thirdType: string;
-  grant_type: string;
 }
 
 export interface RoleInfo {

jeecgboot-vue3/src/api/sys/user.ts

@@ -13,7 +13,7 @@ import { ExceptionEnum } from "@/enums/exceptionEnum";
 const { createErrorModal } = useMessage();
 enum Api {
   Login = '/sys/login',
-  phoneLogin = '/oauth2/token',
+  phoneLogin = '/sys/phoneLogin',
   Logout = '/sys/logout',
   GetUserInfo = '/sys/user/getUserInfo',
   // 获取系统权限
@@ -36,7 +36,7 @@ enum Api {
   //修改密码
   passwordChange = '/sys/user/passwordChange',
   //第三方登录
-  thirdLogin = '/oauth2/token',
+  thirdLogin = '/sys/thirdLogin/getLoginUser',
   //第三方登录
   getThirdCaptcha = '/sys/thirdSms',
   //获取二维码信息
@@ -53,10 +53,6 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal')
     {
       url: Api.Login,
       params,
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        'Authorization': 'Basic amVlY2ctY2xpZW50OnNlY3JldA=='
-      },
     },
     {
       errorMessageMode: mode,
@@ -72,13 +68,8 @@ export function phoneLoginApi(params: LoginParams, mode: ErrorMessageMode = 'mod
     {
       url: Api.phoneLogin,
       params,
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        'Authorization': 'Basic amVlY2ctY2xpZW50OnNlY3JldA=='
-      },
     },
     {
-      isTransformResponse: false,
       errorMessageMode: mode,
     }
   );
@@ -180,19 +171,12 @@ export function thirdLogin(params, mode: ErrorMessageMode = 'modal') {
     tenantId = params.tenantId;
   }
   //==========end 第三方登录/auth2登录需要传递租户id===========
-  return defHttp.post<LoginResultModel>(
+  return defHttp.get<LoginResultModel>(
     {
-      url: `${Api.thirdLogin}`,
-      params,
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        'Authorization': 'Basic amVlY2ctY2xpZW50OnNlY3JldA=='
-      },
+      url: `${Api.thirdLogin}/${params.token}/${params.thirdType}/${tenantId}`,
     },
     {
-      isTransformResponse: false,
       errorMessageMode: mode,
-      
     }
   );
 }

jeecgboot-vue3/src/store/modules/user.ts

@@ -151,7 +151,6 @@ export const useUserStore = defineStore({
     ): Promise<GetUserInfoModel | null> {
       try {
         const { goHome = true, mode, ...loginParams } = params;
-        loginParams.grant_type = 'password';
         const data = await loginApi(loginParams, mode);
         const { token, userInfo } = data;
         // save token
@@ -249,11 +248,10 @@ export const useUserStore = defineStore({
     ): Promise<GetUserInfoModel | null> {
       try {
         const { goHome = true, mode, ...loginParams } = params;
-        loginParams.grant_type = 'phone';
         const data = await phoneLoginApi(loginParams, mode);
-        const { access_token } = data;
+        const { token } = data;
         // save token
-        this.setToken(access_token);
+        this.setToken(token);
         return this.afterLoginAction(goHome, data);
       } catch (error) {
         return Promise.reject(error);
@@ -358,11 +356,10 @@ export const useUserStore = defineStore({
     ): Promise<any | null> {
       try {
         const { goHome = true, mode, ...ThirdLoginParams } = params;
-        ThirdLoginParams.grant_type = "social";
         const data = await thirdLogin(ThirdLoginParams, mode);
-        const { access_token } = data;
+        const { token } = data;
         // save token
-        this.setToken(access_token);
+        this.setToken(token);
         return this.afterLoginAction(goHome, data);
       } catch (error) {
         return Promise.reject(error);

jeecgboot-vue3/src/utils/http/axios/index.ts

@@ -165,7 +165,7 @@ const transform: AxiosTransform = {
     // update-end--author:liaozhiyang---date:20240509---for：【issues/1220】登录时，vue3版本不加载字典数据设置无效
     if (token && (config as Recordable)?.requestOptions?.withToken !== false) {
       // jwt token
-      config.headers.Authorization = options.authenticationScheme ? `${options.authenticationScheme} ${token}` : 'Bearer ' + token;
+      config.headers.Authorization = options.authenticationScheme ? `${options.authenticationScheme} ${token}` : token;
       config.headers[ConfigEnum.TOKEN] = token;
       
       // 将签名和时间戳，添加在请求接口 Header

jeecgboot-vue3/src/views/sys/login/LoginForm.vue

@@ -149,7 +149,6 @@
           username: data.account,
           captcha: data.inputCode,
           checkKey: randCodeData.checkKey,
-          grant_type: 'password',
           mode: 'none', //不要默认的错误提示
         })
       );