Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

saas-module/src/main/java/com/makeit/controller/saas/SaasUserController.java

@@ -143,7 +143,7 @@ public class SaasUserController {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("sysUserLoginVO",sysUserLoginVO);
         jsonObject.put("wechatUserInfo",wechatUserInfo);
-        jsonObject.put("saasUser",sysUserLoginVO);
+        jsonObject.put("saasUser",saasUser);
         return ApiResponseUtils.success(jsonObject);
     }
 

server-common/src/main/java/com/makeit/utils/user/ThreadLocalUserUtil.java

@@ -80,7 +80,7 @@ public class ThreadLocalUserUtil {
         WechatUserInfo wechatUserInfo = THREAD_LOCAL_WECHAT_USER.get();
         if (wechatUserInfo == null) {
             wechatUserInfo = TokenUtil.getWechatUserDetail();
-            THREAD_LOCAL_WECHAT_USER.set(wechatUserInfo);
+            //THREAD_LOCAL_WECHAT_USER.set(wechatUserInfo);
         }
         return wechatUserInfo;
     }

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java

@@ -105,7 +105,7 @@ public class BehaviorAlarm implements IAlarm{
             }
             //保存每次进入空间时长
             saveDayDurationRecord(platAlarmCheckDTO,alarmRedisDTO);
-            RedisUtil.set(RedisConst.ALARM_DEVICE_ID + deviceId,null);
+            RedisUtil.delete(RedisConst.ALARM_DEVICE_ID + deviceId);
         }
     }