wulin/qiuguo-iot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature-BOX一期' into test

Browse Source
This commit is contained in:
wulin 2023-10-24 16:44:35 +08:00
commit 7cdcc7ae68
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BoxWebSocketHandler.java
View File

@ -234,10 +234,8 @@ public class BoxWebSocketHandler implements WebSocketHandler {
}).flatMap(d -> {
DeviceInfoEntity dv = (DeviceInfoEntity)d;
boxSession.setDeviceId(dv.getId());
BoxSession oldBoxSession = baseWebSocketService.putBoxSession(sn, boxSession);
return bindBox(boxSession, dv, userId, isBind).flatMap(db ->{
BoxSession oldBoxSession = baseWebSocketService.getBoxSessionWithSn(sn);
baseWebSocketService.putBoxSession(sn, boxSession);
if(oldBoxSession != null){
return baseWebSocketService.closeSendMsg(oldBoxSession, "您在其他地方登录", AskTypeEnum.TTS.getCode());
}

4
iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/CustomerWebSocketHandler.java
View File

@ -170,8 +170,8 @@ public class CustomerWebSocketHandler implements WebSocketHandler {
}else{
baseWebSocketService.normalSendMsg(userSession, "您暂未绑定果宝儿Box，快去绑定吧", AskTypeEnum.TTS.getCode());
}
UserSession oldUserSession = baseWebSocketService.getUserSessionWithUserId(userId);
baseWebSocketService.putUserSession(userId, userSession);
UserSession oldUserSession = baseWebSocketService.putUserSession(userId, userSession);
if(oldUserSession != null){
return baseWebSocketService.closeSendMsg(oldUserSession, "您在其他地方登录", AskTypeEnum.TTS.getCode());
}

4
iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/service/BaseWebSocketService.java
View File

@ -238,16 +238,16 @@ public class BaseWebSocketService {
int length,
Long requestId){
if(n < length && baseSession.getRequestId().equals(requestId)){
int start = n;
n += ONE_MAX_TEXT;
if(n > length){
n = length;
}
String message = text.substring(n - ONE_MAX_TEXT, n);
String message = text.substring(start, n);
int status = 0;
if(n == length){
message += "。";
status = 1;
builder.setLength(0);
}
message = getSendStr(builder, message);
int m = n;

2
iot-modules/iot-box-websocket-api/src/main/resources/logback-test.xml
View File

@ -3,7 +3,7 @@
<!-- 日志存放路径 -->
<property name="log.path" value="logs/iot-box-websocket-api" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] [%X{logid}] - %msg%n" />
<!-- 控制台输出 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">

2
iot-modules/iot-customer-http-api/src/main/resources/logback-test.xml
View File

@ -3,7 +3,7 @@
<!-- 日志存放路径 -->
<property name="log.path" value="logs/iot-customer-http-api" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] [%X{logid}] - %msg%n" />
<!-- 控制台输出 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">