[tag] 修复了原始框架接口导致的报错,全部换用自有接口

This commit is contained in:
LiuYuanchi 2025-04-28 16:22:29 +08:00
parent e0585e28bb
commit c6d0c38232
4 changed files with 42 additions and 37 deletions

View File

@ -51,37 +51,37 @@ function createCommonRequest<ResponseData = any>(
instance.interceptors.response.use(
async response => {
const responseType: ResponseType = (response.config?.responseType as ResponseType) || 'json';
response.data.errorMsg = "success";
if (responseType !== 'json' || opts.isBackendSuccess(response)) {
console.log("true")
return Promise.resolve(response);
}
const fail = await opts.onBackendFail(response, instance);
if (fail) {
return fail;
}
// console.log('...Response Data:', response.data);
// const isSuccess = opts.isBackendSuccess(response);
// console.log('...Is Backend Success:', isSuccess);
console.log('Response URL:', response.config.url); // 记录请求的 URL
console.log('Response Data:', response.data); // 记录响应数据以便调试
const backendErrorMessage = response.data?.message || 'the backend request error.';
const backendError = new AxiosError<ResponseData>(
backendErrorMessage,
BACKEND_ERROR_CODE,
response.config,
response.request,
response
);
await opts.onError(backendError);
return Promise.reject(backendError);
console.log('Error detected for URL:', response.config.url); // 记录抛出错误的 URL
const backendError = new AxiosError<ResponseData>(
backendErrorMessage,
BACKEND_ERROR_CODE,
response.config,
response.request,
response
);
await opts.onError(backendError);
return Promise.reject(backendError);
},
async (error: AxiosError<ResponseData>) => {
console.log('Request Error for URL:', error.config?.url); // 记录请求错误的 URL
console.error('Error Details:', error.message); // 记录错误详情
await opts.onError(error);
return Promise.reject(error);

View File

@ -10,6 +10,7 @@ import { $t } from '@/locales';
import { useRouteStore } from '../route';
import { useTabStore } from '../tab';
import { clearAuthStorage, getToken } from './shared';
import { apiRequestGet,apiRequestPost } from '@/utils/api';
export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
const route = useRoute();
@ -60,21 +61,24 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
* @param password Password
* @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();
const { response, error } = await fetchLogin(userName, password);
let data = {username, password}
let response= await apiRequestPost('/auth/login',data);
let accessToken = response.data.token;
let loginToken: Api.Auth.LoginToken = { token: accessToken, refreshToken: "" };
let userId = response.data.employeeId
if (error?.status == 200) {
const pass = await loginByToken(loginToken,userId);
if (response.status) {
localStg.set('token', loginToken.token);
localStg.set('refreshToken', loginToken.refreshToken);
const pass = await getUserInfo();
if (pass) {
token.value = loginToken.token;
await redirectFromLogin(redirect);
window.$notification?.success({
message: $t('page.login.common.loginSuccess'),
description: $t('page.login.common.welcomeBack', { userName: userInfo.userName })
@ -97,7 +101,6 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
if (pass) {
token.value = loginToken.token;
return true;
}
@ -105,10 +108,10 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
}
async function getUserInfo() {
const { response, error } = await fetchGetUserInfo();
let response = await apiRequestGet('/employees/getUserInfo');
let data:any = response.data.data
if (error?.status == 200) {
if (response.data.success) {
let info: Api.Auth.UserInfo = {
userId: data.employeeId.toString(),
userName: data.name,

View File

@ -1,8 +1,8 @@
<script setup lang="ts">
import { computed, reactive } from 'vue';
import { $t } from '@/locales';
import { loginModuleRecord } from '@/constants/app';
import { useRouterPush } from '@/hooks/common/router';
// import { loginModuleRecord } from '@/constants/app';
// import { useRouterPush } from '@/hooks/common/router';
import { useAntdForm, useFormRules } from '@/hooks/common/form';
import { useAuthStore } from '@/store/modules/auth';
@ -11,7 +11,7 @@ defineOptions({
});
const authStore = useAuthStore();
const { toggleLoginModule } = useRouterPush();
// const { toggleLoginModule } = useRouterPush();
const { formRef, validate } = useAntdForm();
interface FormModel {

View File

@ -131,12 +131,14 @@ const fetchData = async (page = 1, pageSize = 10) => {
const token = localStg.get('token'); // token
try {
const response = await apiRequestGet('/work-orders/my-orders', {
params: {
page: page - 1, // 0
size: pageSize,
}
});
const response = await apiRequestGet('/work-orders/my-orders',
// {
// params: {
// page: page - 1, // 0
// size: pageSize,
// }
//}
);
if (response.data.success) {
dataSource.value = response.data.data.content;