diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysFileUploadController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysFileUploadController.java
index 2745957c1..ece6a3285 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysFileUploadController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysFileUploadController.java
@@ -42,6 +42,7 @@ public class SysFileUploadController extends BaseController {
if (StringUtils.isNotEmpty(fileUrl)) {
ajax = AjaxResult.success();
ajax.put("fileUrl", fileUrl);
+ ajax.put("previewUrl", AliyunOSSUtils.generatePresignedUrl(fileUrl));
ajax.put("fileName", file.getOriginalFilename());
} else {
ajax = AjaxResult.error("文件上传失败");
diff --git a/stdiet-ui/src/views/custom/ingredient/index.vue b/stdiet-ui/src/views/custom/ingredient/index.vue
index 8e1b1c590..a191c825d 100644
--- a/stdiet-ui/src/views/custom/ingredient/index.vue
+++ b/stdiet-ui/src/views/custom/ingredient/index.vue
@@ -357,7 +357,9 @@
将文件拖到此处,或
点击上传
-
最多可上传5个文件,且每个文件不超过10M
+
+ 最多可上传5个文件,且每个文件不超过10M
+
@@ -598,8 +600,18 @@ export default {
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
- if (this.form.id != null) {
- updateIngredient(this.form).then((response) => {
+ const params = JSON.parse(JSON.stringify(this.form));
+ params.imgList = params.imgList.reduce((arr, cur) => {
+ if (cur.url) {
+ arr.push({
+ url: cur.url.substring(0, cur.url.indexOf("?")),
+ name: cur.name,
+ });
+ }
+ return arr;
+ }, []);
+ if (params.id != null) {
+ updateIngredient(params).then((response) => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
@@ -607,7 +619,7 @@ export default {
}
});
} else {
- addIngredient(this.form).then((response) => {
+ addIngredient(params).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
@@ -658,7 +670,7 @@ export default {
this.form.imgList = fileList.map((data) => {
const { name, url, response } = data;
if (response) {
- return { url: response.fileUrl, name: response.fileName };
+ return { url: response.previewUrl, name: response.fileName };
}
return { url, name };
});