From 4a7b6c33e4e137ac1373148939047844361f51b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E6=98=BE=E4=BC=98?= <237809796@qq.com>
Date: Sat, 6 May 2023 19:02:20 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=8D=87=E7=BA=A7=EF=BC=9A=E6=9C=80?=
=?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=20redkale=20=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
conf/application.properties | 13 +
conf/application.xml | 26 -
conf/kafak.properties | 19 -
conf/logging.properties | 18 +
conf/source.properties | 5 +
src/com/zdemo/AbstractConsumer.java | 13 +-
src/com/zdemo/ZhubAgentProvider.java | 69 +
src/com/zdemo/ZhubListener.java | 7 +-
src/com/zdemo/ZhubProvider.java | 21 +
src/com/zdemo/cache_/RedisCacheSource.java | 2173 --------------
src/com/zdemo/cache_/RedisTest.java | 262 --
src/com/zdemo/cachex/MyRedisCacheSource.java | 430 ---
src/com/zdemo/cachex/RedisCacheSource.java | 2240 --------------
.../zdemo/cachex/RedissionCacheSource.java | 1944 ------------
src/com/zdemo/kafak/KafakConsumer.java | 93 -
src/com/zdemo/kafak/KafakProducer.java | 59 -
src/com/zdemo/pulsar/AService.java | 29 -
src/com/zdemo/pulsar/PulsarConsumer.java | 91 -
src/com/zdemo/pulsar/PulsarProducer.java | 82 -
src/com/zdemo/redis/RedisConsumer.java | 114 -
src/com/zdemo/redis/RedisProducer.java | 61 -
src/com/zdemo/zhub/ZHubClient.java | 68 +-
.../cache/redis/AbstractRedisSource.java | 131 +
.../cache/redis/MyRedisCacheSource.java | 137 +
src/org/redkalex/cache/redis/RedisCRC16.java | 78 +
.../cache/redis/RedisCacheClient.java | 36 +
.../redkalex/cache/redis/RedisCacheCodec.java | 249 ++
.../cache/redis/RedisCacheConnection.java | 49 +
.../cache/redis/RedisCacheReqAuth.java | 45 +
.../cache/redis/RedisCacheReqClose.java | 36 +
.../redkalex/cache/redis/RedisCacheReqDB.java | 43 +
.../cache/redis/RedisCacheReqPing.java | 31 +
.../cache/redis/RedisCacheRequest.java | 61 +
.../cache/redis/RedisCacheResult.java | 151 +
.../cache/redis/RedisCacheSource.java | 1790 +++++++++++
.../cache/redis/RedisCacheSourceProvider.java | 29 +
.../redkalex/cache/redis/RedisCryptor.java | 46 +
.../lettuce/RedisLettuceCacheSource.java | 2670 +++++++++++++++++
.../RedisLettuceCacheSourceProvider.java | 35 +
.../redis/redission/RedissionCacheSource.java | 2226 ++++++++++++++
.../RedissionCacheSourceProvider.java | 35 +
.../redis/vertx/RedisVertxCacheSource.java | 1781 +++++++++++
.../vertx/RedisVertxCacheSourceProvider.java | 32 +
.../org.redkale.cluster.ClusterAgentProvider | 1 +
.../org.redkale.source.CacheSourceProvider | 1 +
.../net.tccn/cache}/RedisTest.java | 112 +-
.../zdemo/test => net.tccn/mq}/AppTest.java | 0
.../zdemo/test => net.tccn/mq}/Delays.java | 0
.../test => net.tccn/mq}/HelloService.java | 29 +-
.../test => net.tccn/mq}/MyConsumer.java | 0
50 files changed, 10012 insertions(+), 7659 deletions(-)
create mode 100644 conf/application.properties
delete mode 100644 conf/application.xml
delete mode 100644 conf/kafak.properties
create mode 100644 conf/logging.properties
create mode 100644 conf/source.properties
create mode 100644 src/com/zdemo/ZhubAgentProvider.java
create mode 100644 src/com/zdemo/ZhubProvider.java
delete mode 100644 src/com/zdemo/cache_/RedisCacheSource.java
delete mode 100644 src/com/zdemo/cache_/RedisTest.java
delete mode 100644 src/com/zdemo/cachex/MyRedisCacheSource.java
delete mode 100644 src/com/zdemo/cachex/RedisCacheSource.java
delete mode 100644 src/com/zdemo/cachex/RedissionCacheSource.java
delete mode 100644 src/com/zdemo/kafak/KafakConsumer.java
delete mode 100644 src/com/zdemo/kafak/KafakProducer.java
delete mode 100644 src/com/zdemo/pulsar/AService.java
delete mode 100644 src/com/zdemo/pulsar/PulsarConsumer.java
delete mode 100644 src/com/zdemo/pulsar/PulsarProducer.java
delete mode 100644 src/com/zdemo/redis/RedisConsumer.java
delete mode 100644 src/com/zdemo/redis/RedisProducer.java
create mode 100644 src/org/redkalex/cache/redis/AbstractRedisSource.java
create mode 100644 src/org/redkalex/cache/redis/MyRedisCacheSource.java
create mode 100644 src/org/redkalex/cache/redis/RedisCRC16.java
create mode 100644 src/org/redkalex/cache/redis/RedisCacheClient.java
create mode 100644 src/org/redkalex/cache/redis/RedisCacheCodec.java
create mode 100644 src/org/redkalex/cache/redis/RedisCacheConnection.java
create mode 100644 src/org/redkalex/cache/redis/RedisCacheReqAuth.java
create mode 100644 src/org/redkalex/cache/redis/RedisCacheReqClose.java
create mode 100644 src/org/redkalex/cache/redis/RedisCacheReqDB.java
create mode 100644 src/org/redkalex/cache/redis/RedisCacheReqPing.java
create mode 100644 src/org/redkalex/cache/redis/RedisCacheRequest.java
create mode 100644 src/org/redkalex/cache/redis/RedisCacheResult.java
create mode 100644 src/org/redkalex/cache/redis/RedisCacheSource.java
create mode 100644 src/org/redkalex/cache/redis/RedisCacheSourceProvider.java
create mode 100644 src/org/redkalex/cache/redis/RedisCryptor.java
create mode 100644 src/org/redkalex/cache/redis/lettuce/RedisLettuceCacheSource.java
create mode 100644 src/org/redkalex/cache/redis/lettuce/RedisLettuceCacheSourceProvider.java
create mode 100644 src/org/redkalex/cache/redis/redission/RedissionCacheSource.java
create mode 100644 src/org/redkalex/cache/redis/redission/RedissionCacheSourceProvider.java
create mode 100644 src/org/redkalex/cache/redis/vertx/RedisVertxCacheSource.java
create mode 100644 src/org/redkalex/cache/redis/vertx/RedisVertxCacheSourceProvider.java
create mode 100644 src/resources/META-INF/services/org.redkale.cluster.ClusterAgentProvider
create mode 100644 src/resources/META-INF/services/org.redkale.source.CacheSourceProvider
rename {src/com/zdemo/cachex => test/net.tccn/cache}/RedisTest.java (75%)
rename test/{com/zdemo/test => net.tccn/mq}/AppTest.java (100%)
rename test/{com/zdemo/test => net.tccn/mq}/Delays.java (100%)
rename test/{com/zdemo/test => net.tccn/mq}/HelloService.java (93%)
rename test/{com/zdemo/test => net.tccn/mq}/MyConsumer.java (100%)
diff --git a/conf/application.properties b/conf/application.properties
new file mode 100644
index 0000000..3987050
--- /dev/null
+++ b/conf/application.properties
@@ -0,0 +1,13 @@
+redkale.name=zhub-dev
+redkale.port=6560
+redkale.server[0].protocol=HTTP
+redkale.server[0].host=127.0.0.1
+redkale.server[0].port=80
+# redkale.server[0].root = root
+redkale.server[0].rest.autoload=true
+redkale.server[0].rest.path=
+redkale.server[0].services[0].autoload=true
+# zhub
+redkale.cluster.zhub[hub].addr=47.111.150.118:6066
+redkale.cluster.zhub[hub].auth=zchd@123456
+redkale.cluster.zhub[hub].groupid=venue-zhub
\ No newline at end of file
diff --git a/conf/application.xml b/conf/application.xml
deleted file mode 100644
index 3c2e3ed..0000000
--- a/conf/application.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/conf/kafak.properties b/conf/kafak.properties
deleted file mode 100644
index 37bcd72..0000000
--- a/conf/kafak.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# Producer
-#bootstrap.servers=47.111.150.118:6062
-#bootstrap.servers=121.196.17.55:6062
-bootstrap.servers=39.108.56.246:9092
-#bootstrap.servers=122.112.180.156:6062
-acks=all
-retries=0
-batch.size=16384
-linger.ms=1
-buffer.memory=33554432
-key.serializer=org.apache.kafka.common.serialization.StringSerializer
-value.serializer=org.apache.kafka.common.serialization.StringSerializer
-
-# Consumer
-enable.auto.commit=true
-auto.commit.interval.ms=1000
-group.id=
-key.deserializer=org.apache.kafka.common.serialization.StringDeserializer
-value.deserializer=org.apache.kafka.common.serialization.StringDeserializer
\ No newline at end of file
diff --git a/conf/logging.properties b/conf/logging.properties
new file mode 100644
index 0000000..ab86219
--- /dev/null
+++ b/conf/logging.properties
@@ -0,0 +1,18 @@
+handlers=java.util.logging.ConsoleHandler
+# handlers = java.util.logging.FileHandler
+############################################################
+.level=FINEST
+java.level=INFO
+javax.level=INFO
+com.sun.level=INFO
+sun.level=INFO
+jdk.level=INFO
+java.util.logging.FileHandler.level=FINER
+#10M
+java.util.logging.FileHandler.limit=10M
+java.util.logging.FileHandler.count=20
+java.util.logging.FileHandler.encoding=UTF-8
+java.util.logging.FileHandler.pattern=${APP_HOME}/logs-%tY%tm/log-%tY%tm%td.log
+java.util.logging.FileHandler.unusual=${APP_HOME}/logs-%tY%tm/log-warnerr-%tY%tm%td.log
+java.util.logging.FileHandler.append=true
+java.util.logging.ConsoleHandler.level=FINEST
diff --git a/conf/source.properties b/conf/source.properties
new file mode 100644
index 0000000..741210c
--- /dev/null
+++ b/conf/source.properties
@@ -0,0 +1,5 @@
+############ ClusterSource @Resource(name="hub") ############
+# redkale.cluster.zhub[hub].addr = 47.111.150.118:6066
+# redkale.cluster.zhub[hub].auth = zchd@123456
+# redkale.cluster.zhub[hub].groupid = venue-zhub
+
diff --git a/src/com/zdemo/AbstractConsumer.java b/src/com/zdemo/AbstractConsumer.java
index db3e02b..b3a48a2 100644
--- a/src/com/zdemo/AbstractConsumer.java
+++ b/src/com/zdemo/AbstractConsumer.java
@@ -1,6 +1,7 @@
package com.zdemo;
import org.redkale.convert.json.JsonConvert;
+import org.redkale.util.Resourcable;
import org.redkale.util.TypeToken;
import javax.annotation.Resource;
@@ -13,7 +14,7 @@ import java.util.function.Consumer;
* @author Liang
* @data 2020-09-05 23:18
*/
-public abstract class AbstractConsumer implements IConsumer {
+public abstract class AbstractConsumer extends ZhubAgentProvider implements IConsumer, Resourcable {
protected JsonConvert convert = JsonConvert.root();
@@ -24,10 +25,6 @@ public abstract class AbstractConsumer implements IConsumer {
protected abstract String getGroupid();
- protected boolean preInit() {
- return true;
- }
-
protected final Set getTopics() {
if (!eventMap.isEmpty()) {
return eventMap.keySet();
@@ -76,4 +73,10 @@ public abstract class AbstractConsumer implements IConsumer {
}
}
+ // --------------
+
+ @Override
+ public String resourceName() {
+ return super.getName();
+ }
}
diff --git a/src/com/zdemo/ZhubAgentProvider.java b/src/com/zdemo/ZhubAgentProvider.java
new file mode 100644
index 0000000..c122d4b
--- /dev/null
+++ b/src/com/zdemo/ZhubAgentProvider.java
@@ -0,0 +1,69 @@
+package com.zdemo;
+
+import org.redkale.boot.Application;
+import org.redkale.boot.NodeServer;
+import org.redkale.cluster.CacheClusterAgent;
+import org.redkale.cluster.ClusterAgent;
+import org.redkale.service.Service;
+import org.redkale.util.ResourceEvent;
+
+import java.net.InetSocketAddress;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+
+public abstract class ZhubAgentProvider extends ClusterAgent {
+
+ @Override
+ public void onResourceChange(ResourceEvent[] events) {
+
+ }
+
+ @Override
+ public void register(Application application) {
+
+ }
+
+ @Override
+ public void deregister(Application application) {
+
+ }
+
+ @Override
+ public CompletableFuture