diff --git a/admin-client-temperature.iml b/admin-client-temperature.iml
index 881a08a..60dcaf7 100644
--- a/admin-client-temperature.iml
+++ b/admin-client-temperature.iml
@@ -10,9 +10,7 @@
-
-
-
+
diff --git a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java
index 2c5ef5d..977633f 100644
--- a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java
+++ b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java
@@ -19,9 +19,9 @@ import javax.annotation.Resource;
import java.util.Map;
@Slf4j
-@EnableJpaAuditing
-@EnableScheduling
-@EnableAsync
+//@EnableJpaAuditing
+//@EnableScheduling
+//@EnableAsync
@SpringBootApplication
public class AdminClientTemperatureApplication implements CommandLineRunner, ApplicationContextAware {
diff --git a/src/main/java/com/rehome/mqttclienttemperature/MqttDianDengTechClient.java b/src/main/java/com/rehome/mqttclienttemperature/MqttDianDengTechClient.java
index 035efcc..7380905 100644
--- a/src/main/java/com/rehome/mqttclienttemperature/MqttDianDengTechClient.java
+++ b/src/main/java/com/rehome/mqttclienttemperature/MqttDianDengTechClient.java
@@ -112,7 +112,7 @@ public class MqttDianDengTechClient {
log.info("message RSA:"+strData);
if(strData!=null&&strData.length()>=11){
String[] strDataTemperature = strData.split(" ");
- temperatureEspService.saveTemperature(strDataTemperature[0],strDataTemperature[1],s);
+ //temperatureEspService.saveTemperature(strDataTemperature[0],strDataTemperature[1],s);
}
}
diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java
index c0a6ca9..db3d044 100644
--- a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java
+++ b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java
@@ -53,7 +53,7 @@ import java.util.concurrent.*;
*/
@Slf4j
-@RestController
+//@RestController
public class JdbcDemoController {
@Resource
@@ -64,20 +64,26 @@ public class JdbcDemoController {
static {
//配置数据源
- ds.setId("1");
- ds.setName("mysql");
- 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");
+// ds.setId("1");
+// ds.setName("mysql");
+// 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");
// ds.setId("2");
// ds.setName("oracle");
-// ds.setUrl("jdbc:oracle:thin:@192.168.1.9:1521/orcl");
-// ds.setUrl("jdbc:oracle:thin:@192.168.3.7:1521/orcl");
+// ds.setUrl("jdbc:oracle:thin:@192.168.3.9:1521/orcl");
// ds.setUsername("appserver");
// ds.setPassword("appserver");
// ds.setDriver("oracle.jdbc.driver.OracleDriver");
+
+ ds.setId("3");
+ ds.setName("sqlserver");
+ ds.setUrl("jdbc:sqlserver://192.168.3.29:1433;DatabaseName=appserver;encrypt=false");
+ ds.setUsername("sa");
+ ds.setPassword("452131wW");
+ ds.setDriver("com.microsoft.sqlserver.jdbc.SQLServerDriver");
}
/**
@@ -85,16 +91,16 @@ public class JdbcDemoController {
*
* @return
*/
- //@RequestMapping("/api/list")
+ @RequestMapping("/api/list")
public ResponseDto queryList() {
// 自定义一个线程池,内部包含8个线程
- ExecutorService customPool = Executors.newFixedThreadPool(8);
+ ExecutorService customPool = Executors.newFixedThreadPool(2);
// 自定义一个线程池,内部包含10个线程
ExecutorService executorService = Executors.newFixedThreadPool(10);
CompletableFuture future = CompletableFuture.supplyAsync(() -> {
String sql = "select * from temperature where id = ?";
List