diff --git a/src/main/java/top/octopusyan/base/BaseController.java b/src/main/java/top/octopusyan/base/BaseController.java
index bc88f64..0e47b3c 100644
--- a/src/main/java/top/octopusyan/base/BaseController.java
+++ b/src/main/java/top/octopusyan/base/BaseController.java
@@ -82,7 +82,7 @@ public abstract class BaseController implements Initializable {
}
// app 版本信息
- if (getAppVersionLabel() != null) getAppVersionLabel().setText("version : v" + ApplicatonStore.APP_VERSION);
+ if (getAppVersionLabel() != null) getAppVersionLabel().setText("v" + ApplicatonStore.APP_VERSION);
// 这个位置的左边第一个 JFXBtn 会莫名其妙会的焦点效果,启动时禁用焦点,取消按钮效果
if (getFirstBtn() != null) getFirstBtn().setDisableVisualFocus(true);
diff --git a/src/main/java/top/octopusyan/config/ProxyConfig.java b/src/main/java/top/octopusyan/config/ProxyConfig.java
index d6484bf..43c970e 100644
--- a/src/main/java/top/octopusyan/config/ProxyConfig.java
+++ b/src/main/java/top/octopusyan/config/ProxyConfig.java
@@ -29,9 +29,9 @@ public class ProxyConfig {
serverIp.put("上海", "127.0.0.1");
typePort.put("http", 80);
- typePort.put("https", 80);
- typePort.put("tcp", 0);
- typePort.put("udp", 0);
+ typePort.put("https", 443);
+ typePort.put("tcp", 25565);
+ typePort.put("udp", 53);
}
diff --git a/src/main/java/top/octopusyan/config/TextValidate.java b/src/main/java/top/octopusyan/config/TextValidate.java
index c0ea21c..85e7731 100644
--- a/src/main/java/top/octopusyan/config/TextValidate.java
+++ b/src/main/java/top/octopusyan/config/TextValidate.java
@@ -88,7 +88,7 @@ public class TextValidate {
static {
EmailFormat.setRegexPattern("^\\s*\\w+(?:\\.{0,1}[\\w-]+)*@[a-zA-Z0-9]+(?:[-.][a-zA-Z0-9]+)*\\.[a-zA-Z]+\\s*$");
AccoountValidator.setRegexPattern("^[a-zA-Z0-9_-]*$");
- PortFormat.setRegexPattern("^([0-9]|[1-9]\\d{1,3}|[1-5]\\d{4}|6[0-4]\\d{4}|65[0-4]\\d{2}|655[0-2]\\d|6553[0-5])$");
+ PortFormat.setRegexPattern("^([1-9]|[1-9]\\d{1,3}|[1-5]\\d{4}|6[0-4]\\d{4}|65[0-4]\\d{2}|655[0-2]\\d|6553[0-5])$");
IpFormat.setRegexPattern("^(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])\\" +
".(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])$");
HttpUserFormat.setRegexPattern("^[a-zA-Z0-9_-]*$");
diff --git a/src/main/java/top/octopusyan/controller/MainController.java b/src/main/java/top/octopusyan/controller/MainController.java
index 7be0705..d68d997 100644
--- a/src/main/java/top/octopusyan/controller/MainController.java
+++ b/src/main/java/top/octopusyan/controller/MainController.java
@@ -5,17 +5,12 @@ import com.alibaba.fastjson.JSONObject;
import com.jfoenix.controls.*;
import com.jfoenix.validation.base.ValidatorBase;
import javafx.application.Platform;
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.value.ObservableValue;
import javafx.collections.ObservableList;
-import javafx.fxml.FXMLLoader;
import javafx.fxml.Initializable;
import javafx.scene.Node;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
import javafx.scene.control.*;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.HBox;
@@ -35,9 +30,9 @@ import top.octopusyan.manager.http.request.ProxySetup;
import top.octopusyan.model.ApplicatonStore;
import top.octopusyan.model.ProxySetupModel;
import top.octopusyan.utils.*;
+import top.octopusyan.view.ProxyListItemView;
import java.io.IOException;
-import java.util.List;
import java.util.*;
import static top.octopusyan.model.ApplicatonStore.*;
@@ -51,9 +46,6 @@ import static top.octopusyan.model.ApplicatonStore.*;
public class MainController extends BaseController implements Initializable {
public static final String PROXY_LIST_ITEM_CLASS = "proxyListItem";
- public static final String PROXY_LIST_ITEM_STOP_CLASS = "proxyListItem-stop";
- public static final String PROXY_LIST_ITEM_RUN_CLASS = "proxyListItem-run";
- public static final String PROXY_LIST_ITEM_CLOSE_CLASS = "proxyListItem-close";
public static final String PROXY_LIST_ITEM_SELECT_CLASS = "proxyListItem-select";
@@ -88,7 +80,7 @@ public class MainController extends BaseController implements Initial
public JFXButton copyDomainBtn;
/* 隧道列表控件 */
- public JFXListView