|
@@ -77,7 +77,7 @@ public class FileStorageController {
|
|
|
|
|
|
@RequestMapping(value = "/fileStorage/getUeconfig")
|
|
|
@ResponseBody
|
|
|
- public void ueditor(HttpServletResponse response) {
|
|
|
+ public String ueditor(HttpServletResponse response) {
|
|
|
InputStream is = null;
|
|
|
response.setHeader("Content-Type", "text/html");
|
|
|
try {
|
|
@@ -90,9 +90,10 @@ public class FileStorageController {
|
|
|
}
|
|
|
String result = sb.toString().replaceAll("/\\*(.|[\\r\\n])*?\\*/", "");
|
|
|
JSONObject json = JSON.parseObject(result);
|
|
|
- System.out.println(json.toJSONString());
|
|
|
- PrintWriter out = response.getWriter();
|
|
|
- out.print(json.toString());
|
|
|
+ return json.toJSONString();
|
|
|
+// System.out.println(json.toJSONString());
|
|
|
+// PrintWriter out = response.getWriter();
|
|
|
+// out.print(json.toString());
|
|
|
} catch (IOException e) {
|
|
|
e.printStackTrace();
|
|
|
} finally {
|
|
@@ -102,7 +103,7 @@ public class FileStorageController {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
}
|
|
|
- // return result;
|
|
|
+ return null;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -310,6 +311,7 @@ public class FileStorageController {
|
|
|
|
|
|
/**
|
|
|
* 文件下载(预览)
|
|
|
+ *
|
|
|
* @param absolutePath 文件路径
|
|
|
* @param response
|
|
|
*/
|