Merge remote-tracking branch 'origin/master'

src/main/webapp/resources/js/common/services.js

@@ -131,9 +131,7 @@ define(['angular', 'toaster', 'big'], function(angular, big) {
                     ifModified :true ,
 				};
 				var logout = $http.get(rootPath + "/logout", config);
-				logout.success(uncacheSession);
-				logout.success(function(data){
-				    if (data.url) $http.get(data.url, config);
+				var refresh = function(data) {
                     var pathName = document.location.pathname;
                     var index = pathName.substr(1).indexOf("/");// platform-b2c/logout/proxy
                     var result = pathName.substr(0,index);
@@ -149,6 +147,28 @@ define(['angular', 'toaster', 'big'], function(angular, big) {
                             window.location.href = data.content;
                         }
                     }
+                }
+				logout.success(uncacheSession);
+				logout.success(function(data) {
+                    if (data.url) {
+                        $.ajax({
+                            url: data.url,
+                            type: "get",
+                            cache: false,
+                            dataType: "jsonp",
+                            jsonp: "callback",
+                            jsonpCallback: "successCallback",
+                            success: function (data) {
+                                console.log(data);
+                                refresh(data);
+                            },
+                            error: function (data) {
+                                console.log(data);
+                                refresh(data);
+                            }
+                        });
+                    }
+                    refresh(data);
 				});
 				return logout;
             },

src/main/webapp/resources/js/index/app.js

@@ -1574,12 +1574,13 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     jsonpCallback:"successCallback",
                     success:function(data){
                         console.log(data);
+                        $window.location.reload();
                     },
                     error:function(data){
                         console.log(data);
+                        $window.location.reload();
                     }
                 });
-                $window.location.reload();
             });
         };