wzh 2 лет назад
Родитель
Сommit
75909035b9

+ 3 - 3
ruoyi-admin/src/main/resources/application-test.yml

@@ -90,9 +90,9 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://61.183.212.90:57911/weitiandi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-    username: root
-    password: Qyy#2023.Wzh!
+    url: jdbc:mysql://rm-bp15wjnwm989k97b3.mysql.rds.aliyuncs.com:3306/foreign?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+    username: weitiandi
+    password: Weitiandi20230718!@!
     druid:
       # 初始连接数
       initialSize: 5

+ 1 - 1
ruoyi-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java

@@ -67,7 +67,7 @@ public class DeviceController {
         if(StringUtils.isEmpty(appfrom)){
             appfrom = "normal";
         }
-        Map<String, Object> deviceData = tDeviceRecordMapper.getDeviceData("select * from cz_app_version where from = '"+appfrom+"' order by create_time desc limit 1");
+        Map<String, Object> deviceData = tDeviceRecordMapper.getDeviceData("select * from cz_app_version where `from` = '"+appfrom+"' order by create_time desc limit 1");
         return AjaxResult.success(deviceData);
     }