Commit 402a758b authored by 王源's avatar 王源 🎧

Merge branch 'develop' into test

parents f3469ff9 3aec3b14
...@@ -125,6 +125,19 @@ if (!function_exists('fail')) { ...@@ -125,6 +125,19 @@ if (!function_exists('fail')) {
} }
} }
if (!function_exists('download')) {
/**
* 文件流下载文件
* @param string $filePath 文件路径
* @param string $showName 下载后展示的名称
* @return mixed
*/
function download($filePath = '', $showName = '')
{
return response()->download($filePath, urlencode($showName));
}
}
if (!function_exists('decimal_to_abc')) { if (!function_exists('decimal_to_abc')) {
/** /**
* 数字转换对应26个字母 * 数字转换对应26个字母
...@@ -731,10 +744,10 @@ if (!function_exists('to_camel_case')) { ...@@ -731,10 +744,10 @@ if (!function_exists('to_camel_case')) {
{ {
$array = explode($dirSep, $str); $array = explode($dirSep, $str);
$result = $array[0]; $result = $array[0];
$len=count($array); $len = count($array);
if($len>1) { if ($len > 1) {
for($i=1;$i<$len;$i++) { for ($i = 1; $i < $len; $i++) {
$result.= ucfirst($array[$i]); $result .= ucfirst($array[$i]);
} }
} }
return $result; return $result;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment