Browse Source

修正注释

tags/v3.0.0
RuoYi 4 years ago
parent
commit
4dc51fae53
  1. 2
      ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
  2. 1
      ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java
  3. 1
      ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java
  4. 11
      ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
  5. 4
      ruoyi-ui/src/api/login.js
  6. 1
      ruoyi-ui/src/views/index.vue

2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java

@ -8,7 +8,7 @@ import io.minio.MinioClient; @@ -8,7 +8,7 @@ import io.minio.MinioClient;
/**
* Minio 配置信息
*
* @author ruoiy
* @author ruoyi
*/
@Configuration
@ConfigurationProperties(prefix = "minio")

1
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java

@ -40,6 +40,7 @@ public class LocalSysFileServiceImpl implements ISysFileService @@ -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);

1
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java

@ -29,6 +29,7 @@ public class MinioSysFileServiceImpl implements ISysFileService @@ -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);

11
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java

@ -54,7 +54,7 @@ public class FileUploadUtils @@ -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 @@ -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 @@ -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)
{

4
ruoyi-ui/src/api/login.js

@ -1,9 +1,5 @@ @@ -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({

1
ruoyi-ui/src/views/index.vue

@ -154,7 +154,6 @@ @@ -154,7 +154,6 @@
<li>增加分布式事务seata支持</li>
<li>代码生成模板支持主子表</li>
<li>表格右侧工具栏组件支持显隐列</li>
<li>代码生成支持文件上传组件</li>
<li>图片组件添加预览&移除功能</li>
<li>Excel注解支持Image图片导出</li>
<li>操作按钮组调整为朴素按钮样式</li>

Loading…
Cancel
Save