Commit Graph

233 Commits

Author SHA1 Message Date
lionsoul f483af329e Security Alerts fixing 2019-07-21 17:51:07 +08:00
lionsoul a49b7deaf4 Upgrade some the dependencies version to the one followed by the github alerts 2019-07-07 11:33:31 +08:00
lionsoul bb3740fba1 Upgrade some the dependencies version to the one followed by the github alerts 2019-07-07 11:18:21 +08:00
lionsoul a8f77a9638 fix the bug of raf=null in the close interface of DbSearcher 2019-07-07 11:09:48 +08:00
lionsoul 4dabf635a8 Upgrade the lodash base version to 4.17.11 2019-02-12 17:39:11 +08:00
lionsoul ab1c331fbd Update the merge to version 1.2.1 2018-11-03 11:05:48 +08:00
lionsoul a6968d9767
Merge pull request #86 from heweizhen0822/patch-1
Update README.md
2018-10-18 20:59:29 +08:00
heweizhen0822 06e8aa2528
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 281237c5c3
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 9c37b5be7f Optimize the lua_c module 2018-10-10 11:54:26 +08:00
lionsoul 253dc12917 Add automatically lib dir make 2018-10-07 20:58:54 +08:00
lionsoul 86104eb31f Optimize the ip2long function with trim logic applied 2018-10-07 10:23:17 +08:00
lionsoul bd6dc7be90 Update the README doc for lua_c module 2018-10-06 15:12:24 +08:00
lionsoul 03fd40bb09 Add README doc for lua_c module 2018-10-06 11:18:01 +08:00
lionsoul f9e9dd59a3 lua ip2region c module forward with release version published 2018-10-06 11:05:01 +08:00
lionsoul 93689e09e8 lua binding module interface stdlize with new and ip2long method access by . support 2018-10-05 21:46:21 +08:00
lionsoul e26ed44861 lua_c module forward with basic framework finished(tested) 2018-10-05 21:39:35 +08:00
lionsoul 7bd81290f1 lua_c binding basic framework(Not tested yet...) 2018-10-05 14:03:16 +08:00
lionsoul 7032830d23 Optimize the lua module by add the __index and the __tostring meta-method 2018-10-05 10:55:24 +08:00
lionsoul e9a08e27a3 Optimize the benchmark script 2018-10-05 09:49:32 +08:00
Koma 593aba66d8 重构python客户端,提升查询性能,兼容python2.x,3.x 2018-10-04 11:39:49 +08:00
lionsoul a2d250919d Update the lua interface and add setDbFile interface 2018-10-04 10:22:01 +08:00
lionsoul 5f871ba257 Update the Lua binding 2018-10-03 20:12:30 +08:00
lionsoul e6104dcd1f Update README for lua binding 2018-10-03 20:10:02 +08:00
lionsoul 86ad8057aa Lua binding completed(tested) 2018-10-03 20:05:14 +08:00
lionsoul 5f073d814e lua binding forward with binarySearch and btreeSearch interface implemented 2018-10-03 13:12:05 +08:00
lionsoul 04f093d9bd lua binding basic framework with memory search completed(tested) 2018-10-02 22:36:57 +08:00
lionsoul 1f04c554db Update the maven version number to 1.7.2 2018-10-02 11:24:58 +08:00
lionsoul 679f30acdb 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 d82447c1b7
Merge pull request #76 from a631807682/master
[nodejs] publish package on npm
2018-10-02 10:19:43 +08:00
lionsoul 9623e345d9
Merge pull request #72 from stulzq/master
Add use stream method for C#
2018-09-01 20:59:52 +08:00
陈睿 4556afd815 [nodejs] publish package on npm 2018-08-30 18:20:49 +08:00
lionsoul f482591eee
Merge pull request #69 from Maledong/master
[Feature] Add 'memorySearch' and 'memorySearchSync' for Nodejs
2018-08-25 10:59:30 +08:00
stulzq f3ae83afb5 add use stream method 2018-08-19 16:47:01 +08:00
MaleDong 487129d59c [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 b7e9755c6b java binding version 1.7 with btree search bug fixed 2018-07-31 16:03:15 +08:00
lionsoul f82d3be466 Fix the bug for btree header fetch 2018-07-31 15:58:11 +08:00
Rocher e1a7052c9d
Update README.md
Use the synchronization method as the first choice.
2018-07-31 11:37:25 +08:00
Rocher 48edca6313
Update README.md
Use the synchronization method as the first choice.
2018-07-31 11:36:14 +08:00
MaleDong b177834c7b [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 ee5c05d321 [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 c6721af1ec [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 d40e001802
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 d51db48721 Fix the conflicts 2018-07-30 10:39:15 +08:00
MaleDong 8a6ac1cdc6 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 55db35b6f4 1.CodeStandardized 2.Support Netfx4.5 3.TestStandardized 2018-07-30 00:31:49 +08:00
MaleDong 1331f75997 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 33570612bc 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 ea9a3ff7b8 Rust: 0.2.0, use std::net::Ipaddr and update Error. 2018-07-03 15:53:16 +08:00
dongyado 94ed13cdd0 update php_extension client intro file 2018-07-03 15:27:33 +08:00
dongyado b63a566641 add new author and email for nodejs binding client 2018-07-03 15:17:47 +08:00
Monster Slayer 1d3c083dc8
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 4afaf4513c
Merge pull request #55 from biluohc/master
add rust implement.
2018-07-03 10:55:40 +08:00
leeching 1ffe2b985e feat: add destroy method for backward compatibility 2018-07-03 10:07:25 +08:00
leeching 834e5939d8 feat(nodejs): add create static method 2018-07-03 09:48:41 +08:00
leeching b89ed1c397 refactor(nodejs): write nodejs script in javascript way 2018-07-03 09:48:41 +08:00
biluohc 1d09fee3c5 add a example 2018-07-02 23:04:46 +08:00
biluohc 02db5c5c56 use workspace 2018-07-02 22:17:10 +08:00
biluohc 4120c651eb add rust implement. 2018-06-30 16:16:00 +08:00
insua d8a7e34a84 fix(move golang package in directory and typo in readme): 2018-06-29 16:49:38 +08:00
Felix Yan 34be04bc4a
Fix some typos in Ip2Region.class.php 2018-06-28 02:00:05 +08:00
dongyado 550425a2b5 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 35cc0f37c7
Merge pull request #48 from leeching/fix/nodejs-var
remove unnecessary var
2018-06-26 17:34:03 +08:00
leeching b961c1f0ac test(nodejs): update snapshot 2018-06-26 17:10:56 +08:00
leeching 3d6db4931a remove unnecessary var 2018-06-26 16:26:00 +08:00
Wei.Jiang 98616d0df8
重命名 php 测试脚本
重命名 php 测试脚本,与 README 和其他语言脚本名保持一致
2018-06-26 11:05:48 +08:00
dongyado 7e6cbdc652 update php_extension install guides 2018-05-17 12:11:13 +08:00
Chunlin Li fdac1c0101
fix: ReferenceError: m is not defined 2018-05-16 19:01:17 +08:00
helloKaiDing d4dab91796
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 a1ae4c8299
Update README.md
更改 markdow h 标签错误格式!
2018-03-29 19:04:48 +08:00
RocherKong b65d8206ba add support for C# 2018-02-09 22:04:01 +08:00
lionsoul 217a7dab9e Untrack the binding/java/target/ directory 2017-10-28 15:38:09 +08:00
lionsoul 5f29715ec2 java binding maven upload & track the latest dbMaker.jar 2017-10-23 13:48:49 +08:00
lionsoul b48dbe5248 Bug fixed: Adjust the super header length to 8192 for all client implementation 2017-10-21 12:47:24 +08:00
wfifi 0f39924b08 add python3 support 2017-10-20 18:09:07 +08:00
chengpiaopiao 1ad6274118 fix incorrect python test helper. 2017-09-15 15:40:04 +08:00
mohong e4f54054c4 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 eae269f37d
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