diff --git a/pom.xml b/pom.xml
index 5f1136f..5504d2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,12 +101,14 @@
${hutool.version}
+
org.projectlombok
lombok
${lombok.version}
+
com.fasterxml.jackson.dataformat
jackson-dataformat-yaml
@@ -253,7 +255,11 @@
false
true
${project.basedir}/src/main/resources/assets
- --enable-preview
+
+ --enable-preview
+ -Xmx100m
+
+
diff --git a/src/main/java/cn/octopusyan/alistgui/Application.java b/src/main/java/cn/octopusyan/alistgui/Application.java
index 8916f54..26169e5 100644
--- a/src/main/java/cn/octopusyan/alistgui/Application.java
+++ b/src/main/java/cn/octopusyan/alistgui/Application.java
@@ -97,7 +97,7 @@ public class Application extends javafx.application.Application {
private void showErrorDialog(Thread t, Throwable e) {
logger.error("", e);
- AlertUtil.exception(new Exception(e)).show();
+ Platform.runLater(() -> AlertUtil.exception(new Exception(e)).show());
}
@Override
diff --git a/src/main/java/cn/octopusyan/alistgui/manager/ConfigManager.java b/src/main/java/cn/octopusyan/alistgui/manager/ConfigManager.java
index c652c55..d3e1992 100644
--- a/src/main/java/cn/octopusyan/alistgui/manager/ConfigManager.java
+++ b/src/main/java/cn/octopusyan/alistgui/manager/ConfigManager.java
@@ -189,12 +189,16 @@ public class ConfigManager {
}
public static void checkProxy(BiConsumer consumer) {
+ if (ProxySetup.SYSTEM.equals(proxySetup())) {
+ consumer.accept(true, "");
+ return;
+ }
if (!hasProxy()) return;
ThreadPoolManager.getInstance().execute(() -> {
try {
InetSocketAddress address = NetUtil.createAddress(proxyHost(), getProxyPort());
- if (NetUtil.isOpen(address, 5000)) {
+ if (NetUtil.isOpen(address, 1000)) {
Platform.runLater(() -> consumer.accept(true, "success"));
} else {
Platform.runLater(() -> consumer.accept(false, "connection timed out"));
diff --git a/src/main/java/cn/octopusyan/alistgui/manager/ConsoleLog.java b/src/main/java/cn/octopusyan/alistgui/manager/ConsoleLog.java
index cf1cc72..b8a9a2c 100644
--- a/src/main/java/cn/octopusyan/alistgui/manager/ConsoleLog.java
+++ b/src/main/java/cn/octopusyan/alistgui/manager/ConsoleLog.java
@@ -129,7 +129,7 @@ public class ConsoleLog {
String regex = STR.".*(\{AListManager.scheme()}|\{URL_IP_REX}).*";
if (ReUtil.isMatch(regex, message)) {
String text = ReUtil.get(regex, message, 1);
- String url = text.startsWith("http") ? STR."http://\{text}" : text;
+ String url = text.startsWith("http") ? text : STR."http://\{text}";
url = url.replace("0.0.0.0", "127.0.0.1");
message = message.replace(text, STR."[url=\{url}]\{text}[/url]");
}
diff --git a/src/main/java/cn/octopusyan/alistgui/viewModel/SetupViewModel.java b/src/main/java/cn/octopusyan/alistgui/viewModel/SetupViewModel.java
index 1ec2381..bb5f582 100644
--- a/src/main/java/cn/octopusyan/alistgui/viewModel/SetupViewModel.java
+++ b/src/main/java/cn/octopusyan/alistgui/viewModel/SetupViewModel.java
@@ -115,7 +115,7 @@ public class SetupViewModel extends BaseViewModel {
ConfigManager.checkProxy((success, msg) -> {
if (!success) {
final var tmp = Context.getLanguageBinding("proxy.test.result.failed").getValue();
- AlertUtil.error(STR."\{tmp}:\{msg}").show();
+ AlertUtil.error(STR."\{tmp}\{msg}").show();
return;
}
diff --git a/src/main/resources/css/main-view.scss b/src/main/resources/css/main-view.scss
index dbeb9b5..48b11cd 100644
--- a/src/main/resources/css/main-view.scss
+++ b/src/main/resources/css/main-view.scss
@@ -23,18 +23,16 @@
}
#startButton {
- -color-button-bg-hover: -color-button-bg;
-color-button-bg-focused: -color-button-bg;
-fx-border-color: -color-button-bg;
- -fx-border-color-hover: -color-button-bg;
}
#passwordButton {
-color-button-bg: -color-success-3;
-color-button-bg-hover: -color-button-bg;
- -color-button-bg-focused: -color-success-3;
+ -color-button-bg-focused: -color-button-bg;
-color-button-bg-pressed: -color-button-bg;
- -fx-border-color: -color-success-3;
+ -fx-border-color: -color-button-bg;
}
#restartButton {