From 0410eea38bbd8016c55b51e7e4d1c5d0e726f171 Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Thu, 9 Aug 2018 09:49:47 +0800
Subject: [PATCH] 提交

---
 resource/js/unit.js          | 23 +++++++++++++----------
 topages/workfill/workfill.js |  1 +
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/resource/js/unit.js b/resource/js/unit.js
index b2e3bf2..d5b13b2 100644
--- a/resource/js/unit.js
+++ b/resource/js/unit.js
@@ -11,7 +11,7 @@ sysComm = {
 //阿里云测试环境，别删
 
 //var parkcloudbaseUrl = 'http://localhost:8101/';// url公用地址
-var parkcloudbaseUrl = 'http://192.168.1.196:8101/';// url公用地址
+var parkcloudbaseUrl = 'http://47.96.41.38:8101/';// url公用地址
 
 
 
@@ -129,24 +129,20 @@ var fn ={
     },
     //登出系统
     loginOut: function () {
-
+        fn.toLoginPage();
+        sessionStorage.clear();
+        fn.setToken('');
         var token = fn.getToken();
-
         if (token != "" && token != null) {
-
             var opt = {
                 method: "post",
                 url: dataUrl.util.getLoginOut(),
                 success: function(res){
-                    sessionStorage.clear()
-                    fn.setToken('');
-                    fn.toLoginPage();
-
+                   console.log(" redis session has been cleared...")
                 }
             };
             sysAjax(opt);
 
-
         }
 
     },
@@ -336,9 +332,16 @@ function sysAjax(opts) {
             //设置请求头
             //xhr.setRequestHeader("User-Agent", "headertest");
             console.log(fn.getToken());
-            xhr.setRequestHeader("X-Auth-Token", fn.getToken());
+            if(fn.getToken() == null || fn.getToken() == "" || fn.getToken() == undefined){
+                //window.location.href = '../../workreport/login/login.html'
+                xhr.setRequestHeader("X-Auth-Token", "");
+            }else{
+                xhr.setRequestHeader("X-Auth-Token", fn.getToken());
+            }
+
         },
         success: function (res, status, xhr) {
+            debugger;
             var msg = (typeof res.msg == 'string') && (res.msg.constructor == String) ? res.msg : res.errMsg;
             //成功
             if (res.code=='2003') {
diff --git a/topages/workfill/workfill.js b/topages/workfill/workfill.js
index be53107..15e8e94 100644
--- a/topages/workfill/workfill.js
+++ b/topages/workfill/workfill.js
@@ -65,6 +65,7 @@ var fun = {
     //退出
     logout:function(){
         documentBindFunc.on('click','#logoutId',function(){
+            debugger;
            fn.loginOut();
        });
     },
--
libgit2 0.21.4