Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
liqin
chnmuseum-party
Commits
125805fe
Commit
125805fe
authored
Apr 27, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
980e20da
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
Asset.java
src/main/java/cn/chnmuseum/party/model/Asset.java
+4
-0
FileUploadController.java
.../chnmuseum/party/web/controller/FileUploadController.java
+4
-2
AssetMapper.xml
src/main/resources/mapper/AssetMapper.xml
+2
-1
No files found.
src/main/java/cn/chnmuseum/party/model/Asset.java
View file @
125805fe
...
@@ -65,6 +65,10 @@ public class Asset implements Serializable {
...
@@ -65,6 +65,10 @@ public class Asset implements Serializable {
@TableField
(
"file_url"
)
@TableField
(
"file_url"
)
private
String
fileUrl
;
private
String
fileUrl
;
@ApiModelProperty
(
"Base64加密链接"
)
@TableField
(
"intro"
)
private
String
intro
;
@ApiModelProperty
(
"加密链接"
)
@ApiModelProperty
(
"加密链接"
)
@TableField
(
"file_url_crypto"
)
@TableField
(
"file_url_crypto"
)
private
String
fileUrlCrypto
;
private
String
fileUrlCrypto
;
...
...
src/main/java/cn/chnmuseum/party/web/controller/FileUploadController.java
View file @
125805fe
...
@@ -175,6 +175,7 @@ public class FileUploadController extends BaseController {
...
@@ -175,6 +175,7 @@ public class FileUploadController extends BaseController {
final
Set
<
MetaData
>
fileMetaData
=
FastDFSUtils
.
getFileMetaData
(
fileUrlCrypto
);
final
Set
<
MetaData
>
fileMetaData
=
FastDFSUtils
.
getFileMetaData
(
fileUrlCrypto
);
String
md5
=
fileMetaData
.
stream
().
filter
(
x
->
"MD5"
.
equals
(
x
.
getName
())).
map
(
MetaData:
:
getValue
).
findFirst
().
get
();
String
md5
=
fileMetaData
.
stream
().
filter
(
x
->
"MD5"
.
equals
(
x
.
getName
())).
map
(
MetaData:
:
getValue
).
findFirst
().
get
();
asset
.
setMd5
(
md5
);
asset
.
setMd5
(
md5
);
asset
.
setIntro
(
Base64
.
getEncoder
().
encodeToString
(
fileUrl
.
getBytes
()));
asset
.
setFileUrlCrypto
(
md5
+
".chnmuseum"
);
asset
.
setFileUrlCrypto
(
md5
+
".chnmuseum"
);
}
else
if
(
Arrays
.
stream
(
AUDIO_TYPE
).
anyMatch
(
s
->
Objects
.
equals
(
s
,
finalExtName
.
toUpperCase
())))
{
}
else
if
(
Arrays
.
stream
(
AUDIO_TYPE
).
anyMatch
(
s
->
Objects
.
equals
(
s
,
finalExtName
.
toUpperCase
())))
{
metaDataSet
.
add
(
new
MetaData
(
"fileType"
,
FileTypeEnum
.
AUDIO
.
name
()));
metaDataSet
.
add
(
new
MetaData
(
"fileType"
,
FileTypeEnum
.
AUDIO
.
name
()));
...
@@ -220,7 +221,7 @@ public class FileUploadController extends BaseController {
...
@@ -220,7 +221,7 @@ public class FileUploadController extends BaseController {
this
.
assetService
.
save
(
asset
);
this
.
assetService
.
save
(
asset
);
datumUrlList
.
add
(
asset
);
datumUrlList
.
add
(
asset
);
handleResult
.
setFileUrl
(
fileUrl
);
handleResult
.
setFileUrl
(
""
);
handleResult
.
setFileName
(
originalFilename
);
handleResult
.
setFileName
(
originalFilename
);
handleResult
.
setHandleResult
(
HANDLE_STATUS_ENUM
.
SUCCESS
.
getName
());
handleResult
.
setHandleResult
(
HANDLE_STATUS_ENUM
.
SUCCESS
.
getName
());
handleResult
.
setDescription
(
""
);
handleResult
.
setDescription
(
""
);
...
@@ -554,6 +555,7 @@ public class FileUploadController extends BaseController {
...
@@ -554,6 +555,7 @@ public class FileUploadController extends BaseController {
.
fileType
(
FileTypeEnum
.
VIDEO
.
name
())
.
fileType
(
FileTypeEnum
.
VIDEO
.
name
())
.
fileSize
(
fileSize
)
.
fileSize
(
fileSize
)
.
fileUrl
(
fileUrl
)
.
fileUrl
(
fileUrl
)
.
intro
(
Base64
.
getEncoder
().
encodeToString
(
fileUrl
.
getBytes
()))
.
fileUrlCrypto
(
fileUrlCrypto
)
.
fileUrlCrypto
(
fileUrlCrypto
)
.
fileCat
(
FileCatEnum
.
VIDEO_CONTENT
.
name
())
.
fileCat
(
FileCatEnum
.
VIDEO_CONTENT
.
name
())
.
language
(
language
)
.
language
(
language
)
...
@@ -572,7 +574,7 @@ public class FileUploadController extends BaseController {
...
@@ -572,7 +574,7 @@ public class FileUploadController extends BaseController {
this
.
assetService
.
save
(
asset
);
this
.
assetService
.
save
(
asset
);
fileList
.
add
(
asset
);
fileList
.
add
(
asset
);
handleResult
.
setFileUrl
(
fileUrl
);
handleResult
.
setFileUrl
(
""
);
handleResult
.
setFileName
(
originalFilename
);
handleResult
.
setFileName
(
originalFilename
);
handleResult
.
setFileType
(
FileTypeEnum
.
VIDEO
.
getName
());
handleResult
.
setFileType
(
FileTypeEnum
.
VIDEO
.
getName
());
handleResult
.
setHandleResult
(
HANDLE_STATUS_ENUM
.
SUCCESS
.
getName
());
handleResult
.
setHandleResult
(
HANDLE_STATUS_ENUM
.
SUCCESS
.
getName
());
...
...
src/main/resources/mapper/AssetMapper.xml
View file @
125805fe
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
<result
column=
"file_cat"
property=
"fileCat"
/>
<result
column=
"file_cat"
property=
"fileCat"
/>
<result
column=
"file_size"
property=
"fileSize"
/>
<result
column=
"file_size"
property=
"fileSize"
/>
<result
column=
"file_url"
property=
"fileUrl"
/>
<result
column=
"file_url"
property=
"fileUrl"
/>
<result
column=
"intro"
property=
"intro"
/>
<result
column=
"file_url_crypto"
property=
"fileUrlCrypto"
/>
<result
column=
"file_url_crypto"
property=
"fileUrlCrypto"
/>
<result
column=
"thumbnail"
property=
"thumbnail"
/>
<result
column=
"thumbnail"
property=
"thumbnail"
/>
<result
column=
"language"
property=
"language"
/>
<result
column=
"language"
property=
"language"
/>
...
@@ -26,7 +27,7 @@
...
@@ -26,7 +27,7 @@
<!-- 通用查询结果列 -->
<!-- 通用查询结果列 -->
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
id, ref_item_id, file_name, file_name_crypto, file_ext_name, file_type, file_cat, file_size, file_url,
id, ref_item_id, file_name, file_name_crypto, file_ext_name, file_type, file_cat, file_size, file_url,
file_url_crypto, thumbnail, language, md5, crc32, video_content_name, create_time, update_time
intro,
file_url_crypto, thumbnail, language, md5, crc32, video_content_name, create_time, update_time
</sql>
</sql>
</mapper>
</mapper>
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