mysql连接串/示例数据调整

data/init/product.json

@@ -75,16 +75,6 @@
     "transparent": false,
     "createAt": 1652237643216
   },
-  {
-    "id": "KdJYpTp5ywNhmrmC",
-    "name": "第三方接入",
-    "category": "",
-    "nodeType": 0,
-    "uid": "fa1c5eaa-de6e-48b6-805e-8f091c7bb831",
-    "img": "http://iotkit-img.oss-cn-shenzhen.aliyuncs.com/product/KdJYpTp5ywNhmrmC/cover.png?Expires=1968261336&OSSAccessKeyId=LTAI5t8UFEH5eGrBUS5zSiof&Signature=df%2F6JEcxBlXitSNIENPMYJlRE8Y%3D",
-    "transparent": false,
-    "createAt": 1655637610215
-  },
   {
     "id": "Eit3kmGJtxSHfCKT",
     "name": "燃气表",

data/init/virtualDevice.json

@@ -74,8 +74,6 @@
       "16552595723210menci0001008000012f",
       "16552595685220menci00010070000127",
       "16552595656210menci0001006000012d",
-      "16552595626260menci0001005000012b",
-      "16552595580220menci0001004000012a",
       "16501898583770f4cce4feffbd1bec164"
     ],
     "type": "thingModel",

iot-auth-server/src/main/java/cc/iotkit/oauth/service/SaOAuth2TemplateImpl.java

@@ -36,7 +36,6 @@ public class SaOAuth2TemplateImpl extends SaOAuth2Template {
             return null;
         }
 
-
         return new SaClientModel()
                 .setClientId(client.getClientId())
                 .setClientSecret(client.getClientSecret())

iot-auth-server/src/main/java/cc/iotkit/oauth/service/TokenRequestHandler.java

@@ -23,7 +23,6 @@ import cn.dev33.satoken.oauth2.model.ClientTokenModel;
 import cn.dev33.satoken.oauth2.model.RequestAuthModel;
 import cn.dev33.satoken.oauth2.model.SaClientModel;
 import cn.dev33.satoken.stp.StpUtil;
-import cn.dev33.satoken.util.SaResult;
 
 public class TokenRequestHandler {
 

iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java

@@ -70,6 +70,9 @@ public class DeviceInfoDataImpl implements IDeviceInfoData {
      * 填充设备其它信息
      */
     private void fillDeviceInfo(String deviceId, TbDeviceInfo vo, DeviceInfo dto) {
+        if (vo == null || dto == null) {
+            return;
+        }
         //取子关联用户
         dto.setSubUid(deviceSubUserRepository.findByDeviceId(deviceId).stream()
                 .map(TbDeviceSubUser::getUid).collect(Collectors.toList()));
@@ -339,7 +342,7 @@ public class DeviceInfoDataImpl implements IDeviceInfoData {
 
         //按品类分组求合
         rst.stream().collect(Collectors.groupingBy(DataItem::getName,
-                Collectors.summarizingLong(item -> (long) item.getValue())))
+                        Collectors.summarizingLong(item -> (long) item.getValue())))
                 .forEach((key, sum) -> stats.add(new DataItem(key, sum.getSum())));
 
         return stats;

iot-standalone/src/main/resources/application-mysql.yml

@@ -11,7 +11,7 @@ spring:
   #注： 切换数据库时需要将项目根目录中的.init文件删除再重启
   # <<==========mysql配置开始==============
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/iotkit?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
+    url: jdbc:mysql://127.0.0.1:3306/iotkit?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
     driverClassName: com.mysql.cj.jdbc.Driver
     username: root
     password: 123456