From 7dcec80080377915674c6f1198cc02d4090dbe9d Mon Sep 17 00:00:00 2001 From: lionsoul Date: Thu, 3 Nov 2016 15:53:20 +0800 Subject: [PATCH] track the db make jar tools --- .gitignore | 1 + CHANGES.md | 15 +++++++++++++++ dbMaker-1.2.2.jar | Bin 0 -> 10470 bytes 3 files changed, 16 insertions(+) create mode 100644 dbMaker-1.2.2.jar diff --git a/.gitignore b/.gitignore index 2276a2d..bea30fa 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ META-INF/ # Binary Files # *.jar +!dbMaker-*.jar # Package Files # .settings/ .classpath diff --git a/CHANGES.md b/CHANGES.md index fdb0c18..f2b27ca 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,18 @@ +### 1.2.2 + +1. ip数据文件更新至2016/11/02版本 +2. 增加ip2region.db数据库文件的java生成工具,用法如下: + +```shell +cd 项目根目录 +java -jar dbMaker-{version}.jar -src 文本数据文件 -region 地域csv文件 + +# 文件数据文件:是db文件的原始数据,自带的ip2region.db文件就是/data/ip.merge.txt生成而来 +# 地域csv文件:该文件目的是用于方便配置ip2region进行数据关系的存储,可以获取里面的city_id,这个直接使用/data/origin/global_region.csv文件即可 +``` + +3. 新增golang查询客户端的实现,感谢 [@mohong122](https://github.com/mohong122) 的关注和贡献 + ### 1.2 1. 新增分列式升级算法,大大的增加了数据的准确率,基本避免之前各大网友反馈的些许ip定位错误! diff --git a/dbMaker-1.2.2.jar b/dbMaker-1.2.2.jar new file mode 100644 index 0000000000000000000000000000000000000000..2cd1d50169f090ccb7d6b7d5fa6e39f6389463c8 GIT binary patch literal 10470 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 HKYsl`zHWi9 literal 0 HcmV?d00001