wangmh 7 лет назад
Родитель
Сommit
e065db3c8f

+ 5 - 1
src/main/java/com/uas/platform/b2b/controller/SecurityController.java

@@ -5,6 +5,7 @@ import com.uas.platform.b2b.model.SigninLog;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.service.SigninLogService;
 import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.SysConf;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.util.AgentUtils;
 import com.uas.platform.core.util.encry.Md5Utils;
@@ -41,6 +42,9 @@ public class SecurityController {
 
 	@Autowired
 	private UserService userService;
+
+	@Autowired
+	private SysConf conf;
 	@Autowired
 	private SigninLogService signinLogService;
 	private final DeviceResolver deviceResolver = new LiteDeviceResolver();
@@ -60,7 +64,7 @@ public class SecurityController {
 			// 跨域情况,需要再次询问账户中心
 			returnUrl = "logout/proxy";
 		}
-		return new ModelMap("content", returnUrl);
+		return new ModelMap("content", returnUrl).addAttribute("url", conf.getB2c() + "/logout");
 	}
 
 	/**

+ 1 - 0
src/main/webapp/resources/js/common/services.js

@@ -133,6 +133,7 @@ define(['angular', 'toaster', 'big'], function(angular, big) {
 				var logout = $http.get(rootPath + "/logout", config);
 				logout.success(uncacheSession);
 				logout.success(function(data){
+				    if (data.url) $http.get(data.url, config);
                     var pathName = document.location.pathname;
                     var index = pathName.substr(1).indexOf("/");// platform-b2c/logout/proxy
                     var result = pathName.substr(0,index);