From e4f1564ade8da4f84858e8cd8429017d82e2e3ec Mon Sep 17 00:00:00 2001 From: dhb52 Date: Tue, 27 Feb 2024 08:22:19 +0000 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E8=8E=B7=E5=8F=96redis=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E7=BB=9F=E8=AE=A1=E6=8C=87=E4=BB=A4=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dhb52 --- .../module/infra/controller/admin/redis/RedisController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java index e9fd80fc73..74cb7d95a8 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java @@ -34,7 +34,7 @@ public class RedisController { Properties info = stringRedisTemplate.execute((RedisCallback) RedisServerCommands::info); Long dbSize = stringRedisTemplate.execute(RedisServerCommands::dbSize); Properties commandStats = stringRedisTemplate.execute(( - RedisCallback) connection -> connection.commands().info()); + RedisCallback) connection -> connection.info("commandstats")); assert commandStats != null; // 断言，避免警告 // 拼接结果返回 return success(RedisConvert.INSTANCE.build(info, dbSize, commandStats)); From 814acb83aec7764358ffd20b7f57d20f22c93bbd Mon Sep 17 00:00:00 2001 From: zhanhong <283456800@qq.com> Date: Fri, 1 Mar 2024 09:28:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E8=B7=9F=E8=BF=9B=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=95=86=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/followup/CrmFollowUpRecordController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/CrmFollowUpRecordController.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/CrmFollowUpRecordController.java index 64026f15d2..3f9e8cfeb3 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/CrmFollowUpRecordController.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/CrmFollowUpRecordController.java @@ -94,7 +94,7 @@ public class CrmFollowUpRecordController { record.setBusinesses(new ArrayList<>()).setContacts(new ArrayList<>()); record.getContactIds().forEach(id -> MapUtils.findAndThen(contactMap, id, contact -> record.getContacts().add(new CrmBusinessRespVO().setId(contact.getId()).setName(contact.getName())))); - record.getContactIds().forEach(id -> MapUtils.findAndThen(businessMap, id, business -> + record.getBusinessIds().forEach(id -> MapUtils.findAndThen(businessMap, id, business -> record.getBusinesses().add(new CrmBusinessRespVO().setId(business.getId()).setName(business.getName())))); // 2.2 设置用户信息 MapUtils.findAndThen(userMap, Long.valueOf(record.getCreator()), user -> record.setCreatorName(user.getNickname())); @@ -102,4 +102,4 @@ public class CrmFollowUpRecordController { return success(voPageResult); } -} \ No newline at end of file +} From d8bfed5c87e9bc1affc4c82d1144e27018ab8377 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 1 Mar 2024 09:39:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E8=8E=B7=E5=8F=96redis=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E7=BB=9F=E8=AE=A1=E6=8C=87=E4=BB=A4=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/infra/controller/admin/redis/RedisController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java index 74cb7d95a8..88f29f9a82 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java @@ -34,7 +34,7 @@ public class RedisController { Properties info = stringRedisTemplate.execute((RedisCallback) RedisServerCommands::info); Long dbSize = stringRedisTemplate.execute(RedisServerCommands::dbSize); Properties commandStats = stringRedisTemplate.execute(( - RedisCallback) connection -> connection.info("commandstats")); + RedisCallback) connection -> connection.serverCommands().info("commandstats")); assert commandStats != null; // 断言，避免警告 // 拼接结果返回 return success(RedisConvert.INSTANCE.build(info, dbSize, commandStats));