Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzdisk
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzdisk
提交
67565fa7
提交
67565fa7
编写于
9月 22, 2020
作者:
sq3536
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
免登
上级
d426f648
变更
1
显示空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
12 行增加
和
8 行删除
+12
-8
DiskCoreResource.java
...java/cn/ibizlab/api/rest/extensions/DiskCoreResource.java
+12
-8
未找到文件。
ibzdisk-provider/ibzdisk-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/DiskCoreResource.java
浏览文件 @
67565fa7
...
...
@@ -95,9 +95,9 @@ public class DiskCoreResource
public
void
download
(
@PathVariable
(
"folder"
)
String
folder
,
@PathVariable
(
"id"
)
String
id
,
@PathVariable
(
value
=
"name"
,
required
=
false
)
String
name
,
@PathVariable
(
value
=
"ext"
,
required
=
false
)
String
ext
,
@RequestHeader
(
value
=
"authcode"
,
required
=
false
)
String
authcode
,
@RequestParam
(
value
=
"authcode"
,
required
=
false
)
String
checkcode
,
HttpServletResponse
response
){
@RequestParam
(
value
=
"authcode"
,
required
=
false
)
String
checkcode
,
HttpServletRe
quest
request
,
HttpServletRe
sponse
response
){
File
file
=
diskCoreService
.
getFile
(
folder
,
id
,
StringUtils
.
isEmpty
(
authcode
)?
checkcode:
authcode
);
response
.
setHeader
(
"Content-Disposition"
,
"attachment;filename="
+
getFileName
(
file
.
getName
()));
response
.
setHeader
(
"Content-Disposition"
,
"attachment;filename="
+
getFileName
(
request
.
getHeader
(
"User-Agent"
),
file
.
getName
()));
this
.
sendRespose
(
response
,
file
);
}
...
...
@@ -106,12 +106,12 @@ public class DiskCoreResource
public
void
open
(
@PathVariable
(
"folder"
)
String
folder
,
@PathVariable
(
"id"
)
String
id
,
@PathVariable
(
"name"
)
String
name
,
@PathVariable
(
"ext"
)
String
ext
,
@RequestHeader
(
value
=
"authcode"
,
required
=
false
)
String
authcode
,
@RequestParam
(
value
=
"authcode"
,
required
=
false
)
String
checkcode
,
HttpServletResponse
response
){
@RequestParam
(
value
=
"authcode"
,
required
=
false
)
String
checkcode
,
HttpServletRe
quest
request
,
HttpServletRe
sponse
response
){
File
file
=
diskCoreService
.
getFile
(
folder
,
id
,
StringUtils
.
isEmpty
(
authcode
)?
checkcode:
authcode
);
String
type
=
getType
(
DiskCoreService
.
getExtensionName
(
file
));
response
.
setContentType
(
type
);
if
(
type
.
toLowerCase
().
equals
(
"application/octet-stream"
))
response
.
setHeader
(
"Content-Disposition"
,
"attachment;filename="
+
getFileName
(
file
.
getName
()));
response
.
setHeader
(
"Content-Disposition"
,
"attachment;filename="
+
getFileName
(
request
.
getHeader
(
"User-Agent"
),
file
.
getName
()));
this
.
sendRespose
(
response
,
file
);
}
...
...
@@ -178,7 +178,7 @@ public class DiskCoreResource
return
ResponseEntity
.
status
(
HttpStatus
.
MOVED_PERMANENTLY
).
header
(
HttpHeaders
.
LOCATION
,
redirectUrl
).
build
();
}
@Value
(
"${ibiz.file.proxy.editpath:http://172.16.180.233:9980/loleaflet/dist/loleaflet.html?file_path=}"
)
@Value
(
"${ibiz.file.proxy.editpath:http://172.16.180.233:
3
9980/loleaflet/dist/loleaflet.html?file_path=}"
)
private
String
editPath
;
@GetMapping
(
value
=
{
"net-disk/editview/{folder}/{id}/{name}.{ext}"
,
"net-disk/edit/{folder}/{id}/{name}.{ext}"
})
...
...
@@ -243,7 +243,7 @@ public class DiskCoreResource
response
.
reset
();
// 设置response的Header
response
.
addHeader
(
"Content-Disposition"
,
"attachment;filename="
+
getFileName
(
filename
));
getFileName
(
""
,
filename
));
response
.
addHeader
(
"Content-Length"
,
""
+
file
.
length
());
toClient
=
new
BufferedOutputStream
(
response
.
getOutputStream
());
response
.
setContentType
(
"application/octet-stream"
);
...
...
@@ -320,9 +320,13 @@ public class DiskCoreResource
}
}
protected
String
getFileName
(
String
fileName
){
protected
String
getFileName
(
String
userAgent
,
String
fileName
){
try
{
return
new
String
(
fileName
.
getBytes
(
"utf-8"
),
"ISO-8859-1"
);
//防止中文乱码
if
(
userAgent
.
contains
(
"MSIE"
)||
userAgent
.
contains
(
"Trident"
))
{
return
java
.
net
.
URLEncoder
.
encode
(
fileName
,
"UTF-8"
);
}
else
{
return
new
String
(
fileName
.
getBytes
(
"UTF-8"
),
"ISO-8859-1"
);
}
}
catch
(
UnsupportedEncodingException
e
)
{
e
.
printStackTrace
();
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录