This commit is contained in:
GH Action - Upstream Sync 2023-03-09 01:42:56 +00:00
commit b05511697d
13 changed files with 4334 additions and 8803 deletions

View File

@ -7,5 +7,5 @@ https://github.com/CatVodTVOfficial/CatVodTVSpider
### Usage
[fastgit](https://raw.fastgit.org/FongMi/CatVodSpider/main/json/config.json)
[gh-proxy](https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/config.json)
[ghproxy](https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/config.json)
[https://fongmi.page.link/cat](https://fongmi.page.link/cat)

View File

@ -12,6 +12,7 @@ android {
targetSdk 29
ndk { abiFilters "armeabi-v7a" }
buildConfigField("String", "APP_ID", "\"${appId}\"")
buildConfigField("String", "CLIENT_ID", "\"${clientId}\"")
}
buildTypes {

View File

@ -116,16 +116,16 @@ public class API {
return result;
}
private String authOpen(String url, JSONObject body, boolean retry) {
String result = OkHttp.postJson(url, body.toString(), getHeaderAuthOpen());
if (retry && check401Open(result)) return authOpen(url, body, false);
private String authOpen(String url, String json, boolean retry) {
String result = OkHttp.postJson(url, json, getHeaderAuthOpen());
if (retry && check401Open(result)) return authOpen(url, json, false);
return result;
}
private String sign(String url, JSONObject body, boolean retry) {
private String sign(String url, String json, boolean retry) {
url = url.startsWith("https") ? url : "https://api.aliyundrive.com/" + url;
String result = OkHttp.postJson(url, body.toString(), getHeaderSign());
if (retry && check401(result)) return sign(url, body, false);
String result = OkHttp.postJson(url, json, getHeaderSign());
if (retry && check401(result)) return sign(url, json, false);
return result;
}
@ -157,7 +157,7 @@ public class API {
try {
JSONObject body = new JSONObject();
String token = auth.getRefreshToken();
if (token.startsWith("http")) token = OkHttp.string(token);
if (token.startsWith("http")) token = OkHttp.string(token).replaceAll("[^A-Za-z0-9]", "");
body.put("refresh_token", token);
body.put("grant_type", "refresh_token");
JSONObject object = new JSONObject(post("https://auth.aliyundrive.com/v2/account/token", body));
@ -170,7 +170,7 @@ public class API {
body = new JSONObject();
body.put("authorize", 1);
body.put("scope", "user:base,file:all:read,file:all:write");
object = new JSONObject(auth("https://open.aliyundrive.com/oauth/users/authorize?client_id=76917ccccd4441c39457a04f6084fb2f&redirect_uri=https://alist.nn.ci/tool/aliyundrive/callback&scope=user:base,file:all:read,file:all:write&state=", body, false));
object = new JSONObject(auth("https://open.aliyundrive.com/oauth/users/authorize?client_id=" + BuildConfig.CLIENT_ID + "&redirect_uri=https://alist.nn.ci/tool/aliyundrive/callback&scope=user:base,file:all:read,file:all:write&state=", body, false));
String code = object.toString().substring(object.toString().indexOf("code=") + 5, 104);
//OAuth Redirect
body = new JSONObject();
@ -234,7 +234,7 @@ public class API {
body.put("nonce", 0);
body.put("pubKey", pubKey);
body.put("refreshToken", auth.getRefreshToken());
JSONObject object = new JSONObject(sign("users/v1/users/device/create_session", body, false));
JSONObject object = new JSONObject(sign("users/v1/users/device/create_session", body.toString(), false));
if (!object.getBoolean("success")) throw new Exception(object.toString());
return true;
} catch (Exception e) {
@ -358,8 +358,8 @@ public class API {
JSONObject body = new JSONObject();
body.put("file_id", fileId);
body.put("drive_id", auth.getDriveId());
String url = new JSONObject(authOpen("https://open.aliyundrive.com/adrive/v1.0/openFile/getDownloadUrl", body, true)).optString("url");
delete(fileId);
String url = new JSONObject(authOpen("https://open.aliyundrive.com/adrive/v1.0/openFile/getDownloadUrl", body.toString(), true)).optString("url");
Init.execute(() -> delete(fileId));
return url;
}
@ -428,7 +428,7 @@ public class API {
body.put("share_id", auth.getShareId());
body.put("template_id", "");
body.put("category", "live_transcoding");
String json = sign("v2/file/get_share_link_video_preview_play_info", body, true);
String json = sign("v2/file/get_share_link_video_preview_play_info", body.toString(), true);
JSONArray taskList = new JSONObject(json).getJSONObject("video_preview_play_info").getJSONArray("live_transcoding_task_list");
Map<String, List<String>> respHeaders = new HashMap<>();
OkHttp.stringNoRedirect(getPreviewQuality(taskList, flag), getHeader(), respHeaders);

View File

@ -20,3 +20,4 @@ android.useAndroidX=true
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
appId=5dde4e1bdf9e4966b387ba58f4b3fdc3
clientId=76917ccccd4441c39457a04f6084fb2f

Binary file not shown.

View File

@ -1 +1 @@
100b8d081bfead06388e6a65d12fa554
df10e61cf95ea6a8507162d0c9e9063f

View File

@ -1,11 +1,11 @@
{
"spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;100b8d081bfead06388e6a65d12fa554",
"spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;df10e61cf95ea6a8507162d0c9e9063f",
"wallpaper": "https://gao.chuqiuyu.tk",
"lives": [
{
"name": "直播",
"type": 0,
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/txt/adult.txt"
"url": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/txt/adult.txt"
}
],
"sites": [

View File

@ -9,7 +9,7 @@
"filterable": 1,
"switchable": 0,
"ext": "http://ali.饭太硬.ml/alitoken",
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
"jar": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
},
{
"key": "易搜",
@ -20,7 +20,7 @@
"filterable": 0,
"switchable": 0,
"ext": "http://ali.饭太硬.ml/alitoken",
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
"jar": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
},
{
"key": "盤搜",
@ -31,7 +31,7 @@
"filterable": 0,
"switchable": 0,
"ext": "http://ali.饭太硬.ml/alitoken",
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
"jar": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
},
{
"key": "UP雲搜",
@ -42,7 +42,7 @@
"filterable": 0,
"switchable": 0,
"ext": "http://ali.饭太硬.ml/alitoken",
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
"jar": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
},
{
"key": "找資源",
@ -53,7 +53,7 @@
"filterable": 0,
"switchable": 0,
"ext": "http://ali.饭太硬.ml/alitoken$$$yingshi$$$abcd1234",
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
"jar": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
},
{
"key": "push_agent",
@ -64,7 +64,7 @@
"filterable": 0,
"switchable": 0,
"ext": "http://ali.饭太硬.ml/alitoken",
"jar": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
"jar": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar"
}
]
}

View File

@ -1,5 +1,5 @@
{
"cookie": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/txt/cookie.txt",
"cookie": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/txt/cookie.txt",
"classes": [
{
"type_name": "帕梅拉",

View File

@ -1,5 +1,5 @@
{
"spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;100b8d081bfead06388e6a65d12fa554",
"spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;df10e61cf95ea6a8507162d0c9e9063f",
"wallpaper": "http://www.kf666888.cn/api/tvbox/img",
"lives": [
{
@ -12,7 +12,7 @@
{
"name": "Json",
"type": 1,
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/live.json",
"url": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/live.json",
"epg": "http://epg.51zmt.top:8000/api/diyp/?ch={epg}&date={date}",
"logo": "http://epg.51zmt.top:8000/{logo}"
}
@ -26,7 +26,7 @@
"searchable": 1,
"filterable": 1,
"changeable": 0,
"ext": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/alist.json"
"ext": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/alist.json"
},
{
"key": "哔哩",
@ -36,7 +36,7 @@
"searchable": 1,
"filterable": 1,
"changeable": 0,
"ext": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/bili.json"
"ext": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/bili.json"
},
{
"key": "泥巴",
@ -55,7 +55,7 @@
"searchable": 1,
"filterable": 1,
"changeable": 1,
"ext": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/duboku.json"
"ext": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/duboku.json"
},
{
"key": "快播",

File diff suppressed because it is too large Load Diff

View File

@ -52,7 +52,7 @@ public class Run {
for (Group group : groups) {
for (Channel channel : group.getChannel()) {
channel.number(String.format(Locale.getDefault(), "%03d", ++number));
channel.logo("https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/TV/release/app/src/leanback/res/drawable-xxhdpi/ic_live.png");
channel.logo("https://ghproxy.com/https://raw.githubusercontent.com/FongMi/TV/release/app/src/main/res/drawable-xxhdpi/ic_img_empty.png");
combine(channel);
}
}

View File

@ -1 +1 @@
DedeUserID=3493076028885079;DedeUserID__ckMd5=60a8757a1f4d6ae9;SESSDATA=42b8ada6,1683277266,4bd05*b2;bili_jct=2dbe39aea02b41324395630a24d4775f;
DedeUserID=690781341;DedeUserID__ckMd5=cabc96906269c5b6;SESSDATA=2245ba24%2C1684212125%2C466fd%2Ab2;bili_jct=de6fdb60c10f8a83910aa55d79407b4e;