fix docean cross domain #838 (#839)

* fix docean cross domain #838 * fix redis mget
XiaoMi · May 10, 2024 · e466541 · e466541
1 parent 3705969
commit e466541
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
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
@@ -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
@@ -8,7 +8,7 @@
     <version>1.6.0-jdk21-SNAPSHOT</version>
   </parent>
   <artifactId>redis</artifactId>
-  <version>2.0-jdk20-SNAPSHOT</version>
+  <version>2.0-jdk21-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>javax.annotation</groupId>
@@ -37,4 +37,18 @@
       <version>3.8.1</version>
     </dependency>
   </dependencies>
+
+  <distributionManagement>
+    <repository>
+      <id>central</id>
+      <name>maven-release-virtual</name>
+      <url>https://pkgs.d.xiaomi.net/artifactory/maven-release-virtual</url>
+    </repository>
+    <snapshotRepository>
+      <id>snapshots</id>
+      <name>maven-snapshot-virtual</name>
+      <url>https://pkgs.d.xiaomi.net/artifactory/maven-snapshot-virtual</url>
+    </snapshotRepository>
+  </distributionManagement>
+
 </project>
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
@@ -208,7 +208,6 @@ public String get(String key) {
     }
 
     public Map<String, String> mget(final List<String> keys) {
-        boolean success = true;
         try {
             if (serverType.equals("dev")) {
                 Map<String, String> result = new HashMap<>();
@@ -224,7 +223,6 @@ public Map<String, String> mget(final List<String> 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
@@ -126,6 +126,7 @@ private Map<JedisPool, List<String>> getPoolKeyMap(List<String> keys) {
         Map<JedisPool, List<String>> poolKeysMap = new LinkedHashMap<JedisPool, List<String>>();
         try {
             Field field = JedisClusterConnectionHandler.class.getDeclaredField("cache");
+            field.setAccessible(true);
             for (String key : keys) {
                 JedisPool jedisPool;
                 int slot = JedisClusterCRC16.getSlot(key);