diff --git a/admin-client-temperature.iml b/admin-client-temperature.iml index 3119143..f792840 100644 --- a/admin-client-temperature.iml +++ b/admin-client-temperature.iml @@ -17,6 +17,7 @@ + diff --git a/pom.xml b/pom.xml index 4a72afe..c8cbcb2 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.rehome admin-client-temperature 1.0.0 - war + jar admin-client-temperature admin-client-temperature diff --git a/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java b/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java index 6318f9d..74c96fd 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java +++ b/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java @@ -107,7 +107,7 @@ public class MqttRSAClient { System.out.println("topic:"+s); System.out.println("Qos:"+mqttMessage.getQos()); System.out.println("message RSA:"+strData); - temperatureService.saveTemperature(strData,s); + //temperatureService.saveTemperature(strData,s); } @Override diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java index 639865d..8128ea8 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java +++ b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java @@ -69,12 +69,12 @@ public class JdbcDemoController { static { //配置数据源 //mysql - 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.setUsername("root"); - ds.setPassword("Skyinno251,"); - ds.setDriver("com.mysql.cj.jdbc.Driver"); +// 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.setUsername("root"); +// ds.setPassword("Skyinno251,"); +// ds.setDriver("com.mysql.cj.jdbc.Driver"); // oracle // ds.setId("2"); @@ -85,12 +85,12 @@ public class JdbcDemoController { // ds.setDriver("oracle.jdbc.driver.OracleDriver"); //postgres -// ds.setId("3"); -// ds.setName("postgres"); -// ds.setUrl("jdbc:postgresql://192.168.3.24:5432/postgres"); -// ds.setUsername("postgres"); -// ds.setPassword("452131wW"); -// ds.setDriver("org.postgresql.Driver"); + ds.setId("3"); + ds.setName("postgres"); + ds.setUrl("jdbc:postgresql://192.168.3.24:5432/postgres"); + ds.setUsername("postgres"); + ds.setPassword("452131wW"); + ds.setDriver("org.postgresql.Driver"); } /** @@ -98,7 +98,7 @@ public class JdbcDemoController { * * @return */ - //@RequestMapping("/api/list") + @RequestMapping("/api/list") public ResponseDto queryList() { // 自定义一个线程池,内部包含8个线程 ExecutorService customPool = Executors.newFixedThreadPool(2); @@ -107,7 +107,7 @@ public class JdbcDemoController { CompletableFuture future = CompletableFuture.supplyAsync(() -> { String sql = "select * from temperature where id = ?"; List jdbcParamValues = new ArrayList<>(); - for (int i = 0; i < 2390470; i++) { + for (int i = 0; i < 2500470; i++) { jdbcParamValues.add(i + 1); Gson gson = new Gson(); ResponseDto responseDto = JdbcUtil.executeSql(ds, sql, jdbcParamValues); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1b53ba5..e60a894 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -22,7 +22,7 @@ spring: #url: jdbc:mysql://192.168.3.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true #url: jdbc:mysql://192.168.1.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true #url: jdbc:mysql://47.242.184.139:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true - url: jdbc:postgresql://192.168.3.26:5432/appserver + url: jdbc:postgresql://192.168.3.26:5432/postgres driverClassName: org.postgresql.Driver #com.mysql.cj.jdbc.Driver com.mysql.jdbc.Driver username: postgres password: 452131wW