From e4ecde0db325f36c815660c4ee91f3ab8d72860c Mon Sep 17 00:00:00 2001 From: Yutousama <583819556@qq.com> Date: Fri, 11 Mar 2022 21:07:06 +0800 Subject: [PATCH] update --- .../qqbot/Controllers/AppController.java | 23 +++++++++++++++++++ .../com/yutou/qqbot/utlis/CorsConfig.java | 22 ++++++++++++++++++ .../java/com/yutou/qqbot/utlis/HttpTools.java | 1 + .../java/com/yutou/qqbot/utlis/WebClient.java | 5 +++- 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/yutou/qqbot/utlis/CorsConfig.java diff --git a/src/main/java/com/yutou/qqbot/Controllers/AppController.java b/src/main/java/com/yutou/qqbot/Controllers/AppController.java index ed0c6b7..289e2b0 100644 --- a/src/main/java/com/yutou/qqbot/Controllers/AppController.java +++ b/src/main/java/com/yutou/qqbot/Controllers/AppController.java @@ -13,7 +13,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.File; +import java.io.IOException; @Controller public class AppController { @@ -87,4 +90,24 @@ public class AppController { QQBotManager.getInstance().sendMessage(_file,583819556L,"time = "+AppTools.getToDayNowTimeToString()); return "ok"; } + @RequestMapping("/test.do") + @ResponseBody + public String test(HttpServletResponse response){ + System.out.println("NAS自动关机"); + /* try { + response.sendRedirect("http://192.168.31.88:9999/live/index.m3u8"); + } catch (IOException e) { + e.printStackTrace(); + }*/ + // return HttpTools.http_get("http://192.168.31.88:9999/live/index.m3u8",null); + return "1"; + } + @RequestMapping("*.ts") + public void test2(HttpServletResponse response, HttpServletRequest request){ + try { + response.sendRedirect("http://192.168.31.88:9999/live"+request.getRequestURI()); + } catch (IOException e) { + e.printStackTrace(); + } + } } diff --git a/src/main/java/com/yutou/qqbot/utlis/CorsConfig.java b/src/main/java/com/yutou/qqbot/utlis/CorsConfig.java new file mode 100644 index 0000000..12f3897 --- /dev/null +++ b/src/main/java/com/yutou/qqbot/utlis/CorsConfig.java @@ -0,0 +1,22 @@ +package com.yutou.qqbot.utlis; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class CorsConfig implements WebMvcConfigurer { + @Override + public void addCorsMappings(CorsRegistry registry) { + //设置允许跨域的路径 + registry.addMapping("/**") + //设置允许跨域请求的域名 + .allowedOriginPatterns("*") + //是否允许证书 不再默认开启 + .allowCredentials(true) + //设置允许的方法 + .allowedMethods("*") + //跨域允许时间 + .maxAge(3600); + } +} \ No newline at end of file diff --git a/src/main/java/com/yutou/qqbot/utlis/HttpTools.java b/src/main/java/com/yutou/qqbot/utlis/HttpTools.java index a2aa07e..acab6be 100644 --- a/src/main/java/com/yutou/qqbot/utlis/HttpTools.java +++ b/src/main/java/com/yutou/qqbot/utlis/HttpTools.java @@ -63,6 +63,7 @@ public class HttpTools { String tmp; while ((tmp = reader.readLine()) != null) { str.append(tmp); + str.append("\n"); } reader.close(); return str.toString(); diff --git a/src/main/java/com/yutou/qqbot/utlis/WebClient.java b/src/main/java/com/yutou/qqbot/utlis/WebClient.java index 7f679be..baa871c 100644 --- a/src/main/java/com/yutou/qqbot/utlis/WebClient.java +++ b/src/main/java/com/yutou/qqbot/utlis/WebClient.java @@ -62,7 +62,10 @@ public class WebClient { ChromeOptions options = new ChromeOptions(); // options.addArguments("--disable-gpu"); // options.addArguments("blink-settings=imagesEnabled=false"); - options.addArguments("--headless"); + String headless = RedisTools.get("headless"); + if("true".equals(headless)) { + options.addArguments("--headless"); + } options.addArguments("--no-sandbox"); // options.addArguments("--incognito"); options.addArguments("--disable-plugins");