Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
88602da0
o2oa
项目概览
weixin_42566577
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
88602da0
编写于
11月 23, 2022
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
支持亚马逊s3存储
上级
c4226322
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
8 deletion
+14
-8
o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageObject.java
...t/src/main/java/com/x/base/core/entity/StorageObject.java
+13
-7
o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageProtocol.java
...src/main/java/com/x/base/core/entity/StorageProtocol.java
+1
-1
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageObject.java
浏览文件 @
88602da0
...
...
@@ -252,6 +252,13 @@ public abstract class StorageObject extends SliceJpaObject {
+
URLEncoder
.
encode
(
mapping
.
getPassword
(),
DefaultCharset
.
name
)
+
"@"
+
mapping
.
getHost
()
+
"/"
+
mapping
.
getName
();
break
;
case
s3:
prefix
=
"s3://"
+
URLEncoder
.
encode
(
mapping
.
getUsername
(),
DefaultCharset
.
name
)
+
":"
+
URLEncoder
.
encode
(
mapping
.
getPassword
(),
DefaultCharset
.
name
)
+
"@"
+
mapping
.
getHost
();
if
(
StringUtils
.
isNotBlank
(
mapping
.
getName
())
&&
!
mapping
.
getHost
().
startsWith
(
mapping
.
getName
()))
{
prefix
=
prefix
+
"/"
+
mapping
.
getName
();
}
break
;
case
file:
prefix
=
"file://"
;
break
;
...
...
@@ -324,8 +331,6 @@ public abstract class StorageObject extends SliceJpaObject {
ftpsBuilder
.
setSoTimeout
(
opts
,
Duration
.
ofMillis
(
10
*
1000
));
ftpsBuilder
.
setControlEncoding
(
opts
,
DefaultCharset
.
name
);
break
;
case
cifs:
break
;
case
webdav:
Webdav4FileSystemConfigBuilder
webdavBuilder
=
Webdav4FileSystemConfigBuilder
.
getInstance
();
webdavBuilder
.
setConnectionTimeout
(
opts
,
Duration
.
ofMillis
(
10
*
1000
));
...
...
@@ -335,8 +340,6 @@ public abstract class StorageObject extends SliceJpaObject {
webdavBuilder
.
setMaxTotalConnections
(
opts
,
200
);
webdavBuilder
.
setFollowRedirect
(
opts
,
true
);
break
;
case
file:
break
;
default
:
break
;
}
...
...
@@ -365,7 +368,8 @@ public abstract class StorageObject extends SliceJpaObject {
this
.
setLength
(
length
);
if
((!
Objects
.
equals
(
StorageProtocol
.
webdav
,
mapping
.
getProtocol
()))
&&
(!
Objects
.
equals
(
StorageProtocol
.
sftp
,
mapping
.
getProtocol
()))
&&
(!
Objects
.
equals
(
StorageProtocol
.
ali
,
mapping
.
getProtocol
())))
{
&&
(!
Objects
.
equals
(
StorageProtocol
.
ali
,
mapping
.
getProtocol
()))
&&
(!
Objects
.
equals
(
StorageProtocol
.
s3
,
mapping
.
getProtocol
())))
{
/* webdav关闭会试图去关闭commons.httpClient */
manager
.
closeFileSystem
(
fo
.
getFileSystem
());
}
...
...
@@ -406,7 +410,8 @@ public abstract class StorageObject extends SliceJpaObject {
fo
.
getPublicURIString
()
+
" not existed, object:"
+
this
.
toString
()
+
"."
);
}
if
(!
Objects
.
equals
(
StorageProtocol
.
webdav
,
mapping
.
getProtocol
())
&&
(!
Objects
.
equals
(
StorageProtocol
.
ali
,
mapping
.
getProtocol
())))
{
&&
(!
Objects
.
equals
(
StorageProtocol
.
ali
,
mapping
.
getProtocol
()))
&&
(!
Objects
.
equals
(
StorageProtocol
.
s3
,
mapping
.
getProtocol
())))
{
/* webdav关闭会试图去关闭commons.httpClient */
manager
.
closeFileSystem
(
fo
.
getFileSystem
());
}
...
...
@@ -447,7 +452,8 @@ public abstract class StorageObject extends SliceJpaObject {
}
}
if
(!
Objects
.
equals
(
StorageProtocol
.
webdav
,
mapping
.
getProtocol
())
&&
(!
Objects
.
equals
(
StorageProtocol
.
ali
,
mapping
.
getProtocol
())))
{
&&
(!
Objects
.
equals
(
StorageProtocol
.
ali
,
mapping
.
getProtocol
()))
&&
(!
Objects
.
equals
(
StorageProtocol
.
s3
,
mapping
.
getProtocol
())))
{
// webdav关闭会试图去关闭commons.httpClient
manager
.
closeFileSystem
(
fo
.
getFileSystem
());
}
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageProtocol.java
浏览文件 @
88602da0
package
com.x.base.core.entity
;
public
enum
StorageProtocol
{
ftp
,
ftps
,
webdav
,
cifs
,
file
,
sftp
,
hdfs
,
ali
;
ftp
,
ftps
,
webdav
,
cifs
,
file
,
sftp
,
hdfs
,
ali
,
s3
;
public
static
final
int
length
=
JpaObject
.
length_16B
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录