From c1c6c1cf3076d0e6dae9f15cc77ece4f42add618 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 10 九月 2021 10:51:40 +0800 Subject: [PATCH] update 将所有 云存储字样 改为 对象存储 避免误解 --- ruoyi-ui/src/api/system/oss.js | 4 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java | 2 ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java | 2 ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractCloudStorageStrategy.java | 2 ruoyi-ui/src/api/system/ossConfig.js | 10 +- ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java | 4 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java | 10 +- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java | 2 ruoyi-ui/src/views/system/oss/index.vue | 10 +- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java | 32 +++++----- ruoyi-oss/src/main/java/com/ruoyi/oss/constant/CloudConstant.java | 4 ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java | 2 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java | 2 sql/oss.sql | 10 +- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java | 22 +++--- ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java | 4 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java | 4 ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java | 4 ruoyi-oss/src/main/java/com/ruoyi/oss/service/ICloudStorageStrategy.java | 2 ruoyi-ui/src/views/system/oss/config.vue | 14 ++-- ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java | 8 +- 21 files changed, 77 insertions(+), 77 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java index 55f25df..e72bd1f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java @@ -25,14 +25,14 @@ import java.util.Arrays; /** - * 浜戝瓨鍌ㄩ厤缃瓹ontroller + * 瀵硅薄瀛樺偍閰嶇疆Controller * * @author Lion Li * @author 瀛よ垷鐑熼洦 * @date 2021-08-13 */ @Validated -@Api(value = "浜戝瓨鍌ㄩ厤缃帶鍒跺櫒", tags = {"浜戝瓨鍌ㄩ厤缃鐞�"}) +@Api(value = "瀵硅薄瀛樺偍閰嶇疆鎺у埗鍣�", tags = {"瀵硅薄瀛樺偍閰嶇疆绠$悊"}) @RequiredArgsConstructor(onConstructor_ = @Autowired) @RestController @RequestMapping("/system/oss/config") @@ -41,9 +41,9 @@ private final ISysOssConfigService iSysOssConfigService; /** - * 鏌ヨ浜戝瓨鍌ㄩ厤缃垪琛� + * 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃 */ - @ApiOperation("鏌ヨ浜戝瓨鍌ㄩ厤缃垪琛�") + @ApiOperation("鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃") @PreAuthorize("@ss.hasPermi('system:oss:list')") @GetMapping("/list") public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo) { @@ -51,9 +51,9 @@ } /** - * 鑾峰彇浜戝瓨鍌ㄩ厤缃缁嗕俊鎭� + * 鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅 */ - @ApiOperation("鑾峰彇浜戝瓨鍌ㄩ厤缃缁嗕俊鎭�") + @ApiOperation("鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅") @PreAuthorize("@ss.hasPermi('system:oss:query')") @GetMapping("/{ossConfigId}") public AjaxResult<SysOssConfigVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖") @@ -62,11 +62,11 @@ } /** - * 鏂板浜戝瓨鍌ㄩ厤缃� + * 鏂板瀵硅薄瀛樺偍閰嶇疆 */ - @ApiOperation("鏂板浜戝瓨鍌ㄩ厤缃�") + @ApiOperation("鏂板瀵硅薄瀛樺偍閰嶇疆") @PreAuthorize("@ss.hasPermi('system:oss:add')") - @Log(title = "浜戝瓨鍌ㄩ厤缃�", businessType = BusinessType.INSERT) + @Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) { @@ -74,11 +74,11 @@ } /** - * 淇敼浜戝瓨鍌ㄩ厤缃� + * 淇敼瀵硅薄瀛樺偍閰嶇疆 */ - @ApiOperation("淇敼浜戝瓨鍌ㄩ厤缃�") + @ApiOperation("淇敼瀵硅薄瀛樺偍閰嶇疆") @PreAuthorize("@ss.hasPermi('system:oss:edit')") - @Log(title = "浜戝瓨鍌ㄩ厤缃�", businessType = BusinessType.UPDATE) + @Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) { @@ -86,11 +86,11 @@ } /** - * 鍒犻櫎浜戝瓨鍌ㄩ厤缃� + * 鍒犻櫎瀵硅薄瀛樺偍閰嶇疆 */ - @ApiOperation("鍒犻櫎浜戝瓨鍌ㄩ厤缃�") + @ApiOperation("鍒犻櫎瀵硅薄瀛樺偍閰嶇疆") @PreAuthorize("@ss.hasPermi('system:oss:remove')") - @Log(title = "浜戝瓨鍌ㄩ厤缃�", businessType = BusinessType.DELETE) + @Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.DELETE) @DeleteMapping("/{ossConfigIds}") public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖") @PathVariable Long[] ossConfigIds) { @@ -101,7 +101,7 @@ * 鐘舵�佷慨鏀� */ @PreAuthorize("@ss.hasPermi('system:oss:edit')") - @Log(title = "浜戝瓨鍌ㄧ姸鎬佷慨鏀�", businessType = BusinessType.UPDATE) + @Log(title = "瀵硅薄瀛樺偍鐘舵�佷慨鏀�", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public AjaxResult changeStatus(@RequestBody SysOssConfigBo bo) { return toAjax(iSysOssConfigService.updateOssConfigStatus(bo)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java index ff37991..47e9032 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java @@ -49,7 +49,7 @@ * @author Lion Li */ @Validated -@Api(value = "OSS浜戝瓨鍌ㄦ帶鍒跺櫒", tags = {"OSS浜戝瓨鍌ㄧ鐞�"}) +@Api(value = "OSS瀵硅薄瀛樺偍鎺у埗鍣�", tags = {"OSS瀵硅薄瀛樺偍绠$悊"}) @RequiredArgsConstructor(onConstructor_ = @Autowired) @RestController @RequestMapping("/system/oss") @@ -59,9 +59,9 @@ private final ISysConfigService iSysConfigService; /** - * 鏌ヨOSS浜戝瓨鍌ㄥ垪琛� + * 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃 */ - @ApiOperation("鏌ヨOSS浜戝瓨鍌ㄥ垪琛�") + @ApiOperation("鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃") @PreAuthorize("@ss.hasPermi('system:oss:list')") @GetMapping("/list") public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo) { @@ -69,14 +69,14 @@ } /** - * 涓婁紶OSS浜戝瓨鍌� + * 涓婁紶OSS瀵硅薄瀛樺偍 */ - @ApiOperation("涓婁紶OSS浜戝瓨鍌�") + @ApiOperation("涓婁紶OSS瀵硅薄瀛樺偍") @ApiImplicitParams({ @ApiImplicitParam(name = "file", value = "鏂囦欢", dataType = "java.io.File", required = true), }) @PreAuthorize("@ss.hasPermi('system:oss:upload')") - @Log(title = "OSS浜戝瓨鍌�", businessType = BusinessType.INSERT) + @Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.INSERT) @RepeatSubmit @PostMapping("/upload") public AjaxResult<Map<String, String>> upload(@RequestPart("file") MultipartFile file) { @@ -90,7 +90,7 @@ return AjaxResult.success(map); } - @ApiOperation("涓嬭浇OSS浜戝瓨鍌�") + @ApiOperation("涓嬭浇OSS瀵硅薄瀛樺偍") @PreAuthorize("@ss.hasPermi('system:oss:download')") @GetMapping("/download/{ossId}") public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException { @@ -108,11 +108,11 @@ } /** - * 鍒犻櫎OSS浜戝瓨鍌� + * 鍒犻櫎OSS瀵硅薄瀛樺偍 */ - @ApiOperation("鍒犻櫎OSS浜戝瓨鍌�") + @ApiOperation("鍒犻櫎OSS瀵硅薄瀛樺偍") @PreAuthorize("@ss.hasPermi('system:oss:remove')") - @Log(title = "OSS浜戝瓨鍌�" , businessType = BusinessType.DELETE) + @Log(title = "OSS瀵硅薄瀛樺偍" , businessType = BusinessType.DELETE) @DeleteMapping("/{ossIds}") public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖") @PathVariable Long[] ossIds) { @@ -124,7 +124,7 @@ */ @ApiOperation("鍙樻洿鍥剧墖鍒楄〃棰勮鐘舵��") @PreAuthorize("@ss.hasPermi('system:oss:edit')") - @Log(title = "OSS浜戝瓨鍌�" , businessType = BusinessType.UPDATE) + @Log(title = "OSS瀵硅薄瀛樺偍" , businessType = BusinessType.UPDATE) @PutMapping("/changePreviewListResource") public AjaxResult<Void> changePreviewListResource(@RequestBody String body) { Map<String, Boolean> map = JsonUtils.parseMap(body); diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/CloudConstant.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/CloudConstant.java index ab7c096..7bba1f4 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/CloudConstant.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/CloudConstant.java @@ -4,7 +4,7 @@ import java.util.List; /** - * 浜戝瓨鍌ㄥ父閲� + * 瀵硅薄瀛樺偍甯搁噺 * * @author Lion Li */ @@ -16,7 +16,7 @@ public static final String SYS_OSS_KEY = "sys_oss:"; /** - * 浜戝瓨鍌ㄩ厤缃甂EY + * 瀵硅薄瀛樺偍閰嶇疆KEY */ public static final String CLOUD_STORAGE_CONFIG_KEY = "CloudStorageConfig"; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java index 11a571c..ac8ad81 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java @@ -9,7 +9,7 @@ import lombok.Getter; /** - * 浜戝瓨鍌ㄦ湇鍔″晢鏋氫妇 + * 瀵硅薄瀛樺偍鏈嶅姟鍟嗘灇涓� * * @author Lion Li */ diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java index 1c62ae2..9d3f15a 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java @@ -5,7 +5,7 @@ import java.util.Date; /** - * OSS浜戝瓨鍌� 閰嶇疆灞炴�� + * OSS瀵硅薄瀛樺偍 閰嶇疆灞炴�� * * @author Lion Li */ diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/ICloudStorageStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/ICloudStorageStrategy.java index f91fc7a..96ea539 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/ICloudStorageStrategy.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/ICloudStorageStrategy.java @@ -5,7 +5,7 @@ import java.io.InputStream; /** - * 浜戝瓨鍌ㄧ瓥鐣� + * 瀵硅薄瀛樺偍绛栫暐 * * @author Lion Li */ diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractCloudStorageStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractCloudStorageStrategy.java index 1d7060f..8f5e962 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractCloudStorageStrategy.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractCloudStorageStrategy.java @@ -11,7 +11,7 @@ import java.io.InputStream; /** - * 浜戝瓨鍌ㄧ瓥鐣�(鏀寔涓冪墰銆侀樋閲屼簯銆佽吘璁簯銆乵inio) + * 瀵硅薄瀛樺偍绛栫暐(鏀寔涓冪墰銆侀樋閲屼簯銆佽吘璁簯銆乵inio) * * @author Lion Li */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java index 7b7639c..d090c92 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java @@ -9,7 +9,7 @@ import java.util.Date; /** - * OSS浜戝瓨鍌ㄥ璞� + * OSS瀵硅薄瀛樺偍瀵硅薄 * * @author Lion Li */ @@ -23,7 +23,7 @@ /** - * 浜戝瓨鍌ㄤ富閿� + * 瀵硅薄瀛樺偍涓婚敭 */ @TableId(value = "oss_id", type = IdType.AUTO) private Long ossId; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java index 9f0e28e..3a6fb83 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java @@ -9,7 +9,7 @@ import java.math.BigDecimal; /** - * 浜戝瓨鍌ㄩ厤缃璞� sys_oss_config + * 瀵硅薄瀛樺偍閰嶇疆瀵硅薄 sys_oss_config * * @author ruoyi * @date 2021-08-11 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java index a30ff32..e41f94f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java @@ -7,13 +7,13 @@ import lombok.EqualsAndHashCode; /** - * OSS浜戝瓨鍌ㄥ垎椤垫煡璇㈠璞� sys_oss + * OSS瀵硅薄瀛樺偍鍒嗛〉鏌ヨ瀵硅薄 sys_oss * * @author Lion Li */ @Data @EqualsAndHashCode(callSuper = true) -@ApiModel("OSS浜戝瓨鍌ㄥ垎椤垫煡璇㈠璞�") +@ApiModel("OSS瀵硅薄瀛樺偍鍒嗛〉鏌ヨ瀵硅薄") public class SysOssBo extends BaseEntity { /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java index 3e8defc..44bc7a2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java @@ -13,7 +13,7 @@ import javax.validation.constraints.Size; /** - * 浜戝瓨鍌ㄩ厤缃笟鍔″璞� sys_oss_config + * 瀵硅薄瀛樺偍閰嶇疆涓氬姟瀵硅薄 sys_oss_config * * @author Lion Li * @author 瀛よ垷鐑熼洦 @@ -22,7 +22,7 @@ @Data @EqualsAndHashCode(callSuper = true) -@ApiModel("浜戝瓨鍌ㄩ厤缃笟鍔″璞�") +@ApiModel("瀵硅薄瀛樺偍閰嶇疆涓氬姟瀵硅薄") public class SysOssConfigBo extends BaseEntity { /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java index 58e3900..79b2b17 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java @@ -8,14 +8,14 @@ /** - * 浜戝瓨鍌ㄩ厤缃鍥惧璞� sys_oss_config + * 瀵硅薄瀛樺偍閰嶇疆瑙嗗浘瀵硅薄 sys_oss_config * * @author Lion Li * @author 瀛よ垷鐑熼洦 * @date 2021-08-13 */ @Data -@ApiModel("浜戝瓨鍌ㄩ厤缃鍥惧璞�") +@ApiModel("瀵硅薄瀛樺偍閰嶇疆瑙嗗浘瀵硅薄") @ExcelIgnoreUnannotated public class SysOssConfigVo { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java index 8bc59b2..26e0151 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java @@ -7,20 +7,20 @@ import java.util.Date; /** - * OSS浜戝瓨鍌ㄨ鍥惧璞� sys_oss + * OSS瀵硅薄瀛樺偍瑙嗗浘瀵硅薄 sys_oss * * @author Lion Li */ @Data -@ApiModel("OSS浜戝瓨鍌ㄨ鍥惧璞�") +@ApiModel("OSS瀵硅薄瀛樺偍瑙嗗浘瀵硅薄") public class SysOssVo { private static final long serialVersionUID = 1L; /** - * 浜戝瓨鍌ㄤ富閿� + * 瀵硅薄瀛樺偍涓婚敭 */ - @ApiModelProperty("浜戝瓨鍌ㄤ富閿�") + @ApiModelProperty("瀵硅薄瀛樺偍涓婚敭") private Long ossId; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java index 9546e73..db63709 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java @@ -4,7 +4,7 @@ import com.ruoyi.system.domain.SysOssConfig; /** - * 浜戝瓨鍌ㄩ厤缃甅apper鎺ュ彛 + * 瀵硅薄瀛樺偍閰嶇疆Mapper鎺ュ彛 * * @author Lion Li * @author 瀛よ垷鐑熼洦 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java index f1ece65..2748078 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java @@ -9,7 +9,7 @@ import java.util.Collection; /** - * 浜戝瓨鍌ㄩ厤缃甋ervice鎺ュ彛 + * 瀵硅薄瀛樺偍閰嶇疆Service鎺ュ彛 * * @author Lion Li * @author 瀛よ垷鐑熼洦 @@ -29,15 +29,15 @@ /** - * 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆浜戝瓨鍌ㄩ厤缃� - * @param bo 浜戝瓨鍌ㄩ厤缃柊澧炰笟鍔″璞� + * 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆瀵硅薄瀛樺偍閰嶇疆 + * @param bo 瀵硅薄瀛樺偍閰嶇疆鏂板涓氬姟瀵硅薄 * @return */ Boolean insertByBo(SysOssConfigBo bo); /** - * 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼浜戝瓨鍌ㄩ厤缃� - * @param bo 浜戝瓨鍌ㄩ厤缃紪杈戜笟鍔″璞� + * 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼瀵硅薄瀛樺偍閰嶇疆 + * @param bo 瀵硅薄瀛樺偍閰嶇疆缂栬緫涓氬姟瀵硅薄 * @return */ Boolean updateByBo(SysOssConfigBo bo); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java index 0b11f83..848f4d6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java @@ -31,7 +31,7 @@ import java.util.List; /** - * 浜戝瓨鍌ㄩ厤缃甋ervice涓氬姟灞傚鐞� + * 瀵硅薄瀛樺偍閰嶇疆Service涓氬姟灞傚鐞� * * @author Lion Li * @author 瀛よ垷鐑熼洦 diff --git a/ruoyi-ui/src/api/system/oss.js b/ruoyi-ui/src/api/system/oss.js index 965f137..b98bd1f 100644 --- a/ruoyi-ui/src/api/system/oss.js +++ b/ruoyi-ui/src/api/system/oss.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 鏌ヨOSS浜戝瓨鍌ㄥ垪琛� +// 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃 export function listOss(query) { return request({ url: '/system/oss/list', @@ -9,7 +9,7 @@ }) } -// 鍒犻櫎OSS浜戝瓨鍌� +// 鍒犻櫎OSS瀵硅薄瀛樺偍 export function delOss(ossId) { return request({ url: '/system/oss/' + ossId, diff --git a/ruoyi-ui/src/api/system/ossConfig.js b/ruoyi-ui/src/api/system/ossConfig.js index 2c6ae0c..175325e 100644 --- a/ruoyi-ui/src/api/system/ossConfig.js +++ b/ruoyi-ui/src/api/system/ossConfig.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 鏌ヨ浜戝瓨鍌ㄩ厤缃垪琛� +// 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃 export function listOssConfig(query) { return request({ url: '/system/oss/config/list', @@ -9,7 +9,7 @@ }) } -// 鏌ヨ浜戝瓨鍌ㄩ厤缃缁� +// 鏌ヨ瀵硅薄瀛樺偍閰嶇疆璇︾粏 export function getOssConfig(ossConfigId) { return request({ url: '/system/oss/config/' + ossConfigId, @@ -17,7 +17,7 @@ }) } -// 鏂板浜戝瓨鍌ㄩ厤缃� +// 鏂板瀵硅薄瀛樺偍閰嶇疆 export function addOssConfig(data) { return request({ url: '/system/oss/config', @@ -26,7 +26,7 @@ }) } -// 淇敼浜戝瓨鍌ㄩ厤缃� +// 淇敼瀵硅薄瀛樺偍閰嶇疆 export function updateOssConfig(data) { return request({ url: '/system/oss/config', @@ -35,7 +35,7 @@ }) } -// 鍒犻櫎浜戝瓨鍌ㄩ厤缃� +// 鍒犻櫎瀵硅薄瀛樺偍閰嶇疆 export function delOssConfig(ossConfigId) { return request({ url: '/system/oss/config/' + ossConfigId, diff --git a/ruoyi-ui/src/views/system/oss/config.vue b/ruoyi-ui/src/views/system/oss/config.vue index 28bdbe5..f3e3340 100644 --- a/ruoyi-ui/src/views/system/oss/config.vue +++ b/ruoyi-ui/src/views/system/oss/config.vue @@ -118,7 +118,7 @@ @pagination="getList" /> - <!-- 娣诲姞鎴栦慨鏀逛簯瀛樺偍閰嶇疆瀵硅瘽妗� --> + <!-- 娣诲姞鎴栦慨鏀瑰璞″瓨鍌ㄩ厤缃璇濇 --> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> <el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form-item label="閰嶇疆key" prop="configKey"> @@ -201,7 +201,7 @@ showSearch: true, // 鎬绘潯鏁� total: 0, - // 浜戝瓨鍌ㄩ厤缃〃鏍兼暟鎹� + // 瀵硅薄瀛樺偍閰嶇疆琛ㄦ牸鏁版嵁 ossConfigList: [], // configKeyOptions configKeyOptions: [], @@ -284,7 +284,7 @@ this.configKeyOptions = this.configKeyDatas; }, methods: { - /** 鏌ヨ浜戝瓨鍌ㄩ厤缃垪琛� */ + /** 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃 */ getList() { this.loading = true; listOssConfig(this.queryParams).then((response) => { @@ -335,7 +335,7 @@ handleAdd() { this.reset(); this.open = true; - this.title = "娣诲姞浜戝瓨鍌ㄩ厤缃�"; + this.title = "娣诲姞瀵硅薄瀛樺偍閰嶇疆"; }, /** 淇敼鎸夐挳鎿嶄綔 */ handleUpdate(row) { @@ -346,7 +346,7 @@ this.loading = false; this.form = response.data; this.open = true; - this.title = "淇敼浜戝瓨鍌ㄩ厤缃�"; + this.title = "淇敼瀵硅薄瀛樺偍閰嶇疆"; }); }, /** 鎻愪氦鎸夐挳 */ @@ -377,7 +377,7 @@ /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { const ossConfigIds = row.ossConfigId || this.ids; - this.$confirm('鏄惁纭鍒犻櫎浜戝瓨鍌ㄩ厤缃紪鍙蜂负"' + ossConfigIds + '"鐨勬暟鎹」?', "璀﹀憡", { + this.$confirm('鏄惁纭鍒犻櫎瀵硅薄瀛樺偍閰嶇疆缂栧彿涓�"' + ossConfigIds + '"鐨勬暟鎹」?', "璀﹀憡", { confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", type: "warning" @@ -392,7 +392,7 @@ this.loading = false; }); }, - // 浜戝瓨鍌ㄩ厤缃姸鎬佷慨鏀� + // 瀵硅薄瀛樺偍閰嶇疆鐘舵�佷慨鏀� handleStatusChange(row) { let text = row.status === "0" ? "鍚敤" : "鍋滅敤"; this.$confirm( diff --git a/ruoyi-ui/src/views/system/oss/index.vue b/ruoyi-ui/src/views/system/oss/index.vue index 2bbbba0..b4c5a46 100644 --- a/ruoyi-ui/src/views/system/oss/index.vue +++ b/ruoyi-ui/src/views/system/oss/index.vue @@ -120,7 +120,7 @@ <el-table v-loading="loading" :data="ossList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> - <el-table-column label="浜戝瓨鍌ㄤ富閿�" align="center" prop="ossId" v-if="false"/> + <el-table-column label="瀵硅薄瀛樺偍涓婚敭" align="center" prop="ossId" v-if="false"/> <el-table-column label="鏂囦欢鍚�" align="center" prop="fileName" /> <el-table-column label="鍘熷悕" align="center" prop="originalName" /> <el-table-column label="鏂囦欢鍚庣紑" align="center" prop="fileSuffix" /> @@ -170,7 +170,7 @@ @pagination="getList" /> - <!-- 娣诲姞鎴栦慨鏀筄SS浜戝瓨鍌ㄥ璇濇 --> + <!-- 娣诲姞鎴栦慨鏀筄SS瀵硅薄瀛樺偍瀵硅瘽妗� --> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form-item label="鏂囦欢鍚�"> @@ -210,7 +210,7 @@ showSearch: true, // 鎬绘潯鏁� total: 0, - // OSS浜戝瓨鍌ㄨ〃鏍兼暟鎹� + // OSS瀵硅薄瀛樺偍琛ㄦ牸鏁版嵁 ossList: [], // 寮瑰嚭灞傛爣棰� title: "", @@ -248,7 +248,7 @@ this.getList(); }, methods: { - /** 鏌ヨOSS浜戝瓨鍌ㄥ垪琛� */ + /** 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃 */ getList() { this.loading = true; this.queryParams.params = {}; @@ -330,7 +330,7 @@ /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { const ossIds = row.ossId || this.ids; - this.$confirm('鏄惁纭鍒犻櫎OSS浜戝瓨鍌ㄧ紪鍙蜂负"' + ossIds + '"鐨勬暟鎹」?', "璀﹀憡", { + this.$confirm('鏄惁纭鍒犻櫎OSS瀵硅薄瀛樺偍缂栧彿涓�"' + ossIds + '"鐨勬暟鎹」?', "璀﹀憡", { confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", type: "warning" diff --git a/sql/oss.sql b/sql/oss.sql index 2ecfacf..f6ce8c6 100644 --- a/sql/oss.sql +++ b/sql/oss.sql @@ -1,9 +1,9 @@ -- ---------------------------- --- OSS浜戝瓨鍌ㄨ〃 +-- OSS瀵硅薄瀛樺偍琛� -- ---------------------------- drop table if exists sys_oss; create table sys_oss ( - oss_id bigint(20) not null auto_increment comment '浜戝瓨鍌ㄤ富閿�', + oss_id bigint(20) not null auto_increment comment '瀵硅薄瀛樺偍涓婚敭', file_name varchar(64) not null default '' comment '鏂囦欢鍚�', original_name varchar(64) not null default '' comment '鍘熷悕', file_suffix varchar(10) not null default '' comment '鏂囦欢鍚庣紑鍚�', @@ -14,10 +14,10 @@ update_by varchar(64) default '' comment '鏇存柊浜�', service varchar(10) not null default 'minio' comment '鏈嶅姟鍟�', primary key (oss_id) -) engine=innodb comment ='OSS浜戝瓨鍌ㄨ〃'; +) engine=innodb comment ='OSS瀵硅薄瀛樺偍琛�'; -- ---------------------------- --- OSS浜戝瓨鍌ㄥ姩鎬侀厤缃〃 +-- OSS瀵硅薄瀛樺偍鍔ㄦ�侀厤缃〃 -- ---------------------------- drop table if exists sys_oss_config; create table sys_oss_config ( @@ -38,7 +38,7 @@ update_time datetime default null comment '鏇存柊鏃堕棿', remark varchar(500) default null comment '澶囨敞', primary key (oss_config_id) -) engine=innodb comment='浜戝瓨鍌ㄩ厤缃〃'; +) engine=innodb comment='瀵硅薄瀛樺偍閰嶇疆琛�'; insert into sys_config values(11, 'OSS棰勮鍒楄〃璧勬簮寮�鍏�', 'sys.oss.previewListResource', 'true', 'Y', 'admin', sysdate(), '', null, 'true:寮�鍚�, false:鍏抽棴'); -- Gitblit v1.9.3