From bd1966ac64e93a610a4635c3eefd5115ab825c5b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 16 Mar 2018 13:43:17 +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 |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/app/business/services/http/login.service.ts b/src/app/business/services/http/login.service.ts
index 9432876..5b3cfa4 100644
--- a/src/app/business/services/http/login.service.ts
+++ b/src/app/business/services/http/login.service.ts
@@ -50,8 +50,9 @@
                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', this.authorization.expiredTime.toString());
+               localStorage.setItem('expiredTime', expiredTime);
                localStorage.setItem('refreshToken', this.authorization.refreshToken);
                return res;
            }

--
Gitblit v1.8.0