From bdeb9610026907583de94c194ebef03240d62d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E6=98=BE=E4=BC=98?= <237809796@qq.com> Date: Sun, 25 Jun 2023 02:21:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=8F=98=E6=9B=B4=E4=B8=BA=20maven=20?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 17 +++++ .../org.redkale.cluster.ClusterAgentProvider | 0 .../org.redkale.source.CacheSourceProvider | 0 .../java}/net/tccn/AbstractConsumer.java | 0 src/{ => main/java}/net/tccn/Event.java | 0 src/{ => main/java}/net/tccn/EventType.java | 0 src/{ => main/java}/net/tccn/IConsumer.java | 0 src/{ => main/java}/net/tccn/IProducer.java | 0 src/{ => main/java}/net/tccn/IType.java | 0 .../main/java/net/tccn}/RedisTest.java | 73 +++++++++++++++---- .../java}/net/tccn/ZhubAgentProvider.java | 0 .../java}/net/tccn/ZhubProvider.java | 0 .../java}/net/tccn/timer/TimerExecutor.java | 0 .../java}/net/tccn/timer/TimerTask.java | 0 .../java}/net/tccn/timer/Timers.java | 0 .../net/tccn/timer/queue/TimerQueue.java | 0 .../net/tccn/timer/scheduled/Scheduled.java | 0 .../tccn/timer/scheduled/ScheduledCycle.java | 0 .../tccn/timer/scheduled/ScheduledExpres.java | 0 .../java}/net/tccn/timer/task/Job.java | 0 .../java}/net/tccn/timer/task/Task.java | 0 src/{ => main/java}/net/tccn/zhub/Lock.java | 0 src/{ => main/java}/net/tccn/zhub/Rpc.java | 0 .../java}/net/tccn/zhub/RpcResult.java | 0 .../java}/net/tccn/zhub/ZHubClient.java | 0 .../cache/redis/AbstractRedisSource.java | 0 .../cache/redis/MyRedisCacheSource.java | 0 .../org/redkalex/cache/redis/RedisCRC16.java | 0 .../cache/redis/RedisCacheClient.java | 0 .../redkalex/cache/redis/RedisCacheCodec.java | 0 .../cache/redis/RedisCacheConnection.java | 0 .../cache/redis/RedisCacheReqAuth.java | 0 .../cache/redis/RedisCacheReqClose.java | 0 .../redkalex/cache/redis/RedisCacheReqDB.java | 0 .../cache/redis/RedisCacheReqPing.java | 0 .../cache/redis/RedisCacheRequest.java | 0 .../cache/redis/RedisCacheResult.java | 0 .../cache/redis/RedisCacheSource.java | 0 .../cache/redis/RedisCacheSourceProvider.java | 0 .../redkalex/cache/redis/RedisCryptor.java | 0 40 files changed, 77 insertions(+), 13 deletions(-) create mode 100644 pom.xml rename src/{ => main/java}/META-INF/services/org.redkale.cluster.ClusterAgentProvider (100%) rename src/{ => main/java}/META-INF/services/org.redkale.source.CacheSourceProvider (100%) rename src/{ => main/java}/net/tccn/AbstractConsumer.java (100%) rename src/{ => main/java}/net/tccn/Event.java (100%) rename src/{ => main/java}/net/tccn/EventType.java (100%) rename src/{ => main/java}/net/tccn/IConsumer.java (100%) rename src/{ => main/java}/net/tccn/IProducer.java (100%) rename src/{ => main/java}/net/tccn/IType.java (100%) rename {test/net.tccn/cache => src/main/java/net/tccn}/RedisTest.java (87%) rename src/{ => main/java}/net/tccn/ZhubAgentProvider.java (100%) rename src/{ => main/java}/net/tccn/ZhubProvider.java (100%) rename src/{ => main/java}/net/tccn/timer/TimerExecutor.java (100%) rename src/{ => main/java}/net/tccn/timer/TimerTask.java (100%) rename src/{ => main/java}/net/tccn/timer/Timers.java (100%) rename src/{ => main/java}/net/tccn/timer/queue/TimerQueue.java (100%) rename src/{ => main/java}/net/tccn/timer/scheduled/Scheduled.java (100%) rename src/{ => main/java}/net/tccn/timer/scheduled/ScheduledCycle.java (100%) rename src/{ => main/java}/net/tccn/timer/scheduled/ScheduledExpres.java (100%) rename src/{ => main/java}/net/tccn/timer/task/Job.java (100%) rename src/{ => main/java}/net/tccn/timer/task/Task.java (100%) rename src/{ => main/java}/net/tccn/zhub/Lock.java (100%) rename src/{ => main/java}/net/tccn/zhub/Rpc.java (100%) rename src/{ => main/java}/net/tccn/zhub/RpcResult.java (100%) rename src/{ => main/java}/net/tccn/zhub/ZHubClient.java (100%) rename src/{ => main/java}/org/redkalex/cache/redis/AbstractRedisSource.java (100%) rename src/{ => main/java}/org/redkalex/cache/redis/MyRedisCacheSource.java (100%) rename src/{ => main/java}/org/redkalex/cache/redis/RedisCRC16.java (100%) rename src/{ => main/java}/org/redkalex/cache/redis/RedisCacheClient.java (100%) rename src/{ => main/java}/org/redkalex/cache/redis/RedisCacheCodec.java (100%) rename src/{ => main/java}/org/redkalex/cache/redis/RedisCacheConnection.java (100%) rename src/{ => main/java}/org/redkalex/cache/redis/RedisCacheReqAuth.java (100%) rename src/{ => main/java}/org/redkalex/cache/redis/RedisCacheReqClose.java (100%) rename src/{ => main/java}/org/redkalex/cache/redis/RedisCacheReqDB.java (100%) rename src/{ => main/java}/org/redkalex/cache/redis/RedisCacheReqPing.java (100%) rename src/{ => main/java}/org/redkalex/cache/redis/RedisCacheRequest.java (100%) rename src/{ => main/java}/org/redkalex/cache/redis/RedisCacheResult.java (100%) rename src/{ => main/java}/org/redkalex/cache/redis/RedisCacheSource.java (100%) rename src/{ => main/java}/org/redkalex/cache/redis/RedisCacheSourceProvider.java (100%) rename src/{ => main/java}/org/redkalex/cache/redis/RedisCryptor.java (100%) diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..96d099f --- /dev/null +++ b/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + net.tccn + zhub-client-redkale + 1.0-SNAPSHOT + + + 17 + 17 + UTF-8 + + + \ No newline at end of file diff --git a/src/META-INF/services/org.redkale.cluster.ClusterAgentProvider b/src/main/java/META-INF/services/org.redkale.cluster.ClusterAgentProvider similarity index 100% rename from src/META-INF/services/org.redkale.cluster.ClusterAgentProvider rename to src/main/java/META-INF/services/org.redkale.cluster.ClusterAgentProvider diff --git a/src/META-INF/services/org.redkale.source.CacheSourceProvider b/src/main/java/META-INF/services/org.redkale.source.CacheSourceProvider similarity index 100% rename from src/META-INF/services/org.redkale.source.CacheSourceProvider rename to src/main/java/META-INF/services/org.redkale.source.CacheSourceProvider diff --git a/src/net/tccn/AbstractConsumer.java b/src/main/java/net/tccn/AbstractConsumer.java similarity index 100% rename from src/net/tccn/AbstractConsumer.java rename to src/main/java/net/tccn/AbstractConsumer.java diff --git a/src/net/tccn/Event.java b/src/main/java/net/tccn/Event.java similarity index 100% rename from src/net/tccn/Event.java rename to src/main/java/net/tccn/Event.java diff --git a/src/net/tccn/EventType.java b/src/main/java/net/tccn/EventType.java similarity index 100% rename from src/net/tccn/EventType.java rename to src/main/java/net/tccn/EventType.java diff --git a/src/net/tccn/IConsumer.java b/src/main/java/net/tccn/IConsumer.java similarity index 100% rename from src/net/tccn/IConsumer.java rename to src/main/java/net/tccn/IConsumer.java diff --git a/src/net/tccn/IProducer.java b/src/main/java/net/tccn/IProducer.java similarity index 100% rename from src/net/tccn/IProducer.java rename to src/main/java/net/tccn/IProducer.java diff --git a/src/net/tccn/IType.java b/src/main/java/net/tccn/IType.java similarity index 100% rename from src/net/tccn/IType.java rename to src/main/java/net/tccn/IType.java diff --git a/test/net.tccn/cache/RedisTest.java b/src/main/java/net/tccn/RedisTest.java similarity index 87% rename from test/net.tccn/cache/RedisTest.java rename to src/main/java/net/tccn/RedisTest.java index 1547d99..f7e75fb 100644 --- a/test/net.tccn/cache/RedisTest.java +++ b/src/main/java/net/tccn/RedisTest.java @@ -1,15 +1,10 @@ -package net.tccn.cache; +package net.tccn; import org.redkale.net.AsyncIOGroup; import org.redkale.util.AnyValue; import org.redkale.util.ResourceFactory; import org.redkalex.cache.redis.MyRedisCacheSource; -import java.io.Serializable; -import java.util.Collection; -import java.util.List; -import java.util.Map; - import static org.redkale.boot.Application.RESNAME_APP_CLIENT_ASYNCGROUP; import static org.redkale.source.AbstractCacheSource.*; @@ -19,7 +14,7 @@ public class RedisTest { static { // redis://:*Zhong9307!@47.111.150.118:6064?db=2 AnyValue.DefaultAnyValue conf = new AnyValue.DefaultAnyValue().addValue(CACHE_SOURCE_MAXCONNS, "1"); - conf.addValue(CACHE_SOURCE_NODE, new AnyValue.DefaultAnyValue().addValue(CACHE_SOURCE_URL, "redis://:*Zhong9307!@47.111.150.118:6064?db=0")); + conf.addValue(CACHE_SOURCE_NODE, new AnyValue.DefaultAnyValue().addValue(CACHE_SOURCE_URL, "redis://:123456@127.0.0.1:6379?db=0")); final ResourceFactory factory = ResourceFactory.create(); final AsyncIOGroup asyncGroup = new AsyncIOGroup(8192, 16); asyncGroup.start(); @@ -28,6 +23,8 @@ public class RedisTest { //source.defaultConvert = JsonFactory.root().getConvert(); source.init(conf); + System.out.println(source.get("a")); + //--------------------- bit ------------------------------ /*boolean ax = source.getBit("ax", 6); System.out.println("ax:"+ ax); @@ -47,12 +44,62 @@ public class RedisTest { source.lock("lockx", 5000); */ + + source.keysStartsWith("more-hot").forEach(x -> { + System.out.println(x); + source.del(x); + + int i = (short) 3; + }); + + source.keysStartsWith("districtbeans").forEach(x -> { + System.out.println(x); + source.del(x); + }); + source.keysStartsWith("oss-blind-users").forEach(x -> { + System.out.println(x); + source.del(x); + }); + source.keysStartsWith("venue:drama-product-schedule-fee:rt-lbeuai84:20221217").forEach(x -> { + System.out.println(x); + source.del(x); + }); + source.keysStartsWith("venue:site-hour-fee:54f6e9b74cd7416db8d605366c1f49c2:20220729").forEach(x -> { + System.out.println(x); + source.del(x); + }); + source.keysStartsWith("rainbow").forEach(x -> { + System.out.println(x); + source.del(x); + }); + source.keysStartsWith("run").forEach(x -> { + System.out.println(x); + source.del(x); + }); + source.keysStartsWith("today").forEach(x -> { + System.out.println(x); + source.del(x); + }); + source.keysStartsWith("user").forEach(x -> { + System.out.println(x); + source.del(x); + }); + source.keysStartsWith("im:").forEach(x -> { + System.out.println(x); + source.del(x); + }); + source.keysStartsWith("ios-").forEach(x -> { + System.out.println(x); + source.del(x); + }); + + //--------------------- set ------------------------------ - source.del("setx"); - /* + /*source.del("setx"); + *//* int[] ints = {1, 2, 3}; source.sadd("setx", ints); - */ + *//* //source.sadd("setx", list.toArray(Integer[]::new)); List list = List.of(2, 3, 5); @@ -87,17 +134,17 @@ public class RedisTest { Map hms = source.getHms("hmx", "a", "b"); System.out.println("hmx:" + hms); - /*System.out.println("======================================================"); + *//*System.out.println("======================================================"); System.out.println(source.incrHm("hmx", "a", -6.0)); hms = source.getHms("hmx", "a", "b"); - System.out.println("hmx：a+1后的结果 " + hms);*/ + System.out.println("hmx：a+1后的结果 " + hms);*//* System.out.println("======================================================"); source.setHm("hmx", "c", 12); hms = source.getHms("hmx", "a", "b", "c", "d", "a"); System.out.println("hmx：设置 c=12 后的结果 " + hms); System.out.println("======================================================"); Double c = source.getHm("hmx", double.class, "c"); - System.out.println("hmx 中 c 值：" + c); + System.out.println("hmx 中 c 值：" + c);*/ /*Map hmx = source.getHmall("hmx"); System.out.println("Hmall：" + hmx);*/ diff --git a/src/net/tccn/ZhubAgentProvider.java b/src/main/java/net/tccn/ZhubAgentProvider.java similarity index 100% rename from src/net/tccn/ZhubAgentProvider.java rename to src/main/java/net/tccn/ZhubAgentProvider.java diff --git a/src/net/tccn/ZhubProvider.java b/src/main/java/net/tccn/ZhubProvider.java similarity index 100% rename from src/net/tccn/ZhubProvider.java rename to src/main/java/net/tccn/ZhubProvider.java diff --git a/src/net/tccn/timer/TimerExecutor.java b/src/main/java/net/tccn/timer/TimerExecutor.java similarity index 100% rename from src/net/tccn/timer/TimerExecutor.java rename to src/main/java/net/tccn/timer/TimerExecutor.java diff --git a/src/net/tccn/timer/TimerTask.java b/src/main/java/net/tccn/timer/TimerTask.java similarity index 100% rename from src/net/tccn/timer/TimerTask.java rename to src/main/java/net/tccn/timer/TimerTask.java diff --git a/src/net/tccn/timer/Timers.java b/src/main/java/net/tccn/timer/Timers.java similarity index 100% rename from src/net/tccn/timer/Timers.java rename to src/main/java/net/tccn/timer/Timers.java diff --git a/src/net/tccn/timer/queue/TimerQueue.java b/src/main/java/net/tccn/timer/queue/TimerQueue.java similarity index 100% rename from src/net/tccn/timer/queue/TimerQueue.java rename to src/main/java/net/tccn/timer/queue/TimerQueue.java diff --git a/src/net/tccn/timer/scheduled/Scheduled.java b/src/main/java/net/tccn/timer/scheduled/Scheduled.java similarity index 100% rename from src/net/tccn/timer/scheduled/Scheduled.java rename to src/main/java/net/tccn/timer/scheduled/Scheduled.java diff --git a/src/net/tccn/timer/scheduled/ScheduledCycle.java b/src/main/java/net/tccn/timer/scheduled/ScheduledCycle.java similarity index 100% rename from src/net/tccn/timer/scheduled/ScheduledCycle.java rename to src/main/java/net/tccn/timer/scheduled/ScheduledCycle.java diff --git a/src/net/tccn/timer/scheduled/ScheduledExpres.java b/src/main/java/net/tccn/timer/scheduled/ScheduledExpres.java similarity index 100% rename from src/net/tccn/timer/scheduled/ScheduledExpres.java rename to src/main/java/net/tccn/timer/scheduled/ScheduledExpres.java diff --git a/src/net/tccn/timer/task/Job.java b/src/main/java/net/tccn/timer/task/Job.java similarity index 100% rename from src/net/tccn/timer/task/Job.java rename to src/main/java/net/tccn/timer/task/Job.java diff --git a/src/net/tccn/timer/task/Task.java b/src/main/java/net/tccn/timer/task/Task.java similarity index 100% rename from src/net/tccn/timer/task/Task.java rename to src/main/java/net/tccn/timer/task/Task.java diff --git a/src/net/tccn/zhub/Lock.java b/src/main/java/net/tccn/zhub/Lock.java similarity index 100% rename from src/net/tccn/zhub/Lock.java rename to src/main/java/net/tccn/zhub/Lock.java diff --git a/src/net/tccn/zhub/Rpc.java b/src/main/java/net/tccn/zhub/Rpc.java similarity index 100% rename from src/net/tccn/zhub/Rpc.java rename to src/main/java/net/tccn/zhub/Rpc.java diff --git a/src/net/tccn/zhub/RpcResult.java b/src/main/java/net/tccn/zhub/RpcResult.java similarity index 100% rename from src/net/tccn/zhub/RpcResult.java rename to src/main/java/net/tccn/zhub/RpcResult.java diff --git a/src/net/tccn/zhub/ZHubClient.java b/src/main/java/net/tccn/zhub/ZHubClient.java similarity index 100% rename from src/net/tccn/zhub/ZHubClient.java rename to src/main/java/net/tccn/zhub/ZHubClient.java diff --git a/src/org/redkalex/cache/redis/AbstractRedisSource.java b/src/main/java/org/redkalex/cache/redis/AbstractRedisSource.java similarity index 100% rename from src/org/redkalex/cache/redis/AbstractRedisSource.java rename to src/main/java/org/redkalex/cache/redis/AbstractRedisSource.java diff --git a/src/org/redkalex/cache/redis/MyRedisCacheSource.java b/src/main/java/org/redkalex/cache/redis/MyRedisCacheSource.java similarity index 100% rename from src/org/redkalex/cache/redis/MyRedisCacheSource.java rename to src/main/java/org/redkalex/cache/redis/MyRedisCacheSource.java diff --git a/src/org/redkalex/cache/redis/RedisCRC16.java b/src/main/java/org/redkalex/cache/redis/RedisCRC16.java similarity index 100% rename from src/org/redkalex/cache/redis/RedisCRC16.java rename to src/main/java/org/redkalex/cache/redis/RedisCRC16.java diff --git a/src/org/redkalex/cache/redis/RedisCacheClient.java b/src/main/java/org/redkalex/cache/redis/RedisCacheClient.java similarity index 100% rename from src/org/redkalex/cache/redis/RedisCacheClient.java rename to src/main/java/org/redkalex/cache/redis/RedisCacheClient.java diff --git a/src/org/redkalex/cache/redis/RedisCacheCodec.java b/src/main/java/org/redkalex/cache/redis/RedisCacheCodec.java similarity index 100% rename from src/org/redkalex/cache/redis/RedisCacheCodec.java rename to src/main/java/org/redkalex/cache/redis/RedisCacheCodec.java diff --git a/src/org/redkalex/cache/redis/RedisCacheConnection.java b/src/main/java/org/redkalex/cache/redis/RedisCacheConnection.java similarity index 100% rename from src/org/redkalex/cache/redis/RedisCacheConnection.java rename to src/main/java/org/redkalex/cache/redis/RedisCacheConnection.java diff --git a/src/org/redkalex/cache/redis/RedisCacheReqAuth.java b/src/main/java/org/redkalex/cache/redis/RedisCacheReqAuth.java similarity index 100% rename from src/org/redkalex/cache/redis/RedisCacheReqAuth.java rename to src/main/java/org/redkalex/cache/redis/RedisCacheReqAuth.java diff --git a/src/org/redkalex/cache/redis/RedisCacheReqClose.java b/src/main/java/org/redkalex/cache/redis/RedisCacheReqClose.java similarity index 100% rename from src/org/redkalex/cache/redis/RedisCacheReqClose.java rename to src/main/java/org/redkalex/cache/redis/RedisCacheReqClose.java diff --git a/src/org/redkalex/cache/redis/RedisCacheReqDB.java b/src/main/java/org/redkalex/cache/redis/RedisCacheReqDB.java similarity index 100% rename from src/org/redkalex/cache/redis/RedisCacheReqDB.java rename to src/main/java/org/redkalex/cache/redis/RedisCacheReqDB.java diff --git a/src/org/redkalex/cache/redis/RedisCacheReqPing.java b/src/main/java/org/redkalex/cache/redis/RedisCacheReqPing.java similarity index 100% rename from src/org/redkalex/cache/redis/RedisCacheReqPing.java rename to src/main/java/org/redkalex/cache/redis/RedisCacheReqPing.java diff --git a/src/org/redkalex/cache/redis/RedisCacheRequest.java b/src/main/java/org/redkalex/cache/redis/RedisCacheRequest.java similarity index 100% rename from src/org/redkalex/cache/redis/RedisCacheRequest.java rename to src/main/java/org/redkalex/cache/redis/RedisCacheRequest.java diff --git a/src/org/redkalex/cache/redis/RedisCacheResult.java b/src/main/java/org/redkalex/cache/redis/RedisCacheResult.java similarity index 100% rename from src/org/redkalex/cache/redis/RedisCacheResult.java rename to src/main/java/org/redkalex/cache/redis/RedisCacheResult.java diff --git a/src/org/redkalex/cache/redis/RedisCacheSource.java b/src/main/java/org/redkalex/cache/redis/RedisCacheSource.java similarity index 100% rename from src/org/redkalex/cache/redis/RedisCacheSource.java rename to src/main/java/org/redkalex/cache/redis/RedisCacheSource.java diff --git a/src/org/redkalex/cache/redis/RedisCacheSourceProvider.java b/src/main/java/org/redkalex/cache/redis/RedisCacheSourceProvider.java similarity index 100% rename from src/org/redkalex/cache/redis/RedisCacheSourceProvider.java rename to src/main/java/org/redkalex/cache/redis/RedisCacheSourceProvider.java diff --git a/src/org/redkalex/cache/redis/RedisCryptor.java b/src/main/java/org/redkalex/cache/redis/RedisCryptor.java similarity index 100% rename from src/org/redkalex/cache/redis/RedisCryptor.java rename to src/main/java/org/redkalex/cache/redis/RedisCryptor.java