From 6c5e7061fe5f06afe3a5b8a2162a0b4dc0d517c0 Mon Sep 17 00:00:00 2001
From: Zheng Jie <201507802@qq.com>
Date: Sun, 11 Jun 2023 21:27:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...issionConfig.java => AuthorityConfig.java} | 2 +-
.../me/zhengjie/config/ElAdminProperties.java | 38 -------------------
.../me/zhengjie/config/FileProperties.java | 6 +--
.../{ElAdminConstant.java => ElConstant.java} | 15 +-------
.../java/me/zhengjie/utils/StringUtils.java | 25 ------------
.../service/impl/MonitorServiceImpl.java | 4 +-
.../main/resources/config/application-dev.yml | 4 --
.../resources/config/application-prod.yml | 4 --
pom.xml | 3 +-
9 files changed, 8 insertions(+), 93 deletions(-)
rename eladmin-common/src/main/java/me/zhengjie/config/{ElPermissionConfig.java => AuthorityConfig.java} (97%)
delete mode 100644 eladmin-common/src/main/java/me/zhengjie/config/ElAdminProperties.java
rename eladmin-common/src/main/java/me/zhengjie/utils/{ElAdminConstant.java => ElConstant.java} (71%)
diff --git a/eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java b/eladmin-common/src/main/java/me/zhengjie/config/AuthorityConfig.java
similarity index 97%
rename from eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java
rename to eladmin-common/src/main/java/me/zhengjie/config/AuthorityConfig.java
index 9ae1fd5d..658e6216 100644
--- a/eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java
+++ b/eladmin-common/src/main/java/me/zhengjie/config/AuthorityConfig.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
* @author Zheng Jie
*/
@Service(value = "el")
-public class ElPermissionConfig {
+public class AuthorityConfig {
public Boolean check(String ...permissions){
// 获取当前用户的所有权限
diff --git a/eladmin-common/src/main/java/me/zhengjie/config/ElAdminProperties.java b/eladmin-common/src/main/java/me/zhengjie/config/ElAdminProperties.java
deleted file mode 100644
index 28541858..00000000
--- a/eladmin-common/src/main/java/me/zhengjie/config/ElAdminProperties.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2019-2020 Zheng Jie
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package me.zhengjie.config;
-
-import lombok.Data;
-import me.zhengjie.utils.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Zheng Jie
- * @description
- * @date 2021-11-22
- **/
-@Data
-@Component
-public class ElAdminProperties {
-
- public static Boolean ipLocal;
-
- @Value("${ip.local-parsing}")
- public void setIpLocal(Boolean ipLocal) {
- ElAdminProperties.ipLocal = ipLocal;
- }
-}
diff --git a/eladmin-common/src/main/java/me/zhengjie/config/FileProperties.java b/eladmin-common/src/main/java/me/zhengjie/config/FileProperties.java
index bf0ebf6a..3d0a5c6a 100644
--- a/eladmin-common/src/main/java/me/zhengjie/config/FileProperties.java
+++ b/eladmin-common/src/main/java/me/zhengjie/config/FileProperties.java
@@ -16,7 +16,7 @@
package me.zhengjie.config;
import lombok.Data;
-import me.zhengjie.utils.ElAdminConstant;
+import me.zhengjie.utils.ElConstant;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@@ -42,9 +42,9 @@ public class FileProperties {
public ElPath getPath(){
String os = System.getProperty("os.name");
- if(os.toLowerCase().startsWith(ElAdminConstant.WIN)) {
+ if(os.toLowerCase().startsWith(ElConstant.WIN)) {
return windows;
- } else if(os.toLowerCase().startsWith(ElAdminConstant.MAC)){
+ } else if(os.toLowerCase().startsWith(ElConstant.MAC)){
return mac;
}
return linux;
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java b/eladmin-common/src/main/java/me/zhengjie/utils/ElConstant.java
similarity index 71%
rename from eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java
rename to eladmin-common/src/main/java/me/zhengjie/utils/ElConstant.java
index 08f9c3c1..479b1e69 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/ElConstant.java
@@ -21,12 +21,7 @@ package me.zhengjie.utils;
* @author Zheng Jie
* @date 2018-12-26
*/
-public class ElAdminConstant {
-
- /**
- * 用于IP定位转换
- */
- public static final String REGION = "内网IP|内网IP";
+public class ElConstant {
/**
* win 系统
*/
@@ -36,12 +31,4 @@ public class ElAdminConstant {
* mac 系统
*/
public static final String MAC = "mac";
-
- /**
- * 常用接口
- */
- public static class Url {
- // IP归属地查询
- public static final String IP_URL = "http://whois.pconline.com.cn/ipJson.jsp?ip=%s&json=true";
- }
}
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
index e0c262b0..9c87bd4c 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
@@ -15,11 +15,7 @@
*/
package me.zhengjie.utils;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.config.ElAdminProperties;
import net.dreamlu.mica.ip2region.core.Ip2regionSearcher;
import net.dreamlu.mica.ip2region.core.IpInfo;
import nl.basjes.parse.useragent.UserAgent;
@@ -174,32 +170,11 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* 根据ip获取详细地址
*/
public static String getCityInfo(String ip) {
- if (ElAdminProperties.ipLocal) {
- return getLocalCityInfo(ip);
- } else {
- return getHttpCityInfo(ip);
- }
- }
-
- /**
- * 根据ip获取详细地址
- */
- public static String getHttpCityInfo(String ip) {
- String api = String.format(ElAdminConstant.Url.IP_URL, ip);
- JSONObject object = JSONUtil.parseObj(HttpUtil.get(api));
- 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) {
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java
index fd69a222..4868bab6 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java
@@ -18,7 +18,7 @@ package me.zhengjie.modules.system.service.impl;
import cn.hutool.core.date.BetweenFormatter.Level;
import cn.hutool.core.date.DateUtil;
import me.zhengjie.modules.system.service.MonitorService;
-import me.zhengjie.utils.ElAdminConstant;
+import me.zhengjie.utils.ElConstant;
import me.zhengjie.utils.FileUtil;
import me.zhengjie.utils.StringUtils;
import org.springframework.stereotype.Service;
@@ -78,7 +78,7 @@ public class MonitorServiceImpl implements MonitorService {
long available = 0, total = 0;
for (OSFileStore fs : fsArray){
// windows 需要将所有磁盘分区累加，linux 和 mac 直接累加会出现磁盘重复的问题，待修复
- if(osName.toLowerCase().startsWith(ElAdminConstant.WIN)) {
+ if(osName.toLowerCase().startsWith(ElConstant.WIN)) {
available += fs.getUsableSpace();
total += fs.getTotalSpace();
} else {
diff --git a/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin-system/src/main/resources/config/application-dev.yml
index c96a9233..79373aaf 100644
--- a/eladmin-system/src/main/resources/config/application-dev.yml
+++ b/eladmin-system/src/main/resources/config/application-dev.yml
@@ -100,10 +100,6 @@ generator:
swagger:
enabled: true
-# IP 本地解析
-ip:
- local-parsing: true
-
# 文件存储路径
file:
mac:
diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml
index 03b6e994..851b26c4 100644
--- a/eladmin-system/src/main/resources/config/application-prod.yml
+++ b/eladmin-system/src/main/resources/config/application-prod.yml
@@ -94,10 +94,6 @@ jwt:
# 续期时间范围，默认 1小时，这里单位毫秒
renew: 3600000
-# IP 本地解析
-ip:
- local-parsing: true
-
#是否允许生成代码，生产环境设置为false
generator:
enabled: false
diff --git a/pom.xml b/pom.xml
index 18068474..3e086e8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,12 +121,11 @@
${druid.version}
-
net.dreamlu
mica-ip2region
- 2.6.3
+ 2.7.12