Commit 10f0d6a1 by 邓实川 Committed by chenzg

改回避免冲突

parent 9dc42da8
...@@ -511,9 +511,6 @@ public class QyzxController { ...@@ -511,9 +511,6 @@ public class QyzxController {
*/ */
// 下载系统使用手册 直接提供(OSS公共读权限文件)url地址到前端按钮 // 下载系统使用手册 直接提供(OSS公共读权限文件)url地址到前端按钮
@Autowired
OSSUtil oss;
/** /**
* 意见反馈 * 意见反馈
*/ */
...@@ -531,7 +528,7 @@ public class QyzxController { ...@@ -531,7 +528,7 @@ public class QyzxController {
return ResultUtil.error("上传的文件为空,请重新选择!"); return ResultUtil.error("上传的文件为空,请重新选择!");
} else { } else {
try { try {
url = oss.uploadFile(path, file.getInputStream()); url = OSSUtil.uploadFile(path, file.getInputStream());
list.add(url); list.add(url);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment