diff --git a/admin-service/src/main/java/com/cxx/admin/dto/server/CpuDto.java b/admin-service/src/main/java/com/cxx/admin/dto/server/CpuDto.java deleted file mode 100644 index 7abc32d..0000000 --- a/admin-service/src/main/java/com/cxx/admin/dto/server/CpuDto.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.cxx.admin.dto.server; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class CpuDto { - private double usagePercent; -} diff --git a/admin-service/src/main/java/com/cxx/admin/dto/server/DiskDto.java b/admin-service/src/main/java/com/cxx/admin/dto/server/DiskDto.java deleted file mode 100644 index e99406b..0000000 --- a/admin-service/src/main/java/com/cxx/admin/dto/server/DiskDto.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cxx.admin.dto.server; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class DiskDto { - private double total; - private double used; - private double free; - private double usagePercent; -} diff --git a/admin-service/src/main/java/com/cxx/admin/dto/server/MemoryDto.java b/admin-service/src/main/java/com/cxx/admin/dto/server/MemoryDto.java deleted file mode 100644 index 4b5ef8d..0000000 --- a/admin-service/src/main/java/com/cxx/admin/dto/server/MemoryDto.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cxx.admin.dto.server; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class MemoryDto { - private double total; - private double used; - private double free; - private double usagePercent; -} diff --git a/admin-service/src/main/java/com/cxx/admin/dto/server/SystemInfoDto.java b/admin-service/src/main/java/com/cxx/admin/dto/server/SystemInfoDto.java deleted file mode 100644 index 317ca4b..0000000 --- a/admin-service/src/main/java/com/cxx/admin/dto/server/SystemInfoDto.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cxx.admin.dto.server; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Getter; -import lombok.Setter; - -import java.util.Date; - -@Getter -@Setter -public class SystemInfoDto { - // CPU信息 - private String cpuName; - private String cpuVendor; - private int cpuLogicalCores; - private int cpuPhysicalCores; - private double cpuSystemLoad; - // 操作系统信息 - private String osFamily; - private String osVersion; - private String osManufacturer; - // 系统运行时间 - private long systemUptime; -} diff --git a/admin-service/src/main/java/com/cxx/admin/dto/server/SystemMetricsDto.java b/admin-service/src/main/java/com/cxx/admin/dto/server/SystemMetricsDto.java deleted file mode 100644 index 9ac8396..0000000 --- a/admin-service/src/main/java/com/cxx/admin/dto/server/SystemMetricsDto.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cxx.admin.dto.server; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Getter; -import lombok.Setter; - -import java.util.Date; - -@Getter -@Setter -public class SystemMetricsDto { - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date time; - - private double cpuUsage; - private double memoryTotal; - private double memoryUsed; - private double memoryFree; - private double memoryUsage; - private double diskTotal; - private double diskUsed; - private double diskFree; - private double diskUsage; -} diff --git a/admin-service/src/main/resources/application-dev.yml b/admin-service/src/main/resources/application-dev.yml index 82d908c..42874c4 100644 --- a/admin-service/src/main/resources/application-dev.yml +++ b/admin-service/src/main/resources/application-dev.yml @@ -3,8 +3,4 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false username: cxx - password: 123456 - -file: - path: D:\\temp\\ - log-path: D:\\temp\\ \ No newline at end of file + password: 123456 \ No newline at end of file diff --git a/admin-service/src/main/resources/application-docker.yml b/admin-service/src/main/resources/application-docker.yml index dafb638..5a6d0ab 100644 --- a/admin-service/src/main/resources/application-docker.yml +++ b/admin-service/src/main/resources/application-docker.yml @@ -4,6 +4,3 @@ spring: url: jdbc:mysql://mysql:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false username: docker password: 19940822Cxx - -file: - path: /upload-file/ \ No newline at end of file diff --git a/admin-service/src/main/resources/application-prod.yml b/admin-service/src/main/resources/application-prod.yml index 0bdcd3b..2d374ee 100644 --- a/admin-service/src/main/resources/application-prod.yml +++ b/admin-service/src/main/resources/application-prod.yml @@ -4,7 +4,3 @@ spring: url: jdbc:mysql://127.0.0.1:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false username: cxx password: 19940822Cxx@1213 - -file: - path: /root/docker/upload-file/ - log-path: /root/service/logs/ \ No newline at end of file diff --git a/admin-service/src/main/java/com/cxx/admin/config/WebMvcConfig.java b/home-service/src/main/java/com/cxx/home/config/WebMvcConfig.java similarity index 92% rename from admin-service/src/main/java/com/cxx/admin/config/WebMvcConfig.java rename to home-service/src/main/java/com/cxx/home/config/WebMvcConfig.java index bb75df0..a9a1dbd 100644 --- a/admin-service/src/main/java/com/cxx/admin/config/WebMvcConfig.java +++ b/home-service/src/main/java/com/cxx/home/config/WebMvcConfig.java @@ -1,6 +1,6 @@ -package com.cxx.admin.config; +package com.cxx.home.config; -import com.cxx.admin.constant.FileConstant; +import com.cxx.home.constant.FileConstant; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; diff --git a/admin-service/src/main/java/com/cxx/admin/constant/FileConstant.java b/home-service/src/main/java/com/cxx/home/constant/FileConstant.java similarity index 81% rename from admin-service/src/main/java/com/cxx/admin/constant/FileConstant.java rename to home-service/src/main/java/com/cxx/home/constant/FileConstant.java index 6298a0c..4086efa 100644 --- a/admin-service/src/main/java/com/cxx/admin/constant/FileConstant.java +++ b/home-service/src/main/java/com/cxx/home/constant/FileConstant.java @@ -1,4 +1,4 @@ -package com.cxx.admin.constant; +package com.cxx.home.constant; public interface FileConstant { String FILE_NAME_SPLIT = "_"; diff --git a/admin-service/src/main/java/com/cxx/admin/controller/FileController.java b/home-service/src/main/java/com/cxx/home/controller/FileController.java similarity index 89% rename from admin-service/src/main/java/com/cxx/admin/controller/FileController.java rename to home-service/src/main/java/com/cxx/home/controller/FileController.java index 92a9f53..8717e38 100644 --- a/admin-service/src/main/java/com/cxx/admin/controller/FileController.java +++ b/home-service/src/main/java/com/cxx/home/controller/FileController.java @@ -1,10 +1,10 @@ -package com.cxx.admin.controller; +package com.cxx.home.controller; -import com.cxx.admin.dto.file.ChunkInfoDto; -import com.cxx.admin.dto.file.ChunkResultDto; -import com.cxx.admin.dto.file.FileInfoDto; -import com.cxx.admin.service.FileService; -import com.cxx.admin.dto.file.FileRecordDto; +import com.cxx.home.dto.file.ChunkInfoDto; +import com.cxx.home.dto.file.ChunkResultDto; +import com.cxx.home.dto.file.FileInfoDto; +import com.cxx.home.dto.file.FileRecordDto; +import com.cxx.home.service.FileService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; diff --git a/admin-service/src/main/java/com/cxx/admin/dto/file/ChunkInfoDto.java b/home-service/src/main/java/com/cxx/home/dto/file/ChunkInfoDto.java similarity index 92% rename from admin-service/src/main/java/com/cxx/admin/dto/file/ChunkInfoDto.java rename to home-service/src/main/java/com/cxx/home/dto/file/ChunkInfoDto.java index 955f901..e00cf27 100644 --- a/admin-service/src/main/java/com/cxx/admin/dto/file/ChunkInfoDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/file/ChunkInfoDto.java @@ -1,4 +1,4 @@ -package com.cxx.admin.dto.file; +package com.cxx.home.dto.file; import lombok.Getter; import lombok.Setter; diff --git a/admin-service/src/main/java/com/cxx/admin/dto/file/ChunkResultDto.java b/home-service/src/main/java/com/cxx/home/dto/file/ChunkResultDto.java similarity index 92% rename from admin-service/src/main/java/com/cxx/admin/dto/file/ChunkResultDto.java rename to home-service/src/main/java/com/cxx/home/dto/file/ChunkResultDto.java index a44625a..5f34005 100644 --- a/admin-service/src/main/java/com/cxx/admin/dto/file/ChunkResultDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/file/ChunkResultDto.java @@ -1,4 +1,4 @@ -package com.cxx.admin.dto.file; +package com.cxx.home.dto.file; import lombok.Getter; import lombok.Setter; diff --git a/admin-service/src/main/java/com/cxx/admin/dto/file/FileInfoDto.java b/home-service/src/main/java/com/cxx/home/dto/file/FileInfoDto.java similarity index 91% rename from admin-service/src/main/java/com/cxx/admin/dto/file/FileInfoDto.java rename to home-service/src/main/java/com/cxx/home/dto/file/FileInfoDto.java index a57d2f5..2224133 100644 --- a/admin-service/src/main/java/com/cxx/admin/dto/file/FileInfoDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/file/FileInfoDto.java @@ -1,4 +1,4 @@ -package com.cxx.admin.dto.file; +package com.cxx.home.dto.file; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Getter; diff --git a/admin-service/src/main/java/com/cxx/admin/dto/file/FileRecordDto.java b/home-service/src/main/java/com/cxx/home/dto/file/FileRecordDto.java similarity index 86% rename from admin-service/src/main/java/com/cxx/admin/dto/file/FileRecordDto.java rename to home-service/src/main/java/com/cxx/home/dto/file/FileRecordDto.java index daa9548..c44453e 100644 --- a/admin-service/src/main/java/com/cxx/admin/dto/file/FileRecordDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/file/FileRecordDto.java @@ -1,4 +1,4 @@ -package com.cxx.admin.dto.file; +package com.cxx.home.dto.file; import lombok.Getter; import lombok.Setter; diff --git a/admin-service/src/main/java/com/cxx/admin/entity/FileRecord.java b/home-service/src/main/java/com/cxx/home/entity/FileRecord.java similarity index 94% rename from admin-service/src/main/java/com/cxx/admin/entity/FileRecord.java rename to home-service/src/main/java/com/cxx/home/entity/FileRecord.java index 2cc9842..35931f7 100644 --- a/admin-service/src/main/java/com/cxx/admin/entity/FileRecord.java +++ b/home-service/src/main/java/com/cxx/home/entity/FileRecord.java @@ -1,4 +1,4 @@ -package com.cxx.admin.entity; +package com.cxx.home.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/admin-service/src/main/java/com/cxx/admin/mapper/FileRecordMapper.java b/home-service/src/main/java/com/cxx/home/mapper/FileRecordMapper.java similarity index 71% rename from admin-service/src/main/java/com/cxx/admin/mapper/FileRecordMapper.java rename to home-service/src/main/java/com/cxx/home/mapper/FileRecordMapper.java index 491963d..4a861d8 100644 --- a/admin-service/src/main/java/com/cxx/admin/mapper/FileRecordMapper.java +++ b/home-service/src/main/java/com/cxx/home/mapper/FileRecordMapper.java @@ -1,7 +1,7 @@ -package com.cxx.admin.mapper; +package com.cxx.home.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.admin.entity.FileRecord; +import com.cxx.home.entity.FileRecord; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/admin-service/src/main/java/com/cxx/admin/service/FileService.java b/home-service/src/main/java/com/cxx/home/service/FileService.java similarity index 84% rename from admin-service/src/main/java/com/cxx/admin/service/FileService.java rename to home-service/src/main/java/com/cxx/home/service/FileService.java index 2bd9148..b1d616a 100644 --- a/admin-service/src/main/java/com/cxx/admin/service/FileService.java +++ b/home-service/src/main/java/com/cxx/home/service/FileService.java @@ -1,9 +1,9 @@ -package com.cxx.admin.service; +package com.cxx.home.service; -import com.cxx.admin.dto.file.ChunkInfoDto; -import com.cxx.admin.dto.file.ChunkResultDto; -import com.cxx.admin.dto.file.FileInfoDto; -import com.cxx.admin.dto.file.FileRecordDto; +import com.cxx.home.dto.file.ChunkInfoDto; +import com.cxx.home.dto.file.ChunkResultDto; +import com.cxx.home.dto.file.FileInfoDto; +import com.cxx.home.dto.file.FileRecordDto; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/admin-service/src/main/java/com/cxx/admin/service/impl/FileServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/FileServiceImpl.java similarity index 94% rename from admin-service/src/main/java/com/cxx/admin/service/impl/FileServiceImpl.java rename to home-service/src/main/java/com/cxx/home/service/impl/FileServiceImpl.java index 6b525db..0e3f61e 100644 --- a/admin-service/src/main/java/com/cxx/admin/service/impl/FileServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/FileServiceImpl.java @@ -1,18 +1,18 @@ -package com.cxx.admin.service.impl; +package com.cxx.home.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.cxx.admin.constant.FileConstant; -import com.cxx.admin.dto.file.ChunkInfoDto; -import com.cxx.admin.dto.file.ChunkResultDto; -import com.cxx.admin.dto.file.FileInfoDto; -import com.cxx.admin.service.FileService; -import com.cxx.admin.dto.file.FileRecordDto; -import com.cxx.admin.util.FileUtils; -import com.cxx.admin.util.UploadFileUtil; -import com.cxx.admin.entity.FileRecord; -import com.cxx.admin.mapper.FileRecordMapper; import com.cxx.framework.web.CustomException; +import com.cxx.home.constant.FileConstant; +import com.cxx.home.dto.file.ChunkInfoDto; +import com.cxx.home.dto.file.ChunkResultDto; +import com.cxx.home.dto.file.FileInfoDto; +import com.cxx.home.dto.file.FileRecordDto; +import com.cxx.home.entity.FileRecord; +import com.cxx.home.mapper.FileRecordMapper; +import com.cxx.home.service.FileService; +import com.cxx.home.util.FileUtils; +import com.cxx.home.util.UploadFileUtil; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; diff --git a/admin-service/src/main/java/com/cxx/admin/util/FileUtils.java b/home-service/src/main/java/com/cxx/home/util/FileUtils.java similarity index 96% rename from admin-service/src/main/java/com/cxx/admin/util/FileUtils.java rename to home-service/src/main/java/com/cxx/home/util/FileUtils.java index 12c1759..4f34efe 100644 --- a/admin-service/src/main/java/com/cxx/admin/util/FileUtils.java +++ b/home-service/src/main/java/com/cxx/home/util/FileUtils.java @@ -1,4 +1,4 @@ -package com.cxx.admin.util; +package com.cxx.home.util; import lombok.extern.slf4j.Slf4j; diff --git a/admin-service/src/main/java/com/cxx/admin/util/UploadFileUtil.java b/home-service/src/main/java/com/cxx/home/util/UploadFileUtil.java similarity index 98% rename from admin-service/src/main/java/com/cxx/admin/util/UploadFileUtil.java rename to home-service/src/main/java/com/cxx/home/util/UploadFileUtil.java index 4ce4f76..fb7960d 100644 --- a/admin-service/src/main/java/com/cxx/admin/util/UploadFileUtil.java +++ b/home-service/src/main/java/com/cxx/home/util/UploadFileUtil.java @@ -1,7 +1,7 @@ -package com.cxx.admin.util; +package com.cxx.home.util; import cn.hutool.core.io.file.FileNameUtil; -import com.cxx.admin.dto.file.ChunkInfoDto; +import com.cxx.home.dto.file.ChunkInfoDto; import lombok.extern.slf4j.Slf4j; import java.io.File; diff --git a/home-service/src/main/resources/application-dev.yml b/home-service/src/main/resources/application-dev.yml index 9c5bb6e..82d908c 100644 --- a/home-service/src/main/resources/application-dev.yml +++ b/home-service/src/main/resources/application-dev.yml @@ -4,3 +4,7 @@ spring: url: jdbc:mysql://127.0.0.1:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false username: cxx password: 123456 + +file: + path: D:\\temp\\ + log-path: D:\\temp\\ \ No newline at end of file diff --git a/home-service/src/main/resources/application-docker.yml b/home-service/src/main/resources/application-docker.yml index 5a6d0ab..dafb638 100644 --- a/home-service/src/main/resources/application-docker.yml +++ b/home-service/src/main/resources/application-docker.yml @@ -4,3 +4,6 @@ spring: url: jdbc:mysql://mysql:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false username: docker password: 19940822Cxx + +file: + path: /upload-file/ \ No newline at end of file diff --git a/home-service/src/main/resources/application-prod.yml b/home-service/src/main/resources/application-prod.yml index 42635cf..0bdcd3b 100644 --- a/home-service/src/main/resources/application-prod.yml +++ b/home-service/src/main/resources/application-prod.yml @@ -3,4 +3,8 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false username: cxx - password: 19940822Cxx@1213 \ No newline at end of file + password: 19940822Cxx@1213 + +file: + path: /root/docker/upload-file/ + log-path: /root/service/logs/ \ No newline at end of file