From b6585a821d5a1b15f5e1d3456b005309951e097b Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 30 Nov 2023 20:45:58 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=87=AA=E5=8A=A8=E9=85=8D=E7=BD=AE=EF=BC=8C=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=AF=BC=E5=85=A5=20Hutool=20SpringUtil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/ProjectAutoConfiguration.java | 4 ++++ .../continew/starter/core/util/IpUtils.java | 16 ++++------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/project/ProjectAutoConfiguration.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/project/ProjectAutoConfiguration.java index 36825cfe..0c5343e1 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/project/ProjectAutoConfiguration.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/project/ProjectAutoConfiguration.java @@ -19,6 +19,8 @@ package top.charles7c.continew.starter.core.autoconfigure.project; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Import; /** * 项目自动配置 @@ -28,6 +30,8 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties */ @Slf4j @AutoConfiguration +@ComponentScan("cn.hutool.extra.spring") +@Import(cn.hutool.extra.spring.SpringUtil.class) @EnableConfigurationProperties(ProjectProperties.class) public class ProjectAutoConfiguration { } diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/IpUtils.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/IpUtils.java index d0a29e74..ecd96532 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/IpUtils.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/IpUtils.java @@ -32,10 +32,6 @@ import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperti /** * IP 工具类 * - *

- * 使用本地解析时请提前引入 Hutool SpringUtil,详情请见引入方式。 - *

- * * @author Charles7c * @since 1.0.0 */ @@ -51,8 +47,7 @@ public class IpUtils { /** * 根据 IP 获取归属地信息 * - * @param ip - * IP 地址 + * @param ip IP 地址 * @return 归属地信息 */ public static String getCityInfo(String ip) { @@ -66,8 +61,7 @@ public class IpUtils { /** * 根据 IP 获取归属地信息(网络解析) * - * @param ip - * IP 地址 + * @param ip IP 地址 * @return 归属地信息 */ public static String getHttpCityInfo(String ip) { @@ -82,8 +76,7 @@ public class IpUtils { /** * 根据 IP 获取归属地信息(本地解析) * - * @param ip - * IP 地址 + * @param ip IP 地址 * @return 归属地信息 */ public static String getLocalCityInfo(String ip) { @@ -101,8 +94,7 @@ public class IpUtils { /** * 是否为内网 IPv4 * - * @param ip - * IP 地址 + * @param ip IP 地址 * @return 是否为内网 IP */ public static boolean isInnerIp(String ip) {