diff --git a/README.md b/README.md index 4581cda..625541f 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ 测试环境需要配置好 Clash、Fiddler。Clash 部分,需要对益盟网址 Phaser 进行设置,强制使用代理访问。 -目前,平台已经提供代理设置界面,程序调用 okhttp、Playwright 的地方基本上已经可以经由配置代理进行网络活动,故大部分确保平台访问能过代理的部分需要在 Clash 上的规则进行配置。 +目前,平台已经提供代理设置界面,程序调用 okhttp 的地方基本上已经可以经由配置代理进行网络活动,故大部分确保平台访问能过代理的部分需要在 Clash 上的规则进行配置。 以 Clash Verge 为例:打开主界面——订阅——全局扩展脚本,编辑脚本如下: diff --git a/src/main/java/quant/rich/emoney/annotation/ResponseDecodeExtension.java b/src/main/java/quant/rich/emoney/annotation/ResponseDecodeExtension.java index 2a1640c..96547a0 100644 --- a/src/main/java/quant/rich/emoney/annotation/ResponseDecodeExtension.java +++ b/src/main/java/quant/rich/emoney/annotation/ResponseDecodeExtension.java @@ -9,6 +9,11 @@ import java.lang.annotation.Target; /** * 注解在方法上以获取对 EmoneyProtocol 的额外操作 + *

+ * 目前方法必须是受 spring 管理类下的公共成员方法,且接受参数为单参数 JsonNode. + *

+ * 例: + * {@code StrategyAndPoolService#updateByQueryResponse(JsonNode)} */ @Documented @Retention(RUNTIME) diff --git a/src/main/java/quant/rich/emoney/controller/api/CommonAbilityControllerV1.java b/src/main/java/quant/rich/emoney/controller/api/CommonAbilityControllerV1.java index 4fa0913..0d86014 100644 --- a/src/main/java/quant/rich/emoney/controller/api/CommonAbilityControllerV1.java +++ b/src/main/java/quant/rich/emoney/controller/api/CommonAbilityControllerV1.java @@ -2,31 +2,17 @@ package quant.rich.emoney.controller.api; import java.util.HashMap; import java.util.Map; -import java.util.Objects; import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.lang.NonNull; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.protobuf.nano.MessageNano; - -import org.apache.commons.lang3.StringUtils; import org.reflections.Reflections; import lombok.extern.slf4j.Slf4j; -import nano.BaseResponse.Base_Response; -import quant.rich.emoney.entity.sqlite.ProtocolMatch; -import quant.rich.emoney.exception.RException; import quant.rich.emoney.interfaces.IQueryableEnum; -import quant.rich.emoney.pojo.dto.EmoneyConvertResult; -import quant.rich.emoney.pojo.dto.EmoneyProtobufBody; -import quant.rich.emoney.service.sqlite.ProtocolMatchService; @RestController @RequestMapping("/api/v1/common") diff --git a/src/main/java/quant/rich/emoney/entity/sqlite/RequestInfo.java b/src/main/java/quant/rich/emoney/entity/sqlite/RequestInfo.java index 9e024d6..c479c84 100644 --- a/src/main/java/quant/rich/emoney/entity/sqlite/RequestInfo.java +++ b/src/main/java/quant/rich/emoney/entity/sqlite/RequestInfo.java @@ -452,7 +452,7 @@ public class RequestInfo extends Model { } public boolean isAnonymous() { - return !StringUtils.isAnyBlank(getUsername(), getPassword()); + return StringUtils.isAnyBlank(getUsername(), getPassword()); } } diff --git a/src/main/java/quant/rich/emoney/patch/okhttp/PatchOkHttp.java b/src/main/java/quant/rich/emoney/patch/okhttp/PatchOkHttp.java index f41c655..36311f9 100644 --- a/src/main/java/quant/rich/emoney/patch/okhttp/PatchOkHttp.java +++ b/src/main/java/quant/rich/emoney/patch/okhttp/PatchOkHttp.java @@ -23,7 +23,6 @@ public class PatchOkHttp { private static final Random random = new Random(); private static final Logger log = LoggerFactory.getLogger(PatchOkHttp.class); private static final Set rules = new CopyOnWriteArraySet<>(); - private static boolean logOnce = false; private static boolean isHooked = false; diff --git a/src/main/java/quant/rich/emoney/service/sqlite/StrategyAndPoolService.java b/src/main/java/quant/rich/emoney/service/sqlite/StrategyAndPoolService.java index a3aa210..cab34cc 100644 --- a/src/main/java/quant/rich/emoney/service/sqlite/StrategyAndPoolService.java +++ b/src/main/java/quant/rich/emoney/service/sqlite/StrategyAndPoolService.java @@ -3,10 +3,7 @@ package quant.rich.emoney.service.sqlite; import java.util.Collections; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; - import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import com.baomidou.dynamic.datasource.annotation.DS; diff --git a/src/main/resources/database.db b/src/main/resources/database.db index 4f26679..39e181c 100644 Binary files a/src/main/resources/database.db and b/src/main/resources/database.db differ