content-type 有时为空
This commit is contained in:
parent
27c57401e9
commit
cfadc7403a
|
|
@ -70,10 +70,16 @@ public class ProxyVideo {
|
||||||
SpiderDebug.log(" ++proxy res code:" + response.code());
|
SpiderDebug.log(" ++proxy res code:" + response.code());
|
||||||
SpiderDebug.log(" ++proxy res header:" + Json.toJson(response.headers()));
|
SpiderDebug.log(" ++proxy res header:" + Json.toJson(response.headers()));
|
||||||
// SpiderDebug.log(" ++proxy res data:" + Json.toJson(response.body()));
|
// SpiderDebug.log(" ++proxy res data:" + Json.toJson(response.body()));
|
||||||
String contentType = response.headers().get("Content-Type");
|
|
||||||
|
|
||||||
|
String contentType = StringUtils.isAllBlank(response.headers().get("Content-Type")) ? response.headers().get("content-type") : response.headers().get("Content-Type");
|
||||||
String contentDisposition = response.headers().get("Content-Disposition");
|
String contentDisposition = response.headers().get("Content-Disposition");
|
||||||
if (contentDisposition != null) contentType = getMimeType(contentDisposition);
|
if (contentDisposition != null && StringUtils.isAllBlank(contentType)) {
|
||||||
|
contentType = getMimeType(contentDisposition);
|
||||||
|
}
|
||||||
Map<String, String> respHeaders = new HashMap<>();
|
Map<String, String> respHeaders = new HashMap<>();
|
||||||
|
|
||||||
|
|
||||||
/* respHeaders.put("Access-Control-Allow-Credentials", "true");
|
/* respHeaders.put("Access-Control-Allow-Credentials", "true");
|
||||||
respHeaders.put("Access-Control-Allow-Origin", "*");*/
|
respHeaders.put("Access-Control-Allow-Origin", "*");*/
|
||||||
|
|
||||||
|
|
@ -179,9 +185,11 @@ public class ProxyVideo {
|
||||||
}
|
}
|
||||||
in = new SequenceInputStream(new Vector<>(inputStreams).elements());
|
in = new SequenceInputStream(new Vector<>(inputStreams).elements());
|
||||||
service.shutdown();
|
service.shutdown();
|
||||||
String contentType = resHeader.get("Content-Type");
|
String contentType = StringUtils.isAllBlank(resHeader.get("Content-Type")) ? resHeader.get("content-type") : resHeader.get("Content-Type");
|
||||||
String contentDisposition = resHeader.get("Content-Disposition");
|
String contentDisposition = resHeader.get("Content-Disposition");
|
||||||
if (contentDisposition != null) contentType = getMimeType(contentDisposition);
|
if (contentDisposition != null && StringUtils.isAllBlank(contentType)) {
|
||||||
|
contentType = getMimeType(contentDisposition);
|
||||||
|
}
|
||||||
/* respHeaders.put("Access-Control-Allow-Credentials", "true");
|
/* respHeaders.put("Access-Control-Allow-Credentials", "true");
|
||||||
respHeaders.put("Access-Control-Allow-Origin", "*");*/
|
respHeaders.put("Access-Control-Allow-Origin", "*");*/
|
||||||
|
|
||||||
|
|
@ -204,7 +212,7 @@ public class ProxyVideo {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<long[]> generatePart(Map<String, String> rangeObj, String total) {
|
public static List<long[]> generatePart(Map<String, String> rangeObj, String total) {
|
||||||
long totalSize = Long.parseLong(total);
|
long totalSize = Long.parseLong(total);
|
||||||
//超过10GB,分块是10Mb,不然是2MB
|
//超过10GB,分块是10Mb,不然是2MB
|
||||||
long partSize = totalSize > 8L * 1024L * 1024L * 1024L * 10L ? 1024 * 1024 * 8 * 10L : 1024 * 1024 * 8 * 2L;
|
long partSize = totalSize > 8L * 1024L * 1024L * 1024L * 10L ? 1024 * 1024 * 8 * 10L : 1024 * 1024 * 8 * 2L;
|
||||||
|
|
@ -227,7 +235,7 @@ public class ProxyVideo {
|
||||||
return partList;
|
return partList;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Map<String, String> parseRange(String range) {
|
public static Map<String, String> parseRange(String range) {
|
||||||
SpiderDebug.log("parseRange:" + range);
|
SpiderDebug.log("parseRange:" + range);
|
||||||
if (StringUtils.isNoneBlank(range)) {
|
if (StringUtils.isNoneBlank(range)) {
|
||||||
|
|
||||||
|
|
@ -239,7 +247,7 @@ public class ProxyVideo {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String getMimeType(String contentDisposition) {
|
public static String getMimeType(String contentDisposition) {
|
||||||
if (contentDisposition.endsWith(".mp4")) {
|
if (contentDisposition.endsWith(".mp4")) {
|
||||||
return "video/mp4";
|
return "video/mp4";
|
||||||
} else if (contentDisposition.endsWith(".webm")) {
|
} else if (contentDisposition.endsWith(".webm")) {
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1 +1 @@
|
||||||
1e79368bea06172cd75d6e5856d2618f
|
cb01574459b3b0e05a8162798e4453a4
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"spider": "https://andoridspidermt.netlify.app/jar/custom_spider.jar;md5;1e79368bea06172cd75d6e5856d2618f",
|
"spider": "https://andoridspidermt.netlify.app/jar/custom_spider.jar;md5;cb01574459b3b0e05a8162798e4453a4",
|
||||||
"lives": [
|
"lives": [
|
||||||
{
|
{
|
||||||
"name": "电视直播",
|
"name": "电视直播",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue