Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java

@@ -280,9 +280,13 @@ public class ChinaMobileRestApiController extends BaseController {
     public Map<String, Object> logout() {
         String token = request.getHeader("Authorization");
         JSONObject resultMap = new JSONObject(true);
+        if (token.startsWith("Bearer ")) {
+            token = token.substring(7);
+        }
         try {
             if (StringUtils.isNotBlank(token)) {
 //                SecurityUtils.getSubject().logout();
+
                 this.stringRedisTemplate.delete(SHIRO_JWT_TOKEN + token);
             }
             resultMap.put("resultCode", "200");

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LoginController.java

@@ -210,6 +210,9 @@ public class LoginController extends BaseController {
     @RequestMapping(value = "logout", method = RequestMethod.GET)
     public Map<String, Object> logout() {
         String token = request.getHeader("Authorization");
+        if (token.startsWith("Bearer ")) {
+            token = token.substring(7);
+        }
         try {
             if (StringUtils.isNotBlank(token)) {
 //                SecurityUtils.getSubject().logout();