zishuo/FastBee
1
0
Fork 0
mirror of https://github.com/kerwincui/FastBee.git synced 2025-09-26 20:31:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

build(依赖包整理): 依赖包版本统一整理

Browse Source
This commit is contained in:
zhuangpeng.li
2025-04-16 14:31:24 +08:00
parent b86acd933b
commit e404cd26d4
14 changed files with 85 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
springboot/fastbee-admin/pom.xml
View File

@@ -34,7 +34,7 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>1.6.2</version>
<version>${io.swagger.version}</version>
</dependency>
<!-- Mysql驱动包 -->

13
springboot/fastbee-common/pom.xml
View File

@@ -40,6 +40,7 @@
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
@@ -74,7 +75,6 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>3.5.2</version>
</dependency>
<!-- 阿里JSON解析器 -->
@@ -150,20 +150,11 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.6.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
<version>1.2.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
<version>1.2.5</version>
<scope>compile</scope>
</dependency>
<dependency>

20
springboot/fastbee-common/src/main/java/com/fastbee/common/utils/DateUtils.java
View File

@@ -1,18 +1,14 @@
package com.fastbee.common.utils;
import org.apache.commons.lang3.time.DateFormatUtils;
import java.lang.management.ManagementFactory;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.*;
import java.util.Date;
import java.util.Random;
import org.apache.commons.lang3.time.DateFormatUtils;
/**
* 时间工具类
*
@@ -160,16 +156,20 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
}
/**
* 计算两个时间差
* 计算时间差
*
* @param endDate 最后时间
* @param startTime 开始时间
* @return 时间差（天/小时/分钟）
*/
public static String getDatePoor(Date endDate, Date nowDate)
public static String timeDistance(Date endDate, Date startTime)
{
long nd = 1000 * 24 * 60 * 60;
long nh = 1000 * 60 * 60;
long nm = 1000 * 60;
// long ns = 1000;
// 获得两个时间的毫秒时间差异
long diff = endDate.getTime() - nowDate.getTime();
long diff = endDate.getTime() - startTime.getTime();
// 计算差多少天
long day = diff / nd;
// 计算差多少小时

21
springboot/fastbee-framework/src/main/java/com/fastbee/framework/web/domain/Server.java
View File

@@ -1,16 +1,8 @@
package com.fastbee.framework.web.domain;
import java.net.UnknownHostException;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
import com.fastbee.common.utils.Arith;
import com.fastbee.common.utils.ip.IpUtils;
import com.fastbee.framework.web.domain.server.Cpu;
import com.fastbee.framework.web.domain.server.Jvm;
import com.fastbee.framework.web.domain.server.Mem;
import com.fastbee.framework.web.domain.server.Sys;
import com.fastbee.framework.web.domain.server.SysFile;
import com.fastbee.framework.web.domain.server.*;
import oshi.SystemInfo;
import oshi.hardware.CentralProcessor;
import oshi.hardware.CentralProcessor.TickType;
@@ -21,15 +13,20 @@ import oshi.software.os.OSFileStore;
import oshi.software.os.OperatingSystem;
import oshi.util.Util;
import java.net.UnknownHostException;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
/**
* 服务器相关信息
*
*
* @author ruoyi
*/
public class Server
{
private static final int OSHI_WAIT_SECOND = 1000;
/**
* CPU相关信息
*/
@@ -209,7 +206,7 @@ public class Server
/**
* 字节转换
*
*
* @param size 字节大小
* @return 转换后值
*/

3
springboot/fastbee-framework/src/main/java/com/fastbee/framework/web/domain/server/Cpu.java
View File

@@ -1,10 +1,11 @@
package com.fastbee.framework.web.domain.server;
import com.fastbee.common.utils.Arith;
/**
* CPU相关信息
*
*
* @author ruoyi
*/
public class Cpu

8
springboot/fastbee-framework/src/main/java/com/fastbee/framework/web/domain/server/Jvm.java
View File

@@ -1,12 +1,14 @@
package com.fastbee.framework.web.domain.server;
import java.lang.management.ManagementFactory;
import com.fastbee.common.utils.Arith;
import com.fastbee.common.utils.DateUtils;
import java.lang.management.ManagementFactory;
/**
* JVM相关信息
*
*
* @author ruoyi
*/
public class Jvm
@@ -117,7 +119,7 @@ public class Jvm
*/
public String getRunTime()
{
return DateUtils.getDatePoor(DateUtils.getNowDate(), DateUtils.getServerStartDate());
return DateUtils.timeDistance(DateUtils.getNowDate(), DateUtils.getServerStartDate());
}
/**

3
springboot/fastbee-framework/src/main/java/com/fastbee/framework/web/domain/server/Mem.java
View File

@@ -1,10 +1,11 @@
package com.fastbee.framework.web.domain.server;
import com.fastbee.common.utils.Arith;
/**
* 內存相关信息
*
*
* @author ruoyi
*/
public class Mem

2
springboot/fastbee-framework/src/main/java/com/fastbee/framework/web/domain/server/Sys.java
View File

@@ -2,7 +2,7 @@ package com.fastbee.framework.web.domain.server;
/**
* 系统相关信息
*
*
* @author ruoyi
*/
public class Sys

2
springboot/fastbee-framework/src/main/java/com/fastbee/framework/web/domain/server/SysFile.java
View File

@@ -2,7 +2,7 @@ package com.fastbee.framework.web.domain.server;
/**
* 系统文件相关信息
*
*
* @author ruoyi
*/
public class SysFile

1
springboot/fastbee-gateway/fastbee-mq/pom.xml
View File

@@ -20,6 +20,7 @@
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-mqtt-client</artifactId>

1
springboot/fastbee-gateway/gateway-boot/pom.xml
View File

@@ -17,6 +17,7 @@
<groupId>com.fastbee</groupId>
<artifactId>fastbee-mq</artifactId>
</dependency>
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-mqtt-client</artifactId>

1
springboot/fastbee-plugs/fastbee-ruleEngine/pom.xml
View File

@@ -38,7 +38,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>${commons.text.version}</version>
</dependency>
</dependencies>

10
springboot/fastbee-service/fastbee-iot-service/pom.xml
View File

@@ -23,12 +23,12 @@
<groupId>com.fastbee</groupId>
<artifactId>fastbee-common</artifactId>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.6.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
@@ -41,10 +41,10 @@
<groupId>com.fastbee</groupId>
<artifactId>fastbee-quartz</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.6</version>
</dependency>
<!-- oauth2-->
<dependency>
@@ -62,10 +62,10 @@
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
<version>1.2.5</version>
</dependency>
<!--AES-->
@@ -94,7 +94,7 @@
<dependency>
<groupId>com.taosdata.jdbc</groupId>
<artifactId>taos-jdbcdriver</artifactId>
<version>2.0.38</version>
<version>${tdengine.version}</version>
</dependency>
<!-- TDengine连接 END-->

64
springboot/pom.xml
View File

@@ -18,17 +18,16 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-boot.version>2.5.15</spring-boot.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<druid.version>1.2.15</druid.version>
<bitwalker.version>1.21</bitwalker.version>
<swagger.version>3.0.0</swagger.version>
<io.swagger.version>1.6.2</io.swagger.version>
<kaptcha.version>2.3.3</kaptcha.version>
<mybatis-spring-boot.version>2.2.0</mybatis-spring-boot.version>
<pagehelper.boot.version>1.4.6</pagehelper.boot.version>
<fastjson.version>2.0.20</fastjson.version>
<oshi.version>6.1.6</oshi.version>
<jna.version>5.9.0</jna.version>
<commons.io.version>2.11.0</commons.io.version>
<oshi.version>6.6.5</oshi.version>
<jna.version>5.13.0</jna.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
<commons.collections.version>3.2.2</commons.collections.version>
<poi.version>4.1.2</poi.version>
@@ -42,12 +41,25 @@
<mapstruct.version>1.5.5.Final</mapstruct.version>
<mybatis-plus.version>3.5.3.1</mybatis-plus.version>
<mybatis-plus-generator.version>3.5.3.1</mybatis-plus-generator.version>
<dynamic-datasource.version>4.3.1</dynamic-datasource.version>
<tdengine.version>2.0.38</tdengine.version>
<guava.version>32.0.1-jre</guava.version>
<!-- <redisson.version>3.15.6</redisson.version>-->
<lock4j.version>2.2.3</lock4j.version>
<easyexcel.version>3.3.1</easyexcel.version>
<liteflow.version>2.12.2</liteflow.version>
<commons.text.version>1.10.0</commons.text.version>
<paho.mqtt.version>1.2.5</paho.mqtt.version>
<druid.version>1.2.23</druid.version>
<pagehelper.boot.version>1.4.7</pagehelper.boot.version>
<fastjson.version>2.0.53</fastjson.version>
<oshi.version>6.6.5</oshi.version>
<commons.io.version>2.13.0</commons.io.version>
<!-- override dependency version -->
<tomcat.version>9.0.102</tomcat.version>
<logback.version>1.2.13</logback.version>
<spring-security.version>5.7.12</spring-security.version>
<spring-framework.version>5.3.39</spring-framework.version>
</properties>
<!-- 依赖声明 -->
@@ -96,6 +108,25 @@
<version>${mybatis-plus-generator.version}</version>
</dependency>
<!-- 动态数据源 -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>${dynamic-datasource.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
<version>${paho.mqtt.version}</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${io.swagger.version}</version>
</dependency>
<!-- pagehelper 分页插件 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
@@ -149,6 +180,12 @@
<version>${commons.fileupload.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>${commons.text.version}</version>
</dependency>
<!-- excel工具 -->
<dependency>
<groupId>org.apache.poi</groupId>
@@ -272,12 +309,6 @@
<version>${fastbee.version}</version>
</dependency>
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-oss</artifactId>
<version>${fastbee.version}</version>
</dependency>
<!--基于netty的MqttBroker-->
<dependency>
<groupId>com.fastbee</groupId>
@@ -332,12 +363,7 @@
<artifactId>boot-strap</artifactId>
<version>${fastbee.version}</version>
</dependency>
<!--协议解析基础模块-->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-protocol-base</artifactId>
<version>${fastbee.version}</version>
</dependency>
<!--网关启动模块-->
<dependency>
<groupId>com.fastbee</groupId>