diff --git a/.gitignore b/.gitignore index a38495e..8ca40d3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ META-INF/ # vim swp file # *.swp +.idea # binding /binding/java/classes/ diff --git a/binding/php_extension/php5/ip2region/ip2region.c b/binding/php_extension/php5/ip2region/ip2region.c index 0e9ec26..7139f3b 100644 --- a/binding/php_extension/php5/ip2region/ip2region.c +++ b/binding/php_extension/php5/ip2region/ip2region.c @@ -67,10 +67,10 @@ void search( if ( res == 1 ) { - add_assoc_long( *return_value, "cityId", (*_block).city_id); + add_assoc_long( *return_value, "city_id", (*_block).city_id); add_assoc_string( *return_value, "region", (*_block).region, 1); } else { - add_assoc_long( *return_value, "cityId", 0); + add_assoc_long( *return_value, "city_id", 0); add_assoc_string( *return_value, "region", "[Error] Search Failed! Please check the path of ip2region db file.", 1); } } diff --git a/binding/php_extension/php7/ip2region/ip2region.c b/binding/php_extension/php7/ip2region/ip2region.c index 7ea84ba..6b6e121 100644 --- a/binding/php_extension/php7/ip2region/ip2region.c +++ b/binding/php_extension/php7/ip2region/ip2region.c @@ -67,12 +67,12 @@ void search( if ( res == 1 ) { - add_assoc_long( *return_value, "cityId", (*_block).city_id); + add_assoc_long( *return_value, "city_id", (*_block).city_id); //add_assoc_string( *return_value, "region", (*_block).region, 1); // for phpng add_assoc_string( *return_value, "region", (*_block).region); } else { - add_assoc_long( *return_value, "cityId", 0); + add_assoc_long( *return_value, "city_id", 0); //add_assoc_string( *return_value, "region", "[Error] Search Failed! Please check the path of ip2region db file.", 1); // for phpng add_assoc_string( *return_value, "region", "[Error] Search Failed! Please check the path of ip2region db file.");