From 78280b54efd84063c3e626f0979145afbee141f6 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Tue, 1 Apr 2025 22:16:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?ip=20=E5=9C=B0=E5=9D=80=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/log/aspect/OperationLogAspect.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cash-common/cash-common-log/src/main/java/com/czg/log/aspect/OperationLogAspect.java b/cash-common/cash-common-log/src/main/java/com/czg/log/aspect/OperationLogAspect.java index 6131e9dc..6ef78764 100644 --- a/cash-common/cash-common-log/src/main/java/com/czg/log/aspect/OperationLogAspect.java +++ b/cash-common/cash-common-log/src/main/java/com/czg/log/aspect/OperationLogAspect.java @@ -125,7 +125,7 @@ public class OperationLogAspect { log.set("location", Convert.toStr(location)); } else { String address = AddressUtil.getRealAddressByIp(ip); - redisService.set("IP::" + ip, address); + redisService.set("IP::" + ip, address, 60 * 60 * 24); log.set("location", address); } log.set("userAgent", request.getHeader(HttpHeaders.USER_AGENT)); @@ -151,4 +151,4 @@ public class OperationLogAspect { //保存到Redis队列里 logProducer.saveLog(JSON.toJSONString(log.toUnderlineKeysMap(), JSONWriter.Feature.WriteMapNullValue)); } -} \ No newline at end of file +} From 6df79916bd50d13885aa663a12c0b08d9ee79e86 Mon Sep 17 00:00:00 2001 From: Tankaikai Date: Wed, 2 Apr 2025 09:06:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=93=E5=AD=98bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/controller/admin/ProductController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java index 0fa53f74..1a26a0c4 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java @@ -65,13 +65,15 @@ public class ProductController { public CzgResult> getProductList(ProductDTO param) { Long shopId = StpKit.USER.getShopId(0L); param.setShopId(shopId); - List data = getProductCacheList(param); + ProductDTO cacheParam = new ProductDTO(); + cacheParam.setShopId(shopId); + List data = getProductCacheList(cacheParam, param); productService.refreshProductStock(param, data); return CzgResult.success(data); } - private List getProductCacheList(ProductDTO param) { - List productList = productService.getProductList(param); + private List getProductCacheList(ProductDTO cacheParam, ProductDTO param) { + List productList = productService.getProductList(cacheParam); if (StrUtil.isNotEmpty(param.getName())) { productList = productList.stream().filter(obj -> StrUtil.contains(obj.getName(), param.getName())).toList(); }