Commit 23a71ccb by 牛晓林

添加全局请求参数

parent e47f37c6
...@@ -112,24 +112,10 @@ export class DefaultInterceptor implements HttpInterceptor { ...@@ -112,24 +112,10 @@ export class DefaultInterceptor implements HttpInterceptor {
// 统一加上服务端前缀 // 统一加上服务端前缀
let url = req.url; let url = req.url;
if (!url.startsWith('https://') && !url.startsWith('http://')) { if (!url.startsWith('https://') && !url.startsWith('http://')) {
console.log(url.indexOf('asset'));
console.log(url.indexOf('/login'));
// asset/a/assets/.....
//asset/a/login
//qita
// const rg = /asset\/a\/[^(login)].*/g;
// if (rg.match(url)) url = environment.SERVER_URL + url;
// const reg = [/\/login/, /assets\//, /passport\//];
url = environment.SERVER_URL + url; url = environment.SERVER_URL + url;
const api = /asset\/a\/[^(login)].*/g;
console.log(url); if(api.test(url)){
if (url.indexOf('asset') === 0) { url += `;JSESSIONID=${this.tokenService.get().token}?_ajax=true&mobileLogin=true`;
if (url.indexOf('/login') === -1) {
console.log(1111);
url += `JSESSIONID=${this.tokenService.get().token}?_ajax=true&mobileLogin=true`;
} else {
console.log(2222);
}
} }
} }
......
<div class="alain-default__header-logo"> <div class="alain-default__header-logo">
<a [routerLink]="['/']" class="alain-default__header-logo-link"> <a [routerLink]="['/']" class="alain-default__header-logo-link">
<img class="alain-default__header-logo-expanded" src="./assets/logo-full.svg" alt="{{settings.app.name}}" style="max-height:40px;" /> <img class="alain-default__header-logo-expanded" src="./assets/logo-full.svg" alt="{{settings.app.name}}" style="max-height:40px;" />
<img class="alain-default__header-logo-collapsed" src="./assets/logo.svg" alt="{{settings.app.name}}" style="max-height:30px;" /> <img class="alain-default__header-logo-collapsed" src="./assets/luqiao.jpg" alt="{{settings.app.name}}" style="max-height:30px;border-radius:13px;" />
</a> </a>
</div> </div>
<div class="alain-default__nav-wrap"> <div class="alain-default__nav-wrap">
...@@ -12,12 +12,7 @@ ...@@ -12,12 +12,7 @@
<i nz-icon type="menu-{{settings.layout.collapsed ? 'unfold' : 'fold'}}"></i> <i nz-icon type="menu-{{settings.layout.collapsed ? 'unfold' : 'fold'}}"></i>
</div> </div>
</li> </li>
<!-- Github Page -->
<li>
<a class="alain-default__nav-item" href="//github.com/ng-alain/ng-alain" target="_blank">
<i nz-icon type="github"></i>
</a>
</li>
<!-- Lock Page --> <!-- Lock Page -->
<li class="hidden-mobile"> <li class="hidden-mobile">
<div class="alain-default__nav-item" routerLink="/passport/lock"> <div class="alain-default__nav-item" routerLink="/passport/lock">
...@@ -25,18 +20,18 @@ ...@@ -25,18 +20,18 @@
</div> </div>
</li> </li>
<!-- Search Button --> <!-- Search Button -->
<li class="hidden-pc" (click)="searchToggleChange()"> <!-- <li class="hidden-pc" (click)="searchToggleChange()">
<div class="alain-default__nav-item"> <div class="alain-default__nav-item">
<i nz-icon type="search"></i> <i nz-icon type="search"></i>
</div> </div>
</li> </li> -->
</ul> </ul>
<header-search class="alain-default__search" [toggleChange]="searchToggleStatus"></header-search> <!-- <header-search class="alain-default__search" [toggleChange]="searchToggleStatus"></header-search> -->
<ul class="alain-default__nav"> <ul class="alain-default__nav">
<!-- Notify --> <!-- Notify -->
<li> <!-- <li>
<header-notify></header-notify> <header-notify></header-notify>
</li> </li> -->
<!-- Task --> <!-- Task -->
<li class="hidden-mobile"> <li class="hidden-mobile">
<header-task></header-task> <header-task></header-task>
......
...@@ -27,10 +27,6 @@ export class FixedAssetsComponent implements OnInit { ...@@ -27,10 +27,6 @@ export class FixedAssetsComponent implements OnInit {
this.loading = false; this.loading = false;
}); });
// this.http.get('/api/list', { count: 8 }).subscribe((res: any) => {
// this.list = this.list.concat(res);
// this.loading = false;
// this.cdr.detectChanges();
// });
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment