diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index afcf0a3..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b604923..7c67a44 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,10 +5,8 @@
+
-
-
-
@@ -118,6 +116,7 @@
+
diff --git a/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java b/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java
index 22a7b8f..8c66dab 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.SEQUENCE)
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty(value = "主键")
private Long id;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index de7d855..8ee2c1c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,15 +11,16 @@ spring:
#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: oracle.jdbc.driver.OracleDriver
- url: jdbc:oracle:thin:@192.168.1.9:1521/orcl
- username: appserver
- password: appserver
+ url: jdbc:mysql://192.168.1.24: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.1.9:1521/orcl
+# username: appserver
+# password: appserver
jpa:
- database: oracle # 配置 DBMS 类型
+ database: mysql # 配置 DBMS 类型
show-sql: true # 配置是否将执行的 SQL 输出到日志
open-in-view: true
hibernate: