diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java index 57826e3e..ee3e14c2 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java @@ -8,7 +8,7 @@ import io.minio.MinioClient; /** * Minio 配置信息 * - * @author ruoiy + * @author ruoyi */ @Configuration @ConfigurationProperties(prefix = "minio") diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java index f416f98d..c0e20681 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java @@ -40,6 +40,7 @@ public class LocalSysFileServiceImpl implements ISysFileService * @return 访问地址 * @throws Exception */ + @Override public String uploadFile(MultipartFile file) throws Exception { String name = FileUploadUtils.upload(localFilePath, file); diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java index 4a6f2081..3dd2fc6f 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java @@ -29,6 +29,7 @@ public class MinioSysFileServiceImpl implements ISysFileService * @return 访问地址 * @throws Exception */ + @Override public String uploadFile(MultipartFile file) throws Exception { String fileName = FileUploadUtils.extractFilename(file); diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java index a49168c2..02eb1cd2 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java @@ -54,7 +54,7 @@ public class FileUploadUtils * * @param baseDir 相对应用的基目录 * @param file 上传的文件 - * @param extension 上传文件类型 + * @param allowedExtension 上传文件类型 * @return 返回上传成功的文件名 * @throws FileSizeLimitExceededException 如果超出最大大小 * @throws FileNameLengthLimitExceededException 文件名太长 @@ -116,9 +116,8 @@ public class FileUploadUtils * 文件大小校验 * * @param file 上传的文件 - * @return * @throws FileSizeLimitExceededException 如果超出最大大小 - * @throws InvalidExtensionException + * @throws InvalidExtensionException 文件校验异常 */ public static final void assertAllowed(MultipartFile file, String[] allowedExtension) throws FileSizeLimitExceededException, InvalidExtensionException @@ -163,9 +162,9 @@ public class FileUploadUtils /** * 判断MIME类型是否是允许的MIME类型 * - * @param extension - * @param allowedExtension - * @return + * @param extension 上传文件类型 + * @param allowedExtension 允许上传文件类型 + * @return true/false */ public static final boolean isAllowedExtension(String extension, String[] allowedExtension) { diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js index 8b396863..4e9da7f4 100644 --- a/ruoyi-ui/src/api/login.js +++ b/ruoyi-ui/src/api/login.js @@ -1,9 +1,5 @@ import request from '@/utils/request' -const client_id = 'web' -const client_secret = '123456' -const scope = 'server' - // 登录方法 export function login(username, password, code, uuid) { return request({ diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 3a7ae543..a99504ec 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -154,7 +154,6 @@