Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/pipihelper/project/feishu/service/PainService.java

src/main/java/com/pipihelper/project/utils/CacheUtil.java

@@ -7,10 +7,11 @@ import java.util.Map;
 import java.util.Timer;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
+
 @Slf4j
 @Slf4j
 @Component
 @Component
 public class CacheUtil {
 public class CacheUtil {
-    private static final long DEFAULT_TIMEOUT = 3600;
+    private static final long DEFAULT_TIMEOUT = 3600 * 1000 * 10;
     private static final int DEFAULT_CAPACITY = 1024;
     private static final int DEFAULT_CAPACITY = 1024;
     private static final Timer timer;
     private static final Timer timer;
     private static final int MAX_CAPACITY = 10000;
     private static final int MAX_CAPACITY = 10000;
@@ -40,6 +41,7 @@ public class CacheUtil {
         }
         }
 
 
     }
     }
+
     //私有化构造方法
     //私有化构造方法
     private CacheUtil() {
     private CacheUtil() {