|
|
@@ -131,10 +131,16 @@ public class FileController {
|
|
|
@GetMapping("/review")
|
|
|
public String reviewDocFile(@RequestParam(required = false) String bucket,
|
|
|
@RequestParam(required = false) String title,
|
|
|
- @RequestParam String name,
|
|
|
+ @RequestParam(required = false) String url,
|
|
|
+ @RequestParam(required = false) String name,
|
|
|
@RequestParam String userId,
|
|
|
@RequestParam String userName,
|
|
|
Model model) {
|
|
|
+ if (StrUtil.isNotBlank(url)) {
|
|
|
+ name = url.substring(url.lastIndexOf('/') + 1);
|
|
|
+ bucket = url.replace("/admin/sys-file/", "").substring(0, url.indexOf('/'));
|
|
|
+ }
|
|
|
+
|
|
|
log.info("==> 预览文档 bucket: {}, name: {}", bucket, name);
|
|
|
|
|
|
Pair<Document, DocumentEditParam> pair = docPair(bucket, title, name, userId, userName);
|
|
|
@@ -192,11 +198,12 @@ public class FileController {
|
|
|
@GetMapping("/reviewExcel")
|
|
|
public String reviewExcel(@RequestParam(required = false) String bucket,
|
|
|
@RequestParam(required = false) String title,
|
|
|
- @RequestParam String name,
|
|
|
+ @RequestParam(required = false) String url,
|
|
|
+ @RequestParam(required = false) String name,
|
|
|
String userId,
|
|
|
String userName,
|
|
|
Model model) {
|
|
|
- return reviewDocFile(bucket, title, name, userName, userId, model);
|
|
|
+ return reviewDocFile(bucket, title, url, name, userName, userId, model);
|
|
|
}
|
|
|
|
|
|
@GetMapping("/edit")
|