提交的内容

app/api/logic/LoginLogic.php

@@ -148,7 +148,6 @@ class LoginLogic extends BaseLogic
         } else {
             $user_info = UserServer::updateUser($response, Client_::mnp, $user_id);
         }
-
         //验证用户信息
         $check_res = self::checkUserInfo($user_info);
         if (true !== $check_res) {

composer.json

@@ -32,7 +32,7 @@
         "aliyuncs/oss-sdk-php": "^2.4",
         "alibabacloud/client": "^1.5",
         "rmccue/requests": "^2.0",
-        "w7corp/easywechat": "^6.8",
+        "w7corp/easywechat": "^6.7",
         "tencentcloud/sms": "^3.0",
         "alipaysdk/easysdk": "^2.2"
     },

vendor/aliyuncs/oss-sdk-php/CHANGELOG.md

@@ -1,5 +1,22 @@
 # ChangeLog - Aliyun OSS SDK for PHP
 
+## v2.7.2 / 2024-10-28
+* Added: presign supports response-* parameters
+* Added: forcePathStyle option.
+
+## v2.7.1 / 2024-02-28
+* Fixed: fix deprecated
+
+## v2.7.0 / 2024-02-02
+* Added: support signature version 4.
+* Added: support checkObjectEndcoding option.
+* Added: support strictObjectName option.
+* Added: support filePathCompatible option.
+* Added: support path style.
+* Added: support environment variables credentials provider.
+* Update: add filed for some api.
+* Fixed: fix some bugs.
+
 ## v2.6.0 / 2022-08-03
 * Added: support credentials provider.
 * Fixed: compatible with swoole curl handler.

vendor/aliyuncs/oss-sdk-php/composer.json

@@ -15,7 +15,7 @@
     },
     "require-dev" : {
         "phpunit/phpunit": "*",
-        "satooshi/php-coveralls": "*"
+        "php-coveralls/php-coveralls": "*"
     },
     "minimum-stability": "stable",
     "autoload": {

vendor/aliyuncs/oss-sdk-php/samples/BucketCors.php

@@ -26,7 +26,39 @@ Common::println("bucket $bucket corsConfig created:" . $corsConfig->serializeToX
 
 // Get cors configuration
 $corsConfig = $ossClient->getBucketCors($bucket);
-Common::println("bucket $bucket corsConfig fetched:" . $corsConfig->serializeToXml());
+
+if ($corsConfig->getResponseVary()){
+    printf("Response Vary : true" .PHP_EOL);
+}else{
+    printf("Response Vary : false" .PHP_EOL);
+}
+
+foreach ($corsConfig->getRules() as $key => $rule){
+    if($rule->getAllowedHeaders()){
+        foreach($rule->getAllowedHeaders() as $header){
+            printf("Allowed Headers :" .$header .PHP_EOL);
+        }
+    }
+    if ($rule->getAllowedMethods()){
+        foreach($rule->getAllowedMethods() as $method){
+            printf("Allowed Methods :" .$method . PHP_EOL);
+        }
+
+    }
+    if($rule->getAllowedOrigins()){
+        foreach($rule->getAllowedOrigins() as $origin){
+            printf("Allowed Origins :" .$origin , PHP_EOL);
+        }
+
+    }
+    if($rule->getExposeHeaders()){
+        foreach($rule->getExposeHeaders() as $exposeHeader){
+            printf("Expose Headers :" .$exposeHeader . PHP_EOL);
+        }
+    }
+    printf("Max Age Seconds :" .$rule->getMaxAgeSeconds() .PHP_EOL);
+
+}
 
 // Delete cors configuration
 $ossClient->deleteBucketCors($bucket);
@@ -78,13 +110,44 @@ function getBucketCors($ossClient, $bucket)
     $corsConfig = null;
     try {
         $corsConfig = $ossClient->getBucketCors($bucket);
+
+        if ($corsConfig->getResponseVary()){
+            printf("Response Vary : true" .PHP_EOL);
+        }else{
+            printf("Response Vary : false" .PHP_EOL);
+        }
+        foreach ($corsConfig->getRules() as $key => $rule){
+            if($rule->getAllowedHeaders()){
+                foreach($rule->getAllowedHeaders() as $header){
+                    printf("Allowed Headers :" .$header .PHP_EOL);
+                }
+            }
+            if ($rule->getAllowedMethods()){
+                foreach($rule->getAllowedMethods() as $method){
+                    printf("Allowed Methods :" .$method . PHP_EOL);
+                }
+
+            }
+            if($rule->getAllowedOrigins()){
+                foreach($rule->getAllowedOrigins() as $origin){
+                    printf("Allowed Origins :" .$origin , PHP_EOL);
+                }
+
+            }
+            if($rule->getExposeHeaders()){
+                foreach($rule->getExposeHeaders() as $exposeHeader){
+                    printf("Expose Headers :" .$exposeHeader . PHP_EOL);
+                }
+            }
+            printf("Max Age Seconds :" .$rule->getMaxAgeSeconds() .PHP_EOL);
+
+        }
     } catch (OssException $e) {
         printf(__FUNCTION__ . ": FAILED\n");
         printf($e->getMessage() . "\n");
         return;
     }
     print(__FUNCTION__ . ": OK" . "\n");
-    print($corsConfig->serializeToXml() . "\n");
 }
 
 /**

vendor/aliyuncs/oss-sdk-php/samples/CredentialsProvider.php

@@ -4,6 +4,7 @@ require_once __DIR__ . '/Common.php';
 use OSS\OssClient;
 use OSS\Core\OssException;
 use OSS\Credentials\StaticCredentialsProvider;
+use OSS\Credentials\EnvironmentVariableCredentialsProvider;
 $bucket = Common::getBucketName();
 
 // Access Key Provider demo
@@ -43,3 +44,20 @@ try {
     printf($e->getMessage() . "\n");
     return;
 }
+
+// read from env
+$envProvider = new EnvironmentVariableCredentialsProvider();
+$config = array(
+    'provider' => $envProvider,
+    'endpoint'=> "<endpoint>"
+);
+
+try {
+    $ossClient = new OssClient($config);
+    $ossClient->putObject($bucket,'c.file','hi oss,this is credentials test of sts provider');
+    $result = $ossClient->getObject($bucket,'c.file');
+    var_dump($result);
+} catch (OssException $e) {
+    printf($e->getMessage() . "\n");
+    return;
+}

vendor/aliyuncs/oss-sdk-php/samples/Object.php

@@ -227,30 +227,47 @@ function listObjects($ossClient, $bucket)
     );
     try {
         $listObjectInfo = $ossClient->listObjects($bucket, $options);
-    } catch (OssException $e) {
-        printf(__FUNCTION__ . ": FAILED\n");
-        printf($e->getMessage() . "\n");
-        return;
-    }
-    print(__FUNCTION__ . ": OK" . "\n");
+        printf("Bucket Name: %s". "\n",$listObjectInfo->getBucketName());
+        printf("Prefix: %s". "\n",$listObjectInfo->getPrefix());
+        printf("Marker: %s". "\n",$listObjectInfo->getMarker());
+        printf("Next Marker: %s". "\n",$listObjectInfo->getNextMarker());
+        printf("Max Keys: %s". "\n",$listObjectInfo->getMaxKeys());
+        printf("Delimiter: %s". "\n",$listObjectInfo->getDelimiter());
+        printf("Is Truncated: %s". "\n",$listObjectInfo->getIsTruncated());
         $objectList = $listObjectInfo->getObjectList(); // object list
         $prefixList = $listObjectInfo->getPrefixList(); // directory list
         if (!empty($objectList)) {
             print("objectList:\n");
             foreach ($objectList as $objectInfo) {
-            print($objectInfo->getKey() . "\n");
-            if($objectInfo->getOwner() != null){
-                printf("owner id:".$objectInfo->getOwner()->getId() . "\n");
-                printf("owner name:".$objectInfo->getOwner()->getDisplayName() . "\n");
+                printf("Object Name: %s". "\n",$objectInfo->getKey());
+                printf("Object Size: %s". "\n",$objectInfo->getSize());
+                printf("Object Type: %s". "\n",$objectInfo->getType());
+                printf("Object ETag: %s". "\n",$objectInfo->getETag());
+                printf("Object Last Modified: %s". "\n",$objectInfo->getLastModified());
+                printf("Object Storage Class: %s". "\n",$objectInfo->getStorageClass());
+
+                if ($objectInfo->getRestoreInfo()){
+                    printf("Restore Info: %s". "\n",$objectInfo->getRestoreInfo() );
+                }
+
+                if($objectInfo->getOwner()){
+                    printf("Owner Id:".$objectInfo->getOwner()->getId() . "\n");
+                    printf("Owner Name:".$objectInfo->getOwner()->getDisplayName() . "\n");
                 }
             }
         }
         if (!empty($prefixList)) {
             print("prefixList: \n");
             foreach ($prefixList as $prefixInfo) {
-            print($prefixInfo->getPrefix() . "\n");
+                printf("Common Prefix:%s\n",$prefixInfo->getPrefix());
             }
         }
+    } catch (OssException $e) {
+        printf(__FUNCTION__ . ": FAILED\n");
+        printf($e->getMessage() . "\n");
+        return;
+    }
+    print(__FUNCTION__ . ": OK" . "\n");
 }
 
 /**
@@ -276,30 +293,49 @@ function listObjectsV2($ossClient, $bucket)
     );
     try {
         $listObjectInfo = $ossClient->listObjectsV2($bucket, $options);
-	} catch (OssException $e) {
-		printf(__FUNCTION__ . ": FAILED\n");
-		printf($e->getMessage() . "\n");
-		return;
-	}
-	print(__FUNCTION__ . ": OK" . "\n");
+        printf("Bucket Name: %s". "\n",$listObjectInfo->getBucketName());
+        printf("Prefix: %s". "\n",$listObjectInfo->getPrefix());
+        printf("Next Continuation Token: %s". "\n",$listObjectInfo->getNextContinuationToken());
+        printf("Continuation Token: %s". "\n",$listObjectInfo->getContinuationToken());
+        printf("Max Keys: %s". "\n",$listObjectInfo->getMaxKeys());
+        printf("Key Count: %s". "\n",$listObjectInfo->getKeyCount());
+        printf("Delimiter: %s". "\n",$listObjectInfo->getDelimiter());
+        printf("Is Truncated: %s". "\n",$listObjectInfo->getIsTruncated());
+        printf("Start After: %s". "\n",$listObjectInfo->getStartAfter());
         $objectList = $listObjectInfo->getObjectList(); // object list
         $prefixList = $listObjectInfo->getPrefixList(); // directory list
         if (!empty($objectList)) {
             print("objectList:\n");
             foreach ($objectList as $objectInfo) {
-			print($objectInfo->getKey() . "\n");
-			if($objectInfo->getOwner() != null){
-				printf("owner id:".$objectInfo->getOwner()->getId() . "\n");
-				printf("owner name:".$objectInfo->getOwner()->getDisplayName() . "\n");
+                printf("Object Name: %s". "\n",$objectInfo->getKey());
+                printf("Object Size: %s". "\n",$objectInfo->getSize());
+                printf("Object Type: %s". "\n",$objectInfo->getType());
+                printf("Object ETag: %s". "\n",$objectInfo->getETag());
+                printf("Object Last Modified: %s". "\n",$objectInfo->getLastModified());
+                printf("Object Storage Class: %s". "\n",$objectInfo->getStorageClass());
+
+                if ($objectInfo->getRestoreInfo()){
+                    printf("Restore Info: %s". "\n",$objectInfo->getRestoreInfo() );
+                }
+
+                if($objectInfo->getOwner()){
+                    printf("Owner Id:".$objectInfo->getOwner()->getId() . "\n");
+                    printf("Owner Name:".$objectInfo->getOwner()->getDisplayName() . "\n");
                 }
             }
         }
         if (!empty($prefixList)) {
             print("prefixList: \n");
             foreach ($prefixList as $prefixInfo) {
-			print($prefixInfo->getPrefix() . "\n");
+                printf("Common Prefix:%s\n",$prefixInfo->getPrefix());
             }
         }
+    } catch (OssException $e) {
+        printf(__FUNCTION__ . ": FAILED\n");
+        printf($e->getMessage() . "\n");
+        return;
+    }
+    print(__FUNCTION__ . ": OK" . "\n");
 }
 
 /**

vendor/aliyuncs/oss-sdk-php/src/OSS/Core/OssUtil.php

@@ -193,7 +193,6 @@ class OssUtil
      *
      * @param array $options
      * @throws OssException
-     * @return boolean
      */
     public static function validateOptions($options)
     {
@@ -372,7 +371,8 @@ BBB;
      * Get the host:port from endpoint.
      *
      * @param string $endpoint the endpoint.
-     * @return boolean
+     * @return string
+     * @throws OssException
      */
     public static function getHostPortFromEndpoint($endpoint)
     {
@@ -531,4 +531,13 @@ BBB;
             throw new OssException("Unrecognized encoding type: " . $encoding);
         }
     }
+
+    public static function unparseUrl($parsed_url) {
+        $scheme   = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : '';
+        $host     = isset($parsed_url['host']) ? $parsed_url['host'] : '';
+        $port     = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '';
+        $path     = isset($parsed_url['path']) ? $parsed_url['path'] : '';
+        $query    = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : '';
+        return "$scheme$host$port$path$query";
+    }
 }

vendor/aliyuncs/oss-sdk-php/src/OSS/Credentials/EnvironmentVariableCredentialsProvider.php

@@ -0,0 +1,20 @@
+<?php
+namespace OSS\Credentials;
+
+use OSS\Core\OssException;
+
+class EnvironmentVariableCredentialsProvider implements CredentialsProvider
+{
+
+    /**
+     * @return Credentials
+     * @throws OssException
+     */
+    public function getCredentials()
+    {
+        $ak= getenv('OSS_ACCESS_KEY_ID');
+        $sk = getenv('OSS_ACCESS_KEY_SECRET');
+        $token =  getenv('OSS_SESSION_TOKEN');
+        return new Credentials($ak, $sk, $token);
+    }
+}

vendor/aliyuncs/oss-sdk-php/src/OSS/Http/RequestCore.php

@@ -170,7 +170,7 @@ class RequestCore
     public $registered_streaming_write_callback = null;
 
     /**
-     * The request timeout time, which is 5,184,000 seconds,that is, 6 days by default
+     * The request timeout time, which is 5,184,000 seconds,that is, 60 days by default
      *
      * @var int
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/CorsConfig.php

@@ -45,10 +45,26 @@ class CorsConfig implements XmlConfig
         }
         $this->rules[] = $rule;
     }
+    /**
+     * @param boolean $value
+     */
+    public function setResponseVary($value)
+    {
+        $this->responseVary = $value;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function getResponseVary(){
+        if (isset($this->responseVary)) {
+            return $this->responseVary;
+        }
+        return false;
+    }
 
     /**
      * Parse CorsConfig from the xml.
-     *
      * @param string $strXml
      * @throws OssException
      * @return null
@@ -56,6 +72,10 @@ class CorsConfig implements XmlConfig
     public function parseFromXml($strXml)
     {
         $xml = simplexml_load_string($strXml);
+        if(isset($xml->ResponseVary)){
+            $this->responseVary =
+            (strval($xml->ResponseVary) === 'TRUE' || strval($xml->ResponseVary) === 'true') ? true : false;
+        }
         if (!isset($xml->CORSRule)) return;
         foreach ($xml->CORSRule as $rule) {
             $corsRule = new CorsRule();
@@ -74,7 +94,6 @@ class CorsConfig implements XmlConfig
             }
             $this->addRule($corsRule);
         }
-        return;
     }
 
     /**
@@ -89,6 +108,13 @@ class CorsConfig implements XmlConfig
             $xmlRule = $xml->addChild('CORSRule');
             $rule->appendToXml($xmlRule);
         }
+        if(isset($this->responseVary)){
+            if ($this->responseVary) {
+                $xml->addChild('ResponseVary', 'true');
+            } else {
+                $xml->addChild('ResponseVary', 'false');
+            }
+        }
         return $xml->asXML();
     }
 
@@ -110,4 +136,5 @@ class CorsConfig implements XmlConfig
      * @var CorsRule[]
      */
     private $rules = array();
+    private $responseVary;
 }

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/ObjectInfo.php

@@ -24,8 +24,10 @@ class ObjectInfo
      * @param string $type
      * @param string $size
      * @param string $storageClass
+     * @param Owner|null $owner
+     * @param null $restoreInfo
      */
-    public function __construct($key, $lastModified, $eTag, $type, $size, $storageClass)
+    public function __construct($key, $lastModified, $eTag, $type, $size, $storageClass,$owner=null,$restoreInfo=null)
     {
         $this->key = $key;
         $this->lastModified = $lastModified;
@@ -33,6 +35,8 @@ class ObjectInfo
         $this->type = $type;
         $this->size = $size;
         $this->storageClass = $storageClass;
+        $this->owner = $owner;
+        $this->restoreInfo = $restoreInfo;
     }
 
     /**
@@ -94,10 +98,32 @@ class ObjectInfo
         return $this->storageClass;
     }
 
+    /**
+     * @return string
+     */
+    public function getRestoreInfo()
+    {
+        return $this->restoreInfo;
+    }
+
+
+    /**
+     * @return Owner|null
+     */
+    public function getOwner()
+    {
+        return $this->owner;
+    }
+
     private $key = "";
     private $lastModified = "";
     private $eTag = "";
     private $type = "";
     private $size = "0";
     private $storageClass = "";
+    /**
+     * @var Owner
+     */
+    private $owner;
+    private $restoreInfo;
 }

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/ObjectVersionListInfo.php

@@ -22,7 +22,7 @@ class ObjectVersionListInfo
      * @param string $nextVersionIdMarker
      * @param string $maxKeys
      * @param string $delimiter
-     * @param null $isTruncated
+     * @param null|string $isTruncated
      * @param array $objectversionList
      * @param array $deleteMarkerList
      * @param array $prefixList
@@ -151,7 +151,7 @@ class ObjectVersionListInfo
     private $prefix = "";
     private $keyMarker = "";
     private $nextKeyMarker = "";
-    private $versionIdmarker = "";
+    private $versionIdMarker = "";
     private $nextVersionIdMarker = "";
     private $maxKeys = 0;
     private $delimiter = "";

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/Owner.php

@@ -0,0 +1,46 @@
+<?php
+
+
+namespace OSS\Model;
+
+/**
+ * Class Owner
+ *
+ * ListObjects return owner list of classes
+ * The returned data contains two arrays
+ * One is to get the list of objects【Can be understood as the corresponding file system file list】
+ * One is to get owner list
+ *
+ */
+class Owner
+{
+    /**
+     * OwnerInfo constructor.
+     * @param $id string
+     * @param $displayName string
+     */
+    public function __construct($id, $displayName)
+    {
+        $this->id = $id;
+        $this->displayName = $displayName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDisplayName()
+    {
+        return $this->displayName;
+    }
+
+    private $id;
+    private $displayName;
+}