Compare commits
2 Commits
29a87bf1c4
...
ae4599cd9a
| Author | SHA1 | Date | |
|---|---|---|---|
| ae4599cd9a | |||
| 10598a51cf |
@@ -8,7 +8,7 @@ import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* 注解在方法上以获取对 EmoneyProtocol 的额外操作
|
||||
* 注解在方法上以获取对 Emoney Protocol 的额外操作
|
||||
* <p>
|
||||
* 目前方法必须是受 spring 管理类下的公共成员方法,且接受参数为单参数 JsonNode.
|
||||
* <p>
|
||||
@@ -21,18 +21,15 @@ import java.lang.annotation.Target;
|
||||
@Target(METHOD)
|
||||
public @interface ResponseDecodeExtension {
|
||||
/**
|
||||
* 指定的 protocolId
|
||||
* @return
|
||||
* @return 指定的 protocolId
|
||||
*/
|
||||
String protocolId();
|
||||
/**
|
||||
* inspect 的排序
|
||||
* @return
|
||||
* @return inspect 的排序
|
||||
*/
|
||||
int order() default -1;
|
||||
/**
|
||||
* 是否在模拟客户端请求和返回时启用, 默认 true
|
||||
* @return
|
||||
* @return 是否在模拟客户端请求和返回时启用, 默认 true
|
||||
*/
|
||||
boolean client() default true;
|
||||
}
|
||||
|
||||
@@ -47,23 +47,31 @@ public class ProxySettingControllerV1 extends UpdateBoolServiceController<ProxyS
|
||||
return super.getOne(id);
|
||||
}
|
||||
|
||||
@PostMapping("/save")
|
||||
@ResponseBody
|
||||
public R<?> save(@RequestBody ProxySetting proxySetting) {
|
||||
return super.save(proxySetting);
|
||||
}
|
||||
|
||||
@PostMapping("/delete")
|
||||
@ResponseBody
|
||||
public R<?> delete(String id) {
|
||||
return super.delete(id);
|
||||
}
|
||||
@PostMapping("/save")
|
||||
@ResponseBody
|
||||
public R<?> save(@RequestBody ProxySetting proxySetting) {
|
||||
R<?> result = super.save(proxySetting);
|
||||
proxySettingService.clearIpInfoCache();
|
||||
return result;
|
||||
}
|
||||
|
||||
@PostMapping("/delete")
|
||||
@ResponseBody
|
||||
public R<?> delete(String id) {
|
||||
R<?> result = super.delete(id);
|
||||
proxySettingService.clearIpInfoCache();
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected
|
||||
R<?> updateBool(String id, String field, Boolean value) {
|
||||
return super.updateBool(id, field, value);
|
||||
}
|
||||
@Override
|
||||
protected
|
||||
R<?> updateBool(String id, String field, Boolean value) {
|
||||
R<?> result = super.updateBool(id, field, value);
|
||||
if ("isDefault".equals(field)) {
|
||||
proxySettingService.clearIpInfoCache();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@PostMapping("/batchOp")
|
||||
@ResponseBody
|
||||
@@ -79,10 +87,12 @@ public class ProxySettingControllerV1 extends UpdateBoolServiceController<ProxyS
|
||||
// op 为空是删除
|
||||
throw RException.badRequest("操作类型不能为空");
|
||||
}
|
||||
else if (ProxySettingBatchOp.DELETE == op) {
|
||||
return R.judge(
|
||||
proxySettingService.removeBatchByIds(idArray));
|
||||
}
|
||||
else if (ProxySettingBatchOp.DELETE == op) {
|
||||
R<?> result = R.judge(
|
||||
proxySettingService.removeBatchByIds(idArray));
|
||||
proxySettingService.clearIpInfoCache();
|
||||
return result;
|
||||
}
|
||||
|
||||
LambdaUpdateWrapper<ProxySetting> uw = new LambdaUpdateWrapper<>();
|
||||
uw.in(ProxySetting::getId, idArray);
|
||||
|
||||
@@ -13,12 +13,19 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import jakarta.annotation.Nonnull;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.Accessors;
|
||||
import quant.rich.emoney.validator.ProxySettingValid;
|
||||
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@NoArgsConstructor
|
||||
import lombok.experimental.Accessors;
|
||||
import quant.rich.emoney.validator.ProxySettingValid;
|
||||
|
||||
/**
|
||||
* 平台代理配置。
|
||||
* <p>
|
||||
* SQLite 表 proxy_setting 使用触发器维护默认代理的一致性:新增或更新 is_default = 1
|
||||
* 时会把其他记录置为非默认;不允许把最后一条默认代理改为非默认,也不允许删除默认代理。
|
||||
* 这部分约束不在 Java 代码里重复实现,调整表结构或导入数据时需要同步检查触发器。
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "proxy_setting", autoResultMap = true)
|
||||
@ProxySettingValid
|
||||
public class ProxySetting {
|
||||
|
||||
@@ -30,12 +30,16 @@ import quant.rich.emoney.validator.RequestInfoValid;
|
||||
/**
|
||||
* 用于配置请求时的请求行为,一般而言,请求头与安卓系统的信息有关(build.prop)
|
||||
* 虽然部分请求对应服务器可能不进行审核,但合理的请求头能尽可能模仿真机行为,避免风险
|
||||
* @see DeviceInfoConfig
|
||||
* @see AndroidSdkLevelConfig
|
||||
* @see ChromeVersionsConfig
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper=false)
|
||||
* @see DeviceInfoConfig
|
||||
* @see AndroidSdkLevelConfig
|
||||
* @see ChromeVersionsConfig
|
||||
* <p>
|
||||
* SQLite 表 request_info 使用触发器维护默认请求配置的一致性:新增或更新 is_default = 1
|
||||
* 时会把其他记录置为非默认;不允许把最后一条默认请求配置改为非默认,也不允许删除默认请求配置。
|
||||
* 这部分约束不在 Java 代码里重复实现,调整表结构或导入数据时需要同步检查触发器。
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper=false)
|
||||
@Accessors(chain = true)
|
||||
@Slf4j
|
||||
@RequestInfoValid
|
||||
|
||||
@@ -9,11 +9,14 @@ import lombok.Data;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* 益盟策略和策略池
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain=true)
|
||||
/**
|
||||
* 益盟策略和策略池
|
||||
* <p>
|
||||
* SQLite 表 strategy_and_pool 对 pool_id 设置了 UNIQUE_POOL_ID 唯一约束,并使用
|
||||
* ON CONFLICT REPLACE。重复写入同一 pool_id 时会由 SQLite 替换旧记录。
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain=true)
|
||||
@TableName(value="strategy_and_pool")
|
||||
@ToString
|
||||
public class StrategyAndPool implements Comparable<StrategyAndPool> {
|
||||
|
||||
@@ -36,9 +36,13 @@ public class ProxySettingService extends SqliteServiceImpl<ProxySettingMapper, P
|
||||
}
|
||||
|
||||
|
||||
public synchronized IpInfo refreshIpThroughProxy() {
|
||||
ipInfo = GeoIPUtil.getIpInfoThroughProxy(getDefaultProxySetting());
|
||||
return ipInfo;
|
||||
}
|
||||
|
||||
}
|
||||
public synchronized IpInfo refreshIpThroughProxy() {
|
||||
ipInfo = GeoIPUtil.getIpInfoThroughProxy(getDefaultProxySetting());
|
||||
return ipInfo;
|
||||
}
|
||||
|
||||
public void clearIpInfoCache() {
|
||||
ipInfo = null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -18,7 +18,6 @@ import java.net.InetAddress;
|
||||
import java.net.Proxy;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import org.springframework.core.io.ClassPathResource;
|
||||
import org.springframework.scheduling.annotation.Async;
|
||||
|
||||
@Slf4j
|
||||
public class GeoIPUtil {
|
||||
@@ -34,8 +33,7 @@ public class GeoIPUtil {
|
||||
throw new RuntimeException("IP 地址库初始化失败", e);
|
||||
}
|
||||
}
|
||||
|
||||
@Async
|
||||
|
||||
public static IpInfo getIpInfoThroughProxy(ProxySetting proxySetting) {
|
||||
if (proxySetting == null) {
|
||||
throw new RuntimeException("代理为空");
|
||||
@@ -66,7 +64,7 @@ public class GeoIPUtil {
|
||||
String responseBody = response.body().string();
|
||||
log.debug("Response ipv4 from proxy: {}", responseBody.trim());
|
||||
ipInfo.setIp(responseBody);
|
||||
} catch (IOException e) {
|
||||
} catch (Exception e) {
|
||||
log.warn("Proxy ipv4 error: {}", e.getMessage());
|
||||
return IpInfo.EMPTY;
|
||||
}
|
||||
@@ -81,7 +79,7 @@ public class GeoIPUtil {
|
||||
String responseBody = response.body().string();
|
||||
log.debug("Response ipv6 from proxy: {}", responseBody.trim());
|
||||
ipInfo.setIpv6(responseBody);
|
||||
} catch (IOException e) {
|
||||
} catch (Exception e) {
|
||||
log.warn("Proxy ipv6 error {}", e.getMessage());
|
||||
}
|
||||
return queryIpInfoGeoLite(ipInfo);
|
||||
@@ -104,7 +102,7 @@ public class GeoIPUtil {
|
||||
|
||||
if (response.getSubdivisions() != null && !response.getSubdivisions().isEmpty()) {
|
||||
// 省
|
||||
Subdivision subdivision = response.getSubdivisions().get(0);
|
||||
Subdivision subdivision = response.getSubdivisions().getFirst();
|
||||
if (subdivision != null) {
|
||||
String subdivisionStr = subdivision.getNames().get(LOCALE);
|
||||
ipInfo.setSubdivision(subdivisionStr);
|
||||
@@ -125,4 +123,4 @@ public class GeoIPUtil {
|
||||
public static void main(String[] args) {
|
||||
System.out.format("GeoLite2-City %s\r\n", queryIpInfoGeoLite(new IpInfo().setIp("46.3.98.216")));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user