diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 94b4409..07c3695 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,16 +5,9 @@ - - - - - - - - - + + @@ -191,6 +178,10 @@ + + + + diff --git a/pom.xml b/pom.xml index a7f6353..b1f5555 100644 --- a/pom.xml +++ b/pom.xml @@ -81,18 +81,6 @@ 1.18.20 true - - - org.apache.logging.log4j - log4j-api - 2.17.1 - - - - org.apache.logging.log4j - log4j-core - 2.17.1 - com.github.xiaoymin swagger-bootstrap-ui @@ -295,13 +283,6 @@ org.springframework.boot spring-boot-maven-plugin - - org.apache.maven.plugins - maven-surefire-plugin - - true - - diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java index b9dc3b7..45b839a 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java +++ b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java @@ -68,20 +68,29 @@ public class JdbcDemoController { static { //配置数据源 + //mysql 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.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"); // 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"); + + //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"); } /** @@ -92,13 +101,13 @@ public class JdbcDemoController { //@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 jdbcParamValues = new ArrayList<>(); - for (int i = 2292104; i < 2298700; i++) { + for (int i = 2336115; i < 2339088; i++) { jdbcParamValues.add(i + 1); Gson gson = new Gson(); ResponseDto responseDto = JdbcUtil.executeSql(ds, sql, jdbcParamValues);