diff --git a/.cursorignore b/.cursorignore index 55ea4af..5eafe1f 100644 --- a/.cursorignore +++ b/.cursorignore @@ -1,7 +1,5 @@ # Add directories or file patterns to ignore during indexing (e.g. foo/ or *.csv) # Project exclude paths -/Noodles-Detector/target/ - HELP.md target/ !.mvn/wrapper/maven-wrapper.jar diff --git a/.gitignore b/.gitignore index 28dd153..f97f40a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ # Project exclude paths -/Noodles-Detector/target/ - HELP.md target/ !.mvn/wrapper/maven-wrapper.jar diff --git a/README.md b/README.md index 1d04e67..034aad5 100644 --- a/README.md +++ b/README.md @@ -1,124 +1,16 @@ -

Noodles

-

基于SpringBoot的轻量服务(器)管理系统

- -

- - -

- - +# 百盘搜 ## 这个项目是做什么的？ -随着个人服务器（Nas/微云盘/软路由）的飞速发展，个人用户拥有多台不同厂家、不同系统服务器的情况越来越多。另一方面随着虚拟机和容器的大量应用，使得个人用户~~（我）~~对于指数上升的管理难度应接不暇。 +- 网盘聚合搜索器 + 1.自动搜索对应的网盘资源（多种网盘，包括百度网盘，UC网盘，迅雷云盘，夸克网盘）然后转存到我的对应网盘的账号后，将分享链接返回。 + 2.一个强大的搜索入口，高度扩展性，可以扩展各种网盘，返回对应网盘的分享链接，接口速度快，多级缓存。 +- 常见社交平台推广下载链接 + 类似B站这样的平台，可以自动发现某个类型的视频，然后将所有资料整理，自动转存后形成分享链接，并且自动评论到评论区。 -本项目就是为了解决我在使用我个人的多台服务器时发现的一些问题，比如： +## 功能模块 -- Windows Server这种`没有原生管理平台`，无法直接通过Web查看状态的系统 -- 物理机上使用虚拟机，虚拟机上再使用容器，多层虚拟导致最后记不清宿主关系而`误删除`的情况 -- 统一的掉线提醒。有些管理平台有多种掉线提醒(Unraid)，有些没有，有些`配置麻烦`。 -- …… - - - -## 技术栈？ - -### 主要框架 - -| 技术 | 说明 | 官网 | -|----------------|---------|------------------------------------------------------------------------------------------| -| SpringBoot | 后端框架 | [https://spring.io/projects/spring-boot](https://spring.io/projects/spring-boot) | -| SpringSecurity | 登录认证 | [https://spring.io/projects/spring-security](https://spring.io/projects/spring-security) | -| jjwt | 生成Token | [https://github.com/jwtk/jjwt](https://github.com/jwtk/jjwt) | -| MyBatis-Plus | ORM框架 | [https://baomidou.com/pages/24112f/](https://baomidou.com/pages/24112f/) | -| oshi-core | 获取本机信息 | [https://github.com/oshi/oshi](https://github.com/oshi/oshi) | -| hutool-all | 工具包 | [https://github.com/dromara/hutool](https://github.com/dromara/hutool) | -| jsch | 连接控制台 | [http://www.jcraft.com/jsch/](http://www.jcraft.com/jsch/) | - -### 中间件&其他服务 - -- MySQL8 -- RabbitMq -- Redis - - - -## 都有什么功能？ - -1. 服务管理：配置管理所有服务。 -2. 物理机管理：配置管理所有的物理服务器。 -3. 虚拟机管理：配置管理所有的虚拟机。 -4. 容器管理：配置管理所有的容器。 -5. 账号管理：包括默认账号的更改，删除账号等。 -6. 远程控制台：连接任意一台配置了连接信息的实例。 -7. JVM监控：实时监控本机JVM运行环境。 -8. 操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。 -9. 用户日志：记录用户信息的所有修改。 -10. 掉线提醒：提供多种实例掉线提醒。 -11. 物理机监控：实时监视所有物理机的CPU、内存、磁盘、等相关信息。 - - - -## 如何安装？ - -1. 拉取本项目 - - ```bash - git clone - ``` - -2. 导入MySQL数据库文件 - -3. 在对应的application-xxx.yml中配置连接信息 - - ```yaml - server: - port: xxxx - spring: - #MySQL配置 - datasource: - url: jdbc:mysql://xxxx/xxxx?characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: xxxx - password: xxxx - driver-class-name: com.mysql.cj.jdbc.Driver - #Redis配置 - redis: - host: xxxx - database: x - #RabbitMq配置 - rabbitmq: - host: xxxx - port: xxxx - username: xxxxxx - password: xxxxxx - ``` - - - -## 如何使用？ - -[文档地址](https://mzaxd.github.io/2023/04/22/Noodles%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97/) - - - -## 一些演示图 - -![](https://blog-1310221847.cos.ap-beijing.myqcloud.com/202303232124212.png) - -![](https://blog-1310221847.cos.ap-beijing.myqcloud.com/202303232126621.png) - -![](https://blog-1310221847.cos.ap-beijing.myqcloud.com/202303232126542.png) - -![](https://blog-1310221847.cos.ap-beijing.myqcloud.com/202303232126976.png) - -![](https://blog-1310221847.cos.ap-beijing.myqcloud.com/202303232126812.png) - -![](https://blog-1310221847.cos.ap-beijing.myqcloud.com/202303232126267.png) - -![](https://blog-1310221847.cos.ap-beijing.myqcloud.com/202303232127691.png) - -![](https://blog-1310221847.cos.ap-beijing.myqcloud.com/202303232127793.png) - -![](https://blog-1310221847.cos.ap-beijing.myqcloud.com/202303232127591.png) - -![](https://blog-1310221847.cos.ap-beijing.myqcloud.com/202303232128416.png) +1. 云盘管理（设计上是四种云盘，但目前只支持百度云盘） +2. 资源管理 +3. 评论管理（评论时间，评论的链接要能跳转看到） +4. 日志管理（都搜索了什么，要记录下来） \ No newline at end of file diff --git a/noodles-new.sql b/bps-new.sql similarity index 100% rename from noodles-new.sql rename to bps-new.sql diff --git a/pom.xml b/pom.xml index 8729a68..6ae307e 100644 --- a/pom.xml +++ b/pom.xml @@ -140,6 +140,15 @@ + + + src/main/resources + false + + **/*.exe + + + diff --git a/src/main/java/com/mzaxd/bps/constant/UrlConstant.java b/src/main/java/com/mzaxd/bps/constant/UrlConstant.java deleted file mode 100644 index 57bc1c9..0000000 --- a/src/main/java/com/mzaxd/bps/constant/UrlConstant.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.mzaxd.bps.constant; - -/** - * @author root - */ -public class UrlConstant { - - /** - * 协议 - */ - public static final String PROTOCOL = "protocol"; - - /** - * ip - */ - public static final String IP = "IP"; - - /** - * 端口号 - */ - public static final String PORT = "port"; -} diff --git a/src/main/java/com/mzaxd/bps/controller/SettingController.java b/src/main/java/com/mzaxd/bps/controller/SettingController.java index 1af8841..81c5df2 100644 --- a/src/main/java/com/mzaxd/bps/controller/SettingController.java +++ b/src/main/java/com/mzaxd/bps/controller/SettingController.java @@ -1,9 +1,6 @@ package com.mzaxd.bps.controller; import com.mzaxd.bps.domain.ResponseResult; -import com.mzaxd.bps.domain.vo.SmtpVo; -import com.mzaxd.bps.domain.vo.SystemVo; -import com.mzaxd.bps.domain.vo.TerminalVo; import com.mzaxd.bps.service.SystemSettingService; import org.springframework.web.bind.annotation.*; @@ -24,27 +21,15 @@ public class SettingController { return systemSettingService.getSmtpSetting(); } - @PostMapping("/smtp") - public ResponseResult saveSmtpSetting(@RequestBody SmtpVo smtpVo) { - return systemSettingService.saveSmtpSetting(smtpVo); - } @GetMapping("/terminal") public ResponseResult getTerminalSetting() { return systemSettingService.getTerminalSetting(); } - @PostMapping("/terminal") - public ResponseResult saveTerminalSetting(@RequestBody TerminalVo terminalVo) { - return systemSettingService.saveTerminalSetting(terminalVo); - } @GetMapping("/system") public ResponseResult getSystemSetting() { return systemSettingService.getSystemSetting(); } - @PostMapping("/system") - public ResponseResult saveSystemSetting(@RequestBody SystemVo systemVo) { - return systemSettingService.saveSystemSetting(systemVo); - } } diff --git a/src/main/java/com/mzaxd/bps/controller/UserController.java b/src/main/java/com/mzaxd/bps/controller/UserController.java index 4d91b25..c999575 100644 --- a/src/main/java/com/mzaxd/bps/controller/UserController.java +++ b/src/main/java/com/mzaxd/bps/controller/UserController.java @@ -3,7 +3,6 @@ package com.mzaxd.bps.controller; import com.mzaxd.bps.annotation.SysLog; import com.mzaxd.bps.domain.ResponseResult; import com.mzaxd.bps.domain.entity.User; -import com.mzaxd.bps.domain.vo.UserInfoVo; import com.mzaxd.bps.enums.OperationEnum; import com.mzaxd.bps.service.UserService; import org.springframework.web.bind.annotation.*; @@ -47,11 +46,4 @@ public class UserController { return userService.changePassword(map.get("password")); } - @SysLog(operation = OperationEnum.USER_UPDATE_USERINFO) - @PostMapping("/updateUserInfo") - public ResponseResult updateUserInfo(@RequestBody Map map) { - return userService.updateUserInfo(map.get("user")); - } - - } diff --git a/src/main/java/com/mzaxd/bps/domain/CloudFile.java b/src/main/java/com/mzaxd/bps/domain/CloudFile.java new file mode 100644 index 0000000..a4131e8 --- /dev/null +++ b/src/main/java/com/mzaxd/bps/domain/CloudFile.java @@ -0,0 +1,79 @@ +package com.mzaxd.bps.domain; + +import java.time.LocalDateTime; + +public class CloudFile { + private String id; + private String name; + private String path; + private long size; + private LocalDateTime createTime; + private LocalDateTime modifyTime; + private String md5; + private String shareLink; + + // Getters and Setters + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public long getSize() { + return size; + } + + public void setSize(long size) { + this.size = size; + } + + public LocalDateTime getCreateTime() { + return createTime; + } + + public void setCreateTime(LocalDateTime createTime) { + this.createTime = createTime; + } + + public LocalDateTime getModifyTime() { + return modifyTime; + } + + public void setModifyTime(LocalDateTime modifyTime) { + this.modifyTime = modifyTime; + } + + public String getMd5() { + return md5; + } + + public void setMd5(String md5) { + this.md5 = md5; + } + + public String getShareLink() { + return shareLink; + } + + public void setShareLink(String shareLink) { + this.shareLink = shareLink; + } +} \ No newline at end of file diff --git a/src/main/java/com/mzaxd/bps/domain/vo/AccountVo.java b/src/main/java/com/mzaxd/bps/domain/vo/AccountVo.java deleted file mode 100644 index f0c1d3f..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/AccountVo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author root - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class AccountVo { - /** - * 主键id - */ - private Long id; - - /** - * 账号 - */ - private String account; - - /** - * 名称 - */ - private String name; - - /** - * 0代表管理员 1代表非管理员 - */ - private Integer type; - - /** - * 描述 - */ - private String description; -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/AffectedServirListVo.java b/src/main/java/com/mzaxd/bps/domain/vo/AffectedServirListVo.java deleted file mode 100644 index 4f00554..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/AffectedServirListVo.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * @author Mzaxd - * @since 2023-03-08 10:23 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -public class AffectedServirListVo { - - /** - * 主键id - */ - private Long id; - - /** - * 名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 图像 - */ - private String avatar; - - /** - * 备注 - */ - private String remark; - - /** - * 所有关联的host - */ - private List hosts; - - /** - * 所有关联的容器 - */ - private List containers; - -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/AuditLogListVo.java b/src/main/java/com/mzaxd/bps/domain/vo/AuditLogListVo.java deleted file mode 100644 index 7ae1eb8..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/AuditLogListVo.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * @author 13439 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class AuditLogListVo { - - /** - * id - */ - private Long id; - - /** - * 操作 - */ - private String operation; - - /** - * 操作类型（用户/容器/虚拟机/物理机/服务/系统） - */ - private String operationType; - - /** - * 请求参数 - */ - private String param; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 创建人id - */ - private Long createBy; - - /** - * 操作人信息 - */ - private UserInfoVo user; - -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/ContainerSelectVo.java b/src/main/java/com/mzaxd/bps/domain/vo/ContainerSelectVo.java deleted file mode 100644 index 0def6af..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/ContainerSelectVo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author 13439 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class ContainerSelectVo { - - /** - * 主键id - */ - private Long id; - - /** - * 名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 图像 - */ - private String avatar; - -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/ContainerVo.java b/src/main/java/com/mzaxd/bps/domain/vo/ContainerVo.java deleted file mode 100644 index 2dd0616..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/ContainerVo.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * @author root - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -public class ContainerVo { - - /** - * 主键id - */ - private Long id; - - /** - * 名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 图像 - */ - private String avatar; - - /** - * 镜像名 - */ - private String imageName; - - /** - * 实际服务器地址(不带协议，不带端口号) - */ - private String serverAddress; - - /** - * WebUi URL - */ - private String webUi; - - /** - * 宿主机id - */ - private Long hostMachineId; - - /** - * 宿主机信息 - */ - private HostMachineVo hostMachine; - - /** - * 状态（0在线 1离线 2孤立镜像） - */ - private Integer containerState; - - /** - * 容器编号 - */ - private String containerId; - - /** - * 状态（0不提醒 1浏览器 2邮件 3浏览器&邮件） - */ - private Integer notify; - - /** - * SSH Id - */ - private Long sshId; - - /** - * 控制台类型 - */ - private String sshType; - - /** - * SSH连接地址 - */ - private String sshHost; - - /** - * SSH连接地址端口号 - */ - private Integer sshPort; - - /** - * SSH连接用户 - */ - private String sshUser; - - /** - * SSH连接密码 - */ - private String sshPwd; - - - -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/HostMachineDrawerVo.java b/src/main/java/com/mzaxd/bps/domain/vo/HostMachineDrawerVo.java deleted file mode 100644 index fcbddea..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/HostMachineDrawerVo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author root - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class HostMachineDrawerVo { - - /** - * 主键id - */ - private Long id; - - /** - * 名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 图像 - */ - private String avatar; - -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/HostMachineListVo.java b/src/main/java/com/mzaxd/bps/domain/vo/HostMachineListVo.java deleted file mode 100644 index 436c47a..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/HostMachineListVo.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author root - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class HostMachineListVo { - - /** - * 主键id - */ - private Long id; - - /** - * 名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 图像 - */ - private String avatar; - - /** - * 状态（0在线 1离线 2睡眠） - */ - private Integer hostMachineState; - - /** - * 探测器地址 - */ - private String detectorIpAddress; - - /** - * 操作系统id - */ - private Long osId; - - /** - * 操作系统Vo - */ - private OsVo os; - - /** - * 操作系统id - */ - private Long sshId; - - /** - * 操作系统Vo - */ - private SshLinkVo sshLink; - - /** - * 核心线程数 - */ - private Long threads; - - /** - * 内存 - */ - private Long memory; - - /** - * 管理ip地址 - */ - private String manageIp; - - /** - * 状态（0不提醒 1浏览器 2邮件 3浏览器&邮件） - */ - private Integer notify; - - -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/HostMachineVo.java b/src/main/java/com/mzaxd/bps/domain/vo/HostMachineVo.java deleted file mode 100644 index 0502b04..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/HostMachineVo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author root - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class HostMachineVo { - - /** - * 主键id - */ - private Long id; - - /** - * 名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 图像 - */ - private String avatar; - -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/HostPanelVo.java b/src/main/java/com/mzaxd/bps/domain/vo/HostPanelVo.java deleted file mode 100644 index b4e8a36..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/HostPanelVo.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * @author 13439 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -public class HostPanelVo { - - /** - * 主键id - */ - private Long id; - - /** - * 名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 图像 - */ - private String avatar; - - /** - * 管理ip地址 - */ - private String manageIp; - - /** - * 协议 - */ - private String protocol; - - /** - * ip地址 - */ - private String ip; - - /** - * 端口 - */ - private String port; - - /** - * 1代表Linux 2代表WindowsNT 3代表FreeBSD - */ - private Integer osKernel; - - /** - * 状态（0不提醒 1浏览器 2邮件 3浏览器&邮件） - */ - private Integer notify; - - /** - * 状态（0在线 1离线 2睡眠） - */ - private Integer hostMachineState; - - /** - * 虚拟机数量 - */ - private Integer vmCount; - - /** - * 容器数量 - */ - private Integer containerCount; - -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/HostVo.java b/src/main/java/com/mzaxd/bps/domain/vo/HostVo.java deleted file mode 100644 index dd506c0..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/HostVo.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * @author root - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -public class HostVo { - /** - * 主键id - */ - private Long id; - - /** - * 名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 图像 - */ - private String avatar; - - /** - * 实际服务器地址(不带协议，不带端口号) - */ - private String serverAddress; - - /** - * 管理ip地址 - */ - private String manageIp; - - /** - * 协议 - */ - private String protocol; - - /** - * ip地址 - */ - private String ip; - - /** - * 端口 - */ - private String port; - - /** - * 1代表Linux 2代表WindowsNT 3代表FreeBSD - */ - private Integer osKernel; - - /** - * 状态（0不提醒 1浏览器 2邮件 3浏览器&邮件） - */ - private Integer notify; - - /** - * 操作系统id - */ - private Long sshId; - - /** - * SSH连接地址 - */ - private String sshHost; - - /** - * SSH连接地址端口号 - */ - private Integer sshPort; - - /** - * SSH连接用户 - */ - private String sshUser; - - /** - * SSH连接密码 - */ - private String sshPwd; - -} - diff --git a/src/main/java/com/mzaxd/bps/domain/vo/NotificationListVo.java b/src/main/java/com/mzaxd/bps/domain/vo/NotificationListVo.java deleted file mode 100644 index 2aac570..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/NotificationListVo.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - * @author 13439 - */ - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -public class NotificationListVo { - - /** - * 主键id - */ - @TableId(type = IdType.AUTO) - private Long id; - - /** - * 通知标题 - */ - private String title; - - /** - * 通知内容 - */ - private String content; - - /** - * 通知类型（0代表掉线通知，1代表统计通知） - */ - private Integer type; - - /** - * 可能关联的实例的类型（0代表无 1代表host 2代表vm 3代表container） - */ - private Integer instanceType; - - /** - * 可能关联的实例id - */ - private Long instanceId; - - /** - * 提醒发送方式（0不提醒 1浏览器 1邮件 3代表两者） - */ - private Integer sendType; - - /** - * 用户是否确认（0代表未确认 1代表已确认） - */ - private Integer affirm; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 关联的实例名称 - */ - private String instanceName; - - /** - * 关联的实例图标 - */ - private String instanceAvatar; -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/OsVo.java b/src/main/java/com/mzaxd/bps/domain/vo/OsVo.java deleted file mode 100644 index a87b82c..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/OsVo.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author root - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class OsVo { - - /** - * 主键id - */ - private Long id; - - /** - * 名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 1代表Linux 2代表WindowsNT 3代表FreeBSD - */ - private Integer kernel; -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/ProfileHeaderVo.java b/src/main/java/com/mzaxd/bps/domain/vo/ProfileHeaderVo.java deleted file mode 100644 index 3367a60..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/ProfileHeaderVo.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * @author 13439 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class ProfileHeaderVo { - - /** - * 用户名 - */ - private String nickName; - - /** - * 头像 - */ - private String avatar; - - /** - * 登录地点 - */ - private String location; - - /** - * 账号创建时间 - */ - private Date createTime; -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/ProfileVo.java b/src/main/java/com/mzaxd/bps/domain/vo/ProfileVo.java deleted file mode 100644 index 7d3e010..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/ProfileVo.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * @author 13439 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class ProfileVo { - - /** - * 用户名 - */ - private String userName; - - /** - * 昵称 - */ - private String nickName; - - /** - * 邮箱 - */ - private String email; - - /** - * 头像 - */ - private String avatar; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 总服务数 - */ - private Integer servirNumber; - - /** - * 总物理机数 - */ - private Integer hostNumber; - - /** - * 总虚拟机数 - */ - private Integer vmNumber; - - /** - * 总容器数 - */ - private Integer containerNumber; -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/RecentConsoleListVo.java b/src/main/java/com/mzaxd/bps/domain/vo/RecentConsoleListVo.java deleted file mode 100644 index 1cc8eba..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/RecentConsoleListVo.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - - -/** - * @author 13439 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Accessors(chain = true) -public class RecentConsoleListVo { - - /** - * 名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 图像 - */ - private String avatar; - - /** - * ssh连接信息表id - */ - private Long sshId; - - -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/SaveOrUpdateServirVo.java b/src/main/java/com/mzaxd/bps/domain/vo/SaveOrUpdateServirVo.java deleted file mode 100644 index 6704de2..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/SaveOrUpdateServirVo.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -/** - * @author 13439 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class SaveOrUpdateServirVo { - - /** - * 主键id - */ - private Long id; - - /** - * 名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 图像 - */ - private String avatar; - - /** - * 备注 - */ - private String remark; - - /** - * 容器id - */ - private List containerIds; - - /** - * 主机id - */ - private List hostIds; - - /** - * 标签id - */ - private List tagIds; - -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/ServirContainerVo.java b/src/main/java/com/mzaxd/bps/domain/vo/ServirContainerVo.java deleted file mode 100644 index 9d6f214..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/ServirContainerVo.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author 13439 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class ServirContainerVo { - - /** - * 主键id - */ - private Long id; - - /** - * 名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 图像 - */ - private String avatar; - - /** - * WebUi URL - */ - private String webUi; - -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/ServirHostVo.java b/src/main/java/com/mzaxd/bps/domain/vo/ServirHostVo.java deleted file mode 100644 index 5ca7bfd..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/ServirHostVo.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author 13439 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class ServirHostVo { - - /** - * 主键id - */ - private Long id; - - /** - * 名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 图像 - */ - private String avatar; - - /** - * 管理ip地址 - */ - private String manageIp; - -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/ServirListVo.java b/src/main/java/com/mzaxd/bps/domain/vo/ServirListVo.java deleted file mode 100644 index f190feb..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/ServirListVo.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * @author 13439 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -public class ServirListVo { - - /** - * 主键id - */ - private Long id; - - /** - * 名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 图像 - */ - private String avatar; - - /** - * 备注 - */ - private String remark; - - /** - * 所有关联的host - */ - private List hosts; - - /** - * 所有关联的容器 - */ - private List containers; - - /** - * 所有标签 - */ - private List tags; - -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/SmtpVo.java b/src/main/java/com/mzaxd/bps/domain/vo/SmtpVo.java deleted file mode 100644 index 03322e7..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/SmtpVo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author 13439 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class SmtpVo { - /** - * 发送邮箱 - */ - private String serverEmail; - - /** - * 邮箱密码 - */ - private String emailPass; - - /** - * 接收邮箱 - */ - private String notificationEmail; -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/SshLinkVo.java b/src/main/java/com/mzaxd/bps/domain/vo/SshLinkVo.java deleted file mode 100644 index b772a37..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/SshLinkVo.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author 13439 - */ - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class SshLinkVo { - - /** - * 主键id - */ - private Long id; - - /** - * 账号 - */ - private String host; - - /** - * 名称 - */ - private String name; - - /** - * 端口号 - */ - private Integer port; - - /** - * 密码 - */ - private String password; - - /** - * 控制台类型（bash/sh） - */ - private String consoleType; - -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/SystemVo.java b/src/main/java/com/mzaxd/bps/domain/vo/SystemVo.java deleted file mode 100644 index 674181a..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/SystemVo.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * @author 13439 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -public class SystemVo { - - /** - * 过期时间(1、3、7、30) - */ - private Integer logExpire; - - /** - * 检查实例状态间隔(秒) - */ - private Integer checkInstanceStatePeriod; - - /** - * ch/en - */ - private String defaultLang; - -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/TagVo.java b/src/main/java/com/mzaxd/bps/domain/vo/TagVo.java deleted file mode 100644 index 43a1107..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/TagVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.Data; - -/** - * @author 13439 - */ - -@Data -public class TagVo { - - /** - * 主键id - */ - private Long id; - - /** - * 名称 - */ - private String name; -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/TerminalVo.java b/src/main/java/com/mzaxd/bps/domain/vo/TerminalVo.java deleted file mode 100644 index aad163e..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/TerminalVo.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * @author 13439 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -public class TerminalVo { - - /** - * 控制台渲染类型 - */ - private String rendererType; - - /** - * 字体大小 - */ - private Integer fontSize; - - /** - * 光标是否闪烁（0关1开） - */ - private Integer cursorBlink; - - /** - * 字体颜色 - */ - private String foreground; - - /** - * 背景色 - */ - private String background; -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/VirtualMachineListVo.java b/src/main/java/com/mzaxd/bps/domain/vo/VirtualMachineListVo.java deleted file mode 100644 index 93e1e4d..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/VirtualMachineListVo.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.mzaxd.bps.domain.vo; - - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - - -/** - * @author root - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class VirtualMachineListVo { - /** - * 主键id - */ - private Long id; - - /** - * 名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 图像 - */ - private String avatar; - - /** - * 控制台id - */ - private Long sshId; - - /** - * 操作系统id - */ - private Long osId; - - /** - * 操作系统Vo - */ - private OsVo os; - - /** - * 管理ip地址 - */ - private String manageIp; - - /** - * 实际服务器地址(不带协议，不带端口号) - */ - private String serverAddress; - - /** - * 核心线程数 - */ - private Long threads; - - /** - * 内存 - */ - private Long memory; - - /** - * 状态（0在线 1离线 2睡眠） - */ - private Integer hostMachineState; - - /** - * 状态（0不提醒 1浏览器 2邮件 3浏览器&邮件） - */ - private Integer notify; - -} diff --git a/src/main/java/com/mzaxd/bps/domain/vo/VmVo.java b/src/main/java/com/mzaxd/bps/domain/vo/VmVo.java deleted file mode 100644 index 95d8009..0000000 --- a/src/main/java/com/mzaxd/bps/domain/vo/VmVo.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.mzaxd.bps.domain.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * @author root - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -public class VmVo { - - /** - * 主键id - */ - private Long id; - - /** - * 名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - - /** - * 图像 - */ - private String avatar; - - /** - * 宿主机id（0代表物理机没有宿主机） - */ - private Long hostMachineId; - - /** - * 核心线程数 - */ - private Long threads; - - /** - * 内存 - */ - private Long memory; - - /** - * 名称 - */ - private String osName; - - /** - * 实际服务器地址(不带协议，不带端口号) - */ - private String serverAddress; - - /** - * 管理ip地址 - */ - private String manageIp; - - /** - * 1代表Linux 2代表WindowsNT 3代表FreeBSD - */ - private Integer osKernel; - - /** - * 状态（0不提醒 1浏览器 2邮件 3浏览器&邮件） - */ - private Integer notify; - - /** - * SSH连接地址 - */ - private String sshHost; - - /** - * SSH连接地址端口号 - */ - private Integer sshPort; - - /** - * SSH连接用户 - */ - private String sshUser; - - /** - * SSH连接密码 - */ - private String sshPwd; - - - -} diff --git a/src/main/java/com/mzaxd/bps/service/SystemSettingService.java b/src/main/java/com/mzaxd/bps/service/SystemSettingService.java index 41023ad..466885f 100644 --- a/src/main/java/com/mzaxd/bps/service/SystemSettingService.java +++ b/src/main/java/com/mzaxd/bps/service/SystemSettingService.java @@ -3,9 +3,6 @@ package com.mzaxd.bps.service; import com.mzaxd.bps.domain.ResponseResult; import com.mzaxd.bps.domain.entity.SystemSetting; import com.baomidou.mybatisplus.extension.service.IService; -import com.mzaxd.bps.domain.vo.SmtpVo; -import com.mzaxd.bps.domain.vo.SystemVo; -import com.mzaxd.bps.domain.vo.TerminalVo; /** * @author 13439 diff --git a/src/main/java/com/mzaxd/bps/service/UserService.java b/src/main/java/com/mzaxd/bps/service/UserService.java index ce8abd4..4a37326 100644 --- a/src/main/java/com/mzaxd/bps/service/UserService.java +++ b/src/main/java/com/mzaxd/bps/service/UserService.java @@ -3,7 +3,6 @@ package com.mzaxd.bps.service; import com.mzaxd.bps.domain.ResponseResult; import com.mzaxd.bps.domain.entity.User; import com.baomidou.mybatisplus.extension.service.IService; -import com.mzaxd.bps.domain.vo.UserInfoVo; /** * @author root diff --git a/src/main/java/com/mzaxd/bps/service/impl/SystemSettingServiceImpl.java b/src/main/java/com/mzaxd/bps/service/impl/SystemSettingServiceImpl.java index b8d020e..eaba4a4 100644 --- a/src/main/java/com/mzaxd/bps/service/impl/SystemSettingServiceImpl.java +++ b/src/main/java/com/mzaxd/bps/service/impl/SystemSettingServiceImpl.java @@ -3,9 +3,6 @@ package com.mzaxd.bps.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mzaxd.bps.domain.ResponseResult; import com.mzaxd.bps.domain.entity.SystemSetting; -import com.mzaxd.bps.domain.vo.SmtpVo; -import com.mzaxd.bps.domain.vo.SystemVo; -import com.mzaxd.bps.domain.vo.TerminalVo; import com.mzaxd.bps.enums.AppHttpCodeEnum; import com.mzaxd.bps.exception.SystemException; import com.mzaxd.bps.service.SystemSettingService; diff --git a/src/main/java/com/mzaxd/bps/service/impl/UserServiceImpl.java b/src/main/java/com/mzaxd/bps/service/impl/UserServiceImpl.java index ba961cd..3af645e 100644 --- a/src/main/java/com/mzaxd/bps/service/impl/UserServiceImpl.java +++ b/src/main/java/com/mzaxd/bps/service/impl/UserServiceImpl.java @@ -4,8 +4,6 @@ package com.mzaxd.bps.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mzaxd.bps.domain.ResponseResult; import com.mzaxd.bps.domain.entity.User; -import com.mzaxd.bps.domain.vo.ProfileVo; -import com.mzaxd.bps.domain.vo.UserInfoVo; import com.mzaxd.bps.exception.SystemException; import com.mzaxd.bps.mapper.UserMapper; import com.mzaxd.bps.service.UserService; diff --git a/src/main/resources/baidu/linux/BaiduPCS-Go b/src/main/resources/baidu/linux/BaiduPCS-Go new file mode 100644 index 0000000..5c3f131 Binary files /dev/null and b/src/main/resources/baidu/linux/BaiduPCS-Go differ diff --git a/src/main/resources/baidu/win/BaiduPCS-Go.exe b/src/main/resources/baidu/win/BaiduPCS-Go.exe new file mode 100644 index 0000000..25d48c9 Binary files /dev/null and b/src/main/resources/baidu/win/BaiduPCS-Go.exe differ