ak/zn-cloud-wcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

远遥登录

Browse Source
This commit is contained in:
cbs 2025-05-12 14:56:16 +08:00
parent e6a0dee3ef
commit 7c508ceae3
6 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
View File

@ -251,6 +251,7 @@ public class GlobalExceptionHandler {
for (StackTraceElement stackTrace : stackTraces) {
if (ObjUtil.notEqual(stackTrace.getClassName(), ServiceExceptionUtil.class.getName())) {
log.warn("[serviceExceptionHandler]\n\t{}", stackTrace);
log.warn("异常信息 :{}",ex.getMessage());
break;
}
}

2
yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/service/login/LoginServiceImpl.java
View File

@ -37,7 +37,7 @@ public class LoginServiceImpl implements LoginService {
@Override
public Boolean checkCommunication(LoginCheckDTO loginCheckDTO) {
HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory();
factory.setConnectTimeout(5 * 1000);
factory.setConnectTimeout(2 * 1000);
RestTemplate restTemplate = new RestTemplate(factory);
String url = "http://" + loginCheckDTO.getSystemIp() + ":" + loginCheckDTO.getSystemPort() + checkUrl;
LinkedMultiValueMap<String, String> headers = new LinkedMultiValueMap<>();

2
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/remote/dto/RemoteRobotStatusDTO.java
View File

@ -18,7 +18,7 @@ public class RemoteRobotStatusDTO {
private Integer remoteMode = 0;
@Schema(description = "协控(0:关闭协控, 1:开启协控, 2:不显示协控)")
private Integer collaborativeControl = 0;
private Integer collaborativeControl = 2;
@Schema(description = "车辆任务状态(3：待命 , 其他都是任务中)")
private Integer robotStatus = 2;

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
View File

@ -52,7 +52,7 @@ public class AuthLoginReqVO {
private String socialState;
@Schema(description = "登录来源地址, 远遥传: remote")
private String clientId;
private String clientid;
/**
* 开启验证码的 Group

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
View File

@ -106,7 +106,7 @@ public class AdminAuthServiceImpl implements AdminAuthService {
reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState()));
}
String clientId = ObjectUtil.isNotEmpty(reqVO.getClientId()) ? reqVO.getClientId() : OAuth2ClientConstants.CLIENT_ID_DEFAULT;
String clientId = ObjectUtil.isNotEmpty(reqVO.getClientid()) ? reqVO.getClientid() : OAuth2ClientConstants.CLIENT_ID_DEFAULT;
// 创建 Token 令牌，记录登录日志
return createTokenAfterLoginSuccess(user.getId(), reqVO.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME, clientId);

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/remote/RemoteControllerInformationServiceImpl.java
View File

@ -492,7 +492,7 @@ public class RemoteControllerInformationServiceImpl extends ServiceImpl<RemoteCo
//任务异常
RobotTaskDetailDO taskDetail = taskDetailService.getTaskDetail(data.getId());
String oldRobotNo = taskDetail.getRobotNo();
List<RobotDoingTaskDTO> robotDoingTaskNo = taskDetailService.getRobotDoingTaskNo(oldRobotNo);
List<RobotDoingTaskDTO> robotDoingTaskNo = taskDetailService.getRobotDoingTaskNo(information.getRobotNo());
if (ObjectUtil.isNotEmpty(robotDoingTaskNo)) {
throw exception(REMOTE_ROBOT_HAVE_TASK);
}