From e4a20a6f49e5378896d28238228f64e7f3e3c294 Mon Sep 17 00:00:00 2001
From: Wu Jian Ping <wujp@greatld.com>
Date: Thu, 30 Mar 2023 21:58:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 binding/nginx/README.md                       | 14 ++++++------
 binding/nginx/config                          | 22 +++++++++++++------
 binding/nginx/src/ngx_http_ip2region_module.c |  2 +-
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/binding/nginx/README.md b/binding/nginx/README.md
index be91805..90dd834 100644
--- a/binding/nginx/README.md
+++ b/binding/nginx/README.md
@@ -15,16 +15,16 @@ $ make install
 ...
 http {
 
-    log_format json_access_log escape=json '{'
-                                           '"remote_addr": "$remote_addr", '
-                                           '"region": "$ip2region", '
-                                           '"http_x_forwarded_for": "$http_x_forwarded_for"'
-                                           '}';
+    log_format main escape=json '{'
+                                '"remote_addr": "$remote_addr", '
+                                '"region": "$ip2region", '
+                                '"http_x_forwarded_for": "$http_x_forwarded_for"'
+                                '}';
 
-    access_log logs/access.log json_access_log;
+    access_log logs/access.log main;
 
     # 设置xdb文件路径
-    ip2region ip2region.xdb;
+    ip2region_db ip2region.xdb;
 
     server {
         listen 80;
diff --git a/binding/nginx/config b/binding/nginx/config
index 9d8f5f7..08fe212 100644
--- a/binding/nginx/config
+++ b/binding/nginx/config
@@ -1,14 +1,22 @@
-ngx_addon_name=ngx_ip2region_module
+ngx_addon_name=ngx_http_ip2region_module
 
-NGX_IP2REGION_SRCS="                                                           \
+NGX_HTTP_IP2REGION_SRCS="                                                           \
                 $ngx_addon_dir/src/ngx_http_ip2region_module.c                 \
                 $ngx_addon_dir/src/xdb_searcher.c                              \
                 "
 
-NGX_IP2REGION_DEPS="                                                           \
+NGX_HTTP_IP2REGION_DEPS="                                                           \
                 "
 
-HTTP_MODULES="$HTTP_MODULES ngx_http_ip2region_module"
-# STREAM_MODULES="ngx_stream_ip2region_module $STREAM_MODULES"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $NGX_IP2REGION_SRCS"
-NGX_ADDON_DEPS="$NGX_ADDON_DEPS $NGX_IP2REGION_DEPS"
+if test -n "$ngx_module_link"; then
+    ngx_module_type=HTTP
+    ngx_module_name=$ngx_addon_name
+    ngx_module_deps="$NGX_HTTP_IP2REGION_DEPS"
+    ngx_module_srcs="$NGX_HTTP_IP2REGION_SRCS"
+
+    . auto/module
+else
+    HTTP_MODULES="$HTTP_MODULES $ngx_addon_name"
+    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $NGX_HTTP_IP2REGION_DEPS"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $NGX_HTTP_IP2REGION_SRCS"
+fi
\ No newline at end of file
diff --git a/binding/nginx/src/ngx_http_ip2region_module.c b/binding/nginx/src/ngx_http_ip2region_module.c
index 3795006..aa3e3e7 100644
--- a/binding/nginx/src/ngx_http_ip2region_module.c
+++ b/binding/nginx/src/ngx_http_ip2region_module.c
@@ -29,7 +29,7 @@ static ngx_http_module_t ngx_http_ip2region_ctx = {
 
 
 static ngx_command_t ngx_http_ip2region_commands[] = {
-    { ngx_string("ip2region"),
+    { ngx_string("ip2region_db"),
       NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE12,
       ngx_http_ip2region_init,
       NGX_HTTP_MAIN_CONF_OFFSET,
-- 
GitLab