From 4dc51fae53f098f139a78b85674f96e27609bdee Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 23 Feb 2021 10:27:54 +0800
Subject: [PATCH] 修正注释
---
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java | 2 +-
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java | 11 +++++------
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java | 1 +
ruoyi-ui/src/api/login.js | 4 ----
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java | 1 +
ruoyi-ui/src/views/index.vue | 1 -
6 files changed, 8 insertions(+), 12 deletions(-)
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 57826e3..ee3e14c 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 @@
/**
* 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 f416f98..c0e2068 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 @@
* @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 4a6f208..3dd2fc6 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 @@
* @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 a49168c..02eb1cd 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 @@
*
* @param baseDir 相对应用的基目录
* @param file 上传的文件
- * @param extension 上传文件类型
+ * @param allowedExtension 上传文件类型
* @return 返回上传成功的文件名
* @throws FileSizeLimitExceededException 如果超出最大大小
* @throws FileNameLengthLimitExceededException 文件名太长
@@ -116,9 +116,8 @@
* 文件大小校验
*
* @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 @@
/**
* 判断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 8b39686..4e9da7f 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 3a7ae54..a99504e 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -154,7 +154,6 @@
<li>增加分布式事务seata支持</li>
<li>代码生成模板支持主子表</li>
<li>表格右侧工具栏组件支持显隐列</li>
- <li>代码生成支持文件上传组件</li>
<li>图片组件添加预览&移除功能</li>
<li>Excel注解支持Image图片导出</li>
<li>操作按钮组调整为朴素按钮样式</li>
--
Gitblit v1.9.3