From f59069399fea5c28e909ad9904d0e751bc3273bd Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Sat, 9 Jul 2022 16:30:46 +0800
Subject: [PATCH 01/16] =?UTF-8?q?update:rss=E8=AE=A2=E9=98=85=E5=8A=A8?=
 =?UTF-8?q?=E7=94=BB=E6=96=B0=E5=A2=9E=E9=80=89=E6=8B=A9=E5=AD=A3=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/html/body/nas/animrss.html | 71 ++++++++++++++++++++--------------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/web/html/body/nas/animrss.html b/web/html/body/nas/animrss.html
index c0e083b..d615356 100644
--- a/web/html/body/nas/animrss.html
+++ b/web/html/body/nas/animrss.html
@@ -13,12 +13,10 @@
 
 <div class="layui-layout layui-layout-admin">
     <div id="header"></div>
+
     <div class="layui-body body2">
-
         <div id="side"></div>
-        <blockquote class="layui-elem-quote"><span id="ip">番剧订阅器</span></blockquote>
-
-
+        <blockquote class="layui-elem-quote"><span>番剧订阅器</span></blockquote>
         <button type="button" id="addType" class="layui-btn layui-btn-normal">新增分类</button>
         <div class="layui-tab" lay-filter="animType" lay-allowclose="true">
             <ul class="layui-tab-title">
@@ -28,7 +26,7 @@
 
             </div>
         </div>
-        <blockquote class="layui-elem-quote"><span id="ip">动漫花园RSS</span></blockquote>
+        <blockquote class="layui-elem-quote"><span>动漫花园RSS</span></blockquote>
         <form class="layui-form" action="" lay-filter="formTest">
             <div class="layui-form-item">
                 <label class="layui-form-label"><a type="text" id="search"
@@ -220,10 +218,10 @@
                         , cols: [[
                             {field: "id", title: "id", width: 80, sort: true, fixed: 'left'}
                             , {field: 'title', title: '标题', edit: 'text'}
-                            , {field: 'categories', title: '类型',width: 80}
-                            , {field: 'author', title: '字幕组',width:100}
+                            , {field: 'categories', title: '类型', width: 80}
+                            , {field: 'author', title: '字幕组', width: 100}
                             , {field: 'titlekey', title: '搜索关键词', edit: 'text'}
-                            , {field: 'enable', title: '状态',width:80, templet: '#animState'}
+                            , {field: 'enable', title: '状态', width: 80, templet: '#animState'}
                             , {field: "right", toolbar: '#listTools'}
                         ]]
                     });
@@ -293,38 +291,53 @@
                                 layer.close(index);
                             }
                         })
