修改bug

master
whb 8 months ago
parent e93a4865f4
commit d61d1433b7

@ -386,14 +386,17 @@ public class StuJupyterController {
@AnonymousAccess @AnonymousAccess
public ResultEntity importHtml(@ApiParam("案例名") String caseName,@RequestPart MultipartFile file) { public ResultEntity importHtml(@ApiParam("案例名") String caseName,@RequestPart MultipartFile file) {
String originalFilename = file.getOriginalFilename();
int i = originalFilename.lastIndexOf("."); String replace = file.getOriginalFilename().replace(".ipynb", ".html");
String substring = originalFilename.substring(i+1); int i = replace.lastIndexOf(".");
String substring = replace.substring(i+1);
if ("html".equals(substring)) { if ("html".equals(substring)) {
String htmlPath = "/usr/local/tianzeProject/jupyter/md/html"; String htmlPath = "/usr/local/tianzeProject/jupyter/md/html";
//String htmlPath = "D:\\home\\"; //String htmlPath = "D:\\home\\";
System.out.println("文件上传:"+substring);
String upload = localFileUtil.uploadByRelativePath(file, htmlPath,caseName); String upload = localFileUtil.uploadByRelativePath(file, htmlPath,caseName);
if (upload != null) { if (upload != null) {

@ -178,21 +178,23 @@ public class LocalFileUtil implements IFileUtil{
public String uploadByRelativePath(MultipartFile file, String relativePath,String caseName) { public String uploadByRelativePath(MultipartFile file, String relativePath,String caseName) {
Assert.isTrue(!file.isEmpty(), "文件不存在"); Assert.isTrue(!file.isEmpty(), "文件不存在");
System.out.println("文件不存在!");
try { try {
// 创建目录如果不存在 // 创建目录如果不存在
File directory = new File(relativePath); File directory = new File(relativePath);
if (!directory.exists()) { if (!directory.exists()) {
directory.mkdirs(); directory.mkdirs();
} }
System.out.println("1");
// 设置目标文件路径 // 设置目标文件路径
String result = caseName == null ? file.getOriginalFilename() : caseName; String result = caseName == null ? file.getOriginalFilename() : caseName;
System.out.println("2");
int i = file.getOriginalFilename().lastIndexOf("."); int i = file.getOriginalFilename().lastIndexOf(".");
System.out.println("3");
String substring = file.getOriginalFilename().substring(i); String substring = file.getOriginalFilename().substring(i);
System.out.println("4");
File destFile = new File(relativePath + File.separator + result+substring); File destFile = new File(relativePath + File.separator + result+substring);
System.out.println("5");
file.transferTo(destFile); file.transferTo(destFile);
return "上传成功!"; return "上传成功!";
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {

Loading…
Cancel
Save