From d49341204c0e924aa8bb442f1aadcd5d621a8102 Mon Sep 17 00:00:00 2001 From: hy001 Date: Mon, 18 May 2026 11:10:20 +0800 Subject: [PATCH] Fix gateway console go route --- nacos_config/rc-gateway/application.yml | 21 ++++++++++++++++++- .../PropsCommodityStoreClientServiceImpl.java | 14 ++++++++----- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/nacos_config/rc-gateway/application.yml b/nacos_config/rc-gateway/application.yml index dac1a798..c42be4c9 100644 --- a/nacos_config/rc-gateway/application.yml +++ b/nacos_config/rc-gateway/application.yml @@ -108,7 +108,7 @@ spring: predicates: - Path=/play-server-notice/** - - id: service-console-go + - id: console-go-service uri: http://10.2.1.16:2900 order: -20 predicates: @@ -132,6 +132,8 @@ gateway: - /account/create - /account/login/**/* - /account/login + - /console/go + - /console/go/** - /console/account/login/**/* - /console/account/login - /console/** @@ -191,8 +193,25 @@ gateway: - /go/resident-activity/room-turnover-reward/** - /resident-activity/room-turnover-reward/** - /go/resident-activity/register-reward/** + - /resident-activity/register-reward/** - /go/resident-activity/specified-gift-weekly-rank/** + - /resident-activity/specified-gift-weekly-rank/** - /go/resident-activity/week-star/** + - /resident-activity/week-star/** + - /resident-activity/sign-in-reward/** + - /resident-activity/vip/** + - /resident-activity/recharge-reward/** + - /resident-activity/task-center/** + - /resident-activity/voice-room-red-packet/** + - /resident-activity/voice-room-rocket/** + - /resident-activity/wheel/** + - /resident-activity/smash-golden-egg/** + - /operate/baishun-game/** + - /operate/lingxian-game/** + - /app-system/home-popups/** + - /app-system/error-logs/** + - /region/config/im-groups/** + - /payment/binance/** # leaderboard - /activity/leaderboard/gifts-send - /activity/leaderboard/gifts-received diff --git a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsCommodityStoreClientServiceImpl.java b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsCommodityStoreClientServiceImpl.java index 3e5909fe..ac91656c 100644 --- a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsCommodityStoreClientServiceImpl.java +++ b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsCommodityStoreClientServiceImpl.java @@ -46,7 +46,9 @@ public class PropsCommodityStoreClientServiceImpl implements PropsCommodityStore return propsCommodityStoreService.query() .eq(PropsCommodityStore::getSysOrigin, sysOrigin) .in(PropsCommodityStore::getSourceId, sourceIds) - .eq(PropsCommodityStore::getDel, Boolean.FALSE) + .and(wrapper -> wrapper.eq(PropsCommodityStore::getDel, Boolean.FALSE) + .or() + .isNull(PropsCommodityStore::getDel)) .orderByDesc(PropsCommodityStore::getUpdateTime) .list() .stream() @@ -70,10 +72,12 @@ public class PropsCommodityStoreClientServiceImpl implements PropsCommodityStore qryCmd.getPropsType()) .like(StringUtils.isNotBlank(qryCmd.getCurrencyTypes()), PropsCommodityStore::getCurrencyTypes, qryCmd.getCurrencyTypes()) - .eq(Objects.nonNull(qryCmd.getShelfStatus()), - PropsCommodityStore::getShelfStatus, qryCmd.getShelfStatus()) - .eq(PropsCommodityStore::getDel, Boolean.FALSE) - .orderByDesc(PropsCommodityStore::getSort, PropsCommodityStore::getId) + .eq(Objects.nonNull(qryCmd.getShelfStatus()), + PropsCommodityStore::getShelfStatus, qryCmd.getShelfStatus()) + .and(wrapper -> wrapper.eq(PropsCommodityStore::getDel, Boolean.FALSE) + .or() + .isNull(PropsCommodityStore::getDel)) + .orderByDesc(PropsCommodityStore::getSort, PropsCommodityStore::getId) .page(qryCmd.getPageQuery()) ); }