Compare commits

..

No commits in common. '3ab84b3627c2819476136929b37af38c88871a3f' and 'a09e2810e3d4ee0c2c742a68f11d2ba863d58ecf' have entirely different histories.

1
.gitignore vendored

@ -4,7 +4,6 @@ target/
/target/*
/.idea/*
/.idea
/.idea/workspace.xml
.idea/*
.idea
.idea/

@ -56,11 +56,6 @@
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="repository" />
<option name="name" value="repository" />
<option name="url" value="http://43.139.89.198:8081/repository/maven-public/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven-central" />
<option name="name" value="maven-central" />

@ -9,9 +9,13 @@
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/WeatherController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/WeatherController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceCity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceCity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/com/rehome/mqttclienttemperature/AdminClientAppmqttserverYfApplicationTests.java" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -33,6 +37,13 @@
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
<option name="userSettingsFile" value="C:\Users\Administrator\.m3\settings.xml" />
</MavenGeneralSettings>
</option>
</component>
<component name="MavenRunner">
<option name="skipTests" value="true" />
</component>
@ -50,9 +61,9 @@
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../Documents/admin-client-temperature" />
<property name="last_opened_file_path" value="$USER_HOME$/Documents/admin-client-temperature" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="project.structure.last.edited" value="SDKs" />
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.20052427" />
<property name="settings.editor.selected.configurable" value="MavenSettings" />
@ -171,10 +182,6 @@
<workItem from="1747644155888" duration="5369000" />
<workItem from="1747658293616" duration="1309000" />
<workItem from="1748326418665" duration="908000" />
<workItem from="1748328055655" duration="102000" />
<workItem from="1749634386339" duration="7000" />
<workItem from="1753115820165" duration="686000" />
<workItem from="1753116771399" duration="1030000" />
</task>
<servers />
</component>

@ -11,7 +11,7 @@
<groupId>com.rehome</groupId>
<artifactId>admin-client-temperature</artifactId>
<version>1.0.0</version>
<packaging>war</packaging>
<packaging>jar</packaging>
<name>admin-client-temperature</name>
<description>admin-client-temperature</description>
<properties>
@ -26,23 +26,17 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>2.1.4</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>mysql</groupId>-->
<!-- <artifactId>mysql-connector-java</artifactId>-->
<!-- <scope>runtime</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
@ -50,6 +44,11 @@
<version>1.1.9</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
@ -269,11 +268,12 @@
</dependency>
<!--webservice 第三方库axis2 maven引用 Spring-axis end-->
</dependencies>
<!--在项目中使用pom.xml进行下载依赖配置的话可以单独使用-->
<!--在项目中使用pom.xml进行下载依赖配置的话可以单独使用
注意项目中使用的maven如果已经在settings.xml中配置过后就无需在配置此项-->
<repositories>
<repository>
<id>repository</id>
<url>http://43.139.89.198:8081/repository/maven-public/</url>
<url>http://47.242.184.139:8081/repository/maven-public/</url>
<releases>
<enabled>true</enabled>
</releases>
@ -283,6 +283,7 @@
</repository>
</repositories>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>

@ -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,14 +16,13 @@ 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 extends SpringBootServletInitializer implements CommandLineRunner, ApplicationContextAware {
public class AdminClientTemperatureApplication implements CommandLineRunner, ApplicationContextAware {
/**
* Spring
@ -48,17 +47,17 @@ public class AdminClientTemperatureApplication extends SpringBootServletInitiali
//在这里可以调用applicationContext了
Map<String, Object> controllers = applicationContext.getBeansWithAnnotation(RequestMapping.class);
for (Map.Entry<String, Object> entry : controllers.entrySet()) {
log.info("------------------------");
log.info(entry.getKey());//demo1Controller
System.out.println("------------------------");
System.out.println(entry.getKey());//demo1Controller
}
try {
if (temperatureService != null) {
log.info("------------------------");
log.info("TemperatureController is not empty");
System.out.println("------------------------");
System.out.println("TemperatureController is not empty");
MqttRSAClient client = new MqttRSAClient();
client.start(temperatureService);
}else {
log.info("temperatureService is empty");
System.out.println("temperatureService is empty");
}
} catch (Exception ex) {
ex.printStackTrace();
@ -69,14 +68,4 @@ public class AdminClientTemperatureApplication extends SpringBootServletInitiali
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
this.applicationContext = applicationContext;
}
/**
* @date 2021-05-18 09:20
* @description: springbootwar springboot
* @Param: SpringApplicationBuilder
*/
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
return builder.sources(AdminClientTemperatureApplication.class);
}
}

