Commit Graph

650 Commits

Author SHA1 Message Date
Wu Jian Ping d96d54bbaa 优化代码 2023-03-30 21:58:40 +08:00
Wu Jian Ping 9578720cd1 优化代码 2023-03-30 21:34:06 +08:00
Wu Jian Ping 1d09953acb nginx implementation first cut 2023-03-30 21:03:53 +08:00
Wu Jian Ping b04e477b99 nginx-impl init 2023-03-30 17:46:38 +08:00
lion 138eea8849 upgrade maven version to 2.7.0 2023-02-05 19:05:31 +08:00
lion 3fef2a2fad fix the bug of getInt2 reported by https://github.com/lionsoul2014/ip2region/issues/287 2023-02-05 18:52:40 +08:00
LeiHua f053e97b23 1.查询接口模块名为xdb;2.查询接口返回字符串;3.增加 apache 授权信息;4.调整基准测试数据来源 2023-01-17 11:57:45 +08:00
LeiHua 0a4d16b434 add priv directory 2023-01-14 10:40:12 +08:00
LeiHua 4803a7ecfb add priv directory 2023-01-14 10:37:53 +08:00
LeiHua ab9d5a443a rename util module to ip2region_util 2023-01-14 10:32:54 +08:00
LeiHua 6ae8e496a3 rename util module to ip2region_util 2023-01-14 10:31:47 +08:00
LeiHua 2f647b955c rename util module to ip2region_util 2023-01-14 10:17:21 +08:00
LeiHua de4f5c0c22 增加单元测试及基准测试 2023-01-13 21:41:43 +08:00
LeiHua 4efa1b36b2 增加erlang语言xdb查询客户端 2023-01-13 14:10:59 +08:00
LeiHua 18abb9d999 增加erlang语言xdb查询客户端 2023-01-13 13:42:44 +08:00
gongzhengyang 3c88e7a12f feat: change the ip2region2 -> xdb 2022-12-28 14:20:35 +08:00
gongzhengyang 42a3370e65 docs: add some infos 2022-12-24 14:21:32 +08:00
gongzhengyang c4b722f74b docs: fix docs error 2022-12-24 13:34:21 +08:00
gongzhengyang 8d606affff docs: finish the binding/rust Readme.md 2022-12-24 13:17:29 +08:00
gongzhengyang 6c9fdc5d26 feat: add bench and update tracing version 2022-12-24 10:39:39 +08:00
gongzhengyang f10b8971e1 feat: add example subcommands 2022-12-23 18:39:58 +08:00
gongzhengyang 654080b1d0 feat: change searcher fn 2022-12-23 17:06:14 +08:00
gongzhengyang 7e7a612437 feat: 调整search的整体接口 2022-12-23 12:02:12 +08:00
gongzhengyang 5702ca9259 feat: change package name 2022-12-22 18:27:01 +08:00
gongzhengyang 76345e67b0 perf(add more benchmark and change function calls): 2022-12-21 16:38:37 +08:00
gongzhengyang e57adde491 feat: finish all jobs 2022-12-20 14:58:10 +08:00
gongzhengyang 102b128c0d feat: add loop test ip 2022-12-20 13:55:52 +08:00
gongzhengyang 95b822ac38 refactor: change searcher to global 2022-12-20 12:01:43 +08:00
gongzhengyang c48150216e feat: add miss depens 2022-12-20 09:58:43 +08:00
gongzhengyang a5f0837bb5 feat: add ToUIntIP for types ip value 2022-12-20 09:56:51 +08:00
gongzhengyang 09c05be3f2 feat: 完成IP搜索 2022-12-19 15:49:13 +08:00
gongzhengyang cb84133da8 feat: 初始化增加rust查询 2022-12-19 14:36:09 +08:00
Lion 61788530fd some optimizations 2022-12-06 20:16:44 +08:00
Lion 3e6440f1dd load segments while editor init 2022-12-02 18:29:39 +08:00
lion 27612f871a update the maven version to 2.6.6 2022-11-18 08:38:53 +08:00
lion 2084878935 update the version number to 2.6.6 for maven upgrade 2022-11-18 08:36:07 +08:00
lion fe0605224e shoule be VectorIndexSize 2022-11-18 08:33:37 +08:00
lisb 8cb9aeb29e java:移除无用导包
Signed-off-by: lisb <shangshili@hotmail.com>
2022-10-16 11:36:56 +00:00
cenguoping b071019afd fs.close不写回调函数时,在14.x及以上版本中报错 2022-10-13 14:04:04 +08:00
Alan bdab0d8c6d feat(csharp): 2.0 xdb csharp client implementation 2022-09-06 18:21:23 +08:00
Alan 7d22a7d6ae feat(csharp): csharp 2.0 xdb client implementation 2022-09-06 18:18:43 +08:00
Lion b299e9eaf1 fix the doc erors 2022-08-27 13:37:39 +08:00
lion 3641d130d0 use rb mode reported at https://github.com/lionsoul2014/ip2region/issues/255 2022-08-13 11:51:30 +08:00
lion 67eb391a5a remove the unused ptr reported at https://github.com/lionsoul2014/ip2region/issues/254 2022-08-13 11:49:18 +08:00
Lion c80d2ffb82 Merge pull request #245 from wujjpp/v2.0-for-nodejs
xdb searcher for nodejs
2022-07-25 13:23:52 +08:00
Wu Jian Ping f2a7485a56 移除主代码中的关于逻辑说明注释 2022-07-25 12:37:18 +08:00
Wu Jian Ping e434554864 修改ReadMe.md的一处错误 2022-07-25 12:33:53 +08:00
Wu Jian Ping a1879c3d29 移除package-lock.json 2022-07-25 12:32:30 +08:00
weideguo e8bbe27e42 fix error for xdbSearcher.py 2022-07-25 11:33:21 +08:00
Wu Jian Ping f3df96ef30 . 2022-07-22 16:29:18 +08:00
Wu Jian Ping 8c92ed33f4 . 2022-07-22 15:45:45 +08:00
Wu Jian Ping 1a2e327e22 更新readme 2022-07-22 15:10:44 +08:00
Wu Jian Ping 5110cefc47 优化bench程序 2022-07-22 14:57:38 +08:00
Wu Jian Ping 6af5789fc4 优化bench程序 2022-07-22 14:28:14 +08:00
Wu Jian Ping bd084c0a5d bench程序增加对sip、eip合法性检测 2022-07-22 14:05:04 +08:00
Wu Jian Ping 609e7749ee bench程序: 增加单个IP段,检查5个IP,与其它语言保持一致 2022-07-22 13:57:31 +08:00
Wu Jian Ping f6bf9baf1e bench程序: 增加单个IP段,检查5个IP,与其它语言保持一致 2022-07-22 13:56:56 +08:00
Wu Jian Ping e57db724d3 更新bench app,增加比对结果 2022-07-22 13:44:23 +08:00
Wu Jian Ping 142ded8db5 update readme 2022-07-22 13:26:19 +08:00
Wu Jian Ping b601b19d91 增加bench测试程序 2022-07-22 13:24:10 +08:00
Wu Jian Ping 6d42c45c12 增加bench测试程序 2022-07-22 13:22:18 +08:00
Wu Jian Ping 607fbcdde7 add test app 2022-07-22 11:03:10 +08:00
Wu Jian Ping e761381d0e update readme 2022-07-21 22:35:46 +08:00
Wu Jian Ping 4fde2363fa 查询返回对象增加took(us)和ioCount 2022-07-21 22:31:44 +08:00
Wu Jian Ping 743bbd204b . 2022-07-21 18:12:36 +08:00
Wu Jian Ping 0ffa58b592 . 2022-07-21 18:09:08 +08:00
Wu Jian Ping 12aee0894d 集成单元测试&覆盖率报告 2022-07-21 17:33:47 +08:00
Wu Jian Ping 7f6cac9e09 nodejs实现 2022-07-21 16:27:04 +08:00
Lion fd0a6e09f4 auto close the handle after buffer loaded 2022-07-20 16:38:43 +08:00
Lion c5fad74d95 auto close the handle after buffer loaded 2022-07-20 16:24:21 +08:00
Lion 680624db65 auto close the handle after buffer loaded 2022-07-20 16:15:42 +08:00
Lion c15be8c7b5 auto close the handle after loaded the buffer 2022-07-20 16:06:37 +08:00
Lion 69a085f8cf auto close the handle for all buffer load functions 2022-07-20 16:04:00 +08:00
Lion 91d0c39f11 add another php composer addr 2022-07-20 14:18:29 +08:00
狮子的魂 4c464fac2e add c# xdb searcher
Merge pull request !12 from Soar360/master
2022-07-19 07:28:40 +00:00
Soar360 a5b759c756 完善文档 2022-07-18 10:24:10 +08:00
Soar360 a66ed6aa1f IP2Region.sln 2022-07-18 10:02:45 +08:00
Soar360 7a6a6fc515 BenchTest 2022-07-18 10:01:17 +08:00
Soar360 b44a71592d SearchTest 2022-07-18 09:47:22 +08:00
lion 811ffa1dce add global copyright and governed agreement 2022-07-14 10:37:55 +08:00
Lion 88462e9983 stdlize the result print 2022-07-12 10:40:17 +08:00
厉害的花花 b8b3cde805 1.增加bench_test
2.增加search_test
3.修改ip2Region.py及类名,改为xdbSearcher

Signed-off-by: 厉害的花花 <117415792@qq.com>
2022-07-12 09:46:44 +08:00
厉害的花花 938b0e063f Merge branch 'lionsoul2014:master' into python_dev 2022-07-08 16:10:57 +08:00
Lion 78f4794926 add third composer repo for php 2022-07-08 11:15:40 +08:00
Lion 7d66d96525 optimize the checkIP and Long2IP impl 2022-07-07 10:26:27 +08:00
Soar360 0bd2c15c56 C# 版 2022-07-06 18:00:09 +08:00
Lion 791e81efe4 update the version number to 2.6.4 2022-07-06 16:55:49 +08:00
Lion cbf79d4682 rename searchByStr to search and default the region encode to utf-8 2022-07-06 16:55:35 +08:00
Lion 0b8146fa5f return err for buffer functions 2022-07-06 13:14:39 +08:00
Lion f87bee3f20 Merge branch 'master' of github.com:lionsoul2014/ip2region 2022-07-06 12:08:17 +08:00
Lion 08e11220a5 add lua xdb searcher 2022-07-06 12:01:16 +08:00
Lion e980386c1f util test passed 2022-07-06 11:07:59 +08:00
Lion 1aed3ecc46 Merge branch 'master' into lua_binding 2022-07-06 10:05:40 +08:00
Lion 818777d48a search api is ready 2022-07-05 17:25:23 +08:00
alistar fb29feebe0 fix:垮线程 --> 跨线程 2022-07-05 14:58:03 +08:00
Lion 5b52484cf8 xdb lua searcher framework 2022-07-05 14:06:01 +08:00
Lion e58757ada5 require the local xdb_searcher.so and fix the bug for err check and print 2022-07-05 13:47:47 +08:00
Lion 100493ec11 update the version number to 2.6.3 2022-07-02 18:25:13 +08:00
Lion 14fc2c5de3 keep the original byte for self-define header 2022-07-02 18:15:54 +08:00
Lion e09c9b57b9 update the docs for vectorIndex/content buffer type and resource close 2022-07-02 18:07:17 +08:00
Lion fcc503c8d7 Add docs for compile/install/api and tests 2022-07-02 17:59:10 +08:00
Lion c1616fbca3 err checking the searcher create 2022-07-02 17:58:15 +08:00
Lion 59e5545d70 return the undefined the option 2022-07-02 17:35:01 +08:00
Lion f97e72c23e bench test script ready and bench test passed 2022-07-02 17:10:02 +08:00
Lion 089948ae02 search test is ready 2022-07-02 13:40:16 +08:00
Lion 4fa7aad302 optimize the api error return 2022-07-02 13:39:27 +08:00
Lion 90d80ed622 add type method and make the close duplicate call support 2022-07-02 11:50:44 +08:00
Lion a5eb2faf5b basic tests passed 2022-07-01 15:54:18 +08:00
Lion b949574af5 void * for all the close functions 2022-07-01 15:42:39 +08:00
厉害的花花 d827dbd472 Merge branch 'lionsoul2014:master' into python_dev 2022-07-01 13:36:02 +08:00
Lion 91f9efa107 wrap the header/vector/content buffer 2022-07-01 11:57:45 +08:00
Lion 8aa2ef71b3 Merge branch 'master' into lua_binding 2022-06-30 22:13:40 +08:00
Lion fa42e387a3 fix the doc errors reported by https://github.com/lionsoul2014/ip2region/pull/232 2022-06-30 22:10:24 +08:00
Lion dbb8e2b407 stdlize the print of Header stringify 2022-06-30 22:08:16 +08:00
Lion d819ff2047 optimize the args checking 2022-06-30 18:35:59 +08:00
Lion b8710c17d8 safely duplicate close 2022-06-30 18:34:14 +08:00
Lion 8ee41f4e1d impl lua c xdb searcher 2022-06-30 18:26:57 +08:00
厉害的花花 894fdc3924 增加 python 查询实现
Signed-off-by: 厉害的花花 <117415792@qq.com>
2022-06-30 14:33:48 +08:00
Lion 7325306a56 make all the db_path and vIndex/cBuffer args const 2022-06-30 11:55:41 +08:00
Lion fea3503f7b update the maven version to 2.6.2 and docs 2022-06-29 18:46:44 +08:00
Lion 905590aff5 optimize the var define 2022-06-29 18:44:50 +08:00
Lion 7942816fad update the docs 2022-06-29 17:52:43 +08:00
Lion fdedfcc0d8 some optimizations 2022-06-29 17:50:25 +08:00
Lion 68486ea679 some optimizations 2022-06-29 17:49:59 +08:00
Lion c5b45e0502 add api usage demo docs 2022-06-29 17:35:19 +08:00
Lion 7f9a9fd3a7 add search/bench test ReadMe docs 2022-06-29 15:28:14 +08:00
Lion 257c391912 add Makefile 2022-06-29 15:16:16 +08:00
Lion bcf12a41db xdb clang binding is ready with search/bench test passed 2022-06-29 15:03:32 +08:00
Lion 015a15f2e0 safe the type convertion 2022-06-29 09:47:09 +08:00
lion 417636d93c newline the error info print 2022-06-28 18:37:16 +08:00
lion cb03009ac4 fix the bug of content based read offset 2022-06-28 18:37:02 +08:00
lion 34c410998f xdb searcher and search test program are ready 2022-06-28 18:30:34 +08:00
lion e17add2d47 xdb search and bench test program 2022-06-28 17:48:19 +08:00
lion f642c54848 c style db path 2022-06-28 17:07:24 +08:00
lion f047a3d360 buffer load functions are ready 2022-06-28 16:28:16 +08:00
lion 2772ccb0ab search logical impl 2022-06-28 12:15:09 +08:00
lion 1810fe74d6 impl the search by string 2022-06-27 18:37:31 +08:00
lion bd065347b3 add the clang xdb searcher binding 2022-06-27 18:32:40 +08:00
Lion 73b8aa3789 bash comments 2022-06-24 15:50:35 +08:00
Lion 2790f818c7 xdb java searcher is ready 2022-06-24 15:28:12 +08:00
Lion 010674506e update the pom for maven release 2022-06-24 15:23:04 +08:00
Lion 3c8569152f optimize the php docs 2022-06-24 12:43:33 +08:00
Lion 3403b74e31 add doc for java binding 2022-06-24 12:41:35 +08:00
Lion 00b3b4c76d update the marks for xdb cached search 2022-06-24 12:24:16 +08:00
Lion deeb947ba1 update the version number to 2.6.0 2022-06-24 11:56:28 +08:00
Lion a0efcf0456 impl the bench test 2022-06-24 11:52:33 +08:00
Lion 5a8a22a01c count maybe 0 2022-06-24 11:52:06 +08:00
lion aca88673d6 store the costs first 2022-06-23 17:59:14 +08:00
lion 3b96003ca1 use the raw []byte as vectorIndex to reduce memory alloc 2022-06-23 17:56:28 +08:00
lion 670cf1dcb3 add java xdb searcher impl 2022-06-23 17:26:17 +08:00
lion 734ac597ea it should be the cols 2022-06-23 17:03:25 +08:00
lion 11df874b5d reduce the data copy for vectorIndex search with content cached 2022-06-23 15:03:18 +08:00
lion 5b058d2a8a optimize the bench average costs stats 2022-06-23 14:57:02 +08:00
lion 9659a920e9 content buffer directly as vectorIndex 2022-06-23 14:52:39 +08:00
lion ca6b26c53a remove the vectorIndex autoload for buffer based searcher to reduce memory usage 2022-06-23 11:42:28 +08:00
Lion a835d15d0a update docs 2022-06-22 19:23:03 +08:00
Lion ee1c22f932 add docs for php binding 2022-06-22 19:21:08 +08:00
Lion 7b7171c233 update the docs for cache-policy 2022-06-22 19:20:59 +08:00
Lion d482335ca2 add bench test script 2022-06-22 18:49:02 +08:00
Lion 431e42209c print the cache policy for bench 2022-06-22 18:48:06 +08:00
Lion fc843205d5 util test script to test all the utils functions 2022-06-22 18:06:50 +08:00
Lion bf0f413a22 xdb searcher util and tests 2022-06-22 17:36:01 +08:00
Lion b08e798e27 print the dataLen and dataPtr for debug 2022-06-22 15:59:29 +08:00
lion 6149b68a84 add php xdb searcher impl 2022-06-21 18:02:54 +08:00
lion 8e88caecab break for the undefine option 2022-06-21 18:02:40 +08:00
lion 59434d03c9 use the Header struct 2022-06-21 11:34:47 +08:00
lion 14badde79e add header mgr struct 2022-06-21 10:57:47 +08:00
lion 7eb4a5ba5e add copy right statement and author contact info 2022-06-21 10:21:37 +08:00
lion 08a4ad245d add cache-policy option desc 2022-06-20 22:12:21 +08:00
lion e59d71e316 add docs for cache searcher create 2022-06-20 21:45:59 +08:00
Lion 08b1656e02 add vectorIndex/Content cache policy impl 2022-06-20 15:14:33 +08:00
Lion 4b4984fce0 add Makefile and docs for golang xdb maker and binding 2022-06-19 19:07:03 +08:00
Lion 9cb3bbcb07 add load header func 2022-06-18 19:36:45 +08:00
Lion 059446caa7 add vector index and xdb content load util func 2022-06-18 19:29:24 +08:00
lion db4aa26547 update the command docs 2022-06-17 15:48:48 +08:00
lion be472cbbf7 Update the docs 2022-06-17 15:06:34 +08:00
lion 0b36cb947b rename pacakge to xdb and add SearchByStr impl 2022-06-17 14:45:16 +08:00
lion 985dabd51c add golang searcher binding 2022-06-17 14:18:44 +08:00
lion d746d5d4b2 init the v2.0 framework with v1.0 source kept 2022-06-16 16:27:56 +08:00
lion 1e2544cc57 archive the v1.0 - old db structure 2022-06-16 16:25:31 +08:00
dependabot[bot] 1b8d8598b1 Bump async from 2.3.0 to 2.6.4 in /binding/nodejs
Bumps [async](https://github.com/caolan/async) from 2.3.0 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.3.0...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-28 15:55:54 +00:00
Lion 5056f08b88 Merge pull request #203 from lionsoul2014/dependabot/npm_and_yarn/binding/nodejs/path-parse-1.0.7
Bump path-parse from 1.0.5 to 1.0.7 in /binding/nodejs
2021-10-24 09:48:41 +08:00
dependabot[bot] 7fee31c645 Bump tmpl from 1.0.4 to 1.0.5 in /binding/nodejs
Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-20 23:38:34 +00:00
dependabot[bot] 2a221eae28 Bump path-parse from 1.0.5 to 1.0.7 in /binding/nodejs
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.5 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-10 19:27:14 +00:00
Lion ea1e38c314 Merge pull request #193 from lionsoul2014/dependabot/npm_and_yarn/binding/nodejs/handlebars-4.7.7
Bump handlebars from 4.5.3 to 4.7.7 in /binding/nodejs
2021-05-08 09:40:43 +08:00
Lion 58d6fccfdc Merge pull request #187 from lionsoul2014/dependabot/npm_and_yarn/binding/nodejs/y18n-3.2.2
Bump y18n from 3.2.1 to 3.2.2 in /binding/nodejs
2021-05-08 09:40:30 +08:00
dependabot[bot] 0369816675 Bump hosted-git-info from 2.4.2 to 2.8.9 in /binding/nodejs
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.4.2 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.4.2...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-08 01:38:48 +00:00
dependabot[bot] 2b690b7f09 Bump lodash from 4.17.19 to 4.17.21 in /binding/nodejs
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 16:28:27 +00:00
dependabot[bot] 377b4e6029 Bump handlebars from 4.5.3 to 4.7.7 in /binding/nodejs
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.5.3 to 4.7.7.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.5.3...v4.7.7)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-06 21:46:24 +00:00
dependabot[bot] 7d69b3aed2 Bump y18n from 3.2.1 to 3.2.2 in /binding/nodejs
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-30 14:25:51 +00:00
dependabot[bot] f65eb173b6 Bump junit from 3.8.1 to 4.13.1 in /binding/java
Bumps [junit](https://github.com/junit-team/junit4) from 3.8.1 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
- [Commits](https://github.com/junit-team/junit4/commits/r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-12 22:56:44 +00:00
liyang ea5bfb52e0 fix bug about stack corrupt for example ip address is spceial "172.16.107.7, Proxy:False, 210.3.213.69" 2020-10-06 21:55:21 +08:00
Zhao Zilong bafd7741a2 Add files via upload 2020-09-18 18:03:30 +08:00
Zhao Zilong f4aee793a8 Update readme.md 2020-09-18 17:59:13 +08:00
Zhao Zilong e5e31005ac Update readme.md 2020-09-18 17:58:31 +08:00
Zhao Zilong 5a5ae36b01 Add files via upload 2020-09-18 17:55:35 +08:00
Zhao Zilong b87e6029d6 Create readme.md 2020-09-18 17:54:17 +08:00
wuxiaodong a1ee7fd5e7 Fix multi instance bugs, use instance variable instead of class variable. 2020-09-02 17:26:01 +08:00
dependabot[bot] d58119db4b Bump lodash from 4.17.13 to 4.17.19 in /binding/nodejs
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.13 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-16 08:58:29 +00:00
lionsoul 5d29fe2f2a Upgrade the minimist version inspired by the github alerts 2020-06-18 08:53:20 +08:00
lionsoul b9b1d5a8c7 upgrade the acorn to version 5.7.4 2020-04-02 09:42:44 +08:00
lionsoul 068a7f48ed Upgrade the minimist to 1.2.2 2020-04-02 09:41:14 +08:00
lionsoul b46b168842 Merge branch 'master' of https://gitee.com/lionsoul/ip2region 2020-04-02 09:38:27 +08:00
lionsoul 247c09376b Upgrade the kind-of to version 6.0.3 2020-04-02 09:38:10 +08:00
PHP Static 5ea194bb22 fix php5 symbol duplicate 2020-03-22 11:43:46 +08:00
PHP Static fc80149d82 fix memory leak and symbol duplicate 2020-03-22 11:38:21 +08:00
lionsoul 89b80ef310 Optimize the installation DOC and rename the php ext binding name 2020-02-21 13:56:26 +08:00
lionsoul dbc05223fd Merge branch 'master' of https://gitee.com/lionsoul/ip2region 2020-02-21 13:36:35 +08:00
lionsoul ac86979872 Optimize the README DOC 2020-02-21 13:36:21 +08:00
dongyado ff535a79f4 update readme add tested node version 2020-02-20 16:57:50 +08:00
dongyado e33004f319 update nodejs client and use node-ip2region for npm package name 2020-02-20 12:58:56 +08:00
dependabot[bot] e7bbeb7919 Bump handlebars from 4.1.2 to 4.5.3 in /binding/nodejs
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.2 to 4.5.3.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.2...v4.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
2019-12-27 11:39:13 +00:00
lionsoul 728c04d633 Merge pull request #138 from RocherKong/master
add data result availability checking
2019-12-11 17:20:05 +08:00
rocher 23609e81f5 test result data right 2019-12-11 16:59:44 +08:00
lionsoul b23cb7fdf6 Upgrade mixin-deep for version 1.3.2 and set-value to version 2.0.1 2019-09-07 10:36:36 +08:00
lionsoul 3f4f8a4051 add nginx module support 2019-08-22 10:35:26 +08:00
Cherisher 7bdea3d171 add support for nginx 2019-08-22 09:02:09 +08:00
lionsoul 6b50224fd7 Security Alerts fixing 2019-07-21 17:51:07 +08:00
lionsoul 4f52d8c4ef Upgrade some the dependencies version to the one followed by the github alerts 2019-07-07 11:33:31 +08:00
lionsoul 7e81847d01 Upgrade some the dependencies version to the one followed by the github alerts 2019-07-07 11:18:21 +08:00
lionsoul ebea2a1467 fix the bug of raf=null in the close interface of DbSearcher 2019-07-07 11:09:48 +08:00
lionsoul 008d82eee0 Upgrade the lodash base version to 4.17.11 2019-02-12 17:39:11 +08:00
lionsoul 8688ae3ecb Update the merge to version 1.2.1 2018-11-03 11:05:48 +08:00
lionsoul 0809f9eda8 Merge pull request #86 from heweizhen0822/patch-1
Update README.md
2018-10-18 20:59:29 +08:00
heweizhen0822 87734a614f Update main.go
github.com/mohong122/ip2region/binding/golang/ip2region 并没有子包ip2region 需要改成 github.com/lionsoul2014/ip2region/binding/golang/ip2region
2018-10-18 10:34:33 +08:00
heweizhen0822 94594542f7 Update README.md
github.com/mohong122/ip2region/binding/golang/ip2region  需要改成 github.com/lionsoul2014/ip2region/binding/golang/ip2region
2018-10-18 10:32:32 +08:00
lionsoul d3b65df599 Optimize the lua_c module 2018-10-10 11:54:26 +08:00
lionsoul 7e32a84d2c Add automatically lib dir make 2018-10-07 20:58:54 +08:00
lionsoul d796a76400 Optimize the ip2long function with trim logic applied 2018-10-07 10:23:17 +08:00
lionsoul 835d9c1b90 Update the README doc for lua_c module 2018-10-06 15:12:24 +08:00
lionsoul 6fefefa9ae Add README doc for lua_c module 2018-10-06 11:18:01 +08:00
lionsoul 08eea15172 lua ip2region c module forward with release version published 2018-10-06 11:05:01 +08:00
lionsoul a589b79e6c lua binding module interface stdlize with new and ip2long method access by . support 2018-10-05 21:46:21 +08:00
lionsoul 01ab0a0373 lua_c module forward with basic framework finished(tested) 2018-10-05 21:39:35 +08:00
lionsoul 57f4fb4383 lua_c binding basic framework(Not tested yet...) 2018-10-05 14:03:16 +08:00
lionsoul 6a8d641a07 Optimize the lua module by add the __index and the __tostring meta-method 2018-10-05 10:55:24 +08:00
lionsoul 597b769311 Optimize the benchmark script 2018-10-05 09:49:32 +08:00
Koma a584ef9caf 重构python客户端,提升查询性能,兼容python2.x,3.x 2018-10-04 11:39:49 +08:00
lionsoul 1701f49e45 Update the lua interface and add setDbFile interface 2018-10-04 10:22:01 +08:00
lionsoul b1463a23a0 Update the Lua binding 2018-10-03 20:12:30 +08:00
lionsoul cbba946ff7 Update README for lua binding 2018-10-03 20:10:02 +08:00
lionsoul 3d69968290 Lua binding completed(tested) 2018-10-03 20:05:14 +08:00
lionsoul 92684b1183 lua binding forward with binarySearch and btreeSearch interface implemented 2018-10-03 13:12:05 +08:00
lionsoul 932a5d80b4 lua binding basic framework with memory search completed(tested) 2018-10-02 22:36:57 +08:00
lionsoul 64adcf122e Update the maven version number to 1.7.2 2018-10-02 11:24:58 +08:00
lionsoul 8494e1075d Add DbSearcher(dbConfig, dbBinStr) construct method specified by Wendal at https://gitee.com/lionsoul/ip2region/issues/IILFL 2018-10-02 11:14:31 +08:00
lionsoul b029d58aa3 Merge pull request #76 from a631807682/master
[nodejs] publish package on npm
2018-10-02 10:19:43 +08:00
lionsoul 0bb8cb9553 Merge pull request #72 from stulzq/master
Add use stream method for C#
2018-09-01 20:59:52 +08:00
陈睿 ad219e3e07 [nodejs] publish package on npm 2018-08-30 18:20:49 +08:00
lionsoul c95bed6f58 Merge pull request #69 from Maledong/master
[Feature] Add 'memorySearch' and 'memorySearchSync' for Nodejs
2018-08-25 10:59:30 +08:00
stulzq d83e20c99c add use stream method 2018-08-19 16:47:01 +08:00
MaleDong b9e9fcfd80 [Feature] Add 'memorySearch' and 'memorySearchSync' for Nodejs
1) Add features.
2) Add unit tests.
3) Add benchmark.
2018-07-31 16:12:56 +08:00
lionsoul 90f0e86597 java binding version 1.7 with btree search bug fixed 2018-07-31 16:03:15 +08:00
lionsoul 37845e7dea Fix the bug for btree header fetch 2018-07-31 15:58:11 +08:00
Rocher 176081fcc7 Update README.md
Use the synchronization method as the first choice.
2018-07-31 11:37:25 +08:00
Rocher cc629102e5 Update README.md
Use the synchronization method as the first choice.
2018-07-31 11:36:14 +08:00
MaleDong 09dda2c211 [Fix] Fix csharp formations
1) In `README.md`, we shouldn't use `c#` but `csharp` to make md
recoginize it's the C# formation of codes.

2) Add 'ConfigureAwait(false)' as for the MSDN magazine usage.

3) Don't need Contribution History in README.md, because we can see the
change logs in GitHub instead.
2018-07-30 14:44:47 +08:00
MaleDong fb564c79e5 [Fix] Add "Disposible" interface for final release of resouces
`_search` should release resouces because the file state is still open.
2018-07-30 11:21:31 +08:00
MaleDong 614ced34e4 [Update] Refactor codes according to RocherHong's changes
1) Considering using xUnit for UnitTest, remove my unit tests.
2) Remove useless `async`, because `async` is just the wrapper of `Task`.
3) Modify unit tests to be sure that the values MUST BE equal to each other when the IP is the same.
2018-07-30 10:48:30 +08:00
lionsoul ca3997f822 Merge pull request #61 from Maledong/master
New Feature of async for Nodejs, Refactor of codes in node.js
2018-07-30 10:41:23 +08:00
lionsoul d1c443f934 Fix the conflicts 2018-07-30 10:39:15 +08:00
MaleDong 09a6d60620 Change from `async Task` to `Task`
Because the async is the wrapper of Task, we don't need to use async
again.
2018-07-30 09:56:25 +08:00
RocherKong 11f527b207 1.CodeStandardized 2.Support Netfx4.5 3.TestStandardized 2018-07-30 00:31:49 +08:00
MaleDong 35fc3cbf23 Refactor of codes in node.js
1) Add async method: `binarySearch` and `btreeSearch`.
2) Refactor of tests by putting them into `tests` folder.
3) Create several new tests in details.
4) Remove useless and reformat codes to be clear.
5) Remove useless snapshots, because they can be recreated when you run `npm run test`.
2018-07-29 20:02:14 +08:00
MaleDong 23dbb5ab2c Refactor of CSharp:
1) Add `Async` methods.
2) Remove uesless variables, codes.
3) Remove ConsoleApp and use UnitTest instead.
4) Add README.md instead.
2018-07-20 13:57:32 +08:00
biluohc 1605a3d9a5 Rust: 0.2.0, use std::net::Ipaddr and update Error. 2018-07-03 15:53:16 +08:00
dongyado 52bede553d update php_extension client intro file 2018-07-03 15:27:33 +08:00
dongyado 202f86eba7 add new author and email for nodejs binding client 2018-07-03 15:17:47 +08:00
Monster Slayer a823a70326 Merge pull request #50 from leeching/refactor/nodejs
refactor(nodejs): write nodejs script in javascript way
2018-07-03 15:14:41 +08:00
lionsoul 0aacd39882 Merge pull request #55 from biluohc/master
add rust implement.
2018-07-03 10:55:40 +08:00
leeching b705253664 feat: add destroy method for backward compatibility 2018-07-03 10:07:25 +08:00
leeching 7a020f52aa feat(nodejs): add create static method 2018-07-03 09:48:41 +08:00
leeching c7104902e3 refactor(nodejs): write nodejs script in javascript way 2018-07-03 09:48:41 +08:00
biluohc 42a6d37c43 add a example 2018-07-02 23:04:46 +08:00
biluohc 5287df2fe7 use workspace 2018-07-02 22:17:10 +08:00
biluohc 8a48d41657 add rust implement. 2018-06-30 16:16:00 +08:00
insua e70d1e473e fix(move golang package in directory and typo in readme): 2018-06-29 16:49:38 +08:00
Felix Yan c9bf99d07f Fix some typos in Ip2Region.class.php 2018-06-28 02:00:05 +08:00
dongyado 22bd52fd65 keep php class and php_extention return data key same, we change php_extension return data key : cityId to city_id 2018-06-27 10:44:29 +08:00
lionsoul dfca3494ad Merge pull request #48 from leeching/fix/nodejs-var
remove unnecessary var
2018-06-26 17:34:03 +08:00
leeching 12dd913be4 test(nodejs): update snapshot 2018-06-26 17:10:56 +08:00
leeching dbcb33f608 remove unnecessary var 2018-06-26 16:26:00 +08:00
Wei.Jiang d0c5ea05b6 重命名 php 测试脚本
重命名 php 测试脚本,与 README 和其他语言脚本名保持一致
2018-06-26 11:05:48 +08:00
dongyado 9527177a91 update php_extension install guides 2018-05-17 12:11:13 +08:00
Chunlin Li d8fcf0a31e fix: ReferenceError: m is not defined 2018-05-16 19:01:17 +08:00
helloKaiDing 174e4a46db Makefile for binding/c
This is an Makefile for the binding/c program, can use to generate the db file ip2config.db  and the test program testSearcher, can be very convient for the new starter.
2018-04-08 17:23:03 +08:00
Jack a784a0295e Update README.md
更改 markdow h 标签错误格式!
2018-03-29 19:04:48 +08:00
RocherKong 1258a74064 add support for C# 2018-02-09 22:04:01 +08:00
lionsoul 5ffd7cb14c Untrack the binding/java/target/ directory 2017-10-28 15:38:09 +08:00
lionsoul 91d9dccb90 java binding maven upload & track the latest dbMaker.jar 2017-10-23 13:48:49 +08:00
lionsoul 5f3bddec08 Bug fixed: Adjust the super header length to 8192 for all client implementation 2017-10-21 12:47:24 +08:00
wfifi 6d61beb592 add python3 support 2017-10-20 18:09:07 +08:00
chengpiaopiao 862d218756 fix incorrect python test helper. 2017-09-15 15:40:04 +08:00
mohong 9232c8fec1 Merge pull request #1 from lionsoul2014/master
合并远程
2017-05-25 14:51:46 +08:00
mohong 20cd77c80c 增加控制台实例 2017-05-25 14:35:19 +08:00
Ya Zhuang 6d878babb4 chore: test in jest 2017-04-14 12:47:55 +08:00
lionsoul b7376d5868 Add the author info for binding/c_mmap module 2017-01-12 18:21:36 +08:00
lionsoul 387f5a2097 Merge branch 'master' of http://git.oschina.net/lionsoul/ip2region 2017-01-12 18:14:16 +08:00
lionsoul 9de920ef2b stdlize the code style and add the author info 2017-01-12 18:14:09 +08:00
Leo Ma 3c8cfa1282 Fix memory leak
Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
2017-01-12 18:04:07 +08:00
Leo Ma 9bdf030fe0 Add database file memory map as c_mmap binding
File I/O optimization.

- No more `fread` call when the file is mapped.

- Close database file as soon as possible after `mmap`

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
2017-01-12 17:33:58 +08:00
mohong 0755357474 添加readme.md说明文件 2016-10-20 15:19:07 +08:00
mohong 97e0bb8374 golang实现 2016-10-20 14:45:38 +08:00
dongyado 09797dfb5b nodejs client ready 2016-07-31 20:46:44 +08:00
dongyado ae1a7742c2 Merge branch 'nodejsclient' of https://git.oschina.net/lionsoul/ip2region into nodejsclient 2016-07-31 20:45:51 +08:00
dongyado cd75235625 Merge branch 'master' of github.com:lionsoul2014/ip2region into nodejsclient 2016-07-31 20:39:17 +08:00
dongyado 3246dc2df2 update search method name for nodejs client 2016-07-16 15:42:45 +08:00
koma caad8bad88 add memory search alrogrithm and optimize script 2016-07-13 15:54:08 +08:00
dongyado 3fd756300e nodejs btree search ready for test 2016-07-07 10:48:22 +08:00
dongyado a2e3bdb13e update btree search 2016-07-07 09:21:38 +08:00
dongyado 63cd3fa085 nodejs client finish binary search 2016-07-07 00:08:45 +08:00
dongyado 401e5bc795 nodejs client forward 2016-07-06 11:27:58 +08:00
dongyado 0dd1a53d00 getLong finished for nodejs client 2016-07-06 09:28:53 +08:00
dongyado 0fb5af9067 update nodejs client 2016-07-06 00:29:19 +08:00
dongyado b187d1646a Merge branch 'master' into nodejsclient 2016-07-03 21:35:13 +08:00
dongyado 503e95026f Merge branch 'master' of https://git.oschina.net/lionsoul/ip2region 2016-07-03 00:39:52 +08:00
dongyado 81c495058c fix ip2long/getLong function return unsigned int ip value on 32-bit operating system 2016-07-03 00:35:48 +08:00
dongyado 4a8aa275e0 Merge branch 'master' of github.com:lionsoul2016/ip2region into nodejsclient 2016-07-03 00:07:52 +08:00
Twist Fate e6737466ee Update ip2Region.py 2016-07-01 17:46:01 +08:00
lionsoul a5df8ff87c add DbSearcher#memorySearch interface 2016-06-30 20:19:17 +08:00
lionsoul 861b8b4622 add #ip2region_memory_search interface for memory search 2016-06-30 19:32:31 +08:00
lionsoul dbf94ef586 remove the debug info 2016-06-30 16:05:16 +08:00
lionsoul e436094563 add #memorySearch interface for purge memory search 2016-06-30 16:04:02 +08:00
lionsoul 32ad842926 add data_ptr return for datablock 2016-06-30 16:02:11 +08:00
dongyado 2e31e924b5 update ip2region.js 2016-06-28 09:31:23 +08:00
dongyado 0e498e27f8 nodejs client init 2016-06-22 20:00:23 +08:00
dongyado 2113931c61 remove note information and change php version 2016-06-17 16:24:03 +08:00
dongyado 7e4801df22 ip2region extension for php7 2016-06-16 16:29:24 +08:00
dongyado e7e6f376ee ip2region extension for php5.x 2016-06-16 16:23:30 +08:00
dongyado 8aacb89e49 remove submodule ip2region4php 2016-06-16 15:28:41 +08:00
koma 9152488163 fixd bug, the left side was lost. thanks for mmy83@git.oschina.net. 2016-04-12 16:14:55 +08:00
lionsoul 9a4b450ab8 update data to the latest version 2016-04-10 12:15:35 +08:00
lionsoul 6bf163230b stdlize the code style 2016-04-07 14:33:58 +08:00
狮子的魂 83d7586c84 conflicts fixed 2015-12-08 21:48:39 +08:00
狮子的魂 9b0b7e8ebd conflicts fixed 2015-12-08 21:41:34 +08:00
狮子的魂 f0c91e70b9 conflicts fixed 2015-12-08 21:40:44 +08:00
chenxin 7e51a4909f Merge branch 'master' of https://git.oschina.net/lionsoul/ip2region 2015-12-07 11:27:52 +08:00
chenxin 41617aac4d code tab to 4 space 2015-12-07 11:27:14 +08:00
dongyado 12c0304ae2 remove submodule 2015-11-14 02:24:14 +08:00
dongyado 1966fc44ec php ext for github 2015-11-14 02:19:05 +08:00
dongyado 36dad93e4e remove duplicate uint_t define 2015-11-13 10:52:27 +08:00
dongyado 7c28790746 add ip2region extension for php 2015-11-12 13:44:24 +08:00
Koma 56b864220b changed README.md file 2015-11-09 23:48:51 +08:00
Koma 94440bb240 Merge branch 'master' of https://git.oschina.net/lionsoul/ip2region 2015-11-09 23:45:53 +08:00
Koma 33d2a095a6 add python client script 2015-11-09 23:45:38 +08:00
狮子的魂 f56f6175de fix the may comming bug 2015-11-08 20:41:00 +08:00
Koma adba4d6048 add python cline module 2015-11-07 13:21:10 +08:00
chenxin 56c83f3895 optimized the header block size & fix the may comming leak for c binding 2015-11-05 12:48:24 +08:00
chenxin 066fb3324e bug fixed for cost time count 2015-11-02 12:31:03 +08:00
狮子的魂 a7021dc12a yat, hello ip2region 2015-11-02 01:12:43 +08:00