优化上传配置和API接口上传配置

@@ -47,7 +47,7 @@ class Common extends Api
             }
             }
 
 
             $upload['cdnurl'] = $upload['cdnurl'] ? $upload['cdnurl'] : cdnurl('', true);
             $upload['cdnurl'] = $upload['cdnurl'] ? $upload['cdnurl'] : cdnurl('', true);
-            $upload['uploadurl'] = $upload['bucket'] == 'local' ? cdnurl('/api/common/upload', true) : url($upload['uploadurl'], '', false, true);
+            $upload['uploadurl'] = preg_match("/^((?:[a-z]+:)?\/\/)(.*)/i", $upload['uploadurl']) ? $upload['uploadurl'] : url($upload['bucket'] == 'local' ? '/api/common/upload' : $upload['uploadurl'], '', false, true);
 
 
             $content = [
             $content = [
                 'citydata'    => Area::getCityFromLngLat($lng, $lat),
                 'citydata'    => Area::getCityFromLngLat($lng, $lat),

@@ -171,7 +171,10 @@ class Config extends Model
 
 
         $uploadurl = request()->module() ? $uploadcfg['uploadurl'] : ($uploadcfg['uploadurl'] === 'ajax/upload' ? 'index/' . $uploadcfg['uploadurl'] : $uploadcfg['uploadurl']);
         $uploadurl = request()->module() ? $uploadcfg['uploadurl'] : ($uploadcfg['uploadurl'] === 'ajax/upload' ? 'index/' . $uploadcfg['uploadurl'] : $uploadcfg['uploadurl']);
 
 
-        $uploadurl = url($uploadurl, '', false, false);
+        if (!preg_match("/^((?:[a-z]+:)?\/\/)(.*)/i", $uploadurl) && substr($uploadurl, 0, 1) !== '/') {
+            $uploadurl = url($uploadurl, '', false);
+        }
+
         $upload = [
         $upload = [
             'cdnurl'    => $uploadcfg['cdnurl'],
             'cdnurl'    => $uploadcfg['cdnurl'],
             'uploadurl' => $uploadurl,
             'uploadurl' => $uploadurl,