refactor(wxads): 优化代码

This commit is contained in:
fudiwei
2022-12-06 21:03:35 +08:00
parent 81d8576ea8
commit 5ca3dae671
28 changed files with 174 additions and 59 deletions

View File

@@ -1,6 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models.Abstractions
{
public sealed class CommonDateRange
public abstract class CommonDateRange
{
/// <summary>
/// 获取或设置开始日期字符串格式yyyy-MM-dd

View File

@@ -1,6 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models.Abstractions
{
public sealed class CommonFilter
public abstract class CommonFilter
{
public const string OPERATOR_EQUALS = "EQUALS";
public const string OPERATOR_CONTAINS = "CONTAINS";
@@ -18,7 +18,7 @@
/// <summary>
/// 获取或设置操作符。
/// <para>默认值EQUALS</para>
/// <para>默认值:"EQUALS"</para>
/// </summary>
[Newtonsoft.Json.JsonProperty("operator")]
[System.Text.Json.Serialization.JsonPropertyName("operator")]

View File

@@ -1,6 +1,6 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models.Abstractions
{
public sealed class CommonPagination
public abstract class CommonPagination
{
/// <summary>
/// 获取或设置总数量。

View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
@@ -7,6 +7,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
/// </summary>
public class AdCreativesGetRequest : WechatAdsRequest
{
public static class Types
{
public class Filter : Abstractions.CommonFilter
{
}
}
/// <summary>
/// 获取或设置广告创意 ID。
/// </summary>
@@ -19,7 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public IList<CommonFilter>? Filters { get; set; }
public IList<Types.Filter>? Filters { get; set; }
/// <summary>
/// 获取或设置页大小。

View File

@@ -1,4 +1,4 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [GET] /adcreatives/get 接口的响应。</para>
@@ -131,6 +131,10 @@
[System.Text.Json.Serialization.JsonPropertyName("created_time")]
public long CreateTimestamp { get; set; }
}
public class Pagination : Abstractions.CommonPagination
{
}
}
/// <summary>
@@ -145,7 +149,7 @@
/// </summary>
[Newtonsoft.Json.JsonProperty("page_info")]
[System.Text.Json.Serialization.JsonPropertyName("page_info")]
public CommonPagination Pagination { get; set; } = default!;
public Types.Pagination Pagination { get; set; } = default!;
}
}

View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
@@ -7,6 +7,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
/// </summary>
public class AdGroupsGetRequest : WechatAdsRequest
{
public static class Types
{
public class Filter : Abstractions.CommonFilter
{
}
}
/// <summary>
/// 获取或设置广告组 ID。
/// </summary>
@@ -19,7 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public IList<CommonFilter>? Filters { get; set; }
public IList<Types.Filter>? Filters { get; set; }
/// <summary>
/// 获取或设置页大小。

View File

@@ -1,4 +1,4 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [GET] /adgroups/get 接口的响应。</para>
@@ -321,6 +321,10 @@
[System.Text.Json.Serialization.JsonPropertyName("created_time")]
public long CreateTimestamp { get; set; }
}
public class Pagination : Abstractions.CommonPagination
{
}
}
/// <summary>
@@ -335,7 +339,7 @@
/// </summary>
[Newtonsoft.Json.JsonProperty("page_info")]
[System.Text.Json.Serialization.JsonPropertyName("page_info")]
public CommonPagination Pagination { get; set; } = default!;
public Types.Pagination Pagination { get; set; } = default!;
}
}

View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
@@ -7,6 +7,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
/// </summary>
public class AdsGetRequest : WechatAdsRequest
{
public static class Types
{
public class Filter : Abstractions.CommonFilter
{
}
}
/// <summary>
/// 获取或设置广告 ID。
/// </summary>
@@ -19,7 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public IList<CommonFilter>? Filters { get; set; }
public IList<Types.Filter>? Filters { get; set; }
/// <summary>
/// 获取或设置页大小。

View File

@@ -1,4 +1,4 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [GET] /ads/get 接口的响应。</para>
@@ -90,6 +90,10 @@
[System.Text.Json.Serialization.JsonPropertyName("created_time")]
public long CreateTimestamp { get; set; }
}
public class Pagination : Abstractions.CommonPagination
{
}
}
/// <summary>
@@ -104,7 +108,7 @@
/// </summary>
[Newtonsoft.Json.JsonProperty("page_info")]
[System.Text.Json.Serialization.JsonPropertyName("page_info")]
public CommonPagination Pagination { get; set; } = default!;
public Types.Pagination Pagination { get; set; } = default!;
}
}

View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
@@ -7,12 +7,19 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
/// </summary>
public class AsyncTasksGetRequest : WechatAdsRequest
{
public static class Types
{
public class Filter : Abstractions.CommonFilter
{
}
}
/// <summary>
/// 获取或设置过滤条件。
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public IList<CommonFilter>? Filters { get; set; }
public IList<Types.Filter>? Filters { get; set; }
/// <summary>
/// 获取或设置页大小。

View File

@@ -1,4 +1,4 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [GET] /async_tasks/get 接口的响应。</para>
@@ -115,6 +115,10 @@
[System.Text.Json.Serialization.JsonPropertyName("created_time")]
public long CreateTimestamp { get; set; }
}
public class Pagination : Abstractions.CommonPagination
{
}
}
/// <summary>
@@ -129,7 +133,7 @@
/// </summary>
[Newtonsoft.Json.JsonProperty("page_info")]
[System.Text.Json.Serialization.JsonPropertyName("page_info")]
public CommonPagination Pagination { get; set; } = default!;
public Types.Pagination Pagination { get; set; } = default!;
}
}

View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
@@ -7,6 +7,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
/// </summary>
public class CampaignsGetRequest : WechatAdsRequest
{
public static class Types
{
public class Filter : Abstractions.CommonFilter
{
}
}
/// <summary>
/// 获取或设置推广计划 ID。
/// </summary>
@@ -19,7 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public IList<CommonFilter>? Filters { get; set; }
public IList<Types.Filter>? Filters { get; set; }
/// <summary>
/// 获取或设置页大小。

View File

@@ -1,4 +1,4 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [GET] /campaigns/get 接口的响应。</para>
@@ -77,6 +77,10 @@
[System.Text.Json.Serialization.JsonPropertyName("created_time")]
public long CreateTimestamp { get; set; }
}
public class Pagination : Abstractions.CommonPagination
{
}
}
/// <summary>
@@ -91,7 +95,7 @@
/// </summary>
[Newtonsoft.Json.JsonProperty("page_info")]
[System.Text.Json.Serialization.JsonPropertyName("page_info")]
public CommonPagination Pagination { get; set; } = default!;
public Types.Pagination Pagination { get; set; } = default!;
}
}

View File

@@ -1,4 +1,4 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [GET] /credit_bills/get 接口的请求。</para>
@@ -35,7 +35,7 @@
/// <summary>
/// 获取或设置微信广告平台的版本号。
/// <para>默认值v1.1</para>
/// <para>默认值:"v1.1"</para>
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]

View File

@@ -1,4 +1,4 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [GET] /credit_bills/get 接口的响应。</para>
@@ -55,6 +55,10 @@
[System.Text.Json.Serialization.JsonPropertyName("repaid_amount")]
public int RepaidAmount { get; set; }
}
public class Pagination : Abstractions.CommonPagination
{
}
}
/// <summary>
@@ -69,7 +73,7 @@
/// </summary>
[Newtonsoft.Json.JsonProperty("page_info")]
[System.Text.Json.Serialization.JsonPropertyName("page_info")]
public CommonPagination Pagination { get; set; } = default!;
public Types.Pagination Pagination { get; set; } = default!;
}
}

View File

@@ -1,4 +1,4 @@
using System;
using System;
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
@@ -82,6 +82,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
[System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.RegularDateTimeOffsetConverter))]
public DateTimeOffset CreateTime { get; set; }
}
public class Pagination : Abstractions.CommonPagination
{
}
}
/// <summary>
@@ -96,7 +100,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("page_info")]
[System.Text.Json.Serialization.JsonPropertyName("page_info")]
public CommonPagination Pagination { get; set; } = default!;
public Types.Pagination Pagination { get; set; } = default!;
}
}

View File

@@ -1,4 +1,4 @@
using System;
using System;
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
@@ -101,6 +101,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
[System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.RegularDateTimeOffsetConverter))]
public DateTimeOffset CreateTime { get; set; }
}
public class Pagination : Abstractions.CommonPagination
{
}
}
/// <summary>
@@ -115,7 +119,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("page_info")]
[System.Text.Json.Serialization.JsonPropertyName("page_info")]
public CommonPagination Pagination { get; set; } = default!;
public Types.Pagination Pagination { get; set; } = default!;
}
}

View File

@@ -1,16 +1,23 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [GET] /fund_statements_detailed/get 接口的请求。</para>
/// </summary>
public class FundStatementsDetailedGetRequest : WechatAdsRequest
{
public static class Types
{
public class DateRange : Abstractions.CommonDateRange
{
}
}
/// <summary>
/// 获取或设置时间范围。
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public CommonDateRange DateRange { get; set; } = new CommonDateRange();
public Types.DateRange DateRange { get; set; } = new Types.DateRange();
/// <summary>
/// 获取或设置交易类型。
@@ -35,7 +42,7 @@
/// <summary>
/// 获取或设置微信广告平台的版本号。
/// <para>默认值v1.1</para>
/// <para>默认值:"v1.1"</para>
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]

View File

@@ -1,4 +1,4 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [GET] /fund_statements_detailed/get 接口的响应。</para>
@@ -48,6 +48,10 @@
[System.Text.Json.Serialization.JsonPropertyName("time")]
public long CreateTimestamp { get; set; }
}
public class Pagination : Abstractions.CommonPagination
{
}
}
/// <summary>
@@ -62,7 +66,7 @@
/// </summary>
[Newtonsoft.Json.JsonProperty("page_info")]
[System.Text.Json.Serialization.JsonPropertyName("page_info")]
public CommonPagination Pagination { get; set; } = default!;
public Types.Pagination Pagination { get; set; } = default!;
}
}

View File