@ -4,7 +4,6 @@ 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;
@ -15,7 +14,7 @@ import java.util.Date;
import java.util.Timer;
import java.util.TimerTask;
@Slf4j
// Xiaomi_8B2C
public class MqttRSAClient {
/**
* ip
@ -94,7 +93,7 @@ public class MqttRSAClient {
@Override
public void connectionLost(Throwable throwable) {
log.info("connectionLost");
System.out.println("connectionLost");
try {
mqttClient.reconnect();
} catch (MqttException e) {
@ -105,15 +104,15 @@ public class MqttRSAClient {
@Override
public void messageArrived(String s, MqttMessage mqttMessage) {
String strData = new String(mqttMessage.getPayload());
log.info("topic:"+s);
log.info("Qos:"+mqttMessage.getQos());
log.info("message RSA:"+strData);
temperatureService.saveTemperature(strData,s);
System.out.println("topic:"+s);
System.out.println("Qos:"+mqttMessage.getQos());
System.out.println("message RSA:"+strData);
//temperatureService.saveTemperature(strData,s);
}
@Override
public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) {
log.info("deliveryComplete---------"+ iMqttDeliveryToken.isComplete());
System.out.println("deliveryComplete---------"+ iMqttDeliveryToken.isComplete());
}
@Override
@ -129,17 +128,17 @@ public class MqttRSAClient {
timer = new Timer();
timer.schedule(new TimerTask() {
public void run() {
log.info("-------设定要指定任务--------");
System.out.println("-------设定要指定任务--------");
try {
//判断拦截状态,这里注意一下,如果没有这个判断,是非常坑的
if (!mqttClient.isConnected()) {
log.info("***** 没有连接到服务器 *****");
log.info("***** client to connect *****");
System.out.println("***** 没有连接到服务器 *****");
System.out.println("***** client to connect *****");
// 重新连接
mqttClient.connect(options);
}
if (mqttClient.isConnected()) {//连接成功,跳出连接
log.info("***** connect success *****");
System.out.println("***** connect success *****");
}
} catch (MqttException e1) {
e1.printStackTrace();

@ -70,7 +70,7 @@ public class JdbcDemoController {
//配置数据源
ds.setId("1");
ds.setName("mysql");
ds.setUrl("jdbc:mysql://192.168.3.9:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true");
ds.setUrl("jdbc:mysql://192.168.1.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true");
ds.setUsername("root");
ds.setPassword("Skyinno251,");
ds.setDriver("com.mysql.cj.jdbc.Driver");
@ -98,7 +98,7 @@ public class JdbcDemoController {
CompletableFuture<String> future = CompletableFuture.supplyAsync(() -> {
String sql = "select * from temperature where id = ?";
List<Object> jdbcParamValues = new ArrayList<>();
for (int i = 2320438; i < 2329243; i++) {
for (int i = 2292104; i < 2298700; i++) {
jdbcParamValues.add(i + 1);
Gson gson = new Gson();
ResponseDto responseDto = JdbcUtil.executeSql(ds, sql, jdbcParamValues);
@ -152,7 +152,7 @@ public class JdbcDemoController {
*
* @return
*/
//@RequestMapping("/api/getResult")
@RequestMapping("/api/getResult")
public String getResult() {
// 自定义一个线程池,内部包含4个线程
ExecutorService executorService = Executors.newFixedThreadPool(4);
@ -180,7 +180,7 @@ public class JdbcDemoController {
*
* @return
*/
//@RequestMapping("/api/getResult0")
@RequestMapping("/api/getResult0")
public String getResult0() {
// 自定义一个线程池,内部包含4个线程
ExecutorService executorService = Executors.newFixedThreadPool(4);

@ -32,16 +32,13 @@ public class Temperature implements Serializable {
@Id
@ApiModelProperty(value = "主键")
@GeneratedValue(strategy = GenerationType.SEQUENCE,generator="temperature_seq")
@SequenceGenerator(name="temperature_seq", sequenceName="temperature_seq_appserver",initialValue = 1,allocationSize = 1)
//@GeneratedValue(strategy = GenerationType.SEQUENCE)
@SequenceGenerator(name="temperature_seq", sequenceName="temperature_seq_appserver")
private Long id;
@ApiModelProperty(value = "温度")
@Column(length=10)
private String temperature;
@ApiModelProperty(value = "湿度")
@Column(length=10)
private String humidity;
@ApiModelProperty(value = "日期")

@ -1,12 +1,6 @@
server:
port: 8873
# 日志配置
logging:
level:
root: INFO
file:
path: /root/temperature_war
spring:
datasource:
@ -33,19 +27,12 @@ spring:
url: jdbc:oracle:thin:@192.168.3.9:1521/orcl
username: appserver
password: appserver
# driverClassName: oracle.jdbc.driver.OracleDriver
# url: jdbc:oracle:thin:@192.168.3.9:1521/orcl
# username: huangwenfei
# password: huangwenfei
jpa:
database: oracle # 配置 DBMS 类型
show-sql: true # 配置是否将执行的 SQL 输出到日志
open-in-view: true
hibernate:
ddl-auto: update # 第一次建表create 后面用update要不然每次重启都会新建表
properties:
hibernate:
format_sql: true
servlet:
multipart:
# 开启 multipart 上传功能

@ -0,0 +1,13 @@
package com.rehome.mqttclienttemperature;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
class AdminClientAppmqttserverYfApplicationTests {
@Test
void contextLoads() {
}
}
Loading…
Cancel
Save