diff --git a/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/MvcRunnable.java b/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/MvcRunnable.java index 778ad7299..8e848470c 100644 --- a/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/MvcRunnable.java +++ b/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/MvcRunnable.java @@ -69,6 +69,7 @@ public MvcRunnable(Mvc mvc, HttpServerConfig config, ChannelHandlerContext ctx, this.context.setHeaders(this.request.getHeaders()); this.context.setVirtualThread(mvc.getMvcConfig().isVirtualThread()); this.context.setPath(path); + this.context.setAllowCross(mvc.getMvcConfig().isAllowCross()); this.request.setMethod(method); this.request.setPath(path); this.request.setBody(body); diff --git a/jcommon/redis/pom.xml b/jcommon/redis/pom.xml index e797a9153..ecd0ab93c 100644 --- a/jcommon/redis/pom.xml +++ b/jcommon/redis/pom.xml @@ -8,7 +8,7 @@ 1.6.0-jdk21-SNAPSHOT redis - 2.0-jdk20-SNAPSHOT + 2.0-jdk21-SNAPSHOT javax.annotation @@ -37,4 +37,18 @@ 3.8.1 + + + + central + maven-release-virtual + https://pkgs.d.xiaomi.net/artifactory/maven-release-virtual + + + snapshots + maven-snapshot-virtual + https://pkgs.d.xiaomi.net/artifactory/maven-snapshot-virtual + + + diff --git a/jcommon/redis/src/main/java/com/xiaomi/data/push/redis/Redis.java b/jcommon/redis/src/main/java/com/xiaomi/data/push/redis/Redis.java index d38845baf..b084b3c8b 100644 --- a/jcommon/redis/src/main/java/com/xiaomi/data/push/redis/Redis.java +++ b/jcommon/redis/src/main/java/com/xiaomi/data/push/redis/Redis.java @@ -208,7 +208,6 @@ public String get(String key) { } public Map mget(final List keys) { - boolean success = true; try { if (serverType.equals("dev")) { Map result = new HashMap<>(); @@ -224,7 +223,6 @@ public Map mget(final List keys) { return cluster.mget(keys); } } catch (Exception e) { - success = false; throw e; } } diff --git a/jcommon/redis/src/main/java/com/xiaomi/data/push/redis/ext/PipelineClusterCommand.java b/jcommon/redis/src/main/java/com/xiaomi/data/push/redis/ext/PipelineClusterCommand.java index 650fdc278..bd678be7f 100644 --- a/jcommon/redis/src/main/java/com/xiaomi/data/push/redis/ext/PipelineClusterCommand.java +++ b/jcommon/redis/src/main/java/com/xiaomi/data/push/redis/ext/PipelineClusterCommand.java @@ -126,6 +126,7 @@ private Map> getPoolKeyMap(List keys) { Map> poolKeysMap = new LinkedHashMap>(); try { Field field = JedisClusterConnectionHandler.class.getDeclaredField("cache"); + field.setAccessible(true); for (String key : keys) { JedisPool jedisPool; int slot = JedisClusterCRC16.getSlot(key);