diff --git a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitType.java b/eladmin-common/src/main/java/me/zhengjie/aspect/LimitType.java index e788adc7..bf3f09e2 100644 --- a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitType.java +++ b/eladmin-common/src/main/java/me/zhengjie/aspect/LimitType.java @@ -23,5 +23,5 @@ public enum LimitType { // 默认 CUSTOMER, // by ip addr - IP; + IP } diff --git a/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java b/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java index c128b0ae..a6d3f87f 100644 --- a/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java +++ b/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java @@ -3,14 +3,13 @@ package me.zhengjie.base; import lombok.Getter; import lombok.Setter; import org.apache.commons.lang3.builder.ToStringBuilder; - import java.io.Serializable; import java.lang.reflect.Field; import java.sql.Timestamp; /** * @author Zheng Jie - * @Date 2019年10月24日20:48:53 + * @date 2019年10月24日20:48:53 */ @Getter @Setter diff --git a/eladmin-common/src/main/java/me/zhengjie/config/AuditorConfig.java b/eladmin-common/src/main/java/me/zhengjie/config/AuditorConfig.java index 71826add..e551bb6d 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/AuditorConfig.java +++ b/eladmin-common/src/main/java/me/zhengjie/config/AuditorConfig.java @@ -21,10 +21,9 @@ import org.springframework.stereotype.Component; import java.util.Optional; /** - * @描述 : 设置审计 + * @description : 设置审计 * @author : Dong ZhaoYang - * @日期 : 2019/10/28 - * @时间 : 10:29 + * @date : 2019/10/28 */ @Component("auditorAware") public class AuditorConfig implements AuditorAware { diff --git a/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java b/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java index 6f66e9c1..e9ed0750 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java +++ b/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java @@ -153,7 +153,7 @@ public class RedisConfig extends CachingConfigurerSupport { */ class FastJsonRedisSerializer implements RedisSerializer { - private Class clazz; + private final Class clazz; FastJsonRedisSerializer(Class clazz) { super(); diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java b/eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java index 3d7b0406..b62f86f9 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java @@ -22,11 +22,6 @@ package me.zhengjie.utils; */ public class ElAdminConstant { - /** - * 用于IP定位转换 - */ - public static final String REGION = "内网IP|内网IP"; - /** * win 系统 */ @@ -41,6 +36,9 @@ public class ElAdminConstant { * 常用接口 */ public static class Url{ + // 免费图床 public static final String SM_MS_URL = "https://sm.ms/api"; + // 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/FileUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java index fe039489..23e32bd1 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java @@ -15,7 +15,6 @@ */ package me.zhengjie.utils; -import cn.hutool.core.codec.Base64; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.poi.excel.BigExcelWriter; @@ -23,7 +22,6 @@ import cn.hutool.poi.excel.ExcelUtil; import me.zhengjie.exception.BadRequestException; import org.apache.poi.util.IOUtils; import org.springframework.web.multipart.MultipartFile; -import javax.activation.MimetypesFileTypeMap; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -126,26 +124,6 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { return resultSize; } - /** - * inputStream 转 File - */ - static File inputStreamToFile(InputStream ins, String name) throws Exception{ - File file = new File(System.getProperty("java.io.tmpdir") + File.separator + name); - if (file.exists()) { - return file; - } - OutputStream os = new FileOutputStream(file); - int bytesRead; - int len = 8192; - byte[] buffer = new byte[len]; - while ((bytesRead = ins.read(buffer, 0, len)) != -1) { - os.write(buffer, 0, bytesRead); - } - os.close(); - ins.close(); - return file; - } - /** * 将文件名解析成文件的上传路径 */ @@ -173,16 +151,6 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { return null; } - public static String fileToBase64(File file) throws Exception { - FileInputStream inputFile = new FileInputStream(file); - String base64; - byte[] buffer = new byte[(int)file.length()]; - inputFile.read(buffer); - inputFile.close(); - base64=Base64.encode(buffer); - return base64.replaceAll("[\\s*\t\n\r]", ""); - } - /** * 导出excel */ @@ -222,11 +190,6 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { } } - public static String getFileTypeByMimeType(String type) { - String mimeType = new MimetypesFileTypeMap().getContentType("." + type); - return mimeType.split("/")[0]; - } - public static void checkSize(long maxSize, long size) { // 1M int len = 1024 * 1024; 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 b380e6af..33bfc51c 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java @@ -15,16 +15,12 @@ */ package me.zhengjie.utils; -import cn.hutool.core.io.resource.ClassPathResource; +import cn.hutool.http.HttpUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import eu.bitwalker.useragentutils.Browser; import eu.bitwalker.useragentutils.UserAgent; -import org.lionsoul.ip2region.DataBlock; -import org.lionsoul.ip2region.DbConfig; -import org.lionsoul.ip2region.DbSearcher; import javax.servlet.http.HttpServletRequest; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Method; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Calendar; @@ -159,35 +155,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * 根据ip获取详细地址 */ public static String getCityInfo(String ip) { - DbSearcher searcher = null; - try { - String path = "ip2region/ip2region.db"; - String name = "ip2region.db"; - DbConfig config = new DbConfig(); - File file = FileUtil.inputStreamToFile(new ClassPathResource(path).getStream(), name); - searcher = new DbSearcher(config, file.getPath()); - Method method; - method = searcher.getClass().getMethod("btreeSearch", String.class); - DataBlock dataBlock; - dataBlock = (DataBlock) method.invoke(searcher, ip); - String address = dataBlock.getRegion().replace("0|",""); - char symbol = '|'; - if(address.charAt(address.length()-1) == symbol){ - address = address.substring(0,address.length() - 1); - } - return address.equals(ElAdminConstant.REGION)?"内网IP":address; - } catch (Exception e) { - e.printStackTrace(); - }finally { - if(searcher!=null){ - try { - searcher.close(); - } catch (IOException ignored) { - } - } - - } - return ""; + String api = String.format(ElAdminConstant.Url.IP_URL,ip); + JSONObject object = JSONUtil.parseObj(HttpUtil.get(api)); + return object.get("addr", String.class); } public static String getBrowser(HttpServletRequest request){ diff --git a/eladmin-system/src/main/resources/ip2region/ip2region.db b/eladmin-system/src/main/resources/ip2region/ip2region.db deleted file mode 100644 index 43e1daf5..00000000 Binary files a/eladmin-system/src/main/resources/ip2region/ip2region.db and /dev/null differ diff --git a/pom.xml b/pom.xml index 7b14c861..09b091ae 100644 --- a/pom.xml +++ b/pom.xml @@ -140,12 +140,6 @@ true - - - org.lionsoul - ip2region - 1.7.2 - org.apache.poi poi