Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
engine-class-work
Project
Project
Details
Activity
Releases
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
liuchengjiu
engine-class-work
Commits
199b4c30
Commit
199b4c30
authored
Jul 24, 2023
by
Ryan Loong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix 文件导出
parent
6d6551e7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
PointController.java
...va/cn/exploring/engine/server/wx/web/PointController.java
+2
-2
WxStorageController.java
...n/exploring/engine/server/wx/web/WxStorageController.java
+1
-1
No files found.
server-wx-api/src/main/java/cn/exploring/engine/server/wx/web/PointController.java
View file @
199b4c30
...
...
@@ -6,6 +6,7 @@ import cn.exploring.engine.server.db.domain.StudentPointInfo;
import
cn.exploring.engine.server.db.domain.vo.IdVo
;
import
cn.exploring.engine.server.db.service.StudentInfoService
;
import
cn.exploring.engine.server.db.service.StudentPointService
;
import
cn.exploring.engine.server.db.util.StrUtil
;
import
org.springframework.util.StringUtils
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -55,8 +56,7 @@ public class PointController {
FileInputStream
in
=
null
;
try
{
in
=
new
FileInputStream
(
file
);
// return ResponseUtil.ok(storageService.store(in, file.length(), "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", file.getName(), storageService.generateKey(file.getName())));
return
ResponseUtil
.
ok
(
storageService
.
store
(
in
,
file
.
length
(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"
,
file
.
getName
(),
storageService
.
generateKey
(
file
.
getName
())));
return
ResponseUtil
.
ok
(
storageService
.
store
(
in
,
file
.
length
(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
,
StrUtil
.
format
(
"学生成绩-{}.xlsx"
,
System
.
currentTimeMillis
()),
storageService
.
generateKey
(
file
.
getName
())));
}
catch
(
FileNotFoundException
e
)
{
throw
new
RuntimeException
(
e
);
...
...
server-wx-api/src/main/java/cn/exploring/engine/server/wx/web/WxStorageController.java
View file @
199b4c30
...
...
@@ -174,7 +174,7 @@ public class WxStorageController {
}
String
type
=
storage
.
getType
();
if
(
type
.
equals
(
"application/x-zip-compressed"
)){
if
(
type
.
equals
(
"application/x-zip-compressed"
)
||
type
.
equals
(
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
)
){
MediaType
mediaType
=
MediaType
.
parseMediaType
(
type
);
Resource
file
=
storageService
.
loadAsResource
(
key
);
if
(
file
==
null
)
{
...
...
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