From 8a02ee844e93ab496ddfbdb843ba5ff362ba5484 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Sat, 28 Jan 2023 16:01:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA=E5=A4=9A?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80=20oss=202023=E5=B9=B41=E6=9C=8828=E6=97=A5?=
 =?UTF-8?q?=20=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/oss/controller/SysOssController.java     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/oss/controller/SysOssController.java b/src/main/java/com/gaotao/modules/oss/controller/SysOssController.java
index dbe18bb..3f3de08 100644
--- a/src/main/java/com/gaotao/modules/oss/controller/SysOssController.java
+++ b/src/main/java/com/gaotao/modules/oss/controller/SysOssController.java
@@ -2,6 +2,7 @@
 
 package com.gaotao.modules.oss.controller;
 
+import com.gaotao.common.constant.SysMsgConstant;
 import com.gaotao.common.exception.XJException;
 import com.gaotao.common.utils.ConfigConstant;
 import com.gaotao.common.utils.Constant;
@@ -16,6 +17,7 @@ import com.gaotao.modules.oss.cloud.OSSFactory;
 import com.gaotao.modules.oss.entity.SysOssEntity;
 import com.gaotao.modules.oss.service.SysOssService;
 import com.gaotao.modules.oss.vo.SysOssEntityData;
+import com.gaotao.modules.sys.controller.AbstractController;
 import com.gaotao.modules.sys.service.SysConfigService;
 import com.google.gson.Gson;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -35,7 +37,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("sys/oss")
-public class SysOssController {
+public class SysOssController extends AbstractController {
 	@Autowired
 	private SysOssService sysOssService;
     @Autowired
@@ -89,7 +91,7 @@ public class SysOssController {
 
         sysConfigService.updateValueByKey(KEY, new Gson().toJson(config));
 
-		return R.ok();
+		return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
 	}
 	
 
@@ -100,7 +102,7 @@ public class SysOssController {
 	@RequiresPermissions("sys:oss:all")
 	public R upload(@RequestParam("file") MultipartFile file) throws Exception {
 		if (file.isEmpty()) {
-			throw new XJException("上传文件不能为空");
+			throw new XJException(getLanguageMsg(SysMsgConstant.OBJECT_ID_200126));
 		}
 
 		//上传文件
@@ -125,7 +127,7 @@ public class SysOssController {
 	public R delete(@RequestBody Long[] ids){
 		sysOssService.removeByIds(Arrays.asList(ids));
 
-		return R.ok();
+		return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
 	}
 
 
@@ -156,7 +158,7 @@ public class SysOssController {
 	@PostMapping("/updateOssRef")
 	public R updateOssRef(@RequestBody SysOssEntity sysOssEntity){
 		sysOssService.updateOssRef(sysOssEntity);
-		return R.ok();
+		return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
 	}
 
 }