diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 6cb98a2..b604923 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,127 +5,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/admin-client-temperature.iml b/admin-client-temperature.iml deleted file mode 100644 index b2a1074..0000000 --- a/admin-client-temperature.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 94891e8..e8a973e 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/AdminClientTemperatureApplication.java b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java index d7d7027..65cf4b8 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java +++ b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java @@ -6,8 +6,6 @@ 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; @@ -20,7 +18,7 @@ import java.util.Map; @EnableJpaAuditing @EnableScheduling @SpringBootApplication -public class AdminClientTemperatureApplication extends SpringBootServletInitializer implements CommandLineRunner, ApplicationContextAware { +public class AdminClientTemperatureApplication implements CommandLineRunner, ApplicationContextAware { /** * 获取Spring框架的上下文 @@ -36,17 +34,6 @@ public class AdminClientTemperatureApplication extends SpringBootServletInitiali SpringApplication.run(AdminClientTemperatureApplication.class, args); } - /** - * @date 2021-05-18 09:20 - * @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 8c66dab..22a7b8f 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java +++ b/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java @@ -26,7 +26,7 @@ import java.util.Date; @Table(indexes = {@Index(name = "idx_dataDate", columnList = "dataDate"),@Index(name = "idx_locationDesc", columnList = "locationDesc"),@Index(name = "idx_dataHour", columnList = "dataHour"),@Index(name = "idx_dataMinute", columnList = "dataMinute"),@Index(name = "data_date_location_desc", columnList = "dataDate"),@Index(name = "data_date_location_desc", columnList = "locationDesc")}) public class Temperature implements Serializable { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) + @GeneratedValue(strategy = GenerationType.SEQUENCE) @ApiModelProperty(value = "主键") private Long id; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 08856ac..de7d855 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -7,14 +7,19 @@ spring: # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=appserver;encrypt=false; # username: sa # password: Skyinno251, - url: jdbc:mysql://127.0.0.1:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true + #url: jdbc:mysql://192.168.1.21: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 #url: jdbc:mysql://192.168.3.7: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: 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.1.9:1521/orcl + username: appserver + password: appserver jpa: - database: mysql # 配置 DBMS 类型 + database: oracle # 配置 DBMS 类型 show-sql: true # 配置是否将执行的 SQL 输出到日志 open-in-view: true hibernate: