Skip to content

Commit b9818bc

Browse files
RayWangQvQRayWangQvQ
committed
feat[#513]:migrate componets to nuget
1 parent 88326e3 commit b9818bc

File tree

13 files changed

+29
-385
lines changed

13 files changed

+29
-385
lines changed

‎src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
8+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
99
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.3" />
1010
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
1111
<PackageReference Include="Scrutor" Version="4.2.0" />

‎src/Ray.BiliBiliTool.Application/VipBigPointAppService.cs

+11-11
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public override async Task DoTaskAsync(CancellationToken cancellationToken)
4646

4747
var re = await _vipApi.GetTaskList();
4848

49-
if (re.Code != 0) throw new Exception(re.ToJson());
49+
if (re.Code != 0) throw new Exception(re.ToJsonStr());
5050

5151
VipTaskInfo taskInfo = re.Data;
5252
taskInfo.LogInfo(_logger);
@@ -103,11 +103,11 @@ private async Task<VipTaskInfo> Sign(VipTaskInfo info)
103103
}
104104

105105
var re = await _vipApi.Sign(new SignRequest());
106-
if (re.Code != 0) throw new Exception(re.ToJson());
106+
if (re.Code != 0) throw new Exception(re.ToJsonStr());
107107

108108
//确认
109109
var infoResult = await _vipApi.GetTaskList();
110-
if (infoResult.Code != 0) throw new Exception(infoResult.ToJson());
110+
if (infoResult.Code != 0) throw new Exception(infoResult.ToJsonStr());
111111
info = infoResult.Data;
112112

113113
_logger.LogInformation("今日可获得签到积分：{score}", info.Task_info.Sing_task_item.TodayHistory?.Score);
@@ -143,7 +143,7 @@ private async Task<VipTaskInfo> Bonus(VipTaskInfo info)
143143
if (re)
144144
{
145145
var infoResult = await _vipApi.GetTaskList();
146-
if (infoResult.Code != 0) throw new Exception(infoResult.ToJson());
146+
if (infoResult.Code != 0) throw new Exception(infoResult.ToJsonStr());
147147
info = infoResult.Data;
148148
bonusTask = GetTarget(info);
149149

@@ -186,7 +186,7 @@ private async Task<VipTaskInfo> Privilege(VipTaskInfo info)
186186
if (re)
187187
{
188188
var infoResult = await _vipApi.GetTaskList();
189-
if (infoResult.Code != 0) throw new Exception(infoResult.ToJson());
189+
if (infoResult.Code != 0) throw new Exception(infoResult.ToJsonStr());
190190
info = infoResult.Data;
191191
privilegeTask = GetTarget(info);
192192

@@ -231,7 +231,7 @@ private async Task<VipTaskInfo> ViewAnimate(VipTaskInfo info)
231231
if (re)
232232
{
233233
var infoResult = await _vipApi.GetTaskList();
234-
if (infoResult.Code != 0) throw new Exception(infoResult.ToJson());
234+
if (infoResult.Code != 0) throw new Exception(infoResult.ToJsonStr());
235235
info = infoResult.Data;
236236
targetTask = GetTarget(info);
237237

@@ -276,7 +276,7 @@ private async Task<VipTaskInfo> ViewFilmChannel(VipTaskInfo info)
276276
if (re)
277277
{
278278
var infoResult = await _vipApi.GetTaskList();
279-
if (infoResult.Code != 0) throw new Exception(infoResult.ToJson());
279+
if (infoResult.Code != 0) throw new Exception(infoResult.ToJsonStr());
280280
info = infoResult.Data;
281281
targetTask = GetTarget(info);
282282

@@ -433,12 +433,12 @@ private async Task TryReceive(string taskCode)
433433
if (re.Code == 0)
434434
_logger.LogInformation("领取任务成功");
435435
else
436-
_logger.LogInformation("领取任务失败：{msg}", re.ToJson());
436+
_logger.LogInformation("领取任务失败：{msg}", re.ToJsonStr());
437437
}
438438
catch (Exception e)
439439
{
440440
_logger.LogError("领取任务异常");
441-
_logger.LogError(e.Message + re?.ToJson());
441+
_logger.LogError(e.Message + re?.ToJsonStr());
442442
}
443443
}
444444

@@ -454,7 +454,7 @@ private async Task<bool> Complete(string taskCode)
454454

455455
else
456456
{
457-
_logger.LogInformation("失败：{msg}", re.ToJson());
457+
_logger.LogInformation("失败：{msg}", re.ToJsonStr());
458458
return false;
459459
}
460460
}
@@ -474,7 +474,7 @@ private async Task<bool> CompleteView(string code)
474474

475475
else
476476
{
477-
_logger.LogInformation("浏览失败：{msg}", re.ToJson());
477+
_logger.LogInformation("浏览失败：{msg}", re.ToJsonStr());
478478
return false;
479479
}
480480
}

‎src/Ray.BiliBiliTool.Config/Ray.BiliBiliTool.Config.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ItemGroup>
88
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
99
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
1111
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
1212
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
1313
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />

‎src/Ray.BiliBiliTool.DomainService/AccountDomainService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public async Task<DailyTaskInfo> GetDailyTaskStatus()
9494
}
9595
else
9696
{
97-
_logger.LogWarning("获取今日任务完成状态失败：{result}", apiResponse.ToJson());
97+
_logger.LogWarning("获取今日任务完成状态失败：{result}", apiResponse.ToJsonStr());
9898
result = (await _dailyTaskApi.GetDailyTaskRewardInfo()).Data;
9999
//todo:偶发性请求失败，再请求一次，这么写很丑陋，待用polly再框架层面实现
100100
}

‎src/Ray.BiliBiliTool.DomainService/ChargeDomainService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public async Task Charge(UserInfo userInfo)
105105
else
106106
{
107107
_logger.LogInformation("【充电结果】失败");
108-
_logger.LogError("【原因】{reason}", response.ToJson());
108+
_logger.LogError("【原因】{reason}", response.ToJsonStr());
109109
}
110110
}
111111
else

‎src/Ray.BiliBiliTool.DomainService/LoginDomainService.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public async Task<BiliCookie> LoginByQrCodeAsync(CancellationToken cancellationT
5656
var re = await _passportApi.GenerateQrCode();
5757
if (re.Code != 0)
5858
{
59-
_logger.LogWarning("获取二维码失败：{msg}", re.ToJson());
59+
_logger.LogWarning("获取二维码失败：{msg}", re.ToJsonStr());
6060
return null;
6161
}
6262

@@ -86,7 +86,7 @@ public async Task<BiliCookie> LoginByQrCodeAsync(CancellationToken cancellationT
8686
var content = JsonConvert.DeserializeObject<BiliApiResponse<TokenDto>>(await check.Content.ReadAsStringAsync(cancellationToken));
8787
if (content.Code != 0)
8888
{
89-
_logger.LogWarning("调用检测接口异常：{msg}", check.ToJson());
89+
_logger.LogWarning("调用检测接口异常：{msg}", check.ToJsonStr());
9090
break;
9191
}
9292

@@ -127,12 +127,12 @@ public async Task<BiliCookie> SetCookieAsync(BiliCookie biliCookie, Cancellation
127127
_logger.LogInformation("SetCookie成功");
128128
return biliCookie;
129129
}
130-
_logger.LogError("访问主站失败：{msg}", homePage.ToJson());
130+
_logger.LogError("访问主站失败：{msg}", homePage.ToJsonStr());
131131
}
132132
catch (Exception e)
133133
{
134134
//buvid只影响分享和投币，可以吞掉异常
135-
_logger.LogError(e.ToJson());
135+
_logger.LogError(e.ToJsonStr());
136136
}
137137

138138
return biliCookie;
@@ -217,11 +217,11 @@ public async Task SaveCookieToQinLongAsync(BiliCookie ckInfo, CancellationToken
217217

218218
if (re.Code != 200)
219219
{
220-
_logger.LogInformation($"查询环境变量失败：{re}", re.ToJson());
220+
_logger.LogInformation($"查询环境变量失败：{re}", re.ToJsonStr());
221221
return;
222222
}
223223

224-
_logger.LogDebug(re.Data.ToJson());
224+
_logger.LogDebug(re.Data.ToJsonStr());
225225
_logger.LogDebug(ckInfo.ToString());
226226

227227
var list = re.Data.Where(x => x.name.StartsWith("Ray_BiliBiliCookies__")).ToList();
@@ -242,7 +242,7 @@ public async Task SaveCookieToQinLongAsync(BiliCookie ckInfo, CancellationToken
242242
};
243243

244244
var updateRe = await _qingLongApi.UpdateEnvs(update, token);
245-
_logger.LogInformation(updateRe.Code == 200 ? "更新成功！" : updateRe.ToJson());
245+
_logger.LogInformation(updateRe.Code == 200 ? "更新成功！" : updateRe.ToJsonStr());
246246

247247
return;
248248
}
@@ -268,7 +268,7 @@ public async Task SaveCookieToQinLongAsync(BiliCookie ckInfo, CancellationToken
268268
remarks = $"bili-{ckInfo.UserId}"
269269
};
270270
var addRe = await _qingLongApi.AddEnvs(new List<AddQingLongEnv> { add }, token);
271-
_logger.LogInformation(addRe.Code == 200 ? "新增成功！" : addRe.ToJson());
271+
_logger.LogInformation(addRe.Code == 200 ? "新增成功！" : addRe.ToJsonStr());
272272
}
273273

274274
#region private

‎src/Ray.BiliBiliTool.Infrastructure/Extensions/DateTimeExtension.cs

-44
This file was deleted.

0 commit comments

Comments
 (0)