From 6b6de845fca7e2087a55eda0c296ad01d89b2828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E6=BC=8F=E6=B4=9E?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=8C=E6=88=90?= <> Date: Sun, 1 Jun 2025 16:33:37 +0800 Subject: [PATCH] df --- pom.xml | 8 ++++- .../AdminClientTemperatureApplication.java | 12 +++++++- .../entity/Temperature.java | 2 ++ .../service/impl/TemperatureServiceImpl.java | 4 +-- src/main/resources/application.yml | 29 +++++++++---------- 5 files changed, 36 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index f6a2948..a7f6353 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 @@ -267,6 +267,12 @@ 1.7.9 + + + org.postgresql + postgresql + runtime + diff --git a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java index ab6b4c2..f9ad541 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java +++ b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java @@ -22,7 +22,7 @@ import java.util.Map; @EnableScheduling @EnableAsync @SpringBootApplication -public class AdminClientTemperatureApplication implements CommandLineRunner, ApplicationContextAware { +public class AdminClientTemperatureApplication extends SpringBootServletInitializer implements CommandLineRunner, ApplicationContextAware { /** * 获取Spring框架的上下文 @@ -38,6 +38,16 @@ public class AdminClientTemperatureApplication implements CommandLineRunner, App SpringApplication.run(AdminClientTemperatureApplication.class, args); } + /** + * @date 2025-06-01 14:32 + * @description: 容器配置，springboot打war包布署必须添加这个配置 为了打包springboot项目 + * @Param: SpringApplicationBuilder + */ + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { + return builder.sources(AdminClientTemperatureApplication.class); + } + /** * 调用 applicationContext(不能在main中使用,main是static的,不能调用) * @param args diff --git a/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java b/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java index ea6481a..4a2a5a4 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java +++ b/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java @@ -36,9 +36,11 @@ public class Temperature implements Serializable { private Long id; @ApiModelProperty(value = "温度") + @Column(length=10) private String temperature; @ApiModelProperty(value = "湿度") + @Column(length=10) private String humidity; @ApiModelProperty(value = "日期") diff --git a/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java b/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java index 6e44f1b..bf59e32 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java +++ b/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java @@ -64,8 +64,8 @@ public class TemperatureServiceImpl implements TemperatureService { temperature.setTemperature(strDataTemperature[1]); this.temperatureRepository.save(temperature); - ResponseDto responseDto = this.oracleTemperatureService.saveTemperature(temperature); - log.info(new Gson().toJson(responseDto)); + //ResponseDto responseDto = this.oracleTemperatureService.saveTemperature(temperature); + //log.info(new Gson().toJson(responseDto)); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 209afee..ced307a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,10 +10,6 @@ logging: spring: datasource: type: com.zaxxer.hikari.HikariDataSource -# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=appserver;encrypt=false; -# username: sa -# password: Skyinno251, #url: jdbc:mysql://192.168.3.29:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true #url: jdbc:mysql://127.0.0.1:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true #url: jdbc:mysql://192.168.2.18:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true @@ -24,20 +20,23 @@ 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:mysql://192.168.3.9:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true - driverClassName: com.mysql.cj.jdbc.Driver #com.mysql.cj.jdbc.Driver com.mysql.jdbc.Driver - username: root - password: Skyinno251, -# driverClassName: oracle.jdbc.driver.OracleDriver -# url: jdbc:oracle:thin:@192.168.3.9:1521/orcl -# username: appserver -# password: appserver + url: jdbc:postgresql://192.168.3.24:5432/postgres + driverClassName: org.postgresql.Driver #com.mysql.cj.jdbc.Driver com.mysql.jdbc.Driver + username: postgres + password: 452131wW jpa: - database: mysql # 配置 DBMS 类型 + database: POSTGRESQL # 配置 DBMS 类型 show-sql: true # 配置是否将执行的 SQL 输出到日志 open-in-view: true - hibernate: - ddl-auto: update # 第一次建表create 后面用update，要不然每次重启都会新建表 + #hibernate: + # ddl-auto: update # 第一次建表create 后面用update，要不然每次重启都会新建表 + properties: + hibernate: + format_sql: true + dialect: org.hibernate.dialect.PostgreSQLDialect + ddl-auto: update + hbm2ddl: + auto: update servlet: multipart: # 开启 multipart 上传功能