sharebug

application/library/OSS/Common.php

@@ -49,22 +49,31 @@ class Common
      */
     public static function getOssClient()
     {
-        if(APP_ENV=='product' || APP_ENV=='productOne'){
-            return self::getOssClientOnline();
-        }else{
-            return self::getOssClientPre();
+        try {
+            $ossClient = new OssClient(self::accessKeyId, self::accessKeySecret, self::endpoint, false);
+        } catch (OssException $e) {
+            printf(__FUNCTION__ . "creating OssClient instance: FAILED\n");
+            printf($e->getMessage() . "\n");
+            return null;
         }
+        return $ossClient;
+//        if(APP_ENV=='product' || APP_ENV=='productOne'){
+//            return self::getOssClientOnline();
+//        }else{
+//            return self::getOssClientPre();
+//        }
 
 
     }
 
     public static function getBucketName()
     {
-        if(APP_ENV=='product' || APP_ENV=='productOne'){
-            return self::bucket;
-        }else{
-            return self::buketPre;
-        }
+        return self::bucket;
+//        if(APP_ENV=='product' || APP_ENV=='productOne'){
+//            return self::bucket;
+//        }else{
+//            return self::buketPre;
+//        }
 
     }