@@ -1,4 +1,4 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [GET] /funds/get 接口的请求。</para>
@@ -7,7 +7,7 @@
{
/// <summary>
/// 获取或设置微信广告平台的版本号。
/// <para>默认值v1.1</para>
/// <para>默认值:"v1.1"</para>
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]

View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
@@ -7,6 +7,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
/// </summary>
public class ImagesGetRequest : WechatAdsRequest
{
public static class Types
{
public class Filter : Abstractions.CommonFilter
{
}
}
/// <summary>
/// 获取或设置图片 ID。
/// </summary>
@@ -19,7 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public IList<CommonFilter>? Filters { get; set; }
public IList<Types.Filter>? Filters { get; set; }
/// <summary>
/// 获取或设置页大小。

View File

@@ -1,4 +1,4 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [GET] /images/get 接口的响应。</para>
@@ -62,6 +62,10 @@
[System.Text.Json.Serialization.JsonPropertyName("preview_url")]
public string PreviewUrl { get; set; } = default!;
}
public class Pagination : Abstractions.CommonPagination
{
}
}
/// <summary>
@@ -76,7 +80,7 @@
/// </summary>
[Newtonsoft.Json.JsonProperty("page_info")]
[System.Text.Json.Serialization.JsonPropertyName("page_info")]
public CommonPagination Pagination { get; set; } = default!;
public Types.Pagination Pagination { get; set; } = default!;
}
}

View File

@@ -1,4 +1,4 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [GET] /qualifications/get 接口的响应。</para>
@@ -62,6 +62,10 @@
[System.Text.Json.Serialization.JsonPropertyName("reject_message")]
public string? RejectReason { get; set; }
}
public class Pagination : Abstractions.CommonPagination
{
}
}
/// <summary>
@@ -76,7 +80,7 @@
/// </summary>
[Newtonsoft.Json.JsonProperty("page_info")]
[System.Text.Json.Serialization.JsonPropertyName("page_info")]
public CommonPagination Pagination { get; set; } = default!;
public Types.Pagination Pagination { get; set; } = default!;
}
}

View File

@@ -1,16 +1,23 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [GET] /daily_reports/get 接口的请求。</para>
/// </summary>
public class DailyReportsGetRequest : WechatAdsRequest
{
public static class Types
{
public class DateRange : Abstractions.CommonDateRange
{
}
}
/// <summary>
/// 获取或设置时间范围。
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public CommonDateRange DateRange { get; set; } = new CommonDateRange();
public Types.DateRange DateRange { get; set; } = new Types.DateRange();
/// <summary>
/// 获取或设置报表类型。

View File

@@ -1,4 +1,4 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [GET] /daily_reports/get 接口的响应。</para>
@@ -111,6 +111,10 @@
[System.Text.Json.Serialization.JsonPropertyName("lbs_wechat_uv")]
public int LBSWechatUV { get; set; }
}
public class Pagination : Abstractions.CommonPagination
{
}
}
/// <summary>
@@ -125,7 +129,7 @@
/// </summary>
[Newtonsoft.Json.JsonProperty("page_info")]
[System.Text.Json.Serialization.JsonPropertyName("page_info")]
public CommonPagination Pagination { get; set; } = default!;
public Types.Pagination Pagination { get; set; } = default!;
}
}

View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
@@ -7,6 +7,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
/// </summary>
public class RealtimeCostGetRequest : WechatAdsRequest
{
public static class Types
{
public class Filter : Abstractions.CommonFilter
{
}
}
/// <summary>
/// 获取或设置查询日期字符串格式yyyy-MM-dd
/// </summary>
@@ -16,7 +23,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
/// <summary>
/// 获取或设置类型级别。
/// <para>默认值ADGROUP</para>
/// <para>默认值:"ADGROUP"</para>
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
@@ -27,6 +34,6 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
public IList<CommonFilter>? Filters { get; set; }
public IList<Types.Filter>? Filters { get; set; }
}
}

View File

@@ -1,4 +1,4 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
namespace SKIT.FlurlHttpClient.Wechat.Ads.Models
{
/// <summary>
/// <para>表示 [GET] /realtime_cost/get 接口的响应。</para>
@@ -34,6 +34,10 @@
[System.Text.Json.Serialization.JsonPropertyName("cost")]
public int Cost { get; set; }
}
public class Pagination : Abstractions.CommonPagination
{
}
}
/// <summary>
@@ -48,7 +52,7 @@
/// </summary>
[Newtonsoft.Json.JsonProperty("page_info")]
[System.Text.Json.Serialization.JsonPropertyName("page_info")]
public CommonPagination Pagination { get; set; } = default!;
public Types.Pagination Pagination { get; set; } = default!;
}
}

View File

@@ -1,4 +1,4 @@
namespace SKIT.FlurlHttpClient.Wechat.Ads
namespace SKIT.FlurlHttpClient.Wechat.Ads
{
/// <summary>
/// 微信广告平台 API 请求的基类。
@@ -21,7 +21,7 @@
/// <summary>
/// 获取或设置微信广告平台的版本号。
/// <para>默认值v1.0</para>
/// <para>默认值:"v1.0"</para>
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]