diff --git a/conf/system/emoneyRequest.json b/conf/system/emoneyRequest.json index e2fcc2f..1c99631 100644 --- a/conf/system/emoneyRequest.json +++ b/conf/system/emoneyRequest.json @@ -1,8 +1,4 @@ { - "proxyType" : "DIRECT", - "proxyHost" : null, - "proxyPort" : null, - "ignoreHttpsVerification" : false, "isAnonymous" : false, "username" : "emy1730978", "password" : "ubVa0vNmD+JJC4171eLYUw==", diff --git a/conf/system/proxy.json b/conf/system/proxy.json new file mode 100644 index 0000000..edc390d --- /dev/null +++ b/conf/system/proxy.json @@ -0,0 +1,6 @@ +{ + "proxyType" : "DIRECT", + "proxyHost" : "", + "proxyPort" : 0, + "ignoreHttpsVerification" : true +} \ No newline at end of file diff --git a/src/main/java/quant/rich/emoney/entity/config/EmoneyRequestConfig.java b/src/main/java/quant/rich/emoney/entity/config/EmoneyRequestConfig.java index b8107ea..ff2856d 100644 --- a/src/main/java/quant/rich/emoney/entity/config/EmoneyRequestConfig.java +++ b/src/main/java/quant/rich/emoney/entity/config/EmoneyRequestConfig.java @@ -46,26 +46,6 @@ import quant.rich.emoney.util.TextUtils; @ConfigInfo(field = "emoneyRequest", name = "益盟请求设置", initDefault = true) public class EmoneyRequestConfig implements IConfig { - /** - * 代理类型 - */ - private Proxy.Type proxyType = Proxy.Type.DIRECT; - - /** - * 代理主机 - */ - private String proxyHost; - - /** - * 代理端口 - */ - private Integer proxyPort; - - /** - * 是否忽略 HTTPS 证书校验 - */ - private Boolean ignoreHttpsVerification = false; - /** * 是否匿名登录 */ diff --git a/src/main/resources/webpage/admin/v1/config/emoneyRequest/index.html b/src/main/resources/webpage/admin/v1/config/emoneyRequest/index.html index 11c6a23..9ef94da 100644 --- a/src/main/resources/webpage/admin/v1/config/emoneyRequest/index.html +++ b/src/main/resources/webpage/admin/v1/config/emoneyRequest/index.html @@ -13,6 +13,23 @@ 益盟操盘手请求头配置,请小心更改。部分参数需要通过模拟的 APP 版本抓包确认。
+
+ 代理配置 +
+ + +
+ +
+ +
+
+
鉴权配置
diff --git a/src/main/resources/webpage/admin/v1/config/proxy/index.html b/src/main/resources/webpage/admin/v1/config/proxy/index.html new file mode 100644 index 0000000..1a2ed35 --- /dev/null +++ b/src/main/resources/webpage/admin/v1/config/proxy/index.html @@ -0,0 +1,131 @@ + + + + + + + +
+
+

代理设置

+
+
+ +
+ +
+ +
+
+ +
+ +
+ +
代理地址 +
+
+
+
+ +
+ +
非匿名登录时的密码 +
+
+
+ +
+ +
+ +
+
+ +
+
+
+ +
+
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/src/main/resources/webpage/admin/v1/include.html b/src/main/resources/webpage/admin/v1/include.html index 885c957..aa95251 100644 --- a/src/main/resources/webpage/admin/v1/include.html +++ b/src/main/resources/webpage/admin/v1/include.html @@ -50,6 +50,7 @@ 设置
请求头设置
+
代理设置