From dd0debd51eedf5ff05b6db6abf613fe6c60f7a7a Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Thu, 15 Aug 2024 17:07:27 +0800
Subject: [PATCH] =?UTF-8?q?Flipper.sort=E5=85=BC=E5=AE=B9=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E7=9A=84=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/cached.md                                         |  4 ++--
 .../java/org/redkale/source/AbstractDataSqlSource.java |  3 ++-
 .../java/org/redkale/test/cached/CachedInstance.java   | 10 +++++-----
 .../org/redkale/test/cached/CachedInstanceTest.java    |  4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/docs/cached.md b/docs/cached.md
index 882ad87c8..4278b689c 100644
--- a/docs/cached.md
+++ b/docs/cached.md
@@ -42,7 +42,7 @@
 
     //实时修改远程缓存的key值
     public void updateName(String code, Map<String, Long> map) {
-        cachedManager.remoteSetString(code + "_" + map.get("id"), Duration.ofMillis(60));
+        cachedManager.remoteSetString(code + "_" + map.get("id"), code + "-" + map, Duration.ofMillis(60));
     }
 
     @Cached(key = "#{code}_#{map.id}", remoteExpire = "60", timeUnit = TimeUnit.MILLISECONDS)
@@ -104,7 +104,7 @@
 
     //第一个缓存器实时修改远程缓存的key值
     public void updateName(String code, Map<String, Long> map) {
-        cachedManager.remoteSetString(code + "_" + map.get("id"), Duration.ofMillis(60));
+        cachedManager.remoteSetString(code + "_" + map.get("id"), code + "-" + map, Duration.ofMillis(60));
     }
 
     //使用第一个缓存器
diff --git a/src/main/java/org/redkale/source/AbstractDataSqlSource.java b/src/main/java/org/redkale/source/AbstractDataSqlSource.java
index 4e9f0d43e..79f0ccf44 100644
--- a/src/main/java/org/redkale/source/AbstractDataSqlSource.java
+++ b/src/main/java/org/redkale/source/AbstractDataSqlSource.java
@@ -253,7 +253,7 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource
         if (sort.indexOf(';') >= 0 || sort.indexOf('\n') >= 0) {
             return "";
         }
-        return sortOrderbySqls.computeIfAbsent(sort, s -> {
+        return sortOrderbySqls.computeIfAbsent(sort.trim(), s -> {
             final StringBuilder sb = new StringBuilder();
             sb.append(" ORDER BY ");
             if (info.getBuilder().isNoAlias()) {
@@ -261,6 +261,7 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource
             } else {
                 boolean flag = false;
                 for (String item : s.split(",")) {
+                    item = item.trim();
                     if (item.isEmpty()) {
                         continue;
                     }
diff --git a/src/test/java/org/redkale/test/cached/CachedInstance.java b/src/test/java/org/redkale/test/cached/CachedInstance.java
index 9ed6650ba..f19e06f1d 100644
--- a/src/test/java/org/redkale/test/cached/CachedInstance.java
+++ b/src/test/java/org/redkale/test/cached/CachedInstance.java
@@ -23,11 +23,11 @@ import org.redkale.util.RedkaleException;
 public class CachedInstance implements Service {
 
     @Resource
-    private CachedManager cacheManager;
+    private CachedManager cachedManager;
 
     // 修改远程缓存的key值
     public void updateName(String code, Map<String, Long> map) {
-        cacheManager.remoteSetString(code, code + "_" + map.get("id"), Duration.ofMillis(60));
+        cachedManager.remoteSetString(code + "_" + map.get("id"), code + "-" + map, Duration.ofMillis(60));
     }
 
     @Cached(key = "#{code}_#{map.id}", remoteExpire = "60", timeUnit = TimeUnit.MILLISECONDS)
@@ -41,7 +41,7 @@ public class CachedInstance implements Service {
     }
 
     public void updateName(String val) {
-        cacheManager.bothSet("name_2", String.class, val, Duration.ofSeconds(31), Duration.ofSeconds(60));
+        cachedManager.bothSet("name_2", String.class, val, Duration.ofSeconds(31), Duration.ofSeconds(60));
     }
 
     @Cached(key = "name_2", localExpire = "31", remoteExpire = "60")
@@ -86,8 +86,8 @@ public class CachedInstance implements Service {
         return CompletableFuture.completedFuture(null);
     }
 
-    public CachedManager getCacheManager() {
-        return cacheManager;
+    public CachedManager getCachedManager() {
+        return cachedManager;
     }
 
     public static class ParamBean {
diff --git a/src/test/java/org/redkale/test/cached/CachedInstanceTest.java b/src/test/java/org/redkale/test/cached/CachedInstanceTest.java
index 6a97675b8..c79fb62fe 100644
--- a/src/test/java/org/redkale/test/cached/CachedInstanceTest.java
+++ b/src/test/java/org/redkale/test/cached/CachedInstanceTest.java
@@ -80,8 +80,8 @@ public class CachedInstanceTest {
         Assertions.assertEquals("haha", instance.getName2());
         Assertions.assertEquals("haha", instance2.getName2());
         System.out.println("准备设置 updateName");
-        System.out.println("instance1.manager = " + instance.getCacheManager());
-        System.out.println("instance2.manager = " + instance2.getCacheManager());
+        System.out.println("instance1.manager = " + instance.getCachedManager());
+        System.out.println("instance2.manager = " + instance2.getCachedManager());
         manager.updateBroadcastable(false);
         instance.updateName("gege");
         Assertions.assertEquals("gege", instance.getName2());