Merge pull request #906 from RayWangQvQ/feature/842-qinglong-api

[#842] Integrate new QingLong OpenAPI to add bili cookie autumatically

Author: RayWangQvQ

CHANGELOG.md

@@ -1,3 +1,5 @@
+## 3.0.6
+- Feature[#842]: 对接青龙新的OpenAPI，实现青龙版Bili登录后自动存储Cookie
 ## 3.0.5
 - Fix: Bruno 脚本错误
 ## 3.0.4

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Authors>Ray</Authors>
-    <Version>3.0.5</Version>
+    <Version>3.0.6</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
   </PropertyGroup>
 </Project>

src/Ray.BiliBiliTool.Agent/QingLong/Dtos/AddQingLongEnv.cs

@@ -0,0 +1,8 @@
+namespace Ray.BiliBiliTool.Agent.QingLong.Dtos;
+
+public class AddQingLongEnv
+{
+    public string value { get; set; }
+    public string name { get; set; }
+    public string remarks { get; set; }
+}

src/Ray.BiliBiliTool.Agent/QingLong/Dtos/QingLongEnv.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace Ray.BiliBiliTool.Agent.QingLong.Dtos;
+
+public class QingLongEnv : UpdateQingLongEnv
+{
+    public string timestamp { get; set; }
+    public int status { get; set; }
+
+    //public long position { get; set; }
+    public DateTime createdAt { get; set; }
+    public DateTime updatedAt { get; set; }
+}

src/Ray.BiliBiliTool.Agent/QingLong/Dtos/QingLongGenericResponse.cs

@@ -0,0 +1,8 @@
+namespace Ray.BiliBiliTool.Agent.QingLong.Dtos;
+
+public class QingLongGenericResponse<T>
+{
+    public int Code { get; set; }
+
+    public T Data { get; set; }
+}

src/Ray.BiliBiliTool.Agent/QingLong/Dtos/TokenResponse.cs

@@ -0,0 +1,8 @@
+namespace Ray.BiliBiliTool.Agent.QingLong.Dtos;
+
+public class TokenResponse
+{
+    public string token { get; set; }
+
+    public string token_type { get; set; }
+}

src/Ray.BiliBiliTool.Agent/QingLong/Dtos/UpdateQingLongEnv.cs

@@ -0,0 +1,6 @@
+namespace Ray.BiliBiliTool.Agent.QingLong.Dtos;
+
+public class UpdateQingLongEnv : AddQingLongEnv
+{
+    public long id { get; set; }
+}

src/Ray.BiliBiliTool.Agent/QingLong/IQingLongApi.cs

@@ -1,58 +1,35 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Ray.BiliBiliTool.Agent.Attributes;
+using Ray.BiliBiliTool.Agent.QingLong.Dtos;
 using WebApiClientCore.Attributes;
 
 namespace Ray.BiliBiliTool.Agent.QingLong;
 
 [LogFilter]
 public interface IQingLongApi
 {
-    [HttpGet("/api/envs")]
-    Task<QingLongGenericResponse<List<QingLongEnv>>> GetEnvs(
+    [HttpGet("/open/auth/token")]
+    Task<QingLongGenericResponse<TokenResponse>> GetTokenAsync(
+        string client_id,
+        string client_secret
+    );
+
+    [HttpGet("/open/envs")]
+    Task<QingLongGenericResponse<List<QingLongEnv>>> GetEnvsAsync(
         string searchValue,
         [Header("Authorization")] string token
     );
 
-    [HttpPost("/api/envs")]
-    Task<QingLongGenericResponse<List<QingLongEnv>>> AddEnvs(
+    [HttpPost("/open/envs")]
+    Task<QingLongGenericResponse<List<QingLongEnv>>> AddEnvsAsync(
         [JsonContent] List<AddQingLongEnv> envs,
         [Header("Authorization")] string token
     );
 
-    [HttpPut("/api/envs")]
-    Task<QingLongGenericResponse<QingLongEnv>> UpdateEnvs(
+    [HttpPut("/open/envs")]
+    Task<QingLongGenericResponse<QingLongEnv>> UpdateEnvsAsync(
         [JsonContent] UpdateQingLongEnv env,
         [Header("Authorization")] string token
     );
 }
-
-public class QingLongGenericResponse<T>
-{
-    public int Code { get; set; }
-
-    public T Data { get; set; }
-}
-
-public class QingLongEnv : UpdateQingLongEnv
-{
-    public string timestamp { get; set; }
-    public int status { get; set; }
-
-    //public long position { get; set; }
-    public DateTime createdAt { get; set; }
-    public DateTime updatedAt { get; set; }
-}
-
-public class AddQingLongEnv
-{
-    public string value { get; set; }
-    public string name { get; set; }
-    public string remarks { get; set; }
-}
-
-public class UpdateQingLongEnv : AddQingLongEnv
-{
-    public long id { get; set; }
-}

src/Ray.BiliBiliTool.Config/Extensions/ServiceCollectionExtension.cs

@@ -34,7 +34,8 @@ IConfiguration configuration
             .Configure<VipPrivilegeOptions>(configuration.GetSection("VipPrivilegeConfig"))
             .Configure<LiveFansMedalTaskOptions>(
                 configuration.GetSection("LiveFansMedalTaskOptions")
-            );
+            )
+            .Configure<QingLongOptions>(configuration.GetSection("QingLongConfig"));
 
         return services;
     }

src/Ray.BiliBiliTool.Config/Options/QingLongOptions.cs

@@ -0,0 +1,8 @@
+namespace Ray.BiliBiliTool.Config.Options;
+
+public class QingLongOptions
+{
+    public string ClientId { get; set; }
+
+    public string ClientSecret { get; set; }
+}