Merge branch 'release/0.3.2'

RayWangQvQ · Dec 14, 2022 · 36f4ea1 · 36f4ea1
2 parents 91c7c7c + 4f117a9
commit 36f4ea1
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -367,4 +367,4 @@ bilipro
 kustomization.yaml
 
 # cookie config
-cookies.json
+**/Ray.BiliBiliTool.Console/cookies.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -74,5 +74,7 @@
 - Fix( #260 )，在需要的时候encode cookie
 - 更新文档
 ## 0.3.2
-- Fix( #358 )，获取auth时兼容老板青龙文件路径
-- Fix( #364 )，兼容青龙异性response数据类型
+- Fix( #358 )，获取auth时兼容老版青龙文件路径
+- Fix( #364 )，兼容青龙异形response数据类型
+- Fix( #366 #361 )，修复一些低级bug
+- Feature( #359 )，兼容读取不到`$QL_DIR`的情况
diff --git a/docker/sample/cookies.json b/docker/sample/cookies.json
@@ -0,0 +1,4 @@
+{
+    "BiliBiliCookies": [
+  ],
+}
diff --git a/qinglong/DefaultTasks/bili_task_base.sh b/qinglong/DefaultTasks/bili_task_base.sh
@@ -2,7 +2,7 @@
 # new Env("bili_base")
 # cron 0 0 1 1 * bili_base.sh
 
-dir_shell=$QL_DIR/shell
+dir_shell=${QL_DIR-'/ql'}/shell
 . $dir_shell/share.sh
 
 ## 安装dotnet

diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_base.sh b/qinglong/DefaultTasks/dev/bili_dev_task_base.sh
@@ -2,7 +2,7 @@
 # new Env("bili_dev_task_base")
 # cron 0 0 1 1 * bili_dev_task_base.sh
 
-dir_shell=$QL_DIR/shell
+dir_shell=${QL_DIR-'/ql'}/shell
 . $dir_shell/share.sh
 
 ## 安装dotnet

diff --git a/src/Ray.BiliBiliTool.Application/LoginTaskAppService.cs b/src/Ray.BiliBiliTool.Application/LoginTaskAppService.cs
@@ -220,7 +220,7 @@ protected void AddOrUpdateCkToQingLong(BiliCookie ckInfo)
                 return;
             }
 
-            var list = re.Data.Where(x=>x.name.StartsWith("Ray_BiliBiliCookies__"));
+            var list = re.Data.Where(x => x.name.StartsWith("Ray_BiliBiliCookies__")).ToList();
             QingLongEnv oldEnv = list.FirstOrDefault(x => x.value.Contains(ckInfo.UserId));
 
             if (oldEnv != null)
@@ -245,13 +245,17 @@ protected void AddOrUpdateCkToQingLong(BiliCookie ckInfo)
             }
 
             _logger.LogInformation("用户不存在，新增cookie");
-            var lastNum = list.Select(x =>
+            var maxNum = -1;
+            if (list.Any())
             {
-                var num = x.name.Replace("Ray_BiliBiliCookies__","");
-                var parseSuc= int.TryParse(num, out int envNum);
-                return parseSuc ? envNum : 0;
-            }).MaxBy(x=>x);
-            var name = $"Ray_BiliBiliCookies__{lastNum + 1}";
+                maxNum = list.Select(x =>
+                {
+                    var num = x.name.Replace("Ray_BiliBiliCookies__", "");
+                    var parseSuc = int.TryParse(num, out int envNum);
+                    return parseSuc ? envNum : 0;
+                }).Max();
+            }
+            var name = $"Ray_BiliBiliCookies__{maxNum + 1}";
             _logger.LogInformation("Key：{key}", name);
 
             var add = new AddQingLongEnv()
@@ -378,7 +382,7 @@ private bool GetToken(out string token)
 
             var qlDir = _configuration["QL_DIR"] ?? "/ql";
 
-            string authFile= qlDir;
+            string authFile = qlDir;
             if (_hostingEnvironment.ContentRootPath.Contains($"{qlDir}/data/"))
             {
                 authFile = Path.Combine(authFile, "data");