Merge branch 'release/0.3.2'

RayWangQvQ · Dec 13, 2022 · 91c7c7c · 91c7c7c
2 parents b4e0f8f + 2512965
commit 91c7c7c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -74,4 +74,5 @@
 - Fix( #260 )，在需要的时候encode cookie
 - 更新文档
 ## 0.3.2
-- Fix( #358 )，兼容老板青龙
+- Fix( #358 )，获取auth时兼容老板青龙文件路径
+- Fix( #364 )，兼容青龙异性response数据类型
diff --git a/src/Ray.BiliBiliTool.Agent/QingLong/IQingLongApi.cs b/src/Ray.BiliBiliTool.Agent/QingLong/IQingLongApi.cs
@@ -33,7 +33,7 @@ public class QingLongEnv : UpdateQingLongEnv
     {
         public string timestamp { get; set; }
         public int status { get; set; }
-        public long position { get; set; }
+        //public long position { get; set; }
         public DateTime createdAt { get; set; }
         public DateTime updatedAt { get; set; }
     }

diff --git a/src/Ray.BiliBiliTool.Application/LoginTaskAppService.cs b/src/Ray.BiliBiliTool.Application/LoginTaskAppService.cs
@@ -220,12 +220,13 @@ protected void AddOrUpdateCkToQingLong(BiliCookie ckInfo)
                 return;
             }
 
-            var list = re.Data.OrderBy(x => x.id);
+            var list = re.Data.Where(x=>x.name.StartsWith("Ray_BiliBiliCookies__"));
             QingLongEnv oldEnv = list.FirstOrDefault(x => x.value.Contains(ckInfo.UserId));
 
             if (oldEnv != null)
             {
                 _logger.LogInformation("用户已存在，更新cookie");
+                _logger.LogInformation("Key：{key}", oldEnv.name);
                 var update = new UpdateQingLongEnv()
                 {
                     id = oldEnv.id,
@@ -244,12 +245,14 @@ protected void AddOrUpdateCkToQingLong(BiliCookie ckInfo)
             }
 
             _logger.LogInformation("用户不存在，新增cookie");
-            var lastNum = list.LastOrDefault()
-                ?.name
-                .Split("__")
-                .LastOrDefault();
-            var newNum = int.Parse(lastNum ?? "-1") + 1;
-            var name = $"Ray_BiliBiliCookies__{newNum}";
+            var lastNum = list.Select(x =>
+            {
+                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}";
+            _logger.LogInformation("Key：{key}", name);
 
             var add = new AddQingLongEnv()
             {