Merge branch 'master' into gray

@@ -372,7 +372,7 @@ public class SecurityInterceptor implements HandlerInterceptor, ApplicationEvent
                 return null;
             }
             //特殊处理（有可能与有货不共用redis）：如果获取到缓存，把缓存再一次保存到ufo的redis中
-            valueOperations.set(cacheKey,result.getSessionKey(),result.getSessionKeyTimeOut(), TimeUnit.SECONDS);
+            valueOperations.set(cacheKey,uid,result.getSessionKeyTimeOut(), TimeUnit.SECONDS);
             logger.debug("SecurityInterceptor: set session to redis uid {},session key {},result {}",uid,result.getSessionKey(),result);
             return String.valueOf(result.getUid());
         }catch(Exception e){