From f1f78b9bae93fe9a07cc3ebdc743eb71ac78c29e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 28 May 2018 11:49:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/business/services/http/login.service.ts |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/business/services/http/login.service.ts b/src/app/business/services/http/login.service.ts
index 5b3cfa4..b5c1b6f 100644
--- a/src/app/business/services/http/login.service.ts
+++ b/src/app/business/services/http/login.service.ts
@@ -50,9 +50,8 @@
                this.authorization = res;
                const now = new Date();
                // expiredTime,refreshToken,refreshTime ������������ token ������������
-               const expiredTime  = !!this.authorization.expiredTime ? this.authorization.expiredTime.toString() : null;
                this.setRefreshTime();
-               localStorage.setItem('expiredTime', expiredTime);
+               localStorage.setItem('expiredTime', String(this.authorization.expiredTime));
                localStorage.setItem('refreshToken', this.authorization.refreshToken);
                return res;
            }
@@ -66,7 +65,7 @@
         }
       );
   }
-  get _refreshToken(){
+  get _refreshToken() {
     return !!this.authorization.refreshToken ? this.authorization.refreshToken : this.refreshTokenFromLocal;
   }
   get refreshTokenFromLocal(): string {

--
Gitblit v1.8.0