From e4153bb3495c56e0a59d13d4e089cde189c35025 Mon Sep 17 00:00:00 2001 From: heqijun Date: Sat, 7 Jun 2025 11:05:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84ip=E5=9C=B0=E5=9D=80+=E4=BC=98=E5=8C=96ip?= =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E6=A0=A1=E9=AA=8C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/sendCheck/impl/IpSendCheckServiceImpl.java | 6 +++--- beacon-api/src/main/resources/bootstrap.yml | 4 ++-- beacon-cache/src/main/resources/bootstrap.yml | 4 ++-- beacon-test/src/main/resources/application.yml | 4 ++-- .../com/mashibing/test/mapper/ClientBusinessMapperTest.java | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/beacon-api/src/main/java/com/mashibing/api/service/sendCheck/impl/IpSendCheckServiceImpl.java b/beacon-api/src/main/java/com/mashibing/api/service/sendCheck/impl/IpSendCheckServiceImpl.java index ea689fa..d686602 100644 --- a/beacon-api/src/main/java/com/mashibing/api/service/sendCheck/impl/IpSendCheckServiceImpl.java +++ b/beacon-api/src/main/java/com/mashibing/api/service/sendCheck/impl/IpSendCheckServiceImpl.java @@ -29,19 +29,19 @@ public class IpSendCheckServiceImpl implements SendCheckService { @Override public void check(StandardSubmit submit) { - log.info("【接口模块-校验ip】 校验ing…………"); + log.info("【接口模块-校验ip】校验ing…………"); //1. 根据CacheClient根据客户的apikey以及ipAddress去查询客户的IP白名单 String ip = cacheClient.hgetString(CacheConstant.CLIENT_BUSINESS + submit.getApikey(), IP_ADDRESS); submit.setIpAddress(ip); //2. 如果IP白名单为null，直接放行 if (StringUtils.isEmpty(ip) || ip.contains(submit.getRealIp())) { - log.info("【接口模块-校验ip】 客户端请求IP合法！"); + log.info("【接口模块-校验ip】客户端请求IP合法！{}", submit.getIpAddress()); return; } //3. IP白名单不为空，并且客户端请求不在IP报名单内 - log.info("【接口模块-校验ip】 请求的ip不在白名单内"); + log.info("【接口模块-校验ip】请求的ip不在白名单内！{}", submit.getIpAddress()); throw new ApiException(ExceptionEnums.IP_NOT_WHITE); } } diff --git a/beacon-api/src/main/resources/bootstrap.yml b/beacon-api/src/main/resources/bootstrap.yml index f9a0ab8..fd3e373 100644 --- a/beacon-api/src/main/resources/bootstrap.yml +++ b/beacon-api/src/main/resources/bootstrap.yml @@ -9,9 +9,9 @@ spring: cloud: nacos: discovery: - server-addr: 192.168.1.10:8848 + server-addr: 192.168.1.13:8848 # nacos配置中心地址: config: - server-addr: 192.168.1.10:8848 + server-addr: 192.168.1.13:8848 file-extension: yml # beacon-api-dev.yml \ No newline at end of file diff --git a/beacon-cache/src/main/resources/bootstrap.yml b/beacon-cache/src/main/resources/bootstrap.yml index feb718b..1b2ddd6 100644 --- a/beacon-cache/src/main/resources/bootstrap.yml +++ b/beacon-cache/src/main/resources/bootstrap.yml @@ -9,10 +9,10 @@ spring: cloud: nacos: discovery: - server-addr: 192.168.1.10:8848 + server-addr: 192.168.1.13:8848 # nacos配置中心地址: config: - server-addr: 192.168.1.10:8848 + server-addr: 192.168.1.13:8848 file-extension: yml # beacon-cache-dev.yml \ No newline at end of file diff --git a/beacon-test/src/main/resources/application.yml b/beacon-test/src/main/resources/application.yml index 1d412d1..3fe4a3e 100644 --- a/beacon-test/src/main/resources/application.yml +++ b/beacon-test/src/main/resources/application.yml @@ -6,11 +6,11 @@ spring: cloud: nacos: discovery: - server-addr: 192.168.1.10:8848 + server-addr: 192.168.1.13:8848 # datasource datasource: driver-class-name: org.gjt.mm.mysql.Driver - url: jdbc:mysql://192.168.1.10:3306/beacon_cloud?characterEncoding=utf-8&useSSL=false + url: jdbc:mysql://192.168.1.13:3306/beacon_cloud?characterEncoding=utf-8&useSSL=false username: root password: root # 端口号 diff --git a/beacon-test/src/test/java/com/mashibing/test/mapper/ClientBusinessMapperTest.java b/beacon-test/src/test/java/com/mashibing/test/mapper/ClientBusinessMapperTest.java index d42debc..22afcf5 100644 --- a/beacon-test/src/test/java/com/mashibing/test/mapper/ClientBusinessMapperTest.java +++ b/beacon-test/src/test/java/com/mashibing/test/mapper/ClientBusinessMapperTest.java @@ -25,7 +25,7 @@ class ClientBusinessMapperTest { @Test public void findById() { ClientBusiness cb = mapper.findById(1L); - cb.setIpAddress("127.0.0.1"); + cb.setIpAddress("192.168.1.5"); // System.out.println("\"22.220.124.110\".equals(cb.getIpAddress()) = " + "22.220.124.110".equals(cb.getIpAddress())); System.out.println(cb); ObjectMapper mapper = new ObjectMapper();