|
@@ -159,13 +159,17 @@ class Save
|
|
|
}
|
|
|
Dever::error($state);
|
|
|
}
|
|
|
- if ($dest_name) {
|
|
|
- $name = $dest_name;
|
|
|
- }
|
|
|
- $dest = $this->config['id'] . '/' . $this->getDest($name, $ext, $uid);
|
|
|
- $system = Dever::call("manage/common.system", [false, true, "upload/manage.getFileField"]);
|
|
|
- if ($system && isset($system['database'])) {
|
|
|
- $dest = $system['database'] . '/' . $dest;
|
|
|
+ if ($dest_name && strstr($dest_name, '/')) {
|
|
|
+ $dest = $dest_name;
|
|
|
+ } else {
|
|
|
+ if ($dest_name) {
|
|
|
+ $name = $dest_name;
|
|
|
+ }
|
|
|
+ $dest = $this->config['id'] . '/' . $this->getDest($name, $ext, $uid);
|
|
|
+ $system = Dever::call("manage/common.system", [false, true, "upload/manage.getFileField"]);
|
|
|
+ if ($system && isset($system['database'])) {
|
|
|
+ $dest = $system['database'] . '/' . $dest;
|
|
|
+ }
|
|
|
}
|
|
|
# type 1是文件复制 2是base64 3是远程文件复制
|
|
|
$url = Dever::load('tool', 'upload')->get($this->config['save'])->upload($type, $source, $dest, $chunk, $this);
|