wenhongquan пре 1 година
родитељ
комит
e1ef91ef08
63 измењених фајлова са 135 додато и 100 уклоњено
  1. 1 1
      pom.xml
  2. 1 1
      ruoyi-admin/pom.xml
  3. 2 0
      ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java
  4. 1 1
      ruoyi-admin/src/main/resources/application-dev.yml
  5. 3 3
      ruoyi-admin/src/main/resources/application.yml
  6. 11 0
      ruoyi-common/ruoyi-common-web/pom.xml
  7. 1 1
      ruoyi-modules/pom.xml
  8. 0 1
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java
  9. 0 1
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/package-info.java
  10. 0 1
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/package-info.java
  11. 0 1
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/package-info.java
  12. 0 1
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/package-info.java
  13. 2 2
      ruoyi-modules/ruoyi-filemanager/pom.xml
  14. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/MailController.java
  15. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/RedisCacheController.java
  16. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/RedisLockController.java
  17. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/RedisPubSubController.java
  18. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/RedisRateLimiterController.java
  19. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/SmsController.java
  20. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/Swagger3DemoController.java
  21. 3 3
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/TestBatchController.java
  22. 6 6
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/TestDemoController.java
  23. 3 3
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/TestEncryptController.java
  24. 4 4
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/TestExcelController.java
  25. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/TestI18nController.java
  26. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/TestSensitiveController.java
  27. 4 4
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/TestTreeController.java
  28. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/WeSocketController.java
  29. 1 0
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/package-info.java
  30. 1 3
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/queue/BoundedQueueController.java
  31. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/queue/DelayedQueueController.java
  32. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/queue/PriorityDemo.java
  33. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/queue/PriorityQueueController.java
  34. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/TestDemo.java
  35. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/TestDemoEncrypt.java
  36. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/TestTree.java
  37. 2 2
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/bo/TestDemoBo.java
  38. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/bo/TestDemoImportVo.java
  39. 2 2
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/bo/TestTreeBo.java
  40. 1 0
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/package-info.java
  41. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/vo/ExportDemoVo.java
  42. 2 2
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/vo/TestDemoVo.java
  43. 2 2
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/vo/TestTreeVo.java
  44. 2 2
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/listener/ExportDemoListener.java
  45. 2 2
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/mapper/TestDemoEncryptMapper.java
  46. 3 4
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/mapper/TestDemoMapper.java
  47. 3 3
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/mapper/TestTreeMapper.java
  48. 1 0
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/mapper/package-info.java
  49. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/IExportExcelService.java
  50. 4 4
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/ITestDemoService.java
  51. 3 3
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/ITestTreeService.java
  52. 3 3
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/impl/ExportExcelServiceImpl.java
  53. 6 6
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/impl/TestDemoServiceImpl.java
  54. 6 6
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/impl/TestTreeServiceImpl.java
  55. 1 0
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/impl/package-info.java
  56. 1 0
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/package-info.java
  57. 25 0
      ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/task/SystemTask.java
  58. 0 0
      ruoyi-modules/ruoyi-filemanager/src/main/resources/excel/单列表.xlsx
  59. 0 0
      ruoyi-modules/ruoyi-filemanager/src/main/resources/excel/多sheet列表.xlsx
  60. 0 0
      ruoyi-modules/ruoyi-filemanager/src/main/resources/excel/多列表.xlsx
  61. 2 2
      ruoyi-modules/ruoyi-filemanager/src/main/resources/mapper/filemanager/TestDemoMapper.xml
  62. 1 1
      ruoyi-modules/ruoyi-filemanager/src/main/resources/mapper/filemanager/TestTreeMapper.xml
  63. 0 0
      ruoyi-modules/ruoyi-filemanager/src/main/resources/mapper/package-info.md

+ 1 - 1
pom.xml

@@ -335,7 +335,7 @@
 
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-demo</artifactId>
+                <artifactId>ruoyi-filemanager</artifactId>
                 <version>${revision}</version>
             </dependency>
 

+ 1 - 1
ruoyi-admin/pom.xml

@@ -72,7 +72,7 @@
         <!--  demo模块  -->
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-demo</artifactId>
+            <artifactId>ruoyi-filemanager</artifactId>
         </dependency>
 
         <dependency>

+ 2 - 0
ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java

@@ -3,6 +3,7 @@ package org.dromara;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * 启动程序
@@ -11,6 +12,7 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
  */
 
 @SpringBootApplication
+@EnableScheduling
 public class DromaraApplication {
 
     public static void main(String[] args) {

+ 1 - 1
ruoyi-admin/src/main/resources/application-dev.yml

@@ -43,7 +43,7 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://localhost:3306/khyznh?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
+          url: jdbc:mysql://localhost:3306/file_manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
           username: root
           password: root
         # 从库数据源

+ 3 - 3
ruoyi-admin/src/main/resources/application.yml

@@ -8,7 +8,7 @@ ruoyi:
   copyrightYear: 2023
 
 captcha:
-  enable: true
+  enable: false
   # 页面 <参数设置> 可开启关闭 验证码校验
   # 验证码类型 math 数组计算 char 字符验证
   type: MATH
@@ -207,8 +207,8 @@ springdoc:
         name: ${sa-token.token-name}
   #这里定义了两个分组,可定义多个,也可以不定义
   group-configs:
-    - group: 1.演示模块
-      packages-to-scan: org.dromara.demo
+    - group: 1.文件管理模块
+      packages-to-scan: org.dromara.filemanager
     - group: 2.通用模块
       packages-to-scan: org.dromara.web
     - group: 3.系统模块

+ 11 - 0
ruoyi-common/ruoyi-common-web/pom.xml

@@ -59,6 +59,17 @@
         </dependency>
 
         <dependency>
+            <groupId>com.github.oshi</groupId>
+            <artifactId>oshi-core</artifactId>
+            <version>6.4.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-system</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>transmittable-thread-local</artifactId>
         </dependency>

+ 1 - 1
ruoyi-modules/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <modules>
-        <module>ruoyi-demo</module>
+        <module>ruoyi-filemanager</module>
         <module>ruoyi-generator</module>
         <module>ruoyi-job</module>
         <module>ruoyi-system</module>

+ 0 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java

@@ -1 +0,0 @@
-package org.dromara.demo.controller;

+ 0 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/package-info.java

@@ -1 +0,0 @@
-package org.dromara.demo.domain;

+ 0 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/package-info.java

@@ -1 +0,0 @@
-package org.dromara.demo.mapper;

+ 0 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/package-info.java

@@ -1 +0,0 @@
-package org.dromara.demo.service.impl;

+ 0 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/package-info.java

@@ -1 +0,0 @@
-package org.dromara.demo.service;

+ 2 - 2
ruoyi-modules/ruoyi-demo/pom.xml → ruoyi-modules/ruoyi-filemanager/pom.xml

@@ -9,10 +9,10 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-demo</artifactId>
+    <artifactId>ruoyi-filemanager</artifactId>
 
     <description>
-        demo模块
+        filemanager模块
     </description>
 
     <dependencies>

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/MailController.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller;
+package org.dromara.filemanager.controller;
 
 import org.dromara.common.core.domain.R;
 import org.dromara.common.mail.utils.MailUtils;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/RedisCacheController.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller;
+package org.dromara.filemanager.controller;
 
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.domain.R;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/RedisLockController.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller;
+package org.dromara.filemanager.controller;
 
 import com.baomidou.lock.LockInfo;
 import com.baomidou.lock.LockTemplate;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/RedisPubSubController.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller;
+package org.dromara.filemanager.controller;
 
 import org.dromara.common.core.domain.R;
 import org.dromara.common.redis.utils.RedisUtils;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/RedisRateLimiterController.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller;
+package org.dromara.filemanager.controller;
 
 import org.dromara.common.core.domain.R;
 import org.dromara.common.ratelimiter.annotation.RateLimiter;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/SmsController.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller;
+package org.dromara.filemanager.controller;
 
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/Swagger3DemoController.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller;
+package org.dromara.filemanager.controller;
 
 import org.dromara.common.core.domain.R;
 import org.springframework.http.MediaType;

+ 3 - 3
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/TestBatchController.java

@@ -1,10 +1,10 @@
-package org.dromara.demo.controller;
+package org.dromara.filemanager.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.demo.domain.TestDemo;
-import org.dromara.demo.mapper.TestDemoMapper;
+import org.dromara.filemanager.domain.TestDemo;
+import org.dromara.filemanager.mapper.TestDemoMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;

+ 6 - 6
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/TestDemoController.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller;
+package org.dromara.filemanager.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.common.core.domain.R;
@@ -15,11 +15,11 @@ import org.dromara.common.excel.core.ExcelResult;
 import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
-import org.dromara.demo.domain.TestDemo;
-import org.dromara.demo.domain.bo.TestDemoBo;
-import org.dromara.demo.domain.bo.TestDemoImportVo;
-import org.dromara.demo.domain.vo.TestDemoVo;
-import org.dromara.demo.service.ITestDemoService;
+import org.dromara.filemanager.domain.TestDemo;
+import org.dromara.filemanager.domain.bo.TestDemoBo;
+import org.dromara.filemanager.domain.bo.TestDemoImportVo;
+import org.dromara.filemanager.domain.vo.TestDemoVo;
+import org.dromara.filemanager.service.ITestDemoService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;

+ 3 - 3
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/TestEncryptController.java

@@ -1,8 +1,8 @@
-package org.dromara.demo.controller;
+package org.dromara.filemanager.controller;
 
 import org.dromara.common.core.domain.R;
-import org.dromara.demo.domain.TestDemoEncrypt;
-import org.dromara.demo.mapper.TestDemoEncryptMapper;
+import org.dromara.filemanager.domain.TestDemoEncrypt;
+import org.dromara.filemanager.mapper.TestDemoEncryptMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;

+ 4 - 4
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/TestExcelController.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller;
+package org.dromara.filemanager.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import jakarta.servlet.http.HttpServletResponse;
@@ -7,9 +7,9 @@ import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.excel.core.ExcelResult;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.demo.domain.vo.ExportDemoVo;
-import org.dromara.demo.listener.ExportDemoListener;
-import org.dromara.demo.service.IExportExcelService;
+import org.dromara.filemanager.domain.vo.ExportDemoVo;
+import org.dromara.filemanager.listener.ExportDemoListener;
+import org.dromara.filemanager.service.IExportExcelService;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/TestI18nController.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller;
+package org.dromara.filemanager.controller;
 
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.MessageUtils;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/TestSensitiveController.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller;
+package org.dromara.filemanager.controller;
 
 import org.dromara.common.core.domain.R;
 import org.dromara.common.web.core.BaseController;

+ 4 - 4
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/TestTreeController.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller;
+package org.dromara.filemanager.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.common.core.domain.R;
@@ -10,9 +10,9 @@ import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
-import org.dromara.demo.domain.bo.TestTreeBo;
-import org.dromara.demo.domain.vo.TestTreeVo;
-import org.dromara.demo.service.ITestTreeService;
+import org.dromara.filemanager.domain.bo.TestTreeBo;
+import org.dromara.filemanager.domain.vo.TestTreeVo;
+import org.dromara.filemanager.service.ITestTreeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WeSocketController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/WeSocketController.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller;
+package org.dromara.filemanager.controller;
 
 import org.dromara.common.core.domain.R;
 import org.dromara.common.websocket.dto.WebSocketMessageDto;

+ 1 - 0
ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/package-info.java

@@ -0,0 +1 @@
+package org.dromara.filemanager.controller;

+ 1 - 3
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/queue/BoundedQueueController.java

@@ -1,11 +1,9 @@
-package org.dromara.demo.controller.queue;
+package org.dromara.filemanager.controller.queue;
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.redis.utils.QueueUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.redisson.api.RBoundedBlockingQueue;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/queue/DelayedQueueController.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller.queue;
+package org.dromara.filemanager.controller.queue;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import org.dromara.common.core.domain.R;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/queue/PriorityDemo.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller.queue;
+package org.dromara.filemanager.controller.queue;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/controller/queue/PriorityQueueController.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.controller.queue;
+package org.dromara.filemanager.controller.queue;
 
 import cn.hutool.core.util.RandomUtil;
 import org.dromara.common.core.domain.R;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/TestDemo.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.domain;
+package org.dromara.filemanager.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import org.dromara.common.tenant.core.TenantEntity;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/TestDemoEncrypt.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.domain;
+package org.dromara.filemanager.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import org.dromara.common.encrypt.annotation.EncryptField;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/TestTree.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.domain;
+package org.dromara.filemanager.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;

+ 2 - 2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/bo/TestDemoBo.java

@@ -1,9 +1,9 @@
-package org.dromara.demo.domain.bo;
+package org.dromara.filemanager.domain.bo;
 
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.demo.domain.TestDemo;
+import org.dromara.filemanager.domain.TestDemo;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/bo/TestDemoImportVo.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.domain.bo;
+package org.dromara.filemanager.domain.bo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

+ 2 - 2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/bo/TestTreeBo.java

@@ -1,9 +1,9 @@
-package org.dromara.demo.domain.bo;
+package org.dromara.filemanager.domain.bo;
 
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.demo.domain.TestTree;
+import org.dromara.filemanager.domain.TestTree;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;

+ 1 - 0
ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/package-info.java

@@ -0,0 +1 @@
+package org.dromara.filemanager.domain;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/vo/ExportDemoVo.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.domain.vo;
+package org.dromara.filemanager.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

+ 2 - 2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/vo/TestDemoVo.java

@@ -1,10 +1,10 @@
-package org.dromara.demo.domain.vo;
+package org.dromara.filemanager.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
-import org.dromara.demo.domain.TestDemo;
+import org.dromara.filemanager.domain.TestDemo;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 

+ 2 - 2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/vo/TestTreeVo.java

@@ -1,8 +1,8 @@
-package org.dromara.demo.domain.vo;
+package org.dromara.filemanager.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.demo.domain.TestTree;
+import org.dromara.filemanager.domain.TestTree;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 

+ 2 - 2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/listener/ExportDemoListener.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.listener;
+package org.dromara.filemanager.listener;
 
 import cn.hutool.core.util.NumberUtil;
 import com.alibaba.excel.context.AnalysisContext;
@@ -7,7 +7,7 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.excel.core.DefaultExcelListener;
 import org.dromara.common.excel.core.DropDownOptions;
-import org.dromara.demo.domain.vo.ExportDemoVo;
+import org.dromara.filemanager.domain.vo.ExportDemoVo;
 
 import java.util.List;
 

+ 2 - 2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/mapper/TestDemoEncryptMapper.java

@@ -1,7 +1,7 @@
-package org.dromara.demo.mapper;
+package org.dromara.filemanager.mapper;
 
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.demo.domain.TestDemoEncrypt;
+import org.dromara.filemanager.domain.TestDemoEncrypt;
 
 /**
  * 测试加密功能

+ 3 - 4
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/mapper/TestDemoMapper.java

@@ -1,15 +1,14 @@
-package org.dromara.demo.mapper;
+package org.dromara.filemanager.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.poi.ss.formula.functions.T;
 import org.dromara.common.mybatis.annotation.DataColumn;
 import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.demo.domain.TestDemo;
-import org.dromara.demo.domain.vo.TestDemoVo;
+import org.dromara.filemanager.domain.TestDemo;
+import org.dromara.filemanager.domain.vo.TestDemoVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Collection;

+ 3 - 3
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/mapper/TestTreeMapper.java

@@ -1,10 +1,10 @@
-package org.dromara.demo.mapper;
+package org.dromara.filemanager.mapper;
 
 import org.dromara.common.mybatis.annotation.DataColumn;
 import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.demo.domain.TestTree;
-import org.dromara.demo.domain.vo.TestTreeVo;
+import org.dromara.filemanager.domain.TestTree;
+import org.dromara.filemanager.domain.vo.TestTreeVo;
 
 /**
  * 测试树表Mapper接口

+ 1 - 0
ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/mapper/package-info.java

@@ -0,0 +1 @@
+package org.dromara.filemanager.mapper;

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/IExportExcelService.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.service;
+package org.dromara.filemanager.service;
 
 import jakarta.servlet.http.HttpServletResponse;
 

+ 4 - 4
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/ITestDemoService.java

@@ -1,10 +1,10 @@
-package org.dromara.demo.service;
+package org.dromara.filemanager.service;
 
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.demo.domain.TestDemo;
-import org.dromara.demo.domain.bo.TestDemoBo;
-import org.dromara.demo.domain.vo.TestDemoVo;
+import org.dromara.filemanager.domain.TestDemo;
+import org.dromara.filemanager.domain.bo.TestDemoBo;
+import org.dromara.filemanager.domain.vo.TestDemoVo;
 
 import java.util.Collection;
 import java.util.List;

+ 3 - 3
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/ITestTreeService.java

@@ -1,7 +1,7 @@
-package org.dromara.demo.service;
+package org.dromara.filemanager.service;
 
-import org.dromara.demo.domain.bo.TestTreeBo;
-import org.dromara.demo.domain.vo.TestTreeVo;
+import org.dromara.filemanager.domain.bo.TestTreeBo;
+import org.dromara.filemanager.domain.vo.TestTreeVo;
 
 import java.util.Collection;
 import java.util.List;

+ 3 - 3
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/impl/ExportExcelServiceImpl.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.service.impl;
+package org.dromara.filemanager.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import jakarta.servlet.http.HttpServletResponse;
@@ -8,8 +8,8 @@ import org.dromara.common.core.enums.UserStatus;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.excel.core.DropDownOptions;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.demo.domain.vo.ExportDemoVo;
-import org.dromara.demo.service.IExportExcelService;
+import org.dromara.filemanager.domain.vo.ExportDemoVo;
+import org.dromara.filemanager.service.IExportExcelService;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

+ 6 - 6
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/impl/TestDemoServiceImpl.java

@@ -1,4 +1,4 @@
-package org.dromara.demo.service.impl;
+package org.dromara.filemanager.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -7,11 +7,11 @@ import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.demo.domain.TestDemo;
-import org.dromara.demo.domain.bo.TestDemoBo;
-import org.dromara.demo.domain.vo.TestDemoVo;
-import org.dromara.demo.mapper.TestDemoMapper;
-import org.dromara.demo.service.ITestDemoService;
+import org.dromara.filemanager.domain.TestDemo;
+import org.dromara.filemanager.domain.bo.TestDemoBo;
+import org.dromara.filemanager.domain.vo.TestDemoVo;
+import org.dromara.filemanager.mapper.TestDemoMapper;
+import org.dromara.filemanager.service.ITestDemoService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

+ 6 - 6
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java → ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/impl/TestTreeServiceImpl.java

@@ -1,14 +1,14 @@
-package org.dromara.demo.service.impl;
+package org.dromara.filemanager.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.demo.domain.TestTree;
-import org.dromara.demo.domain.bo.TestTreeBo;
-import org.dromara.demo.domain.vo.TestTreeVo;
-import org.dromara.demo.mapper.TestTreeMapper;
-import org.dromara.demo.service.ITestTreeService;
+import org.dromara.filemanager.domain.TestTree;
+import org.dromara.filemanager.domain.bo.TestTreeBo;
+import org.dromara.filemanager.domain.vo.TestTreeVo;
+import org.dromara.filemanager.mapper.TestTreeMapper;
+import org.dromara.filemanager.service.ITestTreeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

+ 1 - 0
ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/impl/package-info.java

@@ -0,0 +1 @@
+package org.dromara.filemanager.service.impl;

+ 1 - 0
ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/service/package-info.java

@@ -0,0 +1 @@
+package org.dromara.filemanager.service;

+ 25 - 0
ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/task/SystemTask.java

@@ -0,0 +1,25 @@
+package org.dromara.filemanager.task;
+
+import cn.hutool.system.SystemUtil;
+import cn.hutool.system.oshi.OshiUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+
+
+
+@Component
+@Slf4j
+public class SystemTask {
+
+    @Scheduled(fixedRate = 5000)
+    public void reportCurrentTime() {
+
+
+
+         log.info("{}",OshiUtil.getDiskStores());
+        System.out.println("现在时间:" + System.currentTimeMillis());
+    }
+
+}

+ 0 - 0
ruoyi-modules/ruoyi-demo/src/main/resources/excel/单列表.xlsx → ruoyi-modules/ruoyi-filemanager/src/main/resources/excel/单列表.xlsx


+ 0 - 0
ruoyi-modules/ruoyi-demo/src/main/resources/excel/多sheet列表.xlsx → ruoyi-modules/ruoyi-filemanager/src/main/resources/excel/多sheet列表.xlsx


+ 0 - 0
ruoyi-modules/ruoyi-demo/src/main/resources/excel/多列表.xlsx → ruoyi-modules/ruoyi-filemanager/src/main/resources/excel/多列表.xlsx


+ 2 - 2
ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml → ruoyi-modules/ruoyi-filemanager/src/main/resources/mapper/filemanager/TestDemoMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.demo.mapper.TestDemoMapper">
+<mapper namespace="org.dromara.filemanager.mapper.TestDemoMapper">
 
-    <select id="customPageList" resultType="org.dromara.demo.domain.vo.TestDemoVo">
+    <select id="customPageList" resultType="org.dromara.filemanager.domain.vo.TestDemoVo">
         SELECT * FROM test_demo ${ew.customSqlSegment}
     </select>
 

+ 1 - 1
ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml → ruoyi-modules/ruoyi-filemanager/src/main/resources/mapper/filemanager/TestTreeMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.demo.mapper.TestTreeMapper">
+<mapper namespace="org.dromara.filemanager.mapper.TestTreeMapper">
 
 </mapper>

+ 0 - 0
ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md → ruoyi-modules/ruoyi-filemanager/src/main/resources/mapper/package-info.md