[tag] 修复了原始框架接口导致的报错,全部换用自有接口
This commit is contained in:
parent
e0585e28bb
commit
c6d0c38232
|
|
@ -52,9 +52,7 @@ function createCommonRequest<ResponseData = any>(
|
||||||
async response => {
|
async response => {
|
||||||
const responseType: ResponseType = (response.config?.responseType as ResponseType) || 'json';
|
const responseType: ResponseType = (response.config?.responseType as ResponseType) || 'json';
|
||||||
|
|
||||||
response.data.errorMsg = "success";
|
|
||||||
if (responseType !== 'json' || opts.isBackendSuccess(response)) {
|
if (responseType !== 'json' || opts.isBackendSuccess(response)) {
|
||||||
console.log("true")
|
|
||||||
return Promise.resolve(response);
|
return Promise.resolve(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -63,11 +61,12 @@ function createCommonRequest<ResponseData = any>(
|
||||||
return fail;
|
return fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
// console.log('...Response Data:', response.data);
|
console.log('Response URL:', response.config.url); // 记录请求的 URL
|
||||||
// const isSuccess = opts.isBackendSuccess(response);
|
console.log('Response Data:', response.data); // 记录响应数据以便调试
|
||||||
// console.log('...Is Backend Success:', isSuccess);
|
|
||||||
|
|
||||||
const backendErrorMessage = response.data?.message || 'the backend request error.';
|
const backendErrorMessage = response.data?.message || 'the backend request error.';
|
||||||
|
|
||||||
|
|
||||||
|
console.log('Error detected for URL:', response.config.url); // 记录抛出错误的 URL
|
||||||
const backendError = new AxiosError<ResponseData>(
|
const backendError = new AxiosError<ResponseData>(
|
||||||
backendErrorMessage,
|
backendErrorMessage,
|
||||||
BACKEND_ERROR_CODE,
|
BACKEND_ERROR_CODE,
|
||||||
|
|
@ -77,11 +76,12 @@ function createCommonRequest<ResponseData = any>(
|
||||||
);
|
);
|
||||||
|
|
||||||
await opts.onError(backendError);
|
await opts.onError(backendError);
|
||||||
|
|
||||||
return Promise.reject(backendError);
|
return Promise.reject(backendError);
|
||||||
|
|
||||||
},
|
},
|
||||||
async (error: AxiosError<ResponseData>) => {
|
async (error: AxiosError<ResponseData>) => {
|
||||||
|
console.log('Request Error for URL:', error.config?.url); // 记录请求错误的 URL
|
||||||
|
console.error('Error Details:', error.message); // 记录错误详情
|
||||||
await opts.onError(error);
|
await opts.onError(error);
|
||||||
|
|
||||||
return Promise.reject(error);
|
return Promise.reject(error);
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ import { $t } from '@/locales';
|
||||||
import { useRouteStore } from '../route';
|
import { useRouteStore } from '../route';
|
||||||
import { useTabStore } from '../tab';
|
import { useTabStore } from '../tab';
|
||||||
import { clearAuthStorage, getToken } from './shared';
|
import { clearAuthStorage, getToken } from './shared';
|
||||||
|
import { apiRequestGet,apiRequestPost } from '@/utils/api';
|
||||||
|
|
||||||
export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
|
export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
|
@ -60,21 +61,24 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
|
||||||
* @param password Password
|
* @param password Password
|
||||||
* @param [redirect=true] Whether to redirect after login. Default is `true`
|
* @param [redirect=true] Whether to redirect after login. Default is `true`
|
||||||
*/
|
*/
|
||||||
async function login(userName: string, password: string, redirect = true) {
|
async function login(username: string, password: string, redirect = true) {
|
||||||
startLoading();
|
startLoading();
|
||||||
|
|
||||||
const { response, error } = await fetchLogin(userName, password);
|
let data = {username, password}
|
||||||
|
let response= await apiRequestPost('/auth/login',data);
|
||||||
|
|
||||||
let accessToken = response.data.token;
|
let accessToken = response.data.token;
|
||||||
let loginToken: Api.Auth.LoginToken = { token: accessToken, refreshToken: "" };
|
let loginToken: Api.Auth.LoginToken = { token: accessToken, refreshToken: "" };
|
||||||
let userId = response.data.employeeId
|
|
||||||
|
|
||||||
if (error?.status == 200) {
|
if (response.status) {
|
||||||
const pass = await loginByToken(loginToken,userId);
|
|
||||||
|
localStg.set('token', loginToken.token);
|
||||||
|
localStg.set('refreshToken', loginToken.refreshToken);
|
||||||
|
const pass = await getUserInfo();
|
||||||
|
|
||||||
if (pass) {
|
if (pass) {
|
||||||
|
token.value = loginToken.token;
|
||||||
await redirectFromLogin(redirect);
|
await redirectFromLogin(redirect);
|
||||||
|
|
||||||
window.$notification?.success({
|
window.$notification?.success({
|
||||||
message: $t('page.login.common.loginSuccess'),
|
message: $t('page.login.common.loginSuccess'),
|
||||||
description: $t('page.login.common.welcomeBack', { userName: userInfo.userName })
|
description: $t('page.login.common.welcomeBack', { userName: userInfo.userName })
|
||||||
|
|
@ -97,7 +101,6 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
|
||||||
|
|
||||||
if (pass) {
|
if (pass) {
|
||||||
token.value = loginToken.token;
|
token.value = loginToken.token;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -105,10 +108,10 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getUserInfo() {
|
async function getUserInfo() {
|
||||||
const { response, error } = await fetchGetUserInfo();
|
let response = await apiRequestGet('/employees/getUserInfo');
|
||||||
let data:any = response.data.data
|
let data:any = response.data.data
|
||||||
|
|
||||||
if (error?.status == 200) {
|
if (response.data.success) {
|
||||||
let info: Api.Auth.UserInfo = {
|
let info: Api.Auth.UserInfo = {
|
||||||
userId: data.employeeId.toString(),
|
userId: data.employeeId.toString(),
|
||||||
userName: data.name,
|
userName: data.name,
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, reactive } from 'vue';
|
import { computed, reactive } from 'vue';
|
||||||
import { $t } from '@/locales';
|
import { $t } from '@/locales';
|
||||||
import { loginModuleRecord } from '@/constants/app';
|
// import { loginModuleRecord } from '@/constants/app';
|
||||||
import { useRouterPush } from '@/hooks/common/router';
|
// import { useRouterPush } from '@/hooks/common/router';
|
||||||
import { useAntdForm, useFormRules } from '@/hooks/common/form';
|
import { useAntdForm, useFormRules } from '@/hooks/common/form';
|
||||||
import { useAuthStore } from '@/store/modules/auth';
|
import { useAuthStore } from '@/store/modules/auth';
|
||||||
|
|
||||||
|
|
@ -11,7 +11,7 @@ defineOptions({
|
||||||
});
|
});
|
||||||
|
|
||||||
const authStore = useAuthStore();
|
const authStore = useAuthStore();
|
||||||
const { toggleLoginModule } = useRouterPush();
|
// const { toggleLoginModule } = useRouterPush();
|
||||||
const { formRef, validate } = useAntdForm();
|
const { formRef, validate } = useAntdForm();
|
||||||
|
|
||||||
interface FormModel {
|
interface FormModel {
|
||||||
|
|
|
||||||
|
|
@ -131,12 +131,14 @@ const fetchData = async (page = 1, pageSize = 10) => {
|
||||||
const token = localStg.get('token'); // 替换为你的 token 键
|
const token = localStg.get('token'); // 替换为你的 token 键
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await apiRequestGet('/work-orders/my-orders', {
|
const response = await apiRequestGet('/work-orders/my-orders',
|
||||||
params: {
|
// {
|
||||||
page: page - 1, // 后端通常从0开始计数
|
// params: {
|
||||||
size: pageSize,
|
// page: page - 1, // 后端通常从0开始计数
|
||||||
}
|
// size: pageSize,
|
||||||
});
|
// }
|
||||||
|
//}
|
||||||
|
);
|
||||||
|
|
||||||
if (response.data.success) {
|
if (response.data.success) {
|
||||||
dataSource.value = response.data.data.content;
|
dataSource.value = response.data.data.content;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue