Merge branch 'dev' of bvbej/base-php into master

composer.json

@@ -12,9 +12,9 @@
     "ext-openssl": "*",
     "ext-curl": "*",
     "ext-bcmath": "*",
-    "laravel/framework": "^8.40",
-    "ramsey/uuid": "^4.1",
-    "guzzlehttp/guzzle": "^7.3",
+    "laravel/framework": "^8.0 || ^9.0",
+    "ramsey/uuid": "^4.6",
+    "guzzlehttp/guzzle": "^7.5",
     "zoujingli/ip2region": "^1.0"
   },
   "autoload": {

src/Handles/BvBeJHandle.php

@@ -30,7 +30,7 @@ class BvBeJHandle
      */
     public function AesEncrypt(string $data, string $key, string $vi): string|false
     {
-        return $this->Base64UrlEncode(openssl_encrypt($data, 'AES-128-CBC', $key, OPENSSL_CIPHER_AES_128_CBC, $vi));
+        return base64_encode(openssl_encrypt($data, 'AES-128-CBC', $key, OPENSSL_CIPHER_AES_128_CBC, $vi));
     }
 
     /**
@@ -42,7 +42,7 @@ class BvBeJHandle
      */
     public function AesDecrypt(string $data, string $key, string $vi): string|false
     {
-        return openssl_decrypt($this->Base64UrlDecode($data), 'AES-128-CBC', $key, OPENSSL_CIPHER_AES_128_CBC, $vi);
+        return openssl_decrypt(base64_decode($data), 'AES-128-CBC', $key, OPENSSL_CIPHER_AES_128_CBC, $vi);
     }
 
     /**
@@ -110,9 +110,9 @@ class BvBeJHandle
             't' => $timestamp
         ]);
         ksort($form);
-        $http_build_query = http_build_query($form);
+        $sign = http_build_query($form);
         try {
-            $signature = $this->AesEncrypt($http_build_query, $key, $vi);
+            $signature = $this->AesEncrypt($sign, $key, $vi);
             if ($signature === false) {
                 return false;
             }
@@ -120,7 +120,7 @@ class BvBeJHandle
                 RequestOptions::FORM_PARAMS => $form,
                 RequestOptions::HEADERS => [
                     'Signature' => $signature,
-                    'Signature-Date' => date($this::DATE_FORMAT, $timestamp),
+                    'Signature-Datetime' => date($this::DATE_FORMAT, $timestamp),
                     'Product-ID' => $productID
                 ]
             ]);

src/Providers/BvBeJServiceProvider.php

@@ -3,10 +3,12 @@ declare(strict_types=1);
 
 namespace BvBeJ\Providers;
 
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\ServiceProvider;
 use BvBeJ\Commands\ApolloConfigSync;
 use BvBeJ\Handles\Apollo\Client;
 use BvBeJ\Handles\BvBeJHandle;
+use Illuminate\Database\Schema\Blueprint;
 
 
 class BvBeJServiceProvider extends ServiceProvider
@@ -26,6 +28,10 @@ class BvBeJServiceProvider extends ServiceProvider
                 ApolloConfigSync::class
             ]);
         }
+
+        Blueprint::macro('comment', function ($comment) {
+            $this->charset =  DB::connection()->getConfig('charset') . " COMMENT='{$comment}'";
+        });
     }
 
     /**