diff --git a/app/Admin/Controllers/SettingController.php b/app/Admin/Controllers/SettingController.php index e6293d7..5fe076f 100644 --- a/app/Admin/Controllers/SettingController.php +++ b/app/Admin/Controllers/SettingController.php @@ -55,37 +55,36 @@ class SettingController extends AdminController ]); //上传设置-修改env文件内配置; - if (! empty($data['upload_disk'])) { - $envData['FILESYSTEM_DISK'] = $data['upload_disk']; - if ($envData['FILESYSTEM_DISK'] == 'oss') {//如果设置为OSS驱动,则配置env变量 - $envData['OSS_ACCESS_KEY_ID'] = Arr::get($data['oss_config'], 'access_key_id'); - $envData['OSS_ACCESS_KEY_SECRET'] = Arr::get($data['oss_config'], 'access_key_secret'); - $envData['OSS_BUCKET'] = Arr::get($data['oss_config'], 'bucket'); - $envData['OSS_ENDPOINT'] = Arr::get($data['oss_config'], 'endpoint'); - $envData['OSS_DOMAIN'] = Arr::get($data['oss_config'], 'domain'); - if (! empty($envData['OSS_DOMAIN'])) { - $envData['OSS_CNAME'] = 'true'; - } else { - $envData['OSS_CNAME'] = 'false'; - } - $envData['OSS_SSL'] = Arr::get($data['oss_config'], 'use_ssl') ? 'true' : 'false'; - } - $envPath = base_path().DIRECTORY_SEPARATOR.'.env'; - $contentArray = collect(file($envPath, FILE_IGNORE_NEW_LINES)); - $contentArray->transform(function ($item) use ($envData) { - foreach ($envData as $key => $value) { - if (str_contains($item, $key)) { + // if (! empty($data['upload_disk'])) { + // $envData['FILESYSTEM_DISK'] = $data['upload_disk']; + // if ($envData['FILESYSTEM_DISK'] == 'oss') {//如果设置为OSS驱动,则配置env变量 + // $envData['OSS_ACCESS_KEY_ID'] = Arr::get($data['oss_config'], 'access_key_id'); + // $envData['OSS_ACCESS_KEY_SECRET'] = Arr::get($data['oss_config'], 'access_key_secret'); + // $envData['OSS_BUCKET'] = Arr::get($data['oss_config'], 'bucket'); + // $envData['OSS_ENDPOINT'] = Arr::get($data['oss_config'], 'endpoint'); + // $envData['OSS_DOMAIN'] = Arr::get($data['oss_config'], 'domain'); + // if (! empty($envData['OSS_DOMAIN'])) { + // $envData['OSS_CNAME'] = 'true'; + // } else { + // $envData['OSS_CNAME'] = 'false'; + // } + // $envData['OSS_SSL'] = Arr::get($data['oss_config'], 'use_ssl') ? 'true' : 'false'; + // } + // $envPath = base_path().DIRECTORY_SEPARATOR.'.env'; + // $contentArray = collect(file($envPath, FILE_IGNORE_NEW_LINES)); + // $contentArray->transform(function ($item) use ($envData) { + // foreach ($envData as $key => $value) { + // if (str_contains($item, $key)) { + // return $key.'='.$value; + // } + // } - return $key.'='.$value; - } - } + // return $item; + // }); - return $item; - }); - - $content = implode("\n", $contentArray->toArray()); - \File::put($envPath, $content); - } + // $content = implode("\n", $contentArray->toArray()); + // \File::put($envPath, $content); + // } return settings()->adminSetMany($data); }