feat: 添加日志配置和Logback依赖
refactor: 重构实体类equals和hashCode方法 fix: 修复WebSocketService消息发送逻辑 style: 格式化代码和优化导入 docs: 更新JacksonConfig日期序列化格式 test: 添加CompanyFilePathTableCell测试类 chore: 清理无用代码和注释
This commit is contained in:
@@ -104,25 +104,16 @@ public class OkHttpLoginController implements MessageHolder {
|
||||
String userName = getUserName();
|
||||
String password = getPassword();
|
||||
|
||||
CompletableFuture<Void> loginFuture = new CompletableFuture<>();
|
||||
|
||||
if (StringUtils.hasText(userName) && StringUtils.hasText(password)) {
|
||||
login(userName, password).whenComplete((v, e) -> {
|
||||
if (e != null) {
|
||||
loginFuture.completeExceptionally(e);
|
||||
} else {
|
||||
loginFuture.complete(v);
|
||||
}
|
||||
});
|
||||
return login(userName, password);
|
||||
} else {
|
||||
CompletableFuture<Void> loginFuture = new CompletableFuture<>();
|
||||
Platform.runLater(() -> {
|
||||
showLoginDialog();
|
||||
if (!loginFuture.isDone()) {
|
||||
loginFuture.complete(null);
|
||||
}
|
||||
loginFuture.complete(null);
|
||||
});
|
||||
return loginFuture;
|
||||
}
|
||||
return loginFuture;
|
||||
}
|
||||
|
||||
private String getUserName() {
|
||||
|
||||
Reference in New Issue
Block a user