Improved Noce (#206)

Improved Noce
aliyun · Feb 26, 2020 · a11d68d · a11d68d
1 parent 6e08730
commit a11d68d
Show file tree

Hide file tree

Showing 9 changed files with 280 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.5.21 - 2020-02-26
+- Improved Nonce.
+- Updated Endpoints.
+
 ## 1.5.20 - 2019-12-30
 - Improved Docs.
 - Updated Endpoints.

diff --git a/src/AlibabaCloud.php b/src/AlibabaCloud.php
@@ -30,7 +30,7 @@ class AlibabaCloud
     /**
      * Version of the Client
      */
-    const VERSION = '1.5.20';
+    const VERSION = '1.5.21';
 
     /**
      * This static method can directly call the specific service.

diff --git a/src/Config/Data.php b/src/Config/Data.php
diff --git a/src/Support/Sign.php b/src/Support/Sign.php
@@ -135,6 +135,6 @@ public static function roaString(Request $request)
      */
     public static function uuid($salt)
     {
-        return md5($salt . uniqid(md5(microtime(true)), true));
+        return md5($salt . uniqid(md5(microtime(true)), true)) . microtime();
     }
 }
diff --git a/tests/Unit/Credentials/Providers/EcsRamRoleProviderTest.php b/tests/Unit/Credentials/Providers/EcsRamRoleProviderTest.php
@@ -62,7 +62,7 @@ public function testGetInCache()
         );
         $cacheMethod->setAccessible(true);
         $result = [
-            'Expiration'      => '2020-02-02 11:11:11',
+            'Expiration'      => '2049-10-01 11:11:11',
             'AccessKeyId'     => 'foo',
             'AccessKeySecret' => 'bar',
             'SecurityToken'   => 'token',

diff --git a/tests/Unit/Credentials/Providers/ProviderTest.php b/tests/Unit/Credentials/Providers/ProviderTest.php
@@ -166,10 +166,10 @@ public function cache()
             [
                 new AccessKeyClient('foo', 'bar'),
                 [
-                    'Expiration' => '2020-02-02 11:11:11',
+                    'Expiration' => '2049-10-01 11:11:11',
                 ],
                 [
-                    'Expiration' => '2020-02-02 11:11:11',
+                    'Expiration' => '2049-10-01 11:11:11',
                 ],
             ],
             [

diff --git a/tests/Unit/Credentials/Providers/RamRoleArnProviderTest.php b/tests/Unit/Credentials/Providers/RamRoleArnProviderTest.php
@@ -69,7 +69,7 @@ public function testGetInCache()
         );
         $cacheMethod->setAccessible(true);
         $result = [
-            'Expiration'      => '2020-02-02 11:11:11',
+            'Expiration'      => '2049-10-01 11:11:11',
             'AccessKeyId'     => 'foo',
             'AccessKeySecret' => 'bar',
             'SecurityToken'   => 'token',

diff --git a/tests/Unit/Credentials/Providers/RsaKeyPairProviderTest.php b/tests/Unit/Credentials/Providers/RsaKeyPairProviderTest.php
@@ -66,7 +66,7 @@ public function testGetInCache()
         );
         $cacheMethod->setAccessible(true);
         $result = [
-            'Expiration'             => '2020-02-02 11:11:11',
+            'Expiration'             => '2049-10-01 11:11:11',
             'SessionAccessKeyId'     => 'foo',
             'SessionAccessKeySecret' => 'bar',
         ];

diff --git a/tests/Unit/Support/SignTest.php b/tests/Unit/Support/SignTest.php
@@ -2,13 +2,13 @@
 
 namespace AlibabaCloud\Client\Tests\Unit\Support;
 
-use PHPUnit\Framework\TestCase;
 use AlibabaCloud\Client\Support\Sign;
+use PHPUnit\Framework\TestCase;
 
 class SignTest extends TestCase
 {
     public function testUUID()
     {
-        self::assertEquals(32, strlen(Sign::uuid('uuid')));
+        self::assertEquals(53, strlen(Sign::uuid('uuid')));
     }
 }