Merge branch 'master' of http://101.36.160.140:21044/csc/csc-szls-common-utils

src/main/java/com/unissoft/MyConstant.java

@@ -1,6 +1,6 @@
 package com.unissoft;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 
 /**
  * 常量类
@@ -34,6 +34,8 @@ public class MyConstant {
     public static final String FORTY = "40";
 
     public static final String LOGIN_USER = "loginUser";
+    //请求认证头
+    public static final String AUTHORIZATION = "Authorization";
 
     public static final String CLIENT_ID = "client_id";
     public static final String CLIENT_SECRET = "client_secret";
@@ -41,18 +43,19 @@ public class MyConstant {
     public static final String PASSWORD = "password";
     public static final String GRANT_TYPE = "grant_type";
     public static final String SCOPE = "scope";
+    //登录成功获取里面的key
+    public static final String ACCESS_TOKEN = "access_token";
+    //超时时间
+    public static final long TIME_OUT = 6000;
     //reids过期时间，单位秒默认3分钟
     public static final long REDIS_SECONDS = 180;
 
-    public static final HashMap<String, String> GRADEMAP = new HashMap<String, String>() {{
+    public static final LinkedHashMap<String, String> GRADEMAP = new LinkedHashMap<String, String>() {{
         put("1", "初级");
         put("2", "中级");
         put("3", "高级");
         put("4", "技师");
         put("5", "高级技师");
-        put("6", "初级注册安全工程师");
-        put("7", "中级注册安全工程师");
-        put("8", "高级注册安全工程师");
     }};
 
 }

src/main/java/com/unissoft/result/ResultEnum.java

@@ -55,7 +55,7 @@ public enum ResultEnum {
     /**
      * token无效！
      */
-    CODE_401(401, "token无效！"),
+    CODE_401(401, "你的账号已在其它设备登录！"),
     /**
      * 抱歉，您没有访问权限！
      */

src/main/java/com/unissoft/utils/UserUtils.java

@@ -2,6 +2,7 @@ package com.unissoft.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.unissoft.MyConstant;
 import com.unissoft.model.SysUserPO;
 import org.springframework.security.jwt.Jwt;
 import org.springframework.security.jwt.JwtHelper;
@@ -26,10 +27,9 @@ public class UserUtils {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = attributes.getRequest();
         SysUserPO loginUser = null;
-        if (request != null && !StringUtils.isEmpty(request.getHeader("Authorization"))) {
+        if (request != null && !StringUtils.isEmpty(request.getHeader(MyConstant.AUTHORIZATION))) {
             // 只携带token
-            String authorization = request.getHeader("Authorization").replace("bearer ","");
-            System.out.println(authorization);
+            String authorization = request.getHeader(MyConstant.AUTHORIZATION).replace("bearer ","");
             Jwt decode = JwtHelper.decode(authorization);
             String claims = decode.getClaims();
             JSONObject jsonObject = JSON.parseObject(claims);