Skip to content

thinglinks
thinglinks

mqttsnet / thinglinks

通知 1
Star 2
Fork 0
thinglinks
thinglinks

体验新版 GitCode，发现更多精彩内容 >>

提交 7e1044f1 编写于 作者: xiaonannet's avatar xiaonannet
浏览文件
操作

调整服务器采集服务配置

上级 7d481f4c
隐藏空白更改
内联 并排
Showing with 191 addition and 47 deletion
README.md
浏览文件 @ 7e1044f1
......@@ -55,6 +55,7 @@ com.mqttsnet.thinglinks
└── thinglinks-modules-broker // broker服务 [19306]、[MQTT-TCP:11883]、[MQTT-SSL:18443]、[MQTT-WS:18999]
├── thinglinks-visual // 图形化管理模块
│ └── thinglinks-visual-monitor // 监控中心 [19400]
│ └── thinglinks-visual-collection // 服务器监控采集服务 [19401]
├──pom.xml // 公共依赖
~~~
......
thinglinks-visual/thinglinks-visual-collection/pom.xml
浏览文件 @ 7e1044f1
......@@ -3,14 +3,25 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>thinglinks-visual</artifactId>
<groupId>com.mqttsnet</groupId>
<version>1.0.0-RELEASE</version>
<artifactId>thinglinks-visual</artifactId>
<version>${thinglinks.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>thinglinks-visual-collection</artifactId>
<description>
thinglinks-visual-collection 服务器监控采集服务
</description>
<properties>
<!--打包目录-->
<thinglinks.package.url>D:\thinglinks-server\collection</thinglinks.package.url>
<!--启动类目录-->
<thinglinks.mainClass.url>com.mqttsnet.thinglinks.collection.ThingLinksCollectionApplication</thinglinks.mainClass.url>
</properties>
<dependencies>
<!-- SpringCloud Alibaba Nacos -->
......@@ -25,10 +36,46 @@
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!-- SpringBoot Actuator -->
<!-- SpringCloud Alibaba Sentinel -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
</dependency>
<!-- SpringBoot Web -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- Spring Security -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>5.3.6</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.10.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform -->
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.10.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<!-- Swagger UI -->
......@@ -59,29 +106,113 @@
<version>${thinglinks.version}</version>
</dependency>
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>5.3.6</version>
</dependency>
</dependencies>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.10.0</version>
</dependency>
<build>
<plugins>
<!--打包jar-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<!-- &lt;!&ndash;不打包资源文件&ndash;&gt;-->
<excludes>
<exclude>*.**</exclude>
<exclude>*/*.xml</exclude>
</excludes>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<!--MANIFEST.MF 中 Class-Path 加入前缀-->
<classpathPrefix>../lib/</classpathPrefix>
<!--jar包不包含唯一版本标识-->
<useUniqueVersions>false</useUniqueVersions>
<!--指定入口类-->
<mainClass>${thinglinks.mainClass.url}</mainClass>
</manifest>
<manifestEntries>
<!--MANIFEST.MF 中 Class-Path 加入资源文件目录-->
<Class-Path>./resources/</Class-Path>
</manifestEntries>
</archive>
<outputDirectory>${thinglinks.package.url}</outputDirectory>
</configuration>
</plugin>
<!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform -->
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.10.0</version>
</dependency>
<!--拷贝依赖 copy-dependencies-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>
${thinglinks.lib.package.url}
</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<!--拷贝资源文件 copy-resources-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<outputDirectory>${thinglinks.package.url}/resources</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</dependencies>
<!--spring boot repackage，依赖 maven-jar-plugin 打包的jar包 重新打包成 spring boot 的jar包-->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.5.5</version>
<configuration>
<!--重写包含依赖，包含不存在的依赖，jar里没有pom里的依赖-->
<includes>
<include>
<groupId>null</groupId>
<artifactId>null</artifactId>
</include>
</includes>
<layout>ZIP</layout>
<!--使用外部配置文件，jar包里没有资源文件-->
<addResources>true</addResources>
<outputDirectory>${thinglinks.package.url}</outputDirectory>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
<configuration>
<!--配置jar包特殊标识 配置后，保留原文件，生成新文件 *-run.jar -->
<!--配置jar包特殊标识 不配置，原文件命名为 *.jar.original，生成新文件 *.jar -->
<!--<classifier>run</classifier>-->
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
thinglinks-visual/thinglinks-visual-collection/src/main/java/com/mqttsnet/thinglinks/collection/ThingLinksCollectionApplication.java
浏览文件 @ 7e1044f1
......@@ -19,16 +19,7 @@ public class ThingLinksCollectionApplication {
public static void main(String[] args) {
{
SpringApplication.run(ThingLinksCollectionApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ 服务采集系统启动成功 ლ(´ڡ`ლ)ﾞ \n" +
" .-------. ____ __ \n" +
" | _ _ \\ \\ \\ / / \n" +
" | ( ' ) | \\ _. / ' \n" +
" |(_ o _) / _( )_ .' \n" +
" | (_,_).' __ ___(_ o _)' \n" +
" | |\\ \\ | || |(_,_)' \n" +
" | | \\ `' /| `-' / \n" +
" | | \\ / \\ / \n" +
" ''-' `'-' `-..-' ");
System.out.println("(♥◠‿◠)ﾉﾞ 服务器监控采集服务启动成功 ლ(´ڡ`ლ)ﾞ ");
}
}
......
thinglinks-visual/thinglinks-visual-collection/src/main/java/com/mqttsnet/thinglinks/collection/common/job/ScheduledJob.java
浏览文件 @ 7e1044f1
package com.mqttsnet.thinglinks.collection.common.job;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.mqttsnet.thinglinks.collection.common.mq.CollectionProducer;
import com.mqttsnet.thinglinks.collection.common.recketmq.CollectionProducer;
import com.mqttsnet.thinglinks.collection.entity.*;
import com.mqttsnet.thinglinks.collection.util.FormatUtil;
import com.mqttsnet.thinglinks.collection.util.OshiUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
......@@ -19,10 +15,8 @@ import oshi.hardware.HardwareAbstractionLayer;
import oshi.software.os.OperatingSystem;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
/**
* 定时推送服务数据
......
thinglinks-visual/thinglinks-visual-collection/src/main/java/com/mqttsnet/thinglinks/collection/common/mq/CollectionProducer.java → thinglinks-visual/thinglinks-visual-collection/src/main/java/com/mqttsnet/thinglinks/collection/common/recketmq/CollectionProducer.java
浏览文件 @ 7e1044f1
package com.mqttsnet.thinglinks.collection.common.mq;
package com.mqttsnet.thinglinks.collection.common.recketmq;
import com.mqttsnet.thinglinks.common.core.utils.DateUtils;
import lombok.extern.slf4j.Slf4j;
......@@ -6,8 +6,6 @@ import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
/**
* 采集数据生产
*/
......@@ -19,9 +17,9 @@ public class CollectionProducer {
private RocketMQTemplate rocketMQTemplate;
public void senJsonObject(String topic, String json) {
log.info(DateUtils.formatYYYY_MM_DD_HH_MM_SS(LocalDateTime.now()) + ":MQ生产消息开始");
log.info(DateUtils.getTime() + ":MQ生产消息开始");
rocketMQTemplate.convertAndSend(topic, json);
log.info(DateUtils.formatYYYY_MM_DD_HH_MM_SS(LocalDateTime.now()) + ":MQ生产消息结束");
log.info(DateUtils.getTime() + ":MQ生产消息结束");
}
}
thinglinks-visual/thinglinks-visual-collection/src/main/resources/bootstrap.yml 0 → 100644
浏览文件 @ 7e1044f1
# Tomcat
server:
port: 19400
# Spring
spring:
application:
# 应用名称
name: thinglinks-collection
profiles:
# 环境配置
active: dev
cloud:
nacos:
discovery:
# 配置中心地址
server-addr: 49.235.122.136:8848
#命名空间
namespace: fffe6c69-d6cb-44fd-b542-8167d8a0c29d
config:
# 配置中心地址
server-addr: 49.235.122.136:8848
#命名空间
namespace: fffe6c69-d6cb-44fd-b542-8167d8a0c29d
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或