Merge branch 'long-consultation-desk'
This commit is contained in:
@@ -0,0 +1,17 @@
|
||||
<?php
|
||||
|
||||
namespace app\common\model\doctor;
|
||||
|
||||
use app\common\model\BaseModel;
|
||||
|
||||
class DoctorNote extends BaseModel
|
||||
{
|
||||
protected $name = 'doctor_note';
|
||||
|
||||
protected $autoWriteTimestamp = true;
|
||||
protected $createTime = 'create_time';
|
||||
protected $updateTime = 'update_time';
|
||||
protected $deleteTime = 'delete_time';
|
||||
|
||||
protected $dateFormat = false;
|
||||
}
|
||||
@@ -44,11 +44,7 @@ class FileService
|
||||
if (strstr($uri, 'http://')) return $uri;
|
||||
if (strstr($uri, 'https://')) return $uri;
|
||||
|
||||
$default = Cache::get('STORAGE_DEFAULT');
|
||||
if (!$default) {
|
||||
$default = ConfigService::get('storage', 'default', 'local');
|
||||
Cache::set('STORAGE_DEFAULT', $default);
|
||||
}
|
||||
$default = ConfigService::get('storage', 'default', 'local');
|
||||
|
||||
if ($default === 'local') {
|
||||
if($type == 'public_path') {
|
||||
@@ -56,11 +52,7 @@ class FileService
|
||||
}
|
||||
$domain = request()->domain();
|
||||
} else {
|
||||
$storage = Cache::get('STORAGE_ENGINE');
|
||||
if (!$storage) {
|
||||
$storage = ConfigService::get('storage', $default);
|
||||
Cache::set('STORAGE_ENGINE', $storage);
|
||||
}
|
||||
$storage = ConfigService::get('storage', $default);
|
||||
$domain = $storage ? $storage['domain'] : '';
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user