Merge remote-tracking branch 'origin/master'

sms_water/src/main/java/com/huaxu/service/impl/CameraManageServiceImpl.java

@@ -194,7 +194,10 @@ public class CameraManageServiceImpl implements CameraManageService {
                 token=data.getString("accessToken");
                 long expireTime=data.getLong("expireTime");
                 redisUtil.set(appKey,token);
-                redisUtil.setExpire(appKey,expireTime-1000);
+                redisUtil.set(appKey,token);
+                expireTime=expireTime-new Date().getTime();
+                expireTime=expireTime/1000-60;
+                redisUtil.setExpire(appKey,expireTime);
             }
 
         }