diff --git a/flossom-modules/flossom-file/src/main/java/com/flossom/file/controller/SysFileController.java b/flossom-modules/flossom-file/src/main/java/com/flossom/file/controller/SysFileController.java index 4fc3902..50124c6 100644 --- a/flossom-modules/flossom-file/src/main/java/com/flossom/file/controller/SysFileController.java +++ b/flossom-modules/flossom-file/src/main/java/com/flossom/file/controller/SysFileController.java @@ -33,6 +33,7 @@ public class SysFileController try { // 上传并返回访问地址 + System.out.println("文件上传开始"); String url = sysFileService.uploadFile(file); SysFile sysFile = new SysFile(); sysFile.setName(FileUtils.getName(url)); diff --git a/flossom-modules/flossom-file/src/main/resources/bootstrap.yml b/flossom-modules/flossom-file/src/main/resources/bootstrap.yml index 9a6abbe..cf150ba 100644 --- a/flossom-modules/flossom-file/src/main/resources/bootstrap.yml +++ b/flossom-modules/flossom-file/src/main/resources/bootstrap.yml @@ -23,3 +23,8 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + servlet: + multipart: + enabled: true #默认支持文件上传 + max-file-size: 50MB #最大文件 + max-request-size: 30MB #最大支持请求大小 diff --git a/flossom-ui/src/views/system/companyTag/index.vue b/flossom-ui/src/views/system/companyTag/index.vue index f891365..9429acd 100644 --- a/flossom-ui/src/views/system/companyTag/index.vue +++ b/flossom-ui/src/views/system/companyTag/index.vue @@ -185,6 +185,7 @@ export default { refreshTable: true, // 查询参数 queryParams: { + type: 2, tagName: undefined, status: undefined }, diff --git a/flossom-ui/src/views/system/firing/index.vue b/flossom-ui/src/views/system/firing/index.vue index 477f970..98cdf5f 100644 --- a/flossom-ui/src/views/system/firing/index.vue +++ b/flossom-ui/src/views/system/firing/index.vue @@ -1,132 +1,101 @@ diff --git a/flossom-ui/src/views/system/setting/index.vue b/flossom-ui/src/views/system/setting/index.vue index 01cefd8..1551ece 100644 --- a/flossom-ui/src/views/system/setting/index.vue +++ b/flossom-ui/src/views/system/setting/index.vue @@ -66,7 +66,7 @@