Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
meibuyu-rpc
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
without authentication
meibuyu-rpc
Commits
a65a3b1b
Commit
a65a3b1b
authored
Sep 02, 2020
by
王源
🎧
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test' into shopify
parents
feeab408
402a758b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
11 deletions
+24
-11
UploadManager.php
src/Manager/UploadManager.php
+3
-3
Exporter.php
src/Tools/Exporter.php
+4
-4
functions.php
src/functions.php
+17
-4
No files found.
src/Manager/UploadManager.php
View file @
a65a3b1b
...
...
@@ -146,13 +146,13 @@ class UploadManager
// 文件重命名,由当前日期时间 + 唯一ID + 扩展名
$fileName
=
date
(
'YmdHis'
)
.
uniqid
()
.
'.'
.
$extension
;
$name
=
$file
->
toArray
()[
'name'
];
$savePath
=
self
::
parsePath
(
$options
,
$documentRoot
)
.
$fileName
.
'_'
.
$name
;
$savePath
=
self
::
parsePath
(
$options
,
$documentRoot
)
.
$fileName
;
$file
->
moveTo
(
$savePath
);
if
(
$file
->
isMoved
())
{
if
(
$realPath
)
{
return
$savePath
;
return
$savePath
.
'?'
.
$name
;
}
else
{
return
str_replace
(
$documentRoot
,
''
,
$savePath
);
return
str_replace
(
$documentRoot
,
''
,
$savePath
.
'?'
.
$name
);
}
}
else
{
throw
new
HttpResponseException
(
'文件保存失败'
);
...
...
src/Tools/Exporter.php
View file @
a65a3b1b
...
...
@@ -326,12 +326,12 @@ class Exporter
if
(
!
$filename
)
{
$filename
=
$this
->
name
?
$this
->
name
:
rand
(
1
,
9999999
)
.
time
()
.
rand
(
1
,
9999999
);
}
$filename
.=
"."
.
strtolower
(
$this
->
fileType
);
$this
->
reader
->
setActiveSheetIndex
(
0
);
$objWriter
=
IOFactory
::
createWriter
(
$this
->
reader
,
$this
->
fileType
);
switch
(
$downloadType
)
{
case
self
::
DOWNLOAD_TYPE_STREAM
:
case
self
::
DOWNLOAD_TYPE_SAVE_AND_DOWNLOAD
:
$filename
.=
"."
.
strtolower
(
$this
->
fileType
);
if
(
$this
->
fileType
==
'Xlsx'
)
{
header
(
'Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
);
}
elseif
(
$this
->
fileType
==
'Xls'
)
{
...
...
@@ -371,9 +371,9 @@ class Exporter
case
self
::
DOWNLOAD_TYPE_RETURN_FILE_PATH
:
$filePath
=
$this
->
rootPath
.
"/export/"
;
!
is_dir
(
$filePath
)
&&
mkdir
(
$filePath
,
0777
,
true
);
$file
Name
=
$filePath
.
date
(
'YmdHis'
)
.
'-'
.
$filename
;
$objWriter
->
save
(
$file
Name
);
return
$this
->
config
->
get
(
'app_domain'
)
.
str_replace
(
$this
->
rootPath
,
''
,
$file
Name
);
$file
ReadPath
=
$filePath
.
$filename
.
'-'
.
date
(
'YmdHis'
)
.
"."
.
strtolower
(
$this
->
fileType
)
;
$objWriter
->
save
(
$file
ReadPath
);
return
$this
->
config
->
get
(
'app_domain'
)
.
str_replace
(
$this
->
rootPath
,
''
,
$file
ReadPath
);
break
;
default
:
throw
new
\Exception
(
'不支持此种下载类型'
);
...
...
src/functions.php
View file @
a65a3b1b
...
...
@@ -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'
))
{
/**
* 数字转换对应26个字母
...
...
@@ -731,10 +744,10 @@ if (!function_exists('to_camel_case')) {
{
$array
=
explode
(
$dirSep
,
$str
);
$result
=
$array
[
0
];
$len
=
count
(
$array
);
if
(
$len
>
1
)
{
for
(
$i
=
1
;
$i
<
$len
;
$i
++
)
{
$result
.=
ucfirst
(
$array
[
$i
]);
$len
=
count
(
$array
);
if
(
$len
>
1
)
{
for
(
$i
=
1
;
$i
<
$len
;
$i
++
)
{
$result
.=
ucfirst
(
$array
[
$i
]);
}
}
return
$result
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment