ak/file
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!138 代码合并

Browse Source 
Merge pull request !138 from MAC/develop
This commit is contained in:
MAC 2023-03-07 09:15:54 +00:00 committed by Gitee
commit 1cef332702
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/qiwenshare/file/controller/OfficeController.java
View File

@ -94,7 +94,8 @@ public class OfficeController {
public RestResult<Object> previewOfficeFile(HttpServletRequest request, @RequestBody PreviewOfficeFileDTO previewOfficeFileDTO) { public RestResult<Object> previewOfficeFile(HttpServletRequest request, @RequestBody PreviewOfficeFileDTO previewOfficeFileDTO) {
RestResult<Object> result = new RestResult<>(); RestResult<Object> result = new RestResult<>();
try { try {
String token = request.getHeader("token");
String previewUrl = request.getScheme() + "://" + deploymentHost + ":" + port + "/filetransfer/preview?userFileId=" + previewOfficeFileDTO.getUserFileId() + "&isMin=false&shareBatchNum=undefined&extractionCode=undefined&token=" + token;
JwtUser loginUser = SessionUtil.getSession(); JwtUser loginUser = SessionUtil.getSession();
UserFile userFile = userFileService.getById(previewOfficeFileDTO.getUserFileId()); UserFile userFile = userFileService.getById(previewOfficeFileDTO.getUserFileId());
@ -114,7 +115,7 @@ public class OfficeController {
.lang(locale.toLanguageTag()) .lang(locale.toLanguageTag())
.action(action) .action(action)
.user(user) .user(user)
.actionData(previewOfficeFileDTO.getPreviewUrl()) .actionData(previewUrl)
.build() .build()
); );
@ -138,6 +139,8 @@ public class OfficeController {
@RequestMapping(value = "/editofficefile", method = RequestMethod.POST) @RequestMapping(value = "/editofficefile", method = RequestMethod.POST)
public RestResult<Object> editOfficeFile(HttpServletRequest request, @RequestBody EditOfficeFileDTO editOfficeFileDTO) { public RestResult<Object> editOfficeFile(HttpServletRequest request, @RequestBody EditOfficeFileDTO editOfficeFileDTO) {
RestResult<Object> result = new RestResult<>(); RestResult<Object> result = new RestResult<>();
String token = request.getHeader("token");
String previewUrl = request.getScheme() + "://" + deploymentHost + ":" + port + "/filetransfer/preview?userFileId=" + editOfficeFileDTO.getUserFileId() + "&isMin=false&shareBatchNum=undefined&extractionCode=undefined&token=" + token;
log.info("editOfficeFile"); log.info("editOfficeFile");
try { try {
JwtUser loginUser = SessionUtil.getSession(); JwtUser loginUser = SessionUtil.getSession();
@ -158,7 +161,7 @@ public class OfficeController {
.lang(locale.toLanguageTag()) .lang(locale.toLanguageTag())
.action(action) .action(action)
.user(user) .user(user)
.actionData(editOfficeFileDTO.getPreviewUrl()) .actionData(previewUrl)
.build() .build()
); );
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();