consumer) {
+ // log.debug("match() running in classloader {}", PatchOkHttp.class.getClassLoader());
for (PatchOkHttpRule rule : PatchOkHttp.rules) {
if (rule.matches(ctx)) {
rule.apply(ctx, currentHeader, consumer);
@@ -40,17 +55,46 @@ public class PatchOkHttp {
}
}
+ /**
+ * 通过指定 Advice 重定义指定类的指定方法
+ * 此处为：okhttp3.Request$Builder.header(String, String)
+ *
+ * 注意：必须保证欲重定义的类的方法的 ClassLoader 和调用该方法的 ClassLoader
+ * 一致，否则会导致两者的静态类的静态变量不一致，尤其是项目引入了 spring-boot-devtool
+ * 时，一般调用该方法的类由 RestartClassLoader 加载，而 okhttp 包由于是 jar 包，一般交由默认
+ * ClassLoaders 进行加载，这就导致 PatchOkHttp 在两个 ClassLoader 中不一致，实际注入方法内 PatchOkHttp.rules
+ * 为空，无论如何都无法命中设定的规则。
+ * 解决方法：
+ * - 在 src/main/resources 下建立 META-INF 目录，新建
+ * spring-devtools.properties，并在其内增加一行“restart.include.okhttp3=.*okhttp-.*\.jar”，指定由
+ * RestartClassLoader 加载 okhttp-*.jar 包；
+ * - 在 application.yml 中，增加需要额外扫描的路径，即设置参数“spring.devtools.restart.additional-pathes:
+ * lib/”，否则即便是进行了第一步，也不会生效；
+ * - 在方法体内，使用外部 RestartClassLoader 载入欲重定义的方法类，并在调用 ByteBuddy 时指定该方法类和 ClassLoader。
+ *
+ *
+ * @see org.springframework.boot.devtools.restart.classloader.RestartClassLoader
+ * @see jdk.internal.loader.ClassLoaders
+ */
private static void hook() {
try {
- ByteBuddyAgent.install();
- new ByteBuddy()
- .redefine(Class.forName("okhttp3.Request$Builder"))
- .visit(Advice.to(HeaderInterceptor.class)
- .on(named("header").and(takesArguments(String.class, String.class))))
- .make()
- .load(Class.forName("okhttp3.Request$Builder").getClassLoader(),
- ClassReloadingStrategy.fromInstalledAgent());
+ ByteBuddyAgent.install();
+
+ ClassLoader appLoader = PatchOkHttp.class.getClassLoader();
+ Class builderClass = appLoader.loadClass("okhttp3.Request$Builder");
+
+
+ if (builderClass.getClassLoader() != appLoader) {
+ int exitCode = SpringApplication.exit(
+ SpringContextHolder.getBean(ConfigurableApplicationContext.class), () -> 0);
+ System.exit(exitCode);
+ }
+
+ new ByteBuddy().redefine(builderClass)
+ .visit(Advice.to(HeaderInterceptor.class)
+ .on(named("header").and(takesArguments(String.class, String.class))))
+ .make().load(appLoader, ClassReloadingStrategy.fromInstalledAgent());
isHooked = true;
@@ -64,21 +108,17 @@ public class PatchOkHttp {
public static final Logger log = LoggerFactory.getLogger(HeaderInterceptor.class);
- @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class)
+ @Advice.OnMethodEnter(
+ skipOn = Advice.OnNonDefaultValue.class)
public static boolean intercept(
@Advice.This Request.Builder builder,
@Advice.Argument(0) String name,
@Advice.Argument(value = 1, readOnly = false) String value,
@Advice.Local("call") Callable superCall
) throws Exception {
-
- // print调试
- log.debug("[intercept] name = {}, value = {}", name, value);
-
+
try {
- // 获取 headers map
-
-
+ // 获取上下文
RequestContext ctx = new RequestContext(builder);
String[] modified = new String[]{value};
diff --git a/src/main/java/quant/rich/emoney/patch/okhttp/PatchOkHttpRule.java b/src/main/java/quant/rich/emoney/patch/okhttp/PatchOkHttpRule.java
index 98c9a76..8be923f 100644
--- a/src/main/java/quant/rich/emoney/patch/okhttp/PatchOkHttpRule.java
+++ b/src/main/java/quant/rich/emoney/patch/okhttp/PatchOkHttpRule.java
@@ -4,6 +4,11 @@ import java.util.*;
import java.util.function.*;
import java.util.regex.Pattern;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import quant.rich.emoney.patch.okhttp.PatchOkHttp.HeaderInterceptor;
+
public class PatchOkHttpRule {
private final Predicate condition;
private final List actions;
@@ -37,6 +42,7 @@ public class PatchOkHttpRule {
}
public static class Builder {
+ public static final Logger log = LoggerFactory.getLogger(HeaderInterceptor.class);
private Predicate condition;
private final List actions = new ArrayList<>();
@@ -51,6 +57,10 @@ public class PatchOkHttpRule {
public Builder hasHeaderName(String name) {
return and(ctx -> ctx.headers.containsKey(name));
}
+
+ public Builder hasNotHeaderName(String name) {
+ return not(r -> r.and(ctx -> ctx.headers.containsKey(name)));
+ }
public Builder hasHeaderValueMatch(String name, String regex) {
Pattern pattern = Pattern.compile(regex);
@@ -138,6 +148,8 @@ public class PatchOkHttpRule {
public Builder overrideIf(String headerName, String value) {
actions.add((ctx, curr, setter) -> {
if (curr.equalsIgnoreCase(headerName)) {
+ log.debug("matches and applying - host: {}, currHeader {}, targetHeader {}, value: {}, classLoader: {}", ctx.host, curr, headerName,
+ value, this.getClass().getClassLoader());
setter.accept(value);
}
});
diff --git a/src/main/java/quant/rich/emoney/validator/ProxyConfigValidator.java b/src/main/java/quant/rich/emoney/validator/ProxyConfigValidator.java
index 3563f69..81038d6 100644
--- a/src/main/java/quant/rich/emoney/validator/ProxyConfigValidator.java
+++ b/src/main/java/quant/rich/emoney/validator/ProxyConfigValidator.java
@@ -8,6 +8,7 @@ import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
import quant.rich.emoney.entity.config.ProxyConfig;
import quant.rich.emoney.interfaces.IConfig;
+import quant.rich.emoney.pojo.dto.IpInfo;
public class ProxyConfigValidator implements IValidator, ConstraintValidator> {
@@ -25,11 +26,8 @@ public class ProxyConfigValidator implements IValidator, ConstraintValidator.layui-nav-img {
+ transition: ease-in-out .4s;
+ z-index: 1;
+ position: relative;
+ opacity: 0.9;
+}
+.nav-user-info:hover>.layui-nav-img {
+ opacity: 1;
+}
+.nav-user-info::before {
+ transition: ease-in-out .4s;
+ content: "";
+ position: absolute;
+ top: 16px;
+ width: 30px; height: 30px;
+ border-radius: 50%;
+ filter: blur(6px);
+ background: conic-gradient(
+ from 0deg,
+ #ff0080, #ff8c00, #ffff00, #00ff80,
+ #00f6ff, #8000ff, #ff0080
+ );
+ z-index: 0;
+ animation: spin 4s linear infinite;
+}
+.nav-user-info:hover::before {
+ filter: blur(10px) brightness(1.5);
+}
+@keyframes spin {
+ 0% { transform: rotate(0deg); }
+ 100% { transform: rotate(360deg); }
+}
.manage-body {
padding: 80px 18% 0
}
@@ -333,7 +365,13 @@ ul.start-list span {
border: none;
padding: 0
}
-
+.layui-nav {
+ background-color: rgb(241 241 241 / 60%);
+ backdrop-filter: blur(4.2px);
+}
+.layui-nav .layui-nav-item a {
+ color: black !important;
+}
/* 覆盖样式：blockquote */
blockquote.layui-elem-quote {
border-radius: 5px;
@@ -395,4 +433,13 @@ blockquote.layui-elem-quote {
}
.bottom-anchor-before.submit-fixed {
height: 54px
+}
+fieldset>legend {
+ font-weight: 500
+}
+fieldset>legend:before {
+ content: '#';
+ font-weight: bold;
+ margin-right: .25em;
+ color: rgb(22, 183, 119)
}
\ No newline at end of file
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 9ef94da..41d39b1 100644
--- a/src/main/resources/webpage/admin/v1/config/emoneyRequest/index.html
+++ b/src/main/resources/webpage/admin/v1/config/emoneyRequest/index.html
@@ -13,24 +13,7 @@
益盟操盘手请求头配置，请小心更改。部分参数需要通过模拟的 APP 版本抓包确认。
-