|
@@ -551,10 +551,10 @@ public class GoodsDonController {
|
|
|
// List<Long> filter_goodsIds = getFilterGoodsIds();
|
|
// List<Long> filter_goodsIds = getFilterGoodsIds();
|
|
|
List<Long> filter_goodsIds = null;
|
|
List<Long> filter_goodsIds = null;
|
|
|
AtomicBoolean isRemoveRg = new AtomicBoolean(false);
|
|
AtomicBoolean isRemoveRg = new AtomicBoolean(false);
|
|
|
-// if (isHzIp()) {
|
|
|
|
|
-// key += ":hz-ip";
|
|
|
|
|
-// isRemoveRg.set(true);
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ if (isHzIp()) {
|
|
|
|
|
+ key += ":hz-ip";
|
|
|
|
|
+ isRemoveRg.set(true);
|
|
|
|
|
+ }
|
|
|
Long fUid = StpUserUtil.getUserIdAfterLogin();
|
|
Long fUid = StpUserUtil.getUserIdAfterLogin();
|
|
|
Object o = redisService.get(key);
|
|
Object o = redisService.get(key);
|
|
|
if (o == null) {
|
|
if (o == null) {
|
|
@@ -633,7 +633,7 @@ public class GoodsDonController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public Boolean isHzIp() {
|
|
public Boolean isHzIp() {
|
|
|
- if (StringUtil.getRealAddressByIP(ServletUtil.getClientIP(request)).contains("杭州")) {
|
|
|
|
|
|
|
+ if (StringUtil.getRealAddressByIP(ServletUtil.getClientIP(request)).contains("无锡")) {
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
return false;
|
|
return false;
|
|
@@ -1107,10 +1107,10 @@ public class GoodsDonController {
|
|
|
String key = RedisService.key.YH_HOME_PAGHE_CACHE.getEnvName() + "pc:homeManage";
|
|
String key = RedisService.key.YH_HOME_PAGHE_CACHE.getEnvName() + "pc:homeManage";
|
|
|
//移除奈飞客厅 临时
|
|
//移除奈飞客厅 临时
|
|
|
Long filterConfigId = null;
|
|
Long filterConfigId = null;
|
|
|
-// if (isHzIp()) {
|
|
|
|
|
-// key += ":hz_ip";
|
|
|
|
|
-// filterConfigId = 55l;
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ if (isHzIp()) {
|
|
|
|
|
+ key += ":hz_ip";
|
|
|
|
|
+ filterConfigId = 55l;
|
|
|
|
|
+ }
|
|
|
Object o = redisService.get(key);
|
|
Object o = redisService.get(key);
|
|
|
if (o == null) {
|
|
if (o == null) {
|
|
|
MapBuilder builder = MapUtils.builder()
|
|
MapBuilder builder = MapUtils.builder()
|