Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
regManage
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangqinghua
regManage
Commits
4fffb7b1
Commit
4fffb7b1
authored
Dec 05, 2019
by
wangqinghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
0e4ae56e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
auth.interceptor.ts
src/core/auth.interceptor.ts
+2
-2
login.ts
src/pages/login/login.ts
+11
-7
No files found.
src/core/auth.interceptor.ts
View file @
4fffb7b1
import
{
AlertController
,
App
,
Events
}
from
'ionic-angular'
;
import
{
HttpEvent
,
HttpHandler
,
HttpInterceptor
,
HttpRequest
,
HttpResponse
}
from
'@angular/common/http'
;
import
{
Injectable
}
from
'@angular/core'
;
import
{
Storage
}
from
'@ionic/storage'
;
import
{
Observable
}
from
'rxjs'
;
import
{
_throw
}
from
'rxjs/observable/throw'
;
import
{
CommonService
}
from
"./common.service"
;
import
{
GlobalData
}
from
"./GlobleData"
;
/** * http拦截器 增加token信息 */
@
Injectable
()
export
class
InterceptorProvider
implements
HttpInterceptor
{
constructor
(
private
storage
:
Storage
,
private
alertCtrl
:
AlertController
,
private
events
:
Events
,
private
commonSer
:
CommonService
,
private
app
:
App
,
private
globle
:
GlobalData
)
{
}
// Intercepts all HTTP requests! intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> { const data = this.storage.get(''); return Observable.fromPromise(data) .mergeMap(data => { let clonedReq = this.addToken(request, data); return next.handle(clonedReq).do(res => { if (res instanceof HttpResponse) { this.message(res.body); } }, (error) => { let msg = error.message; this.errorMessage(error); // Pass the error to the caller of the function return _throw(error); }, () => { }) }); } // Adds the token to your headers if it exists private addToken(request: HttpRequest<any>, token: any) { let body; if (request.method == "POST") { body = Object.assign(request.body, {}); if (this.globle.token) { body = Object.assign(body, {"token": this.globle.token}); } if (this.globle.userObj && this.globle.userObj.userid) { body = Object.assign(body, {"userid": this.globle.userObj.userid}); } } if (token) { let clone: HttpRequest<any>; if (request.method == "POST") { clone = request.clone({ setHeaders: { // "Accept": `application/json`, 'Content-Type': `application/json;charset=UTF-8`, }, body: body }); } else { clone = request.clone({ setHeaders: { // "Accept": `application/json`, 'Content-Type': `application/json;charset=UTF-8`, }, }); } return clone; } return request; } //code message message(data) { if (data.code) { let code = data.code; if (code == "401") { this.commonSer.toast("登录已过期"); this.storage.clear(); this.events.publish('toLogin'); } else if (code == "-1") { let alert = this.alertCtrl.create({ title: "错误", message: `${data.msg}。`, buttons: ['确定'] }); alert.present(); } if (code == 500) { let alert = this.alertCtrl.create({ title: "错误", message: `${data.msg}。`, buttons: ['确定'] }); alert.present(); } } } //error message errorMessage(data) { if (data.status) { let code = data.status; if (code != 200) { const error = JSON.parse(data.error); let alert = this.alertCtrl.create({ title: "错误", message: `${data.error.errorMsg},错误码:${code}。`, buttons: ['确定'] }); alert.present(); } } } }
\ No newline at end of file
import
{
AlertController
,
App
,
Events
}
from
'ionic-angular'
;
import
{
HttpEvent
,
HttpHandler
,
HttpInterceptor
,
HttpRequest
,
HttpResponse
}
from
'@angular/common/http'
;
import
{
Injectable
}
from
'@angular/core'
;
import
{
Storage
}
from
'@ionic/storage'
;
import
{
Observable
}
from
'rxjs'
;
import
{
_throw
}
from
'rxjs/observable/throw'
;
import
{
CommonService
}
from
"./common.service"
;
import
{
GlobalData
}
from
"./GlobleData"
;
/** * http拦截器 增加token信息 */
@
Injectable
()
export
class
InterceptorProvider
implements
HttpInterceptor
{
constructor
(
private
storage
:
Storage
,
private
alertCtrl
:
AlertController
,
private
events
:
Events
,
private
commonSer
:
CommonService
,
private
app
:
App
,
private
globle
:
GlobalData
)
{
}
// Intercepts all HTTP requests! intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> { const data = this.storage.get(''); return Observable.fromPromise(data) .mergeMap(data => { let clonedReq = this.addToken(request, data); return next.handle(clonedReq).do(res => { if (res instanceof HttpResponse) { this.message(res.body); } }, (error) => { let msg = error.message; this.errorMessage(error); // Pass the error to the caller of the function return _throw(error); }, () => { }) }); } // Adds the token to your headers if it exists private addToken(request: HttpRequest<any>, token: any) { let body; if (request.method == "POST") { body = Object.assign(request.body, {}); if (this.globle.token) { body = Object.assign(body, {"token": this.globle.token}); } if (this.globle.userObj && this.globle.userObj.userid) { body = Object.assign(body, {"userid": this.globle.userObj.userid}); } } if (token) { let clone: HttpRequest<any>; if (request.method == "POST") { clone = request.clone({ setHeaders: { // "Accept": `application/json`, 'Content-Type': `application/json;charset=UTF-8`, }, body: body }); } else { clone = request.clone({ setHeaders: { // "Accept": `application/json`, 'Content-Type': `application/json;charset=UTF-8`, }, }); } return clone; } return request; } //code message message(data) { if (data.code) { let code = data.code; if (code == "401") { this.commonSer.toast("登录已过期"); this.storage.clear(); this.events.publish('toLogin'); } else if (code == "-1") { let alert = this.alertCtrl.create({ title: "提示", message: `${data.msg}。`, buttons: ['确定'] }); alert.present(); } if (code == 500) { let alert = this.alertCtrl.create({ title: "提示", message: `${data.msg}。`, buttons: ['确定'] }); alert.present(); } } } //error message errorMessage(data) { if (data.status) { let code = data.status; if (code != 200) { const error = JSON.parse(data.error); let alert = this.alertCtrl.create({ title: "错误", message: `${data.error.errorMsg},错误码:${code}。`, buttons: ['确定'] }); alert.present(); } } } }
\ No newline at end of file
...
...
src/pages/login/login.ts
View file @
4fffb7b1
...
...
@@ -22,8 +22,8 @@ export class LoginPage {
codeNum
;
user
=
{
mobilePhone
:
"
18521524378
"
,
password
:
"
qweasd123
"
,
mobilePhone
:
""
,
password
:
""
,
captcha
:
""
};
loading
;
...
...
@@ -57,11 +57,15 @@ export class LoginPage {
this
.
loading
.
present
();
this
.
loginSer
.
login
(
data
).
subscribe
(
(
res
)
=>
{
this
.
storage
.
set
(
'token'
,
res
.
token
);
this
.
globle
.
token
=
res
.
token
;
setTimeout
(()
=>
{
this
.
getUserInfo
();
},
100
)
if
(
res
.
code
==
'0'
)
{
this
.
storage
.
set
(
'token'
,
res
.
token
);
this
.
globle
.
token
=
res
.
token
;
setTimeout
(()
=>
{
this
.
getUserInfo
();
},
100
)
}
else
{
this
.
loading
.
dismiss
();
}
}
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment