From c369c06610a14b2461b811e66aef858948783010 Mon Sep 17 00:00:00 2001
From: elf <360197197@qq.com>
Date: Sat, 4 Feb 2023 23:10:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/App/Common/function.php                         | 2 +-
 Application/Base/Service/GameSourceService.class.php        | 2 +-
 Application/Common/Common/extend.php                        | 2 +-
 Application/Common/Common/function.php                      | 2 +-
 Application/Mobile/Common/function.php                      | 2 +-
 .../Qrcode/Controller/QrCodePromotionController.class.php   | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Application/App/Common/function.php b/Application/App/Common/function.php
index a90af2078..a4658ef5e 100644
--- a/Application/App/Common/function.php
+++ b/Application/App/Common/function.php
@@ -155,7 +155,7 @@ function get_img_url($cover_id){
 		return "";
 	}
 	$picture = M('Picture')->where(array('status'=>1))->getById($cover_id);
-	if (C('OSS_STATUS')) {
+	if (C('STORAGE_TYPE')) {
 		if(!empty($picture['oss_url'])){
 			return $picture['oss_url'];
 		}else{
diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php
index a57459633..9a43e2d98 100644
--- a/Application/Base/Service/GameSourceService.class.php
+++ b/Application/Base/Service/GameSourceService.class.php
@@ -331,7 +331,7 @@ class GameSourceService {
     public function uploadPackage($localFilePath, $distFilePath, $isDeleteLocal = false)
     {
         $isChunk = C('PACKAGE_CHUNK_ENABLED') ? true : false;
-        if (C('OSS_STATUS')) {
+        if (C('STORAGE_TYPE')) {
             if ($isChunk) {
                 return $this->uploadPackageChunk($localFilePath, $distFilePath, $isDeleteLocal);
             } else {
diff --git a/Application/Common/Common/extend.php b/Application/Common/Common/extend.php
index 943a98cc0..a16e31882 100644
--- a/Application/Common/Common/extend.php
+++ b/Application/Common/Common/extend.php
@@ -2397,7 +2397,7 @@ function get_child_ids($id){
     }
 //获取图片连接
 function icon_url($value){
-   if (C('OSS_STATUS')){
+   if (C('STORAGE_TYPE')){
         $url = get_cover($value, 'path');
     } else {
         $url = 'http://' . $_SERVER['HTTP_HOST'] . get_cover($value, 'path');
diff --git a/Application/Common/Common/function.php b/Application/Common/Common/function.php
index b97ca1f90..9264dc67a 100644
--- a/Application/Common/Common/function.php
+++ b/Application/Common/Common/function.php
@@ -1020,7 +1020,7 @@ function get_cover($cover_id, $field = null, $root = 1, $flag = true)
         return "";
     }
     $picture = M('Picture')->where(array('status' => 1))->getById($cover_id);
-    if (C('OSS_STATUS')) {
+    if (C('STORAGE_TYPE')) {
         if (!empty($picture['oss_url'])) {
             return str_replace('http:', 'https:', $picture['oss_url']);
         } else {
diff --git a/Application/Mobile/Common/function.php b/Application/Mobile/Common/function.php
index 1fb99e42d..4cb2c807e 100644
--- a/Application/Mobile/Common/function.php
+++ b/Application/Mobile/Common/function.php
@@ -548,7 +548,7 @@ function get_img_url($cover_id){
         return "";
     }
     $picture = M('Picture')->where(array('status'=>1))->getById($cover_id);
-    if (C('OSS_STATUS')) {
+    if (C('STORAGE_TYPE')) {
         if(!empty($picture['oss_url'])){
             return $picture['oss_url'];
         }else{
diff --git a/Application/Qrcode/Controller/QrCodePromotionController.class.php b/Application/Qrcode/Controller/QrCodePromotionController.class.php
index 5889cd44a..23133ce4a 100644
--- a/Application/Qrcode/Controller/QrCodePromotionController.class.php
+++ b/Application/Qrcode/Controller/QrCodePromotionController.class.php
@@ -37,8 +37,8 @@ class QrCodePromotionController extends BaseController
     public function uploadQrCodeBackground()
     {
         $fileController = new FileController();
-        $ossStatus = C('OSS_STATUS');
-        C('OSS_STATUS', false);
+        $storageType = C('STORAGE_TYPE');
+        C('STORAGE_TYPE', null);
         /* 调用文件上传组件上传文件 */
         $Picture = D('Picture');
         $pic_driver = C('PICTURE_UPLOAD_DRIVER');
@@ -51,7 +51,7 @@ class QrCodePromotionController extends BaseController
             $_REQUEST['flag']
         ); //
 
-        C('OSS_STATUS', $ossStatus);
+        C('STORAGE_TYPE', $storageType);
 
         $path = '';
         if ($info) {