-                    }else if(obj.event === 'src'){
-                        window.open("https://share.dmhy.org/topics/list?keyword="+encodeURI(obj.data.titlekey))
+                    } else if (obj.event === 'src') {
+                        window.open("https://share.dmhy.org/topics/list?keyword=" + encodeURI(obj.data.titlekey))
                     }
                 })
                 table.on('tool(rssTools)', function (obj) {
                     let data = obj.data;
                     if (obj.event === 'addRss') {
-                        layer.prompt({
-                            formType: 2,
+                        let option = '';
+                        for (let i = 0; i < 20; i++) {
+                            if (i === 1) {
+                                option += '<option selected>' + i + '</option>'
+                            } else {
+                                option += '<option>' + i + '</option>'
+                            }
+                        }
+                        let html = '<form class="layui-form">名字:<div class="layui-form-item"><textarea  class="layui-textarea" id="rss_value">'+data.title+'</textarea> 季度:<select lay-search lay-verify="required" id="rss_select">'+option+'</select></div></form>'
+                        layer.open({
+                            type: 0,
+                            area: ['500px', '600px'],
                             title: '订阅这个RSS结果,并加入到第' + tabid + '个分类中',
-                            value: data.title
-                        }, function (value, index, elem) {
-                            $.post("/anim/rss/add.do", {
-                                title: value
-                                , author: data.author
-                                , categories: data.categories[0]
-                                , titleKey: $('#title').val()
-                                , bid: tabid
-                            }, function (data) {
-                                let json = JSON.parse(data);
-                                layer.msg(json.msg)
-                                layer.close(index)
-                            })
+                            content: html,
+                            success:function (){
+                                form.render('select');
+                            },
+                            yes: function (index, elem) {
+                                let value=$('#rss_value')[0].value+'/Season '+$('#rss_select')[0].value
+                                $.post("/anim/rss/add.do", {
+                                    title: value
+                                    , author: data.author
+                                    , categories: data.categories[0]
+                                    , titleKey: $('#title').val()
+                                    , bid: tabid
+                                }, function (data) {
+                                    let json = JSON.parse(data);
+                                    layer.msg(json.msg)
+                                    layer.close(index)
+                                })
+                            }
                         })
-                    }else if(obj.event === "rss_src"){
+                    } else if (obj.event === "rss_src") {
                         window.open(obj.data.link)
                     }
                 })
                 form.on('switch(stateCheckbox)', function (data) {
                     let flag = data.elem.checked ? 1 : 0;
                     let id = data.value;
-                    $.post('/anim/rss/edit.do',{id:id,enable:flag},function (json) {
+                    $.post('/anim/rss/edit.do', {id: id, enable: flag}, function (json) {
                         layer.msg(json.msg)
                     })
                 })
@@ -339,8 +352,8 @@
             page: true,
             cols: [[
                 {field: "title", title: "标题", sort: true, fixed: 'left'}
-                , {field: 'author', title: '字幕组',width:100}
-                , {field: 'categories', title: '类型',width:80, templet: '<div><label>{{d.categories[0]}}</label><div>'}
+                , {field: 'author', title: '字幕组', width: 100}
+                , {field: 'categories', title: '类型', width: 80, templet: '<div><label>{{d.categories[0]}}</label><div>'}
                 , {field: 'pubDate', title: '发布时间',}
                 , {field: 'thumbnail', title: '封面', templet: '<div><img src="{{d.thumbnail}}"/><div>'}
                 , {field: 'title', title: 'magnet', templet: '<div><label >{{d.enclosure.link}}</label ></div>'}

From 9d391ea369ce4bdd4643e567930b1bb51c23042c Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Sun, 10 Jul 2022 14:31:07 +0800
Subject: [PATCH 02/16] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 20 +++++++++----------
 .../yutou/tools/AuthConfig/AuthConfig.java    |  2 +-
 .../AuthConfig/RoleAccessDecisionManager.java |  6 +++---
 .../java/com/yutou/tools/BiliBili/Live.java   |  7 ++++---
 .../tools/Tools/AuthManagerController.java    |  8 ++++----
 .../yutou/tools/Tools/PasswordManager.java    |  9 +++++----
 .../tools/bangumi/AnimMetaController.java     |  4 ++--
 .../tools/bangumi/AnimationController.java    | 11 +++++-----
 .../yutou/tools/bangumi/AnimationData.java    |  4 ++--
 .../java/com/yutou/tools/nas/NasManager.java  |  7 ++++---
 .../java/com/yutou/tools/nas/UpdateIp.java    |  2 +-
 .../java/com/yutou/tools/other/tools.java     |  4 ++--
 .../yutou/tools/sqlite/ADSQLiteManager.java   |  4 ++--
 .../com/yutou/tools/sqlite/SQLiteManager.java |  4 ++--
 .../java/com/yutou/tools/utils/APIFilter.java |  6 +++---
 .../yutou/tools/utils/BiliBiliLiveTools.java  |  4 ++--
 .../com/yutou/tools/utils/ConfigTools.java    |  2 +-
 .../java/com/yutou/tools/utils/HttpTools.java |  2 +-
 .../yutou/tools/utils/NasDepotManager.java    |  9 +++++----
 .../com/yutou/tools/utils/RedisTools.java     |  2 +-
 .../java/com/yutou/tools/utils/Tools.java     |  4 ++--
 .../com/yutou/tools/web/userController.java   |  4 ++--
 .../yutou/tools/ToolsApplicationTests.java    |  2 +-
 23 files changed, 66 insertions(+), 61 deletions(-)

diff --git a/pom.xml b/pom.xml
index e2fd69e..8c32008 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,19 +47,19 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>RELEASE</version>
+            <version>2.7.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>3.6.3</version>
+            <version>4.2.3</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-redis</artifactId>
-            <version>2.2.5.RELEASE</version>
+            <version>2.7.0</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -69,20 +69,20 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>2.2.0</version>
+            <version>2.2.2</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.22</version>
+            <version>1.18.24</version>
             <scope>provided</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.79</version>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>2.0.8</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.jcraft/jsch -->
         <dependency>
@@ -93,13 +93,13 @@
         <dependency>
             <groupId>com.aliyun.oss</groupId>
             <artifactId>aliyun-sdk-oss</artifactId>
-            <version>3.13.2</version>
+            <version>3.15.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.36.0.2</version>
+            <version>3.36.0.3</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/java/com/yutou/tools/AuthConfig/AuthConfig.java b/src/main/java/com/yutou/tools/AuthConfig/AuthConfig.java
index fc085cf..d46db6e 100644
--- a/src/main/java/com/yutou/tools/AuthConfig/AuthConfig.java
+++ b/src/main/java/com/yutou/tools/AuthConfig/AuthConfig.java
@@ -1,6 +1,6 @@
 package com.yutou.tools.AuthConfig;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.mybatis.dao.PermissionDao;
 import com.yutou.tools.mybatis.dao.UKeyDao;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/com/yutou/tools/AuthConfig/RoleAccessDecisionManager.java b/src/main/java/com/yutou/tools/AuthConfig/RoleAccessDecisionManager.java
index 81df89c..f0d1e35 100644
--- a/src/main/java/com/yutou/tools/AuthConfig/RoleAccessDecisionManager.java
+++ b/src/main/java/com/yutou/tools/AuthConfig/RoleAccessDecisionManager.java
@@ -1,6 +1,6 @@
 package com.yutou.tools.AuthConfig;
 
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
 import com.yutou.tools.mybatis.dao.PermissionDao;
 import com.yutou.tools.mybatis.dao.UKeyDao;
 import com.yutou.tools.mybatis.model.Permission;
@@ -79,14 +79,14 @@ public class RoleAccessDecisionManager implements AccessDecisionManager {
            }
            UKey key = list.get(0);
            JSONArray powers = JSONArray.parseArray(key.getPower());
-           if(powers.toJavaList(String.class).contains("-1")){
+           if(powers.toList(String.class).contains("-1")){
               return;
            }
            PermissionExample pExample = new PermissionExample();
            pExample.createCriteria().andUrlEqualTo(url);
            List<Permission> permissions = permissionDao.selectByExample(pExample);
            if (!permissions.isEmpty()) {
-               if (!powers.toJavaList(String.class).contains(permissions.get(0).getId()+"")) {
+               if (!powers.toList(String.class).contains(permissions.get(0).getId()+"")) {
                    System.out.println("111111");
                    error();
                }else{
diff --git a/src/main/java/com/yutou/tools/BiliBili/Live.java b/src/main/java/com/yutou/tools/BiliBili/Live.java
index 3cd8456..af5c572 100644
--- a/src/main/java/com/yutou/tools/BiliBili/Live.java
+++ b/src/main/java/com/yutou/tools/BiliBili/Live.java
@@ -1,7 +1,8 @@
 package com.yutou.tools.BiliBili;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.mybatis.dao.BilibiliLiveDao;
 import com.yutou.tools.mybatis.model.BilibiliLive;
 import com.yutou.tools.mybatis.model.BilibiliLiveExample;
@@ -54,7 +55,7 @@ public class Live {
         JSONObject json=new JSONObject();
         json.put("code",0);
         json.put("msg","ok");
-        json.put("data",JSONArray.toJSON(list));
+        json.put("data", JSON.toJSON(list));
         return json.toJSONString();
     }
     @ResponseBody
diff --git a/src/main/java/com/yutou/tools/Tools/AuthManagerController.java b/src/main/java/com/yutou/tools/Tools/AuthManagerController.java
index 7d94e94..eda8576 100644
--- a/src/main/java/com/yutou/tools/Tools/AuthManagerController.java
+++ b/src/main/java/com/yutou/tools/Tools/AuthManagerController.java
@@ -1,8 +1,8 @@
 package com.yutou.tools.Tools;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.mybatis.dao.PermissionDao;
 import com.yutou.tools.mybatis.dao.UKeyDao;
 import com.yutou.tools.mybatis.model.Permission;
@@ -66,7 +66,7 @@ public class AuthManagerController {
         admin.put("disabled", "");
         admin.put("checked", "");
         allPermission.add(admin);
-        List<String> list = powers.toJavaList(String.class);
+        List<String> list = powers.toList(String.class);
         if (list.contains("-1")) {
             userPermission.add("-1");
         }
diff --git a/src/main/java/com/yutou/tools/Tools/PasswordManager.java b/src/main/java/com/yutou/tools/Tools/PasswordManager.java
index e7f2526..f2adbe2 100644
--- a/src/main/java/com/yutou/tools/Tools/PasswordManager.java
+++ b/src/main/java/com/yutou/tools/Tools/PasswordManager.java
@@ -1,7 +1,8 @@
 package com.yutou.tools.Tools;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.mybatis.dao.ToolsPasswordDao;
 import com.yutou.tools.mybatis.dao.ToolsPasswordTypeDao;
 import com.yutou.tools.mybatis.model.ToolsPassword;
@@ -45,7 +46,7 @@ public class PasswordManager {
         }
         json.put("code",0);
         json.put("msg","ok");
-        json.put("data", JSONArray.toJSON(passwords));
+        json.put("data", JSON.toJSON(passwords));
         return json.toJSONString();
     }
     @ResponseBody
@@ -100,7 +101,7 @@ public class PasswordManager {
         List<ToolsPasswordType> toolsPasswordTypes=passwordTypeDao.selectByExample(example);
         json.put("code",0);
         json.put("msg","ok");
-        json.put("data", JSONArray.toJSON(toolsPasswordTypes));
+        json.put("data", JSON.toJSON(toolsPasswordTypes));
         return json.toJSONString();
     }
     @ResponseBody
diff --git a/src/main/java/com/yutou/tools/bangumi/AnimMetaController.java b/src/main/java/com/yutou/tools/bangumi/AnimMetaController.java
index 42081fd..b6e7693 100644
--- a/src/main/java/com/yutou/tools/bangumi/AnimMetaController.java
+++ b/src/main/java/com/yutou/tools/bangumi/AnimMetaController.java
@@ -1,7 +1,7 @@
 package com.yutou.tools.bangumi;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.nas.UpdateIp;
 import com.yutou.tools.utils.HttpTools;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/com/yutou/tools/bangumi/AnimationController.java b/src/main/java/com/yutou/tools/bangumi/AnimationController.java
index e578fa2..1403925 100644
--- a/src/main/java/com/yutou/tools/bangumi/AnimationController.java
+++ b/src/main/java/com/yutou/tools/bangumi/AnimationController.java
@@ -1,7 +1,8 @@
 package com.yutou.tools.bangumi;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.mybatis.dao.BangumiItemDao;
 import com.yutou.tools.mybatis.dao.BangumiListDao;
 import com.yutou.tools.mybatis.model.BangumiItem;
@@ -70,7 +71,7 @@ public class AnimationController {
         JSONObject json = new JSONObject();
         json.put("code", 0);
         json.put("msg", "ok");
-        json.put("data", JSONArray.toJSON(listDao.selectByExample(new BangumiListExample())));
+        json.put("data", JSON.toJSON(listDao.selectByExample(new BangumiListExample())));
         return json.toJSONString();
     }
     @ResponseBody
@@ -111,7 +112,7 @@ public class AnimationController {
         example.createCriteria().andBidEqualTo(type);
         json.put("code", 0);
         json.put("msg", "ok");
-        json.put("data", JSONArray.toJSON(itemDao.selectByExample(example)));
+        json.put("data", JSON.toJSON(itemDao.selectByExample(example)));
         return json.toJSONString();
     }
     @ResponseBody
@@ -161,7 +162,7 @@ public class AnimationController {
             item.setCategories(animationData.nameToValue(item.getCategories(),false)+"");
             item.setAuthor(animationData.nameToValue(item.getAuthor(),true)+"");
         }
-        JSONArray array= (JSONArray) JSONArray.toJSON(list);
+        JSONArray array= (JSONArray) JSON.toJSON(list);
         return array.toJSONString();
     }
 }
diff --git a/src/main/java/com/yutou/tools/bangumi/AnimationData.java b/src/main/java/com/yutou/tools/bangumi/AnimationData.java
index 957621d..d742f29 100644
--- a/src/main/java/com/yutou/tools/bangumi/AnimationData.java
+++ b/src/main/java/com/yutou/tools/bangumi/AnimationData.java
@@ -1,7 +1,7 @@
 package com.yutou.tools.bangumi;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.utils.HttpTools;
 
 import java.net.URLEncoder;
diff --git a/src/main/java/com/yutou/tools/nas/NasManager.java b/src/main/java/com/yutou/tools/nas/NasManager.java
index 093ace4..c81fbe4 100644
--- a/src/main/java/com/yutou/tools/nas/NasManager.java
+++ b/src/main/java/com/yutou/tools/nas/NasManager.java
@@ -1,7 +1,8 @@
 package com.yutou.tools.nas;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.mybatis.dao.NasAdminAddressDao;
 import com.yutou.tools.mybatis.model.NasAdminAddress;
 import com.yutou.tools.mybatis.model.NasAdminAddressExample;
@@ -66,7 +67,7 @@ public class NasManager {
             if (list.size() == 0) {
                 json.put("data", new JSONArray());
             } else {
-                json.put("data", JSONArray.toJSON(list));
+                json.put("data", JSON.toJSON(list));
             }
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/src/main/java/com/yutou/tools/nas/UpdateIp.java b/src/main/java/com/yutou/tools/nas/UpdateIp.java
index d64f80f..c4fa740 100644
--- a/src/main/java/com/yutou/tools/nas/UpdateIp.java
+++ b/src/main/java/com/yutou/tools/nas/UpdateIp.java
@@ -1,6 +1,6 @@
 package com.yutou.tools.nas;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.utils.ConfigTools;
 import com.yutou.tools.utils.RedisTools;
 import com.yutou.tools.utils.Tools;
diff --git a/src/main/java/com/yutou/tools/other/tools.java b/src/main/java/com/yutou/tools/other/tools.java
index f495e23..260a4e3 100644
--- a/src/main/java/com/yutou/tools/other/tools.java
+++ b/src/main/java/com/yutou/tools/other/tools.java
@@ -1,7 +1,7 @@
 package com.yutou.tools.other;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.ToolsApplication;
 import com.yutou.tools.mybatis.dao.UKeyDao;
 import com.yutou.tools.mybatis.model.UKey;
diff --git a/src/main/java/com/yutou/tools/sqlite/ADSQLiteManager.java b/src/main/java/com/yutou/tools/sqlite/ADSQLiteManager.java
index 77687f3..1f8bd4f 100644
--- a/src/main/java/com/yutou/tools/sqlite/ADSQLiteManager.java
+++ b/src/main/java/com/yutou/tools/sqlite/ADSQLiteManager.java
@@ -1,7 +1,7 @@
 package com.yutou.tools.sqlite;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/src/main/java/com/yutou/tools/sqlite/SQLiteManager.java b/src/main/java/com/yutou/tools/sqlite/SQLiteManager.java
index 844dafa..2670971 100644
--- a/src/main/java/com/yutou/tools/sqlite/SQLiteManager.java
+++ b/src/main/java/com/yutou/tools/sqlite/SQLiteManager.java
@@ -1,7 +1,7 @@
 package com.yutou.tools.sqlite;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.utils.ConfigTools;
 
 import java.io.File;
diff --git a/src/main/java/com/yutou/tools/utils/APIFilter.java b/src/main/java/com/yutou/tools/utils/APIFilter.java
index 3d3510a..65b8c8b 100644
--- a/src/main/java/com/yutou/tools/utils/APIFilter.java
+++ b/src/main/java/com/yutou/tools/utils/APIFilter.java
@@ -1,6 +1,6 @@
 package com.yutou.tools.utils;
 
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
 import com.yutou.tools.mybatis.dao.PermissionDao;
 import com.yutou.tools.mybatis.dao.UKeyDao;
 import com.yutou.tools.mybatis.model.Permission;
@@ -62,14 +62,14 @@ public class APIFilter implements Filter {
 
                 UKey key = list.get(0);
                 JSONArray powers = JSONArray.parseArray(key.getPower());
-                if(powers.toJavaList(String.class).contains("-1")){
+                if(powers.toList(String.class).contains("-1")){
                     isToken=true;
                 }else {
                     PermissionExample pExample = new PermissionExample();
                     pExample.createCriteria().andUrlEqualTo(url);
                     List<Permission> permissions = permissionDao.selectByExample(pExample);
                     if (permissions != null && permissions.size() > 0) {
-                        if (powers.toJavaList(String.class).contains(permissions.get(0).getId()+"")) {
+                        if (powers.toList(String.class).contains(permissions.get(0).getId()+"")) {
                             isToken = true;
                         }
                     }
diff --git a/src/main/java/com/yutou/tools/utils/BiliBiliLiveTools.java b/src/main/java/com/yutou/tools/utils/BiliBiliLiveTools.java
index 7a8d2d8..0ae5e13 100644
--- a/src/main/java/com/yutou/tools/utils/BiliBiliLiveTools.java
+++ b/src/main/java/com/yutou/tools/utils/BiliBiliLiveTools.java
@@ -1,7 +1,7 @@
 package com.yutou.tools.utils;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 
 import javax.net.ssl.HttpsURLConnection;
 import java.io.BufferedReader;
diff --git a/src/main/java/com/yutou/tools/utils/ConfigTools.java b/src/main/java/com/yutou/tools/utils/ConfigTools.java
index f5b5d41..607cae8 100644
--- a/src/main/java/com/yutou/tools/utils/ConfigTools.java
+++ b/src/main/java/com/yutou/tools/utils/ConfigTools.java
@@ -1,6 +1,6 @@
 package com.yutou.tools.utils;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 
 import java.io.*;
 
diff --git a/src/main/java/com/yutou/tools/utils/HttpTools.java b/src/main/java/com/yutou/tools/utils/HttpTools.java
index ad8e603..969abf3 100644
--- a/src/main/java/com/yutou/tools/utils/HttpTools.java
+++ b/src/main/java/com/yutou/tools/utils/HttpTools.java
@@ -1,6 +1,6 @@
 package com.yutou.tools.utils;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.interfaces.DownloadInterface;
 import org.springframework.util.StringUtils;
 
diff --git a/src/main/java/com/yutou/tools/utils/NasDepotManager.java b/src/main/java/com/yutou/tools/utils/NasDepotManager.java
index e2525ca..2a4b3b8 100644
--- a/src/main/java/com/yutou/tools/utils/NasDepotManager.java
+++ b/src/main/java/com/yutou/tools/utils/NasDepotManager.java
@@ -1,7 +1,8 @@
 package com.yutou.tools.utils;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -26,7 +27,7 @@ public class NasDepotManager {
             json.put("code",1);
             json.put("msg","添加成功");
         }
-        json.put("data", JSONArray.toJSON(RedisTools.list_get(DEPOT_NAME)));
+        json.put("data", JSON.toJSON(RedisTools.list_get(DEPOT_NAME)));
         return json;
 
     }
@@ -36,7 +37,7 @@ public class NasDepotManager {
         JSONObject json=new JSONObject();
         json.put("code",1);
         json.put("msg","ok");
-        json.put("data", JSONArray.toJSON(RedisTools.list_get(DEPOT_NAME)));
+        json.put("data", JSON.toJSON(RedisTools.list_get(DEPOT_NAME)));
         return json;
     }
     @ResponseBody
diff --git a/src/main/java/com/yutou/tools/utils/RedisTools.java b/src/main/java/com/yutou/tools/utils/RedisTools.java
index 2079331..78b763f 100644
--- a/src/main/java/com/yutou/tools/utils/RedisTools.java
+++ b/src/main/java/com/yutou/tools/utils/RedisTools.java
@@ -8,7 +8,7 @@ import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
diff --git a/src/main/java/com/yutou/tools/utils/Tools.java b/src/main/java/com/yutou/tools/utils/Tools.java
index bd435c7..202c10e 100644
--- a/src/main/java/com/yutou/tools/utils/Tools.java
+++ b/src/main/java/com/yutou/tools/utils/Tools.java
@@ -1,7 +1,7 @@
 package com.yutou.tools.utils;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.interfaces.DownloadInterface;
 import com.yutou.tools.nas.UpdateIp;
 import org.apache.commons.codec.digest.DigestUtils;
diff --git a/src/main/java/com/yutou/tools/web/userController.java b/src/main/java/com/yutou/tools/web/userController.java
index 37ee2e1..107cb83 100644
--- a/src/main/java/com/yutou/tools/web/userController.java
+++ b/src/main/java/com/yutou/tools/web/userController.java
@@ -1,7 +1,7 @@
 package com.yutou.tools.web;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.Tools.GoogleAccount;
 import com.yutou.tools.utils.ConfigTools;
 import com.yutou.tools.utils.RedisTools;
diff --git a/src/test/java/com/yutou/tools/ToolsApplicationTests.java b/src/test/java/com/yutou/tools/ToolsApplicationTests.java
index 4010c95..2d942d0 100644
--- a/src/test/java/com/yutou/tools/ToolsApplicationTests.java
+++ b/src/test/java/com/yutou/tools/ToolsApplicationTests.java
@@ -1,6 +1,6 @@
 package com.yutou.tools;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.Tools.AuthManagerController;
 import com.yutou.tools.utils.Tools;
 import org.junit.jupiter.api.Test;

From fe7f7997a8d3ff32881e018d6c9d5031d4a1b697 Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Sun, 10 Jul 2022 14:56:05 +0800
Subject: [PATCH 03/16] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=A8=E5=9F=9F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                             | 10 +++++-----
 src/main/java/com/yutou/tools/nas/NasManager.java   |  2 +-
 src/main/java/com/yutou/tools/utils/CorsConfig.java |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8c32008..7d64ed3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.4.RELEASE</version>
+        <version>2.7.1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.yutou</groupId>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.7.0</version>
+            <version>2.7.1</version>
             <scope>compile</scope>
         </dependency>
 
@@ -56,11 +56,11 @@
             <artifactId>jedis</artifactId>
             <version>4.2.3</version>
         </dependency>
-        <dependency>
+      <!--  <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-redis</artifactId>
-            <version>2.7.0</version>
-        </dependency>
+            <version>2.7.1</version>
+        </dependency>-->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
diff --git a/src/main/java/com/yutou/tools/nas/NasManager.java b/src/main/java/com/yutou/tools/nas/NasManager.java
index c81fbe4..da53799 100644
--- a/src/main/java/com/yutou/tools/nas/NasManager.java
+++ b/src/main/java/com/yutou/tools/nas/NasManager.java
@@ -303,7 +303,7 @@ public class NasManager {
             e.printStackTrace();
         }
     }
-    @RequestMapping("/nas/door/{*.ts}")
+    @RequestMapping("/nas/door/*.ts")
     public void getDoorCCTVOfTs(HttpServletResponse response, HttpServletRequest request, @PathVariable("*.ts") String name){
         try {
             if(!name.endsWith(".ts")){
diff --git a/src/main/java/com/yutou/tools/utils/CorsConfig.java b/src/main/java/com/yutou/tools/utils/CorsConfig.java
index 6d93f51..04f0e79 100644
--- a/src/main/java/com/yutou/tools/utils/CorsConfig.java
+++ b/src/main/java/com/yutou/tools/utils/CorsConfig.java
@@ -11,7 +11,7 @@ public class CorsConfig implements WebMvcConfigurer {
         //设置允许跨域的路径
         registry.addMapping("/**")
                 //设置允许跨域请求的域名
-                .allowedOrigins("*")
+                .allowedOrigins("Access-Control-Allow-Origin")
                 //是否允许证书 不再默认开启
                 .allowCredentials(true)
                 //设置允许的方法

From 6b8932c86f48c0e4336e2fd6eb3429b3f7751f13 Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Sun, 10 Jul 2022 17:02:48 +0800
Subject: [PATCH 04/16] =?UTF-8?q?update:=E5=8A=A8=E7=94=BBrss=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=E3=80=90=E7=95=AA=E5=89=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E3=80=91=E5=85=A5=E5=8F=A3=EF=BC=8C=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=BB=8A=E6=97=A5=E6=9B=B4=E6=96=B0=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yutou/tools/ToolsApplication.java     |   2 +-
 .../tools/bangumi/AnimationController.java    |  51 +--
 .../tools/mybatis/model/BangumiItem.java      |   4 +
 .../mybatis/model/BangumiItemExample.java     |  60 +++
 .../tools/services/BangumiServiceImpl.java    |  98 +++++
 .../services/interfaces/BangumiService.java   |  20 +
 .../com/yutou/tools/utils/BangumiTools.java   | 359 ++++++++++++++++++
 .../java/com/yutou/tools/utils/Tools.java     |   7 +
 src/main/resources/mapper/BangumiItemDao.xml  |  31 +-
 web/html/body/nas/animMeta.html               |   6 +-
 web/html/body/nas/animrss.html                |  43 ++-
 11 files changed, 638 insertions(+), 43 deletions(-)
 create mode 100644 src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
 create mode 100644 src/main/java/com/yutou/tools/services/interfaces/BangumiService.java
 create mode 100644 src/main/java/com/yutou/tools/utils/BangumiTools.java

diff --git a/src/main/java/com/yutou/tools/ToolsApplication.java b/src/main/java/com/yutou/tools/ToolsApplication.java
index 6804134..6d228c5 100644
--- a/src/main/java/com/yutou/tools/ToolsApplication.java
+++ b/src/main/java/com/yutou/tools/ToolsApplication.java
@@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class ToolsApplication {
-    public static final String version="1.4.5";
+    public static final String version="1.4.6";
 
     public static void main(String[] args) {
         System.out.println("当前版本号:" + version);
diff --git a/src/main/java/com/yutou/tools/bangumi/AnimationController.java b/src/main/java/com/yutou/tools/bangumi/AnimationController.java
index 1403925..ca92a21 100644
--- a/src/main/java/com/yutou/tools/bangumi/AnimationController.java
+++ b/src/main/java/com/yutou/tools/bangumi/AnimationController.java
@@ -9,6 +9,7 @@ import com.yutou.tools.mybatis.model.BangumiItem;
 import com.yutou.tools.mybatis.model.BangumiItemExample;
 import com.yutou.tools.mybatis.model.BangumiList;
 import com.yutou.tools.mybatis.model.BangumiListExample;
+import com.yutou.tools.services.interfaces.BangumiService;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,13 +18,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Objects;
 
 @Controller
 public class AnimationController {
-    @Resource
-    BangumiListDao listDao;
-    @Resource
-    BangumiItemDao itemDao;
+  @Resource
+    BangumiService bangumiService;
 
     @ResponseBody
     @RequestMapping(value = "/anim/rss/data.do", method = RequestMethod.GET)
@@ -41,11 +41,7 @@ public class AnimationController {
             items = new AnimationData().bangumiList(page,type,team, keys);
         }
         JSONObject json = new JSONObject();
-        if (items != null) {
-            json.put("data", items);
-        } else {
-            json.put("data", new JSONArray());
-        }
+        json.put("data", Objects.requireNonNullElseGet(items, JSONArray::new));
         json.put("count", 999);
         json.put("code", 0);
         json.put("msg", "ok");
@@ -58,7 +54,7 @@ public class AnimationController {
         BangumiList bangumiList = new BangumiList();
         bangumiList.setTitle(title);
         bangumiList.setStatus(1);
-        int i = listDao.insert(bangumiList);
+        int i = bangumiService.addBangumiList(bangumiList);
         JSONObject json = new JSONObject();
         json.put("code", 0);
         json.put("msg", i == 0 ? "添加失败" : "添加成功");
@@ -71,16 +67,13 @@ public class AnimationController {
         JSONObject json = new JSONObject();
         json.put("code", 0);
         json.put("msg", "ok");
-        json.put("data", JSON.toJSON(listDao.selectByExample(new BangumiListExample())));
+        json.put("data", JSON.toJSON(bangumiService.getAllBangumiList()));
         return json.toJSONString();
     }
     @ResponseBody
     @RequestMapping(value = "/anim/type/del.do", method = RequestMethod.POST)
     public String delType(int id){
-        BangumiItemExample example=new BangumiItemExample();
-        example.createCriteria().andBidEqualTo(id+"");
-        itemDao.deleteByExample(example);
-        int i=listDao.deleteByPrimaryKey(id);
+        int i=bangumiService.removeBangumiType(id);
         JSONObject json=new JSONObject();
         json.put("code", 0);
         json.put("msg", i == 0 ? "删除失败" : "删除成功");
@@ -89,15 +82,22 @@ public class AnimationController {
 
     @ResponseBody
     @RequestMapping(value = "/anim/rss/add.do", method = RequestMethod.POST)
-    public String addAnimationRss(String title, String author, String categories, String titleKey, String bid) {
+    public String addAnimationRss(String bgmId,String title, String author, String categories, String titleKey, String bid) {
+        int id=0;
+        if(!StringUtils.isEmpty(bgmId)){
+            try {
+                id=Integer.parseInt(bgmId.trim());
+            }catch (Exception ignored){}
+        }
         BangumiItem item = new BangumiItem();
+        item.setBgmid(id);
         item.setTitle(title);
         item.setAuthor(author);
         item.setCategories(categories);
         item.setTitlekey(titleKey);
         item.setBid(bid);
         item.setEnable(1);
-        int i = itemDao.insert(item);
+        int i = bangumiService.addBangumiItem(item);
         JSONObject json = new JSONObject();
         json.put("code", 0);
         json.put("msg", i == 0 ? "添加失败" : "添加成功");
@@ -108,17 +108,15 @@ public class AnimationController {
     @RequestMapping(value = "/anim/rss/list.do", method = RequestMethod.GET)
     public String getAnimationRssList(String type) {
         JSONObject json = new JSONObject();
-        BangumiItemExample example=new BangumiItemExample();
-        example.createCriteria().andBidEqualTo(type);
         json.put("code", 0);
         json.put("msg", "ok");
-        json.put("data", JSON.toJSON(itemDao.selectByExample(example)));
+        json.put("data", JSON.toJSON(bangumiService.getBangumiItemList(type)));
         return json.toJSONString();
     }
     @ResponseBody
     @RequestMapping(value = "/anim/rss/del.do", method = RequestMethod.POST)
     public String delAnimation(int id){
-        int i=itemDao.deleteByPrimaryKey(id);
+        int i=bangumiService.removeBangumiItem(id);
         JSONObject json=new JSONObject();
         json.put("code", 0);
         json.put("msg", i == 0 ? "删除失败" : "删除成功");
@@ -126,9 +124,12 @@ public class AnimationController {
     }
     @ResponseBody
     @RequestMapping(value = "/anim/rss/edit.do",method = RequestMethod.POST)
-    public JSONObject editAnimation(int id,String title, String author, String categories, String titleKey,String enable){
+    public JSONObject editAnimation(int id,int bgmId,String title, String author, String categories, String titleKey,String enable){
         JSONObject json=new JSONObject();
-        BangumiItem item =itemDao.selectByPrimaryKey(id);
+        BangumiItem item =bangumiService.getBangumiItem(id);
+        if(bgmId!=0){
+            item.setBgmid(bgmId);
+        }
         if(!StringUtils.isEmpty(title)){
             item.setTitle(title);
         }
@@ -144,7 +145,7 @@ public class AnimationController {
         if(!StringUtils.isEmpty(enable)){
             item.setEnable(Integer.parseInt(enable));
         }
-        int i=itemDao.updateByPrimaryKey(item);
+        int i=bangumiService.updateBangumiItem(item);
         if(i>0){
             json.put("msg","操作成功");
         }else{
@@ -157,7 +158,7 @@ public class AnimationController {
     @RequestMapping(value = "/anim/client/get.do", method = RequestMethod.GET)
     public String clientApi(){
         AnimationData animationData=new AnimationData();
-        List<BangumiItem> list=itemDao.selectByExample(new BangumiItemExample());
+        List<BangumiItem> list=bangumiService.getAllBangumiItemList();
         for (BangumiItem item : list) {
             item.setCategories(animationData.nameToValue(item.getCategories(),false)+"");
             item.setAuthor(animationData.nameToValue(item.getAuthor(),true)+"");
diff --git a/src/main/java/com/yutou/tools/mybatis/model/BangumiItem.java b/src/main/java/com/yutou/tools/mybatis/model/BangumiItem.java
index c3d1137..0675e68 100644
--- a/src/main/java/com/yutou/tools/mybatis/model/BangumiItem.java
+++ b/src/main/java/com/yutou/tools/mybatis/model/BangumiItem.java
@@ -11,6 +11,8 @@ import lombok.Data;
 public class BangumiItem implements Serializable {
     private Integer id;
 
+    private Integer bgmid;
+
     private String bid;
 
     private String categories;
@@ -19,6 +21,8 @@ public class BangumiItem implements Serializable {
 
     private String title;
 
+    private boolean isUpdate=false;
+
     /**
      * 标题过滤词
      */
diff --git a/src/main/java/com/yutou/tools/mybatis/model/BangumiItemExample.java b/src/main/java/com/yutou/tools/mybatis/model/BangumiItemExample.java
index c2b4d3f..ee4be26 100644
--- a/src/main/java/com/yutou/tools/mybatis/model/BangumiItemExample.java
+++ b/src/main/java/com/yutou/tools/mybatis/model/BangumiItemExample.java
@@ -164,6 +164,66 @@ public class BangumiItemExample {
             return (Criteria) this;
         }
 
+        public Criteria andBgmidIsNull() {
+            addCriterion("bgmId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmidIsNotNull() {
+            addCriterion("bgmId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmidEqualTo(Integer value) {
+            addCriterion("bgmId =", value, "bgmid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmidNotEqualTo(Integer value) {
+            addCriterion("bgmId <>", value, "bgmid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmidGreaterThan(Integer value) {
+            addCriterion("bgmId >", value, "bgmid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("bgmId >=", value, "bgmid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmidLessThan(Integer value) {
+            addCriterion("bgmId <", value, "bgmid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmidLessThanOrEqualTo(Integer value) {
+            addCriterion("bgmId <=", value, "bgmid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmidIn(List<Integer> values) {
+            addCriterion("bgmId in", values, "bgmid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmidNotIn(List<Integer> values) {
+            addCriterion("bgmId not in", values, "bgmid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmidBetween(Integer value1, Integer value2) {
+            addCriterion("bgmId between", value1, value2, "bgmid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmidNotBetween(Integer value1, Integer value2) {
+            addCriterion("bgmId not between", value1, value2, "bgmid");
+            return (Criteria) this;
+        }
+
         public Criteria andBidIsNull() {
             addCriterion("bid is null");
             return (Criteria) this;
diff --git a/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java b/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
new file mode 100644
index 0000000..f5dbcb2
--- /dev/null
+++ b/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
@@ -0,0 +1,98 @@
+package com.yutou.tools.services;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.yutou.tools.mybatis.dao.BangumiItemDao;
+import com.yutou.tools.mybatis.dao.BangumiListDao;
+import com.yutou.tools.mybatis.model.BangumiItem;
+import com.yutou.tools.mybatis.model.BangumiItemExample;
+import com.yutou.tools.mybatis.model.BangumiList;
+import com.yutou.tools.mybatis.model.BangumiListExample;
+import com.yutou.tools.services.interfaces.BangumiService;
+import com.yutou.tools.utils.BangumiTools;
+import com.yutou.tools.utils.Tools;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service("BangumiService")
+public class BangumiServiceImpl implements BangumiService {
+    @Resource
+    BangumiListDao listDao;
+    @Resource
+    BangumiItemDao itemDao;
+
+    @Override
+    public int addBangumiList(BangumiList... list) {
+        for (BangumiList bangumiList : list) {
+            if (listDao.insert(bangumiList) <= 0) {
+                return 0;
+            }
+        }
+        return 1;
+    }
+
+    @Override
+    public int addBangumiItem(BangumiItem... list) {
+        for (BangumiItem item : list) {
+            if (itemDao.insert(item) <= 0) {
+                return 0;
+            }
+        }
+        return 1;
+    }
+
+    @Override
+    public int updateBangumiItem(BangumiItem item) {
+        return itemDao.updateByPrimaryKey(item);
+    }
+
+    @Override
+    public int removeBangumiItem(int id) {
+        return itemDao.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int removeBangumiType(int id) {
+        BangumiItemExample example = new BangumiItemExample();
+        example.createCriteria().andBidEqualTo(id + "");
+        itemDao.deleteByExample(example);
+        return listDao.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public BangumiItem getBangumiItem(int id) {
+        return itemDao.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public List<BangumiItem> getBangumiItemList(String type) {
+        BangumiItemExample example = new BangumiItemExample();
+        example.createCriteria().andBidEqualTo(type);
+        List<BangumiItem> items = itemDao.selectByExample(example);
+        for (BangumiItem item : items) {
+            if(item.getEnable()==0){
+                continue;
+            }
+            JSONObject bangumi=BangumiTools.getBangumiInfoSmall(item.getBgmid());
+            int day=Tools.getWeekDay();
+            if (day == 0) {
+                day = 7;
+            }
+            if(bangumi.getInteger("air_weekday")==day) {
+                item.setUpdate(true);
+            }
+        }
+        return items;
+    }
+
+    @Override
+    public List<BangumiItem> getAllBangumiItemList() {
+        return itemDao.selectByExample(new BangumiItemExample());
+    }
+
+    @Override
+    public List<BangumiList> getAllBangumiList() {
+        return listDao.selectByExample(new BangumiListExample());
+    }
+}
diff --git a/src/main/java/com/yutou/tools/services/interfaces/BangumiService.java b/src/main/java/com/yutou/tools/services/interfaces/BangumiService.java
new file mode 100644
index 0000000..a904d4d
--- /dev/null
+++ b/src/main/java/com/yutou/tools/services/interfaces/BangumiService.java
@@ -0,0 +1,20 @@
+package com.yutou.tools.services.interfaces;
+
+import com.yutou.tools.mybatis.model.BangumiItem;
+import com.yutou.tools.mybatis.model.BangumiList;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+public interface BangumiService {
+    int addBangumiList(BangumiList... list);
+    int addBangumiItem(BangumiItem... list);
+    int updateBangumiItem(BangumiItem item);
+    int removeBangumiItem(int id);
+    int removeBangumiType(int id);
+    BangumiItem getBangumiItem(int id);
+    List<BangumiItem> getBangumiItemList(String type);
+    List<BangumiItem> getAllBangumiItemList();
+    List<BangumiList> getAllBangumiList();
+}
diff --git a/src/main/java/com/yutou/tools/utils/BangumiTools.java b/src/main/java/com/yutou/tools/utils/BangumiTools.java
new file mode 100644
index 0000000..f47baa8
--- /dev/null
+++ b/src/main/java/com/yutou/tools/utils/BangumiTools.java
@@ -0,0 +1,359 @@
+package com.yutou.tools.utils;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.aliyuncs.utils.StringUtils;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+public class BangumiTools {
+    private static final String url = "https://api.bgm.tv/";
+    private static final String toDayBangumi = url + "calendar";
+    private static final String BangumiInfo = url + "subject/%s?responseGroup=large";
+
+    private static final String BangumiInfoSmall = url + "subject/%s?responseGroup=small";
+    private static final String SearchBangumi = url + "search/subject/%s?responseGroup=large&type=2";
+
+    /**
+     * 获取番剧列表
+     *
+     * @param day 周几，-1为全部,非1~7范围则为当天
+     * @return 当日数据
+     */
+    public static JSONObject getBangumi(int day) {
+        String str = HttpTools.get(toDayBangumi);
+        JSONArray main = JSON.parseArray(str);
+        if (day == -1) {
+            JSONObject json = new JSONObject();
+            json.put("bangumi", main);
+            return json;
+        }
+        if (day < 1 || day > 7) {
+           day=Tools.getWeekDay();
+            if (day == 0) {
+                day = 7;
+            }
+        }
+        if (main != null) {
+            for (Object o : main) {
+                JSONObject json = (JSONObject) o;
+                if (json.getJSONObject("weekday").getInteger("id") == day) {
+                    return json;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取番剧详细信息
+     *
+     * @param id 剧集id
+     * @return 详细信息
+     */
+    public static JSONObject getBangumiInfo(int id) {
+        String str = HttpTools.get(String.format(BangumiInfo, id + ""));
+        return JSON.parseObject(str);
+    }
+    /**
+     * 获取番剧简略信息
+     *
+     * @param id 剧集id
+     * @return 详细信息
+     */
+    public static JSONObject getBangumiInfoSmall(int id) {
+        String str = HttpTools.get(String.format(BangumiInfoSmall, id + ""));
+        return JSON.parseObject(str);
+    }
+
+    public static JSONArray getPeople(int id) {
+        /**
+         *  Actor 演员
+         *  Composer 作曲家
+         *  Director 导演
+         *  GuestStar 特邀明星
+         *  Producer 制片人
+         *  Writer  编剧
+         */
+        JSONArray people = new JSONArray();
+        JSONObject bangumi = getBangumiInfo(id);
+        JSONArray crt = bangumi.getJSONArray("crt");
+        if(crt!=null) {
+            for (Object o : crt) {
+                JSONObject item = (JSONObject) o;
+                JSONObject pel = new JSONObject();
+                pel.put("Name", item.getString("name_cn"));
+                pel.put("Role", item.getString("role_name"));
+                pel.put("Type", "Actor");
+                people.add(pel);
+            }
+        }
+        crt = bangumi.getJSONArray("staff");
+        if(crt!=null) {
+            for (Object o : crt) {
+                JSONObject item = (JSONObject) o;
+                JSONObject pel = new JSONObject();
+                pel.put("Name", item.getString("name_cn"));
+                String jobsName="";
+                for (Object _jobs : item.getJSONArray("jobs")) {
+                    jobsName+=_jobs+"、";
+                }
+                jobsName=jobsName.substring(0,jobsName.length()-1);
+                pel.put("Role", jobsName);
+                pel.put("Type", "");
+                if (jobsName.contains("导演")) {
+                    pel.put("Type", "Director");
+                } else if (jobsName.contains("脚本")) {
+                    pel.put("Type", "DirectorDirector");
+                }
+                people.add(pel);
+            }
+        }
+        return people;
+    }
+
+    /**
+     * 搜索番剧
+     *
+     * @param key 关键词
+     * @return 详细信息
+     */
+    public static JSONObject search(String key) {
+        String str = HttpTools.get(String.format(SearchBangumi, URLEncoder.encode(key, StandardCharsets.UTF_8)));
+        return JSON.parseObject(str);
+    }
+
+    /**
+     * 获取下一集播放日期
+     *
+     * @param id 番剧id
+     * @return 日期
+     */
+    public static String getPlayNextTime(int id) {
+        JSONObject info = getBangumiInfo(id);
+        JSONArray eps = info.getJSONArray("eps");
+        String toDayTime = Tools.getToDayTime();
+        for (Object o : eps) {
+            JSONObject ep = (JSONObject) o;
+            String time = ep.getString("airdate");
+            try {
+                if (new SimpleDateFormat("yyyy-MM-dd").parse(time).getTime() >=
+                        new SimpleDateFormat("yyyy-MM-dd").parse(toDayTime).getTime()) {
+                    return time;
+                }
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 格式化字符串输出番剧详细信息
+     *
+     * @param id 番剧id
+     * @return 详细内容
+     */
+    public static List<String> reportBangumiInfo(int id) {
+        List<String> bangumiList = new ArrayList<>();
+        JSONObject json = getBangumiInfo(id);
+        if (json.containsKey("code")) {
+            bangumiList.add("error = " + json.toJSONString());
+            return bangumiList;
+        }
+        JSONArray eps = json.getJSONArray("eps");
+        JSONArray crts = json.getJSONArray("crt");
+        JSONArray staffs = json.getJSONArray("staff");
+        StringBuilder builder = new StringBuilder();
+        builder.append("<img ").append(json.getJSONObject("images").getString("large")).append(" /img>").append("\n");
+        builder.append("标题:").append(json.getString("name_cn")).append("\n");
+        builder.append("日文标题:").append(json.getString("name")).append("\n");
+        builder.append("首播时间:").append(json.getString("air_date")).append("\n");
+        builder.append("每周").append(json.getInteger("air_weekday")).append("放送").append("\n");
+        builder.append("Bangumi地址:").append(json.getString("url")).append("\n");
+        builder.append("Bangumi评分:").append(json.getJSONObject("rating").getFloat("score")).append("\n");
+        builder.append("预计放送集数:").append(json.getInteger("eps_count")).append("\n");
+        if (eps != null) {
+            builder.append("已放送集:").append("\n");
+            for (Object o : eps) {
+                JSONObject ep = (JSONObject) o;
+                if (ep.getString("status").equals("Air")) {
+                    builder.append("· 第").append(ep.getInteger("sort")).append("话:");
+                    builder.append(ep.getString("name"));
+                    builder.append("[").append(ep.getString("name_cn")).append("]").append("\n");
+                    builder.append("播放日期:").append(ep.getString("airdate")).append(";\n");
+                    builder.append("播放时长:").append(ep.getString("duration")).append(";\n");
+                    builder.append("单集介绍:").append(ep.getString("desc"));
+                    builder.append("\n\n");
+                } else {
+                    builder.append("下一话:");
+                    builder.append(" 第").append(ep.getInteger("sort")).append("话:");
+                    builder.append("播放日期:").append(ep.getString("airdate")).append("\n\n");
+                    break;
+                }
+            }
+        }
+        if (crts != null) {
+            builder.append("角色介绍:").append("\n");
+            for (Object o : crts) {
+                JSONObject crt = (JSONObject) o;
+                JSONObject info = crt.getJSONObject("info");
+                builder.append(crt.getString("role_name")).append(":");
+                builder.append(crt.getString("name"));
+                builder.append("(").append(crt.getString("name_cn")).append(")").append("  ");
+                builder.append("CV:").append(crt.getJSONArray("actors").getJSONObject(0).getString("name"));
+                builder.append("(").append(info.getString("gender")).append(")");
+                builder.append("\n");
+            }
+        }
+        Map<String, List<JSONObject>> map = new HashMap<>();
+        for (Object o : staffs) {
+            JSONObject staff = (JSONObject) o;
+            for (Object jobs : staff.getJSONArray("jobs")) {
+                String job = (String) jobs;
+                List<JSONObject> list;
+                if (!map.containsKey(job)) {
+                    list = new ArrayList<>();
+                } else {
+                    list = map.get(job);
+                }
+                list.add(staff);
+                map.put(job, list);
+            }
+        }
+        if (!map.isEmpty()) {
+            builder.append("staff:").append("\n");
+            for (String key : map.keySet()) {
+                builder.append(key).append(":");
+                for (JSONObject staff : map.get(key)) {
+                    builder.append(staff.getString("name_cn"));
+                    builder.append("(").append(staff.getString("name")).append(")");
+                    builder.append("、");
+                }
+                builder.append("\n");
+            }
+        }
+        bangumiList.add(builder.toString());
+        return bangumiList;
+    }
+
+    /**
+     * 格式化输出新番列表
+     *
+     * @return 新番信息
+     */
+    public static String reportBangumiList() {
+        try {
+            JSONObject json = getBangumi(-1);
+            StringBuilder builder = new StringBuilder();
+            assert json != null;
+            JSONArray array = json.getJSONArray("bangumi");
+            for (Object o : array) {
+                JSONObject data = (JSONObject) o;
+                JSONObject weekday = data.getJSONObject("weekday");
+                JSONArray items = data.getJSONArray("items");
+                builder.append(weekday.getString("cn")).append("(").append(weekday.getString("ja")).append(")");
+                builder.append(":").append("\n");
+                reportBangumi(builder, items, false);
+                builder.append("\n");
+            }
+            return builder.toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return e.getMessage();
+        }
+    }
+
+    private static void reportBangumi(StringBuilder builder, JSONArray items, boolean reportEp) {
+        int epIndex = 0;
+        String epName = "N/A";
+        for (Object oj : items) {
+            JSONObject item = (JSONObject) oj;
+            builder.append("[").append(item.getInteger("id")).append("]");
+            builder.append(StringUtils.isEmpty(item.getString("name_cn"))
+                    ? item.getString("name") : item.getString("name_cn"));
+            if (!reportEp) {
+                builder.append("\n");
+                continue;
+            }
+            JSONObject info = getBangumiInfo(item.getInteger("id"));
+            if (info.get("eps") == null) {
+                continue;
+            }
+            JSONArray eps = info.getJSONArray("eps");
+            for (Object oe : eps) {
+                JSONObject ep = (JSONObject) oe;
+                if (ep.getString("status").equals("Air")) {
+                    epIndex = ep.getInteger("sort");
+                    epName = ep.getString("name");
+                } else {
+                    break;
+                }
+            }
+            builder.append(" 第").append(epIndex).append("话:");
+            builder.append(epName);
+            builder.append("\n");
+        }
+    }
+
+    /**
+     * 格式化字符串输出今日播放番剧列表
+     *
+     * @return 番剧列表
+     */
+    public static String reportToDayBangumi() {
+        String toDayTime = Tools.getToDayTime();
+        if (!toDayTime.equals(RedisTools.get("reportToDayBangumi"))) {
+            RedisTools.set("reportToDayBangumi", toDayTime);
+            StringBuilder builder = new StringBuilder();
+            JSONObject toDay = getBangumi(0);
+            if (toDay == null) {
+                builder.append("今天没有任何番剧放送~");
+            } else {
+                JSONObject weekday = toDay.getJSONObject("weekday");
+                JSONArray items = toDay.getJSONArray("items");
+                builder.append("今日 ").append(weekday.get("cn")).append("(").append(weekday.get("ja")).append(")");
+                builder.append(" 放送列表:").append("\n");
+                reportBangumi(builder, items, true);
+            }
+            RedisTools.set("toDayBangumi", builder.toString());
+            return builder.toString();
+        } else {
+            System.out.println("error ");
+            return RedisTools.get("toDayBangumi");
+        }
+    }
+
+    /**
+     * 格式化字符串输出搜索动画
+     *
+     * @param key 关键词
+     * @return 详细内容
+     */
+    public static List<String> reportSearchBangumi(String key) {
+        List<String> bangumiList = new ArrayList<>();
+        JSONObject main = search(key);
+        if (main.getInteger("results") > 0) {
+            JSONArray list = main.getJSONArray("list");
+            Collections.reverse(list);
+            for (Object _items : list) {
+                JSONObject items= (JSONObject) _items;
+                bangumiList.addAll(reportBangumiInfo(items.getInteger("id")));
+            }
+            return bangumiList;
+        } else {
+            bangumiList.add("搜索不到任何内容:" + key);
+            return bangumiList;
+        }
+    }
+
+    public static void main(String[] args) {
+        JSONObject toDay = getBangumiInfoSmall(371396);
+        System.out.println(toDay);
+    }
+}
diff --git a/src/main/java/com/yutou/tools/utils/Tools.java b/src/main/java/com/yutou/tools/utils/Tools.java
index 202c10e..401134f 100644
--- a/src/main/java/com/yutou/tools/utils/Tools.java
+++ b/src/main/java/com/yutou/tools/utils/Tools.java
@@ -463,4 +463,11 @@ public class Tools {
         return "";
     }
 
+    public static int getWeekDay() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeZone(TimeZone.getTimeZone("GMT+8:00"));
+        calendar.setFirstDayOfWeek(Calendar.MONDAY);
+        calendar.setTime(new Date());
+        return  calendar.get(Calendar.DAY_OF_WEEK) - 1;
+    }
 }
diff --git a/src/main/resources/mapper/BangumiItemDao.xml b/src/main/resources/mapper/BangumiItemDao.xml
index 9fd4cda..1cfbe35 100644
--- a/src/main/resources/mapper/BangumiItemDao.xml
+++ b/src/main/resources/mapper/BangumiItemDao.xml
@@ -3,6 +3,7 @@
 <mapper namespace="com.yutou.tools.mybatis.dao.BangumiItemDao">
   <resultMap id="BaseResultMap" type="com.yutou.tools.mybatis.model.BangumiItem">
     <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="bgmId" jdbcType="INTEGER" property="bgmid" />
     <result column="bid" jdbcType="VARCHAR" property="bid" />
     <result column="categories" jdbcType="VARCHAR" property="categories" />
     <result column="author" jdbcType="VARCHAR" property="author" />
@@ -69,7 +70,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, bid, categories, author, title, titleKey, `enable`
+    id, bgmId, bid, categories, author, title, titleKey, `enable`
   </sql>
   <select id="selectByExample" parameterType="com.yutou.tools.mybatis.model.BangumiItemExample" resultMap="BaseResultMap">
     select
@@ -102,16 +103,19 @@
     </if>
   </delete>
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yutou.tools.mybatis.model.BangumiItem" useGeneratedKeys="true">
-    insert into bangumi_item (bid, categories, author, 
-      title, titleKey, `enable`
-      )
-    values (#{bid,jdbcType=VARCHAR}, #{categories,jdbcType=VARCHAR}, #{author,jdbcType=VARCHAR}, 
-      #{title,jdbcType=VARCHAR}, #{titlekey,jdbcType=VARCHAR}, #{enable,jdbcType=INTEGER}
-      )
+    insert into bangumi_item (bgmId, bid, categories, 
+      author, title, titleKey, 
+      `enable`)
+    values (#{bgmid,jdbcType=INTEGER}, #{bid,jdbcType=VARCHAR}, #{categories,jdbcType=VARCHAR}, 
+      #{author,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{titlekey,jdbcType=VARCHAR}, 
+      #{enable,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yutou.tools.mybatis.model.BangumiItem" useGeneratedKeys="true">
     insert into bangumi_item
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="bgmid != null">
+        bgmId,
+      </if>
       <if test="bid != null">
         bid,
       </if>
@@ -132,6 +136,9 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="bgmid != null">
+        #{bgmid,jdbcType=INTEGER},
+      </if>
       <if test="bid != null">
         #{bid,jdbcType=VARCHAR},
       </if>
@@ -164,6 +171,9 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=INTEGER},
       </if>
+      <if test="record.bgmid != null">
+        bgmId = #{record.bgmid,jdbcType=INTEGER},
+      </if>
       <if test="record.bid != null">
         bid = #{record.bid,jdbcType=VARCHAR},
       </if>
@@ -190,6 +200,7 @@
   <update id="updateByExample" parameterType="map">
     update bangumi_item
     set id = #{record.id,jdbcType=INTEGER},
+      bgmId = #{record.bgmid,jdbcType=INTEGER},
       bid = #{record.bid,jdbcType=VARCHAR},
       categories = #{record.categories,jdbcType=VARCHAR},
       author = #{record.author,jdbcType=VARCHAR},
@@ -203,6 +214,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.yutou.tools.mybatis.model.BangumiItem">
     update bangumi_item
     <set>
+      <if test="bgmid != null">
+        bgmId = #{bgmid,jdbcType=INTEGER},
+      </if>
       <if test="bid != null">
         bid = #{bid,jdbcType=VARCHAR},
       </if>
@@ -226,7 +240,8 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.yutou.tools.mybatis.model.BangumiItem">
     update bangumi_item
-    set bid = #{bid,jdbcType=VARCHAR},
+    set bgmId = #{bgmid,jdbcType=INTEGER},
+      bid = #{bid,jdbcType=VARCHAR},
       categories = #{categories,jdbcType=VARCHAR},
       author = #{author,jdbcType=VARCHAR},
       title = #{title,jdbcType=VARCHAR},
diff --git a/web/html/body/nas/animMeta.html b/web/html/body/nas/animMeta.html
index f1a1adf..c741bc3 100644
--- a/web/html/body/nas/animMeta.html
+++ b/web/html/body/nas/animMeta.html
@@ -24,16 +24,16 @@
         $('#header').load("/html/header.html");
         $('#footer').load("/html/footer.html");
 
-        var loadId = layer.load();
+        let loadId = layer.load();
         $.get('/anim/meta/get.do', function (json) {
             layer.close(loadId)
             layui.use('tree', function () {
-                var tree = layui.tree;
+                let tree = layui.tree;
                 tree.render({
                     elem: '#animmeta',
                     data: json,
                     click: function (obj) {
-                        var url="https://bgm.tv/subject_search/"+encodeURIComponent(obj.data.title)+"?cat=2"
+                        let url="https://bgm.tv/subject_search/"+encodeURIComponent(obj.data.title)+"?cat=2"
                         layer.prompt({
                             title: "设置元数据:"+'<a href='+url+'  target="_blank">查询</a>',
                             value: ''
diff --git a/web/html/body/nas/animrss.html b/web/html/body/nas/animrss.html
index d615356..c741e9e 100644
--- a/web/html/body/nas/animrss.html
+++ b/web/html/body/nas/animrss.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="zh">
 
 <head>
     <meta charset="utf-8">
@@ -169,6 +169,7 @@
 </script>
 <script type="text/html" id="listTools">
     <a class="layui-btn layui-btn-warm　layui-btn-xs" lay-event="src">原地址</a>
+    <a class="layui-btn layui-btn-warm　layui-btn-xs" lay-event="bgm_src">番剧计划</a>
     <a class="layui-btn layui-btn-xs" lay-event="show">查看</a>
     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
 </script>
@@ -181,6 +182,15 @@
                 value="{{d.id}}"></div>
     {{# }}}
 </script>
+<script type="text/html" id="animUpdateState">
+    {{# if(d.update==1){}}
+    <div><input type="checkbox" name="update" lay-text="今天更新|不更新" lay-filter="stateCheckbox" lay-skin="switch"
+                value="{{d.id}}" checked disabled></div>
+    {{# } else { }}
+    <div><input type="checkbox" name="update" lay-text="今天更新|不更新" lay-filter="stateCheckbox" lay-skin="switch"
+                value="{{d.id}}" disabled></div>
+    {{# }}}
+</script>
 <script>
     $('#header').load("/html/header.html");
     $('#footer').load("/html/footer.html");
@@ -216,12 +226,14 @@
                         , url: '/anim/rss/list.do?type=' + tabid
                         , page: true
                         , cols: [[
-                            {field: "id", title: "id", width: 80, sort: true, fixed: 'left'}
+                            {field: "id", title: "id", width: 60, sort: true, fixed: 'left'}
+                            , {field: 'bgmid', title: 'bgmId', width: 80, edit: 'text'}
                             , {field: 'title', title: '标题', edit: 'text'}
                             , {field: 'categories', title: '类型', width: 80}
                             , {field: 'author', title: '字幕组', width: 100}
-                            , {field: 'titlekey', title: '搜索关键词', edit: 'text'}
+                            , {field: 'titlekey', title: '搜索关键词', width: 200, edit: 'text'}
                             , {field: 'enable', title: '状态', width: 80, templet: '#animState'}
+                            , {field: 'update', title: '更新', width: 110, templet: '#animUpdateState'}
                             , {field: "right", toolbar: '#listTools'}
                         ]]
                     });
@@ -234,6 +246,8 @@
                     let data = {}
                     if (type === 'title') {
                         data = {id: id, title: value}
+                    } else if (type === 'bgmid') {
+                        data = {id: id, bgmId: value}
                     } else {
                         data = {id: id, titleKey: value}
                     }
@@ -293,6 +307,8 @@
                         })
                     } else if (obj.event === 'src') {
                         window.open("https://share.dmhy.org/topics/list?keyword=" + encodeURI(obj.data.titlekey))
+                    } else if (obj.event === 'bgm_src') {
+                        window.open("https://bgm.tv/subject/" + obj.data.bgmid)
                     }
                 })
                 table.on('tool(rssTools)', function (obj) {
@@ -306,19 +322,22 @@
                                 option += '<option>' + i + '</option>'
                             }
                         }
-                        let html = '<form class="layui-form">名字:<div class="layui-form-item"><textarea  class="layui-textarea" id="rss_value">'+data.title+'</textarea> 季度:<select lay-search lay-verify="required" id="rss_select">'+option+'</select></div></form>'
+                        let html = '<form class="layui-form">名字:<div class="layui-form-item"><textarea  class="layui-textarea" id="rss_value" onblur="setTitle(this)">' + data.title + '</textarea> 季度:<select lay-search lay-verify="required" id="rss_select">' + option + '</select> <a id="bgmUrl" href="javascript:;"  target="_blank">bgmId:</a><input class="layui-input" id="bgmId"/></div></form>'
                         layer.open({
                             type: 0,
                             area: ['500px', '600px'],
                             title: '订阅这个RSS结果,并加入到第' + tabid + '个分类中',
                             content: html,
-                            success:function (){
+                            success: function () {
+
                                 form.render('select');
                             },
                             yes: function (index, elem) {
-                                let value=$('#rss_value')[0].value+'/Season '+$('#rss_select')[0].value
+                                let value = $('#rss_value')[0].value + '/Season ' + $('#rss_select')[0].value
+                                let bgmId = $('#bgmId')[0].value
                                 $.post("/anim/rss/add.do", {
                                     title: value
+                                    , bgmId: bgmId
                                     , author: data.author
                                     , categories: data.categories[0]
                                     , titleKey: $('#title').val()
@@ -376,6 +395,10 @@
         $('#search').click(function () {
             searchClick()
         })
+        $('#searchBgmId').click(function () {
+            let url = "https://bgm.tv/subject_search/" + encodeURIComponent($('#title')[0].value) + "?cat=2"
+            window.open(url)
+        })
 
         function searchClick() {
             rssList.reload({
@@ -387,8 +410,16 @@
             })
 
         }
+
+
     });
 
+    function setTitle(_this) {
+        let url = "https://bgm.tv/subject_search/" + encodeURIComponent(_this.value) + "?cat=2"
+        console.log(url)
+        $('#bgmUrl')[0].href = url;
+    }
+
     //let js="" ; $('#team option').each(function() { let value=$(this).val(); let text=$(this).text(); js+='{"'+value+'":"'+text+'"},'})
 </script>
 </body>

From 25730638a3661da717a9bbcab57cd3a4b648cf5d Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Sun, 10 Jul 2022 17:10:28 +0800
Subject: [PATCH 05/16] =?UTF-8?q?update:=E4=BF=AE=E5=A4=8DbgmId=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=E7=9A=84=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yutou/tools/services/BangumiServiceImpl.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java b/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
index f5dbcb2..bbcb37c 100644
--- a/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
+++ b/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
@@ -71,10 +71,13 @@ public class BangumiServiceImpl implements BangumiService {
         example.createCriteria().andBidEqualTo(type);
         List<BangumiItem> items = itemDao.selectByExample(example);
         for (BangumiItem item : items) {
-            if(item.getEnable()==0){
+            if(item.getEnable()==0||item.getBgmid()==0){
                 continue;
             }
             JSONObject bangumi=BangumiTools.getBangumiInfoSmall(item.getBgmid());
+            if(bangumi.getInteger("code")==404){
+                continue;
+            }
             int day=Tools.getWeekDay();
             if (day == 0) {
                 day = 7;

From f57325c327f89b7d84e4365a6a505cbfe939c454 Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Sun, 10 Jul 2022 18:24:17 +0800
Subject: [PATCH 06/16] =?UTF-8?q?add:=E6=96=B0=E5=A2=9E=E4=BB=8A=E6=97=A5?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/bangumi/AnimationController.java    |  6 +++
 .../tools/services/BangumiServiceImpl.java    |  2 +-
 web/html/body/nas/animrss.html                | 39 ++++++++++++++++++-
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/yutou/tools/bangumi/AnimationController.java b/src/main/java/com/yutou/tools/bangumi/AnimationController.java
index ca92a21..4f7043f 100644
--- a/src/main/java/com/yutou/tools/bangumi/AnimationController.java
+++ b/src/main/java/com/yutou/tools/bangumi/AnimationController.java
@@ -10,6 +10,7 @@ import com.yutou.tools.mybatis.model.BangumiItemExample;
 import com.yutou.tools.mybatis.model.BangumiList;
 import com.yutou.tools.mybatis.model.BangumiListExample;
 import com.yutou.tools.services.interfaces.BangumiService;
+import com.yutou.tools.utils.BangumiTools;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -166,4 +167,9 @@ public class AnimationController {
         JSONArray array= (JSONArray) JSON.toJSON(list);
         return array.toJSONString();
     }
+    @ResponseBody
+    @RequestMapping(value = "/anim/getToDay.do", method = RequestMethod.GET)
+    public JSONObject getToDayAnim(){
+        return BangumiTools.getBangumi(0);
+    }
 }
diff --git a/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java b/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
index bbcb37c..ceb32ac 100644
--- a/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
+++ b/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
@@ -75,7 +75,7 @@ public class BangumiServiceImpl implements BangumiService {
                 continue;
             }
             JSONObject bangumi=BangumiTools.getBangumiInfoSmall(item.getBgmid());
-            if(bangumi.getInteger("code")==404){
+            if(bangumi.containsKey("code")&&bangumi.getInteger("code")==404){
                 continue;
             }
             int day=Tools.getWeekDay();
diff --git a/web/html/body/nas/animrss.html b/web/html/body/nas/animrss.html
index c741e9e..6772959 100644
--- a/web/html/body/nas/animrss.html
+++ b/web/html/body/nas/animrss.html
@@ -203,11 +203,23 @@
         }
     })
 
-    layui.use(['layer', 'form', 'element', 'table'], function () {
+    layui.use(['layer', 'form', 'element', 'table', 'util'], function () {
         let layer = layui.layer
+            , util = layui.util
             , form = layui.form
             , table = layui.table
             , element = layui.element;
+        util.fixbar({
+            bar1: '&#xe637;',
+            bgcolor: '#393D49',
+            css: {right: 100, bottom: 100},
+            click: function(type){
+                console.log(type);
+                if(type === 'bar1'){
+                    showToDayAnim()
+                }
+            }
+        });
         $.get("/anim/type/list.do", function (data) {
             let json = JSON.parse(data);
             if (json.code === 0) {
@@ -411,6 +423,30 @@
 
         }
 
+        function showToDayAnim() {
+            $.get("/anim/getToDay.do", function (json) {
+                let items = json.items;
+                let _tab = []
+                let html = '<table class="layui-table"> <colgroup> <col width="150" /> <col width="200" /> <col /> </colgroup> <thead> <tr> <th>标题</th> <th>首更时间</th> <th>图片</th> <th>地址</th> </tr> </thead> <tbody> </tbody>'
+                items.forEach((item) => {
+                    let name = item.name_cn
+                    if (name === '') {
+                        name = item.name;
+                    }
+                    html += '<tr><td>' + name + '</td><td>' + item.air_date + '</td><td><img src="' + item.images.small + '"></td><td><a href="' + item.url + '" target="_blank">前往番剧计划</a></td></tr>'
+                    _tab.push({title: item.name, url: '<a href="' + item.url + '">前往番剧计划</a>'})
+                })
+                html += "</table>"
+                layer.open({
+                    title: '今日新番列表',
+                    area: ['700px', '300px'],
+                    content: html,
+                    shade: 0,
+                    offset: 'rb'
+                });
+            })
+        }
+
 
     });
 
@@ -420,7 +456,6 @@
         $('#bgmUrl')[0].href = url;
     }
 
-    //let js="" ; $('#team option').each(function() { let value=$(this).val(); let text=$(this).text(); js+='{"'+value+'":"'+text+'"},'})
 </script>
 </body>
 <style>

From fefcfe6c359139020f83d4f810ae666ea8c16902 Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Sun, 10 Jul 2022 23:40:01 +0800
Subject: [PATCH 07/16] =?UTF-8?q?add:=E6=96=B0=E5=A2=9E=E6=AD=8C=E8=AF=8D?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/css/lyricer.min.css      |  27 ++++++
 web/html/body/nas/music.html | 154 +++++++++++++++++++++++------------
 web/js/AudioPlayer.js        |   1 +
 web/js/lyricer.min.js        | 148 +++++++++++++++++++++++++++++++++
 4 files changed, 276 insertions(+), 54 deletions(-)
 create mode 100644 web/css/lyricer.min.css
 create mode 100644 web/js/lyricer.min.js

diff --git a/web/css/lyricer.min.css b/web/css/lyricer.min.css
new file mode 100644
index 0000000..29e4748
--- /dev/null
+++ b/web/css/lyricer.min.css
@@ -0,0 +1,27 @@
+#lyricer {
+    font-size: 100%;
+    font-family: "Microsoft YaHei","Hiragino Sans GB W3",Tahoma,Arial;
+    text-shadow: 0 0 1px #EEEEEE;
+    color: #666666;
+    overflow: hidden;
+}
+
+#lyricer ul {
+    list-style-type: none;
+    padding: 5px;
+    margin-left: 50px;
+}
+
+#lyricer ul li {
+    overflow: auto;
+}
+
+#lyricer ul li:hover {
+    color: #428bca;
+}
+
+#lyricer .lyricer-current-line {
+    color: #fff;
+    text-shadow: 0 0 1px #fff, 0 0 2px #fff, 0 0 3px #fff, 0 0 4px #ff2d95, 0 0 6px #ff2d95, 0 0 8px #ff2d95, 0 0 10px #ff2d95, 0 0 12px #ff2d95;
+    padding:10px
+}
\ No newline at end of file
diff --git a/web/html/body/nas/music.html b/web/html/body/nas/music.html
index 1d8e021..aa4749c 100644
--- a/web/html/body/nas/music.html
+++ b/web/html/body/nas/music.html
@@ -6,19 +6,20 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <title>来点Music~</title>
     <link rel="stylesheet" href="/layui/css/layui.css">
+    <link rel="stylesheet" href="/css/lyricer.min.css">
 </head>
 <body>
 <div class="layui-layout layui-layout-admin">
     <div id="header"></div>
 
     <div class="layui-body mybody body2">
-      <!--  <div id="side"></div>-->
+        <!--  <div id="side"></div>-->
 
         <div style="margin-left: 2%; margin-top: 2%;">
             <div>
-                <img src="/assets/defaultPlayImg.jpg" id="img" style="height: 200px; width: 200px"/>
+                <img src="/assets/defaultPlayImg.jpg" id="img" style="height: 300px; width: 300px"/>
 
-                <div style="display:inline-block;">
+                <div style="top: 800px;display:inline-block;">
                     <div id="musicSize">歌单总数:</div>
                     <div id="playerNowList">播放列表:</div>
                     <div id="title">标题:</div>
@@ -28,6 +29,7 @@
                     <a class="layui-btn layui-btn-normal" id="download">下载</a>
                     <a class="layui-btn layui-btn-normal" id="next">下一首</a>
                     <a class="layui-btn layui-btn-normal" id="play_share">分享</a>
+                    <a class="layui-btn layui-btn-normal" id="showLrc">显示歌词</a>
                 </div>
 
                 <div id="audioWrap"></div>
@@ -44,6 +46,7 @@
 <script src="/layui/layui.js"></script>
 <script src="/js/jquery-3.2.1.js"></script>
 <script src="/js/myjs.js"></script>
+<script src="/js/lyricer.min.js"></script>
 <link rel="stylesheet" href="/css/AudioPlayer.css">
 <script src="/js/AudioPlayer.js"></script>
 <script id="listTemplet">
@@ -64,23 +67,24 @@
     let isRandom = true;
     let playIndex = 0;
     let playNow = ""
-    let share=getParam('share');
-    if(share!=null){
+    let share = getParam('share');
+    if (share != null) {
         //$('#playlist').remove()
         $('#reload').remove()
         $('#next').remove()
         $('#play_share').remove()
     }
-    $.get("/nas/music/getlocalhost.do",{share:share}, function (obj) {
+
+    $.get("/nas/music/getlocalhost.do", {share: share}, function (obj) {
         try {
             let json = JSON.parse(obj);
-            if(json.code===403){
+            if (json.code === 403) {
                 layer.msg('您没有权限访问')
                 return;
             }
-            localhost = json.data ;
+            localhost = json.data;
             if (localhost === 'http://null:8000' || localhost === ":8000") {
-                localhost = "https://"+window.location.host;
+                localhost = "https://" + window.location.host;
             }
         } catch (e) {
             localhost = ""
@@ -90,11 +94,11 @@
             let table = layui.table;
             let element = layui.element;
             let listTable = undefined;
-            $.post("/public/nas/music/playlist.do",{share:share},function (json) {
-                if(json.code!==0){
+            $.post("/public/nas/music/playlist.do", {share: share}, function (json) {
+                if (json.code !== 0) {
                     return;
                 }
-                listTable=table.render({
+                listTable = table.render({
                     elem: '#playlist'
                     , url: json.data //数据接口
                     , method: 'post'
@@ -115,19 +119,19 @@
                     , done: function (res, curr, count) {
                         musicLib = res.data
                         $('#musicSize').html("歌单总数:" + res.size)
-                    },error:function (e,data){
+                    }, error: function (e, data) {
                     }
                 })
                 table.on('rowDouble(music)', function (obj) {
                     //obj 同上
                     if (obj.data.isdir === 1) {
-                        let path=obj.data.md5;
-                        if(path===undefined){
-                            path=obj.data.file;
+                        let path = obj.data.md5;
+                        if (path === undefined) {
+                            path = obj.data.file;
                         }
                         listTable.reload({
                             where: {
-                                path:path
+                                path: path
                             }
                             , page: {
                                 curr: 1
@@ -149,49 +153,49 @@
                             window.open(localhost + "/nas/music/play.do?token=&random=false&filePath=" + data.md5)
                         }
                     } else if (obj.event === 'play') {
-                        if(data.md5!==undefined){
+                        if (data.md5 !== undefined) {
                             play(data)
                             return;
                         }
                         $.ajax({
                             type: "POST",
-                            url:localhost + "/nas/music/list.do",
+                            url: localhost + "/nas/music/list.do",
                             contentType: "application/json; charset=utf-8",
-                            data:JSON.stringify({type: true, path: data.file}),
+                            data: JSON.stringify({type: true, path: data.file}),
                             dataType: "json",
-                            success:function (json){
+                            success: function (json) {
                                 try {
                                     if (json.code === 0) {
                                         playIndex = 0;
-                                        musicLib=[]
+                                        musicLib = []
                                         for (let datum of json.data) {
-                                            if(datum.isdir===0){
+                                            if (datum.isdir === 0) {
                                                 musicLib.push(datum)
                                             }
                                         }
                                         isRandom = false;
                                         playNext()
                                     }
-                                }catch (e){
+                                } catch (e) {
 
                                 }
 
                             }
                         })
-                    }else if(obj.event==='share'){
-                        let isDir=false;
-                        let file=data.md5;
-                        if(data.isdir===1){
-                            isDir=true;
-                            file=data.file;
+                    } else if (obj.event === 'share') {
+                        let isDir = false;
+                        let file = data.md5;
+                        if (data.isdir === 1) {
+                            isDir = true;
+                            file = data.file;
                         }
-                        $.post('/nas/music/share.do',{file:file,isDir:isDir},function (json){
-                            if(json.code===0){
-                                var url="http://"+window.location.host+"/html/body/nas/music.html?share="+json.data.token
+                        $.post('/nas/music/share.do', {file: file, isDir: isDir}, function (json) {
+                            if (json.code === 0) {
+                                var url = "http://" + window.location.host + "/html/body/nas/music.html?share=" + json.data.token
                                 layer.prompt({
-                                    title:"分享链接",
-                                    value:url
-                                },function (value,index,elem){
+                                    title: "分享链接",
+                                    value: url
+                                }, function (value, index, elem) {
                                     $('.layui-layer-input')[0].select()
                                     document.execCommand("Copy")
                                     layer.close(index);
@@ -203,17 +207,19 @@
                 element.on('nav(menus)', function (elem) {
                 });
             })
-            function playShare(){
-                $.get('/nas/music/playShare.do?share='+share,function (json) {
+
+            function playShare() {
+                $.get('/nas/music/playShare.do?share=' + share, function (json) {
                     isRandom = false;
-                    playIndex =0;
+                    playIndex = 0;
                     json.data.forEach(function (item) {
                         musicLib.push(item)
                     })
                     play(json.data[0])
                 })
             }
-            if(share!==null){
+
+            if (share !== null) {
                 playShare()
             }
         });
@@ -221,6 +227,8 @@
     });
 
     let player = $.AudioPlayer;
+    let showLrc = false;
+    let lrc = new Lyricer();
     player.init({
         container: '#audioWrap'
         , source: ''
@@ -237,6 +245,10 @@
 
         }, canplayCallback: function () {
             console.log("点击播放")
+        }, timeupdateCallback: function (time) {
+            if (showLrc) {
+                lrc.move(time)
+            }
         }
     });
     $.ajax({cache: false})
@@ -244,7 +256,7 @@
     $('#footer').load("/html/footer.html");
 
     $('#img').click(function () {
-        if(share!==null){
+        if (share !== null) {
             return;
         }
         isRandom = true;
@@ -256,14 +268,14 @@
     $('#next').click(function () {
         playNext()
     });
-    $('#play_share').click(function (){
-        $.post('/nas/music/share.do',{file:playNow},function (json){
-            if(json.code===0){
-                var url="http://"+window.location.host+"/html/body/nas/music.html?share="+json.data.token
+    $('#play_share').click(function () {
+        $.post('/nas/music/share.do', {file: playNow}, function (json) {
+            if (json.code === 0) {
+                let url = "http://" + window.location.host + "/html/body/nas/music.html?share=" + json.data.token
                 layer.prompt({
-                    title:"分享链接",
-                    value:url
-                },function(value,index,elem){
+                    title: "分享链接",
+                    value: url
+                }, function (value, index, elem) {
                     $('.layui-layer-input')[0].select()
                     document.execCommand("Copy")
                     layer.close(index);
@@ -271,12 +283,45 @@
             }
         })
     })
+    $('#showLrc').click(function () {
+        let html = '<div id="lyricer"></div>';
+        $.get(localhost + '/nas/music/lrc.do?filePath=' + playNow, function (file) {
+            layer.open({
+                title: '歌词列表',
+                area: ['400px', '600px'],
+                content: html,
+                shade: 0,
+                offset: 'rb',
+                success: function () {
+                    showLrc = true
+                    if(file===''){
+                        file='[00:00.00]---暂无歌词---'
+                    }
+                    lrc.setLrc(file)
+                },
+                end: function () {
+                    showLrc = false;
+                }
+            });
+        })
+    })
     $('#reload').click(function () {
         $.post(localhost + "/nas/music/reload.do", function (obj) {
             layer.msg("提交刷新请求成功，几分钟后生效")
         })
     });
 
+    function updateLrc() {
+        if (showLrc) {
+            $.get(localhost + '/nas/music/lrc.do?filePath=' + playNow, function (file) {
+                if(file===''){
+                    file='[00:00.00]---暂无歌词---'
+                }
+                lrc.setLrc(file)
+                lrc.move(0)
+            })
+        }
+    }
 
     function playNext() {
         if (isRandom) {
@@ -301,7 +346,7 @@
             if (json.code === 0) {
                 playNow = json.data
                 player.updateSource({
-                    source: localhost + "/nas/music/play.do?random=false&filePath=" + json.data 
+                    source: localhost + "/nas/music/play.do?random=false&filePath=" + json.data
                 });
                 update(json.data)
                 player.play()
@@ -313,8 +358,8 @@
     }
 
     function play(_json) {
-        let md5=''
-        md5=_json.md5
+        let md5 = ''
+        md5 = _json.md5
         playNow = _json.md5
         player.updateSource({
             source: localhost + "/nas/music/play.do?random=false&filePath=" + md5
@@ -344,9 +389,9 @@
                     title: json.data.title,
                     artist: json.data.artist,
                     album: json.data.album,
-                    artwork:[
+                    artwork: [
                         {
-                            src: localhost+'/nas/music/web/image.do?fileName='+fileName,
+                            src: localhost + '/nas/music/web/image.do?fileName=' + fileName,
                             type: 'image/png',
                             sizes: '128x128'
                         }
@@ -358,7 +403,8 @@
                 });
             }
         })
-        $('#img').attr("src",localhost+'/nas/music/web/image.do?fileName='+fileName);
+        $('#img').attr("src", localhost + '/nas/music/web/image.do?fileName=' + fileName);
+        updateLrc()
     }
 
 
diff --git a/web/js/AudioPlayer.js b/web/js/AudioPlayer.js
index 288b6c2..497f056 100644
--- a/web/js/AudioPlayer.js
+++ b/web/js/AudioPlayer.js
@@ -414,6 +414,7 @@
                 _this.elements.totalTime.html(_this.formatTime(duration));
             }
             _this.elements.playProgress.width((_this.elements.audioDom.currentTime / _this.elements.audioDom.duration) * $('.progress_bg').width());
+            _this.options.timeupdateCallback(currTime)
         }
         // Formatting a timestamp / 格式化时间戳相关
         ,formatTime: function(secs, format) {
diff --git a/web/js/lyricer.min.js b/web/js/lyricer.min.js
new file mode 100644
index 0000000..7162188
--- /dev/null
+++ b/web/js/lyricer.min.js
@@ -0,0 +1,148 @@
+(function () {
+    // The constrcutor can be empty or passed in the lrc string
+    var Lyricer = function (options) {
+        this.divID = "lyricer"; // the default html container id
+        this.currentcss = "lyricer-current-line"; // this css for the line current playing
+        this.lineidPrefix = "lyricer-line"; // the id prefix for each line
+        this.showLines = 8; //lines showing before and after;
+        this.clickable = true;
+        this.clickEventName = "lyricerclick";
+        if( options ) {
+            for( var prop in options ) {
+                if ( typeof this[prop] != "undefined" && options.hasOwnProperty(prop)) {
+                    this[prop] =  options[prop];
+                }
+            }
+        }
+    };
+
+    Lyricer.prototype.setLrc = function(rawLrc) {
+        this.tags = {};
+        this.lrc = [];
+        this.rangeLrc = [];
+
+        var tagRegex = /\[([a-z]+):(.*)\].*/;
+        var lrcAllRegex = /(\[[0-9.:\[\]]*\])+(.*)/;
+        var timeRegex = /\[([0-9]+):([0-9.]+)\]/;
+        var timeRegexGim = /\[([0-9]+):([0-9.]+)\]/g;
+        var rawLrcArray = rawLrc.split(/[\r\n]/);
+        for (var i = 0; i < rawLrcArray.length; i++) {
+            // handle tags first
+            var tag = tagRegex.exec(rawLrcArray[i]);
+            if ( tag && tag[0] ) {
+                this.tags[tag[1]] = tag[2];
+                continue;
+            }
+            // handle lrc
+            var lrc = lrcAllRegex.exec(rawLrcArray[i]);
+            if ( lrc && lrc[0] ) {
+                var times = lrc[1].replace(/\]\[/g,"],[").split(",");
+                for (var j = 0; j < times.length; j++) {
+                    var time = timeRegex.exec(times[j]);
+                    if ( time && time[0] ) {
+                        this.lrc.push( { "starttime": parseInt(time[1],10) * 60 + parseFloat(time[2]), "line": lrc[2].replace(timeRegexGim,'') } );
+                    };
+                };
+            };
+        };
+
+        //sort lrc array
+        this.lrc.sort(function (a,b) {
+            return a.starttime - b.starttime;
+        });
+
+        // crate the range lrc array
+        // dummy lines
+        for (var i = 0; i < this.showLines; i++) {
+            this.rangeLrc.push( { "starttime": -1, "endtime": 0, "line": "&nbsp;" } );
+        };
+        // real data
+        var starttime = 0;
+        var line = "";
+        for (var i = 0; i < this.lrc.length; i++) {
+            endtime =  parseFloat(this.lrc[i].starttime);
+            this.rangeLrc.push( { "starttime": starttime, "endtime": endtime, "line": line } );
+            starttime = endtime;
+            line = this.lrc[i].line;
+        };
+        this.rangeLrc.push( { "starttime": starttime, "endtime": 999.99, "line": line } );
+        // dummy lines
+        for (var i = 0; i < this.showLines; i++) {
+            this.rangeLrc.push( { "starttime": -1, "endtime": 0, "line": "&nbsp;" } );
+        };
+        this.totalLines = this.rangeLrc.length;
+
+        // set html and move to start
+        setHtml(this);
+        this.move(0);
+    };
+
+    var setHtml = function(self) {
+        self.currentLine = 0;
+
+        var container = document.getElementById(self.divID);
+        container.innerHTML = "";
+        var ul = document.createElement("ul");
+        container.appendChild(ul);
+        for (var i = 0; i < self.totalLines; i++) {
+            var li = document.createElement("li");
+            li.innerHTML = self.rangeLrc[i].line;
+            if (!li.innerHTML) {li.innerHTML="&nbsp;"};
+            li.setAttribute("id", self.lineidPrefix + i);
+            if (self.clickable) {
+                li.onclick = lineClicked(self, i);
+                li.style.cursor = 'pointer';
+            }
+            ul.appendChild(li);
+        };
+
+        // hide the later ones
+        for (var i = self.showLines; i < self.totalLines; i++) {
+            document.getElementById(self.lineidPrefix + i).style.display = "none";
+        };
+    };
+
+    var lineClicked = function(self, id) {
+        return function(){
+            var detail = {"time": self.rangeLrc[id].starttime};
+            var e = new CustomEvent(self.clickEventName, {
+                'detail': detail,
+                "bubbles": true
+            });
+            var elem = document.getElementById(self.lineidPrefix + id);
+            elem.dispatchEvent(e);
+        };
+    };
+
+
+    Lyricer.prototype.move = function(time) {
+        for (var i = 0; i < this.totalLines; i++) {
+            if (time >= this.rangeLrc[i].starttime && time < this.rangeLrc[i].endtime) {
+                this.currentLine = i;
+                moveToLine(this,this.currentLine);
+                return;
+            };
+        };
+    };
+
+    var moveToLine = function (self, line) {
+        var startShow = line - self.showLines;
+        var endShow = line + self.showLines;
+        for (var i = 0; i < self.totalLines; i++) {
+            var li = document.getElementById(self.lineidPrefix + i);
+            if ( i >= startShow && i <= endShow ) {
+                li.style.display = "block";
+            } else{
+                li.style.display = "none";
+            };
+            if (i==line) {
+                li.className = self.currentcss;
+            } else {
+                li.className = "";
+            };
+        };
+    };
+
+    window.Lyricer = Lyricer; //exposed to global
+
+})();
\ No newline at end of file

From 96b2ba371f5d61d273c19e0eb54b84e981184e2b Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Mon, 11 Jul 2022 14:02:30 +0800
Subject: [PATCH 08/16] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9r?=
 =?UTF-8?q?ss=E6=97=B6=E6=97=A0bgmid=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/bangumi/AnimationController.java    | 94 ++++++++++---------
 1 file changed, 52 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/yutou/tools/bangumi/AnimationController.java b/src/main/java/com/yutou/tools/bangumi/AnimationController.java
index 4f7043f..2c9988c 100644
--- a/src/main/java/com/yutou/tools/bangumi/AnimationController.java
+++ b/src/main/java/com/yutou/tools/bangumi/AnimationController.java
@@ -23,23 +23,23 @@ import java.util.Objects;
 
 @Controller
 public class AnimationController {
-  @Resource
+    @Resource
     BangumiService bangumiService;
 
     @ResponseBody
     @RequestMapping(value = "/anim/rss/data.do", method = RequestMethod.GET)
-    public String getAnimList(String key,String type,String team, int page) {
+    public String getAnimList(String key, String type, String team, int page) {
         boolean isNull = key.length() == 0;
-        if(!StringUtils.isEmpty(type)&&type.length()>2) {
-            type=type.substring(2);
+        if (!StringUtils.isEmpty(type) && type.length() > 2) {
+            type = type.substring(2);
         }
-        if(!StringUtils.isEmpty(team)&&team.length()>2) {
-            team=team.substring(2);
+        if (!StringUtils.isEmpty(team) && team.length() > 2) {
+            team = team.substring(2);
         }
         String[] keys = key.split(" ");
         JSONArray items = null;
         if (!isNull) {
-            items = new AnimationData().bangumiList(page,type,team, keys);
+            items = new AnimationData().bangumiList(page, type, team, keys);
         }
         JSONObject json = new JSONObject();
         json.put("data", Objects.requireNonNullElseGet(items, JSONArray::new));
@@ -71,11 +71,12 @@ public class AnimationController {
         json.put("data", JSON.toJSON(bangumiService.getAllBangumiList()));
         return json.toJSONString();
     }
+
     @ResponseBody
     @RequestMapping(value = "/anim/type/del.do", method = RequestMethod.POST)
-    public String delType(int id){
-        int i=bangumiService.removeBangumiType(id);
-        JSONObject json=new JSONObject();
+    public String delType(int id) {
+        int i = bangumiService.removeBangumiType(id);
+        JSONObject json = new JSONObject();
         json.put("code", 0);
         json.put("msg", i == 0 ? "删除失败" : "删除成功");
         return json.toJSONString();
@@ -83,12 +84,13 @@ public class AnimationController {
 
     @ResponseBody
     @RequestMapping(value = "/anim/rss/add.do", method = RequestMethod.POST)
-    public String addAnimationRss(String bgmId,String title, String author, String categories, String titleKey, String bid) {
-        int id=0;
-        if(!StringUtils.isEmpty(bgmId)){
+    public String addAnimationRss(String bgmId, String title, String author, String categories, String titleKey, String bid) {
+        int id = 0;
+        if (!StringUtils.isEmpty(bgmId)) {
             try {
-                id=Integer.parseInt(bgmId.trim());
-            }catch (Exception ignored){}
+                id = Integer.parseInt(bgmId.trim());
+            } catch (Exception ignored) {
+            }
         }
         BangumiItem item = new BangumiItem();
         item.setBgmid(id);
@@ -114,62 +116,70 @@ public class AnimationController {
         json.put("data", JSON.toJSON(bangumiService.getBangumiItemList(type)));
         return json.toJSONString();
     }
+
     @ResponseBody
     @RequestMapping(value = "/anim/rss/del.do", method = RequestMethod.POST)
-    public String delAnimation(int id){
-        int i=bangumiService.removeBangumiItem(id);
-        JSONObject json=new JSONObject();
+    public String delAnimation(int id) {
+        int i = bangumiService.removeBangumiItem(id);
+        JSONObject json = new JSONObject();
         json.put("code", 0);
         json.put("msg", i == 0 ? "删除失败" : "删除成功");
         return json.toJSONString();
     }
+
     @ResponseBody
-    @RequestMapping(value = "/anim/rss/edit.do",method = RequestMethod.POST)
-    public JSONObject editAnimation(int id,int bgmId,String title, String author, String categories, String titleKey,String enable){
-        JSONObject json=new JSONObject();
-        BangumiItem item =bangumiService.getBangumiItem(id);
-        if(bgmId!=0){
-            item.setBgmid(bgmId);
+    @RequestMapping(value = "/anim/rss/edit.do", method = RequestMethod.POST)
+    public JSONObject editAnimation(int id, String bgmId, String title, String author, String categories, String titleKey, String enable) {
+        JSONObject json = new JSONObject();
+        BangumiItem item = bangumiService.getBangumiItem(id);
+        if (!StringUtils.isEmpty(bgmId)) {
+            try {
+                item.setBgmid(Integer.parseInt(bgmId));
+            } catch (Exception ignored) {
+
+            }
         }
-        if(!StringUtils.isEmpty(title)){
+        if (!StringUtils.isEmpty(title)) {
             item.setTitle(title);
         }
-        if(!StringUtils.isEmpty(author)){
+        if (!StringUtils.isEmpty(author)) {
             item.setAuthor(author);
         }
-        if(!StringUtils.isEmpty(categories)){
+        if (!StringUtils.isEmpty(categories)) {
             item.setCategories(categories);
         }
-        if(!StringUtils.isEmpty(titleKey)){
+        if (!StringUtils.isEmpty(titleKey)) {
             item.setTitlekey(titleKey);
         }
-        if(!StringUtils.isEmpty(enable)){
+        if (!StringUtils.isEmpty(enable)) {
             item.setEnable(Integer.parseInt(enable));
         }
-        int i=bangumiService.updateBangumiItem(item);
-        if(i>0){
-            json.put("msg","操作成功");
-        }else{
-            json.put("msg","操作失败");
+        int i = bangumiService.updateBangumiItem(item);
+        if (i > 0) {
+            json.put("msg", "操作成功");
+        } else {
+            json.put("msg", "操作失败");
         }
-        json.put("code",1);
+        json.put("code", 1);
         return json;
     }
+
     @ResponseBody
     @RequestMapping(value = "/anim/client/get.do", method = RequestMethod.GET)
-    public String clientApi(){
-        AnimationData animationData=new AnimationData();
-        List<BangumiItem> list=bangumiService.getAllBangumiItemList();
+    public String clientApi() {
+        AnimationData animationData = new AnimationData();
+        List<BangumiItem> list = bangumiService.getAllBangumiItemList();
         for (BangumiItem item : list) {
-            item.setCategories(animationData.nameToValue(item.getCategories(),false)+"");
-            item.setAuthor(animationData.nameToValue(item.getAuthor(),true)+"");
+            item.setCategories(animationData.nameToValue(item.getCategories(), false) + "");
+            item.setAuthor(animationData.nameToValue(item.getAuthor(), true) + "");
         }
-        JSONArray array= (JSONArray) JSON.toJSON(list);
+        JSONArray array = (JSONArray) JSON.toJSON(list);
         return array.toJSONString();
     }
+
     @ResponseBody
     @RequestMapping(value = "/anim/getToDay.do", method = RequestMethod.GET)
-    public JSONObject getToDayAnim(){
+    public JSONObject getToDayAnim() {
         return BangumiTools.getBangumi(0);
     }
 }

From 3fb9220e72c7244c1aad147e13af34230e3d436c Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Thu, 14 Jul 2022 13:09:17 +0800
Subject: [PATCH 09/16] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96rss=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98=20fix:rss?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BB=8A=E6=97=A5=E5=8A=A8=E7=94=BB=E6=97=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=97=B6=E6=97=A0=E6=B3=95=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20del:=E7=A7=BB=E9=99=A4redis?=
 =?UTF-8?q?=E7=9A=84=E4=B8=80=E5=A4=84print?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/yutou/tools/ToolsApplication.java         | 2 +-
 .../java/com/yutou/tools/services/BangumiServiceImpl.java   | 5 ++++-
 src/main/java/com/yutou/tools/utils/RedisTools.java         | 5 ++---
 web/html/body/nas/animrss.html                              | 6 +++++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/yutou/tools/ToolsApplication.java b/src/main/java/com/yutou/tools/ToolsApplication.java
index 6d228c5..175e425 100644
--- a/src/main/java/com/yutou/tools/ToolsApplication.java
+++ b/src/main/java/com/yutou/tools/ToolsApplication.java
@@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class ToolsApplication {
-    public static final String version="1.4.6";
+    public static final String version="1.4.7";
 
     public static void main(String[] args) {
         System.out.println("当前版本号:" + version);
diff --git a/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java b/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
index ceb32ac..99c7a30 100644
--- a/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
+++ b/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
@@ -9,6 +9,7 @@ import com.yutou.tools.mybatis.model.BangumiList;
 import com.yutou.tools.mybatis.model.BangumiListExample;
 import com.yutou.tools.services.interfaces.BangumiService;
 import com.yutou.tools.utils.BangumiTools;
+import com.yutou.tools.utils.RedisTools;
 import com.yutou.tools.utils.Tools;
 import org.springframework.stereotype.Service;
 
@@ -74,7 +75,9 @@ public class BangumiServiceImpl implements BangumiService {
             if(item.getEnable()==0||item.getBgmid()==0){
                 continue;
             }
-            JSONObject bangumi=BangumiTools.getBangumiInfoSmall(item.getBgmid());
+            String tmp=RedisTools.get(item.getBgmid()+"",1);
+            JSONObject bangumi= tmp==null?BangumiTools.getBangumiInfoSmall(item.getBgmid()):JSONObject.parseObject(tmp);
+            RedisTools.set(1,item.getBgmid()+"",bangumi.toJSONString());
             if(bangumi.containsKey("code")&&bangumi.getInteger("code")==404){
                 continue;
             }
diff --git a/src/main/java/com/yutou/tools/utils/RedisTools.java b/src/main/java/com/yutou/tools/utils/RedisTools.java
index 78b763f..f6e20a8 100644
--- a/src/main/java/com/yutou/tools/utils/RedisTools.java
+++ b/src/main/java/com/yutou/tools/utils/RedisTools.java
@@ -42,7 +42,6 @@ public class RedisTools {
             Jedis jedis = getRedis();
             jedis.select(dbIndex);
             String ret = jedis.set(key, value);
-            System.out.println("Redis set =" + ret);
             jedis.close();
         } catch (Exception e) {
             // TODO: handle exception
@@ -77,9 +76,9 @@ public class RedisTools {
     }
 
     public static String get(String key, int dbIndex) {
-        String value = "-999";
+        String value = null;
         if (isNotInstallRedis) {
-            return value;
+            return null;
         }
         try (Jedis jedis = getRedis()) {
             jedis.select(dbIndex);
diff --git a/web/html/body/nas/animrss.html b/web/html/body/nas/animrss.html
index 6772959..d283819 100644
--- a/web/html/body/nas/animrss.html
+++ b/web/html/body/nas/animrss.html
@@ -433,7 +433,11 @@
                     if (name === '') {
                         name = item.name;
                     }
-                    html += '<tr><td>' + name + '</td><td>' + item.air_date + '</td><td><img src="' + item.images.small + '"></td><td><a href="' + item.url + '" target="_blank">前往番剧计划</a></td></tr>'
+                    let img='#'
+                    if(item.images!=null){
+                        img=item.images.small
+                    }
+                    html += '<tr><td>' + name + '</td><td>' + item.air_date + '</td><td><img src="' + img + '"></td><td><a href="' + item.url + '" target="_blank">前往番剧计划</a></td></tr>'
                     _tab.push({title: item.name, url: '<a href="' + item.url + '">前往番剧计划</a>'})
                 })
                 html += "</table>"

From 64656c7dc69d105f4426c84bc9b2830fd23e6d10 Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Thu, 14 Jul 2022 13:16:59 +0800
Subject: [PATCH 10/16] =?UTF-8?q?add:redis=E6=96=B0=E5=A2=9E=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E8=AE=BE=E7=BD=AE=E6=96=B9=E6=B3=95=20update=EF=BC=9A?=
 =?UTF-8?q?=E7=95=AA=E5=89=A7rss=E7=9A=84redis=E8=AE=BE=E7=BD=AE=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E6=97=B6=E9=97=B4=E4=B8=BA=E4=B8=80=E4=B8=AA=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/services/BangumiServiceImpl.java    |  2 +-
 .../com/yutou/tools/utils/RedisTools.java     | 50 ++++++++++++-------
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java b/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
index 99c7a30..7e44529 100644
--- a/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
+++ b/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
@@ -77,7 +77,7 @@ public class BangumiServiceImpl implements BangumiService {
             }
             String tmp=RedisTools.get(item.getBgmid()+"",1);
             JSONObject bangumi= tmp==null?BangumiTools.getBangumiInfoSmall(item.getBgmid()):JSONObject.parseObject(tmp);
-            RedisTools.set(1,item.getBgmid()+"",bangumi.toJSONString());
+            RedisTools.set(1,2592000,item.getBgmid()+"",bangumi.toJSONString());
             if(bangumi.containsKey("code")&&bangumi.getInteger("code")==404){
                 continue;
             }
diff --git a/src/main/java/com/yutou/tools/utils/RedisTools.java b/src/main/java/com/yutou/tools/utils/RedisTools.java
index f6e20a8..866026f 100644
--- a/src/main/java/com/yutou/tools/utils/RedisTools.java
+++ b/src/main/java/com/yutou/tools/utils/RedisTools.java
@@ -34,14 +34,19 @@ public class RedisTools {
         port = 6379;
     }
 
-    public static boolean set(int dbIndex, String key, String value) {
+
+    public static boolean set(int dbIndex, int timeout, String key, String value) {
         try {
             if (isNotInstallRedis) {
                 return false;
             }
             Jedis jedis = getRedis();
             jedis.select(dbIndex);
-            String ret = jedis.set(key, value);
+            if (timeout == -1) {
+                jedis.set(key, value);
+            } else {
+                jedis.setex(key, timeout, value);
+            }
             jedis.close();
         } catch (Exception e) {
             // TODO: handle exception
@@ -51,6 +56,10 @@ public class RedisTools {
         return true;
     }
 
+    public static boolean set(int dbIndex, String key, String value) {
+        return set(dbIndex, -1, key, value);
+    }
+
     public static boolean set(String key, String value) {
         return set(0, key, value);
     }
@@ -96,7 +105,7 @@ public class RedisTools {
     }
 
     public static boolean remove(String key) {
-       return remove(key,0);
+        return remove(key, 0);
     }
 
     public static void removeLoginState(String uid) {
@@ -147,32 +156,36 @@ public class RedisTools {
     }
 
     public static long list_add(String listName, String... value) {
-        Jedis jedis=getRedis();
-        long index=jedis.sadd(listName,value);
+        Jedis jedis = getRedis();
+        long index = jedis.sadd(listName, value);
         jedis.close();
         return index;
     }
-    public static Set<String> list_get(String listName){
-        Jedis jedis=getRedis();
-        Set<String> set=jedis.smembers(listName);
+
+    public static Set<String> list_get(String listName) {
+        Jedis jedis = getRedis();
+        Set<String> set = jedis.smembers(listName);
         jedis.close();
-        if(set==null){
-            set=new HashSet<>();
+        if (set == null) {
+            set = new HashSet<>();
         }
         return set;
     }
-    public static boolean list_remove(String listName,String... value){
-        Jedis jedis=getRedis();
-        long index=jedis.srem(listName,value);
+
+    public static boolean list_remove(String listName, String... value) {
+        Jedis jedis = getRedis();
+        long index = jedis.srem(listName, value);
         jedis.close();
         return index != 0;
     }
-    public static boolean list_isExist(String listName,String value){
-        Jedis jedis=getRedis();
-        boolean flag=jedis.sismember(listName,value);
+
+    public static boolean list_isExist(String listName, String value) {
+        Jedis jedis = getRedis();
+        boolean flag = jedis.sismember(listName, value);
         jedis.close();
         return flag;
     }
+
     private static class PropertyUtil {
 
         // 加载property文件到io流里面
@@ -255,7 +268,7 @@ public class RedisTools {
                     system("cmd", message);
                     break;
                 case "msg":
-                    Tools.sendServer("来自服务姬的通知~",message);
+                    Tools.sendServer("来自服务姬的通知~", message);
                     break;
             }
         }
@@ -292,7 +305,6 @@ public class RedisTools {
         }
 
 
-
         public static void bot(String value) {
             switch (value) {
                 case "getip":
@@ -302,6 +314,7 @@ public class RedisTools {
             }
         }
     }
+
     public static void processOut(InputStream inputStream) {
 
         String tmp;
@@ -319,6 +332,7 @@ public class RedisTools {
         System.out.println("cmd > " + str);
         System.out.println("线程结束");
     }
+
     public static void main(String[] args) {
         RedisTools.pullMsg("msg", "abc");
     }

From 39d4edebae5ac2513002da77bcf70c5eec11fd57 Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Thu, 14 Jul 2022 13:56:04 +0800
Subject: [PATCH 11/16] =?UTF-8?q?update:rss=E6=9B=B4=E6=96=B0=E6=97=A5?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E5=85=B7=E4=BD=93=E5=91=A8=E5=87=A0=20del:?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4my.js=E4=B8=80=E5=A4=84=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yutou/tools/mybatis/model/BangumiItem.java    |  2 +-
 .../yutou/tools/services/BangumiServiceImpl.java  | 15 ++++++++++++++-
 web/html/body/nas/animrss.html                    |  4 ++--
 web/js/myjs.js                                    |  3 +--
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/yutou/tools/mybatis/model/BangumiItem.java b/src/main/java/com/yutou/tools/mybatis/model/BangumiItem.java
index 0675e68..28092a7 100644
--- a/src/main/java/com/yutou/tools/mybatis/model/BangumiItem.java
+++ b/src/main/java/com/yutou/tools/mybatis/model/BangumiItem.java
@@ -21,7 +21,7 @@ public class BangumiItem implements Serializable {
 
     private String title;
 
-    private boolean isUpdate=false;
+    private String updateDay ;
 
     /**
      * 标题过滤词
diff --git a/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java b/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
index 7e44529..a31525e 100644
--- a/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
+++ b/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
@@ -86,11 +86,24 @@ public class BangumiServiceImpl implements BangumiService {
                 day = 7;
             }
             if(bangumi.getInteger("air_weekday")==day) {
-                item.setUpdate(true);
+                item.setUpdateDay("今天更新");
+            }else{
+                item.setUpdateDay("周"+getDay(bangumi.getInteger("air_weekday"))+"更新");
             }
         }
         return items;
     }
+    private String getDay(int day){
+        switch (day){
+            case 1:return "一";
+            case 2:return "二";
+            case 3:return "三";
+            case 4:return "四";
+            case 5:return "五";
+            case 6:return "六";
+            default:return "日";
+        }
+    }
 
     @Override
     public List<BangumiItem> getAllBangumiItemList() {
diff --git a/web/html/body/nas/animrss.html b/web/html/body/nas/animrss.html
index d283819..8f0b30d 100644
--- a/web/html/body/nas/animrss.html
+++ b/web/html/body/nas/animrss.html
@@ -183,11 +183,11 @@
     {{# }}}
 </script>
 <script type="text/html" id="animUpdateState">
-    {{# if(d.update==1){}}
+    {{# if(d.updateDay=='今天更新'){}}
     <div><input type="checkbox" name="update" lay-text="今天更新|不更新" lay-filter="stateCheckbox" lay-skin="switch"
                 value="{{d.id}}" checked disabled></div>
     {{# } else { }}
-    <div><input type="checkbox" name="update" lay-text="今天更新|不更新" lay-filter="stateCheckbox" lay-skin="switch"
+    <div><input type="checkbox" name="update" lay-text="{{d.updateDay}}|{{d.updateDay}}" lay-filter="stateCheckbox" lay-skin="switch"
                 value="{{d.id}}" disabled></div>
     {{# }}}
 </script>
diff --git a/web/js/myjs.js b/web/js/myjs.js
index d8f8ad3..52a9357 100644
--- a/web/js/myjs.js
+++ b/web/js/myjs.js
@@ -102,8 +102,7 @@ function Base64() {
     }
 }
 function getParam(name){
-    console.log(window.location.href)
-    var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
+    let results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
     if (results == null) {
         return null;
     } else {

From e17095cc7e7aa9bf8e1ed67ffa9f56c33c6c6e37 Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Sat, 16 Jul 2022 16:13:28 +0800
Subject: [PATCH 12/16] =?UTF-8?q?add:=E5=BC=80=E5=8F=91=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8D=E5=81=9A=E8=BA=AB=E4=BB=BD=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yutou/tools/AuthConfig/RoleAccessDecisionManager.java  | 1 +
 src/main/java/com/yutou/tools/utils/Tools.java                 | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/com/yutou/tools/AuthConfig/RoleAccessDecisionManager.java b/src/main/java/com/yutou/tools/AuthConfig/RoleAccessDecisionManager.java
index f0d1e35..8bd600e 100644
--- a/src/main/java/com/yutou/tools/AuthConfig/RoleAccessDecisionManager.java
+++ b/src/main/java/com/yutou/tools/AuthConfig/RoleAccessDecisionManager.java
@@ -46,6 +46,7 @@ public class RoleAccessDecisionManager implements AccessDecisionManager {
                 return;
         }
         if("dev".equals(ConfigTools.load(ConfigTools.CONFIG, "model"))) {
+            authentication.setAuthenticated(true);
             return;
         }
         if(url.endsWith(".ts")||url.endsWith(".m3u8")){
diff --git a/src/main/java/com/yutou/tools/utils/Tools.java b/src/main/java/com/yutou/tools/utils/Tools.java
index 401134f..3c8edfc 100644
--- a/src/main/java/com/yutou/tools/utils/Tools.java
+++ b/src/main/java/com/yutou/tools/utils/Tools.java
@@ -434,6 +434,9 @@ public class Tools {
     }
 
     public static String getLoginUser() {
+        if("dev".equals(ConfigTools.load(ConfigTools.CONFIG, "model"))) {
+            return "admin";
+        }
         Object user = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         if (user instanceof String) {
             return (String) user;

From 88960372f592377043a3bf90aa1131f8294197a1 Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Sat, 16 Jul 2022 18:25:30 +0800
Subject: [PATCH 13/16] =?UTF-8?q?add:=E6=96=B0=E5=A2=9E=E4=B8=B4=E6=97=B6r?=
 =?UTF-8?q?ss=E8=AE=A2=E9=98=85=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/bangumi/AnimationController.java    | 38 ++++++----
 .../tools/services/BangumiServiceImpl.java    | 70 +++++++++++++------
 web/html/body/nas/animrss.html                | 68 ++++++++++++++----
 web/js/myjs.js                                |  5 +-
 4 files changed, 134 insertions(+), 47 deletions(-)

diff --git a/src/main/java/com/yutou/tools/bangumi/AnimationController.java b/src/main/java/com/yutou/tools/bangumi/AnimationController.java
index 2c9988c..25b8985 100644
--- a/src/main/java/com/yutou/tools/bangumi/AnimationController.java
+++ b/src/main/java/com/yutou/tools/bangumi/AnimationController.java
@@ -3,14 +3,11 @@ package com.yutou.tools.bangumi;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.yutou.tools.mybatis.dao.BangumiItemDao;
-import com.yutou.tools.mybatis.dao.BangumiListDao;
 import com.yutou.tools.mybatis.model.BangumiItem;
-import com.yutou.tools.mybatis.model.BangumiItemExample;
 import com.yutou.tools.mybatis.model.BangumiList;
-import com.yutou.tools.mybatis.model.BangumiListExample;
 import com.yutou.tools.services.interfaces.BangumiService;
 import com.yutou.tools.utils.BangumiTools;
+import com.yutou.tools.utils.RedisTools;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -84,7 +81,20 @@ public class AnimationController {
 
     @ResponseBody
     @RequestMapping(value = "/anim/rss/add.do", method = RequestMethod.POST)
-    public String addAnimationRss(String bgmId, String title, String author, String categories, String titleKey, String bid) {
+    public JSONObject addAnimationRss(String bgmId, String title, String author, String categories, String titleKey, String bid) {
+        int i = 0;
+        JSONObject json = new JSONObject();
+        json.put("code", 0);
+        if ("-1".equals(bid)) {
+            BangumiItem item = new BangumiItem();
+            item.setId(-1);
+            item.setTitle(title);
+            item.setTitlekey(title.split("\\?")[1]);
+            i = bangumiService.addBangumiItem(item);
+            json.put("msg", i == 0 ? "添加失败" : "添加成功");
+            return json;
+        }
+
         int id = 0;
         if (!StringUtils.isEmpty(bgmId)) {
             try {
@@ -100,11 +110,9 @@ public class AnimationController {
         item.setTitlekey(titleKey);
         item.setBid(bid);
         item.setEnable(1);
-        int i = bangumiService.addBangumiItem(item);
-        JSONObject json = new JSONObject();
-        json.put("code", 0);
+        i = bangumiService.addBangumiItem(item);
         json.put("msg", i == 0 ? "添加失败" : "添加成功");
-        return json.toJSONString();
+        return json;
     }
 
     @ResponseBody
@@ -119,12 +127,18 @@ public class AnimationController {
 
     @ResponseBody
     @RequestMapping(value = "/anim/rss/del.do", method = RequestMethod.POST)
-    public String delAnimation(int id) {
-        int i = bangumiService.removeBangumiItem(id);
+    public JSONObject delAnimation(String id) {
         JSONObject json = new JSONObject();
         json.put("code", 0);
+        if (id.startsWith("http")) {
+            boolean tmpRss = RedisTools.list_remove("anim_tmp_rss", id);
+            json.put("msg", tmpRss ? "删除成功" : "删除失败");
+            return json;
+        }
+        int i = bangumiService.removeBangumiItem(Integer.parseInt(id));
+
         json.put("msg", i == 0 ? "删除失败" : "删除成功");
-        return json.toJSONString();
+        return json;
     }
 
     @ResponseBody
diff --git a/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java b/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
index a31525e..f518029 100644
--- a/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
+++ b/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
@@ -14,7 +14,9 @@ import com.yutou.tools.utils.Tools;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 @Service("BangumiService")
 public class BangumiServiceImpl implements BangumiService {
@@ -36,7 +38,9 @@ public class BangumiServiceImpl implements BangumiService {
     @Override
     public int addBangumiItem(BangumiItem... list) {
         for (BangumiItem item : list) {
-            if (itemDao.insert(item) <= 0) {
+            if (item.getId().equals(-1)) {
+                RedisTools.list_add("anim_tmp_rss",item.getTitle());
+            } else if (itemDao.insert(item) <= 0) {
                 return 0;
             }
         }
@@ -68,40 +72,59 @@ public class BangumiServiceImpl implements BangumiService {
 
     @Override
     public List<BangumiItem> getBangumiItemList(String type) {
+        List<BangumiItem> items;
+        if ("-1".equals(type)) {
+            Set<String> strings = RedisTools.list_get("anim_tmp_rss");
+            items=new ArrayList<>();
+            for (String string : strings) {
+                BangumiItem item=new BangumiItem();;
+                item.setTitle(string);
+                items.add(item);
+            }
+            return items;
+        }
         BangumiItemExample example = new BangumiItemExample();
         example.createCriteria().andBidEqualTo(type);
-        List<BangumiItem> items = itemDao.selectByExample(example);
+        items = itemDao.selectByExample(example);
         for (BangumiItem item : items) {
-            if(item.getEnable()==0||item.getBgmid()==0){
+            if (item.getEnable() == 0 || item.getBgmid() == 0) {
                 continue;
             }
-            String tmp=RedisTools.get(item.getBgmid()+"",1);
-            JSONObject bangumi= tmp==null?BangumiTools.getBangumiInfoSmall(item.getBgmid()):JSONObject.parseObject(tmp);
-            RedisTools.set(1,2592000,item.getBgmid()+"",bangumi.toJSONString());
-            if(bangumi.containsKey("code")&&bangumi.getInteger("code")==404){
+            String tmp = RedisTools.get(item.getBgmid() + "", 1);
+            JSONObject bangumi = tmp == null ? BangumiTools.getBangumiInfoSmall(item.getBgmid()) : JSONObject.parseObject(tmp);
+            RedisTools.set(1, 2592000, item.getBgmid() + "", bangumi.toJSONString());
+            if (bangumi.containsKey("code") && bangumi.getInteger("code") == 404) {
                 continue;
             }
-            int day=Tools.getWeekDay();
+            int day = Tools.getWeekDay();
             if (day == 0) {
                 day = 7;
             }
-            if(bangumi.getInteger("air_weekday")==day) {
+            if (bangumi.getInteger("air_weekday") == day) {
                 item.setUpdateDay("今天更新");
-            }else{
-                item.setUpdateDay("周"+getDay(bangumi.getInteger("air_weekday"))+"更新");
+            } else {
+                item.setUpdateDay("周" + getDay(bangumi.getInteger("air_weekday")) + "更新");
             }
         }
         return items;
     }
-    private String getDay(int day){
-        switch (day){
-            case 1:return "一";
-            case 2:return "二";
-            case 3:return "三";
-            case 4:return "四";
-            case 5:return "五";
-            case 6:return "六";
-            default:return "日";
+
+    private String getDay(int day) {
+        switch (day) {
+            case 1:
+                return "一";
+            case 2:
+                return "二";
+            case 3:
+                return "三";
+            case 4:
+                return "四";
+            case 5:
+                return "五";
+            case 6:
+                return "六";
+            default:
+                return "日";
         }
     }
 
@@ -112,6 +135,11 @@ public class BangumiServiceImpl implements BangumiService {
 
     @Override
     public List<BangumiList> getAllBangumiList() {
-        return listDao.selectByExample(new BangumiListExample());
+        List<BangumiList> list = listDao.selectByExample(new BangumiListExample());
+        BangumiList bangumi = new BangumiList();
+        bangumi.setTitle("临时RSS");
+        bangumi.setId(-1);
+        list.add(bangumi);
+        return list;
     }
 }
diff --git a/web/html/body/nas/animrss.html b/web/html/body/nas/animrss.html
index 8f0b30d..f8913ba 100644
--- a/web/html/body/nas/animrss.html
+++ b/web/html/body/nas/animrss.html
@@ -173,6 +173,11 @@
     <a class="layui-btn layui-btn-xs" lay-event="show">查看</a>
     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
 </script>
+<script type="text/html" id="RsslistTools">
+    <a class="layui-btn layui-btn-warm　layui-btn-xs" lay-event="mikan">MiKan</a>
+    <a class="layui-btn layui-btn-xs" lay-event="tmp_rss_show">查看</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="tmp_rss_del">删除</a>
+</script>
 <script type="text/html" id="animState">
     {{# if(d.enable==1){}}
     <div><input type="checkbox" name="state" lay-text="启用|关闭" lay-filter="stateCheckbox" lay-skin="switch"
@@ -202,7 +207,22 @@
             window.location.href = "/"
         }
     })
-
+    function addTmpRss(def) {
+        layer.prompt({
+            formType: 0,
+            value: '',
+            title: '请输入RSS地址'
+        }, function(value, index, elem){
+            $.post('/anim/rss/add.do',{
+                title: value,
+                bid:-1
+            },function (json) {
+                console.log(json)
+                layer.msg(json.msg)
+                layer.close(index);
+            })
+        });
+    }
     layui.use(['layer', 'form', 'element', 'table', 'util'], function () {
         let layer = layui.layer
             , util = layui.util
@@ -220,24 +240,34 @@
                 }
             }
         });
+
         $.get("/anim/type/list.do", function (data) {
             let json = JSON.parse(data);
             if (json.code === 0) {
                 for (let index = 0; index < json.data.length; index++) {
-                    const ret = json.data[index];
+                    let ret = json.data[index];
+                    let content;
+                    if(ret.id===-1){
+                        content='<button type="button" class="layui-btn layui-btn-xs" onclick="addTmpRss(this)">添加临时订阅地址</button>'
+                    }else{
+                        content=''
+                    }
                     element.tabAdd('animType', {
                         title: ret.title
-                        , content: '<table id="passwordlist' + ret.id + '" lay-filter="adminTable"></table>'
+                        , content: content+'<table id="passwordlist' + ret.id + '" lay-filter="adminTable"></table>'
                         , id: ret.id
                     })
                 }
                 element.on('tab(animType)', function (data) {
                     tabid = $(this).attr('lay-id')
-                    table.render({
-                        elem: "#passwordlist" + tabid
-                        , url: '/anim/rss/list.do?type=' + tabid
-                        , page: true
-                        , cols: [[
+                    let cols;
+                    if(tabid==='-1'){
+                        cols=[[
+                            {field: 'title', title: '地址'}
+                            ,{field: "right", toolbar: '#RsslistTools'}
+                        ]]
+                    }else{
+                        cols=[[
                             {field: "id", title: "id", width: 60, sort: true, fixed: 'left'}
                             , {field: 'bgmid', title: 'bgmId', width: 80, edit: 'text'}
                             , {field: 'title', title: '标题', edit: 'text'}
@@ -248,6 +278,12 @@
                             , {field: 'update', title: '更新', width: 110, templet: '#animUpdateState'}
                             , {field: "right", toolbar: '#listTools'}
                         ]]
+                    }
+                    table.render({
+                        elem: "#passwordlist" + tabid
+                        , url: '/anim/rss/list.do?type=' + tabid
+                        , page: true
+                        , cols: cols
                     });
                 })
                 table.on('edit(adminTable)', function (obj) {
@@ -306,8 +342,7 @@
                             , content: "删除操作无法回滚，是否确认删除:" + obj.data.title
                             , btn: ['确认', '取消']
                             , yes: function (index) {
-                                $.post('/anim/rss/del.do', {id: obj.data.id}, function (data) {
-                                    let json = JSON.parse(data);
+                                $.post('/anim/rss/del.do', {id: obj.data.id}, function (json) {
                                     layer.msg(json.msg)
                                     layer.close(index)
                                 })
@@ -321,6 +356,15 @@
                         window.open("https://share.dmhy.org/topics/list?keyword=" + encodeURI(obj.data.titlekey))
                     } else if (obj.event === 'bgm_src') {
                         window.open("https://bgm.tv/subject/" + obj.data.bgmid)
+                    } else if (obj.event==='mikan'){
+                        console.log(getParam('bangumiId',obj.data.title))
+                        window.open('https://mikanani.me/Home/Bangumi/'+getParam('bangumiId',obj.data.title)+'#'+getParam('subgroupid',obj.data.title))
+                    } else if (obj.event==='tmp_rss_show'){
+                        window.open(obj.data.title)
+                    } else if (obj.event==='tmp_rss_del'){
+                        $.post('/anim/rss/del.do', {id: obj.data.title}, function (json) {
+                            layer.msg(json.msg)
+                        })
                     }
                 })
                 table.on('tool(rssTools)', function (obj) {
@@ -354,8 +398,7 @@
                                     , categories: data.categories[0]
                                     , titleKey: $('#title').val()
                                     , bid: tabid
-                                }, function (data) {
-                                    let json = JSON.parse(data);
+                                }, function (json) {
                                     layer.msg(json.msg)
                                     layer.close(index)
                                 })
@@ -456,7 +499,6 @@
 
     function setTitle(_this) {
         let url = "https://bgm.tv/subject_search/" + encodeURIComponent(_this.value) + "?cat=2"
-        console.log(url)
         $('#bgmUrl')[0].href = url;
     }
 
diff --git a/web/js/myjs.js b/web/js/myjs.js
index 52a9357..0c22325 100644
--- a/web/js/myjs.js
+++ b/web/js/myjs.js
@@ -102,7 +102,10 @@ function Base64() {
     }
 }
 function getParam(name){
-    let results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
+    return getParam(name,window.location.href)
+}
+function getParam(name,url){
+    let results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(url);
     if (results == null) {
         return null;
     } else {

From ffb9c8f161c62893cfebacf6457369a66cd3ad0c Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Sat, 16 Jul 2022 18:40:40 +0800
Subject: [PATCH 14/16] =?UTF-8?q?fix:=E7=99=BB=E9=99=86=E6=AD=BB=E5=BE=AA?=
 =?UTF-8?q?=E7=8E=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/html/body/nas/animrss.html | 4 ++--
 web/html/header.html           | 1 -
 web/js/myjs.js                 | 6 ++++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/web/html/body/nas/animrss.html b/web/html/body/nas/animrss.html
index f8913ba..a957090 100644
--- a/web/html/body/nas/animrss.html
+++ b/web/html/body/nas/animrss.html
@@ -357,8 +357,8 @@
                     } else if (obj.event === 'bgm_src') {
                         window.open("https://bgm.tv/subject/" + obj.data.bgmid)
                     } else if (obj.event==='mikan'){
-                        console.log(getParam('bangumiId',obj.data.title))
-                        window.open('https://mikanani.me/Home/Bangumi/'+getParam('bangumiId',obj.data.title)+'#'+getParam('subgroupid',obj.data.title))
+                        console.log(getParamToUrl('bangumiId',obj.data.title))
+                        window.open('https://mikanani.me/Home/Bangumi/'+getParamToUrl('bangumiId',obj.data.title)+'#'+getParamToUrl('subgroupid',obj.data.title))
                     } else if (obj.event==='tmp_rss_show'){
                         window.open(obj.data.title)
                     } else if (obj.event==='tmp_rss_del'){
diff --git a/web/html/header.html b/web/html/header.html
index b98a932..49640b1 100644
--- a/web/html/header.html
+++ b/web/html/header.html
@@ -66,7 +66,6 @@
     $.get("/login/check.do",{share:getParam("share")}, function (data) {
         try {
             let json = JSON.parse(data);
-            console.log(data)
             if (json.code === 0) {
                 $('#login_text').text('已登录')
                 loginStatus = true;
diff --git a/web/js/myjs.js b/web/js/myjs.js
index 0c22325..f42c536 100644
--- a/web/js/myjs.js
+++ b/web/js/myjs.js
@@ -102,9 +102,11 @@ function Base64() {
     }
 }
 function getParam(name){
-    return getParam(name,window.location.href)
+    let url=window.location.href;
+    return getParamToUrl(name,url)
 }
-function getParam(name,url){
+function getParamToUrl(name,url){
+    console.log(url)
     let results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(url);
     if (results == null) {
         return null;

From 760720a96c93a19112b2ac79ee1b7b13051e2cf0 Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Sat, 16 Jul 2022 21:06:04 +0800
Subject: [PATCH 15/16] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=B8=B4=E6=97=B6r?=
 =?UTF-8?q?ss=E6=B2=A1=E5=AE=9A=E4=B9=89=E6=A0=87=E9=A2=98=E5=92=8C?=
 =?UTF-8?q?=E5=AD=A3=E5=BA=A6=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E6=90=9C?=
 =?UTF-8?q?=E5=88=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/bangumi/AnimationController.java    |  2 +-
 .../tools/services/BangumiServiceImpl.java    |  6 +--
 web/html/body/nas/animrss.html                | 51 ++++++++++++++-----
 3 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/yutou/tools/bangumi/AnimationController.java b/src/main/java/com/yutou/tools/bangumi/AnimationController.java
index 25b8985..817f57c 100644
--- a/src/main/java/com/yutou/tools/bangumi/AnimationController.java
+++ b/src/main/java/com/yutou/tools/bangumi/AnimationController.java
@@ -89,7 +89,7 @@ public class AnimationController {
             BangumiItem item = new BangumiItem();
             item.setId(-1);
             item.setTitle(title);
-            item.setTitlekey(title.split("\\?")[1]);
+            item.setTitlekey(titleKey);
             i = bangumiService.addBangumiItem(item);
             json.put("msg", i == 0 ? "添加失败" : "添加成功");
             return json;
diff --git a/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java b/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
index f518029..29f7bea 100644
--- a/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
+++ b/src/main/java/com/yutou/tools/services/BangumiServiceImpl.java
@@ -1,5 +1,6 @@
 package com.yutou.tools.services;
 
+import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.mybatis.dao.BangumiItemDao;
 import com.yutou.tools.mybatis.dao.BangumiListDao;
@@ -39,7 +40,7 @@ public class BangumiServiceImpl implements BangumiService {
     public int addBangumiItem(BangumiItem... list) {
         for (BangumiItem item : list) {
             if (item.getId().equals(-1)) {
-                RedisTools.list_add("anim_tmp_rss",item.getTitle());
+                RedisTools.list_add("anim_tmp_rss", JSON.toJSON(item).toString());
             } else if (itemDao.insert(item) <= 0) {
                 return 0;
             }
@@ -77,8 +78,7 @@ public class BangumiServiceImpl implements BangumiService {
             Set<String> strings = RedisTools.list_get("anim_tmp_rss");
             items=new ArrayList<>();
             for (String string : strings) {
-                BangumiItem item=new BangumiItem();;
-                item.setTitle(string);
+                BangumiItem item=JSON.parseObject(string, BangumiItem.class);
                 items.add(item);
             }
             return items;
diff --git a/web/html/body/nas/animrss.html b/web/html/body/nas/animrss.html
index a957090..b9eea5b 100644
--- a/web/html/body/nas/animrss.html
+++ b/web/html/body/nas/animrss.html
@@ -208,20 +208,43 @@
         }
     })
     function addTmpRss(def) {
-        layer.prompt({
-            formType: 0,
-            value: '',
-            title: '请输入RSS地址'
-        }, function(value, index, elem){
-            $.post('/anim/rss/add.do',{
-                title: value,
-                bid:-1
-            },function (json) {
-                console.log(json)
-                layer.msg(json.msg)
-                layer.close(index);
-            })
-        });
+        let option = '';
+        for (let i = 0; i < 20; i++) {
+            if (i === 1) {
+                option += '<option selected>' + i + '</option>'
+            } else {
+                option += '<option>' + i + '</option>'
+            }
+        }
+        let html = '<form class="layui-form">标题:<div class="layui-form-item"><input type="text" id="anim_rss_title" required  lay-verify="required" placeholder="请输入标题" autocomplete="off" class="layui-input">URL:<textarea  class="layui-textarea" id="rss_value""></textarea> 季度:<select lay-search lay-verify="required" id="rss_select">' + option + '</select> </div></form>'
+        layer.open({
+            type: 0,
+            area: ['500px', '600px'],
+            title: '请输入RSS地址',
+            content: html,
+            success: function () {
+                layui.use(['form'], function () {
+                    layui.form.render('select');
+                })
+            },
+            cancel :function (index){
+              layer.close(index)
+            },
+            yes: function (index, elem) {
+                let url = $('#rss_value')[0].value
+                let title = $('#anim_rss_title')[0].value+ '/Season ' + $('#rss_select')[0].value
+
+                $.post("/anim/rss/add.do", {
+                    title: url
+                    , titleKey: title
+                    , bid: -1
+                }, function (json) {
+                    layer.msg(json.msg)
+                    layer.close(index)
+                })
+            }
+        })
+
     }
     layui.use(['layer', 'form', 'element', 'table', 'util'], function () {
         let layer = layui.layer

From 62831348e433d344ba68890063b3c026bc344327 Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Sun, 17 Jul 2022 16:22:48 +0800
Subject: [PATCH 16/16] =?UTF-8?q?add:=E6=96=B0=E5=A2=9E=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=8A=A8=E7=94=BB=E9=80=89=E9=A1=B9=EF=BC=88?=
 =?UTF-8?q?=E5=90=B8=E9=99=84=E4=BA=8E=E5=B7=B2=E6=B3=A8=E5=86=8C=E5=8A=A8?=
 =?UTF-8?q?=E7=94=BB=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/bangumi/AnimationController.java    | 38 +++++++++++++++++-
 .../yutou/tools/bangumi/AnimationData.java    |  2 +-
 web/html/body/nas/animrss.html                | 39 +++++++++++++++++--
 3 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/yutou/tools/bangumi/AnimationController.java b/src/main/java/com/yutou/tools/bangumi/AnimationController.java
index 817f57c..5ab31fe 100644
--- a/src/main/java/com/yutou/tools/bangumi/AnimationController.java
+++ b/src/main/java/com/yutou/tools/bangumi/AnimationController.java
@@ -5,8 +5,10 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.yutou.tools.mybatis.model.BangumiItem;
 import com.yutou.tools.mybatis.model.BangumiList;
+import com.yutou.tools.nas.UpdateIp;
 import com.yutou.tools.services.interfaces.BangumiService;
 import com.yutou.tools.utils.BangumiTools;
+import com.yutou.tools.utils.HttpTools;
 import com.yutou.tools.utils.RedisTools;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.StringUtils;
@@ -15,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Objects;
 
@@ -130,7 +133,7 @@ public class AnimationController {
     public JSONObject delAnimation(String id) {
         JSONObject json = new JSONObject();
         json.put("code", 0);
-        if (id.startsWith("http")) {
+        if (id.startsWith("{")) {
             boolean tmpRss = RedisTools.list_remove("anim_tmp_rss", id);
             json.put("msg", tmpRss ? "删除成功" : "删除失败");
             return json;
@@ -196,4 +199,37 @@ public class AnimationController {
     public JSONObject getToDayAnim() {
         return BangumiTools.getBangumi(0);
     }
+
+    @ResponseBody
+    @RequestMapping(value = "/anim/setDownload.do", method = RequestMethod.POST)
+    public JSONObject setDownload(int id, String url) {
+        String serverUrl = "http://" + UpdateIp.nas_ip + ":8000/bt/download.do";
+        JSONObject json = new JSONObject();
+        json.put("id", id);
+        json.put("url", url);
+        String post = HttpTools.post(serverUrl, HttpTools.toUrlParams(json).getBytes(StandardCharsets.UTF_8));
+        json.clear();
+        json.put("code", 0);
+        json.put("msg", post);
+        return json;
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/anim/rssdata.do", method = RequestMethod.POST)
+    public JSONObject getRssData(int id) {
+        JSONObject json = new JSONObject();
+        BangumiItem item = bangumiService.getBangumiItem(id);
+        if (item != null) {
+            String key = item.getTitle().split("/")[0];
+            AnimationData animationData = new AnimationData();
+            JSONArray array = animationData.bangumiList(1, "0", "0", ","+key.replace(" ","+"));
+            json.put("code",0);
+            json.put("data", array);
+            json.put("msg","ok");
+        }else{
+            json.put("code",-1);
+            json.put("msg","id错误");
+        }
+        return json;
+    }
 }
diff --git a/src/main/java/com/yutou/tools/bangumi/AnimationData.java b/src/main/java/com/yutou/tools/bangumi/AnimationData.java
index d742f29..c280044 100644
--- a/src/main/java/com/yutou/tools/bangumi/AnimationData.java
+++ b/src/main/java/com/yutou/tools/bangumi/AnimationData.java
@@ -10,7 +10,7 @@ public class AnimationData {
     private String rss2jsonApi_1="wtfm5pebya13pnl8rtu51wfgfpte0mb9sap1foll";
     private String rss2jsonApi_2="z2s7zyzxvrsjz9vh5alvq3lxdypzykly2nnvqpdx";
     private String rss2jsonUrl = "https://api.rss2json.com/v1/api.json?rss_url=";
-    private String animUrl = "http://share.dmhy.org/topics/rss/page/%s/rss.xml?keyword=%s&sort_id=%s&order=date-desc";
+    private String animUrl = "https://share.dmhy.org/topics/rss/page/%s/rss.xml?keyword=%s&sort_id=%s&order=date-desc";
     private String team="[{\"0\":\"全部\"},{\"117\":\"動漫花園\"},{\"669\":\"喵萌奶茶屋\"},{\"648\":\"魔星字幕团\"},{\"185\":\"极影字幕社\"},{\"619\":\"桜都字幕组\"},{\"604\":\"lleeopen\"},{\"241\":\"幻樱字幕组\"},{\"151\":\"悠哈C9字幕社\"},{\"657\":\"LoliHouse\"},{\"283\":\"千夏字幕组\"},{\"755\":\"GMTeam\"},{\"390\":\"天使动漫\"},{\"731\":\"星空字幕组\"},{\"303\":\"动漫国字幕组\"},{\"563\":\"花園壓制組\"},{\"37\":\"雪飄工作室(FLsnow)\"},{\"47\":\"爱恋字幕社\"},{\"710\":\"咪梦动漫组\"},{\"88\":\"动音漫影\"},{\"574\":\"梦蓝字幕组\"},{\"504\":\"LoveEcho!\"},{\"765\":\"爱咕字幕组\"},{\"520\":\"豌豆字幕组\"},{\"650\":\"SweetSub\"},{\"430\":\"幻之字幕组\"},{\"407\":\"DHR動研字幕組\"},{\"321\":\"轻之国度\"},{\"581\":\"VCB-Studio\"},{\"703\":\"届恋字幕组\"},{\"576\":\"银色子弹字幕组\"},{\"454\":\"风车字幕组\"},{\"485\":\"天空树双语字幕组\"},{\"134\":\"漫游字幕组\"},{\"434\":\"风之圣殿\"},{\"630\":\"枫叶字幕组\"},{\"228\":\"KRL字幕组\"},{\"526\":\"东京不够热\"},{\"592\":\"未央阁联盟\"},{\"288\":\"诸神kamigami字幕组\"},{\"767\":\"天月動漫&發佈組\"},{\"768\":\"千歲字幕組\"},{\"423\":\"漫貓字幕組\"},{\"562\":\"129.3字幕組\"},{\"447\":\"夢幻戀櫻\"},{\"680\":\"Little字幕组\"},{\"641\":\"冷番补完字幕组\"},{\"31\":\"卡通空間\"},{\"649\":\"云光字幕组\"},{\"701\":\"狐狸小宮\"},{\"459\":\"紫音動漫&發佈組\"},{\"699\":\"小花花同盟戰線\"},{\"626\":\"驯兽师联盟\"},{\"58\":\"澄空学园\"},{\"769\":\"动漫萌\"},{\"734\":\"TD-RAWS\"},{\"225\":\"鈴風字幕組\"},{\"673\":\"VRAINSTORM\"},{\"741\":\"銀月字幕組\"},{\"675\":\"AikatsuFans\"},{\"759\":\"红鸟窝字幕组\"},{\"764\":\"MCE汉化组\"},{\"391\":\"ZERO字幕组\"},{\"561\":\"钉铛字幕组\"},{\"727\":\"2B4B\"},{\"104\":\"动漫先锋\"},{\"567\":\"雪梦字幕组\"},{\"573\":\"Centaurea-Raws\"},{\"652\":\"SFEO-Raws\"},{\"666\":\"中肯字幕組\"},{\"754\":\"BYYM发布组\"},{\"613\":\"AI-Raws\"},{\"706\":\"K&W-RAWS\"},{\"732\":\"肥猫压制\"},{\"424\":\"TSDM字幕組\"},{\"739\":\"Clarita 压制组\"},{\"432\":\"自由字幕组\"},{\"217\":\"AQUA工作室\"},{\"753\":\"柠檬水字幕组\"},{\"763\":\"光之家族字幕组\"},{\"332\":\"CureSub\"},{\"537\":\"NEO·QSW\"},{\"632\":\"歐克勒亞\"},{\"548\":\"Cornflower Studio\"},{\"638\":\"LittleBakas!\"}]";
     private String type="[{\"0\":\"全部\"},{\"2\":\"動畫\"},{\"31\":\"季度全集\"},{\"3\":\"漫畫\"},{\"41\":\"港台原版\"},{\"42\":\"日文原版\"},{\"4\":\"音樂\"},{\"43\":\"動漫音樂\"},{\"44\":\"同人音樂\"},{\"15\":\"流行音樂\"},{\"6\":\"日劇\"},{\"7\":\"ＲＡＷ\"},{\"9\":\"遊戲\"},{\"17\":\"電腦遊戲\"},{\"18\":\"電視遊戲\"},{\"19\":\"掌機遊戲\"},{\"20\":\"網絡遊戲\"},{\"21\":\"遊戲周邊\"},{\"12\":\"特攝\"},{\"1\":\"其他\"}]";
 
diff --git a/web/html/body/nas/animrss.html b/web/html/body/nas/animrss.html
index b9eea5b..79a0486 100644
--- a/web/html/body/nas/animrss.html
+++ b/web/html/body/nas/animrss.html
@@ -171,6 +171,7 @@
     <a class="layui-btn layui-btn-warm　layui-btn-xs" lay-event="src">原地址</a>
     <a class="layui-btn layui-btn-warm　layui-btn-xs" lay-event="bgm_src">番剧计划</a>
     <a class="layui-btn layui-btn-xs" lay-event="show">查看</a>
+    <a class="layui-btn layui-btn-xs  layui-btn-normal" lay-event="down">手动下载</a>
     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
 </script>
 <script type="text/html" id="RsslistTools">
@@ -384,10 +385,36 @@
                         window.open('https://mikanani.me/Home/Bangumi/'+getParamToUrl('bangumiId',obj.data.title)+'#'+getParamToUrl('subgroupid',obj.data.title))
                     } else if (obj.event==='tmp_rss_show'){
                         window.open(obj.data.title)
-                    } else if (obj.event==='tmp_rss_del'){
-                        $.post('/anim/rss/del.do', {id: obj.data.title}, function (json) {
+                    } else if (obj.event === 'tmp_rss_del'){
+                        $.post('/anim/rss/del.do', {id: JSON.stringify(obj.data)}, function (json) {
                             layer.msg(json.msg)
                         })
+                    } else if(obj.event === 'down'){
+                        let index=layer.load()
+                        $.post('/anim/rssdata.do',{id:obj.data.id},function (json) {
+                            layer.close(index)
+                            if(json.code!==0){
+                                layer.msg(json.msg)
+                                return;
+                            }
+                            let html = '<table class="layui-table"> <colgroup> <col width="150" /> <col width="200" /> <col /> </colgroup> <thead> <tr> <th width="200">标题</th> <th>更新时间</th> <th>图片</th> <th>地址</th> </tr> </thead> <tbody> </tbody>'
+                            json.data.forEach((item) => {
+                                let name = item.title
+                                let img='#'
+                                if(item.thumbnail!=null){
+                                    img=item.thumbnail
+                                }
+                                html += '<tr><td>' + name + '</td><td>' + item.pubDate + '</td><td><img src="' + img + '"></td><td><a href="javascript:sendDownload('+obj.data.id+',\''+item.enclosure.link+'\')">下载这个</a></td></tr>'
+                            })
+                            html += "</table>"
+                            layer.open({
+                                title: '手动下载',
+                                area: ['800px', '600px'],
+                                content: html,
+                                shade: 0
+                            });
+
+                        })
                     }
                 })
                 table.on('tool(rssTools)', function (obj) {
@@ -492,7 +519,6 @@
         function showToDayAnim() {
             $.get("/anim/getToDay.do", function (json) {
                 let items = json.items;
-                let _tab = []
                 let html = '<table class="layui-table"> <colgroup> <col width="150" /> <col width="200" /> <col /> </colgroup> <thead> <tr> <th>标题</th> <th>首更时间</th> <th>图片</th> <th>地址</th> </tr> </thead> <tbody> </tbody>'
                 items.forEach((item) => {
                     let name = item.name_cn
@@ -504,7 +530,6 @@
                         img=item.images.small
                     }
                     html += '<tr><td>' + name + '</td><td>' + item.air_date + '</td><td><img src="' + img + '"></td><td><a href="' + item.url + '" target="_blank">前往番剧计划</a></td></tr>'
-                    _tab.push({title: item.name, url: '<a href="' + item.url + '">前往番剧计划</a>'})
                 })
                 html += "</table>"
                 layer.open({
@@ -524,6 +549,12 @@
         let url = "https://bgm.tv/subject_search/" + encodeURIComponent(_this.value) + "?cat=2"
         $('#bgmUrl')[0].href = url;
     }
+    function sendDownload(id, url) {
+        console.log("id = "+id +" url = "+url);
+        $.post("/anim/setDownload.do",{id:id,url:url},function (json) {
+            layer.msg(json.msg)
+        })
+    }
 
 </script>
 </body>