From 0840f04847ae4c505c137ffb5bbacdad7f942bd3 Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Wed, 27 Dec 2023 10:21:24 +0800
Subject: [PATCH] CacheSource

---
 .../org/redkale/source/CacheMemorySource.java | 20 +++++------
 .../java/org/redkale/source/CacheSource.java  | 36 +++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/main/java/org/redkale/source/CacheMemorySource.java b/src/main/java/org/redkale/source/CacheMemorySource.java
index 4dc6bfd2f..819df683c 100644
--- a/src/main/java/org/redkale/source/CacheMemorySource.java
+++ b/src/main/java/org/redkale/source/CacheMemorySource.java
@@ -350,7 +350,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
     }
 
     @Override
-    public <T> boolean setnxpx(String key, int milliSeconds, Convert convert, Type type, T value) {
+    public <T> boolean setnxpx(String key, long milliSeconds, Convert convert, Type type, T value) {
         CacheEntry entry = find(key);
         if (entry == null) {
             containerLock.lock();
@@ -378,7 +378,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
     }
 
     @Override
-    public <T> CompletableFuture<Boolean> setnxpxAsync(String key, int milliSeconds, Convert convert, Type type, T value) {
+    public <T> CompletableFuture<Boolean> setnxpxAsync(String key, long milliSeconds, Convert convert, Type type, T value) {
         return supplyFuture(() -> setnxpx(key, milliSeconds, convert, type, value));
     }
 
@@ -415,7 +415,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
         return supplyFuture(() -> getDel(key, type));
     }
 
-    private void set0(String key, int milliSeconds, Convert convert, Type type, Object value) {
+    private void set0(String key, long milliSeconds, Convert convert, Type type, Object value) {
         CacheEntry entry = find(key, CacheEntryType.OBJECT);
         if (entry == null) {
             containerLock.lock();
@@ -479,12 +479,12 @@ public final class CacheMemorySource extends AbstractCacheSource {
     }
 
     @Override
-    public <T> void setpx(String key, int milliSeconds, Convert convert, Type type, T value) {
+    public <T> void setpx(String key, long milliSeconds, Convert convert, Type type, T value) {
         set0(key, milliSeconds, convert, type, value);
     }
 
     @Override
-    public <T> CompletableFuture<Void> setpxAsync(String key, int milliSeconds, Convert convert, Type type, T value) {
+    public <T> CompletableFuture<Void> setpxAsync(String key, long milliSeconds, Convert convert, Type type, T value) {
         return runFuture(() -> setpx(key, milliSeconds, convert, type, value));
     }
 
@@ -494,7 +494,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
     }
 
     @Override
-    public void pexpire(String key, int milliSeconds) {
+    public void pexpire(String key, long milliSeconds) {
         CacheEntry entry = find(key);
         if (entry == null) {
             return;
@@ -513,7 +513,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
     }
 
     @Override
-    public CompletableFuture<Void> pexpireAsync(String key, int milliSeconds) {
+    public CompletableFuture<Void> pexpireAsync(String key, long milliSeconds) {
         return runFuture(() -> pexpire(key, milliSeconds));
     }
 
@@ -2339,7 +2339,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
         private String key;
 
         //<=0表示永久保存
-        private int expireMills;
+        private long expireMills;
 
         private final ReentrantLock lock = new ReentrantLock();
 
@@ -2357,7 +2357,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
             }
         }
 
-        public CacheEntry milliSeconds(int milliSeconds) {
+        public CacheEntry milliSeconds(long milliSeconds) {
             this.expireMills = milliSeconds > 0 ? milliSeconds : 0;
             return this;
         }
@@ -2441,7 +2441,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
             return cacheType;
         }
 
-        public int getExpireMills() {
+        public long getExpireMills() {
             return expireMills;
         }
 
diff --git a/src/main/java/org/redkale/source/CacheSource.java b/src/main/java/org/redkale/source/CacheSource.java
index da3b1a1e2..c240a98e7 100644
--- a/src/main/java/org/redkale/source/CacheSource.java
+++ b/src/main/java/org/redkale/source/CacheSource.java
@@ -214,19 +214,19 @@ public interface CacheSource extends Resourcable {
         setex(key, expireSeconds, Long.class, value);
     }
 
-    default <T> void setpx(String key, int milliSeconds, Convert convert, Type type, T value) {
+    default <T> void setpx(String key, long milliSeconds, Convert convert, Type type, T value) {
         setpxAsync(key, milliSeconds, convert, type, value).join();
     }
 
-    default <T> void setpx(String key, int milliSeconds, Type type, T value) {
+    default <T> void setpx(String key, long milliSeconds, Type type, T value) {
         setpx(key, milliSeconds, (Convert) null, type, value);
     }
 
-    default void setpxString(String key, int milliSeconds, String value) {
+    default void setpxString(String key, long milliSeconds, String value) {
         setpx(key, milliSeconds, String.class, value);
     }
 
-    default void setpxLong(String key, int milliSeconds, long value) {
+    default void setpxLong(String key, long milliSeconds, long value) {
         setpx(key, milliSeconds, Long.class, value);
     }
 
@@ -247,19 +247,19 @@ public interface CacheSource extends Resourcable {
         return setnxex(key, expireSeconds, Long.class, value);
     }
 
-    default <T> boolean setnxpx(String key, int milliSeconds, Convert convert, Type type, T value) {
+    default <T> boolean setnxpx(String key, long milliSeconds, Convert convert, Type type, T value) {
         return setnxpxAsync(key, milliSeconds, convert, type, value).join();
     }
 
-    default <T> boolean setnxpx(String key, int milliSeconds, Type type, T value) {
+    default <T> boolean setnxpx(String key, long milliSeconds, Type type, T value) {
         return setnxpx(key, milliSeconds, (Convert) null, type, value);
     }
 
-    default boolean setnxpxString(String key, int milliSeconds, String value) {
+    default boolean setnxpxString(String key, long milliSeconds, String value) {
         return setnxpx(key, milliSeconds, String.class, value);
     }
 
-    default boolean setnxpxLong(String key, int milliSeconds, long value) {
+    default boolean setnxpxLong(String key, long milliSeconds, long value) {
         return setnxpx(key, milliSeconds, Long.class, value);
     }
 
@@ -377,7 +377,7 @@ public interface CacheSource extends Resourcable {
         expireAsync(key, expireSeconds).join();
     }
 
-    default void pexpire(String key, int milliSeconds) {
+    default void pexpire(String key, long milliSeconds) {
         pexpireAsync(key, milliSeconds).join();
     }
 
@@ -1137,17 +1137,17 @@ public interface CacheSource extends Resourcable {
         return setexAsync(key, expireSeconds, Long.class, value);
     }
 
-    public <T> CompletableFuture<Void> setpxAsync(String key, int milliSeconds, Convert convert, Type type, T value);
+    public <T> CompletableFuture<Void> setpxAsync(String key, long milliSeconds, Convert convert, Type type, T value);
 
-    default <T> CompletableFuture<Void> setpxAsync(String key, int milliSeconds, Type type, T value) {
+    default <T> CompletableFuture<Void> setpxAsync(String key, long milliSeconds, Type type, T value) {
         return setpxAsync(key, milliSeconds, (Convert) null, type, value);
     }
 
-    default CompletableFuture<Void> setpxStringAsync(String key, int milliSeconds, String value) {
+    default CompletableFuture<Void> setpxStringAsync(String key, long milliSeconds, String value) {
         return setpxAsync(key, milliSeconds, String.class, value);
     }
 
-    default CompletableFuture<Void> setpxLongAsync(String key, int milliSeconds, long value) {
+    default CompletableFuture<Void> setpxLongAsync(String key, long milliSeconds, long value) {
         return setpxAsync(key, milliSeconds, Long.class, value);
     }
 
@@ -1166,17 +1166,17 @@ public interface CacheSource extends Resourcable {
         return setnxexAsync(key, expireSeconds, Long.class, value);
     }
 
-    public <T> CompletableFuture<Boolean> setnxpxAsync(String key, int milliSeconds, Convert convert, Type type, T value);
+    public <T> CompletableFuture<Boolean> setnxpxAsync(String key, long milliSeconds, Convert convert, Type type, T value);
 
-    default <T> CompletableFuture<Boolean> setnxpxAsync(String key, int milliSeconds, Type type, T value) {
+    default <T> CompletableFuture<Boolean> setnxpxAsync(String key, long milliSeconds, Type type, T value) {
         return setnxpxAsync(key, milliSeconds, (Convert) null, type, value);
     }
 
-    default CompletableFuture<Boolean> setnxpxStringAsync(String key, int milliSeconds, String value) {
+    default CompletableFuture<Boolean> setnxpxStringAsync(String key, long milliSeconds, String value) {
         return setnxpxAsync(key, milliSeconds, String.class, value);
     }
 
-    default CompletableFuture<Boolean> setnxpxLongAsync(String key, int milliSeconds, long value) {
+    default CompletableFuture<Boolean> setnxpxLongAsync(String key, long milliSeconds, long value) {
         return setnxpxAsync(key, milliSeconds, Long.class, value);
     }
 
@@ -1283,7 +1283,7 @@ public interface CacheSource extends Resourcable {
 
     public CompletableFuture<Void> expireAsync(String key, int seconds);
 
-    public CompletableFuture<Void> pexpireAsync(String key, int mills);
+    public CompletableFuture<Void> pexpireAsync(String key, long milliSeconds);
 
     public CompletableFuture<List<String>> keysAsync(String pattern);