Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
  • Loading branch information
devcui committed Aug 21, 2024
2 parents 49ddef6 + 1885562 commit 2c4fd3f
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/app/core/net/default.interceptor.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { HttpErrorResponse, HttpHandlerFn, HttpInterceptorFn, HttpRequest, HttpResponseBase } from '@angular/common/http';
import { Injector, inject } from '@angular/core';
import { IGNORE_BASE_URL, _HttpClient } from '@yelon/theme';
import { environment } from '@env/environment';
import { IGNORE_BASE_URL, _HttpClient } from '@yelon/theme';
import { Observable, of, throwError, mergeMap } from 'rxjs';

import { ReThrowHttpError, checkStatus, getAdditionalHeaders, toLogin } from './helper';
Expand Down Expand Up @@ -48,7 +48,10 @@ function handleData(injector: Injector, ev: HttpResponseBase, req: HttpRequest<a
break;
default:
if (ev instanceof HttpErrorResponse) {
console.warn('未可知错误,大部分是由于后端不支持跨域CORS或无效配置引起,请参考 https://ng.yunzainfo.com/docs/server 解决跨域问题', ev);
console.warn(
'未可知错误,大部分是由于后端不支持跨域CORS或无效配置引起,请参考 https://ng.yunzainfo.com/docs/server 解决跨域问题',
ev
);
}
break;
}
Expand Down

0 comments on commit 2c4fd3f

Please sign in to comment.