diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 4040c77..b9a0874 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -56,6 +56,11 @@
+
+
+
+
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e56da5b..dea06f6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,8 +5,13 @@
-
+
+
+
+
+
+
@@ -28,13 +33,6 @@
-
-
-
@@ -52,9 +50,9 @@
-
+
-
+
@@ -175,6 +173,8 @@
+
+
diff --git a/pom.xml b/pom.xml
index f6a2948..74a764d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.rehome
admin-client-temperature
1.0.0
- jar
+ war
admin-client-temperature
admin-client-temperature
@@ -26,17 +26,23 @@
org.springframework.boot
spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-logging
+
+
org.mybatis.spring.boot
mybatis-spring-boot-starter
2.1.4
-
- mysql
- mysql-connector-java
- runtime
-
+
+
+
+
+
com.alibaba
@@ -44,11 +50,6 @@
1.1.9
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
org.eclipse.paho
org.eclipse.paho.client.mqttv3
@@ -268,12 +269,11 @@
-
+
repository
- http://47.242.184.139:8081/repository/maven-public/
+ http://43.139.89.198:8081/repository/maven-public/
true
@@ -283,7 +283,6 @@
- ${project.artifactId}
org.springframework.boot
diff --git a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java
index ab6b4c2..f3e16ca 100644
--- a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java
+++ b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java
@@ -2,12 +2,12 @@ package com.rehome.mqttclienttemperature;
import com.rehome.mqttclienttemperature.service.TemperatureService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeansException;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
@@ -16,13 +16,14 @@ import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.web.bind.annotation.RequestMapping;
import javax.annotation.Resource;
import java.util.Map;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
+@Slf4j
@EnableJpaAuditing
@EnableScheduling
@EnableAsync
@SpringBootApplication
-public class AdminClientTemperatureApplication implements CommandLineRunner, ApplicationContextAware {
+public class AdminClientTemperatureApplication extends SpringBootServletInitializer implements CommandLineRunner, ApplicationContextAware {
/**
* 获取Spring框架的上下文
@@ -47,17 +48,17 @@ public class AdminClientTemperatureApplication implements CommandLineRunner, App
//在这里可以调用applicationContext了
Map controllers = applicationContext.getBeansWithAnnotation(RequestMapping.class);
for (Map.Entry entry : controllers.entrySet()) {
- System.out.println("------------------------");
- System.out.println(entry.getKey());//demo1Controller
+ log.info("------------------------");
+ log.info(entry.getKey());//demo1Controller
}
try {
if (temperatureService != null) {
- System.out.println("------------------------");
- System.out.println("TemperatureController is not empty");
+ log.info("------------------------");
+ log.info("TemperatureController is not empty");
MqttRSAClient client = new MqttRSAClient();
client.start(temperatureService);
}else {
- System.out.println("temperatureService is empty");
+ log.info("temperatureService is empty");
}
} catch (Exception ex) {
ex.printStackTrace();
@@ -68,4 +69,14 @@ public class AdminClientTemperatureApplication implements CommandLineRunner, App
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
this.applicationContext = applicationContext;
}
+
+ /**
+ * @date 2021-05-18 09:20
+ * @description: 容器配置，springboot打war包布署必须添加这个配置 为了打包springboot项目
+ * @Param: SpringApplicationBuilder
+ */
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+ return builder.sources(AdminClientTemperatureApplication.class);
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java b/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java
index 74c96fd..aecb00b 100644
--- a/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java
+++ b/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java
@@ -4,6 +4,7 @@ package com.rehome.mqttclienttemperature;
import com.rehome.mqttclienttemperature.service.TemperatureService;
import com.rehome.mqttclienttemperature.utils.MqttSSLSocketFactory;
import com.rehome.mqttclienttemperature.utils.UUIDUtil;
+import lombok.extern.slf4j.Slf4j;
import org.eclipse.paho.client.mqttv3.*;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
@@ -14,7 +15,7 @@ import java.util.Date;
import java.util.Timer;
import java.util.TimerTask;
-// Xiaomi_8B2C
+@Slf4j
public class MqttRSAClient {
/**
* 代理服务器ip地址
@@ -93,7 +94,7 @@ public class MqttRSAClient {
@Override
public void connectionLost(Throwable throwable) {
- System.out.println("connectionLost");
+ log.info("connectionLost");
try {
mqttClient.reconnect();
} catch (MqttException e) {
@@ -104,15 +105,15 @@ public class MqttRSAClient {
@Override
public void messageArrived(String s, MqttMessage mqttMessage) {
String strData = new String(mqttMessage.getPayload());
- System.out.println("topic:"+s);
- System.out.println("Qos:"+mqttMessage.getQos());
- System.out.println("message RSA:"+strData);
- //temperatureService.saveTemperature(strData,s);
+ log.info("topic:"+s);
+ log.info("Qos:"+mqttMessage.getQos());
+ log.info("message RSA:"+strData);
+ temperatureService.saveTemperature(strData,s);
}
@Override
public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) {
- System.out.println("deliveryComplete---------"+ iMqttDeliveryToken.isComplete());
+ log.info("deliveryComplete---------"+ iMqttDeliveryToken.isComplete());
}
@Override
@@ -128,17 +129,17 @@ public class MqttRSAClient {
timer = new Timer();
timer.schedule(new TimerTask() {
public void run() {
- System.out.println("-------设定要指定任务--------");
+ log.info("-------设定要指定任务--------");
try {
//判断拦截状态，这里注意一下，如果没有这个判断，是非常坑的
if (!mqttClient.isConnected()) {
- System.out.println("***** 没有连接到服务器 *****");
- System.out.println("***** client to connect *****");
+ log.info("***** 没有连接到服务器 *****");
+ log.info("***** client to connect *****");
// 重新连接
mqttClient.connect(options);
}
if (mqttClient.isConnected()) {//连接成功，跳出连接
- System.out.println("***** connect success *****");
+ log.info("***** connect success *****");
}
} catch (MqttException e1) {
e1.printStackTrace();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fea2bd7..3fc667e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,12 @@
server:
port: 8873
+# 日志配置
+logging:
+ level:
+ root: INFO
+ file:
+ path: /root/temperature_war
spring:
datasource:
diff --git a/src/test/java/com/rehome/mqttclienttemperature/AdminClientAppmqttserverYfApplicationTests.java b/src/test/java/com/rehome/mqttclienttemperature/AdminClientAppmqttserverYfApplicationTests.java
deleted file mode 100644
index c4abe66..0000000
--- a/src/test/java/com/rehome/mqttclienttemperature/AdminClientAppmqttserverYfApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.rehome.mqttclienttemperature;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class AdminClientAppmqttserverYfApplicationTests {
-
- @Test
- void contextLoads() {
- }
-
-}