update

yuanzhihai · Dec 21, 2022 · 338eee7 · 338eee7
1 parent a29f8c9
commit 338eee7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,8 @@
   "require": {
     "php": "^7.4|^8.0",
     "topthink/framework": "^6.0",
-    "geoip2/geoip2": "~2.1"
+    "geoip2/geoip2": "~2.1",
+    "ext-json": "*"
   },
   "require-dev": {
     "monolog/monolog": "^2.8"

diff --git a/src/console/Publish.php b/src/console/Publish.php
@@ -18,10 +18,10 @@ public function configure()
     public function execute(Input $input, Output $output)
     {
         //获取默认配置文件
-        $path = root_path('resources');
+        $path = app( 'geoip' )->config( 'services.maxmind_database.database_path' );
         if (is_file($path) === false) {
             @mkdir($path, 0755, true);
-            copy(__DIR__ . '/../../resources/geoip.mmdb', $path.'/geoip.mmdb');
+            copy(__DIR__ . '/../../resources/geoip.mmdb', $path);
         }
         $output->writeln('publish ok');
     }

diff --git a/src/services/IPApi.php b/src/services/IPApi.php
@@ -32,7 +32,7 @@ public function boot()
         $base = [
             'base_uri' => 'http://ip-api.com/',
             'headers'  => [
-                'User-Agent' => 'Laravel-GeoIP',
+                'User-Agent' => 'Think-GeoIP',
             ],
             'query'    => [
                 'fields' => 49663,