diff --git a/.gitignore b/.gitignore index a8c86fc..c6071fb 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ target/ /target/* /.idea/* /.idea +.idea +.idea/ pom.xml.tag pom.xml.releaseBackup pom.xml.versionsBackup diff --git a/.idea/artifacts/admin_client_temperature_war.xml b/.idea/artifacts/admin_client_temperature_war.xml deleted file mode 100644 index 008131e..0000000 --- a/.idea/artifacts/admin_client_temperature_war.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - $PROJECT_DIR$/target - - - false - admin-client-temperature - war - false - - - - - - - \ No newline at end of file diff --git a/.idea/artifacts/admin_client_temperature_war_exploded.xml b/.idea/artifacts/admin_client_temperature_war_exploded.xml deleted file mode 100644 index f17d5f1..0000000 --- a/.idea/artifacts/admin_client_temperature_war_exploded.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - $PROJECT_DIR$/target/admin-client-temperature - - - true - admin-client-temperature - war - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 00b5eac..ce88352 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -10,9 +10,6 @@ - - - - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4c5d89d..6cb98a2 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,9 +5,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - \ No newline at end of file diff --git a/admin-client-temperature.iml b/admin-client-temperature.iml index d8e3cad..b2a1074 100644 --- a/admin-client-temperature.iml +++ b/admin-client-temperature.iml @@ -1,5 +1,5 @@ - + @@ -11,148 +11,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java b/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java index 5d9691c..6318f9d 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java +++ b/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java @@ -14,7 +14,7 @@ import java.util.Date; import java.util.Timer; import java.util.TimerTask; - +// Xiaomi_8B2C public class MqttRSAClient { /** * 代理服务器ip地址 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e9b4067..08856ac 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -7,9 +7,9 @@ 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://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 + #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,