feat: 支持自定义地区值转换

Author: handy-git

pom.xml

@@ -6,12 +6,12 @@
 
     <groupId>cn.handyplus.region</groupId>
     <artifactId>ip2region</artifactId>
-    <version>2.1.3</version>
+    <version>2.2.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <HandyLib.version>3.40.4</HandyLib.version>
-        <ip2region.version>3.1.1</ip2region.version>
+        <HandyLib.version>3.40.5</HandyLib.version>
+        <ip2region.version>3.3.7</ip2region.version>
     </properties>
 
     <dependencies>
@@ -44,7 +44,7 @@
             <dependency>
                 <groupId>cn.handyplus.lib</groupId>
                 <artifactId>HandyBom</artifactId>
-                <version>1.1.1</version>
+                <version>1.1.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

src/main/java/cn/handyplus/region/util/IpUtil.java

@@ -2,6 +2,7 @@
 
 import cn.handyplus.lib.constants.BaseConstants;
 import cn.handyplus.lib.core.StrUtil;
+import cn.handyplus.lib.util.HandyConfigUtil;
 import cn.handyplus.region.constants.BaseIpConstants;
 import cn.handyplus.region.constants.IpGetTypeEnum;
 import lombok.SneakyThrows;
@@ -13,6 +14,7 @@
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.util.Map;
 
 /**
  * 获取ip地址
@@ -49,6 +51,11 @@ public static void getPlayerRegion(Player player) {
         if (IpGetTypeEnum.VORE_API.getIpGetType().equalsIgnoreCase(dataSource)) {
             VoreApiUtil.getPlayerRegion(player);
         }
+        String region = convertRegion(BaseIpConstants.PLAYER_REGION_MAP.get(player.getUniqueId()));
+        if (StrUtil.isEmpty(region)) {
+            return;
+        }
+        BaseIpConstants.PLAYER_REGION_MAP.put(player.getUniqueId(), region);
     }
 
     /**
@@ -59,27 +66,47 @@ public static void getPlayerRegion(Player player) {
      */
     public static String getIpRegion(String ip) {
         String dataSource = BaseConstants.CONFIG.getString("dataSource", IpGetTypeEnum.OFFLINE.getIpGetType());
+        String region = null;
         // 离线模式
         if (IpGetTypeEnum.OFFLINE.getIpGetType().equalsIgnoreCase(dataSource)) {
-            return SearcherUtil.getIpRegion(ip);
+            region = SearcherUtil.getIpRegion(ip);
         }
         // 请求 ipPlus360 模式
         if (IpGetTypeEnum.IP_PLUS_360.getIpGetType().equalsIgnoreCase(dataSource)) {
-            return IpPlus360Util.getIpRegion(ip, null);
+            region = IpPlus360Util.getIpRegion(ip, null);
         }
         // 请求 ipApi 模式
         if (IpGetTypeEnum.IP_API.getIpGetType().equalsIgnoreCase(dataSource)) {
-            return IpApiUtil.getIpRegion(ip);
+            region = IpApiUtil.getIpRegion(ip);
         }
         // 请求 whois 模式
         if (IpGetTypeEnum.WHOIS.getIpGetType().equalsIgnoreCase(dataSource)) {
-            return WhoisUtil.getIpRegion(ip);
+            region = WhoisUtil.getIpRegion(ip);
         }
         // 请求 voreApi 模式
         if (IpGetTypeEnum.VORE_API.getIpGetType().equalsIgnoreCase(dataSource)) {
-            return VoreApiUtil.getIpRegion(ip);
+            region = VoreApiUtil.getIpRegion(ip);
+        }
+        return convertRegion(region);
+    }
+
+    /**
+     * 转换地区格式
+     *
+     * @param region 地区
+     * @return 转换后的地区
+     */
+    private static String convertRegion(String region) {
+        if (StrUtil.isEmpty(region)) {
+            return region;
+        }
+        Map<String, Object> valueMapping = HandyConfigUtil.getChildMap(BaseConstants.CONFIG, "valueMapping");
+        String[] values = region.split("\\|", -1);
+        for (int i = 0; i < values.length; i++) {
+            Object mappedValue = valueMapping.get(values[i]);
+            values[i] = mappedValue == null ? values[i] : String.valueOf(mappedValue);
         }
-        return null;
+        return String.join("|", values);
     }
 
     /**
@@ -139,4 +166,4 @@ protected static String getStr(String str) {
         return StrUtil.isNotEmpty(str) ? str : "0";
     }
 
-}
+}

src/main/resources/config.yml

@@ -8,6 +8,10 @@ unknown: "未知"
 
 local: "内网IP"
 
+# 自定义变量值转换，仅完整匹配获取到的单个值
+valueMapping:
+  Tokyo: "东京"
+
 # 数据来源 自己选择一个最准确的即可
 # offline 本地数据源模式(支持ipv4/ipv6 百分之99.9数据准确性)
 # ipPlus360 在线api模式(支持ipv4/ipv6 付费 必需先购买key填下面)

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: ip2region
 main: cn.handyplus.region.Ip2region
-version: 2.1.3
+version: 2.2.0
 author: handy
 api-version: 1.13
 website: https://ricedoc.handyplus.cn/wiki/ip2region/log