归并重复代码

src/main/java/cn/quantgroup/xyqb/session/XyqbSessionContextHolder.java

@@ -23,59 +23,20 @@ public class XyqbSessionContextHolder {
   public static RedisTemplate<String, String> redisTemplate = null;
 
   public static SessionStruct getXSession() {
+    SessionStruct sessionStruct;
     if (threadSession.get() != null) {
-      return threadSession.get();
-    }
-    HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-    String token = request.getHeader(Constants.X_AUTH_TOKEN);
-    if (token == null || token.length() != 36) {
-      return null;
-    }
-    String result = redisTemplate.opsForValue().get(Constants.Session.USER_SESSION_CACHE + token);
-    if (StringUtils.isEmpty(result)) {
-      return null;
-    }
-    try {
-      SessionValue values = JSON.parseObject(result, SessionValue.class);
-
-      if (values == null) {
-        return null;
-      }
-      SessionStruct sessionStruct = new SessionStruct();
-      sessionStruct.setSid(token);
-      sessionStruct.setValues(values);
+      sessionStruct = threadSession.get();
+    }else {
+      sessionStruct = getXSessionFromRedis();
       threadSession.set(sessionStruct);
-      return sessionStruct;
-    } catch (Exception ex) {
-      LOGGER.error("序列化session出错", ex);
-      return null;
     }
+    return sessionStruct;
   }
 
   public static SessionStruct getXSessionFromRedis(){
     HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
     String token = request.getHeader(Constants.X_AUTH_TOKEN);
-    if (token == null || token.length() != 36) {
-      return null;
-    }
-    String result = redisTemplate.opsForValue().get(Constants.Session.USER_SESSION_CACHE + token);
-    if (StringUtils.isEmpty(result)) {
-      return null;
-    }
-    try {
-      SessionValue values = JSON.parseObject(result, SessionValue.class);
-
-      if (values == null) {
-        return null;
-      }
-      SessionStruct sessionStruct = new SessionStruct();
-      sessionStruct.setSid(token);
-      sessionStruct.setValues(values);
-      return sessionStruct;
-    }catch (Exception ex){
-      LOGGER.error("序列化session出错", ex);
-      return null;
-    }
+    return getXSessionFromRedis(token);
   }
 
   public static SessionStruct getXSessionFromRedis(String token){