Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.obsidian/workspace.json

.obsidian/workspace.json

@@ -23,8 +23,23 @@
               "icon": "lucide-layout-dashboard",
               "title": "程序流程"
             }
+          },
+          {
+            "id": "be325661064ffa7e",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "conflict-files-obsidian-git"
             }
-        ]
+          }
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -183,8 +198,12 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "a2404aeeee3f06b6",
+  "active": "be325661064ffa7e",
   "lastOpenFiles": [
+    "InterestingStuffs/剧自动化获取任务+下载素材+制作+上传/程序流程.canvas",
+    "conflict-files-obsidian-git.md",
+    "多体调研/sci论文框架.canvas",
+    "多体调研",
     "力学书籍/Kane-Dynamics-Theory-Applications/auto/images/ffe65c0c86b13fd30ed92c751342ebe6350a2b58b31bb1a573536bd5ce43d368.jpg",
     "力学书籍/Kane-Dynamics-Theory-Applications/auto/images/fdc5aa0a435ca87cf186e6a0cbaf8daa8692d94131d2937f3333d9308bbd941e.jpg",
     "力学书籍/Kane-Dynamics-Theory-Applications/auto/images/fcbf7aac6924953f01ba3897bd676babfbae320e1a2c15f31c6e746bd899e758.jpg",
@@ -195,7 +214,6 @@
     "力学书籍/Kane-Dynamics-Theory-Applications/auto/images/ef2e92b79733761816b6bd712a35645b725cb7ec4179cde692f0cfe61065c7bc.jpg",
     "力学书籍/Kane-Dynamics-Theory-Applications/auto/images/ed927e3c9d3bf9bbb9b20a2fbbec296c575c157069c52b4988328831bc9220dd.jpg",
     "力学书籍/Kane-Dynamics-Theory-Applications/auto/images/e817d3a827d0df38377fcf444554ce72096e806c70508848432514b3b3511af5.jpg",
-    "力学书籍/Kane-Dynamics-Theory-Applications/auto/images/e80464755887cfa82ba46d5fc0b72305c41d5a30e8c55fa8f210a2ea72c4b35e.jpg",
     "力学书籍/Kane-Dynamics-Theory-Applications/auto/images",
     "力学书籍/Kane-Dynamics-Theory-Applications/auto/Kane-Dynamics-Theory-Applications_origin.pdf",
     "力学书籍/Kane-Dynamics-Theory-Applications/auto/Kane-Dynamics-Theory-Applications_model.json",
@@ -206,15 +224,12 @@
     "力学书籍/Kane-Dynamics-Theory-Applications",
     "InterestingStuffs/本地知识库+大模型/ollama 设置模型上下文大小.md",
     "InterestingStuffs/本地知识库+大模型/deepSeek Api Key.md",
-    "InterestingStuffs/剧自动化获取任务+下载素材+制作+上传/程序流程.canvas",
     "InterestingStuffs/本地知识库+大模型",
     "InterestingStuffs/剧自动化获取任务+下载素材+制作+上传",
-    "InterestingStuffs",
     "多体+耦合求解器/数据结构讨论.md",
     "多体求解器debug/多体+气动 转速 debug.md",
     "多体求解器debug/多体+水动 platform+tower debug.md",
     "力学书籍/理论力学Ⅰ(第8版) (哈尔滨工业大学理论力学教研室) (Z-Library)/auto/理论力学Ⅰ(第8版) (哈尔滨工业大学理论力学教研室) (Z-Library).md",
-    "conflict-files-obsidian-git.md",
     "Ai/ollama 设置模型上下文大小.md",
     "力学书籍/结构动力学 (R. 克拉夫，J. 彭津) (Z-Library)/auto/结构动力学 (R. 克拉夫，J. 彭津) (Z-Library).md",
     "力学书籍/结构力学Ⅰ（基础教程） (龙驭球、包世华、袁驷) (Z-Library)/auto/结构力学Ⅰ（基础教程） (龙驭球、包世华、袁驷) (Z-Library).md",

InterestingStuffs/剧自动化获取任务+下载素材+制作+上传/程序流程.canvas

@@ -1,23 +1,29 @@
 {
 	"nodes":[
-		{"id":"4250f79d778b5364","type":"text","text":"星图网页，任务时间开始时间降序排列","x":-400,"y":240,"width":250,"height":60},
+		{"id":"8fe0adf04ce0d8c2","type":"text","text":"获取**当天**任务","x":-400,"y":80,"width":250,"height":60},
-		{"id":"8fe0adf04ce0d8c2","type":"text","text":"获取任务","x":-400,"y":80,"width":250,"height":60},
-		{"id":"69573a1cc1c63eba","type":"text","text":"可以本页全获取","x":-400,"y":400,"width":250,"height":60},
-		{"id":"4af7195c0716ea03","type":"text","text":"任务开始，点击进入单个任务详情，获取信息+素材","x":200,"y":80,"width":280,"height":60},
-		{"id":"210b409cc6c143e6","type":"text","text":"Class\n剧名\n剧场\n素材链接\n发表要求\n封面jpg","x":560,"y":15,"width":250,"height":190},
 		{"id":"b671a458da3e722d","type":"text","text":"任务安排","x":-100,"y":80,"width":250,"height":60},
-		{"id":"f1a6c858d37f1304","type":"text","text":"例如：每小时发一个剧，每个剧发3个视频","x":-100,"y":240,"width":250,"height":60},
+		{"id":"4250f79d778b5364","type":"text","text":"星图网页，任务时间开始时间降序排列","x":-400,"y":175,"width":250,"height":60},
-		{"id":"52a68e10b5ed9ac6","type":"text","text":"自动化过程，不与本机正常使用冲突\n- docker ？ 如何实现不影响\n- 无头模式 （cookie失效，需要显示窗口再登陆）","x":-400,"y":520,"width":345,"height":160},
+		{"id":"6ebf0df69dc10018","x":-400,"y":360,"width":250,"height":60,"type":"text","text":"第二页信息抓取"},
-		{"id":"ff0858dd4aa9c151","type":"text","text":"对一个剧首次：\n- 百度网盘素材添加和下载\n- 分析高光时刻，得到能生成几个视频 作为本剧视频数\n\n根据任务安排生成视频","x":900,"y":-17,"width":250,"height":255},
+		{"id":"c02a7bb0e0e301a7","x":-400,"y":270,"width":250,"height":60,"type":"text","text":"重合剔除"},
-		{"id":"2c43079140e74206","x":1260,"y":80,"width":250,"height":60,"type":"text","text":"发布过程"}
+		{"id":"f1a6c858d37f1304","type":"text","text":"例如：每小时发一个剧，每个剧发3个视频","x":-100,"y":360,"width":250,"height":60},
+		{"id":"75a8182ceea075c0","x":-100,"y":270,"width":250,"height":60,"type":"text","text":"做一个从素材数据库删除一个 或添加到完成数据库"},
+		{"id":"1be83a74a3da4208","x":-100,"y":161,"width":250,"height":88,"type":"text","text":"当天任务 按照开始时间 前几个+前天任务后几个 6 4"},
+		{"id":"52a68e10b5ed9ac6","type":"text","text":"自动化过程，不与本机正常使用冲突\n- docker ？ 如何实现不影响\n- 无头模式 （cookie失效，需要显示窗口再登陆）","x":-575,"y":880,"width":345,"height":160},
+		{"id":"548efc71081e36d6","x":-150,"y":880,"width":250,"height":160,"type":"text","text":"辅助功能：\n- 定期删除无用素材"},
+		{"id":"cdd1884827a50f05","x":180,"y":1100,"width":250,"height":60,"type":"text","text":"todo\n过验证码"},
+		{"id":"210b409cc6c143e6","type":"text","text":"Class\n剧名\n剧场\n素材链接\n话题\n封面jpg","x":-400,"y":520,"width":250,"height":190},
+		{"id":"ff0858dd4aa9c151","type":"text","text":"对一个剧首次：\n- 百度网盘素材添加和下载\n- 分析高光时刻，得到能生成几个视频 作为本剧视频数\n\n根据任务安排生成视频","x":440,"y":-17,"width":250,"height":255},
+		{"id":"2c43079140e74206","type":"text","text":"发布过程","x":800,"y":80,"width":250,"height":60},
+		{"id":"a64898985c682307","x":180,"y":860,"width":330,"height":200,"type":"text","text":"改进：\n- 根据完成数据库\n- 监控播放数据\n- 根据播放数据，增加火爆视频的跟发"},
+		{"id":"308ca7cba9848a9a","x":440,"y":-680,"width":520,"height":540,"type":"text","text":"百度网盘里的内容类型\n- .mp4视频+jpg\n- - .mp4视频+jpg+特别版文件夹\n- 好几个版本文件夹 匠心短剧\n\t  - 完整版\n\t  - 无字幕版\n\t  - 无BGM版\n\t  - 封面\n\t    \n\n\n没有视频的 文件名与剧名不对的\n\n删除任务 递补"}
 	],
 	"edges":[
 		{"id":"bdea2d039e30f024","fromNode":"8fe0adf04ce0d8c2","fromSide":"bottom","toNode":"4250f79d778b5364","toSide":"top"},
-		{"id":"60089f7e8aacdb29","fromNode":"4af7195c0716ea03","fromSide":"right","toNode":"210b409cc6c143e6","toSide":"left"},
 		{"id":"b138bf1a3118f584","fromNode":"8fe0adf04ce0d8c2","fromSide":"right","toNode":"b671a458da3e722d","toSide":"left"},
-		{"id":"9b5e96c425967324","fromNode":"b671a458da3e722d","fromSide":"right","toNode":"4af7195c0716ea03","toSide":"left"},
+		{"id":"197d9780b0fdf2ae","fromNode":"ff0858dd4aa9c151","fromSide":"right","toNode":"2c43079140e74206","toSide":"left"},
-		{"id":"ecd63ce6c42daf60","fromNode":"210b409cc6c143e6","fromSide":"right","toNode":"ff0858dd4aa9c151","toSide":"left"},
+		{"id":"2584e6b85dec7b7f","fromNode":"4250f79d778b5364","fromSide":"bottom","toNode":"c02a7bb0e0e301a7","toSide":"top"},
-		{"id":"3715402aa802b1af","fromNode":"b671a458da3e722d","fromSide":"bottom","toNode":"f1a6c858d37f1304","toSide":"top"},
+		{"id":"e30a6d6d69948893","fromNode":"c02a7bb0e0e301a7","fromSide":"bottom","toNode":"6ebf0df69dc10018","toSide":"top"},
-		{"id":"197d9780b0fdf2ae","fromNode":"ff0858dd4aa9c151","fromSide":"right","toNode":"2c43079140e74206","toSide":"left"}
+		{"id":"b89c688915356d6e","fromNode":"6ebf0df69dc10018","fromSide":"bottom","toNode":"210b409cc6c143e6","toSide":"top"},
+		{"id":"37313a8638196d3e","fromNode":"b671a458da3e722d","fromSide":"right","toNode":"ff0858dd4aa9c151","toSide":"left"}
 	]
 }

多体调研/sci论文框架.canvas

@@ -0,0 +1,12 @@
+{
+	"nodes":[
+		{"id":"6d12fb5213e6a1de","x":-280,"y":-160,"width":250,"height":60,"type":"text","text":"1、框架"},
+		{"id":"05d5cbf98dcead2e","x":80,"y":-160,"width":250,"height":60,"type":"text","text":"包含哪些内容"},
+		{"id":"71b9ceed7e6258dc","x":-280,"y":60,"width":250,"height":60,"type":"text","text":"2、体量"},
+		{"id":"1b08e6b52bc2fb50","x":80,"y":60,"width":250,"height":60,"type":"text","text":"写多少"}
+	],
+	"edges":[
+		{"id":"0c8ef40b1fc32434","fromNode":"6d12fb5213e6a1de","fromSide":"right","toNode":"05d5cbf98dcead2e","toSide":"left"},
+		{"id":"a6261bc1c3f5d650","fromNode":"71b9ceed7e6258dc","fromSide":"right","toNode":"1b08e6b52bc2fb50","toSide":"left"}
+	]
+}