From adc8063ba545c133bfb7762571ea6002341fb8e7 Mon Sep 17 00:00:00 2001 From: ludj Date: Fri, 5 May 2023 18:37:26 +0800 Subject: [PATCH] =?UTF-8?q?POM=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mes/hd/nladmin-system/pom.xml | 24 ------------------- .../java/org/nl/common/utils/StringUtils.java | 15 ------------ .../nl/modules/common/utils/StringUtils.java | 14 ----------- .../satoken/utils/FlushSessionUtil.java | 6 ++--- mes/hd/pom.xml | 3 +++ 5 files changed, 6 insertions(+), 56 deletions(-) diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml index c94bfc77..ba7c50b0 100644 --- a/mes/hd/nladmin-system/pom.xml +++ b/mes/hd/nladmin-system/pom.xml @@ -187,17 +187,6 @@ druid-spring-boot-starter ${druid.version} - - net.dreamlu - mica-ip2region - 2.5.6 - - - - org.lionsoul - ip2region - 1.7.2 - org.projectlombok @@ -356,19 +345,6 @@ 0.1.55 - - - jcifs - jcifs - 1.3.17 - - - servlet-api - javax.servlet - - - - com.alibaba diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/StringUtils.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/StringUtils.java index b3faf1a2..924486d5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/StringUtils.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/StringUtils.java @@ -19,8 +19,6 @@ import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; -import net.dreamlu.mica.ip2region.core.Ip2regionSearcher; -import net.dreamlu.mica.ip2region.core.IpInfo; import nl.basjes.parse.useragent.UserAgent; import nl.basjes.parse.useragent.UserAgentAnalyzer; import org.nl.modules.common.config.ElAdminProperties; @@ -48,8 +46,6 @@ public class StringUtils { /** * 注入bean */ - private final static Ip2regionSearcher IP_SEARCHER = SpringContextHolder.getBean(Ip2regionSearcher.class); - private static final UserAgentAnalyzer USER_AGENT_ANALYZER = UserAgentAnalyzer .newBuilder() @@ -200,17 +196,6 @@ public class StringUtils { return object.get("addr", String.class); } - /** - * 根据ip获取详细地址 - */ - public static String getLocalCityInfo(String ip) { - IpInfo ipInfo = IP_SEARCHER.memorySearch(ip); - if(ipInfo != null){ - return ipInfo.getAddress(); - } - return null; - - } public static String getBrowser(HttpServletRequest request) { UserAgent.ImmutableUserAgent userAgent = USER_AGENT_ANALYZER.parse(request.getHeader("User-Agent")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java index 269c7f5d..b11dc81d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java @@ -19,8 +19,6 @@ import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; -import net.dreamlu.mica.ip2region.core.Ip2regionSearcher; -import net.dreamlu.mica.ip2region.core.IpInfo; import nl.basjes.parse.useragent.UserAgent; import nl.basjes.parse.useragent.UserAgentAnalyzer; import org.nl.modules.common.config.ElAdminProperties; @@ -47,7 +45,6 @@ public class StringUtils { /** * 注入bean */ - private final static Ip2regionSearcher IP_SEARCHER = SpringContextHolder.getBean(Ip2regionSearcher.class); private static final UserAgentAnalyzer USER_AGENT_ANALYZER = UserAgentAnalyzer @@ -199,17 +196,6 @@ public class StringUtils { return object.get("addr", String.class); } - /** - * 根据ip获取详细地址 - */ - public static String getLocalCityInfo(String ip) { - IpInfo ipInfo = IP_SEARCHER.memorySearch(ip); - if(ipInfo != null){ - return ipInfo.getAddress(); - } - return null; - - } public static String getBrowser(HttpServletRequest request) { UserAgent.ImmutableUserAgent userAgent = USER_AGENT_ANALYZER.parse(request.getHeader("User-Agent")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/satoken/utils/FlushSessionUtil.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/satoken/utils/FlushSessionUtil.java index 4900e084..db80c5f6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/satoken/utils/FlushSessionUtil.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/satoken/utils/FlushSessionUtil.java @@ -1,8 +1,8 @@ package org.nl.modules.security.satoken.utils; import cn.dev33.satoken.stp.StpUtil; - import lombok.RequiredArgsConstructor; -import net.dreamlu.mica.core.utils.BeanUtil; +import cn.hutool.core.bean.BeanUtil; +import lombok.RequiredArgsConstructor; import org.nl.wms.system_manage.service.user.dao.SysUser; import org.nl.wms.system_manage.service.user.dto.CurrentUser; import org.nl.wms.system_manage.service.user.dto.UserDto; @@ -30,7 +30,7 @@ public class FlushSessionUtil { CurrentUser user = new CurrentUser(); user.setId(userDto.getId()); user.setUsername(userDto.getUsername()); - SysUser sysUser = BeanUtil.copy(userDto, SysUser.class); + SysUser sysUser = BeanUtil.copyProperties(userDto,SysUser.class); user.setUser(sysUser); user.setPermissions(permissionList); StpUtil.getTokenSession().set("userInfo", user); diff --git a/mes/hd/pom.xml b/mes/hd/pom.xml index ff37f787..6e744a47 100644 --- a/mes/hd/pom.xml +++ b/mes/hd/pom.xml @@ -14,6 +14,9 @@ UTF-8 UTF-8 1.8 + @ + ${java.version} + ${java.version}