From c993e916c1f7aaf316cf5371a27c94d416e9998f Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Fri, 8 Sep 2023 13:49:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?2023-08-27=2009:47:36=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=83=BD=E8=80=97=E7=BB=9F=E8=AE=A1=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=94=A8=E8=83=BD=E6=95=B0=E6=8D=AE=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- psdc-business/src/main/java/com/psdc/mqtt/MyMQTTCallback.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/psdc-business/src/main/java/com/psdc/mqtt/MyMQTTCallback.java b/psdc-business/src/main/java/com/psdc/mqtt/MyMQTTCallback.java index b3548f1..8523751 100644 --- a/psdc-business/src/main/java/com/psdc/mqtt/MyMQTTCallback.java +++ b/psdc-business/src/main/java/com/psdc/mqtt/MyMQTTCallback.java @@ -83,7 +83,7 @@ public class MyMQTTCallback implements MqttCallback { log.info("实时数据，开始入库!"); // 更新实时数据，历史数据 dataAndPowerSaveBean.saveDevRtData(jsonObject); - } else if ("resulta".equals(str)) { + } else if ("result".equals(str)) { log.info("控制结果数据，开始入库！"); controlResultSave.saveDevRtData(jsonObject); } From fc8e7686e07a28f7dcb1fcc38bd2dd93b97fcca3 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Fri, 8 Sep 2023 13:51:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2023-08-27=2009:47:36=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=83=BD=E8=80=97=E7=BB=9F=E8=AE=A1=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=94=A8=E8=83=BD=E6=95=B0=E6=8D=AE=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- psdc-admin/src/main/resources/application-prod.yml | 4 ++-- psdc-admin/src/main/resources/application.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/psdc-admin/src/main/resources/application-prod.yml b/psdc-admin/src/main/resources/application-prod.yml index bd76864..7e31614 100644 --- a/psdc-admin/src/main/resources/application-prod.yml +++ b/psdc-admin/src/main/resources/application-prod.yml @@ -54,9 +54,9 @@ spring: # 数据库驱动 driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource - url: jdbc:mysql://127.0.0.1:3306/psdc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3308/psdc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root - password: 123456 + password: root messages: # 国际化资源文件路径 basename: i18n/messages diff --git a/psdc-admin/src/main/resources/application.yml b/psdc-admin/src/main/resources/application.yml index caf4dfc..90385b2 100644 --- a/psdc-admin/src/main/resources/application.yml +++ b/psdc-admin/src/main/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: dev \ No newline at end of file + active: prod \ No newline at end of file