diff --git a/dsAi/src/main/java/com/dsideal/Res/Config/GatewayConfig.java b/dsAi/src/main/java/com/dsideal/Res/Config/GatewayConfig.java deleted file mode 100644 index c9dfea69..00000000 --- a/dsAi/src/main/java/com/dsideal/Res/Config/GatewayConfig.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.dsideal.Res.Config; - -import com.jfinal.kit.Prop; - -import static com.dsideal.Res.Util.JiMeng.Kit.JmCommon.PropKit; - -public class GatewayConfig { - private static final Prop prop = PropKit; - - // 超时配置 - public static final int CONNECT_TIMEOUT = prop.getInt("gateway.timeout.connect", 10000); - public static final int READ_TIMEOUT = prop.getInt("gateway.timeout.read", 30000); - public static final int WRITE_TIMEOUT = prop.getInt("gateway.timeout.write", 30000); - - // 连接池配置 - public static final int MAX_CONNECTIONS = prop.getInt("gateway.connection.max", 5); - public static final int KEEP_ALIVE_DURATION = prop.getInt("gateway.connection.keep-alive", 300); - - // 安全配置 - public static final String[] ALLOWED_ORIGINS = prop.get("gateway.security.cors.allowed-origins", "*").split(","); - public static final String[] ALLOWED_METHODS = prop.get("gateway.security.cors.allowed-methods", "GET,POST,OPTIONS").split(","); - public static final String[] ALLOWED_HEADERS = prop.get("gateway.security.cors.allowed-headers", "Content-Type,Authorization,Cookie").split(","); - public static final boolean ALLOW_CREDENTIALS = prop.getBoolean("gateway.security.cors.allow-credentials", true); - public static final int MAX_AGE = prop.getInt("gateway.security.cors.max-age", 3600);} \ No newline at end of file diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/HttpClient.java b/dsAi/src/main/java/com/dsideal/Res/Util/HttpClient.java index cff0fb53..02d2a07a 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/HttpClient.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/HttpClient.java @@ -1,6 +1,6 @@ package com.dsideal.Res.Util; -import com.dsideal.Res.Config.GatewayConfig; +import com.dsideal.Config.GatewayConfig; import okhttp3.*; import java.io.IOException; diff --git a/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java b/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java index 00a72400..a9f78c3e 100644 --- a/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java +++ b/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java @@ -1,9 +1,9 @@ package com.dsideal.gw.Handler; +import com.dsideal.Config.GatewayConfig; import com.dsideal.gw.Bean.RetBean; import com.dsideal.gw.GwApplication; import com.dsideal.gw.Util.JwtUtil; -import com.dsideal.gw.Config.GatewayConfig; import com.jfinal.handler.Handler; import com.jfinal.kit.StrKit; import com.jfinal.upload.MultipartRequest; diff --git a/dsRes/src/main/java/com/dsideal/Res/Config/GatewayConfig.java b/dsRes/src/main/java/com/dsideal/Res/Config/GatewayConfig.java deleted file mode 100644 index e94687bb..00000000 --- a/dsRes/src/main/java/com/dsideal/Res/Config/GatewayConfig.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.dsideal.Res.Config; - -import com.dsideal.Config.PropKit; - -public class GatewayConfig { - // 超时配置 - public static final int CONNECT_TIMEOUT = PropKit.getInt("gateway.timeout.connect"); - public static final int READ_TIMEOUT = PropKit.getInt("gateway.timeout.read"); - public static final int WRITE_TIMEOUT = PropKit.getInt("gateway.timeout.write"); - - // 连接池配置 - public static final int MAX_CONNECTIONS = PropKit.getInt("gateway.connection.max"); - public static final int KEEP_ALIVE_DURATION = PropKit.getInt("gateway.connection.keep-alive"); - - // 安全配置 -// public static final String[] ALLOWED_ORIGINS = PropKit.get("gateway.security.cors.allowed-origins", "*").split(","); -// public static final String[] ALLOWED_METHODS = PropKit.get("gateway.security.cors.allowed-methods", "GET,POST,OPTIONS").split(","); -// public static final String[] ALLOWED_HEADERS = PropKit.get("gateway.security.cors.allowed-headers", "Content-Type,Authorization,Cookie").split(","); -// public static final boolean ALLOW_CREDENTIALS = PropKit.getBoolean("gateway.security.cors.allow-credentials", true); -// public static final int MAX_AGE = PropKit.getInt("gateway.security.cors.max-age", 3600); -} \ No newline at end of file diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/HttpClient.java b/dsRes/src/main/java/com/dsideal/Res/Util/HttpClient.java index 23edb4ad..a6bb9530 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/HttpClient.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/HttpClient.java @@ -1,6 +1,6 @@ package com.dsideal.Res.Util; -import com.dsideal.Res.Config.GatewayConfig; +import com.dsideal.Config.GatewayConfig; import okhttp3.*; import java.io.File; diff --git a/dsGw/src/main/java/com/dsideal/gw/Config/GatewayConfig.java b/dsUtils/src/main/java/com/dsideal/Config/GatewayConfig.java similarity index 79% rename from dsGw/src/main/java/com/dsideal/gw/Config/GatewayConfig.java rename to dsUtils/src/main/java/com/dsideal/Config/GatewayConfig.java index 8e19f5fa..24de689d 100644 --- a/dsGw/src/main/java/com/dsideal/gw/Config/GatewayConfig.java +++ b/dsUtils/src/main/java/com/dsideal/Config/GatewayConfig.java @@ -1,20 +1,19 @@ -package com.dsideal.gw.Config; +package com.dsideal.Config; -import com.dsideal.Config.PropKit; public class GatewayConfig { - // 超时配置 - public static final int CONNECT_TIMEOUT = PropKit.getInt("gateway.timeout.connect", 10000); - public static final int READ_TIMEOUT = PropKit.getInt("gateway.timeout.read", 30000); - public static final int WRITE_TIMEOUT = PropKit.getInt("gateway.timeout.write", 30000); + public static final int CONNECT_TIMEOUT = PropKit.getInt("gateway.timeout.connect"); + public static final int READ_TIMEOUT = PropKit.getInt("gateway.timeout.read"); + public static final int WRITE_TIMEOUT = PropKit.getInt("gateway.timeout.write"); // 连接池配置 - public static final int MAX_CONNECTIONS = PropKit.getInt("gateway.connection.max", 5); - public static final int KEEP_ALIVE_DURATION = PropKit.getInt("gateway.connection.keep-alive", 300); + public static final int MAX_CONNECTIONS = PropKit.getInt("gateway.connection.max"); + public static final int KEEP_ALIVE_DURATION = PropKit.getInt("gateway.connection.keep-alive"); // 安全配置 public static final String[] ALLOWED_ORIGINS = PropKit.get("gateway.security.cors.allowed-origins", "*").split(","); public static final String[] ALLOWED_METHODS = PropKit.get("gateway.security.cors.allowed-methods", "GET,POST,OPTIONS").split(","); public static final String[] ALLOWED_HEADERS = PropKit.get("gateway.security.cors.allowed-headers", "Content-Type,Authorization,Cookie").split(","); public static final boolean ALLOW_CREDENTIALS = PropKit.getBoolean("gateway.security.cors.allow-credentials", true); - public static final int MAX_AGE = PropKit.getInt("gateway.security.cors.max-age", 3600);} \ No newline at end of file + public static final int MAX_AGE = PropKit.getInt("gateway.security.cors.max-age", 3600); +} \ No newline at end of file