Merge remote-tracking branch 'origin/main'

# Conflicts:
#	jar/custom_spider.jar
#	jar/custom_spider.jar.md5
This commit is contained in:
dukun 2023-02-02 13:24:09 +08:00
commit fd4cb23156
4 changed files with 5 additions and 5 deletions

View File

@ -50,12 +50,12 @@ class OkRequest {
} }
private void getInstance() { private void getInstance() {
Request.Builder builder = new Request.Builder().url(url); Request.Builder builder = new Request.Builder();
if (method.equals(OkHttp.GET) && params != null) setParams(); if (method.equals(OkHttp.GET) && params != null) setParams();
if (method.equals(OkHttp.POST)) builder.post(getRequestBody()); if (method.equals(OkHttp.POST)) builder.post(getRequestBody());
if (header != null) for (String key : header.keySet()) builder.addHeader(key, header.get(key)); if (header != null) for (String key : header.keySet()) builder.addHeader(key, header.get(key));
if (tag != null) builder.tag(tag); if (tag != null) builder.tag(tag);
request = builder.build(); request = builder.url(url).build();
} }
private RequestBody getRequestBody() { private RequestBody getRequestBody() {

View File

@ -310,7 +310,7 @@ public class Ali {
private void getQRCode() { private void getQRCode() {
HashMap<String, String> headers = new HashMap<>(); HashMap<String, String> headers = new HashMap<>();
headers.put("User-Agent", Misc.CHROME); headers.put("User-Agent", Misc.CHROME);
Data data = Data.objectFrom(OkHttp.string("https://easy-token.cooluc.com/qr", headers)); Data data = Data.objectFrom(OkHttp.string("https://token.cooluc.com/qr", headers));
if (data != null) Init.run(() -> showCode(data)); if (data != null) Init.run(() -> showCode(data));
service = Executors.newScheduledThreadPool(1); service = Executors.newScheduledThreadPool(1);
if (data != null) service.scheduleAtFixedRate(() -> { if (data != null) service.scheduleAtFixedRate(() -> {

View File

@ -1,5 +1,5 @@
{ {
"spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;fb25839a41ad3ce40356acf31920373c", "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;4971e3aee0e802323001771e44bb1a87",
"wallpaper": "https://gao.chuqiuyu.tk", "wallpaper": "https://gao.chuqiuyu.tk",
"lives": [ "lives": [
{ {

View File

@ -1,5 +1,5 @@
{ {
"spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;fb25839a41ad3ce40356acf31920373c", "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;4971e3aee0e802323001771e44bb1a87",
"wallpaper": "http://www.kf666888.cn/api/tvbox/img", "wallpaper": "http://www.kf666888.cn/api/tvbox/img",
"lives": [ "lives": [
{ {