feat: 添加日志配置和Logback依赖
refactor: 重构实体类equals和hashCode方法 fix: 修复WebSocketService消息发送逻辑 style: 格式化代码和优化导入 docs: 更新JacksonConfig日期序列化格式 test: 添加CompanyFilePathTableCell测试类 chore: 清理无用代码和注释
This commit is contained in:
@@ -20,6 +20,7 @@ import com.ecep.contract.controller.BaseController;
|
||||
import com.ecep.contract.controller.HomeWindowController;
|
||||
import com.ecep.contract.controller.OkHttpLoginController;
|
||||
import com.ecep.contract.task.TaskMonitorCenter;
|
||||
import com.ecep.contract.util.HibernateProxyUtils;
|
||||
import com.ecep.contract.util.TextMessageHolder;
|
||||
import com.ecep.contract.util.UITools;
|
||||
import com.ecep.contract.vm.CurrentEmployee;
|
||||
@@ -37,12 +38,10 @@ import javafx.scene.text.Text;
|
||||
import javafx.stage.Stage;
|
||||
import javafx.stage.StageStyle;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import okhttp3.Cookie;
|
||||
import okhttp3.CookieJar;
|
||||
import okhttp3.HttpUrl;
|
||||
import okhttp3.OkHttpClient;
|
||||
import okhttp3.WebSocket;
|
||||
|
||||
/**
|
||||
* JavaFx 应用程序
|
||||
@@ -187,6 +186,7 @@ public class Desktop extends Application {
|
||||
} else {
|
||||
logger.warn("配置文件{}不存在", configFile.getAbsolutePath());
|
||||
}
|
||||
HibernateProxyUtils.useProxy(false);
|
||||
|
||||
runAsync(() -> {
|
||||
SpringApp.launch(properties, holder);
|
||||
@@ -204,12 +204,11 @@ public class Desktop extends Application {
|
||||
controller.setHolder(holder);
|
||||
controller.setPrimaryStage(primaryStage);
|
||||
controller.setProperties(properties);
|
||||
// while (true) {
|
||||
controller.tryLogin().whenComplete((v, e) -> {
|
||||
if (e != null) {
|
||||
holder.error("登录失败:" + e.getMessage());
|
||||
} else {
|
||||
while (true) {
|
||||
try {
|
||||
controller.tryLogin().get();
|
||||
holder.info("登录成功");
|
||||
|
||||
try {
|
||||
while (!SpringApp.isRunning()) {
|
||||
System.out.println("等待启动");
|
||||
@@ -221,13 +220,13 @@ public class Desktop extends Application {
|
||||
|
||||
// 必须要等待启动成功后才能关闭主场景,否则进程结束程序退出
|
||||
HomeWindowController.show().thenRun(() -> Platform.runLater(primaryStage::close));
|
||||
}
|
||||
});
|
||||
// if (getActiveEmployeeId() > 0) {
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
|
||||
break;
|
||||
} catch (Exception ex) {
|
||||
holder.error(ex.getMessage());
|
||||
Thread.sleep(3000);
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
holder.error("登录失败:" + e.getMessage());
|
||||
logger.error(e.getMessage(), e);
|
||||
|
||||
Reference in New Issue
Block a user