diff --git a/src/main/java/com/yutou/nas/NasApplication.java b/src/main/java/com/yutou/nas/NasApplication.java index 227023c..f09406f 100644 --- a/src/main/java/com/yutou/nas/NasApplication.java +++ b/src/main/java/com/yutou/nas/NasApplication.java @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Import; @Import(BTDownloadManager.class) @SpringBootApplication public class NasApplication { - public static final String version = "1.2.14"; + public static final String version = "1.2.15"; public static void main(String[] args) { SpringApplication.run(NasApplication.class, args); diff --git a/src/main/java/com/yutou/nas/utils/HttpTools.java b/src/main/java/com/yutou/nas/utils/HttpTools.java index 659b5f5..ebeb7d3 100644 --- a/src/main/java/com/yutou/nas/utils/HttpTools.java +++ b/src/main/java/com/yutou/nas/utils/HttpTools.java @@ -2,9 +2,7 @@ package com.yutou.nas.utils; import com.alibaba.fastjson2.JSONObject; import com.yutou.nas.interfaces.DownloadInterface; -import com.yutou.nas.utils.Interfaces.NetworkInterface; -import javax.net.ssl.HttpsURLConnection; import java.io.*; import java.net.HttpURLConnection; import java.net.URL; @@ -33,7 +31,7 @@ public class HttpTools { try { URLConnection connection; connection = new URL(url).openConnection(); - connection.setRequestProperty("User-Agent", getExtUa()); + connection.setRequestProperty("User-Agent", getUa()); if (header != null) { for (String key : header.keySet()) { connection.addRequestProperty(key, header.get(key)); @@ -68,7 +66,7 @@ public class HttpTools { } connection.setDoOutput(true); connection.setDoInput(true); - connection.addRequestProperty("User-Agent", getExtUa()); + connection.addRequestProperty("User-Agent", getUa()); connection.setConnectTimeout(5 * 1000); connection.setReadTimeout(10 * 1000); //connection.addRequestProperty("Connection", "keep-alive"); @@ -100,8 +98,8 @@ public class HttpTools { } } - private static String getExtUa() { - return "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.97 Safari/537.36"; + public static String getUa() { + return "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36"; } private static String getKuKuUA() { @@ -165,7 +163,7 @@ public class HttpTools { } Log.i("DOWNLOAD", "下载文件:" + url + " 保存文件:" + saveName); HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(); - connection.addRequestProperty("User-Agent", getExtUa()); + connection.addRequestProperty("User-Agent", getUa()); // Log.i(TAG,"获取到网络请求:"+connection.getResponseCode()); @@ -222,7 +220,7 @@ public class HttpTools { } Log.i("DOWNLOAD", "下载文件:" + url + " 保存文件:" + saveName); HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(); - connection.addRequestProperty("User-Agent", getExtUa()); + connection.addRequestProperty("User-Agent", getUa()); // Log.i(TAG,"获取到网络请求:"+connection.getResponseCode()); diff --git a/src/main/java/com/yutou/nas/utils/JellyfinAPIManager.java b/src/main/java/com/yutou/nas/utils/JellyfinAPIManager.java index ca08429..6340500 100644 --- a/src/main/java/com/yutou/nas/utils/JellyfinAPIManager.java +++ b/src/main/java/com/yutou/nas/utils/JellyfinAPIManager.java @@ -18,10 +18,11 @@ import java.util.*; public class JellyfinAPIManager { private List mediaItem = new ArrayList<>(); - private static final String userId="389438aeda0a4972ac66a23cbe5c289c"; - private static final String token="7f8efec6c950415cbaa8a0b54b3a832b"; + private static String userId="389438aeda0a4972ac66a23cbe5c289c"; + private static String token="7f8efec6c950415cbaa8a0b54b3a832b"; public JellyfinAPIManager() { + login(); mediaItem = getAllItem(); } @@ -327,6 +328,24 @@ public class JellyfinAPIManager { public static String mainPath = "Z:\\download\\anim\\"; + public void login(){ + String url="http://192.168.31.88:8096/Users/authenticatebyname"; + Map header = new HashMap<>(); + header.put("content-type", "application/json"); + header.put("accept", "application/json"); + header.put("Connection", "keep-alive"); + header.put("User-Agent", HttpTools.getUa()); + header.put("Origin", "http://192.168.31.88:8096"); + header.put("X-Emby-Authorization", "MediaBrowser Client=\"Jellyfin Web\", Device=\"Chrome\", DeviceId=\"TW96aWxsYS81LjAgKFdpbmRvd3MgTlQgMTAuMDsgV2luNjQ7IHg2NCkgQXBwbGVXZWJLaXQvNTM3LjM2IChLSFRNTCwgbGlrZSBHZWNrbykgQ2hyb21lLzg2LjAuNDI0MC43NSBTYWZhcmkvNTM3LjM2fDE2MDI4NDYzMDc5NjE1\", Version=\"10.8.1\""); + JSONObject json=new JSONObject(); + json.put("Pw","34864394"); + json.put("Username","home"); + String post = HttpTools.http_post(url, json.toJSONString().getBytes(StandardCharsets.UTF_8), 3, header); + json=JSONObject.parseObject(post,JSONObject.class); + token=json.getString("AccessToken"); + userId=json.getJSONObject("User").getString("Id"); + } + public static void main(String[] args) { File file = new File("Z:\\download\\anim\\夏日重现"); //new JellyfinAPIManager().search(file.getName(), file);