feat: model util where empty optimize

Author: modstart

vendor/modstart/modstart/asset/theme/default/style.css

@@ -51,7 +51,7 @@ body, html {
     }
 
     .table-addition-container {
-        //padding-bottom: 10px;
+        padding-bottom: 10px;
     }
 
     .table-container {

vendor/modstart/modstart/resources/asset/src/theme/default/style.less

@@ -114,11 +114,14 @@ public static function mergeQueries($pair = [])
                 continue;
             }
             if (is_array($v)) {
-                $v = $v[0];
+                if (!isset($v[0])) {
+                    continue;
+                }
+                $v = urlencode($v[0]);
             } else {
                 $v = urlencode($v);
             }
-            $urls[] = "$k=" . $v;
+            $urls[] = urlencode($k) . '=' . $v;
         }
 
         return join('&', $urls);

vendor/modstart/modstart/src/Core/Input/Request.php

@@ -252,8 +252,8 @@ public static function proxyCommon($proxy, $package)
 
     public static function postRaw($url, $param = [], $option = [])
     {
-        if (empty($config['timeout'])) {
-            $config['timeout'] = 30;
+        if (empty($option['timeout'])) {
+            $option['timeout'] = 30;
         }
         $sendHeaders = [];
         if (!empty($option['header'])) {
@@ -268,7 +268,7 @@ public static function postRaw($url, $param = [], $option = [])
             curl_setopt($ch, CURLOPT_HTTPHEADER, $sendHeaders);
         }
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_TIMEOUT, $config['timeout']);
+        curl_setopt($ch, CURLOPT_TIMEOUT, $option['timeout']);
         curl_setopt($ch, CURLOPT_REFERER, $url);
         if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) {
             curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
@@ -286,8 +286,8 @@ public static function postRaw($url, $param = [], $option = [])
 
     public static function getRaw($url, $param = [], $option = [])
     {
-        if (empty($config['timeout'])) {
-            $config['timeout'] = 30;
+        if (empty($option['timeout'])) {
+            $option['timeout'] = 30;
         }
         if (!empty($param)) {
             $url = $url . '?' . http_build_query($param);
@@ -305,7 +305,7 @@ public static function getRaw($url, $param = [], $option = [])
             curl_setopt($ch, CURLOPT_HTTPHEADER, $sendHeaders);
         }
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_TIMEOUT, $config['timeout']);
+        curl_setopt($ch, CURLOPT_TIMEOUT, $option['timeout']);
         curl_setopt($ch, CURLOPT_REFERER, $url);
         if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) {
             curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);

vendor/modstart/modstart/src/Core/Util/CurlUtil.php

@@ -456,7 +456,8 @@ public static function savePathToLocalTemp($path, $ext = '')
         if (empty($ext)) {
             $ext = self::extension($path);
         }
-        $tempPath = public_path('temp/' . md5($path) . (starts_with($ext, '.') ? $ext : '.' . $ext));
+        $appKey = config('env.APP_KEY');
+        $tempPath = public_path('temp/' . md5($appKey . ':' . $path) . (starts_with($ext, '.') ? $ext : '.' . $ext));
         if (file_exists($tempPath)) {
             return $tempPath;
         }