Merge branch 'master' into Bulbasaur

2021-05-21 17:25:15 +08:00
parent fa59c9ca73 5cae710304
commit 16498a6850
38 changed files with 422 additions and 242 deletions
--- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java
+++ b/common-api/src/main/java/cn/lili/controller/common/UploadController.java
@@ -63,7 +63,7 @@ public class UploadController {
        if (authUser == null) {
            throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
        }
-        Setting setting = settingService.getById(SettingEnum.OSS_SETTING.name());
+        Setting setting = settingService.get(SettingEnum.OSS_SETTING.name());
        if (setting == null || StrUtil.isBlank(setting.getSettingValue())) {
            throw new ServiceException(ResultCode.OSS_NOT_EXIST);
        }