style(wxapi): clean code

This commit is contained in:
Fu Diwei
2022-01-21 17:06:31 +08:00
parent 5650e3be25
commit 211687ea62
36 changed files with 48 additions and 145 deletions

View File

@@ -14,7 +14,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Sample.Options
public string CallbackToken { get; set; } = string.Empty;
}
partial class WechatOptions
public partial class WechatOptions
{
public static class Types
{

View File

@@ -12,7 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Sample.Services.BackgroundServices
using SKIT.FlurlHttpClient.Wechat.Api;
using SKIT.FlurlHttpClient.Wechat.Api.Models;
class WechatAccessTokenRefreshingBackgroundService : BackgroundService
internal class WechatAccessTokenRefreshingBackgroundService : BackgroundService
{
private readonly ILogger _logger;
private readonly Options.WechatOptions _wechatOptions;
@@ -70,7 +70,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Sample.Services.BackgroundServices
if (!response.IsSuccessful())
{
_logger.LogWarning(
"刷新 AppId 为 {0} 微信 AccessToken 失败(状态码:{1},错误代码:{2},错误描述:{3})。",
"刷新 AppId 为 {0} 微信 AccessToken 失败(状态码:{1},错误代码:{2},错误描述:{3})。",
appId, response.RawStatus, response.ErrorCode, response.ErrorMessage
);
return; // 请求失败

View File

@@ -5,7 +5,7 @@ using Medallion.Threading.FileSystem;
namespace SKIT.FlurlHttpClient.Wechat.Api.Sample.Services.DistributedLock.Implements
{
class DistributedLockFactory : IDistributedLockFactory
internal class DistributedLockFactory : IDistributedLockFactory
{
private readonly DirectoryInfo _lockFileDirectory = new DirectoryInfo(Environment.CurrentDirectory);

View File

@@ -5,7 +5,7 @@ using Microsoft.Extensions.Options;
namespace SKIT.FlurlHttpClient.Wechat.Api.Sample.Services.HttpClients.Implements
{
partial class WechatApiHttpClientFactory : IWechatApiHttpClientFactory
internal partial class WechatApiHttpClientFactory : IWechatApiHttpClientFactory
{
private readonly IHttpClientFactory _httpClientFactory;
private readonly Options.WechatOptions _wechatOptions;
@@ -40,7 +40,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Sample.Services.HttpClients.Implements
}
}
partial class WechatApiHttpClientFactory
internal partial class WechatApiHttpClientFactory
{
internal class DelegatingFlurlClientFactory : Flurl.Http.Configuration.DefaultHttpClientFactory
{

View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;

View File

@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace Newtonsoft.Json.Converters
{

View File

@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace Newtonsoft.Json.Converters
{

View File

@@ -1,6 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using System.Text.Json.Serialization;
using System.Text.Json.Serialization;
namespace System.Text.Json.Converters
{

View File

@@ -1,6 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using System.Text.Json.Serialization;
using System.Text.Json.Serialization;
namespace System.Text.Json.Converters
{

View File

@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
{

View File

@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
{

View File

@@ -1,6 +1,4 @@
using System;
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
{
/// <summary>
/// <para>表示 [POST] /wxa/update_store 接口的请求。</para>

View File

@@ -1,6 +1,4 @@
using System;
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
{
/// <summary>
/// <para>表示 [POST] /wxaapi/log/get_performance 接口的响应。</para>

View File

@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Collections.Generic;
namespace SKIT.FlurlHttpClient.Wechat.Api.Models
{

View File

@@ -1,5 +1,4 @@
using System;
using Xunit;
using Xunit;
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
{
@@ -11,10 +10,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
string iv = "KEWv/gyiIwAfHvjrLeaX6w==";
string key = "YZJqKnNFi0KAiKUc0ggC2g==";
string cipherText = "Gu2PVnxVWl+jK4F8c0liGxfkB5Bj3m5HRvwgEIk1Yb+36RZ3Bg7YmUnud/ooiHz0PQroipsH7GCjlGwUeT04NwmrFaP1y3dRYPLpS43ed9QZWcFIFo+8vTs3Zco6S98DUvaNEAs8duhz/BzfBOZaIHMziRqEtPFI0ZDzCgJluBirJ6Wl3UkygZ5/QLo3KA53qGdip7K48Rq8XbCwuidTCw==";
string expectedPlainData = "{\"phoneNumber\":\"186****5613\",\"purePhoneNumber\":\"186****5613\",\"countryCode\":\"86\",\"watermark\":{\"timestamp\":1634545675,\"appid\":\"wxc****17e87e0e0a7\"}}";
string actualPlainData = Utilities.AESUtility.DecryptWithCBC(encodingKey: key, encodingIV: iv, encodingCipherText: cipherText);
Assert.Equal(expectedPlainData, actualPlainData, ignoreCase: true);
}
}

View File

@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Xunit;

View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Linq;
using System.Threading.Tasks;
using Xunit;

View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Xunit;

View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Threading.Tasks;
using Xunit;
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
@@ -35,7 +31,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
ToUserOpenId = TestConfigs.WechatOpenId,
MessageType = "text",
MessageContentForText = new Models.CgibinMessageMassPreviewRequest.Types.TextMessage()
{
{
Content = "FAKE_CONTENT"
},
AccessToken = TestConfigs.WechatAccessToken

View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Threading.Tasks;
using Xunit;
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
@@ -18,9 +14,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
ExpiresIn = 30,
ActionType = "QR_STR_SCENE",
Action = new Models.CgibinQrcodeCreateRequest.Types.Action()
{
{
Scene = new Models.CgibinQrcodeCreateRequest.Types.Action.Types.Scene()
{
{
SceneString = "FAKE_SCENESTR"
}
}

View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Linq;
using System.Threading.Tasks;
using Xunit;
@@ -15,9 +12,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
var request = new Models.CgibinTagsCreateRequest()
{
AccessToken = TestConfigs.WechatAccessToken,
Tag = new Models.CgibinTagsCreateRequest.Types.Tag()
{
Name = "FAKE_TAGNAME"
Tag = new Models.CgibinTagsCreateRequest.Types.Tag()
{
Name = "FAKE_TAGNAME"
}
};
var response = await TestClients.Instance.ExecuteCgibinTagsCreateAsync(request);

View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Threading.Tasks;
using Xunit;
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests

View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Linq;
using System.Threading.Tasks;
using Xunit;
@@ -20,7 +17,6 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
var response = await TestClients.Instance.ExecuteCgibinUserInfoAsync(request);
Assert.NotEmpty(response.OpenId);
Assert.NotEmpty(response.Nickname);
Assert.True(response.IsSubscribed);
}
@@ -30,8 +26,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
var request = new Models.CgibinUserInfoBatchGetRequest()
{
AccessToken = TestConfigs.WechatAccessToken,
UserList = new Models.CgibinUserInfoBatchGetRequest.Types.User[]
{
UserList = new Models.CgibinUserInfoBatchGetRequest.Types.User[]
{
new Models.CgibinUserInfoBatchGetRequest.Types.User() { OpenId = TestConfigs.WechatOpenId }
}
};
@@ -39,7 +35,6 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
Assert.NotEmpty(response.UserList);
Assert.NotEmpty(response.UserList.First().OpenId);
Assert.NotEmpty(response.UserList.First().Nickname);
Assert.True(response.UserList.First().IsSubscribed);
}

View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Threading.Tasks;
using Xunit;
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests

View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using System.Threading.Tasks;
using Xunit;
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests

View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using System.Threading.Tasks;
using Xunit;
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
@@ -34,7 +31,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
Assert.NotNull(response.AccessToken);
Assert.NotNull(response.RefreshToken);
}
[Fact(DisplayName = "测试用例:调用 API [GET] /sns/jscode2session")]
public async Task TestExecuteSnsJsCode2Session()
{

View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Xunit;

View File

@@ -1,10 +1,5 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.IO;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using Xunit;
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests

View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Threading.Tasks;
using Xunit;
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
@@ -13,7 +9,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
public async Task TestDeliveryRequestSignature()
{
var client = new WechatApiClient(new WechatApiClientOptions()
{
{
AppId = "",
AppSecret = "",
ImmeDeliveryAppKey = "test_shop_id",

View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Xml.Linq;
using System.Xml.Linq;
using Xunit;
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests

View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Xml.Linq;
using Xunit;
using Xunit;
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
{

View File

@@ -1,5 +1,4 @@
using System;
using Xunit;
using Xunit;
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
{

View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Threading.Tasks;
using Xunit;
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
@@ -13,7 +9,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
public async Task TestMidasRequestSignature()
{
var client = new WechatApiClient(new WechatApiClientOptions()
{
{
AppId = "wx1234567",
AppSecret = "",
MidasAppKey = "zNLgAGgqsEWJOg1nFVaO5r7fAlIQxr1u"

View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Xunit;
using Xunit;
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
{

View File

@@ -1,15 +1,13 @@
using System;
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
{
class TestClients
internal class TestClients
{
static TestClients()
{
Instance = new WechatApiClient(new WechatApiClientOptions()
{
{
AppId = TestConfigs.WechatAppId,
AppSecret = TestConfigs.WechatAppSecret
AppSecret = TestConfigs.WechatAppSecret
});
}

View File

@@ -4,7 +4,7 @@ using System.Text.Json;
namespace SKIT.FlurlHttpClient.Wechat.Api.UnitTests
{
class TestConfigs
internal class TestConfigs
{
static TestConfigs()
{