Merge remote-tracking branch 'origin/release-201820-wangcz' into release-201820-wangcz

src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -92,7 +92,7 @@ public class SecurityController {
 	 * @return
 	 * @throws IOException
 	 */
-	@RequestMapping(value = "/logout", method = RequestMethod.GET, headers = "Accept=application/json")
+	@RequestMapping(value = "/logout", method = RequestMethod.GET, produces = {"application/javascript"})
 	@ResponseStatus(value = HttpStatus.OK)
 	@ResponseBody
 	public String logout(HttpServletRequest request, HttpServletResponse response, HttpSession session, String returnUrl)