diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/Array[Integer]/TextualIntegerArrayWithPipeSplitConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/Array[Integer]/TextualIntegerArrayWithPipeSplitConverter.cs deleted file mode 100644 index 478c5a8a..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/Array[Integer]/TextualIntegerArrayWithPipeSplitConverter.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; - -namespace Newtonsoft.Json.Converters -{ - internal class TextualIntegerArrayWithPipeSplitConverter : JsonConverter - { - public override bool CanRead - { - get { return true; } - } - - public override bool CanWrite - { - get { return true; } - } - - public override int[]? ReadJson(JsonReader reader, Type objectType, int[]? existingValue, bool hasExistingValue, JsonSerializer serializer) - { - if (reader.TokenType == JsonToken.Null) - { - return null; - } - else if (reader.TokenType == JsonToken.String) - { - string? value = serializer.Deserialize(reader); - if (value == null) - return null; - if (string.IsNullOrEmpty(value)) - return Array.Empty(); - - string[] strArr = value.Split('|'); - int[] intArr = new int[strArr.Length]; - for (int i = 0; i < strArr.Length; i++) - { - if (!int.TryParse(strArr[i], out int j)) - throw new JsonSerializationException("Unexpected token when parsing string to integer."); - - intArr[i] = j; - } - return intArr; - } - - throw new JsonSerializationException(); - } - - public override void WriteJson(JsonWriter writer, int[]? value, JsonSerializer serializer) - { - if (value != null) - writer.WriteValue(string.Join("|", value)); - else - writer.WriteNull(); - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/Array[Long]/TextualLongArrayWithPipeSplitConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/Array[Long]/TextualLongArrayWithPipeSplitConverter.cs deleted file mode 100644 index 908f7f33..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/Array[Long]/TextualLongArrayWithPipeSplitConverter.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; - -namespace Newtonsoft.Json.Converters -{ - internal class TextualLongArrayWithPipeSplitConverter : JsonConverter - { - public override bool CanRead - { - get { return true; } - } - - public override bool CanWrite - { - get { return true; } - } - - public override long[]? ReadJson(JsonReader reader, Type objectType, long[]? existingValue, bool hasExistingValue, JsonSerializer serializer) - { - if (reader.TokenType == JsonToken.Null) - { - return null; - } - else if (reader.TokenType == JsonToken.String) - { - string? value = serializer.Deserialize(reader); - if (value == null) - return null; - if (string.IsNullOrEmpty(value)) - return Array.Empty(); - - string[] strArr = value.Split('|'); - long[] intArr = new long[strArr.Length]; - for (int i = 0; i < strArr.Length; i++) - { - if (!long.TryParse(strArr[i], out long j)) - throw new JsonSerializationException("Unexpected token when parsing string to long."); - - intArr[i] = j; - } - return intArr; - } - - throw new JsonSerializationException(); - } - - public override void WriteJson(JsonWriter writer, long[]? value, JsonSerializer serializer) - { - if (value != null) - writer.WriteValue(string.Join("|", value)); - else - writer.WriteNull(); - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/Array[String]/TextualStringArrayWithPipeSplitConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/Array[String]/TextualStringArrayWithPipeSplitConverter.cs deleted file mode 100644 index 4ee5f811..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/Array[String]/TextualStringArrayWithPipeSplitConverter.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; - -namespace Newtonsoft.Json.Converters -{ - internal class TextualStringArrayWithPipeSplitConverter : JsonConverter - { - public override bool CanRead - { - get { return true; } - } - - public override bool CanWrite - { - get { return true; } - } - - public override string[]? ReadJson(JsonReader reader, Type objectType, string[]? existingValue, bool hasExistingValue, JsonSerializer serializer) - { - if (reader.TokenType == JsonToken.Null) - { - return null; - } - else if (reader.TokenType == JsonToken.String) - { - string? value = serializer.Deserialize(reader); - if (value == null) - return null; - if (string.IsNullOrEmpty(value)) - return Array.Empty(); - - return value.Split('|'); - } - - throw new JsonSerializationException(); - } - - public override void WriteJson(JsonWriter writer, string[]? value, JsonSerializer serializer) - { - if (value != null) - writer.WriteValue(string.Join("|", value)); - else - writer.WriteNull(); - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/List[Integer]/TextualIntegerListWithPipeSplitConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/List[Integer]/TextualIntegerListWithPipeSplitConverter.cs deleted file mode 100644 index 6c2e1661..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/List[Integer]/TextualIntegerListWithPipeSplitConverter.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Newtonsoft.Json.Converters -{ - internal class TextualIntegerListWithPipeSplitConverter : JsonConverter - { - private readonly JsonConverter _converter = new TextualIntegerArrayWithPipeSplitConverter(); - - public override bool CanConvert(Type objectType) - { - return objectType.IsGenericType && - typeof(IList<>).IsAssignableFrom(objectType.GetGenericTypeDefinition()) && - typeof(int) == objectType.GetGenericArguments()[0]; - } - - public override bool CanRead - { - get { return true; } - } - - public override bool CanWrite - { - get { return true; } - } - - public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer) - { - int[]? array = _converter.ReadJson(reader, objectType, null, false, serializer); - return array?.ToList(); - } - - public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) - { - _converter.WriteJson(writer, ((IList?)value)?.ToArray(), serializer); - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/List[Long]/TextualLongListWithPipeSplitConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/List[Long]/TextualLongListWithPipeSplitConverter.cs deleted file mode 100644 index 068fdbff..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/List[Long]/TextualLongListWithPipeSplitConverter.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Newtonsoft.Json.Converters -{ - internal class TextualLongListWithPipeSplitConverter : JsonConverter - { - private readonly JsonConverter _converter = new TextualLongArrayWithPipeSplitConverter(); - - public override bool CanConvert(Type objectType) - { - return objectType.IsGenericType && - typeof(IList<>).IsAssignableFrom(objectType.GetGenericTypeDefinition()) && - typeof(long) == objectType.GetGenericArguments()[0]; - } - - public override bool CanRead - { - get { return true; } - } - - public override bool CanWrite - { - get { return true; } - } - - public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer) - { - long[]? array = _converter.ReadJson(reader, objectType, null, false, serializer); - return array?.ToList(); - } - - public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) - { - _converter.WriteJson(writer, ((IList?)value)?.ToArray(), serializer); - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/List[String]/TextualStringListWithPipeSplitConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/List[String]/TextualStringListWithPipeSplitConverter.cs deleted file mode 100644 index 8436e7ae..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/Newtonsoft.Json/List[String]/TextualStringListWithPipeSplitConverter.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Newtonsoft.Json.Converters -{ - internal class TextualStringListWithPipeSplitConverter : JsonConverter - { - private readonly JsonConverter _converter = new TextualStringArrayWithPipeSplitConverter(); - - public override bool CanConvert(Type objectType) - { - return objectType.IsGenericType && - typeof(IList<>).IsAssignableFrom(objectType.GetGenericTypeDefinition()) && - typeof(string) == objectType.GetGenericArguments()[0]; - } - - public override bool CanRead - { - get { return true; } - } - - public override bool CanWrite - { - get { return true; } - } - - public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer) - { - string[]? array = _converter.ReadJson(reader, objectType, null, false, serializer); - return array?.ToList(); - } - - public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) - { - _converter.WriteJson(writer, ((IList?)value)?.ToArray(), serializer); - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/Array[Integer]/TextualIntegerArrayWithPipeSplitConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/Array[Integer]/TextualIntegerArrayWithPipeSplitConverter.cs deleted file mode 100644 index 68931271..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/Array[Integer]/TextualIntegerArrayWithPipeSplitConverter.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System.Text.Json.Serialization; - -namespace System.Text.Json.Converters -{ - internal class TextualIntegerArrayWithPipeSplitConverter : JsonConverter - { - public override int[]? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - if (reader.TokenType == JsonTokenType.Null) - { - return null; - } - else if (reader.TokenType == JsonTokenType.String) - { - string? value = reader.GetString(); - if (value == null) - return null; - if (string.IsNullOrEmpty(value)) - return Array.Empty(); - - string[] strArr = value.Split('|'); - int[] intArr = new int[strArr.Length]; - for (int i = 0; i < strArr.Length; i++) - { - if (!int.TryParse(strArr[i], out int j)) - throw new JsonException("Unexpected token when parsing string to integer."); - - intArr[i] = j; - } - return intArr; - } - - throw new JsonException(); - } - - public override void Write(Utf8JsonWriter writer, int[]? value, JsonSerializerOptions options) - { - if (value != null) - writer.WriteStringValue(string.Join("|", value)); - else - writer.WriteNullValue(); - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/Array[Long]/TextualLongArrayWithPipeSplitConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/Array[Long]/TextualLongArrayWithPipeSplitConverter.cs deleted file mode 100644 index d0ada5ff..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/Array[Long]/TextualLongArrayWithPipeSplitConverter.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System.Text.Json.Serialization; - -namespace System.Text.Json.Converters -{ - internal class TextualLongArrayWithPipeSplitConverter : JsonConverter - { - public override long[]? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - if (reader.TokenType == JsonTokenType.Null) - { - return null; - } - else if (reader.TokenType == JsonTokenType.String) - { - string? value = reader.GetString(); - if (value == null) - return null; - if (string.IsNullOrEmpty(value)) - return Array.Empty(); - - string[] strArr = value.Split('|'); - long[] intArr = new long[strArr.Length]; - for (int i = 0; i < strArr.Length; i++) - { - if (!long.TryParse(strArr[i], out long j)) - throw new JsonException("Unexpected token when parsing string to long."); - - intArr[i] = j; - } - return intArr; - } - - throw new JsonException(); - } - - public override void Write(Utf8JsonWriter writer, long[]? value, JsonSerializerOptions options) - { - if (value != null) - writer.WriteStringValue(string.Join("|", value)); - else - writer.WriteNullValue(); - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/Array[String]/TextualStringArrayWithPipeSplitConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/Array[String]/TextualStringArrayWithPipeSplitConverter.cs deleted file mode 100644 index 6d567988..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/Array[String]/TextualStringArrayWithPipeSplitConverter.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Text.Json.Serialization; - -namespace System.Text.Json.Converters -{ - internal class TextualStringArrayWithPipeSplitConverter : JsonConverter - { - public override string[]? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - if (reader.TokenType == JsonTokenType.Null) - { - return null; - } - else if (reader.TokenType == JsonTokenType.String) - { - string? value = reader.GetString(); - if (value == null) - return null; - if (string.IsNullOrEmpty(value)) - return Array.Empty(); - - return value.Split('|'); - } - - throw new JsonException(); - } - - public override void Write(Utf8JsonWriter writer, string[]? value, JsonSerializerOptions options) - { - if (value != null) - writer.WriteStringValue(string.Join("|", value)); - else - writer.WriteNullValue(); - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/List[Integer]/TextualIntegerListWithPipeSplitConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/List[Integer]/TextualIntegerListWithPipeSplitConverter.cs deleted file mode 100644 index 9dc68fd5..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/List[Integer]/TextualIntegerListWithPipeSplitConverter.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; - -namespace System.Text.Json.Converters -{ - internal class TextualIntegerListWithPipeSplitConverter : JsonConverterFactory - { - private sealed class InnerTextualIntegerListWithVBarSplitConverter : JsonConverter?> - { - private readonly JsonConverter _converter = new TextualIntegerArrayWithPipeSplitConverter(); - - public override IList? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - int[]? array = _converter.Read(ref reader, typeToConvert, options); - IList? list = array?.ToList(); - return list; - } - - public override void Write(Utf8JsonWriter writer, IList? value, JsonSerializerOptions options) - { - _converter.Write(writer, value?.ToArray(), options); - } - } - - public override bool CanConvert(Type typeToConvert) - { - return typeToConvert.IsGenericType && - typeof(IList<>).IsAssignableFrom(typeToConvert.GetGenericTypeDefinition()) && - typeof(int) == typeToConvert.GetGenericArguments()[0]; - } - - public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options) - { - return new InnerTextualIntegerListWithVBarSplitConverter(); - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/List[Long]/TextualLongListWithPipeSplitConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/List[Long]/TextualLongListWithPipeSplitConverter.cs deleted file mode 100644 index f370f814..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/List[Long]/TextualLongListWithPipeSplitConverter.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; - -namespace System.Text.Json.Converters -{ - internal class TextualLongListWithPipeSplitConverter : JsonConverterFactory - { - private sealed class InnerTextualIntegerListWithVBarSplitConverter : JsonConverter?> - { - private readonly JsonConverter _converter = new TextualLongArrayWithPipeSplitConverter(); - - public override IList? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - long[]? array = _converter.Read(ref reader, typeToConvert, options); - IList? list = array?.ToList(); - return list; - } - - public override void Write(Utf8JsonWriter writer, IList? value, JsonSerializerOptions options) - { - _converter.Write(writer, value?.ToArray(), options); - } - } - - public override bool CanConvert(Type typeToConvert) - { - return typeToConvert.IsGenericType && - typeof(IList<>).IsAssignableFrom(typeToConvert.GetGenericTypeDefinition()) && - typeof(long) == typeToConvert.GetGenericArguments()[0]; - } - - public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options) - { - return new InnerTextualIntegerListWithVBarSplitConverter(); - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/List[String]/TextualStringListWithPipeSplitConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/List[String]/TextualStringListWithPipeSplitConverter.cs deleted file mode 100644 index f582b069..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/List[String]/TextualStringListWithPipeSplitConverter.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; - -namespace System.Text.Json.Converters -{ - internal class TextualStringListWithPipeSplitConverter : JsonConverterFactory - { - private sealed class InnerTextualStringListWithVBarSplitConverter : JsonConverter?> - { - private readonly JsonConverter _converter = new TextualStringArrayWithPipeSplitConverter(); - - public override IList? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - string[]? array = _converter.Read(ref reader, typeToConvert, options); - IList? list = array?.ToList(); - return list; - } - - public override void Write(Utf8JsonWriter writer, IList? value, JsonSerializerOptions options) - { - _converter.Write(writer, value?.ToArray(), options); - } - } - - public override bool CanConvert(Type typeToConvert) - { - return typeToConvert.IsGenericType && - typeof(IList<>).IsAssignableFrom(typeToConvert.GetGenericTypeDefinition()) && - typeof(string) == typeToConvert.GetGenericArguments()[0]; - } - - public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options) - { - return new InnerTextualStringListWithVBarSplitConverter(); - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/Long/TextualNullableLongConverter.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/Long/TextualNullableLongConverter.cs deleted file mode 100644 index 2cb4e65b..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Converters/Internal/System.Text.Json/Long/TextualNullableLongConverter.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Text.Json.Serialization; - -namespace System.Text.Json.Converters -{ - internal class TextualNullableLongConverter : JsonConverter - { - public override long? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - if (reader.TokenType == JsonTokenType.Null) - { - return null; - } - else if (reader.TokenType == JsonTokenType.Number) - { - return reader.GetInt64(); - } - else if (reader.TokenType == JsonTokenType.String) - { - string? value = reader.GetString(); - if (string.IsNullOrEmpty(value)) - return null; - - if (long.TryParse(value, out long l)) - return l; - } - - throw new JsonException(); - } - - public override void Write(Utf8JsonWriter writer, long? value, JsonSerializerOptions options) - { - if (value.HasValue) - writer.WriteNumberValue(value.Value); - else - writer.WriteNullValue(); - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Agent/SwitchWorkbenchModeEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Agent/SwitchWorkbenchModeEvent.cs index df79291c..f8a83b38 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Agent/SwitchWorkbenchModeEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Agent/SwitchWorkbenchModeEvent.cs @@ -1,20 +1,24 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.switch_workbench_mode 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/92535 /// - public class SwitchWorkbenchModeEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class SwitchWorkbenchModeEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置自定义模式。 /// + [Newtonsoft.Json.JsonProperty("Mode")] + [System.Text.Json.Serialization.JsonPropertyName("Mode")] [System.Xml.Serialization.XmlElement("Mode")] public int Mode { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Approval/OpenApprovalChangeEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Approval/OpenApprovalChangeEvent.cs index ba20ac40..9345ccbf 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Approval/OpenApprovalChangeEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Approval/OpenApprovalChangeEvent.cs @@ -1,11 +1,11 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.open_approval_change 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/90269 /// REF: https://developer.work.weixin.qq.com/document/path/93798 /// - public class OpenApprovalChangeEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class OpenApprovalChangeEvent : WechatWorkEvent { public static class Types { @@ -26,6 +26,8 @@ /// /// 获取或设置审批人列表。 /// + [Newtonsoft.Json.JsonProperty("Item")] + [System.Text.Json.Serialization.JsonPropertyName("Item")] [System.Xml.Serialization.XmlElement("Item", typeof(ApprovalerItem))] public ApprovalerItem[] Items { get; set; } = default!; } @@ -35,42 +37,56 @@ /// /// 获取或设置审批人成员账号。 /// + [Newtonsoft.Json.JsonProperty("ItemUserid")] + [System.Text.Json.Serialization.JsonPropertyName("ItemUserid")] [System.Xml.Serialization.XmlElement("ItemUserid")] public string UserId { get; set; } = default!; /// /// 获取或设置审批人名称。 /// + [Newtonsoft.Json.JsonProperty("ItemName")] + [System.Text.Json.Serialization.JsonPropertyName("ItemName")] [System.Xml.Serialization.XmlElement("ItemName")] public string Name { get; set; } = default!; /// /// 获取或设置审批人部门名称。 /// + [Newtonsoft.Json.JsonProperty("ItemParty")] + [System.Text.Json.Serialization.JsonPropertyName("ItemParty")] [System.Xml.Serialization.XmlElement("ItemParty")] public string DepartmentName { get; set; } = default!; /// /// 获取或设置审批人头像 URL。 /// + [Newtonsoft.Json.JsonProperty("ItemImage")] + [System.Text.Json.Serialization.JsonPropertyName("ItemImage")] [System.Xml.Serialization.XmlElement("ItemImage")] public string AvatarUrl { get; set; } = default!; /// /// 获取或设置分支审批状态。 /// + [Newtonsoft.Json.JsonProperty("ItemStatus")] + [System.Text.Json.Serialization.JsonPropertyName("ItemStatus")] [System.Xml.Serialization.XmlElement("ItemStatus")] public int ApproveStatus { get; set; } /// /// 获取或设置分支审批时间戳。 /// + [Newtonsoft.Json.JsonProperty("ItemOpTime")] + [System.Text.Json.Serialization.JsonPropertyName("ItemOpTime")] [System.Xml.Serialization.XmlElement("ItemOpTime", IsNullable = true)] public long? ApproveTimestamp { get; set; } /// /// 获取或设置审批意见。 /// + [Newtonsoft.Json.JsonProperty("ItemSpeech")] + [System.Text.Json.Serialization.JsonPropertyName("ItemSpeech")] [System.Xml.Serialization.XmlElement("ItemSpeech", IsNullable = true)] public string? Speech { get; set; } } @@ -79,24 +95,32 @@ /// /// 获取或设置节点审批状态。 /// + [Newtonsoft.Json.JsonProperty("NodeStatus")] + [System.Text.Json.Serialization.JsonPropertyName("NodeStatus")] [System.Xml.Serialization.XmlElement("NodeStatus")] public int ApproveStatus { get; set; } /// /// 获取或设置节点审批方式。 /// + [Newtonsoft.Json.JsonProperty("NodeAttr")] + [System.Text.Json.Serialization.JsonPropertyName("NodeAttr")] [System.Xml.Serialization.XmlElement("NodeAttr")] public int ApproveType { get; set; } /// /// 获取或设置节点类型。 /// + [Newtonsoft.Json.JsonProperty("NodeType")] + [System.Text.Json.Serialization.JsonPropertyName("NodeType")] [System.Xml.Serialization.XmlElement("NodeType")] public int NodeType { get; set; } /// /// 获取或设置节点审批人列表。 /// + [Newtonsoft.Json.JsonProperty("Items")] + [System.Text.Json.Serialization.JsonPropertyName("Items")] [System.Xml.Serialization.XmlElement("Items")] public Types.ApprovalerList ApprovalerList { get; set; } = default!; } @@ -105,6 +129,8 @@ /// /// 获取或设置审批流程详情列表。 /// + [Newtonsoft.Json.JsonProperty("ApprovalNode")] + [System.Text.Json.Serialization.JsonPropertyName("ApprovalNode")] [System.Xml.Serialization.XmlElement("ApprovalNode", typeof(Types.RecordDetail))] public Types.RecordDetail[] RecordDetailList { get; set; } = default!; } @@ -118,24 +144,32 @@ /// /// 获取或设置抄送人成员账号。 /// + [Newtonsoft.Json.JsonProperty("ItemUserid")] + [System.Text.Json.Serialization.JsonPropertyName("ItemUserid")] [System.Xml.Serialization.XmlElement("ItemUserid")] public string UserId { get; set; } = default!; /// /// 获取或设置抄送人名称。 /// + [Newtonsoft.Json.JsonProperty("ItemName")] + [System.Text.Json.Serialization.JsonPropertyName("ItemName")] [System.Xml.Serialization.XmlElement("ItemName")] public string Name { get; set; } = default!; /// /// 获取或设置抄送人部门名称。 /// + [Newtonsoft.Json.JsonProperty("ItemParty")] + [System.Text.Json.Serialization.JsonPropertyName("ItemParty")] [System.Xml.Serialization.XmlElement("ItemParty")] public string DepartmentName { get; set; } = default!; /// /// 获取或设置抄送人头像 URL。 /// + [Newtonsoft.Json.JsonProperty("ItemImage")] + [System.Text.Json.Serialization.JsonPropertyName("ItemImage")] [System.Xml.Serialization.XmlElement("ItemImage")] public string AvatarUrl { get; set; } = default!; } @@ -144,6 +178,8 @@ /// /// 获取或设置审批抄送列表。 /// + [Newtonsoft.Json.JsonProperty("NotifyNode")] + [System.Text.Json.Serialization.JsonPropertyName("NotifyNode")] [System.Xml.Serialization.XmlElement("NotifyNode", typeof(Types.Notifier))] public Types.Notifier[] NotifierList { get; set; } = default!; } @@ -152,72 +188,96 @@ /// /// 获取或设置第三方审批单号。 /// + [Newtonsoft.Json.JsonProperty("ThirdNo")] + [System.Text.Json.Serialization.JsonPropertyName("ThirdNo")] [System.Xml.Serialization.XmlElement("ThirdNo")] public string ThirdPartyApprovalNumber { get; set; } = default!; /// /// 获取或设置服务商审批模板 ID。 /// + [Newtonsoft.Json.JsonProperty("OpenTemplateId")] + [System.Text.Json.Serialization.JsonPropertyName("OpenTemplateId")] [System.Xml.Serialization.XmlElement("OpenTemplateId")] public string OpenTemplateId { get; set; } = default!; /// /// 获取或设置审批单名称。 /// + [Newtonsoft.Json.JsonProperty("OpenSpName")] + [System.Text.Json.Serialization.JsonPropertyName("OpenSpName")] [System.Xml.Serialization.XmlElement("OpenSpName")] public string Name { get; set; } = default!; /// /// 获取或设置审批单状态。 /// + [Newtonsoft.Json.JsonProperty("OpenSpStatus")] + [System.Text.Json.Serialization.JsonPropertyName("OpenSpStatus")] [System.Xml.Serialization.XmlElement("OpenSpStatus")] public int Status { get; set; } /// /// 获取或设置申请时间戳。 /// + [Newtonsoft.Json.JsonProperty("ApplyTime")] + [System.Text.Json.Serialization.JsonPropertyName("ApplyTime")] [System.Xml.Serialization.XmlElement("ApplyTime")] public long ApplyTimestamp { get; set; } /// /// 获取或设置申请人成员账号。 /// + [Newtonsoft.Json.JsonProperty("ApplyUserId")] + [System.Text.Json.Serialization.JsonPropertyName("ApplyUserId")] [System.Xml.Serialization.XmlElement("ApplyUserId")] public string ApplicantUserId { get; set; } = default!; /// /// 获取或设置申请人成员名称。 /// + [Newtonsoft.Json.JsonProperty("ApplyUserName")] + [System.Text.Json.Serialization.JsonPropertyName("ApplyUserName")] [System.Xml.Serialization.XmlElement("ApplyUserName")] public string ApplicantName { get; set; } = default!; /// /// 获取或设置提单部门名称。 /// + [Newtonsoft.Json.JsonProperty("ApplyUserParty")] + [System.Text.Json.Serialization.JsonPropertyName("ApplyUserParty")] [System.Xml.Serialization.XmlElement("ApplyUserParty")] public string ApplicantDepartmentName { get; set; } = default!; /// /// 获取或设置申请人头像 URL。 /// + [Newtonsoft.Json.JsonProperty("ApplyUserImage")] + [System.Text.Json.Serialization.JsonPropertyName("ApplyUserImage")] [System.Xml.Serialization.XmlElement("ApplyUserImage")] public string ApplicantAvatarUrl { get; set; } = default!; /// /// 获取或设置审批信息。 /// + [Newtonsoft.Json.JsonProperty("ApprovalNodes")] + [System.Text.Json.Serialization.JsonPropertyName("ApprovalNodes")] [System.Xml.Serialization.XmlElement("ApprovalNodes")] public Types.ApprovalRecord ApprovalRecord { get; set; } = default!; /// /// 获取或设置抄送信息。 /// + [Newtonsoft.Json.JsonProperty("NotifyNodes")] + [System.Text.Json.Serialization.JsonPropertyName("NotifyNodes")] [System.Xml.Serialization.XmlElement("NotifyNodes")] public Types.Notification Notification { get; set; } = default!; /// /// 获取或设置当前审批节点。 /// + [Newtonsoft.Json.JsonProperty("ApproverStep")] + [System.Text.Json.Serialization.JsonPropertyName("ApproverStep")] [System.Xml.Serialization.XmlElement("ApproverStep")] public int ApproverStep { get; set; } } @@ -226,12 +286,16 @@ /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置第三方审批单信息。 /// + [Newtonsoft.Json.JsonProperty("ApprovalInfo")] + [System.Text.Json.Serialization.JsonPropertyName("ApprovalInfo")] [System.Xml.Serialization.XmlElement("ApprovalInfo")] public Types.Approval Approval { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Approval/SystemApprovalChangeEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Approval/SystemApprovalChangeEvent.cs index 67a82d9c..e47e26f9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Approval/SystemApprovalChangeEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Approval/SystemApprovalChangeEvent.cs @@ -1,11 +1,11 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.sys_approval_change 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/91815 /// REF: https://developer.work.weixin.qq.com/document/path/92633 /// - public class SystemApprovalChangeEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class SystemApprovalChangeEvent : WechatWorkEvent { public static class Types { @@ -18,12 +18,16 @@ /// /// 获取或设置申请人成员账号。 /// + [Newtonsoft.Json.JsonProperty("UserId")] + [System.Text.Json.Serialization.JsonPropertyName("UserId")] [System.Xml.Serialization.XmlElement("UserId")] public string UserId { get; set; } = default!; /// /// 获取或设置提单部门 ID。 /// + [Newtonsoft.Json.JsonProperty("Party")] + [System.Text.Json.Serialization.JsonPropertyName("Party")] [System.Xml.Serialization.XmlElement("Party")] public long DepartmentId { get; set; } } @@ -33,6 +37,8 @@ /// /// 获取或设置抄送人成员账号。 /// + [Newtonsoft.Json.JsonProperty("UserId")] + [System.Text.Json.Serialization.JsonPropertyName("UserId")] [System.Xml.Serialization.XmlElement("UserId")] public string UserId { get; set; } = default!; } @@ -50,6 +56,8 @@ /// /// 获取或设置审批人成员账号。 /// + [Newtonsoft.Json.JsonProperty("UserId")] + [System.Text.Json.Serialization.JsonPropertyName("UserId")] [System.Xml.Serialization.XmlElement("UserId")] public string UserId { get; set; } = default!; } @@ -58,30 +66,40 @@ /// /// 获取或设置审批人信息。 /// + [Newtonsoft.Json.JsonProperty("Approver")] + [System.Text.Json.Serialization.JsonPropertyName("Approver")] [System.Xml.Serialization.XmlElement("Approver")] public Types.Approver Approver { get; set; } = default!; /// /// 获取或设置分支审批状态。 /// + [Newtonsoft.Json.JsonProperty("SpStatus")] + [System.Text.Json.Serialization.JsonPropertyName("SpStatus")] [System.Xml.Serialization.XmlElement("SpStatus")] public int ApproveStatus { get; set; } /// /// 获取或设置分支审批时间戳。 /// + [Newtonsoft.Json.JsonProperty("SpTime")] + [System.Text.Json.Serialization.JsonPropertyName("SpTime")] [System.Xml.Serialization.XmlElement("SpTime", IsNullable = true)] public long? ApproveTimestamp { get; set; } /// /// 获取或设置审批意见。 /// + [Newtonsoft.Json.JsonProperty("Speech")] + [System.Text.Json.Serialization.JsonPropertyName("Speech")] [System.Xml.Serialization.XmlElement("Speech", IsNullable = true)] public string? Speech { get; set; } /// /// 获取或设置审批意见附件 MediaId 列表。 /// + [Newtonsoft.Json.JsonProperty("Attach")] + [System.Text.Json.Serialization.JsonPropertyName("Attach")] [System.Xml.Serialization.XmlElement("Attach", Type = typeof(string), IsNullable = true)] public string[]? SpeechMediaIdList { get; set; } } @@ -90,18 +108,24 @@ /// /// 获取或设置节点审批状态。 /// + [Newtonsoft.Json.JsonProperty("SpStatus")] + [System.Text.Json.Serialization.JsonPropertyName("SpStatus")] [System.Xml.Serialization.XmlElement("SpStatus")] public int ApproveStatus { get; set; } /// /// 获取或设置审批方式。 /// + [Newtonsoft.Json.JsonProperty("ApproverAttr")] + [System.Text.Json.Serialization.JsonPropertyName("ApproverAttr")] [System.Xml.Serialization.XmlElement("ApproverAttr")] public int ApproveType { get; set; } /// /// 获取或设置审批流程详情列表。 /// + [Newtonsoft.Json.JsonProperty("Details")] + [System.Text.Json.Serialization.JsonPropertyName("Details")] [System.Xml.Serialization.XmlElement("Details", typeof(Types.RecordDetail))] public Types.RecordDetail[] DetailList { get; set; } = default!; } @@ -115,6 +139,8 @@ /// /// 获取或设置评论人成员账号。 /// + [Newtonsoft.Json.JsonProperty("UserId")] + [System.Text.Json.Serialization.JsonPropertyName("UserId")] [System.Xml.Serialization.XmlElement("UserId")] public string UserId { get; set; } = default!; } @@ -123,30 +149,40 @@ /// /// 获取或设置评论 ID。 /// + [Newtonsoft.Json.JsonProperty("CommentId")] + [System.Text.Json.Serialization.JsonPropertyName("CommentId")] [System.Xml.Serialization.XmlElement("CommentId")] public string CommentId { get; set; } = default!; /// /// 获取或设置评论人信息。 /// + [Newtonsoft.Json.JsonProperty("CommentUserInfo")] + [System.Text.Json.Serialization.JsonPropertyName("CommentUserInfo")] [System.Xml.Serialization.XmlElement("CommentUserInfo")] public Types.CommentUser CommentUser { get; set; } = default!; /// /// 获取或设置评论内容。 /// + [Newtonsoft.Json.JsonProperty("CommentContent")] + [System.Text.Json.Serialization.JsonPropertyName("CommentContent")] [System.Xml.Serialization.XmlElement("CommentContent")] public string Content { get; set; } = default!; /// /// 获取或设置评论内容附件 MediaId 列表。 /// + [Newtonsoft.Json.JsonProperty("Attach")] + [System.Text.Json.Serialization.JsonPropertyName("Attach")] [System.Xml.Serialization.XmlElement("Attach", Type = typeof(string))] public string[] MediaIdList { get; set; } = default!; /// /// 获取或设置评论时间戳。 /// + [Newtonsoft.Json.JsonProperty("CommentTime")] + [System.Text.Json.Serialization.JsonPropertyName("CommentTime")] [System.Xml.Serialization.XmlElement("CommentTime")] public long CreateTimestamp { get; set; } } @@ -155,60 +191,80 @@ /// /// 获取或设置审批申请状态变化类型。 /// + [Newtonsoft.Json.JsonProperty("StatuChangeEvent")] + [System.Text.Json.Serialization.JsonPropertyName("StatuChangeEvent")] [System.Xml.Serialization.XmlElement("StatuChangeEvent")] public int StatusChangeEvent { get; set; } /// /// 获取或设置审批单号。 /// + [Newtonsoft.Json.JsonProperty("SpNo")] + [System.Text.Json.Serialization.JsonPropertyName("SpNo")] [System.Xml.Serialization.XmlElement("SpNo")] public string ApprovalNumber { get; set; } = default!; /// /// 获取或设置审批单名称。 /// + [Newtonsoft.Json.JsonProperty("SpName")] + [System.Text.Json.Serialization.JsonPropertyName("SpName")] [System.Xml.Serialization.XmlElement("SpName")] public string Name { get; set; } = default!; /// /// 获取或设置审批单状态。 /// + [Newtonsoft.Json.JsonProperty("SpStatus")] + [System.Text.Json.Serialization.JsonPropertyName("SpStatus")] [System.Xml.Serialization.XmlElement("SpStatus")] public int Status { get; set; } /// /// 获取或设置审批模板 ID。 /// + [Newtonsoft.Json.JsonProperty("TemplateId")] + [System.Text.Json.Serialization.JsonPropertyName("TemplateId")] [System.Xml.Serialization.XmlElement("TemplateId")] public string TemplateId { get; set; } = default!; /// /// 获取或设置申请人信息。 /// + [Newtonsoft.Json.JsonProperty("Applyer")] + [System.Text.Json.Serialization.JsonPropertyName("Applyer")] [System.Xml.Serialization.XmlElement("Applyer")] public Types.Applicant Applicant { get; set; } = default!; /// /// 获取或设置申请时间戳。 /// + [Newtonsoft.Json.JsonProperty("ApplyTime")] + [System.Text.Json.Serialization.JsonPropertyName("ApplyTime")] [System.Xml.Serialization.XmlElement("ApplyTime")] public long ApplyTimestamp { get; set; } /// /// 获取或设置抄送人列表。 /// + [Newtonsoft.Json.JsonProperty("Notifyer")] + [System.Text.Json.Serialization.JsonPropertyName("Notifyer")] [System.Xml.Serialization.XmlElement("Notifyer", Type = typeof(Types.Notifier))] public Types.Notifier[]? NotifyerList { get; set; } /// /// 获取或设置审批流程列表。 /// + [Newtonsoft.Json.JsonProperty("SpRecord")] + [System.Text.Json.Serialization.JsonPropertyName("SpRecord")] [System.Xml.Serialization.XmlElement("SpRecord", Type = typeof(Types.Record))] public Types.Record[] RecordList { get; set; } = default!; /// /// 获取或设置评论列表。 /// + [Newtonsoft.Json.JsonProperty("Comments")] + [System.Text.Json.Serialization.JsonPropertyName("Comments")] [System.Xml.Serialization.XmlElement("Comments", Type = typeof(Types.Comment))] public Types.Comment[] CommentList { get; set; } = default!; } @@ -217,12 +273,16 @@ /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置审批单信息。 /// + [Newtonsoft.Json.JsonProperty("ApprovalInfo")] + [System.Text.Json.Serialization.JsonPropertyName("ApprovalInfo")] [System.Xml.Serialization.XmlElement("ApprovalInfo")] public Types.Approval Approval { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Batch/BatchJobResultEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Batch/BatchJobResultEvent.cs index fa6454f4..e70f57e0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Batch/BatchJobResultEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Batch/BatchJobResultEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.batch_job_result 事件的数据。 @@ -11,7 +11,7 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90858 /// REF: https://developer.work.weixin.qq.com/document/path/95797 /// - public class BatchJobResultEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class BatchJobResultEvent : WechatWorkEvent { public static class Types { @@ -20,24 +20,32 @@ /// /// 获取或设置任务 ID。 /// + [Newtonsoft.Json.JsonProperty("JobId")] + [System.Text.Json.Serialization.JsonPropertyName("JobId")] [System.Xml.Serialization.XmlElement("JobId")] public string JobId { get; set; } = default!; /// /// 获取或设置任务类型。 /// + [Newtonsoft.Json.JsonProperty("JobType")] + [System.Text.Json.Serialization.JsonPropertyName("JobType")] [System.Xml.Serialization.XmlElement("JobType")] public string Type { get; set; } = default!; /// /// 获取或设置错误码。 /// + [Newtonsoft.Json.JsonProperty("ErrCode")] + [System.Text.Json.Serialization.JsonPropertyName("ErrCode")] [System.Xml.Serialization.XmlElement("ErrCode")] public int ErrorCode { get; set; } /// /// 获取或设置错误信息。 /// + [Newtonsoft.Json.JsonProperty("ErrMsg")] + [System.Text.Json.Serialization.JsonPropertyName("ErrMsg")] [System.Xml.Serialization.XmlElement("ErrMsg", IsNullable = true)] public string? ErrorMessage { get; set; } } @@ -46,6 +54,8 @@ /// /// 获取或设置异步任务信息。 /// + [Newtonsoft.Json.JsonProperty("BatchJob")] + [System.Text.Json.Serialization.JsonPropertyName("BatchJob")] [System.Xml.Serialization.XmlElement("BatchJob")] public Types.BatchJob BatchJob { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Chain/ChangeChainEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Chain/ChangeChainEvent.cs index acfeb233..6b108ee5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Chain/ChangeChainEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Chain/ChangeChainEvent.cs @@ -1,10 +1,10 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.change_chain 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/95796 /// - public class ChangeChainEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ChangeChainEvent : WechatWorkEvent { public static class Types { @@ -13,6 +13,8 @@ /// /// 获取或设置分组 ID 列表。 /// + [Newtonsoft.Json.JsonProperty("GroupId")] + [System.Text.Json.Serialization.JsonPropertyName("GroupId")] [System.Xml.Serialization.XmlElement("GroupId", Type = typeof(int))] public int[] Items { get; set; } = default!; } @@ -22,6 +24,8 @@ /// /// 获取或设置企业 ID 列表。 /// + [Newtonsoft.Json.JsonProperty("CorpId")] + [System.Text.Json.Serialization.JsonPropertyName("CorpId")] [System.Xml.Serialization.XmlElement("CorpId", Type = typeof(string))] public string[] Items { get; set; } = default!; } @@ -30,24 +34,32 @@ /// /// 获取或设置变更类型。 /// + [Newtonsoft.Json.JsonProperty("ChangeType")] + [System.Text.Json.Serialization.JsonPropertyName("ChangeType")] [System.Xml.Serialization.XmlElement("ChangeType")] public string ChangeType { get; set; } = default!; /// /// 获取或设置上下游 ID。 /// + [Newtonsoft.Json.JsonProperty("ChainId")] + [System.Text.Json.Serialization.JsonPropertyName("ChainId")] [System.Xml.Serialization.XmlElement("ChainId")] public string ChainId { get; set; } = default!; /// /// 获取或设置分组 ID 列表。 /// + [Newtonsoft.Json.JsonProperty("GroupIds")] + [System.Text.Json.Serialization.JsonPropertyName("GroupIds")] [System.Xml.Serialization.XmlElement("GroupIds", IsNullable = true)] public Types.GroupIdList? GroupIdList { get; set; } /// /// 获取或设置企业 ID 列表。 /// + [Newtonsoft.Json.JsonProperty("CorpIds")] + [System.Text.Json.Serialization.JsonPropertyName("CorpIds")] [System.Xml.Serialization.XmlElement("CorpIds", IsNullable = true)] public Types.CorpIdList? CorpIdList { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Contact/ChangeContactEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Contact/ChangeContactEvent.cs index 10580be8..411331fd 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Contact/ChangeContactEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Contact/ChangeContactEvent.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.Work.Events { @@ -20,7 +20,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// REF: https://developer.work.weixin.qq.com/document/path/90798 /// REF: https://developer.work.weixin.qq.com/document/path/90858 /// - public class ChangeContactEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ChangeContactEvent : WechatWorkEvent { public static class Types { @@ -33,24 +33,32 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置属性类型。 /// + [Newtonsoft.Json.JsonProperty("Type")] + [System.Text.Json.Serialization.JsonPropertyName("Type")] [System.Xml.Serialization.XmlElement("Type")] public int Type { get; set; } /// /// 获取或设置属性名称。 /// + [Newtonsoft.Json.JsonProperty("Name")] + [System.Text.Json.Serialization.JsonPropertyName("Name")] [System.Xml.Serialization.XmlElement("Name")] public string Name { get; set; } = default!; /// /// 获取或设置文本属性值。 /// + [Newtonsoft.Json.JsonProperty("Text")] + [System.Text.Json.Serialization.JsonPropertyName("Text")] [System.Xml.Serialization.XmlElement("Text", IsNullable = true)] public TextAttribute? Text { get; set; } /// /// 获取或设置网页属性值。 /// + [Newtonsoft.Json.JsonProperty("Web")] + [System.Text.Json.Serialization.JsonPropertyName("Web")] [System.Xml.Serialization.XmlElement("Web", IsNullable = true)] public WebAttribute? Web { get; set; } } @@ -60,6 +68,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置文本内容。 /// + [Newtonsoft.Json.JsonProperty("Value")] + [System.Text.Json.Serialization.JsonPropertyName("Value")] [System.Xml.Serialization.XmlElement("Value")] public string Value { get; set; } = default!; } @@ -69,12 +79,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置网页标题。 /// + [Newtonsoft.Json.JsonProperty("Title")] + [System.Text.Json.Serialization.JsonPropertyName("Title")] [System.Xml.Serialization.XmlElement("Title")] public string Title { get; set; } = default!; /// /// 获取或设置网页 URL。 /// + [Newtonsoft.Json.JsonProperty("Url")] + [System.Text.Json.Serialization.JsonPropertyName("Url")] [System.Xml.Serialization.XmlElement("Url")] public string Url { get; set; } = default!; } @@ -83,6 +97,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置自定义字段列表。 /// + [Newtonsoft.Json.JsonProperty("Item")] + [System.Text.Json.Serialization.JsonPropertyName("Item")] [System.Xml.Serialization.XmlElement("Item", Type = typeof(Types.Attribute))] public Types.Attribute[] AttributeList { get; set; } = default!; } @@ -91,36 +107,48 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId", IsNullable = true)] public string? SuiteId { get; set; } /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId", IsNullable = true)] public string? AuthorizerCorpId { get; set; } /// /// 获取或设置变更类型。 /// + [Newtonsoft.Json.JsonProperty("ChangeType")] + [System.Text.Json.Serialization.JsonPropertyName("ChangeType")] [System.Xml.Serialization.XmlElement("ChangeType")] public string ChangeType { get; set; } = default!; /// /// 获取或设置成员、部门或标签名称。 /// + [Newtonsoft.Json.JsonProperty("Name")] + [System.Text.Json.Serialization.JsonPropertyName("Name")] [System.Xml.Serialization.XmlElement("Name")] public string Name { get; set; } = default!; /// /// 获取或设置用户成员账号。 /// + [Newtonsoft.Json.JsonProperty("UserID")] + [System.Text.Json.Serialization.JsonPropertyName("UserID")] [System.Xml.Serialization.XmlElement("UserID", IsNullable = true)] public string? UserId { get; set; } /// /// 获取或设置新的用户成员账号。 /// + [Newtonsoft.Json.JsonProperty("NewUserID")] + [System.Text.Json.Serialization.JsonPropertyName("NewUserID")] [System.Xml.Serialization.XmlElement("NewUserID", IsNullable = true)] public string? NewUserId { get; set; } @@ -128,12 +156,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 获取或设置用户成员别名。 /// [Obsolete("相关接口或字段于 2022-08-15 下线。")] + [Newtonsoft.Json.JsonProperty("Alias")] + [System.Text.Json.Serialization.JsonPropertyName("Alias")] [System.Xml.Serialization.XmlElement("Alias", IsNullable = true)] public string? UserAlias { get; set; } /// /// 获取或设置用户所在部门 ID（以逗号分割）。 /// + [Newtonsoft.Json.JsonProperty("Department")] + [System.Text.Json.Serialization.JsonPropertyName("Department")] [System.Xml.Serialization.XmlElement("Department", IsNullable = true)] public string? UserDepartmentIds { get; set; } @@ -141,6 +173,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 获取或设置用户的部门领导状态（以逗号分割）。 /// [Obsolete("相关接口或字段于 2022-08-15 下线。")] + [Newtonsoft.Json.JsonProperty("IsLeaderInDept")] + [System.Text.Json.Serialization.JsonPropertyName("IsLeaderInDept")] [System.Xml.Serialization.XmlElement("IsLeaderInDept", IsNullable = true)] public string? UserDepartmentLeaderStatus { get; set; } @@ -148,6 +182,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 获取或设置用户的主部门 ID。 /// [Obsolete("相关接口或字段于 2022-08-15 下线。")] + [Newtonsoft.Json.JsonProperty("MainDepartment")] + [System.Text.Json.Serialization.JsonPropertyName("MainDepartment")] [System.Xml.Serialization.XmlElement("MainDepartment", IsNullable = true)] public long? UserMainDepartmentId { get; set; } @@ -155,6 +191,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 获取或设置用户邮箱。 /// [Obsolete("相关接口或字段于 2022-08-15 下线。")] + [Newtonsoft.Json.JsonProperty("Email")] + [System.Text.Json.Serialization.JsonPropertyName("Email")] [System.Xml.Serialization.XmlElement("Email", IsNullable = true)] public string? UserEmail { get; set; } @@ -162,6 +200,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 获取或设置用户企业邮箱。 /// [Obsolete("相关接口或字段于 2022-08-15 下线。")] + [Newtonsoft.Json.JsonProperty("BizMail")] + [System.Text.Json.Serialization.JsonPropertyName("BizMail")] [System.Xml.Serialization.XmlElement("BizMail", IsNullable = true)] public string? UserBusinessEmail { get; set; } @@ -169,6 +209,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 获取或设置用户手机号码。 /// [Obsolete("相关接口或字段于 2022-08-15 下线。")] + [Newtonsoft.Json.JsonProperty("Mobile")] + [System.Text.Json.Serialization.JsonPropertyName("Mobile")] [System.Xml.Serialization.XmlElement("Mobile", IsNullable = true)] public string? UserMobileNumber { get; set; } @@ -176,6 +218,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 获取或设置用户座机号码。 /// [Obsolete("相关接口或字段于 2022-08-15 下线。")] + [Newtonsoft.Json.JsonProperty("Telephone")] + [System.Text.Json.Serialization.JsonPropertyName("Telephone")] [System.Xml.Serialization.XmlElement("Telephone", IsNullable = true)] public string? UserTeleNumber { get; set; } @@ -183,6 +227,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 获取或设置用户性别。 /// [Obsolete("相关接口或字段于 2022-08-15 下线。")] + [Newtonsoft.Json.JsonProperty("Gender")] + [System.Text.Json.Serialization.JsonPropertyName("Gender")] [System.Xml.Serialization.XmlElement("Gender", IsNullable = true)] public int? UserGender { get; set; } @@ -190,6 +236,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 获取或设置用户地址。 /// [Obsolete("相关接口或字段于 2022-08-15 下线。")] + [Newtonsoft.Json.JsonProperty("Address")] + [System.Text.Json.Serialization.JsonPropertyName("Address")] [System.Xml.Serialization.XmlElement("Address", IsNullable = true)] public string? UserAddress { get; set; } @@ -197,6 +245,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 获取或设置用户职务。 /// [Obsolete("相关接口或字段于 2022-08-15 下线。")] + [Newtonsoft.Json.JsonProperty("Position")] + [System.Text.Json.Serialization.JsonPropertyName("Position")] [System.Xml.Serialization.XmlElement("Position", IsNullable = true)] public string? UserPosition { get; set; } @@ -204,6 +254,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 获取或设置用户头像 URL。 /// [Obsolete("相关接口或字段于 2022-08-15 下线。")] + [Newtonsoft.Json.JsonProperty("Avatar")] + [System.Text.Json.Serialization.JsonPropertyName("Avatar")] [System.Xml.Serialization.XmlElement("Avatar", IsNullable = true)] public string? UserAvatarUrl { get; set; } @@ -211,6 +263,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 获取或设置用户激活状态。 /// [Obsolete("相关接口或字段于 2022-08-15 下线。")] + [Newtonsoft.Json.JsonProperty("Status")] + [System.Text.Json.Serialization.JsonPropertyName("Status")] [System.Xml.Serialization.XmlElement("Status", IsNullable = true)] public int? UserStatus { get; set; } @@ -218,18 +272,24 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 获取或设置用户自定义字段信息。 /// [Obsolete("相关接口或字段于 2022-08-15 下线。")] + [Newtonsoft.Json.JsonProperty("ExtAttr")] + [System.Text.Json.Serialization.JsonPropertyName("ExtAttr")] [System.Xml.Serialization.XmlElement("ExtAttr", IsNullable = true)] public Types.ExtendedAttribute? UserExtendedAttribute { get; set; } /// /// 获取或设置部门 ID。 /// + [Newtonsoft.Json.JsonProperty("Id")] + [System.Text.Json.Serialization.JsonPropertyName("Id")] [System.Xml.Serialization.XmlElement("Id", IsNullable = true)] public long? DepartmentId { get; set; } /// /// 获取或设置上级部门 ID。 /// + [Newtonsoft.Json.JsonProperty("ParentId")] + [System.Text.Json.Serialization.JsonPropertyName("ParentId")] [System.Xml.Serialization.XmlElement("ParentId", IsNullable = true)] public string? DepartmentParentId { get; set; } @@ -237,36 +297,48 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 获取或设置部门次序值。 /// [Obsolete("相关接口或字段于 2022-08-15 下线。")] + [Newtonsoft.Json.JsonProperty("Order")] + [System.Text.Json.Serialization.JsonPropertyName("Order")] [System.Xml.Serialization.XmlElement("Order", IsNullable = true)] public long? DepartmentOrder { get; set; } /// /// 获取或设置标签 ID。 /// + [Newtonsoft.Json.JsonProperty("TagId")] + [System.Text.Json.Serialization.JsonPropertyName("TagId")] [System.Xml.Serialization.XmlElement("TagId", IsNullable = true)] public int? TagId { get; set; } /// /// 获取或设置标签中新增的成员账号（以逗号分隔）。 /// + [Newtonsoft.Json.JsonProperty("AddUserItems")] + [System.Text.Json.Serialization.JsonPropertyName("AddUserItems")] [System.Xml.Serialization.XmlElement("AddUserItems", IsNullable = true)] public string? TagAddedUserIds { get; set; } /// /// 获取或设置标签中删除的成员账号（以逗号分隔）。 /// + [Newtonsoft.Json.JsonProperty("DelUserItems")] + [System.Text.Json.Serialization.JsonPropertyName("DelUserItems")] [System.Xml.Serialization.XmlElement("DelUserItems", IsNullable = true)] public string? TagRemovedUserIds { get; set; } /// /// 获取或设置标签中新增的部门 ID（以逗号分隔）。 /// + [Newtonsoft.Json.JsonProperty("AddPartyItems")] + [System.Text.Json.Serialization.JsonPropertyName("AddPartyItems")] [System.Xml.Serialization.XmlElement("AddPartyItems", IsNullable = true)] public string? TagAddedDepartmentIds { get; set; } /// /// 获取或设置标签中删除的部门 ID（以逗号分隔）。 /// + [Newtonsoft.Json.JsonProperty("DelPartyItems")] + [System.Text.Json.Serialization.JsonPropertyName("DelPartyItems")] [System.Xml.Serialization.XmlElement("DelPartyItems", IsNullable = true)] public string? TagRemovedDepartmentIds { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/CustomerAcquisition/CustomerAcquisitionEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/CustomerAcquisition/CustomerAcquisitionEvent.cs index f2cfd9f9..de82c51b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/CustomerAcquisition/CustomerAcquisitionEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/CustomerAcquisition/CustomerAcquisitionEvent.cs @@ -4,41 +4,53 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 表示 EVENT.customer_acquisition 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/97299 /// - public class CustomerAcquisitionEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class CustomerAcquisitionEvent : WechatWorkEvent { /// /// 获取或设置变更类型。 /// + [Newtonsoft.Json.JsonProperty("ChangeType")] + [System.Text.Json.Serialization.JsonPropertyName("ChangeType")] [System.Xml.Serialization.XmlElement("ChangeType")] public string ChangeType { get; set; } = default!; /// /// 获取或设置获客链接 ID。 /// + [Newtonsoft.Json.JsonProperty("LinkId")] + [System.Text.Json.Serialization.JsonPropertyName("LinkId")] [System.Xml.Serialization.XmlElement("LinkId", IsNullable = true)] public string? LinkId { get; set; } /// /// 获取或设置企业服务人员的成员账号。 /// + [Newtonsoft.Json.JsonProperty("UserID")] + [System.Text.Json.Serialization.JsonPropertyName("UserID")] [System.Xml.Serialization.XmlElement("UserID", IsNullable = true)] public string? UserId { get; set; } /// /// 获取或设置外部联系人 ID。 /// + [Newtonsoft.Json.JsonProperty("ExternalUserID")] + [System.Text.Json.Serialization.JsonPropertyName("ExternalUserID")] [System.Xml.Serialization.XmlElement("ExternalUserID", IsNullable = true)] public string? ExternalUserId { get; set; } /// /// 获取或设置过期时间戳戳。 /// + [Newtonsoft.Json.JsonProperty("ExpireTime")] + [System.Text.Json.Serialization.JsonPropertyName("ExpireTime")] [System.Xml.Serialization.XmlElement("ExpireTime", IsNullable = true)] public long? ExpireTimestamp { get; set; } /// /// 获取或设置过期获客额度数。 /// + [Newtonsoft.Json.JsonProperty("ExpireQuotaNum")] + [System.Text.Json.Serialization.JsonPropertyName("ExpireQuotaNum")] [System.Xml.Serialization.XmlElement("ExpireQuotaNum", IsNullable = true)] public int? ExpireQuota { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/AddDeviceEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/AddDeviceEvent.cs index 46bcf8be..9a949aba 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/AddDeviceEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/AddDeviceEvent.cs @@ -1,38 +1,48 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.add_device 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/90751 /// - public class AddDeviceEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class AddDeviceEvent : WechatWorkEvent { /// /// 获取或设置服务商 CorpId。 /// + [Newtonsoft.Json.JsonProperty("ServiceCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("ServiceCorpId")] [System.Xml.Serialization.XmlElement("ServiceCorpId")] public string ServiceCorpId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId", IsNullable = true)] public string? AuthorizerCorpId { get; set; } /// /// 获取或设置设备序列号。 /// + [Newtonsoft.Json.JsonProperty("DeviceSn")] + [System.Text.Json.Serialization.JsonPropertyName("DeviceSn")] [System.Xml.Serialization.XmlElement("DeviceSn")] public string DeviceSerialNumber { get; set; } = default!; /// /// 获取或设置设备型号 ID。 /// + [Newtonsoft.Json.JsonProperty("ModelId")] + [System.Text.Json.Serialization.JsonPropertyName("ModelId")] [System.Xml.Serialization.XmlElement("ModelId")] public string ModelId { get; set; } = default!; /// /// 获取或设置设备备注名称。 /// + [Newtonsoft.Json.JsonProperty("RemarkName")] + [System.Text.Json.Serialization.JsonPropertyName("RemarkName")] [System.Xml.Serialization.XmlElement("RemarkName")] public string? RemarkName { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/ConnectInfoEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/ConnectInfoEvent.cs index 760828c8..fd31bddf 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/ConnectInfoEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/ConnectInfoEvent.cs @@ -1,32 +1,40 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.connect_info 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/90751 /// - public class ConnectInfoEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ConnectInfoEvent : WechatWorkEvent { /// /// 获取或设置服务商 CorpId。 /// + [Newtonsoft.Json.JsonProperty("ServiceCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("ServiceCorpId")] [System.Xml.Serialization.XmlElement("ServiceCorpId")] public string ServiceCorpId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId", IsNullable = true)] public string? AuthorizerCorpId { get; set; } /// /// 获取或设置设备序列号。 /// + [Newtonsoft.Json.JsonProperty("DeviceSn")] + [System.Text.Json.Serialization.JsonPropertyName("DeviceSn")] [System.Xml.Serialization.XmlElement("DeviceSn")] public string DeviceSerialNumber { get; set; } = default!; /// /// 获取或设置设备成功连接企业微信后台时的时间戳。 /// + [Newtonsoft.Json.JsonProperty("ConnectTime")] + [System.Text.Json.Serialization.JsonPropertyName("ConnectTime")] [System.Xml.Serialization.XmlElement("ConnectTime")] public long ConnectTimestamp { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/DeleteDeviceEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/DeleteDeviceEvent.cs index 61a7cb7d..1cb731a9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/DeleteDeviceEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/DeleteDeviceEvent.cs @@ -1,26 +1,32 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.del_device 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/90751 /// - public class DeleteDeviceEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class DeleteDeviceEvent : WechatWorkEvent { /// /// 获取或设置服务商 CorpId。 /// + [Newtonsoft.Json.JsonProperty("ServiceCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("ServiceCorpId")] [System.Xml.Serialization.XmlElement("ServiceCorpId")] public string ServiceCorpId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId", IsNullable = true)] public string? AuthorizerCorpId { get; set; } /// /// 获取或设置设备序列号。 /// + [Newtonsoft.Json.JsonProperty("DeviceSn")] + [System.Text.Json.Serialization.JsonPropertyName("DeviceSn")] [System.Xml.Serialization.XmlElement("DeviceSn")] public string DeviceSerialNumber { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/DeviceFeatureChangeEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/DeviceFeatureChangeEvent.cs index f4a57267..e650ef6f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/DeviceFeatureChangeEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/DeviceFeatureChangeEvent.cs @@ -1,26 +1,32 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.device_feature_change 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/90751 /// - public class DeviceFeatureChangeEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class DeviceFeatureChangeEvent : WechatWorkEvent { /// /// 获取或设置服务商 CorpId。 /// + [Newtonsoft.Json.JsonProperty("ServiceCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("ServiceCorpId")] [System.Xml.Serialization.XmlElement("ServiceCorpId")] public string ServiceCorpId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId", IsNullable = true)] public string? AuthorizerCorpId { get; set; } /// /// 获取或设置设备序列号。 /// + [Newtonsoft.Json.JsonProperty("DeviceSn")] + [System.Text.Json.Serialization.JsonPropertyName("DeviceSn")] [System.Xml.Serialization.XmlElement("DeviceSn")] public string DeviceSerialNumber { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/DisconnectInfoEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/DisconnectInfoEvent.cs index 2635408c..f1a9f200 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/DisconnectInfoEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/DisconnectInfoEvent.cs @@ -1,38 +1,48 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.disconnect_info 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/90751 /// - public class DisconnectInfoEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class DisconnectInfoEvent : WechatWorkEvent { /// /// 获取或设置服务商 CorpId。 /// + [Newtonsoft.Json.JsonProperty("ServiceCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("ServiceCorpId")] [System.Xml.Serialization.XmlElement("ServiceCorpId")] public string ServiceCorpId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId", IsNullable = true)] public string? AuthorizerCorpId { get; set; } /// /// 获取或设置设备序列号。 /// + [Newtonsoft.Json.JsonProperty("DeviceSn")] + [System.Text.Json.Serialization.JsonPropertyName("DeviceSn")] [System.Xml.Serialization.XmlElement("DeviceSn")] public string DeviceSerialNumber { get; set; } = default!; /// /// 获取或设置设备与企业微信后台网络连接断开时的时间戳。 /// + [Newtonsoft.Json.JsonProperty("DisconnectTime")] + [System.Text.Json.Serialization.JsonPropertyName("DisconnectTime")] [System.Xml.Serialization.XmlElement("DisconnectTime")] public long DiconnectTimestamp { get; set; } /// /// 获取或设置设备连接断开原因。 /// + [Newtonsoft.Json.JsonProperty("Reason")] + [System.Text.Json.Serialization.JsonPropertyName("Reason")] [System.Xml.Serialization.XmlElement("Reason")] public string DisconnectReason { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/ErrorReportEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/ErrorReportEvent.cs index 53ac3af8..fdb04b82 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/ErrorReportEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/ErrorReportEvent.cs @@ -1,38 +1,48 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.error_report 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/90751 /// - public class ErrorReportEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ErrorReportEvent : WechatWorkEvent { /// /// 获取或设置服务商 CorpId。 /// + [Newtonsoft.Json.JsonProperty("ServiceCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("ServiceCorpId")] [System.Xml.Serialization.XmlElement("ServiceCorpId")] public string ServiceCorpId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId", IsNullable = true)] public string? AuthorizerCorpId { get; set; } /// /// 获取或设置设备序列号。 /// + [Newtonsoft.Json.JsonProperty("DeviceSn")] + [System.Text.Json.Serialization.JsonPropertyName("DeviceSn")] [System.Xml.Serialization.XmlElement("DeviceSn")] public string DeviceSerialNumber { get; set; } = default!; /// /// 获取或设置设备上报的错误码。 /// + [Newtonsoft.Json.JsonProperty("ErrCode")] + [System.Text.Json.Serialization.JsonPropertyName("ErrCode")] [System.Xml.Serialization.XmlElement("ErrCode")] public int ErrorCode { get; set; } /// /// 获取或设置设备上报的错误信息。 /// + [Newtonsoft.Json.JsonProperty("ErrMsg")] + [System.Text.Json.Serialization.JsonPropertyName("ErrMsg")] [System.Xml.Serialization.XmlElement("ErrMsg")] public string? ErrorMessage { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/FetchLogFinishEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/FetchLogFinishEvent.cs index 1277d803..f7aa01dd 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/FetchLogFinishEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/FetchLogFinishEvent.cs @@ -1,32 +1,40 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.fetch_log_finish 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/90751 /// - public class FetchLogFinishEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class FetchLogFinishEvent : WechatWorkEvent { /// /// 获取或设置服务商 CorpId。 /// + [Newtonsoft.Json.JsonProperty("ServiceCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("ServiceCorpId")] [System.Xml.Serialization.XmlElement("ServiceCorpId")] public string ServiceCorpId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId", IsNullable = true)] public string? AuthorizerCorpId { get; set; } /// /// 获取或设置设备序列号。 /// + [Newtonsoft.Json.JsonProperty("DeviceSn")] + [System.Text.Json.Serialization.JsonPropertyName("DeviceSn")] [System.Xml.Serialization.XmlElement("DeviceSn")] public string DeviceSerialNumber { get; set; } = default!; /// /// 获取或设置日志文件的 MediaId。 /// + [Newtonsoft.Json.JsonProperty("MediaId")] + [System.Text.Json.Serialization.JsonPropertyName("MediaId")] [System.Xml.Serialization.XmlElement("MediaId")] public string MediaId { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/RemarkDeviceNameEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/RemarkDeviceNameEvent.cs index 19f6228e..039a1d55 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/RemarkDeviceNameEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Device/RemarkDeviceNameEvent.cs @@ -1,32 +1,40 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.remark_device_name 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/90751 /// - public class RemarkDeviceNameEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class RemarkDeviceNameEvent : WechatWorkEvent { /// /// 获取或设置服务商 CorpId。 /// + [Newtonsoft.Json.JsonProperty("ServiceCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("ServiceCorpId")] [System.Xml.Serialization.XmlElement("ServiceCorpId")] public string ServiceCorpId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId", IsNullable = true)] public string? AuthorizerCorpId { get; set; } /// /// 获取或设置设备序列号。 /// + [Newtonsoft.Json.JsonProperty("DeviceSn")] + [System.Text.Json.Serialization.JsonPropertyName("DeviceSn")] [System.Xml.Serialization.XmlElement("DeviceSn")] public string DeviceSerialNumber { get; set; } = default!; /// /// 获取或设置设备备注名称。 /// + [Newtonsoft.Json.JsonProperty("RemarkName")] + [System.Text.Json.Serialization.JsonPropertyName("RemarkName")] [System.Xml.Serialization.XmlElement("RemarkName")] public string RemarkName { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/DeviceData/DeviceDataAuthChangeEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/DeviceData/DeviceDataAuthChangeEvent.cs index ea88bff6..9d623b8c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/DeviceData/DeviceDataAuthChangeEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/DeviceData/DeviceDataAuthChangeEvent.cs @@ -1,26 +1,32 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.device_data_auth_change 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/96103 /// - public class DeviceDataAuthChangeEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class DeviceDataAuthChangeEvent : WechatWorkEvent { /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId")] public string SuiteId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId")] public string AuthorizerCorpId { get; set; } = default!; /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Exmail/AppEmailChangeEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Exmail/AppEmailChangeEvent.cs index fe7d87f4..b9c1a8ef 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Exmail/AppEmailChangeEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Exmail/AppEmailChangeEvent.cs @@ -1,20 +1,24 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.app_email_change 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/97506 /// - public class AppEmailChangeEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class AppEmailChangeEvent : WechatWorkEvent { /// /// 获取或设置变更类型。 /// + [Newtonsoft.Json.JsonProperty("ChangeType")] + [System.Text.Json.Serialization.JsonPropertyName("ChangeType")] [System.Xml.Serialization.XmlElement("ChangeType")] public string ChangeType { get; set; } = default!; /// /// 获取或设置新邮件数。 /// + [Newtonsoft.Json.JsonProperty("Amount")] + [System.Text.Json.Serialization.JsonPropertyName("Amount")] [System.Xml.Serialization.XmlElement("Amount")] public int MailCount { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/ExternalContact/ChangeExternalChatEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/ExternalContact/ChangeExternalChatEvent.cs index 9ebaa6bb..600a0c54 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/ExternalContact/ChangeExternalChatEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/ExternalContact/ChangeExternalChatEvent.cs @@ -5,7 +5,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// REF: https://developer.work.weixin.qq.com/document/path/92130 /// REF: https://developer.work.weixin.qq.com/document/path/92277 /// - public class ChangeExternalChatEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ChangeExternalChatEvent : WechatWorkEvent { public static class Types { @@ -14,6 +14,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置成员账号列表。 /// + [Newtonsoft.Json.JsonProperty("Item")] + [System.Text.Json.Serialization.JsonPropertyName("Item")] [System.Xml.Serialization.XmlElement("Item")] public string[] Items { get; set; } = default!; } @@ -22,66 +24,88 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId", IsNullable = true)] public string? SuiteId { get; set; } /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId", IsNullable = true)] public string? AuthorizerCorpId { get; set; } /// /// 获取或设置变更类型。 /// + [Newtonsoft.Json.JsonProperty("ChangeType")] + [System.Text.Json.Serialization.JsonPropertyName("ChangeType")] [System.Xml.Serialization.XmlElement("ChangeType")] public string ChangeType { get; set; } = default!; /// /// 获取或设置客户群 ID。 /// + [Newtonsoft.Json.JsonProperty("ChatId")] + [System.Text.Json.Serialization.JsonPropertyName("ChatId")] [System.Xml.Serialization.XmlElement("ChatId", IsNullable = true)] public string? GroupChatId { get; set; } /// /// 获取或设置客户群变更详情。 /// + [Newtonsoft.Json.JsonProperty("UpdateDetail")] + [System.Text.Json.Serialization.JsonPropertyName("UpdateDetail")] [System.Xml.Serialization.XmlElement("UpdateDetail", IsNullable = true)] public string? UpdateDetail { get; set; } /// /// 获取或设置客户群入群场景值。 /// + [Newtonsoft.Json.JsonProperty("JoinScene")] + [System.Text.Json.Serialization.JsonPropertyName("JoinScene")] [System.Xml.Serialization.XmlElement("JoinScene", IsNullable = true)] public int? JoinScene { get; set; } /// /// 获取或设置客户群退群场景值。 /// + [Newtonsoft.Json.JsonProperty("QuitScene")] + [System.Text.Json.Serialization.JsonPropertyName("QuitScene")] [System.Xml.Serialization.XmlElement("QuitScene", IsNullable = true)] public int? QuitScene { get; set; } /// /// 获取或设置成员变更数量。 /// + [Newtonsoft.Json.JsonProperty("MemChangeCnt")] + [System.Text.Json.Serialization.JsonPropertyName("MemChangeCnt")] [System.Xml.Serialization.XmlElement("MemChangeCnt", IsNullable = true)] public int? MemberChangedCount { get; set; } /// /// 获取或设置成员变更列表。 /// + [Newtonsoft.Json.JsonProperty("MemChangeList")] + [System.Text.Json.Serialization.JsonPropertyName("MemChangeList")] [System.Xml.Serialization.XmlElement("MemChangeList", IsNullable = true)] public Types.MemberChangedList? MemberChangedList { get; set; } /// /// 获取或设置变更前的群成员版本号。 /// + [Newtonsoft.Json.JsonProperty("LastMemVer")] + [System.Text.Json.Serialization.JsonPropertyName("LastMemVer")] [System.Xml.Serialization.XmlElement("LastMemVer", IsNullable = true)] public string? LastMemberVersion { get; set; } /// /// 获取或设置变更后的群成员版本号。 /// + [Newtonsoft.Json.JsonProperty("CurMemVer")] + [System.Text.Json.Serialization.JsonPropertyName("CurMemVer")] [System.Xml.Serialization.XmlElement("CurMemVer", IsNullable = true)] public string? CurrentMemberVersion { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/ExternalContact/ChangeExternalContactEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/ExternalContact/ChangeExternalContactEvent.cs index 6631c94a..9a17d8ad 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/ExternalContact/ChangeExternalContactEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/ExternalContact/ChangeExternalContactEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.change_external_contact 或 INFO.change_external_contact 事件的数据。 @@ -6,59 +6,77 @@ /// REF: https://developer.work.weixin.qq.com/document/path/92005 /// REF: https://developer.work.weixin.qq.com/document/path/92277 /// - public class ChangeExternalContactEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ChangeExternalContactEvent : WechatWorkEvent { /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId", IsNullable = true)] public string? SuiteId { get; set; } /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId", IsNullable = true)] public string? AuthorizerCorpId { get; set; } /// /// 获取或设置变更类型。 /// + [Newtonsoft.Json.JsonProperty("ChangeType")] + [System.Text.Json.Serialization.JsonPropertyName("ChangeType")] [System.Xml.Serialization.XmlElement("ChangeType")] public string ChangeType { get; set; } = default!; /// /// 获取或设置用户成员账号。 /// + [Newtonsoft.Json.JsonProperty("UserID")] + [System.Text.Json.Serialization.JsonPropertyName("UserID")] [System.Xml.Serialization.XmlElement("UserID", IsNullable = true)] public string? UserId { get; set; } /// /// 获取或设置外部联系人账号。 /// + [Newtonsoft.Json.JsonProperty("ExternalUserID")] + [System.Text.Json.Serialization.JsonPropertyName("ExternalUserID")] [System.Xml.Serialization.XmlElement("ExternalUserID", IsNullable = true)] public string? ExternalUserId { get; set; } /// /// 获取或设置自定义渠道参数。 /// + [Newtonsoft.Json.JsonProperty("State")] + [System.Text.Json.Serialization.JsonPropertyName("State")] [System.Xml.Serialization.XmlElement("State", IsNullable = true)] public string? State { get; set; } /// /// 获取或设置欢迎语 Code。 /// + [Newtonsoft.Json.JsonProperty("WelcomeCode")] + [System.Text.Json.Serialization.JsonPropertyName("WelcomeCode")] [System.Xml.Serialization.XmlElement("WelcomeCode", IsNullable = true)] public string? WelcomeCode { get; set; } /// /// 获取或设置接替失败原因。 /// + [Newtonsoft.Json.JsonProperty("FailReason")] + [System.Text.Json.Serialization.JsonPropertyName("FailReason")] [System.Xml.Serialization.XmlElement("FailReason", IsNullable = true)] public string? TransferFailReason { get; set; } /// /// 获取或设置删除客户的操作来源。 /// + [Newtonsoft.Json.JsonProperty("Source")] + [System.Text.Json.Serialization.JsonPropertyName("Source")] [System.Xml.Serialization.XmlElement("Source", IsNullable = true)] public string? Source { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/ExternalContact/ChangeExternalTagEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/ExternalContact/ChangeExternalTagEvent.cs index 11bd0079..694c38c2 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/ExternalContact/ChangeExternalTagEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/ExternalContact/ChangeExternalTagEvent.cs @@ -1,45 +1,57 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.change_external_tag 或 INFO.change_external_tag 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/92130 /// REF: https://developer.work.weixin.qq.com/document/path/92277 /// - public class ChangeExternalTagEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ChangeExternalTagEvent : WechatWorkEvent { /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId", IsNullable = true)] public string? SuiteId { get; set; } /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId", IsNullable = true)] public string? AuthorizerCorpId { get; set; } /// /// 获取或设置变更类型。 /// + [Newtonsoft.Json.JsonProperty("ChangeType")] + [System.Text.Json.Serialization.JsonPropertyName("ChangeType")] [System.Xml.Serialization.XmlElement("ChangeType")] public string ChangeType { get; set; } = default!; /// /// 获取或设置 ID 类型。 /// + [Newtonsoft.Json.JsonProperty("TagType")] + [System.Text.Json.Serialization.JsonPropertyName("TagType")] [System.Xml.Serialization.XmlElement("TagType", IsNullable = true)] public string? IdType { get; set; } /// /// 获取或设置企业标签或标签分组 ID。 /// + [Newtonsoft.Json.JsonProperty("Id")] + [System.Text.Json.Serialization.JsonPropertyName("Id")] [System.Xml.Serialization.XmlElement("Id", IsNullable = true)] public string? TagOrGroupId { get; set; } /// /// 获取或设置规则组 ID。 /// + [Newtonsoft.Json.JsonProperty("StrategyId")] + [System.Text.Json.Serialization.JsonPropertyName("StrategyId")] [System.Xml.Serialization.XmlElement("StrategyId", IsNullable = true)] public string? StrategyId { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/KfMessage/KfAccountAuthChangeEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/KfMessage/KfAccountAuthChangeEvent.cs index 7ffd5fb7..93d5f2d0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/KfMessage/KfAccountAuthChangeEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/KfMessage/KfAccountAuthChangeEvent.cs @@ -4,17 +4,21 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 表示 EVENT.kf_account_auth_change 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/97712 /// - public class KfAccountAuthChangeEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class KfAccountAuthChangeEvent : WechatWorkEvent { /// /// 获取或设置新增授权的客服账号 ID 列表。 /// + [Newtonsoft.Json.JsonProperty("AuthAddOpenKfId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthAddOpenKfId")] [System.Xml.Serialization.XmlElement("AuthAddOpenKfId", Type = typeof(string), IsNullable = true)] public string[]? AuthAddedOpenKfId { get; set; } /// /// 获取或设置取消授权的客服账号 ID 列表。 /// + [Newtonsoft.Json.JsonProperty("AuthDelOpenKfId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthDelOpenKfId")] [System.Xml.Serialization.XmlElement("AuthDelOpenKfId", Type = typeof(string), IsNullable = true)] public string[]? AuthDeletedOpenKfId { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/KfMessage/KfMessageEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/KfMessage/KfMessageEvent.cs index 8c8b0b4b..84bd62f8 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/KfMessage/KfMessageEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/KfMessage/KfMessageEvent.cs @@ -5,17 +5,21 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// REF: https://developer.work.weixin.qq.com/document/path/94670 /// REF: https://developer.work.weixin.qq.com/document/path/94699 /// - public class KfMessageEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class KfMessageEvent : WechatWorkEvent { /// /// 获取或设置调用拉取消息的 Token。 /// + [Newtonsoft.Json.JsonProperty("Token")] + [System.Text.Json.Serialization.JsonPropertyName("Token")] [System.Xml.Serialization.XmlElement("Token")] public string Token { get; set; } = default!; /// /// 获取或设置客服账号 ID。 /// + [Newtonsoft.Json.JsonProperty("OpenKfId")] + [System.Text.Json.Serialization.JsonPropertyName("OpenKfId")] [System.Xml.Serialization.XmlElement("OpenKfId")] public string OpenKfId { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/License/LicenseAutoActivateEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/License/LicenseAutoActivateEvent.cs index d0c5fa5b..b7683954 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/License/LicenseAutoActivateEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/License/LicenseAutoActivateEvent.cs @@ -1,10 +1,10 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.auto_activate 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/95994 /// - public class LicenseAutoActivateEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class LicenseAutoActivateEvent : WechatWorkEvent { public static class Types { @@ -13,36 +13,48 @@ /// /// 获取或设置激活码。 /// + [Newtonsoft.Json.JsonProperty("ActiveCode")] + [System.Text.Json.Serialization.JsonPropertyName("ActiveCode")] [System.Xml.Serialization.XmlElement("ActiveCode")] public string ActiveCode { get; set; } = default!; /// /// 获取或设置类型。 /// + [Newtonsoft.Json.JsonProperty("Type")] + [System.Text.Json.Serialization.JsonPropertyName("Type")] [System.Xml.Serialization.XmlElement("Type")] public int Type { get; set; } /// /// 获取或设置许可到期时间戳。 /// + [Newtonsoft.Json.JsonProperty("ExpireTime")] + [System.Text.Json.Serialization.JsonPropertyName("ExpireTime")] [System.Xml.Serialization.XmlElement("ExpireTime")] public long ExpireTimestamp { get; set; } /// /// 获取或设置成员 UserId。 /// + [Newtonsoft.Json.JsonProperty("UserId")] + [System.Text.Json.Serialization.JsonPropertyName("UserId")] [System.Xml.Serialization.XmlElement("UserId")] public string UserId { get; set; } = default!; /// /// 获取或设置之前的许可状态。 /// + [Newtonsoft.Json.JsonProperty("PreviousStatus")] + [System.Text.Json.Serialization.JsonPropertyName("PreviousStatus")] [System.Xml.Serialization.XmlElement("PreviousStatus", IsNullable = true)] public int? PreviousStatus { get; set; } /// /// 获取或设置之前的激活码。 /// + [Newtonsoft.Json.JsonProperty("PreviousActiveCode")] + [System.Text.Json.Serialization.JsonPropertyName("PreviousActiveCode")] [System.Xml.Serialization.XmlElement("PreviousActiveCode", IsNullable = true)] public string? PreviousActiveCode { get; set; } } @@ -51,24 +63,32 @@ /// /// 获取或设置服务商 CorpId。 /// + [Newtonsoft.Json.JsonProperty("ServiceCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("ServiceCorpId")] [System.Xml.Serialization.XmlElement("ServiceCorpId")] public string ServiceCorpId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId")] public string AuthorizerCorpId { get; set; } = default!; /// /// 获取或设置许可自动激活场景值。 /// + [Newtonsoft.Json.JsonProperty("Scene")] + [System.Text.Json.Serialization.JsonPropertyName("Scene")] [System.Xml.Serialization.XmlElement("Scene")] public int Scene { get; set; } /// /// 获取或设置激活的许可账号列表。 /// + [Newtonsoft.Json.JsonProperty("AccountList")] + [System.Text.Json.Serialization.JsonPropertyName("AccountList")] [System.Xml.Serialization.XmlElement("AccountList", Type = typeof(Types.Account))] public Types.Account[] AccountList { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/License/LicensePaySuccessEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/License/LicensePaySuccessEvent.cs index ee363d2c..8de87fe7 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/License/LicensePaySuccessEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/License/LicensePaySuccessEvent.cs @@ -1,32 +1,40 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.license_pay_success 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/95716 /// - public class LicensePaySuccessEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class LicensePaySuccessEvent : WechatWorkEvent { /// /// 获取或设置服务商 CorpId。 /// + [Newtonsoft.Json.JsonProperty("ServiceCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("ServiceCorpId")] [System.Xml.Serialization.XmlElement("ServiceCorpId")] public string ServiceCorpId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId")] public string AuthorizerCorpId { get; set; } = default!; /// /// 获取或设置订单号。 /// + [Newtonsoft.Json.JsonProperty("OrderId")] + [System.Text.Json.Serialization.JsonPropertyName("OrderId")] [System.Xml.Serialization.XmlElement("OrderId")] public string OrderId { get; set; } = default!; /// /// 获取或设置服务商内下单用户 UserId。 /// + [Newtonsoft.Json.JsonProperty("BuyerUserId")] + [System.Text.Json.Serialization.JsonPropertyName("BuyerUserId")] [System.Xml.Serialization.XmlElement("BuyerUserId")] public string BuyerUserId { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/License/LicenseRefundEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/License/LicenseRefundEvent.cs index d51b46be..b2f39cf2 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/License/LicenseRefundEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/License/LicenseRefundEvent.cs @@ -1,32 +1,40 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.license_refund 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/95805 /// - public class LicenseRefundEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class LicenseRefundEvent : WechatWorkEvent { /// /// 获取或设置服务商 CorpId。 /// + [Newtonsoft.Json.JsonProperty("ServiceCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("ServiceCorpId")] [System.Xml.Serialization.XmlElement("ServiceCorpId")] public string ServiceCorpId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId")] public string AuthorizerCorpId { get; set; } = default!; /// /// 获取或设置订单号。 /// + [Newtonsoft.Json.JsonProperty("OrderId")] + [System.Text.Json.Serialization.JsonPropertyName("OrderId")] [System.Xml.Serialization.XmlElement("OrderId")] public string OrderId { get; set; } = default!; /// /// 获取或设置订单状态。 /// + [Newtonsoft.Json.JsonProperty("OrderStatus")] + [System.Text.Json.Serialization.JsonPropertyName("OrderStatus")] [System.Xml.Serialization.XmlElement("OrderStatus")] public int OrderStatus { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/License/UnlicensedNotifyEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/License/UnlicensedNotifyEvent.cs index d26fe91f..23c3eb6a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/License/UnlicensedNotifyEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/License/UnlicensedNotifyEvent.cs @@ -1,14 +1,16 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.unlicensed_notify 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/95716 /// - public class UnlicensedNotifyEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class UnlicensedNotifyEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Living/LivingStatusChangeEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Living/LivingStatusChangeEvent.cs index 06cb217a..a6d2b0ce 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Living/LivingStatusChangeEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Living/LivingStatusChangeEvent.cs @@ -1,27 +1,33 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.living_status_change 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/94145 /// REF: https://developer.work.weixin.qq.com/document/path/94308 /// - public class LivingStatusChangeEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class LivingStatusChangeEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置直播 ID。 /// + [Newtonsoft.Json.JsonProperty("LivingId")] + [System.Text.Json.Serialization.JsonPropertyName("LivingId")] [System.Xml.Serialization.XmlElement("LivingId")] public string LivingId { get; set; } = default!; /// /// 获取或设置直播状态。 /// + [Newtonsoft.Json.JsonProperty("Status")] + [System.Text.Json.Serialization.JsonPropertyName("Status")] [System.Xml.Serialization.XmlElement("Status")] public int Status { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Media/UploadMediaJobFinishEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Media/UploadMediaJobFinishEvent.cs index 11a978bf..f53a53db 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Media/UploadMediaJobFinishEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Media/UploadMediaJobFinishEvent.cs @@ -1,14 +1,16 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.upload_media_job_finish 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/96219 /// - public class UploadMediaJobFinishEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class UploadMediaJobFinishEvent : WechatWorkEvent { /// /// 获取或设置任务 ID。 /// + [Newtonsoft.Json.JsonProperty("JobId")] + [System.Text.Json.Serialization.JsonPropertyName("JobId")] [System.Xml.Serialization.XmlElement("JobId")] public string JobId { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Meeting/MeetingChangeEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Meeting/MeetingChangeEvent.cs index 4a503931..8a7eb462 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Meeting/MeetingChangeEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Meeting/MeetingChangeEvent.cs @@ -32,7 +32,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// REF: https://developer.work.weixin.qq.com/document/path/98782 /// REF: https://developer.work.weixin.qq.com/document/path/98783 /// - public class MeetingChangeEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class MeetingChangeEvent : WechatWorkEvent { public static class Types { @@ -41,18 +41,24 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置成员账号。 /// + [Newtonsoft.Json.JsonProperty("UserId")] + [System.Text.Json.Serialization.JsonPropertyName("UserId")] [System.Xml.Serialization.XmlElement("UserId", IsNullable = true)] public string? UserId { get; set; } /// /// 获取或设置会中临时 ID。 /// + [Newtonsoft.Json.JsonProperty("TmpOpenId")] + [System.Text.Json.Serialization.JsonPropertyName("TmpOpenId")] [System.Xml.Serialization.XmlElement("TmpOpenId", IsNullable = true)] public string? TempOpenId { get; set; } /// /// 获取或设置成员角色。 /// + [Newtonsoft.Json.JsonProperty("UserRole")] + [System.Text.Json.Serialization.JsonPropertyName("UserRole")] [System.Xml.Serialization.XmlElement("UserRole", IsNullable = true)] public int? Role { get; set; } } @@ -62,24 +68,32 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置暖场图片 URL。 /// + [Newtonsoft.Json.JsonProperty("WarmUpPicture")] + [System.Text.Json.Serialization.JsonPropertyName("WarmUpPicture")] [System.Xml.Serialization.XmlElement("WarmUpPicture", IsNullable = true)] public string? WarmUpPictureUrl { get; set; } /// /// 获取或设置暖场视频 URL。 /// + [Newtonsoft.Json.JsonProperty("WarmUpVideo")] + [System.Text.Json.Serialization.JsonPropertyName("WarmUpVideo")] [System.Xml.Serialization.XmlElement("WarmUpVideo", IsNullable = true)] public string? WarmUpVideoUrl { get; set; } /// /// 获取或设置上传结果。 /// + [Newtonsoft.Json.JsonProperty("UploadStatus")] + [System.Text.Json.Serialization.JsonPropertyName("UploadStatus")] [System.Xml.Serialization.XmlElement("UploadStatus")] public int UploadStatus { get; set; } /// /// 获取或设置错误描述。 /// + [Newtonsoft.Json.JsonProperty("ErrorMsg")] + [System.Text.Json.Serialization.JsonPropertyName("ErrorMsg")] [System.Xml.Serialization.XmlElement("ErrorMsg", IsNullable = true)] public string? ErrorMessage { get; set; } } @@ -89,24 +103,32 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置素材类型。 /// + [Newtonsoft.Json.JsonProperty("MediumType")] + [System.Text.Json.Serialization.JsonPropertyName("MediumType")] [System.Xml.Serialization.XmlElement("MediumType")] public int MediumType { get; set; } /// /// 获取或设置素材 URL。 /// + [Newtonsoft.Json.JsonProperty("MediumUrl")] + [System.Text.Json.Serialization.JsonPropertyName("MediumUrl")] [System.Xml.Serialization.XmlElement("MediumUrl")] public string MediumUrl { get; set; } = default!; /// /// 获取或设置上传结果。 /// + [Newtonsoft.Json.JsonProperty("UploadStatus")] + [System.Text.Json.Serialization.JsonPropertyName("UploadStatus")] [System.Xml.Serialization.XmlElement("UploadStatus")] public int UploadStatus { get; set; } /// /// 获取或设置错误描述。 /// + [Newtonsoft.Json.JsonProperty("ErrorMsg")] + [System.Text.Json.Serialization.JsonPropertyName("ErrorMsg")] [System.Xml.Serialization.XmlElement("ErrorMsg", IsNullable = true)] public string? ErrorMessage { get; set; } } @@ -116,12 +138,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置信令协议。 /// + [Newtonsoft.Json.JsonProperty("Protocol")] + [System.Text.Json.Serialization.JsonPropertyName("Protocol")] [System.Xml.Serialization.XmlElement("Protocol")] public int Protocol { get; set; } /// /// 获取或设置信令。 /// + [Newtonsoft.Json.JsonProperty("DialString")] + [System.Text.Json.Serialization.JsonPropertyName("DialString")] [System.Xml.Serialization.XmlElement("DialString")] public string DialogString { get; set; } = default!; } @@ -130,60 +156,80 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置变更类型。 /// + [Newtonsoft.Json.JsonProperty("ChangeType")] + [System.Text.Json.Serialization.JsonPropertyName("ChangeType")] [System.Xml.Serialization.XmlElement("ChangeType")] public string ChangeType { get; set; } = default!; /// /// 获取或设置会议 ID。 /// + [Newtonsoft.Json.JsonProperty("MeetingId")] + [System.Text.Json.Serialization.JsonPropertyName("MeetingId")] [System.Xml.Serialization.XmlElement("MeetingId")] public string MeetingId { get; set; } = default!; /// /// 获取或设置会议室 ID。 /// + [Newtonsoft.Json.JsonProperty("MeetingRoomId")] + [System.Text.Json.Serialization.JsonPropertyName("MeetingRoomId")] [System.Xml.Serialization.XmlElement("MeetingRoomId", IsNullable = true)] public string? MeetingRoomId { get; set; } /// /// 获取或设置操作者会中临时 ID。 /// + [Newtonsoft.Json.JsonProperty("FromUserTmpOpenId")] + [System.Text.Json.Serialization.JsonPropertyName("FromUserTmpOpenId")] [System.Xml.Serialization.XmlElement("FromUserTmpOpenId", IsNullable = true)] public string? FromUserTempOpenId { get; set; } /// /// 获取或设置被操作者信息。 /// + [Newtonsoft.Json.JsonProperty("OperatedUser")] + [System.Text.Json.Serialization.JsonPropertyName("OperatedUser")] [System.Xml.Serialization.XmlElement("OperatedUser", IsNullable = true)] public Types.OperatedUser? OperatedUser { get; set; } /// /// 获取或设置暖场信息。 /// + [Newtonsoft.Json.JsonProperty("WarmUpInfo")] + [System.Text.Json.Serialization.JsonPropertyName("WarmUpInfo")] [System.Xml.Serialization.XmlElement("WarmUpInfo", IsNullable = true)] public Types.WarmUpInfo? WarmUpInfo { get; set; } /// /// 获取或设置上传信息列表。 /// + [Newtonsoft.Json.JsonProperty("UploadInfo")] + [System.Text.Json.Serialization.JsonPropertyName("UploadInfo")] [System.Xml.Serialization.XmlElement("UploadInfo", Type = typeof(Types.UploadInfo), IsNullable = true)] public Types.UploadInfo[]? UploadInfoList { get; set; } /// /// 获取或设置报名 ID。 /// + [Newtonsoft.Json.JsonProperty("EnrollId")] + [System.Text.Json.Serialization.JsonPropertyName("EnrollId")] [System.Xml.Serialization.XmlElement("EnrollId", IsNullable = true)] public string? EnrollId { get; set; } /// /// 获取或设置 Rooms MRA 信息。 /// + [Newtonsoft.Json.JsonProperty("MraAddress")] + [System.Text.Json.Serialization.JsonPropertyName("MraAddress")] [System.Xml.Serialization.XmlElement("MraAddress", IsNullable = true)] public Types.MRAInfo? RoomsMRAInfo { get; set; } /// /// 获取或设置 Rooms 应答结果。 /// + [Newtonsoft.Json.JsonProperty("RoomResponseStatus")] + [System.Text.Json.Serialization.JsonPropertyName("RoomResponseStatus")] [System.Xml.Serialization.XmlElement("RoomResponseStatus", IsNullable = true)] public int? RoomsResponseStatus { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/ImageMessageEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/ImageMessageEvent.cs index 65df55e9..b9df37a5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/ImageMessageEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/ImageMessageEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 IMAGE 事件的数据。 @@ -6,29 +6,37 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90375 /// REF: https://developer.work.weixin.qq.com/document/path/90855 /// - public class ImageMessageEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ImageMessageEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置消息 ID。 /// + [Newtonsoft.Json.JsonProperty("MsgId")] + [System.Text.Json.Serialization.JsonPropertyName("MsgId")] [System.Xml.Serialization.XmlElement("MsgId")] public long MessageId { get; set; } /// /// 获取或设置图片 URL。 /// + [Newtonsoft.Json.JsonProperty("PicUrl")] + [System.Text.Json.Serialization.JsonPropertyName("PicUrl")] [System.Xml.Serialization.XmlElement("PicUrl")] public string PictureUrl { get; set; } = default!; /// /// 获取或设置图片消息 MediaId。 /// + [Newtonsoft.Json.JsonProperty("MediaId")] + [System.Text.Json.Serialization.JsonPropertyName("MediaId")] [System.Xml.Serialization.XmlElement("MediaId")] public string MediaId { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/LinkMessageEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/LinkMessageEvent.cs index 18dc2583..9900d6a2 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/LinkMessageEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/LinkMessageEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 LINK 事件的数据。 @@ -6,41 +6,53 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90375 /// REF: https://developer.work.weixin.qq.com/document/path/90855 /// - public class LinkMessageEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class LinkMessageEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置消息 ID。 /// + [Newtonsoft.Json.JsonProperty("MsgId")] + [System.Text.Json.Serialization.JsonPropertyName("MsgId")] [System.Xml.Serialization.XmlElement("MsgId")] public long MessageId { get; set; } /// /// 获取或设置标题。 /// + [Newtonsoft.Json.JsonProperty("Title")] + [System.Text.Json.Serialization.JsonPropertyName("Title")] [System.Xml.Serialization.XmlElement("Title")] public string Title { get; set; } = default!; /// /// 获取或设置描述。 /// + [Newtonsoft.Json.JsonProperty("Description")] + [System.Text.Json.Serialization.JsonPropertyName("Description")] [System.Xml.Serialization.XmlElement("Description")] public string Description { get; set; } = default!; /// /// 获取或设置跳转链接 URL。 /// + [Newtonsoft.Json.JsonProperty("Url")] + [System.Text.Json.Serialization.JsonPropertyName("Url")] [System.Xml.Serialization.XmlElement("Url")] public string Url { get; set; } = default!; /// /// 获取或设置封面图片 URL。 /// + [Newtonsoft.Json.JsonProperty("PicUrl")] + [System.Text.Json.Serialization.JsonPropertyName("PicUrl")] [System.Xml.Serialization.XmlElement("PicUrl")] public string PictureUrl { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/LocationMessageEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/LocationMessageEvent.cs index dcc50054..bfcde024 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/LocationMessageEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/LocationMessageEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 LOCATION 事件的数据。 @@ -6,47 +6,61 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90375 /// REF: https://developer.work.weixin.qq.com/document/path/90855 /// - public class LocationMessageEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class LocationMessageEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置应用类型。 /// + [Newtonsoft.Json.JsonProperty("AppType")] + [System.Text.Json.Serialization.JsonPropertyName("AppType")] [System.Xml.Serialization.XmlElement("AppType", IsNullable = true)] public string? AppType { get; set; } /// /// 获取或设置消息 ID。 /// + [Newtonsoft.Json.JsonProperty("MsgId")] + [System.Text.Json.Serialization.JsonPropertyName("MsgId")] [System.Xml.Serialization.XmlElement("MsgId")] public long MessageId { get; set; } /// /// 获取或设置纬度坐标。 /// + [Newtonsoft.Json.JsonProperty("Location_X")] + [System.Text.Json.Serialization.JsonPropertyName("Location_X")] [System.Xml.Serialization.XmlElement("Location_X")] - public double Latitude { get; set; } + public decimal Latitude { get; set; } /// /// 获取或设置经度坐标。 /// + [Newtonsoft.Json.JsonProperty("Location_Y")] + [System.Text.Json.Serialization.JsonPropertyName("Location_Y")] [System.Xml.Serialization.XmlElement("Location_Y")] - public double Longitude { get; set; } + public decimal Longitude { get; set; } /// /// 获取或设置地图缩放大小。 /// + [Newtonsoft.Json.JsonProperty("Scale")] + [System.Text.Json.Serialization.JsonPropertyName("Scale")] [System.Xml.Serialization.XmlElement("Scale")] - public double Scale { get; set; } + public decimal Scale { get; set; } /// /// 获取或设置地理位置信息。 /// + [Newtonsoft.Json.JsonProperty("Label")] + [System.Text.Json.Serialization.JsonPropertyName("Label")] [System.Xml.Serialization.XmlElement("Label")] public string Label { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/TextMessageEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/TextMessageEvent.cs index 1459875f..1a7d2289 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/TextMessageEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/TextMessageEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 TEXT 事件的数据。 @@ -6,23 +6,29 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90375 /// REF: https://developer.work.weixin.qq.com/document/path/90855 /// - public class TextMessageEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class TextMessageEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置消息 ID。 /// + [Newtonsoft.Json.JsonProperty("MsgId")] + [System.Text.Json.Serialization.JsonPropertyName("MsgId")] [System.Xml.Serialization.XmlElement("MsgId")] public long MessageId { get; set; } /// /// 获取或设置消息内容。 /// + [Newtonsoft.Json.JsonProperty("Content")] + [System.Text.Json.Serialization.JsonPropertyName("Content")] [System.Xml.Serialization.XmlElement("Content")] public string Content { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/VideoMessageEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/VideoMessageEvent.cs index 0300f97a..4075d2c9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/VideoMessageEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/VideoMessageEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 VIDEO 事件的数据。 @@ -6,29 +6,37 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90375 /// REF: https://developer.work.weixin.qq.com/document/path/90855 /// - public class VideoMessageEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class VideoMessageEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置消息 ID。 /// + [Newtonsoft.Json.JsonProperty("MsgId")] + [System.Text.Json.Serialization.JsonPropertyName("MsgId")] [System.Xml.Serialization.XmlElement("MsgId")] public long MessageId { get; set; } /// /// 获取或设置视频消息 MediaId。 /// + [Newtonsoft.Json.JsonProperty("MediaId")] + [System.Text.Json.Serialization.JsonPropertyName("MediaId")] [System.Xml.Serialization.XmlElement("MediaId")] public string MediaId { get; set; } = default!; /// /// 获取或设置视频消息缩略图 MediaId。 /// + [Newtonsoft.Json.JsonProperty("ThumbMediaId")] + [System.Text.Json.Serialization.JsonPropertyName("ThumbMediaId")] [System.Xml.Serialization.XmlElement("ThumbMediaId")] public string ThumbnailMediaId { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/VoiceMessageEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/VoiceMessageEvent.cs index b2bbb8b1..44aecac2 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/VoiceMessageEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Message/VoiceMessageEvent.cs @@ -6,7 +6,7 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90375 /// REF: https://developer.work.weixin.qq.com/document/path/90855 /// - public class VoiceMessageEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class VoiceMessageEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Calendar/AddCalendarEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Calendar/AddCalendarEvent.cs index ab5b9d57..fd5467c3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Calendar/AddCalendarEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Calendar/AddCalendarEvent.cs @@ -1,11 +1,11 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.add_calendar 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/93651 /// REF: https://developer.work.weixin.qq.com/document/path/93704 /// - public class AddCalendarEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IJsonSerializable, WechatWorkEvent.Serialization.IXmlSerializable + public class AddCalendarEvent : WechatWorkEvent { /// /// 获取或设置日历 ID。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Calendar/DeleteCalendarEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Calendar/DeleteCalendarEvent.cs index 466e6c09..406182f8 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Calendar/DeleteCalendarEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Calendar/DeleteCalendarEvent.cs @@ -5,7 +5,7 @@ /// REF: https://developer.work.weixin.qq.com/document/path/93651 /// REF: https://developer.work.weixin.qq.com/document/path/93704 /// - public class DeleteCalendarEvent : AddCalendarEvent, WechatWorkEvent.Serialization.IJsonSerializable, WechatWorkEvent.Serialization.IXmlSerializable + public class DeleteCalendarEvent : AddCalendarEvent { } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Calendar/ModifyCalendarEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Calendar/ModifyCalendarEvent.cs index af32766e..0e6cd5bf 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Calendar/ModifyCalendarEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Calendar/ModifyCalendarEvent.cs @@ -5,7 +5,7 @@ /// REF: https://developer.work.weixin.qq.com/document/path/93651 /// REF: https://developer.work.weixin.qq.com/document/path/93704 /// - public class ModifyCalendarEvent : AddCalendarEvent, WechatWorkEvent.Serialization.IJsonSerializable, WechatWorkEvent.Serialization.IXmlSerializable + public class ModifyCalendarEvent : AddCalendarEvent { } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/MettingRoom/BookMeetingRoomEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/MettingRoom/BookMeetingRoomEvent.cs index a2d874b2..9680b023 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/MettingRoom/BookMeetingRoomEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/MettingRoom/BookMeetingRoomEvent.cs @@ -4,7 +4,7 @@ /// 表示 EVENT.book_meeting_room 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/95333 /// - public class BookMeetingRoomEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IJsonSerializable, WechatWorkEvent.Serialization.IXmlSerializable + public class BookMeetingRoomEvent : WechatWorkEvent { /// /// 获取或设置会议室 ID。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/MettingRoom/CancelMeetingRoomEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/MettingRoom/CancelMeetingRoomEvent.cs index d2f42107..4964979f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/MettingRoom/CancelMeetingRoomEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/MettingRoom/CancelMeetingRoomEvent.cs @@ -4,7 +4,7 @@ /// 表示 EVENT.cancel_meeting_room 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/95333 /// - public class CancelMeetingRoomEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IJsonSerializable, WechatWorkEvent.Serialization.IXmlSerializable + public class CancelMeetingRoomEvent : WechatWorkEvent { /// /// 获取或设置会议室 ID。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Schedule/AddScheduleEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Schedule/AddScheduleEvent.cs index f61b25fa..fda05a62 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Schedule/AddScheduleEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Schedule/AddScheduleEvent.cs @@ -5,7 +5,7 @@ /// REF: https://developer.work.weixin.qq.com/document/path/93651 /// REF: https://developer.work.weixin.qq.com/document/path/93704 /// - public class AddScheduleEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IJsonSerializable, WechatWorkEvent.Serialization.IXmlSerializable + public class AddScheduleEvent : WechatWorkEvent { /// /// 获取或设置日程 ID。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Schedule/DeleteScheduleEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Schedule/DeleteScheduleEvent.cs index dc503647..c93a6286 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Schedule/DeleteScheduleEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Schedule/DeleteScheduleEvent.cs @@ -5,7 +5,7 @@ /// REF: https://developer.work.weixin.qq.com/document/path/93651 /// REF: https://developer.work.weixin.qq.com/document/path/93704 /// - public class DeleteScheduleEvent : AddScheduleEvent, WechatWorkEvent.Serialization.IJsonSerializable, WechatWorkEvent.Serialization.IXmlSerializable + public class DeleteScheduleEvent : AddScheduleEvent { } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Schedule/ModifyScheduleEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Schedule/ModifyScheduleEvent.cs index 3448ffb3..4f5d8d7b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Schedule/ModifyScheduleEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/OA/Schedule/ModifyScheduleEvent.cs @@ -5,7 +5,7 @@ /// REF: https://developer.work.weixin.qq.com/document/path/93651 /// REF: https://developer.work.weixin.qq.com/document/path/93704 /// - public class ModifyScheduleEvent : AddScheduleEvent, WechatWorkEvent.Serialization.IJsonSerializable, WechatWorkEvent.Serialization.IXmlSerializable + public class ModifyScheduleEvent : AddScheduleEvent { } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/ClickPushEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/ClickPushEvent.cs index e9be0e49..c48027b6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/ClickPushEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/ClickPushEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.click 事件的数据。 @@ -6,17 +6,21 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90376 /// REF: https://developer.work.weixin.qq.com/document/path/90858 /// - public class ClickPushEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ClickPushEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置事件 Key，即自定义菜单接口中的 Key 值。 /// + [Newtonsoft.Json.JsonProperty("EventKey")] + [System.Text.Json.Serialization.JsonPropertyName("EventKey")] [System.Xml.Serialization.XmlElement("EventKey")] public string EventKey { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/CloseInactiveAgentEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/CloseInactiveAgentEvent.cs index 820dcfc1..675ea129 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/CloseInactiveAgentEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/CloseInactiveAgentEvent.cs @@ -6,11 +6,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// REF: https://developer.work.weixin.qq.com/document/path/90376 /// REF: https://developer.work.weixin.qq.com/document/path/90858 /// - public class CloseInactiveAgentEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class CloseInactiveAgentEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/EnterAgentPushEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/EnterAgentPushEvent.cs index ae17a180..e460816f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/EnterAgentPushEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/EnterAgentPushEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.enter_agent 事件的数据。 @@ -6,17 +6,21 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90376 /// REF: https://developer.work.weixin.qq.com/document/path/90858 /// - public class EnterAgentPushEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class EnterAgentPushEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置事件 Key。 /// + [Newtonsoft.Json.JsonProperty("EventKey")] + [System.Text.Json.Serialization.JsonPropertyName("EventKey")] [System.Xml.Serialization.XmlElement("EventKey")] public string? EventKey { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/LocationPushEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/LocationPushEvent.cs index 0e74245b..3eb51662 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/LocationPushEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/LocationPushEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.LOCATION 事件的数据。 @@ -6,36 +6,46 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90376 /// REF: https://developer.work.weixin.qq.com/document/path/90858 /// - public class LocationPushEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class LocationPushEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置应用类型。 /// + [Newtonsoft.Json.JsonProperty("AppType")] + [System.Text.Json.Serialization.JsonPropertyName("AppType")] [System.Xml.Serialization.XmlElement("AppType", IsNullable = true)] public string? AppType { get; set; } /// /// 获取或设置地理位置纬度。 /// + [Newtonsoft.Json.JsonProperty("Latitude")] + [System.Text.Json.Serialization.JsonPropertyName("Latitude")] [System.Xml.Serialization.XmlElement("Latitude")] - public double Latitude { get; set; } + public decimal Latitude { get; set; } /// /// 获取或设置地理位置经度。 /// + [Newtonsoft.Json.JsonProperty("Longitude")] + [System.Text.Json.Serialization.JsonPropertyName("Longitude")] [System.Xml.Serialization.XmlElement("Longitude")] - public double Longitude { get; set; } + public decimal Longitude { get; set; } /// /// 获取或设置地理位置精度。 /// + [Newtonsoft.Json.JsonProperty("Precision")] + [System.Text.Json.Serialization.JsonPropertyName("Precision")] [System.Xml.Serialization.XmlElement("Precision")] - public double Precision { get; set; } + public decimal Precision { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/ReopenInactiveAgentEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/ReopenInactiveAgentEvent.cs index d6f010c4..01602902 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/ReopenInactiveAgentEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/ReopenInactiveAgentEvent.cs @@ -6,11 +6,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// REF: https://developer.work.weixin.qq.com/document/path/90376 /// REF: https://developer.work.weixin.qq.com/document/path/90858 /// - public class ReopenInactiveAgentEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ReopenInactiveAgentEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/ScanCodePushEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/ScanCodePushEvent.cs index 31d58646..35c4e9ff 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/ScanCodePushEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/ScanCodePushEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.scancode_push 事件的数据。 @@ -6,7 +6,7 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90376 /// REF: https://developer.work.weixin.qq.com/document/path/90858 /// - public class ScanCodePushEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ScanCodePushEvent : WechatWorkEvent { public static class Types { @@ -15,12 +15,16 @@ /// /// 获取或设置扫描类型。 /// + [Newtonsoft.Json.JsonProperty("ScanType")] + [System.Text.Json.Serialization.JsonPropertyName("ScanType")] [System.Xml.Serialization.XmlElement("ScanType")] public string ScanType { get; set; } = default!; /// /// 获取或设置扫描结果。 /// + [Newtonsoft.Json.JsonProperty("ScanResult")] + [System.Text.Json.Serialization.JsonPropertyName("ScanResult")] [System.Xml.Serialization.XmlElement("ScanResult")] public string ScanResult { get; set; } = default!; } @@ -29,18 +33,24 @@ /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置事件 Key，即自定义菜单接口中的 Key 值。 /// + [Newtonsoft.Json.JsonProperty("EventKey")] + [System.Text.Json.Serialization.JsonPropertyName("EventKey")] [System.Xml.Serialization.XmlElement("EventKey")] public string EventKey { get; set; } = default!; /// /// 获取或设置扫描信息。 /// + [Newtonsoft.Json.JsonProperty("ScanCodeInfo")] + [System.Text.Json.Serialization.JsonPropertyName("ScanCodeInfo")] [System.Xml.Serialization.XmlElement("ScanCodeInfo")] public Types.ScanCode ScanCode { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/SubscribePushEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/SubscribePushEvent.cs index 3d239b3e..b7f8dd57 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/SubscribePushEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/SubscribePushEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.subscribe 事件的数据。 @@ -6,17 +6,21 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90376 /// REF: https://developer.work.weixin.qq.com/document/path/90858 /// - public class SubscribePushEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class SubscribePushEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置事件 Key。 /// + [Newtonsoft.Json.JsonProperty("EventKey")] + [System.Text.Json.Serialization.JsonPropertyName("EventKey")] [System.Xml.Serialization.XmlElement("EventKey", IsNullable = true)] public string? EventKey { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/TaskCardClickPushEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/TaskCardClickPushEvent.cs index a93a8aa5..716eb246 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/TaskCardClickPushEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/TaskCardClickPushEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.taskcard_click 事件的数据。 @@ -6,23 +6,29 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90376 /// REF: https://developer.work.weixin.qq.com/document/path/90858 /// - public class TaskCardClickPushEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class TaskCardClickPushEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置事件 Key，即发送任务卡片时自定义按钮的 Key 值。 /// + [Newtonsoft.Json.JsonProperty("EventKey")] + [System.Text.Json.Serialization.JsonPropertyName("EventKey")] [System.Xml.Serialization.XmlElement("EventKey")] public string EventKey { get; set; } = default!; /// /// 获取或设置任务 ID。 /// + [Newtonsoft.Json.JsonProperty("TaskId")] + [System.Text.Json.Serialization.JsonPropertyName("TaskId")] [System.Xml.Serialization.XmlElement("TaskId")] public string TaskId { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/TemplateCardPushEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/TemplateCardPushEvent.cs index f4eb393b..b10ae572 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/TemplateCardPushEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/TemplateCardPushEvent.cs @@ -1,11 +1,11 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.template_card_event 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/90240 /// REF: https://developer.work.weixin.qq.com/document/path/90240 /// - public class TemplateCardPushEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class TemplateCardPushEvent : WechatWorkEvent { public static class Types { @@ -18,6 +18,8 @@ /// /// 获取或设置选项列表。 /// + [Newtonsoft.Json.JsonProperty("OpitonId")] + [System.Text.Json.Serialization.JsonPropertyName("OpitonId")] [System.Xml.Serialization.XmlElement("OpitonId", Type = typeof(string))] public string[] Items { get; set; } = default!; } @@ -26,12 +28,16 @@ /// /// 获取或设置问题的 Key 值。 /// + [Newtonsoft.Json.JsonProperty("QuestionKey")] + [System.Text.Json.Serialization.JsonPropertyName("QuestionKey")] [System.Xml.Serialization.XmlElement("QuestionKey")] public string QuestionKey { get; set; } = default!; /// /// 获取或设置选项 ID 列表。 /// + [Newtonsoft.Json.JsonProperty("OpitonIds")] + [System.Text.Json.Serialization.JsonPropertyName("OpitonIds")] [System.Xml.Serialization.XmlElement("OpitonIds")] public Types.OptionIdList OptionIdList { get; set; } = default!; } @@ -41,6 +47,8 @@ /// /// 获取或设置下拉框列表。 /// + [Newtonsoft.Json.JsonProperty("SelectedItem")] + [System.Text.Json.Serialization.JsonPropertyName("SelectedItem")] [System.Xml.Serialization.XmlElement("SelectedItem", Type = typeof(SelectItem))] public SelectItem[]? Items { get; set; } = default!; } @@ -49,36 +57,48 @@ /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置任务 ID。 /// + [Newtonsoft.Json.JsonProperty("TaskId")] + [System.Text.Json.Serialization.JsonPropertyName("TaskId")] [System.Xml.Serialization.XmlElement("TaskId")] public string TaskId { get; set; } = default!; /// /// 获取或设置模板卡片类型。 /// + [Newtonsoft.Json.JsonProperty("CardType")] + [System.Text.Json.Serialization.JsonPropertyName("CardType")] [System.Xml.Serialization.XmlElement("CardType")] public string CardType { get; set; } = default!; /// /// 获取或设置用于更新卡片接口的 Code。 /// + [Newtonsoft.Json.JsonProperty("ResponseCode")] + [System.Text.Json.Serialization.JsonPropertyName("ResponseCode")] [System.Xml.Serialization.XmlElement("ResponseCode")] public string ResponseCode { get; set; } = default!; /// /// 获取或设置用户点击的按钮 Key 值。 /// + [Newtonsoft.Json.JsonProperty("EventKey")] + [System.Text.Json.Serialization.JsonPropertyName("EventKey")] [System.Xml.Serialization.XmlElement("EventKey", IsNullable = true)] public string? ButtonKey { get; set; } /// /// 获取或设置下拉框列表。 /// + [Newtonsoft.Json.JsonProperty("SelectedItems")] + [System.Text.Json.Serialization.JsonPropertyName("SelectedItems")] [System.Xml.Serialization.XmlElement("SelectedItems")] public Types.SelectList SelectList { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/ViewPushEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/ViewPushEvent.cs index 7743026b..ec61aa0b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/ViewPushEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Push/ViewPushEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.view 事件的数据。 @@ -6,17 +6,21 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90376 /// REF: https://developer.work.weixin.qq.com/document/path/90858 /// - public class ViewPushEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ViewPushEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } /// /// 获取或设置事件 Key，即跳转的 URL。 /// + [Newtonsoft.Json.JsonProperty("EventKey")] + [System.Text.Json.Serialization.JsonPropertyName("EventKey")] [System.Xml.Serialization.XmlElement("EventKey")] public string EventKey { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/ImageMessageReply.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/ImageMessageReply.cs index abe77224..5337de11 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/ImageMessageReply.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/ImageMessageReply.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示被动回复图片消息的数据。 @@ -6,7 +6,7 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90377#%E5%9B%BE%E7%89%87%E6%B6%88%E6%81%AF /// REF: https://developer.work.weixin.qq.com/document/path/90859#%E5%9B%BE%E7%89%87%E6%B6%88%E6%81%AF /// - public class ImageMessageReply : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ImageMessageReply : WechatWorkEvent { public static class Types { @@ -15,6 +15,8 @@ /// /// 获取或设置图片 MediaId。 /// + [Newtonsoft.Json.JsonProperty("MediaId")] + [System.Text.Json.Serialization.JsonPropertyName("MediaId")] [System.Xml.Serialization.XmlElement("MediaId")] public string MediaId { get; set; } = string.Empty; } @@ -23,6 +25,8 @@ /// /// 获取或设置图片信息。 /// + [Newtonsoft.Json.JsonProperty("Image")] + [System.Text.Json.Serialization.JsonPropertyName("Image")] [System.Xml.Serialization.XmlElement("Image")] public Types.Image Image { get; set; } = new Types.Image(); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/NewsMessageReply.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/NewsMessageReply.cs index 66c793dc..bf08e45a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/NewsMessageReply.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/NewsMessageReply.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示被动回复图文消息的数据。 @@ -6,7 +6,7 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90377#%E5%9B%BE%E6%96%87%E6%B6%88%E6%81%AF /// REF: https://developer.work.weixin.qq.com/document/path/90859#%E5%9B%BE%E6%96%87%E6%B6%88%E6%81%AF /// - public class NewsMessageReply : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class NewsMessageReply : WechatWorkEvent { public static class Types { @@ -15,24 +15,32 @@ /// /// 获取或设置图文链接。 /// + [Newtonsoft.Json.JsonProperty("Url")] + [System.Text.Json.Serialization.JsonPropertyName("Url")] [System.Xml.Serialization.XmlElement("Url")] public string Url { get; set; } = string.Empty; /// /// 获取或设置图文封面图片链接。 /// + [Newtonsoft.Json.JsonProperty("PicUrl")] + [System.Text.Json.Serialization.JsonPropertyName("PicUrl")] [System.Xml.Serialization.XmlElement("PicUrl")] public string PictureUrl { get; set; } = string.Empty; /// /// 获取或设置图文标题。 /// + [Newtonsoft.Json.JsonProperty("Title")] + [System.Text.Json.Serialization.JsonPropertyName("Title")] [System.Xml.Serialization.XmlElement("Title")] public string Title { get; set; } = string.Empty; /// /// 获取或设置图文描述。 /// + [Newtonsoft.Json.JsonProperty("Description")] + [System.Text.Json.Serialization.JsonPropertyName("Description")] [System.Xml.Serialization.XmlElement("Description")] public string Description { get; set; } = string.Empty; } @@ -42,6 +50,8 @@ /// /// 获取或设置图文列表。 /// + [Newtonsoft.Json.JsonProperty("item")] + [System.Text.Json.Serialization.JsonPropertyName("item")] [System.Xml.Serialization.XmlElement("item", Type = typeof(ArticleItem))] public ArticleItem[] Items { get; set; } = new ArticleItem[0]; } @@ -50,12 +60,16 @@ /// /// 获取或设置图文数量。 /// + [Newtonsoft.Json.JsonProperty("ArticleCount")] + [System.Text.Json.Serialization.JsonPropertyName("ArticleCount")] [System.Xml.Serialization.XmlElement("ArticleCount")] public int ArticleCount { get; set; } /// /// 获取或设置图文列表。 /// + [Newtonsoft.Json.JsonProperty("Articles")] + [System.Text.Json.Serialization.JsonPropertyName("Articles")] [System.Xml.Serialization.XmlElement("Articles")] public Types.ArticleList ArticleList { get; set; } = new Types.ArticleList(); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/TextMessageReply.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/TextMessageReply.cs index b361c619..80e30e7e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/TextMessageReply.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/TextMessageReply.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示被动回复文本消息的数据。 @@ -6,11 +6,13 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90377#%E6%96%87%E6%9C%AC%E6%B6%88%E6%81%AF /// REF: https://developer.work.weixin.qq.com/document/path/90859#%E6%96%87%E6%9C%AC%E6%B6%88%E6%81%AF /// - public class TextMessageReply : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class TextMessageReply : WechatWorkEvent { /// /// 获取或设置消息内容。 /// + [Newtonsoft.Json.JsonProperty("Content")] + [System.Text.Json.Serialization.JsonPropertyName("Content")] [System.Xml.Serialization.XmlElement("Content")] public string Content { get; set; } = string.Empty; diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/UpdateButtonReply.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/UpdateButtonReply.cs index eb3560f0..f0adb2ff 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/UpdateButtonReply.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/UpdateButtonReply.cs @@ -1,11 +1,11 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示被动回复更新点击用户的按钮点击文案消息的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/90241#%E6%A8%A1%E6%9D%BF%E5%8D%A1%E7%89%87%E6%9B%B4%E6%96%B0%E6%B6%88%E6%81%AF /// REF: https://developer.work.weixin.qq.com/document/path/90377#%E6%A8%A1%E6%9D%BF%E5%8D%A1%E7%89%87%E6%9B%B4%E6%96%B0%E6%B6%88%E6%81%AF /// - public class UpdateButtonReply : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class UpdateButtonReply : WechatWorkEvent { public static class Types { @@ -14,6 +14,8 @@ /// /// 获取或设置替换文案。 /// + [Newtonsoft.Json.JsonProperty("ReplaceName")] + [System.Text.Json.Serialization.JsonPropertyName("ReplaceName")] [System.Xml.Serialization.XmlElement("ReplaceName")] public string ReplacementText { get; set; } = string.Empty; } @@ -22,6 +24,8 @@ /// /// 获取或设置按钮信息。 /// + [Newtonsoft.Json.JsonProperty("Button")] + [System.Text.Json.Serialization.JsonPropertyName("Button")] [System.Xml.Serialization.XmlElement("Button")] public Types.Button Button { get; set; } = new Types.Button(); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/UpdateTaskCardReply.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/UpdateTaskCardReply.cs index d97759ac..a7e0bf96 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/UpdateTaskCardReply.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/UpdateTaskCardReply.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示被动回复任务卡片更新消息的数据。 @@ -6,7 +6,7 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90377#%E4%BB%BB%E5%8A%A1%E5%8D%A1%E7%89%87%E6%9B%B4%E6%96%B0%E6%B6%88%E6%81%AF /// REF: https://developer.work.weixin.qq.com/document/path/90859#%E4%BB%BB%E5%8A%A1%E5%8D%A1%E7%89%87%E6%9B%B4%E6%96%B0%E6%B6%88%E6%81%AF /// - public class UpdateTaskCardReply : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class UpdateTaskCardReply : WechatWorkEvent { public static class Types { @@ -15,6 +15,8 @@ /// /// 获取或设置点击任务卡片按钮后显示的按钮名称。 /// + [Newtonsoft.Json.JsonProperty("ReplaceName")] + [System.Text.Json.Serialization.JsonPropertyName("ReplaceName")] [System.Xml.Serialization.XmlElement("ReplaceName")] public string ReplacementText { get; set; } = string.Empty; } @@ -23,6 +25,8 @@ /// /// 获取或设置任务卡片信息。 /// + [Newtonsoft.Json.JsonProperty("TaskCard")] + [System.Text.Json.Serialization.JsonPropertyName("TaskCard")] [System.Xml.Serialization.XmlElement("TaskCard")] public Types.TaskCard? TaskCard { get; set; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/VideoMessageReply.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/VideoMessageReply.cs index 65d33286..99479585 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/VideoMessageReply.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/VideoMessageReply.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示被动回复视频消息的数据。 @@ -6,7 +6,7 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90377#%E8%A7%86%E9%A2%91%E6%B6%88%E6%81%AF /// REF: https://developer.work.weixin.qq.com/document/path/90859#%E8%A7%86%E9%A2%91%E6%B6%88%E6%81%AF /// - public class VideoMessageReply : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class VideoMessageReply : WechatWorkEvent { public static class Types { @@ -15,18 +15,24 @@ /// /// 获取或设置视频 MediaId。 /// + [Newtonsoft.Json.JsonProperty("MediaId")] + [System.Text.Json.Serialization.JsonPropertyName("MediaId")] [System.Xml.Serialization.XmlElement("MediaId")] public string MediaId { get; set; } = string.Empty; /// /// 获取或设置视频标题。 /// + [Newtonsoft.Json.JsonProperty("Title")] + [System.Text.Json.Serialization.JsonPropertyName("Title")] [System.Xml.Serialization.XmlElement("Title")] public string Title { get; set; } = string.Empty; /// /// 获取或设置视频描述。 /// + [Newtonsoft.Json.JsonProperty("Description")] + [System.Text.Json.Serialization.JsonPropertyName("Description")] [System.Xml.Serialization.XmlElement("Description")] public string Description { get; set; } = string.Empty; } @@ -35,6 +41,8 @@ /// /// 获取或设置视频信息。 /// + [Newtonsoft.Json.JsonProperty("Video")] + [System.Text.Json.Serialization.JsonPropertyName("Video")] [System.Xml.Serialization.XmlElement("Video")] public Types.Video Video { get; set; } = new Types.Video(); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/VoiceMessageReply.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/VoiceMessageReply.cs index 88e3cb8d..37cc1bfb 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/VoiceMessageReply.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Reply/VoiceMessageReply.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示被动回复语音消息的数据。 @@ -6,7 +6,7 @@ /// REF: https://developer.work.weixin.qq.com/document/path/90377#%E8%AF%AD%E9%9F%B3%E6%B6%88%E6%81%AF /// REF: https://developer.work.weixin.qq.com/document/path/90859#%E8%AF%AD%E9%9F%B3%E6%B6%88%E6%81%AF /// - public class VoiceMessageReply : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class VoiceMessageReply : WechatWorkEvent { public static class Types { @@ -15,6 +15,8 @@ /// /// 获取或设置语音 MediaId。 /// + [Newtonsoft.Json.JsonProperty("MediaId")] + [System.Text.Json.Serialization.JsonPropertyName("MediaId")] [System.Xml.Serialization.XmlElement("MediaId")] public string MediaId { get; set; } = string.Empty; } @@ -23,6 +25,8 @@ /// /// 获取或设置语音信息。 /// + [Newtonsoft.Json.JsonProperty("Voice")] + [System.Text.Json.Serialization.JsonPropertyName("Voice")] [System.Xml.Serialization.XmlElement("Voice")] public Types.Voice Voice { get; set; } = new Types.Voice(); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/School/ChangeSchoolContactEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/School/ChangeSchoolContactEvent.cs index 5ede1da1..d51b3b47 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/School/ChangeSchoolContactEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/School/ChangeSchoolContactEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.change_school_contact 或 INFO.change_school_contact 事件的数据。 @@ -7,29 +7,37 @@ /// REF: https://developer.work.weixin.qq.com/document/path/92051 /// REF: https://developer.work.weixin.qq.com/document/path/92050 /// - public class ChangeSchoolContactEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ChangeSchoolContactEvent : WechatWorkEvent { /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId", IsNullable = true)] public string? SuiteId { get; set; } /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId", IsNullable = true)] public string? AuthorizerCorpId { get; set; } /// /// 获取或设置变更类型。 /// + [Newtonsoft.Json.JsonProperty("ChangeType")] + [System.Text.Json.Serialization.JsonPropertyName("ChangeType")] [System.Xml.Serialization.XmlElement("ChangeType")] public string ChangeType { get; set; } = default!; /// /// 获取或设置学生/家长账号或部门 ID（即班级）。 /// + [Newtonsoft.Json.JsonProperty("Id")] + [System.Text.Json.Serialization.JsonPropertyName("Id")] [System.Xml.Serialization.XmlElement("Id", IsNullable = true)] public string? StudentOrParentOrDepartmentId { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/AgreeExternalUserIdMigrationEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/AgreeExternalUserIdMigrationEvent.cs index 3201c3dc..fd01b178 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/AgreeExternalUserIdMigrationEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/AgreeExternalUserIdMigrationEvent.cs @@ -4,7 +4,7 @@ /// 表示 EVENT.agree_external_userid_migration 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/95327 /// - public class AgreeExternalUserIdMigrationEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable, WechatWorkEvent.Serialization.IJsonSerializable + public class AgreeExternalUserIdMigrationEvent : WechatWorkEvent { /// /// 获取或设置服务商 CorpId。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ApproveSpecialAuthEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ApproveSpecialAuthEvent.cs index af5a65d3..183e3473 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ApproveSpecialAuthEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ApproveSpecialAuthEvent.cs @@ -4,23 +4,29 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 表示 INFO.approve_special_auth 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/98959 /// - public class ApproveSpecialAuthEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ApproveSpecialAuthEvent : WechatWorkEvent { /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId")] public string SuiteId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId")] public string AuthorizerCorpId { get; set; } = default!; /// /// 获取或设置权限类型。 /// + [Newtonsoft.Json.JsonProperty("AuthType")] + [System.Text.Json.Serialization.JsonPropertyName("AuthType")] [System.Xml.Serialization.XmlElement("AuthType")] public string AuthType { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/CancelSpecialAuthEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/CancelSpecialAuthEvent.cs index b40c918e..a9086859 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/CancelSpecialAuthEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/CancelSpecialAuthEvent.cs @@ -4,23 +4,29 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// 表示 INFO.cancel_special_auth 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/98959 /// - public class CancelSpecialAuthEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class CancelSpecialAuthEvent : WechatWorkEvent { /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId")] public string SuiteId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId")] public string AuthorizerCorpId { get; set; } = default!; /// /// 获取或设置权限类型。 /// + [Newtonsoft.Json.JsonProperty("AuthType")] + [System.Text.Json.Serialization.JsonPropertyName("AuthType")] [System.Xml.Serialization.XmlElement("AuthType")] public string AuthType { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ChangeAppAdminEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ChangeAppAdminEvent.cs index 0cd6c9f6..d5952343 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ChangeAppAdminEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ChangeAppAdminEvent.cs @@ -1,14 +1,16 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.change_app_admin 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/95038 /// - public class ChangeAppAdminEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ChangeAppAdminEvent : WechatWorkEvent { /// /// 获取或设置应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentID")] + [System.Text.Json.Serialization.JsonPropertyName("AgentID")] [System.Xml.Serialization.XmlElement("AgentID")] public int AgentId { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ChangeAuthEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ChangeAuthEvent.cs index 78566093..ffec6236 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ChangeAuthEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ChangeAuthEvent.cs @@ -5,7 +5,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// REF: https://developer.work.weixin.qq.com/document/path/90642 /// REF: https://developer.work.weixin.qq.com/document/path/99401 /// - public class ChangeAuthEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ChangeAuthEvent : WechatWorkEvent { public static class Types { @@ -18,6 +18,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置客服账号列表。 /// + [Newtonsoft.Json.JsonProperty("OpenKfId")] + [System.Text.Json.Serialization.JsonPropertyName("OpenKfId")] [System.Xml.Serialization.XmlElement("OpenKfId", Type = typeof(string))] public string[] Items { get; set; } = default!; } @@ -26,6 +28,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置用户本次授权的客服账号列表。 /// + [Newtonsoft.Json.JsonProperty("AuthOpenKfIdList")] + [System.Text.Json.Serialization.JsonPropertyName("AuthOpenKfIdList")] [System.Xml.Serialization.XmlElement("AuthOpenKfIdList", IsNullable = true)] public Types.AuthorizedOpenKfIdList? AuthorizedOpenKfIdList { get; set; } } @@ -34,18 +38,24 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId")] public string SuiteId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId")] public string AuthorizerCorpId { get; set; } = default!; /// /// 获取或设置事件信息。 /// + [Newtonsoft.Json.JsonProperty("ExtraInfo")] + [System.Text.Json.Serialization.JsonPropertyName("ExtraInfo")] [System.Xml.Serialization.XmlElement("ExtraInfo", IsNullable = true)] public Types.Extra? Extra { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/CorpArchitectureAuthEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/CorpArchitectureAuthEvent.cs index 20629c07..f4c600e6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/CorpArchitectureAuthEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/CorpArchitectureAuthEvent.cs @@ -1,20 +1,24 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.corp_arch_auth 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/97378 /// - public class CorpArchitectureAuthEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class CorpArchitectureAuthEvent : WechatWorkEvent { /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId")] public string SuiteId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId")] public string AuthorizerCorpId { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/CreateAuthEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/CreateAuthEvent.cs index b731a57f..1e00e1d5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/CreateAuthEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/CreateAuthEvent.cs @@ -1,27 +1,33 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.create_auth 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/90642 /// REF: https://developer.work.weixin.qq.com/document/path/90795 /// - public class CreateAuthEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class CreateAuthEvent : WechatWorkEvent { /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId")] public string SuiteId { get; set; } = default!; /// /// 获取或设置授权码。 /// + [Newtonsoft.Json.JsonProperty("AuthCode")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCode")] [System.Xml.Serialization.XmlElement("AuthCode")] public string AuthCode { get; set; } = default!; /// /// 获取或设置扫码或者授权链接中的自定义参数。 /// + [Newtonsoft.Json.JsonProperty("State")] + [System.Text.Json.Serialization.JsonPropertyName("State")] [System.Xml.Serialization.XmlElement("State", IsNullable = true)] public string? State { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/EnterRegisterPackageEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/EnterRegisterPackageEvent.cs index f901873a..87ba9f9b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/EnterRegisterPackageEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/EnterRegisterPackageEvent.cs @@ -5,7 +5,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// REF: https://developer.work.weixin.qq.com/document/path/90585 /// REF: https://developer.work.weixin.qq.com/document/path/90810 /// - public class EnterRegisterPackageEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class EnterRegisterPackageEvent : WechatWorkEvent { public static class Types { @@ -14,6 +14,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置成员账号。 /// + [Newtonsoft.Json.JsonProperty("UserId")] + [System.Text.Json.Serialization.JsonPropertyName("UserId")] [System.Xml.Serialization.XmlElement("UserId")] public string UserId { get; set; } = default!; } @@ -22,36 +24,48 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// /// 获取或设置服务商 CorpId。 /// + [Newtonsoft.Json.JsonProperty("ServiceCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("ServiceCorpId")] [System.Xml.Serialization.XmlElement("ServiceCorpId")] public string ServiceCorpId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId")] public string AuthorizerCorpId { get; set; } = default!; /// /// 获取或设置注册码。 /// + [Newtonsoft.Json.JsonProperty("RegisterCode")] + [System.Text.Json.Serialization.JsonPropertyName("RegisterCode")] [System.Xml.Serialization.XmlElement("RegisterCode")] public string RegisterCode { get; set; } = default!; /// /// 获取或设置授权管理员信息。 /// + [Newtonsoft.Json.JsonProperty("AuthUserInfo")] + [System.Text.Json.Serialization.JsonPropertyName("AuthUserInfo")] [System.Xml.Serialization.XmlElement("AuthUserInfo", IsNullable = true)] public Types.AuthorizerUser? AuthorizerUser { get; set; } /// /// 获取或设置推广包 ID。 /// + [Newtonsoft.Json.JsonProperty("TemplateId")] + [System.Text.Json.Serialization.JsonPropertyName("TemplateId")] [System.Xml.Serialization.XmlElement("TemplateId")] public string TemplateId { get; set; } = default!; /// /// 获取或设置自定义渠道参数。 /// + [Newtonsoft.Json.JsonProperty("State")] + [System.Text.Json.Serialization.JsonPropertyName("State")] [System.Xml.Serialization.XmlElement("State", IsNullable = true)] public string? State { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/ChangeEditionEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/ChangeEditionEvent.cs index 1ffaeb0d..a19d89c0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/ChangeEditionEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/ChangeEditionEvent.cs @@ -1,20 +1,24 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.change_editon 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/91933 /// - public class ChangeEditionEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ChangeEditionEvent : WechatWorkEvent { /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId")] public string SuiteId { get; set; } = default!; /// /// 获取或设置购买方 CorpId。 /// + [Newtonsoft.Json.JsonProperty("PaidCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("PaidCorpId")] [System.Xml.Serialization.XmlElement("PaidCorpId")] public string PayerCorpId { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/ChangeOrderEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/ChangeOrderEvent.cs index 33b54b64..36c19cf9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/ChangeOrderEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/ChangeOrderEvent.cs @@ -1,32 +1,40 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.change_order 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/91930 /// - public class ChangeOrderEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ChangeOrderEvent : WechatWorkEvent { /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId")] public string SuiteId { get; set; } = default!; /// /// 获取或设置购买方 CorpId。 /// + [Newtonsoft.Json.JsonProperty("PaidCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("PaidCorpId")] [System.Xml.Serialization.XmlElement("PaidCorpId")] public string PayerCorpId { get; set; } = default!; /// /// 获取或设置原订单 ID。 /// + [Newtonsoft.Json.JsonProperty("OldOrderId")] + [System.Text.Json.Serialization.JsonPropertyName("OldOrderId")] [System.Xml.Serialization.XmlElement("OldOrderId")] public string OldOrderId { get; set; }= default!; /// /// 获取或设置新订单 ID。 /// + [Newtonsoft.Json.JsonProperty("NewOrderId")] + [System.Text.Json.Serialization.JsonPropertyName("NewOrderId")] [System.Xml.Serialization.XmlElement("NewOrderId")] public string NewOrderId { get; set; }= default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/OpenOrderEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/OpenOrderEvent.cs index eb353134..fb75d31c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/OpenOrderEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/OpenOrderEvent.cs @@ -1,32 +1,40 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.open_order 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/91929 /// - public class OpenOrderEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class OpenOrderEvent : WechatWorkEvent { /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId")] public string SuiteId { get; set; } = default!; /// /// 获取或设置购买方 CorpId。 /// + [Newtonsoft.Json.JsonProperty("PaidCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("PaidCorpId")] [System.Xml.Serialization.XmlElement("PaidCorpId")] public string PayerCorpId { get; set; } = default!; /// /// 获取或设置订单 ID。 /// + [Newtonsoft.Json.JsonProperty("OrderId")] + [System.Text.Json.Serialization.JsonPropertyName("OrderId")] [System.Xml.Serialization.XmlElement("OrderId")] public string OrderId { get; set; } = default!; /// /// 获取或设置操作员 ID。 /// + [Newtonsoft.Json.JsonProperty("OperatorId")] + [System.Text.Json.Serialization.JsonPropertyName("OperatorId")] [System.Xml.Serialization.XmlElement("OperatorId", IsNullable = true)] public string? OperatorId { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/PayForAppSuccessEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/PayForAppSuccessEvent.cs index 800757ae..214598d5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/PayForAppSuccessEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/PayForAppSuccessEvent.cs @@ -4,7 +4,7 @@ /// 表示 INFO.pay_for_app_success 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/91931 /// - public class PayForAppSuccessEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class PayForAppSuccessEvent : WechatWorkEvent { /// /// 获取或设置第三方应用的 SuiteId。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/RefundEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/RefundEvent.cs index fc7a1662..a780d4c9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/RefundEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/Order/RefundEvent.cs @@ -1,26 +1,32 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.refund 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/91932 /// - public class RefundEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class RefundEvent : WechatWorkEvent { /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId")] public string SuiteId { get; set; } = default!; /// /// 获取或设置购买方 CorpId。 /// + [Newtonsoft.Json.JsonProperty("PaidCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("PaidCorpId")] [System.Xml.Serialization.XmlElement("PaidCorpId")] public string PayerCorpId { get; set; } = default!; /// /// 获取或设置订单 ID。 /// + [Newtonsoft.Json.JsonProperty("OrderId")] + [System.Text.Json.Serialization.JsonPropertyName("OrderId")] [System.Xml.Serialization.XmlElement("OrderId")] public string OrderId { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/RegisterCorpEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/RegisterCorpEvent.cs index 2faa58cc..e0b9beb0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/RegisterCorpEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/RegisterCorpEvent.cs @@ -1,11 +1,11 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.register_corp 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/90585 /// REF: https://developer.work.weixin.qq.com/document/path/90810 /// - public class RegisterCorpEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class RegisterCorpEvent : WechatWorkEvent { public static class Types { @@ -14,12 +14,16 @@ /// /// 获取或设置通讯录迁移凭证。 /// + [Newtonsoft.Json.JsonProperty("AccessToken")] + [System.Text.Json.Serialization.JsonPropertyName("AccessToken")] [System.Xml.Serialization.XmlElement("AccessToken")] public string AccessToken { get; set; } = default!; /// /// 获取或设置通讯录迁移凭证有效期（单位：秒）。 /// + [Newtonsoft.Json.JsonProperty("ExpiresIn")] + [System.Text.Json.Serialization.JsonPropertyName("ExpiresIn")] [System.Xml.Serialization.XmlElement("ExpiresIn")] public int ExpiresIn { get; set; } } @@ -29,6 +33,8 @@ /// /// 获取或设置成员账号。 /// + [Newtonsoft.Json.JsonProperty("UserId")] + [System.Text.Json.Serialization.JsonPropertyName("UserId")] [System.Xml.Serialization.XmlElement("UserId")] public string UserId { get; set; } = default!; } @@ -37,42 +43,56 @@ /// /// 获取或设置服务商 CorpId。 /// + [Newtonsoft.Json.JsonProperty("ServiceCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("ServiceCorpId")] [System.Xml.Serialization.XmlElement("ServiceCorpId")] public string ServiceCorpId { get; set; } = default!; /// /// 获取或设置授权方的 CorpId。 /// + [Newtonsoft.Json.JsonProperty("AuthCorpId")] + [System.Text.Json.Serialization.JsonPropertyName("AuthCorpId")] [System.Xml.Serialization.XmlElement("AuthCorpId")] public string AuthorizerCorpId { get; set; } = default!; /// /// 获取或设置注册码。 /// + [Newtonsoft.Json.JsonProperty("RegisterCode")] + [System.Text.Json.Serialization.JsonPropertyName("RegisterCode")] [System.Xml.Serialization.XmlElement("RegisterCode")] public string RegisterCode { get; set; } = default!; /// /// 获取或设置通讯录迁移信息。 /// + [Newtonsoft.Json.JsonProperty("ContactSync")] + [System.Text.Json.Serialization.JsonPropertyName("ContactSync")] [System.Xml.Serialization.XmlElement("ContactSync", IsNullable = true)] public Types.ContactSync? ContactSync { get; set; } /// /// 获取或设置授权管理员信息。 /// + [Newtonsoft.Json.JsonProperty("AuthUserInfo")] + [System.Text.Json.Serialization.JsonPropertyName("AuthUserInfo")] [System.Xml.Serialization.XmlElement("AuthUserInfo", IsNullable = true)] public Types.AuthorizerUser? AuthorizerUser { get; set; } /// /// 获取或设置推广包 ID。 /// + [Newtonsoft.Json.JsonProperty("TemplateId")] + [System.Text.Json.Serialization.JsonPropertyName("TemplateId")] [System.Xml.Serialization.XmlElement("TemplateId")] public string TemplateId { get; set; } = default!; /// /// 获取或设置自定义渠道参数。 /// + [Newtonsoft.Json.JsonProperty("State")] + [System.Text.Json.Serialization.JsonPropertyName("State")] [System.Xml.Serialization.XmlElement("State", IsNullable = true)] public string? State { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ShareAgentChangeEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ShareAgentChangeEvent.cs index 90971b16..dd78391a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ShareAgentChangeEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/ShareAgentChangeEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.share_agent_change 或 INFO.share_agent_change 事件的数据。 @@ -6,29 +6,37 @@ /// REF: https://developer.work.weixin.qq.com/document/path/93373 /// REF: https://developer.work.weixin.qq.com/document/path/90376 /// - public class ShareAgentChangeEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class ShareAgentChangeEvent : WechatWorkEvent { /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId", IsNullable = true)] public string? SuiteId { get; set; } /// /// 获取或设置上级企业 CorpId。 /// + [Newtonsoft.Json.JsonProperty("CorpId")] + [System.Text.Json.Serialization.JsonPropertyName("CorpId")] [System.Xml.Serialization.XmlElement("CorpId", IsNullable = true)] public string? ParentCorpId { get; set; } /// /// 获取或设置上级企业应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AgentId")] + [System.Text.Json.Serialization.JsonPropertyName("AgentId")] [System.Xml.Serialization.XmlElement("AgentId")] public int ParentAgentId { get; set; } /// /// 获取或设置下级企业应用 ID。 /// + [Newtonsoft.Json.JsonProperty("AppId")] + [System.Text.Json.Serialization.JsonPropertyName("AppId")] [System.Xml.Serialization.XmlElement("AppId", IsNullable = true)] public int? AgentId { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/SuiteTicketEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/SuiteTicketEvent.cs index 0e65f9a1..7f7bcb2e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/SuiteTicketEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Service/SuiteTicketEvent.cs @@ -1,21 +1,25 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 INFO.suite_ticket 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/90628 /// REF: https://developer.work.weixin.qq.com/document/path/90794 /// - public class SuiteTicketEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class SuiteTicketEvent : WechatWorkEvent { /// /// 获取或设置第三方应用的 SuiteId。 /// + [Newtonsoft.Json.JsonProperty("SuiteId")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteId")] [System.Xml.Serialization.XmlElement("SuiteId")] public string SuiteId { get; set; } = default!; /// /// 获取或设置第三方应用的 SuiteTicket。 /// + [Newtonsoft.Json.JsonProperty("SuiteTicket")] + [System.Text.Json.Serialization.JsonPropertyName("SuiteTicket")] [System.Xml.Serialization.XmlElement("SuiteTicket")] public string SuiteTicket { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Wedoc/DocumentChangeEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Wedoc/DocumentChangeEvent.cs index 0e93e3ea..d39ddb52 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Wedoc/DocumentChangeEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Wedoc/DocumentChangeEvent.cs @@ -8,23 +8,29 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Events /// REF: https://developer.work.weixin.qq.com/document/path/98095 /// REF: https://developer.work.weixin.qq.com/document/path/98096 /// - public class DocumentChangeEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class DocumentChangeEvent : WechatWorkEvent { /// /// 获取或设置变更类型。 /// + [Newtonsoft.Json.JsonProperty("ChangeType")] + [System.Text.Json.Serialization.JsonPropertyName("ChangeType")] [System.Xml.Serialization.XmlElement("ChangeType")] public string ChangeType { get; set; } = default!; /// /// 获取或设置文档 ID 列表。 /// + [Newtonsoft.Json.JsonProperty("DocId")] + [System.Text.Json.Serialization.JsonPropertyName("DocId")] [System.Xml.Serialization.XmlElement("DocId", Type = typeof(string), IsNullable = true)] public string[]? DocumentIdList { get; set; } /// /// 获取或设置收集表 ID 列表。 /// + [Newtonsoft.Json.JsonProperty("FormId")] + [System.Text.Json.Serialization.JsonPropertyName("FormId")] [System.Xml.Serialization.XmlElement("FormId", Type = typeof(string), IsNullable = true)] public string[]? FormIdList { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Wedrive/WedriveFileChangeEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Wedrive/WedriveFileChangeEvent.cs index 86522139..a076cf48 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Wedrive/WedriveFileChangeEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Wedrive/WedriveFileChangeEvent.cs @@ -1,20 +1,24 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.wedrive_file_change 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/97975 /// - public class WedriveFileChangeEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class WedriveFileChangeEvent : WechatWorkEvent { /// /// 获取或设置变更类型。 /// + [Newtonsoft.Json.JsonProperty("ChangeType")] + [System.Text.Json.Serialization.JsonPropertyName("ChangeType")] [System.Xml.Serialization.XmlElement("ChangeType")] public string ChangeType { get; set; } = default!; /// /// 获取或设置文件 ID 列表。 /// + [Newtonsoft.Json.JsonProperty("FileId")] + [System.Text.Json.Serialization.JsonPropertyName("FileId")] [System.Xml.Serialization.XmlElement("FileId", Type = typeof(string))] public string[] FileIdList { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Wedrive/WedriveInsufficientCapacityEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Wedrive/WedriveInsufficientCapacityEvent.cs index 620367fa..249e1ee8 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Wedrive/WedriveInsufficientCapacityEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Wedrive/WedriveInsufficientCapacityEvent.cs @@ -4,7 +4,7 @@ /// 表示 EVENT.wedrive_insufficient_capacity 事件的数据。 /// REF: https://developer.work.weixin.qq.com/document/path/97972 /// - public class WedriveInsufficientCapacityEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class WedriveInsufficientCapacityEvent : WechatWorkEvent { } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Wedrive/WedriveSpaceChangeEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Wedrive/WedriveSpaceChangeEvent.cs index 46086a19..2166660f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Wedrive/WedriveSpaceChangeEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Events/Wedrive/WedriveSpaceChangeEvent.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Events +namespace SKIT.FlurlHttpClient.Wechat.Work.Events { /// /// 表示 EVENT.wedrive_space_change 事件的数据。 @@ -7,17 +7,21 @@ /// REF: https://developer.work.weixin.qq.com/document/path/97977 /// REF: https://developer.work.weixin.qq.com/document/path/97978 /// - public class WedriveSpaceChangeEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable + public class WedriveSpaceChangeEvent : WechatWorkEvent { /// /// 获取或设置变更类型。 /// + [Newtonsoft.Json.JsonProperty("ChangeType")] + [System.Text.Json.Serialization.JsonPropertyName("ChangeType")] [System.Xml.Serialization.XmlElement("ChangeType")] public string ChangeType { get; set; } = default!; /// /// 获取或设置空间 ID 列表。 /// + [Newtonsoft.Json.JsonProperty("SpaceId")] + [System.Text.Json.Serialization.JsonPropertyName("SpaceId")] [System.Xml.Serialization.XmlElement("SpaceId", Type = typeof(string))] public string[] SpaceIdList { get; set; } = default!; } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Exceptions/WechatWorkEventSerializationException.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Exceptions/WechatWorkEventSerializationException.cs deleted file mode 100644 index 7dc7af76..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Exceptions/WechatWorkEventSerializationException.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; - -namespace SKIT.FlurlHttpClient.Wechat.Work.Exceptions -{ - public class WechatWorkEventSerializationException : WechatWorkException - { - /// - internal WechatWorkEventSerializationException() - { - } - - /// - internal WechatWorkEventSerializationException(string message) - : base(message) - { - } - - /// - internal WechatWorkEventSerializationException(string message, Exception innerException) - : base(message, innerException) - { - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Exceptions/WechatWorkRequestTimeoutException.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Exceptions/WechatWorkRequestTimeoutException.cs deleted file mode 100644 index 005a1b71..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Exceptions/WechatWorkRequestTimeoutException.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; - -namespace SKIT.FlurlHttpClient.Wechat.Work.Exceptions -{ - public class WechatWorkRequestTimeoutException : WechatWorkException - { - /// - internal WechatWorkRequestTimeoutException() - { - } - - /// - internal WechatWorkRequestTimeoutException(string message) - : base(message) - { - } - - /// - internal WechatWorkRequestTimeoutException(string message, Exception innerException) - : base(message, innerException) - { - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientEventExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientEventExtensions.cs index 07831261..787d0c2b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientEventExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientEventExtensions.cs @@ -6,100 +6,30 @@ namespace SKIT.FlurlHttpClient.Wechat.Work /// /// 为 提供回调通知事件的扩展方法。 /// - public static class WechatWorkClientEventExtensions + public static partial class WechatWorkClientEventExtensions { - private class InnerEncryptedEvent - { - [Newtonsoft.Json.JsonProperty("Encrypt")] - [System.Text.Json.Serialization.JsonPropertyName("Encrypt")] - public string EncryptedData { get; set; } = default!; - - [Newtonsoft.Json.JsonProperty("TimeStamp")] - [System.Text.Json.Serialization.JsonPropertyName("TimeStamp")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringConverter))] - public string TimestampString { get; set; } = default!; - - [Newtonsoft.Json.JsonProperty("Nonce")] - [System.Text.Json.Serialization.JsonPropertyName("Nonce")] - public string Nonce { get; set; } = default!; - - [Newtonsoft.Json.JsonProperty("MsgSignature")] - [System.Text.Json.Serialization.JsonPropertyName("MsgSignature")] - public string Signature { get; set; } = default!; - } - - private static TEvent InnerDeserializeEventFromJson(this WechatWorkClient client, string callbackJson) - where TEvent : WechatWorkEvent - { - if (client == null) throw new ArgumentNullException(nameof(client)); - if (callbackJson == null) throw new ArgumentNullException(callbackJson); - - try - { - if (string.IsNullOrEmpty(client.Credentials.PushEncodingAESKey)) - throw new Exceptions.WechatWorkEventSerializationException("Failed to decrypt event data, because there is no encoding AES key."); - - InnerEncryptedEvent encryptedEvent = client.JsonSerializer.Deserialize(callbackJson); - callbackJson = Utilities.WxMsgCryptor.AESDecrypt(cipherText: encryptedEvent.EncryptedData, encodingAESKey: client.Credentials.PushEncodingAESKey!, out _); - - return client.JsonSerializer.Deserialize(callbackJson); - } - catch (WechatWorkException) - { - throw; - } - catch (Exception ex) - { - throw new Exceptions.WechatWorkEventSerializationException("Failed to deserialize event data. Please see the inner exception for more details.", ex); - } - } - - private static TEvent InnerDeserializeEventFromXml(this WechatWorkClient client, string callbackXml) - where TEvent : WechatWorkEvent - { - if (client == null) throw new ArgumentNullException(nameof(client)); - if (callbackXml == null) throw new ArgumentNullException(callbackXml); - - try - { - if (!Utilities.WxMsgCryptor.TryParseXml(callbackXml, out string? encryptedXml)) - throw new Exceptions.WechatWorkEventSerializationException("Failed to decrypt event data, because of empty encrypted data."); - - callbackXml = Utilities.WxMsgCryptor.AESDecrypt(cipherText: encryptedXml!, encodingAESKey: client.Credentials.PushEncodingAESKey!, out _); - return Utilities.XmlUtility.Deserialize(callbackXml); - } - catch (WechatWorkException) - { - throw; - } - catch (Exception ex) - { - throw new Exceptions.WechatWorkEventSerializationException("Failed to deserialize event data. Please see the inner exception for more details.", ex); - } - } - /// /// 从 JSON 反序列化得到 对象。 /// /// /// - /// + /// /// - public static TEvent DeserializeEventFromJson(this WechatWorkClient client, string callbackJson) - where TEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IJsonSerializable, new() + public static TEvent DeserializeEventFromJson(this WechatWorkClient client, string webhookJson) + where TEvent : WechatWorkEvent, new() { - return InnerDeserializeEventFromJson(client, callbackJson); + return InnerDeserializeEventFromJson(client, webhookJson); } /// /// 从 JSON 反序列化得到 对象。 /// /// - /// + /// /// - public static WechatWorkEvent DeserializeEventFromJson(this WechatWorkClient client, string callbackJson) + public static WechatWorkEvent DeserializeEventFromJson(this WechatWorkClient client, string webhookJson) { - return InnerDeserializeEventFromJson(client, callbackJson); + return InnerDeserializeEventFromJson(client, webhookJson); } /// @@ -107,23 +37,23 @@ namespace SKIT.FlurlHttpClient.Wechat.Work /// /// /// - /// + /// /// - public static TEvent DeserializeEventFromXml(this WechatWorkClient client, string callbackXml) - where TEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable, new() + public static TEvent DeserializeEventFromXml(this WechatWorkClient client, string webhookXml) + where TEvent : WechatWorkEvent, new() { - return InnerDeserializeEventFromXml(client, callbackXml); + return InnerDeserializeEventFromXml(client, webhookXml); } /// /// 从 XML 反序列化得到 对象。 /// /// - /// + /// /// - public static WechatWorkEvent DeserializeEventFromXml(this WechatWorkClient client, string callbackXml) + public static WechatWorkEvent DeserializeEventFromXml(this WechatWorkClient client, string webhookXml) { - return InnerDeserializeEventFromXml(client, callbackXml); + return InnerDeserializeEventFromXml(client, webhookXml); } /// @@ -131,26 +61,26 @@ namespace SKIT.FlurlHttpClient.Wechat.Work /// /// /// - /// + /// /// - public static string SerializeEventToJson(this WechatWorkClient client, TEvent callbackModel) - where TEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IJsonSerializable, new() + public static string SerializeEventToJson(this WechatWorkClient client, TEvent webhookEvent) + where TEvent : WechatWorkEvent, new() { string json; try { - json = client.JsonSerializer.Serialize(callbackModel); + json = client.JsonSerializer.Serialize(webhookEvent); } catch (Exception ex) { - throw new Exceptions.WechatWorkEventSerializationException("Failed to serialize event data. Please see the inner exception for more details.", ex); + throw new WechatWorkException("Failed to serialize event data. Please see the inner exception for more details.", ex); } if (string.IsNullOrEmpty(client.Credentials.PushEncodingAESKey)) - throw new Exceptions.WechatWorkEventSerializationException("Failed to encrypt event data, because there is no encoding AES key."); + throw new WechatWorkException("Failed to encrypt event data, because the push encoding AES key is empty."); if (string.IsNullOrEmpty(client.Credentials.PushToken)) - throw new Exceptions.WechatWorkEventSerializationException("Failed to encrypt event data, because there is no token."); + throw new WechatWorkException("Failed to encrypt event data, because the push token is empty."); try { @@ -178,7 +108,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work } catch (Exception ex) { - throw new Exceptions.WechatWorkEventSerializationException("Failed to encrypt event data. Please see the inner exception for more details.", ex); + throw new WechatWorkException("Failed to encrypt event data. Please see the inner exception for more details.", ex); } return json; @@ -189,26 +119,26 @@ namespace SKIT.FlurlHttpClient.Wechat.Work /// /// /// - /// + /// /// - public static string SerializeEventToXml(this WechatWorkClient client, TEvent callbackModel) - where TEvent : WechatWorkEvent, WechatWorkEvent.Serialization.IXmlSerializable, new() + public static string SerializeEventToXml(this WechatWorkClient client, TEvent webhookEvent) + where TEvent : WechatWorkEvent, new() { string xml; try { - xml = Utilities.XmlUtility.Serialize(callbackModel); + xml = Utilities.XmlHelper.Serialize(webhookEvent); } catch (Exception ex) { - throw new Exceptions.WechatWorkEventSerializationException("Failed to serialize event data. Please see the inner exception for more details.", ex); + throw new WechatWorkException("Failed to serialize event data. Please see the inner exception for more details.", ex); } if (string.IsNullOrEmpty(client.Credentials.PushEncodingAESKey)) - throw new Exceptions.WechatWorkEventSerializationException("Failed to encrypt event data, because there is no encoding AES key."); + throw new WechatWorkException("Failed to encrypt event data, because the push encoding AES key is empty."); if (string.IsNullOrEmpty(client.Credentials.PushToken)) - throw new Exceptions.WechatWorkEventSerializationException("Failed to encrypt event data, because there is no token."); + throw new WechatWorkException("Failed to encrypt event data, because the push token is empty."); try { @@ -222,7 +152,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work } catch (Exception ex) { - throw new Exceptions.WechatWorkEventSerializationException("Failed to encrypt event data. Please see the inner exception for more details.", ex); + throw new WechatWorkException("Failed to encrypt event data. Please see the inner exception for more details.", ex); } return xml; @@ -235,33 +165,29 @@ namespace SKIT.FlurlHttpClient.Wechat.Work /// REF: https://developer.work.weixin.qq.com/document/path/91148 /// /// - /// 微信回调通知中的 "timestamp" 查询参数。 - /// 微信回调通知中的 "nonce" 查询参数。 - /// 微信回调通知中的 "echostr" 查询参数。 - /// 微信回调通知中的 "msg_signature" 查询参数。 + /// 微信回调通知中的 "timestamp" 查询参数。 + /// 微信回调通知中的 "nonce" 查询参数。 + /// 微信回调通知中的 "echostr" 查询参数。 + /// 微信回调通知中的 "msg_signature" 查询参数。 /// /// - public static bool VerifyEventSignatureForEcho(this WechatWorkClient client, string callbackTimestamp, string callbackNonce, string callbackEcho, string callbackSignature, out string? replyEcho) + public static bool VerifyEventSignatureForEcho(this WechatWorkClient client, string webhookTimestamp, string webhookNonce, string webhookEcho, string webhookSignature, out string? replyEcho) { - if (client == null) throw new ArgumentNullException(nameof(client)); - if (callbackTimestamp == null) throw new ArgumentNullException(nameof(callbackTimestamp)); - if (callbackNonce == null) throw new ArgumentNullException(nameof(callbackNonce)); - if (callbackEcho == null) throw new ArgumentNullException(nameof(callbackEcho)); - if (callbackSignature == null) throw new ArgumentNullException(nameof(callbackSignature)); + if (client is null) throw new ArgumentNullException(nameof(client)); try { bool ret = Utilities.WxMsgCryptor.VerifySignature( sToken: client.Credentials.PushToken!, - sTimestamp: callbackTimestamp, - sNonce: callbackNonce, - sMsgEncrypt: callbackEcho, - sMsgSign: callbackSignature + sTimestamp: webhookTimestamp, + sNonce: webhookNonce, + sMsgEncrypt: webhookEcho, + sMsgSign: webhookSignature ); if (ret) { - replyEcho = Utilities.WxMsgCryptor.AESDecrypt(cipherText: callbackEcho, encodingAESKey: client.Credentials.PushEncodingAESKey!, out _); + replyEcho = Utilities.WxMsgCryptor.AESDecrypt(cipherText: webhookEcho, encodingAESKey: client.Credentials.PushEncodingAESKey!, out _); return true; } } @@ -278,25 +204,24 @@ namespace SKIT.FlurlHttpClient.Wechat.Work /// REF: https://developer.work.weixin.qq.com/document/path/91148 /// /// - /// 微信回调通知中的 "timestamp" 查询参数。 - /// 微信回调通知中的 "nonce" 查询参数。 - /// 微信回调通知中请求正文（JSON 格式）。 - /// 微信回调通知中的 "msg_signature" 查询参数。 + /// 微信回调通知中的 "timestamp" 查询参数。 + /// 微信回调通知中的 "nonce" 查询参数。 + /// 微信回调通知中请求正文（JSON 格式）。 + /// 微信回调通知中的 "msg_signature" 查询参数。 /// - public static bool VerifyEventSignatureFromJson(this WechatWorkClient client, string callbackTimestamp, string callbackNonce, string callbackJson, string callbackSignature) + public static bool VerifyEventSignatureFromJson(this WechatWorkClient client, string webhookTimestamp, string webhookNonce, string webhookJson, string webhookSignature) { - if (client == null) throw new ArgumentNullException(nameof(client)); - if (callbackJson == null) throw new ArgumentNullException(nameof(callbackJson)); + if (client is null) throw new ArgumentNullException(nameof(client)); try { - var encryptedEvent = client.JsonSerializer.Deserialize(callbackJson); + var encryptedEvent = client.JsonSerializer.Deserialize(webhookJson); return Utilities.WxMsgCryptor.VerifySignature( sToken: client.Credentials.PushToken!, - sTimestamp: callbackTimestamp, - sNonce: callbackNonce, + sTimestamp: webhookTimestamp, + sNonce: webhookNonce, sMsgEncrypt: encryptedEvent.EncryptedData, - sMsgSign: callbackSignature + sMsgSign: webhookSignature ); } catch @@ -312,27 +237,26 @@ namespace SKIT.FlurlHttpClient.Wechat.Work /// REF: https://developer.work.weixin.qq.com/document/path/91148 /// /// - /// 微信回调通知中的 "timestamp" 查询参数。 - /// 微信回调通知中的 "nonce" 查询参数。 - /// 微信回调通知中请求正文（XML 格式）。 - /// 微信回调通知中的 "msg_signature" 查询参数。 + /// 微信回调通知中的 "timestamp" 查询参数。 + /// 微信回调通知中的 "nonce" 查询参数。 + /// 微信回调通知中请求正文（XML 格式）。 + /// 微信回调通知中的 "msg_signature" 查询参数。 /// - public static bool VerifyEventSignatureFromXml(this WechatWorkClient client, string callbackTimestamp, string callbackNonce, string callbackXml, string callbackSignature) + public static bool VerifyEventSignatureFromXml(this WechatWorkClient client, string webhookTimestamp, string webhookNonce, string webhookXml, string webhookSignature) { - if (client == null) throw new ArgumentNullException(nameof(client)); - if (callbackXml == null) throw new ArgumentNullException(nameof(callbackXml)); + if (client is null) throw new ArgumentNullException(nameof(client)); try { - XDocument xDoc = XDocument.Parse(callbackXml); + XDocument xDoc = XDocument.Parse(webhookXml); string? msgEncrypt = xDoc.Root?.Element("Encrypt")?.Value; return Utilities.WxMsgCryptor.VerifySignature( sToken: client.Credentials.PushToken!, - sTimestamp: callbackTimestamp, - sNonce: callbackNonce, + sTimestamp: webhookTimestamp, + sNonce: webhookNonce, sMsgEncrypt: msgEncrypt!, - sMsgSign: callbackSignature + sMsgSign: webhookSignature ); } catch @@ -341,4 +265,75 @@ namespace SKIT.FlurlHttpClient.Wechat.Work } } } + + partial class WechatWorkClientEventExtensions + { + private class InnerEncryptedEvent + { + [Newtonsoft.Json.JsonProperty("Encrypt")] + [System.Text.Json.Serialization.JsonPropertyName("Encrypt")] + public string EncryptedData { get; set; } = default!; + + [Newtonsoft.Json.JsonProperty("TimeStamp")] + [System.Text.Json.Serialization.JsonPropertyName("TimeStamp")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringConverter))] + public string TimestampString { get; set; } = default!; + + [Newtonsoft.Json.JsonProperty("Nonce")] + [System.Text.Json.Serialization.JsonPropertyName("Nonce")] + public string Nonce { get; set; } = default!; + + [Newtonsoft.Json.JsonProperty("MsgSignature")] + [System.Text.Json.Serialization.JsonPropertyName("MsgSignature")] + public string Signature { get; set; } = default!; + } + + private static TEvent InnerDeserializeEventFromJson(this WechatWorkClient client, string webhookJson) + where TEvent : WechatWorkEvent + { + if (client is null) throw new ArgumentNullException(nameof(client)); + + try + { + if (string.IsNullOrEmpty(client.Credentials.PushEncodingAESKey)) + throw new WechatWorkException("Failed to decrypt event data, because the push encoding AES key is empty."); + + InnerEncryptedEvent encryptedEvent = client.JsonSerializer.Deserialize(webhookJson); + webhookJson = Utilities.WxMsgCryptor.AESDecrypt(cipherText: encryptedEvent.EncryptedData, encodingAESKey: client.Credentials.PushEncodingAESKey!, out _); + + return client.JsonSerializer.Deserialize(webhookJson); + } + catch (WechatWorkException) + { + throw; + } + catch (Exception ex) + { + throw new WechatWorkException("Failed to deserialize event data. Please see the inner exception for more details.", ex); + } + } + + private static TEvent InnerDeserializeEventFromXml(this WechatWorkClient client, string webhookXml) + where TEvent : WechatWorkEvent + { + if (client is null) throw new ArgumentNullException(nameof(client)); + + try + { + if (!Utilities.WxMsgCryptor.TryParseXml(webhookXml, out string? encryptedXml)) + throw new WechatWorkException("Failed to decrypt event data, because the encrypted data is empty."); + + webhookXml = Utilities.WxMsgCryptor.AESDecrypt(cipherText: encryptedXml!, encodingAESKey: client.Credentials.PushEncodingAESKey!, out _); + return Utilities.XmlHelper.Deserialize(webhookXml); + } + catch (WechatWorkException) + { + throw; + } + catch (Exception ex) + { + throw new WechatWorkException("Failed to deserialize event data. Please see the inner exception for more details.", ex); + } + } + } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAgentExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAgentExtensions.cs index 1156a005..94b08293 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAgentExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAgentExtensions.cs @@ -24,15 +24,15 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.AgentId == null) + if (request.AgentId is null) request.AgentId = client.Credentials.AgentId; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "agent", "get") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "agent", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("agentid", request.AgentId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -51,10 +51,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "agent", "list") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "agent", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -70,14 +70,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.AgentId == null) + if (request.AgentId is null) request.AgentId = client.Credentials.AgentId; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "agent", "set") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "agent", "set") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -94,14 +94,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.AgentId == null) + if (request.AgentId is null) request.AgentId = client.Credentials.AgentId; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "agent", "set_scope") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "agent", "set_scope") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -118,10 +118,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "agent", "migrate_to_customized_app") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "agent", "migrate_to_customized_app") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -138,10 +138,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "agent", "get_permissions") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "agent", "get_permissions") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region Workbench @@ -159,14 +159,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.AgentId == null) + if (request.AgentId is null) request.AgentId = client.Credentials.AgentId; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "agent", "set_workbench_template") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "agent", "set_workbench_template") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -183,14 +183,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.AgentId == null) + if (request.AgentId is null) request.AgentId = client.Credentials.AgentId; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "agent", "get_workbench_template") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "agent", "get_workbench_template") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -207,14 +207,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.AgentId == null) + if (request.AgentId is null) request.AgentId = client.Credentials.AgentId; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "agent", "set_workbench_data") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "agent", "set_workbench_data") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAppChatExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAppChatExtensions.cs index c324375c..d1ffc4f4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAppChatExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAppChatExtensions.cs @@ -23,10 +23,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "appchat", "create") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "appchat", "create") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -43,10 +43,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "appchat", "update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "appchat", "update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -63,11 +63,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "appchat", "get") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "appchat", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("chatid", request.ChatId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -84,10 +84,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "appchat", "send") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "appchat", "send") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAuthExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAuthExtensions.cs index 08d0db49..41b400fd 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAuthExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinAuthExtensions.cs @@ -24,11 +24,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "auth", "getuserinfo") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "auth", "getuserinfo") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("code", request.Code); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -45,10 +45,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "auth", "getuserdetail") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "auth", "getuserdetail") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region TAF @@ -66,10 +66,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "auth", "get_tfa_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "auth", "get_tfa_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinBatchExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinBatchExtensions.cs index 884cb2a1..4f9addc0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinBatchExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinBatchExtensions.cs @@ -25,10 +25,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "batch", "invite") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "batch", "invite") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -47,10 +47,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "batch", "syncuser") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "batch", "syncuser") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -69,10 +69,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "batch", "replaceuser") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "batch", "replaceuser") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -91,10 +91,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "batch", "replaceparty") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "batch", "replaceparty") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -113,11 +113,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "batch", "getresult") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "batch", "getresult") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("jobid", request.JobId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -134,10 +134,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "batch", "userid_to_openuserid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "batch", "userid_to_openuserid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCardInvoiceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCardInvoiceExtensions.cs index 11434611..ec34e05f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCardInvoiceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCardInvoiceExtensions.cs @@ -25,10 +25,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "card", "invoice", "reimburse", "getinvoiceinfo") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "card", "invoice", "reimburse", "getinvoiceinfo") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -47,10 +47,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "card", "invoice", "reimburse", "updateinvoicestatus") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "card", "invoice", "reimburse", "updateinvoicestatus") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -69,10 +69,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "card", "invoice", "reimburse", "updatestatusbatch") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "card", "invoice", "reimburse", "updatestatusbatch") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -91,10 +91,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "card", "invoice", "reimburse", "getinvoiceinfobatch") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "card", "invoice", "reimburse", "getinvoiceinfobatch") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCheckinExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCheckinExtensions.cs index 2879fcdb..09858207 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCheckinExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCheckinExtensions.cs @@ -24,10 +24,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcheckindata") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcheckindata") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -45,10 +45,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcheckin_daydata") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcheckin_daydata") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -66,10 +66,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcheckin_monthdata") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcheckin_monthdata") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -87,10 +87,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcheckinschedulist") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcheckinschedulist") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -108,10 +108,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "setcheckinschedulist") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "setcheckinschedulist") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -128,10 +128,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "addcheckinuserface") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "addcheckinuserface") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -148,10 +148,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "punch_correction") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "punch_correction") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region Option @@ -169,10 +169,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcorpcheckinoption") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcorpcheckinoption") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -190,10 +190,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcheckinoption") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "getcheckinoption") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -210,10 +210,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "add_checkin_option") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "add_checkin_option") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -230,10 +230,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "update_checkin_option") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "update_checkin_option") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -250,10 +250,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "clear_checkin_option_array_field") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "clear_checkin_option_array_field") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -270,10 +270,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "del_checkin_option") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "checkin", "del_checkin_option") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpExtensions.cs index 5c693fe6..f17879b3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpExtensions.cs @@ -23,13 +23,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "corp", "get_join_qrcode") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "corp", "get_join_qrcode") .SetQueryParam("access_token", request.AccessToken); - if (request.SizeType != null) + if (request.SizeType is not null) flurlReq.SetQueryParam("size_type", request.SizeType.Value); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -48,10 +48,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corp", "getopenapprovaldata") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "corp", "getopenapprovaldata") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -68,10 +68,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corp", "apply_mass_call_ticket") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "corp", "apply_mass_call_ticket") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpGroupExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpGroupExtensions.cs index d6e4778c..7bd7fea1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpGroupExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpGroupExtensions.cs @@ -23,10 +23,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "unionid_to_external_userid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "unionid_to_external_userid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -43,10 +43,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "import_chain_contact") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "import_chain_contact") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -63,11 +63,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "corpgroup", "getresult") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "corpgroup", "getresult") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("jobid", request.JobId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region Corp @@ -85,10 +85,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "gettoken") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "gettoken") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -105,14 +105,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.ParentAgentId == null) + if (request.ParentAgentId is null) request.ParentAgentId = client.Credentials.AgentId; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "list_app_share_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "list_app_share_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -129,10 +129,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "corpgroup", "corp", "get_chain_list") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "corpgroup", "corp", "get_chain_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -149,10 +149,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "get_chain_group") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "get_chain_group") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -169,10 +169,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "get_chain_corpinfo_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "get_chain_corpinfo_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -189,10 +189,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "get_chain_corpinfo") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "get_chain_corpinfo") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -209,10 +209,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "remove_corp") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "remove_corp") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -229,10 +229,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "get_chain_user_custom_id") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "corp", "get_chain_user_custom_id") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -251,10 +251,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "rule", "list_ids") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "rule", "list_ids") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -271,10 +271,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "rule", "delete_rule") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "rule", "delete_rule") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -291,10 +291,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "rule", "get_rule_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "rule", "get_rule_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -311,10 +311,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "rule", "add_rule") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "rule", "add_rule") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -331,10 +331,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "rule", "modify_rule") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "corpgroup", "rule", "modify_rule") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDepartmentExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDepartmentExtensions.cs index edd5f2c6..2b7b1ba8 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDepartmentExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDepartmentExtensions.cs @@ -25,10 +25,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "department", "create") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "department", "create") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -47,10 +47,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "department", "update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "department", "update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -69,11 +69,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "department", "delete") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "department", "delete") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("id", request.DepartmentId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -92,13 +92,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "department", "list") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "department", "list") .SetQueryParam("access_token", request.AccessToken); - if (request.ParentDepartmentId != null) + if (request.ParentDepartmentId is not null) flurlReq.SetQueryParam("id", request.ParentDepartmentId.Value); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -116,13 +116,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "department", "simplelist") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "department", "simplelist") .SetQueryParam("access_token", request.AccessToken); - if (request.ParentDepartmentId != null) + if (request.ParentDepartmentId is not null) flurlReq.SetQueryParam("id", request.ParentDepartmentId.Value); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -140,11 +140,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "department", "get") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "department", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("id", request.DepartmentId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDeviceDataExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDeviceDataExtensions.cs index fd83d55f..95064aa3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDeviceDataExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDeviceDataExtensions.cs @@ -23,10 +23,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "devicedata", "get_auth_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "devicedata", "get_auth_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -43,10 +43,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "devicedata", "get_checkin_data") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "devicedata", "get_checkin_data") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -63,10 +63,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "devicedata", "get_temperature_data") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "devicedata", "get_temperature_data") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -83,10 +83,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "devicedata", "get_accesscontrol_data") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "devicedata", "get_accesscontrol_data") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region AccessControlRule @@ -104,10 +104,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "devicedata", "get_accesscontrol_rule") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "devicedata", "get_accesscontrol_rule") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -124,10 +124,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "devicedata", "add_accesscontrol_rule") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "devicedata", "add_accesscontrol_rule") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -144,10 +144,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "devicedata", "mod_accesscontrol_rule") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "devicedata", "mod_accesscontrol_rule") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -164,10 +164,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "devicedata", "del_accesscontrol_rule") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "devicedata", "del_accesscontrol_rule") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDialogExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDialogExtensions.cs index 21a8ab78..1fee3a79 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDialogExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDialogExtensions.cs @@ -23,10 +23,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "dial", "get_dial_record") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "dial", "get_dial_record") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExmailExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExmailExtensions.cs index 9df67928..7e7d255a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExmailExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExmailExtensions.cs @@ -26,10 +26,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "app", "compose_send") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "app", "compose_send") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -46,10 +46,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "app", "get_mail_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "app", "get_mail_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -66,10 +66,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "app", "read_mail") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "app", "read_mail") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -86,10 +86,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "app", "update_email_alias") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "app", "update_email_alias") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -106,10 +106,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "app", "get_email_alias") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "app", "get_email_alias") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -128,10 +128,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "group", "create") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "group", "create") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -148,10 +148,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "group", "update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "group", "update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -168,10 +168,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "group", "delete") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "group", "delete") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -188,14 +188,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "exmail", "group", "search") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "exmail", "group", "search") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("fuzzy", request.IsFuzzy ? 1 : 0); - if (request.GroupId != null) + if (request.GroupId is not null) flurlReq.SetQueryParam("groupid", request.GroupId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -212,11 +212,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "exmail", "group", "get") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "exmail", "group", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("groupid", request.GroupId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -235,10 +235,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "publicmail", "create") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "publicmail", "create") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -255,10 +255,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "publicmail", "update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "publicmail", "update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -275,10 +275,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "publicmail", "delete") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "publicmail", "delete") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -295,14 +295,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "exmail", "publicmail", "search") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "exmail", "publicmail", "search") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("fuzzy", request.IsFuzzy ? 1 : 0); - if (request.EmailOrName != null) + if (request.EmailOrName is not null) flurlReq.SetQueryParam("email", request.EmailOrName); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -319,10 +319,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "publicmail", "get") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "publicmail", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -341,10 +341,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "account", "act_email") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "account", "act_email") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -363,10 +363,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "useroption", "get") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "useroption", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -383,10 +383,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "useroption", "update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "useroption", "update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -405,10 +405,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "mail", "get_newcount") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "exmail", "mail", "get_newcount") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExportExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExportExtensions.cs index e5ae80bf..d53e765d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExportExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExportExtensions.cs @@ -24,10 +24,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "export", "simple_user") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "export", "simple_user") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); ; + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); ; } /// @@ -45,10 +45,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "export", "user") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "export", "user") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -66,10 +66,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "export", "department") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "export", "department") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -87,10 +87,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "export", "taguser") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "export", "taguser") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -108,11 +108,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "export", "get_result") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "export", "get_result") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("jobid", request.JobId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExtensions.cs index 4ad1b0a6..66024655 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExtensions.cs @@ -23,11 +23,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "gettoken") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "gettoken") .SetQueryParam("corpid", client.Credentials.CorpId) .SetQueryParam("corpsecret", client.Credentials.AgentSecret); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -46,10 +46,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "getcallbackip") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "getcallbackip") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -66,10 +66,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "get_api_domain_ip") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "get_api_domain_ip") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -87,10 +87,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "get_jsapi_ticket") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "get_jsapi_ticket") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -108,11 +108,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "ticket", "get") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "ticket", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("type", request.Type); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExternalContactExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExternalContactExtensions.cs index 4ff69e0c..2952893e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExternalContactExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExternalContactExtensions.cs @@ -24,10 +24,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "get_follow_user_list") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "get_follow_user_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -45,10 +45,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "close_temp_chat") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "close_temp_chat") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -66,11 +66,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "list") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "list") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("userid", request.UserId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -90,11 +90,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "get") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("external_userid", request.ExternalUserId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -112,10 +112,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "batch", "get_by_user") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "batch", "get_by_user") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -133,10 +133,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "remark") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "remark") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -154,10 +154,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "mark_tag") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "mark_tag") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -175,10 +175,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_unassigned_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_unassigned_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -196,10 +196,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_user_behavior_data") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_user_behavior_data") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -216,10 +216,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "unionid_to_external_userid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "unionid_to_external_userid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -237,10 +237,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "convert_to_openid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "convert_to_openid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -257,10 +257,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "batch_to_external_userid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "batch_to_external_userid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -277,10 +277,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "opengid_to_chatid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "opengid_to_chatid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -297,10 +297,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "to_service_external_userid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "to_service_external_userid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region ContactWay @@ -319,10 +319,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_contact_way") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_contact_way") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -340,10 +340,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_contact_way") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_contact_way") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -361,10 +361,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "list_contact_way") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "list_contact_way") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -382,10 +382,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "update_contact_way") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "update_contact_way") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -403,10 +403,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "del_contact_way") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "del_contact_way") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -426,10 +426,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_corp_tag_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_corp_tag_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -447,10 +447,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_corp_tag") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_corp_tag") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -468,10 +468,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "edit_corp_tag") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "edit_corp_tag") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -489,10 +489,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "del_corp_tag") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "del_corp_tag") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -512,10 +512,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_acquisition", "list_link") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_acquisition", "list_link") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -533,10 +533,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_acquisition", "get") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_acquisition", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -553,10 +553,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_acquisition", "create_link") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_acquisition", "create_link") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -573,10 +573,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_acquisition", "update_link") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_acquisition", "update_link") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -593,10 +593,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_acquisition", "delete_link") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_acquisition", "delete_link") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -613,10 +613,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_acquisition", "customer") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_acquisition", "customer") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -633,10 +633,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_acquisition_quota") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_acquisition_quota") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -654,13 +654,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "customer_acquisition", "statistic") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "customer_acquisition", "statistic") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("link_id", request.LinkId) .SetQueryParam("start_time", request.StartTimestamp) .SetQueryParam("end_time", request.EndTimestamp); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -679,10 +679,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_strategy", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_strategy", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -699,10 +699,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_strategy", "get") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_strategy", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -719,10 +719,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_strategy", "get_range") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_strategy", "get_range") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -739,10 +739,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_strategy", "create") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_strategy", "create") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -759,10 +759,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_strategy", "edit") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_strategy", "edit") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -779,10 +779,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_strategy", "del") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "customer_strategy", "del") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -802,10 +802,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_intercept_rule") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_intercept_rule") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -823,10 +823,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "get_intercept_rule_list") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "get_intercept_rule_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -844,10 +844,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_intercept_rule") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_intercept_rule") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -865,10 +865,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "update_intercept_rule") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "update_intercept_rule") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -886,10 +886,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "del_intercept_rule") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "del_intercept_rule") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -909,10 +909,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "transfer") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "transfer") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -929,10 +929,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "onjob_transfer") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "onjob_transfer") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -950,10 +950,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -971,10 +971,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "get") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region GroupChatStatistics @@ -993,10 +993,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "statistic") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "statistic") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1014,10 +1014,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "statistic_group_by_day") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "statistic_group_by_day") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -1036,10 +1036,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "add_join_way") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "add_join_way") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1056,10 +1056,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "get_join_way") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "get_join_way") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1076,10 +1076,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "update_join_way") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "update_join_way") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1096,10 +1096,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "del_join_way") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "del_join_way") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion #endregion @@ -1120,10 +1120,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_msg_template") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_msg_template") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1141,10 +1141,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_groupmsg_list_v2") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_groupmsg_list_v2") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1162,10 +1162,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_groupmsg_task") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_groupmsg_task") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1183,10 +1183,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_groupmsg_send_result") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_groupmsg_send_result") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -1206,10 +1206,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "send_welcome_msg") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "send_welcome_msg") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1226,10 +1226,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "remind_groupmsg_send") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "remind_groupmsg_send") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1246,10 +1246,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "cancel_groupmsg_send") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "cancel_groupmsg_send") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1267,10 +1267,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "group_welcome_template", "add") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "group_welcome_template", "add") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1288,10 +1288,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "group_welcome_template", "edit") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "group_welcome_template", "edit") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1309,10 +1309,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "group_welcome_template", "get") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "group_welcome_template", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1330,10 +1330,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "group_welcome_template", "del") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "group_welcome_template", "del") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -1353,14 +1353,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.AgentId == null) + if (request.AgentId is null) request.AgentId = client.Credentials.AgentId; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "message", "send") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "message", "send") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -1380,10 +1380,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_new_external_userid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_new_external_userid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1401,10 +1401,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "get_new_external_userid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "groupchat", "get_new_external_userid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -1424,10 +1424,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1445,10 +1445,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_moment_task") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_moment_task") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1465,10 +1465,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "cancel_moment_task") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "cancel_moment_task") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1486,10 +1486,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_task") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_task") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1507,10 +1507,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_task_result") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_task_result") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1528,10 +1528,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_customer_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_customer_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1549,10 +1549,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_send_result") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_send_result") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1570,10 +1570,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_comments") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_moment_comments") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -1592,10 +1592,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "moment_strategy", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "moment_strategy", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1612,10 +1612,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "moment_strategy", "get") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "moment_strategy", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1632,10 +1632,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "moment_strategy", "get_range") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "moment_strategy", "get_range") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1652,10 +1652,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "moment_strategy", "create") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "moment_strategy", "create") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1672,10 +1672,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "moment_strategy", "edit") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "moment_strategy", "edit") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1692,10 +1692,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "moment_strategy", "del") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "moment_strategy", "del") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -1715,10 +1715,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_product_album") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_product_album") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1736,10 +1736,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_product_album_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_product_album_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1757,10 +1757,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_product_album") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_product_album") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1778,10 +1778,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "update_product_album") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "update_product_album") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1799,10 +1799,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "delete_product_album") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "delete_product_album") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -1822,10 +1822,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "get_subscribe_qr_code") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "get_subscribe_qr_code") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1843,10 +1843,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "set_subscribe_mode") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "set_subscribe_mode") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1864,10 +1864,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "get_subscribe_mode") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "externalcontact", "get_subscribe_mode") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -1886,10 +1886,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_strategy_tag_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "get_strategy_tag_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1906,10 +1906,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_strategy_tag") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "add_strategy_tag") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1926,10 +1926,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "edit_strategy_tag") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "edit_strategy_tag") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1946,10 +1946,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "del_strategy_tag") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "del_strategy_tag") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -1969,10 +1969,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "transfer_customer") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "transfer_customer") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1990,10 +1990,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "transfer_result") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "transfer_result") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -2011,10 +2011,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "resigned", "transfer_customer") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "resigned", "transfer_customer") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -2032,10 +2032,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "resigned", "transfer_result") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalcontact", "resigned", "transfer_result") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExternalPayExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExternalPayExtensions.cs index 9334febe..8fe0c12c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExternalPayExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExternalPayExtensions.cs @@ -24,10 +24,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "addmerchant") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "addmerchant") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -44,10 +44,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "getmerchant") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "getmerchant") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -64,10 +64,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "delmerchant") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "delmerchant") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -84,10 +84,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "set_mch_use_scope") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "set_mch_use_scope") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -107,10 +107,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "get_bill_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "get_bill_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -129,10 +129,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "get_payment_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "externalpay", "get_payment_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinHarewareExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinHarewareExtensions.cs index 6c0ae4c5..526fb570 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinHarewareExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinHarewareExtensions.cs @@ -23,10 +23,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "hardware", "get_device_feature") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "hardware", "get_device_feature") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -44,10 +44,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "hardware", "get_hardware_checkin_data") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "hardware", "get_hardware_checkin_data") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinHealthExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinHealthExtensions.cs index 505c8357..c4f678f3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinHealthExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinHealthExtensions.cs @@ -23,10 +23,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "health", "get_health_report_stat") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "health", "get_health_report_stat") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -43,10 +43,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "health", "get_report_jobids") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "health", "get_report_jobids") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -63,10 +63,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "health", "get_report_job_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "health", "get_report_job_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -83,10 +83,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "health", "get_report_answer") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "health", "get_report_answer") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinHrExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinHrExtensions.cs index 08d9ad35..ab66984e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinHrExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinHrExtensions.cs @@ -23,10 +23,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "hr", "get_fields") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "hr", "get_fields") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -43,10 +43,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "hr", "get_staff_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "hr", "get_staff_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -63,10 +63,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "hr", "update_staff_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "hr", "update_staff_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinIdConvertExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinIdConvertExtensions.cs index d8060f1d..2bfa47af 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinIdConvertExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinIdConvertExtensions.cs @@ -23,10 +23,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "idconvert", "unionid_to_external_userid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "idconvert", "unionid_to_external_userid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -44,10 +44,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "idconvert", "batch", "external_userid_to_pending_id") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "idconvert", "batch", "external_userid_to_pending_id") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -65,10 +65,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "idconvert", "external_tagid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "idconvert", "external_tagid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -86,10 +86,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "idconvert", "open_kfid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "idconvert", "open_kfid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -106,10 +106,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "idconvert", "convert_tmp_external_userid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "idconvert", "convert_tmp_external_userid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinKfExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinKfExtensions.cs index 0e7fc851..12e629fa 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinKfExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinKfExtensions.cs @@ -25,10 +25,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "account", "add") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "account", "add") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -46,10 +46,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "account", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "account", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -67,10 +67,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "account", "update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "account", "update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -88,10 +88,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "account", "del") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "account", "del") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -109,10 +109,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "add_contact_way") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "add_contact_way") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -132,10 +132,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "servicer", "add") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "servicer", "add") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -153,10 +153,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "servicer", "del") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "servicer", "del") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -174,11 +174,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "kf", "servicer", "list") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "kf", "servicer", "list") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("open_kfid", request.OpenKfId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -198,10 +198,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "service_state", "get") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "service_state", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -219,10 +219,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "service_state", "trans") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "service_state", "trans") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -242,10 +242,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "kf", "customer", "get_upgrade_service_config") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "kf", "customer", "get_upgrade_service_config") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -263,10 +263,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "customer", "upgrade_service") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "customer", "upgrade_service") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -284,10 +284,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "customer", "cancel_upgrade_service") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "customer", "cancel_upgrade_service") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -305,10 +305,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "customer", "batchget") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "customer", "batchget") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -327,10 +327,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "knowledge", "add_group") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "knowledge", "add_group") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -347,10 +347,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "knowledge", "mod_group") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "knowledge", "mod_group") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -367,10 +367,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "knowledge", "del_group") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "knowledge", "del_group") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -387,10 +387,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "knowledge", "list_group") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "knowledge", "list_group") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -409,10 +409,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "knowledge", "add_intent") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "knowledge", "add_intent") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -429,10 +429,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "knowledge", "mod_intent") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "knowledge", "mod_intent") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -449,10 +449,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "knowledge", "del_intent") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "knowledge", "del_intent") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -469,10 +469,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "knowledge", "list_intent") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "knowledge", "list_intent") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -491,10 +491,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "send_msg") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "send_msg") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -512,10 +512,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "send_msg_on_event") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "send_msg_on_event") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -533,10 +533,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "sync_msg") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "sync_msg") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -553,10 +553,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "kf", "get_corp_qualification") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "kf", "get_corp_qualification") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -573,10 +573,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "get_corp_statistic") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "get_corp_statistic") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -593,10 +593,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "kf", "get_servicer_statistic") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "kf", "get_servicer_statistic") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLicenseExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLicenseExtensions.cs index 571b9ee7..6c6ddb7c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLicenseExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLicenseExtensions.cs @@ -24,10 +24,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "active_account") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "active_account") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -44,10 +44,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "batch_active_account") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "batch_active_account") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -64,10 +64,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "get_active_info_by_code") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "get_active_info_by_code") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -84,10 +84,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "batch_get_active_info_by_code") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "batch_get_active_info_by_code") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -104,10 +104,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "list_actived_account") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "list_actived_account") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -124,10 +124,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "get_active_info_by_user") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "get_active_info_by_user") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -144,10 +144,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "batch_transfer_license") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "batch_transfer_license") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -164,10 +164,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "batch_share_active_code") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "batch_share_active_code") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -185,14 +185,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.SuiteId == null) + if (request.SuiteId is null) request.SuiteId = client.Credentials.SuiteId; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "get_app_license_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "get_app_license_info") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -211,10 +211,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "set_auto_active_status") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "set_auto_active_status") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -231,10 +231,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "get_auto_active_status") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "get_auto_active_status") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -253,10 +253,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "create_new_order") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "create_new_order") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -273,10 +273,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "create_renew_order_job") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "create_renew_order_job") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -293,10 +293,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "list_order") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "list_order") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -313,10 +313,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "get_order") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "get_order") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -333,10 +333,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "list_order_account") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "list_order_account") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -353,10 +353,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "cancel_order") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "cancel_order") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -375,10 +375,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "create_new_order_job") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "create_new_order_job") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -395,10 +395,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "submit_new_order_job") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "submit_new_order_job") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -415,10 +415,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "new_order_job_result") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "new_order_job_result") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -435,10 +435,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "get_union_order") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "get_union_order") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -457,10 +457,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "submit_pay_job") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "submit_pay_job") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -477,10 +477,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "pay_job_result") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "pay_job_result") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -498,10 +498,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "license", "support_policy_query") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "license", "support_policy_query") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLinkedCorpExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLinkedCorpExtensions.cs index 94be34a6..575d686d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLinkedCorpExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLinkedCorpExtensions.cs @@ -23,10 +23,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "agent", "get_perm_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "agent", "get_perm_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -43,10 +43,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "user", "get") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "user", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -63,10 +63,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "user", "simplelist") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "user", "simplelist") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -83,10 +83,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "user", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "user", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -103,10 +103,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "department", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "department", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region Message @@ -123,14 +123,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.AgentId == null) + if (request.AgentId is null) request.AgentId = client.Credentials.AgentId; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "message", "send") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "linkedcorp", "message", "send") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLivingExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLivingExtensions.cs index 9854b90d..42700fa1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLivingExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinLivingExtensions.cs @@ -24,10 +24,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "living", "create") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "living", "create") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -45,10 +45,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "living", "modify") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "living", "modify") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -66,10 +66,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "living", "cancel") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "living", "cancel") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -89,10 +89,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "living", "delete_replay_data") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "living", "delete_replay_data") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -110,11 +110,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "living", "get_living_info") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "living", "get_living_info") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("livingid", request.LivingId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -132,10 +132,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "living", "get_living_code") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "living", "get_living_code") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -153,10 +153,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "living", "get_living_share_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "living", "get_living_share_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -176,10 +176,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "living", "get_user_all_livingid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "living", "get_user_all_livingid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -197,10 +197,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "living", "get_watch_stat") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "living", "get_watch_stat") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMediaExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMediaExtensions.cs index c0a3c494..dbf99208 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMediaExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMediaExtensions.cs @@ -28,7 +28,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work const string TYPE_VOICE = "voice"; const string TYPE_VIDEO = "video"; - if (request.FileName == null) + if (request.FileName is null) { string ext = string.Empty; if (TYPE_IMAGE.Equals(request.Type)) @@ -41,7 +41,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.FileName = Guid.NewGuid().ToString("N").ToLower() + ext; } - if (request.FileContentType == null) + if (request.FileContentType is null) { if (TYPE_IMAGE.Equals(request.Type)) request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForImage(request.FileName!) ?? "image/png"; @@ -54,12 +54,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Work } IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "media", "upload") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "media", "upload") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("type", request.Type); using var httpContent = Utilities.FileHttpContentBuilder.Build(fileName: request.FileName, fileBytes: request.FileBytes, fileContentType: request.FileContentType, formDataName: "media"); - return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -77,18 +77,18 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.FileName == null) + if (request.FileName is null) request.FileName = Guid.NewGuid().ToString("N").ToLower() + ".png"; - if (request.FileContentType == null) + if (request.FileContentType is null) request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForImage(request.FileName!) ?? "image/png"; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "media", "uploadimg") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "media", "uploadimg") .SetQueryParam("access_token", request.AccessToken); using var httpContent = Utilities.FileHttpContentBuilder.Build(fileName: request.FileName, fileBytes: request.FileBytes, fileContentType: request.FileContentType, formDataName: "media"); - return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -109,7 +109,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work const string TYPE_VIDEO = "video"; const string TYPE_FILE = "file"; - if (request.FileName == null) + if (request.FileName is null) { string ext = string.Empty; if (TYPE_IMAGE.Equals(request.Type)) @@ -122,7 +122,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.FileName = Guid.NewGuid().ToString("N").ToLower() + ext; } - if (request.FileContentType == null) + if (request.FileContentType is null) { if (TYPE_IMAGE.Equals(request.Type)) request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForImage(request.FileName!) ?? "image/png"; @@ -135,13 +135,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work } IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "media", "upload_attachment") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "media", "upload_attachment") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("media_type", request.Type) .SetQueryParam("attachment_type", request.AttachmentType); using var httpContent = Utilities.FileHttpContentBuilder.Build(fileName: request.FileName, fileBytes: request.FileBytes, fileContentType: request.FileContentType, formDataName: "media"); - return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } /// @@ -160,11 +160,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "media", "get") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "media", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("media_id", request.MediaId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -183,11 +183,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "media", "get", "jssdk") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "media", "get", "jssdk") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("media_id", request.MediaId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -204,10 +204,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "media", "upload_by_url") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "media", "upload_by_url") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -224,10 +224,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "media", "get_upload_by_url_result") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "media", "get_upload_by_url_result") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMeetingExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMeetingExtensions.cs index 674916b2..d572366a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMeetingExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMeetingExtensions.cs @@ -24,10 +24,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "create") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "create") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -45,10 +45,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -66,10 +66,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "cancel") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "cancel") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -87,10 +87,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -108,10 +108,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_user_meetingid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_user_meetingid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -128,10 +128,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_invitees") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_invitees") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -148,10 +148,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "set_invitees") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "set_invitees") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -168,10 +168,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "create_customer_short_url") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "create_customer_short_url") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -188,10 +188,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_customer_short_url") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_customer_short_url") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -208,10 +208,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_realtime_attendee_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_realtime_attendee_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -228,10 +228,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_attendee_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_attendee_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -248,10 +248,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "waitingroom", "get_current_user_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "waitingroom", "get_current_user_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -268,10 +268,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "waitingroom", "get_user_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "waitingroom", "get_user_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -288,10 +288,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "check_device_in_meeting") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "check_device_in_meeting") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -308,10 +308,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_guests") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_guests") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -328,10 +328,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "set_guests") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "set_guests") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -348,10 +348,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_quality") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "get_quality") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region Enroll @@ -369,10 +369,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "enroll", "set_config") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "enroll", "set_config") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -389,10 +389,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "enroll", "get_config") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "enroll", "get_config") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -409,10 +409,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "enroll", "query_by_tmp_openid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "enroll", "query_by_tmp_openid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -429,10 +429,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "enroll", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "enroll", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -449,10 +449,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "enroll", "approve") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "enroll", "approve") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -469,10 +469,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "enroll", "import") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "enroll", "import") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -489,10 +489,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "enroll", "delete") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "enroll", "delete") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -511,10 +511,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "meeting", "layout", "list_template") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "meeting", "layout", "list_template") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -531,10 +531,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "layout", "add") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "layout", "add") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -551,10 +551,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "layout", "update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "layout", "update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -571,10 +571,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "layout", "set_default") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "layout", "set_default") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -591,10 +591,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "advanced_layout", "add") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "advanced_layout", "add") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -611,10 +611,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "advanced_layout", "update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "advanced_layout", "update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -631,10 +631,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "advanced_layout", "apply") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "advanced_layout", "apply") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -651,10 +651,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "advanced_layout", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "advanced_layout", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -671,10 +671,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "advanced_layout", "get_user_layout") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "advanced_layout", "get_user_layout") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -691,10 +691,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "advanced_layout", "batch_delete") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "advanced_layout", "batch_delete") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -711,10 +711,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "layout", "add_background") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "layout", "add_background") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -731,10 +731,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "layout", "set_default_background") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "layout", "set_default_background") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -751,10 +751,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "layout", "list_background") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "layout", "list_background") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -771,10 +771,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "layout", "delete_background") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "layout", "delete_background") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -791,10 +791,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "layout", "batch_delete_background") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "layout", "batch_delete_background") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -813,10 +813,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "mra", "query_status") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "mra", "query_status") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -833,10 +833,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "mra", "set_default_layout") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "mra", "set_default_layout") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -853,10 +853,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "mra", "set_raise_hand") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "mra", "set_raise_hand") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -873,10 +873,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "mra", "hangup") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "mra", "hangup") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -895,10 +895,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "phone", "callout") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "phone", "callout") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -915,10 +915,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "phone", "get_callout_status") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "phone", "get_callout_status") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -935,10 +935,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "phone", "get_tmp_openid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "phone", "get_tmp_openid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -957,10 +957,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "poll", "create_theme") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "poll", "create_theme") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -977,10 +977,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "poll", "update_theme") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "poll", "update_theme") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -997,10 +997,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "poll", "get_poll_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "poll", "get_poll_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1017,10 +1017,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "poll", "get_theme_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "poll", "get_theme_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1037,10 +1037,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "poll", "get_poll_detail") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "poll", "get_poll_detail") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1057,10 +1057,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "poll", "delete") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "poll", "delete") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1077,10 +1077,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "poll", "start") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "poll", "start") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1097,10 +1097,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "poll", "finish") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "poll", "finish") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -1119,10 +1119,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "set") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "set") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1139,10 +1139,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "set_cohost") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "set_cohost") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1159,10 +1159,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "mute_user") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "mute_user") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1179,10 +1179,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "switch_user_video") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "switch_user_video") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1199,10 +1199,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "close_screen_share") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "close_screen_share") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1219,10 +1219,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "set_nicknames") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "set_nicknames") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1239,10 +1239,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "manage_waiting_room_users") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "manage_waiting_room_users") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1259,10 +1259,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "kickout_users") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "kickout_users") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1279,10 +1279,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "dismiss") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "realcontrol", "dismiss") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -1301,10 +1301,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "record", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "record", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1321,10 +1321,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "record", "get_statistics") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "record", "get_statistics") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1341,10 +1341,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "record", "update_sharing_config") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "record", "update_sharing_config") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1361,10 +1361,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "record", "delete") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "record", "delete") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1381,10 +1381,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "record", "delete_file") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "record", "delete_file") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -1403,10 +1403,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "book") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "book") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1423,10 +1423,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "release") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "release") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1443,10 +1443,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1463,10 +1463,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "get_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "get_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1483,10 +1483,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "get_config") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "get_config") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1503,10 +1503,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "list_meetings") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "list_meetings") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1523,10 +1523,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "list_devices") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "list_devices") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1543,10 +1543,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "list_controllers") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "list_controllers") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1563,10 +1563,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "get_inventory") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "get_inventory") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1583,10 +1583,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "call") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "call") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1603,10 +1603,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "cancel_call") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "cancel_call") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1623,10 +1623,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "get_response_status") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "rooms", "get_response_status") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -1645,10 +1645,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "vip", "submit_batch_add_job") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "vip", "submit_batch_add_job") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1665,10 +1665,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "vip", "batch_add_job_result") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "vip", "batch_add_job_result") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1685,10 +1685,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "vip", "submit_batch_del_job") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "vip", "submit_batch_del_job") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1705,10 +1705,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "vip", "batch_del_job_result") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "vip", "batch_del_job_result") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1725,10 +1725,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "vip", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "vip", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -1747,10 +1747,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "create") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "create") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1767,10 +1767,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1787,10 +1787,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "cancel") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "cancel") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1807,10 +1807,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "get") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1827,10 +1827,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "list_guest") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "list_guest") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1847,10 +1847,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "update_guest_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "update_guest_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1867,10 +1867,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "update_warm_up") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "update_warm_up") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region /Webinar/Enroll @@ -1888,10 +1888,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "enroll", "set_config") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "enroll", "set_config") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1908,10 +1908,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "enroll", "get_config") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "enroll", "get_config") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1928,10 +1928,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "enroll", "query_by_tmp_openid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "enroll", "query_by_tmp_openid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1948,10 +1948,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "enroll", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "enroll", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1968,10 +1968,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "enroll", "approve") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "enroll", "approve") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -1988,10 +1988,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "enroll", "import") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "enroll", "import") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -2008,10 +2008,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "enroll", "delete") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "meeting", "webinar", "enroll", "delete") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion #endregion diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMenuExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMenuExtensions.cs index 9bdee0bd..44a265ef 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMenuExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMenuExtensions.cs @@ -22,15 +22,15 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.AgentId == null) + if (request.AgentId is null) request.AgentId = client.Credentials.AgentId; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "menu", "create") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "menu", "create") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("agentid", request.AgentId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -46,15 +46,15 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.AgentId == null) + if (request.AgentId is null) request.AgentId = client.Credentials.AgentId; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "menu", "get") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "menu", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("agentid", request.AgentId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -70,15 +70,15 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.AgentId == null) + if (request.AgentId is null) request.AgentId = client.Credentials.AgentId; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "menu", "delete") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "menu", "delete") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("agentid", request.AgentId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMessageAuditExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMessageAuditExtensions.cs index 15413d7a..04f3e7f4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMessageAuditExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMessageAuditExtensions.cs @@ -23,11 +23,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "msgaudit", "get_robot_info") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "msgaudit", "get_robot_info") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("robot_id", request.RobotId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -44,10 +44,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "msgaudit", "get_permit_user_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "msgaudit", "get_permit_user_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -64,10 +64,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "msgaudit", "check_single_agree") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "msgaudit", "check_single_agree") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -84,10 +84,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "msgaudit", "check_room_agree") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "msgaudit", "check_room_agree") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -104,10 +104,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "msgaudit", "groupchat", "get") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "msgaudit", "groupchat", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMessageExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMessageExtensions.cs index 035cbb2c..c692f8e5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMessageExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMessageExtensions.cs @@ -24,14 +24,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.AgentId == null) + if (request.AgentId is null) request.AgentId = client.Credentials.AgentId; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "send") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "message", "send") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -48,14 +48,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.AgentId == null) + if (request.AgentId is null) request.AgentId = client.Credentials.AgentId; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "update_taskcard") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "message", "update_taskcard") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -72,14 +72,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.AgentId == null) + if (request.AgentId is null) request.AgentId = client.Credentials.AgentId; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "update_template_card") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "message", "update_template_card") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -96,10 +96,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "get_statistics") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "message", "get_statistics") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -117,10 +117,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "message", "recall") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "message", "recall") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMiniAppPayExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMiniAppPayExtensions.cs index e6895135..e1683f64 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMiniAppPayExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMiniAppPayExtensions.cs @@ -22,18 +22,18 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.FileName == null) + if (request.FileName is null) request.FileName = Guid.NewGuid().ToString("N").ToLower() + ".png"; - if (request.FileContentType == null) + if (request.FileContentType is null) request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForImage(request.FileName!) ?? "image/png"; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "upload_image") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "upload_image") .SetQueryParam("access_token", request.AccessToken); using var httpContent = Utilities.FileHttpContentBuilder.Build(fileName: request.FileName, fileBytes: request.FileBytes, fileContentType: request.FileContentType, formDataName: "media"); - return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } #region Applyment @@ -51,10 +51,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "apply_mch") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "apply_mch") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -71,10 +71,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "get_applyment_status") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "get_applyment_status") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -93,14 +93,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "miniapppay", "get_bill") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "miniapppay", "get_bill") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("mchid", request.MerchantId) .SetQueryParam("bill_date", request.BillDateString) .SetQueryParam("bill_type", request.BillType) .SetQueryParam("tar_type", request.TarType); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -119,10 +119,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "create_order") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "create_order") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -139,10 +139,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "get_order") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "get_order") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -159,10 +159,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "close_order") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "close_order") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -178,17 +178,17 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.Nonce == null) + if (request.Nonce is null) request.Nonce = Guid.NewGuid().ToString("N"); - if (request.Timestamp == null) + if (request.Timestamp is null) request.Timestamp = DateTimeOffset.Now.ToLocalTime().ToUnixTimeSeconds(); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "get_sign") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "get_sign") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -207,10 +207,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "refund") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "refund") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -227,10 +227,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "get_refund_detail") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "miniapppay", "get_refund_detail") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMiniProgramExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMiniProgramExtensions.cs index 2308381f..38e0f27f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMiniProgramExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinMiniProgramExtensions.cs @@ -23,10 +23,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "miniprogram", "transfer_session") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "miniprogram", "transfer_session") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -43,12 +43,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "miniprogram", "jscode2session") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "miniprogram", "jscode2session") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("js_code", request.JsCode) .SetQueryParam("grant_type", request.GrantType); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinOAExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinOAExtensions.cs index 8339c6c3..d0bdc49b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinOAExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinOAExtensions.cs @@ -25,10 +25,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "applyevent") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "applyevent") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -46,10 +46,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "getapprovalinfo") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "getapprovalinfo") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -67,10 +67,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "getapprovaldetail") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "getapprovaldetail") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -87,10 +87,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "approval", "copytemplate") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "approval", "copytemplate") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -108,10 +108,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "gettemplatedetail") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "gettemplatedetail") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -128,10 +128,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "approval", "create_template") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "approval", "create_template") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -148,10 +148,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "approval", "update_template") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "approval", "update_template") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -171,10 +171,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "oa", "vacation", "getcorpconf") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "oa", "vacation", "getcorpconf") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -192,10 +192,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "vacation", "getuservacationquota") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "vacation", "getuservacationquota") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -213,10 +213,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "vacation", "setoneuserquota") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "vacation", "setoneuserquota") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -235,10 +235,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "journal", "get_record_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "journal", "get_record_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -255,10 +255,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "journal", "get_record_detail") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "journal", "get_record_detail") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -275,10 +275,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "journal", "get_stat_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "journal", "get_stat_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -295,10 +295,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "journal", "export_doc") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "journal", "export_doc") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -315,10 +315,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "journal", "get_export_doc_result") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "journal", "get_export_doc_result") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -337,10 +337,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "add") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "add") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -357,10 +357,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -377,10 +377,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "edit") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "edit") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -397,10 +397,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "del") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "del") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region MeetingRoom/Book @@ -418,10 +418,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "get_booking_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "get_booking_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -438,10 +438,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "get_booking_info_by_meeting_id") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "get_booking_info_by_meeting_id") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -458,10 +458,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "book") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "book") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -478,10 +478,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "book_by_schedule") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "book_by_schedule") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -498,10 +498,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "book_by_meeting") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "book_by_meeting") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -518,10 +518,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "cancel_book") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "cancel_book") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -538,10 +538,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "bookinfo", "get") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "meetingroom", "bookinfo", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion #endregion @@ -562,10 +562,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "calendar", "add") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "calendar", "add") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -582,10 +582,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "calendar", "update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "calendar", "update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -602,10 +602,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "calendar", "get") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "calendar", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -622,10 +622,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "calendar", "del") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "calendar", "del") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -645,10 +645,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "add") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "add") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -666,10 +666,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -687,10 +687,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "get") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "get") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -708,10 +708,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "get_by_calendar") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "get_by_calendar") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -729,10 +729,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "del") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "del") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region ScheduleAttendees @@ -751,10 +751,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "add_attendees") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "add_attendees") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -772,10 +772,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "del_attendees") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "oa", "schedule", "del_attendees") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion #endregion diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinOpenHardwareExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinOpenHardwareExtensions.cs index 46e956c7..95e82df9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinOpenHardwareExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinOpenHardwareExtensions.cs @@ -21,16 +21,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.ModelId == null) + if (request.ModelId is null) request.ModelId = client.Credentials.ModelId; - if (request.ModelSecret == null) + if (request.ModelSecret is null) request.ModelSecret = client.Credentials.ModelSecret; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "get_model_token"); + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "get_model_token"); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -47,10 +47,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "get_device_secret") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "get_device_secret") .SetQueryParam("model_access_token", request.ModelAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -67,10 +67,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "get_device_token") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "get_device_token") .SetQueryParam("model_access_token", request.ModelAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region Model @@ -88,10 +88,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "model", "register_sn") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "model", "register_sn") .SetQueryParam("model_access_token", request.ModelAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -108,10 +108,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "model", "unregister_sn") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "model", "unregister_sn") .SetQueryParam("model_access_token", request.ModelAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -130,10 +130,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "get_device_detail") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "get_device_detail") .SetQueryParam("model_access_token", request.ModelAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -150,10 +150,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "report_device_status") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "report_device_status") .SetQueryParam("device_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -170,10 +170,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "report_firmware_upgrade_result") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "report_firmware_upgrade_result") .SetQueryParam("device_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -190,10 +190,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "report_bio_info_result") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "report_bio_info_result") .SetQueryParam("device_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -210,10 +210,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "report_remote_open_result") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "report_remote_open_result") .SetQueryParam("device_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -230,10 +230,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "get_userinfo_by_page") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "get_userinfo_by_page") .SetQueryParam("device_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -250,10 +250,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "get_userinfo_by_ids") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "get_userinfo_by_ids") .SetQueryParam("device_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -272,10 +272,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "report_checkin_data") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "report_checkin_data") .SetQueryParam("device_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -292,10 +292,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "report_temperature_data") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "report_temperature_data") .SetQueryParam("device_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -312,10 +312,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "report_access_data") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "openhw", "device", "report_access_data") .SetQueryParam("device_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinPSTNCCExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinPSTNCCExtensions.cs index 4c92a2f1..31b35cec 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinPSTNCCExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinPSTNCCExtensions.cs @@ -23,10 +23,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "pstncc", "call") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "pstncc", "call") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -43,10 +43,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "pstncc", "getstates") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "pstncc", "getstates") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinReportExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinReportExtensions.cs index 74ac0e1c..2acc3529 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinReportExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinReportExtensions.cs @@ -24,10 +24,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "add") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "add") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -44,10 +44,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -64,10 +64,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "delete") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "delete") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -84,10 +84,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -104,10 +104,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "get_user_grid_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "get_user_grid_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -126,10 +126,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "add_cata") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "add_cata") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -146,10 +146,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "update_cata") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "update_cata") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -166,10 +166,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "delete_cata") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "delete_cata") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -186,10 +186,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "list_cata") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "grid", "list_cata") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -208,10 +208,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "report", "patrol", "get_grid_info") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "report", "patrol", "get_grid_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -228,10 +228,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "patrol", "get_corp_status") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "patrol", "get_corp_status") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -248,10 +248,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "patrol", "get_user_status") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "patrol", "get_user_status") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -268,10 +268,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "patrol", "category_statistic") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "patrol", "category_statistic") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -288,10 +288,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "patrol", "get_order_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "patrol", "get_order_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -308,10 +308,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "patrol", "get_order_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "patrol", "get_order_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -330,10 +330,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "report", "resident", "get_grid_info") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "report", "resident", "get_grid_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -350,10 +350,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "resident", "get_corp_status") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "resident", "get_corp_status") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -370,10 +370,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "resident", "get_user_status") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "resident", "get_user_status") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -390,10 +390,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "resident", "category_statistic") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "resident", "category_statistic") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -410,10 +410,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "resident", "get_order_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "resident", "get_order_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -430,10 +430,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "resident", "get_order_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "resident", "get_order_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -452,10 +452,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "sitecode", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "sitecode", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -472,10 +472,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "sitecode", "get_site_report_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "sitecode", "get_site_report_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -492,10 +492,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "report", "sitecode", "get_report_answer") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "report", "sitecode", "get_report_answer") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSchoolExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSchoolExtensions.cs index b512694c..9147a9c8 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSchoolExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSchoolExtensions.cs @@ -23,10 +23,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "set_teacher_view_mode") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "set_teacher_view_mode") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -43,10 +43,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "get_teacher_view_mode") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "school", "get_teacher_view_mode") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -64,10 +64,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "set_arch_sync_mode") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "set_arch_sync_mode") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -85,10 +85,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "set_upgrade_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "set_upgrade_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -105,11 +105,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "getuserinfo") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "school", "getuserinfo") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("code", request.Code); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region User @@ -128,11 +128,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "user", "get") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "school", "user", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("userid", request.StudentOrParentUserId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -150,14 +150,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "user", "list") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "school", "user", "list") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("department_id", request.DeparmentId); - if (request.RequireFetchChild != null) + if (request.RequireFetchChild is not null) flurlReq.SetQueryParam("fetch_child", request.RequireFetchChild.Value ? 1 : 0); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -174,11 +174,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "user", "list_parent") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "school", "user", "list_parent") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("department_id", request.DeparmentId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region UserStudent @@ -197,10 +197,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "create_student") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "create_student") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -218,11 +218,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "user", "delete_student") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "school", "user", "delete_student") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("userid", request.StudentUserId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -240,10 +240,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "update_student") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "update_student") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -261,10 +261,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_create_student") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_create_student") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -282,10 +282,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_delete_student") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_delete_student") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -303,10 +303,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_update_student") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_update_student") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -326,10 +326,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "create_parent") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "create_parent") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -347,11 +347,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "user", "delete_parent") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "school", "user", "delete_parent") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("userid", request.ParentUserId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -369,10 +369,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "update_parent") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "update_parent") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -390,10 +390,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_create_parent") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_create_parent") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -411,10 +411,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_delete_parent") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_delete_parent") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -432,10 +432,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_update_parent") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "batch_update_parent") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -454,10 +454,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "get_teacher_customize_health_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "get_teacher_customize_health_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -474,10 +474,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "get_student_customize_health_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "get_student_customize_health_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -494,10 +494,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "get_health_qrcode") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "user", "get_health_qrcode") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion #endregion @@ -518,10 +518,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "department", "create") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "department", "create") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -539,10 +539,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "department", "update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "department", "update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -560,11 +560,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "department", "delete") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "school", "department", "delete") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("id", request.DepartmentId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -582,13 +582,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "department", "list") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "school", "department", "list") .SetQueryParam("access_token", request.AccessToken); - if (request.ParentDepartmentId != null) + if (request.ParentDepartmentId is not null) flurlReq.SetQueryParam("id", request.ParentDepartmentId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -608,11 +608,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "living", "get_living_info") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "school", "living", "get_living_info") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("livingid", request.LivingId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -630,10 +630,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "living", "get_watch_stat") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "living", "get_watch_stat") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -651,10 +651,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "living", "get_unwatch_stat") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "living", "get_unwatch_stat") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -672,10 +672,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "living", "get_watch_stat_v2") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "living", "get_watch_stat_v2") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -693,10 +693,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "living", "get_unwatch_stat_v2") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "living", "get_unwatch_stat_v2") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -715,10 +715,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "get_payment_result") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "get_payment_result") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -735,10 +735,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "school", "get_trade") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "school", "get_trade") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -757,10 +757,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "school", "agent", "get_allow_scope") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "school", "agent", "get_allow_scope") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSecurityExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSecurityExtensions.cs index d3cc0949..6edf9973 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSecurityExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSecurityExtensions.cs @@ -23,10 +23,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "security", "get_file_oper_record") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "security", "get_file_oper_record") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinServiceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinServiceExtensions.cs index 3527af97..9c2316e3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinServiceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinServiceExtensions.cs @@ -23,16 +23,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.CorpId == null) + if (request.CorpId is null) request.CorpId = client.Credentials.CorpId; - if (request.ProviderSecret == null) + if (request.ProviderSecret is null) request.ProviderSecret = client.Credentials.ProviderSecret; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_provider_token"); + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_provider_token"); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -49,16 +49,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (request.SuiteId == null) + if (request.SuiteId is null) request.SuiteId = client.Credentials.SuiteId; - if (request.SuiteSecret == null) + if (request.SuiteSecret is null) request.SuiteSecret = client.Credentials.SuiteSecret; IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_suite_token"); + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_suite_token"); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -76,10 +76,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "service", "get_pre_auth_code") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "service", "get_pre_auth_code") .SetQueryParam("suite_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -97,10 +97,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "set_session_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "set_session_info") .SetQueryParam("suite_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -118,10 +118,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_permanent_code") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_permanent_code") .SetQueryParam("suite_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -138,10 +138,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_auth_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_auth_info") .SetQueryParam("suite_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -159,10 +159,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_corp_token") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_corp_token") .SetQueryParam("suite_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -180,10 +180,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_admin_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_admin_list") .SetQueryParam("suite_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -200,10 +200,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_customized_auth_url") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_customized_auth_url") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -220,10 +220,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_app_qrcode") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_app_qrcode") .SetQueryParam("suite_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region Register @@ -242,10 +242,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_register_code") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_register_code") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -263,10 +263,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_register_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_register_info") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -288,7 +288,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work const string TYPE_VOICE = "voice"; const string TYPE_VIDEO = "video"; - if (request.FileName == null) + if (request.FileName is null) { string ext = string.Empty; if (TYPE_IMAGE.Equals(request.Type)) @@ -301,7 +301,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work request.FileName = Guid.NewGuid().ToString("N").ToLower() + ext; } - if (request.FileContentType == null) + if (request.FileContentType is null) { if (TYPE_IMAGE.Equals(request.Type)) request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForImage(request.FileName!) ?? "image/png"; @@ -314,12 +314,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Work } IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "media", "upload") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "media", "upload") .SetQueryParam("provider_access_token", request.ProviderAccessToken) .SetQueryParam("type", request.Type); using var httpContent = Utilities.FileHttpContentBuilder.Build(fileName: request.FileName, fileBytes: request.FileBytes, fileContentType: request.FileContentType, formDataName: "media"); - return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); } #endregion @@ -339,11 +339,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "service", "getuserinfo3rd") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "service", "getuserinfo3rd") .SetQueryParam("suite_access_token", request.AccessToken) .SetQueryParam("code", request.Code); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -361,10 +361,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "getuserdetail3rd") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "getuserdetail3rd") .SetQueryParam("suite_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -382,10 +382,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_login_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_login_info") .SetQueryParam("access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -404,10 +404,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "contact", "id_translate") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "contact", "id_translate") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -424,10 +424,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "contact", "sort") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "contact", "sort") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -444,10 +444,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "contact", "search") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "contact", "search") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -464,10 +464,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "contact", "batchsearch") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "contact", "batchsearch") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -486,11 +486,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "service", "batch", "getresult") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "service", "batch", "getresult") .SetQueryParam("provider_access_token", request.ProviderAccessToken) .SetQueryParam("jobid", request.JobId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -509,10 +509,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "add_device") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "add_device") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -529,10 +529,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_device_auth_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_device_auth_info") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -549,10 +549,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "reset_secret_no") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "reset_secret_no") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -569,10 +569,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "list_device") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "list_device") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -589,10 +589,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "fetch_device_log") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "fetch_device_log") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -609,10 +609,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "del_device") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "del_device") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -629,10 +629,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "set_printer_support_state") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "set_printer_support_state") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -652,12 +652,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "service", "miniprogram", "jscode2session") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "service", "miniprogram", "jscode2session") .SetQueryParam("suite_access_token", request.AccessToken) .SetQueryParam("js_code", request.JsCode) .SetQueryParam("grant_type", request.GrantType); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -676,10 +676,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "externalcontact", "finish_external_userid_migration") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "externalcontact", "finish_external_userid_migration") .SetQueryParam("provider_access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -696,10 +696,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "externalcontact", "unionid_to_external_userid_3rd") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "externalcontact", "unionid_to_external_userid_3rd") .SetQueryParam("suite_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -716,10 +716,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "corpid_to_opencorpid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "corpid_to_opencorpid") .SetQueryParam("access_token", request.ProviderAccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -738,10 +738,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "prolong_try") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "prolong_try") .SetQueryParam("suite_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -758,10 +758,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_order_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_order_list") .SetQueryParam("suite_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -778,10 +778,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_order") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "service", "get_order") .SetQueryParam("suite_access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSyncExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSyncExtensions.cs index eed11988..249c739e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSyncExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSyncExtensions.cs @@ -24,10 +24,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "sync", "contact_sync_success") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "sync", "contact_sync_success") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinTagExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinTagExtensions.cs index 1f82131d..1e5d3d7b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinTagExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinTagExtensions.cs @@ -25,10 +25,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tag", "create") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "tag", "create") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -47,10 +47,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tag", "update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "tag", "update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -69,11 +69,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "tag", "delete") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "tag", "delete") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("tagid", request.TagId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -92,10 +92,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "tag", "list") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "tag", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -114,11 +114,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "tag", "get") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "tag", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("tagid", request.TagId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region TagUser @@ -138,10 +138,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tag", "addtagusers") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "tag", "addtagusers") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -160,10 +160,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "tag", "deltagusers") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "tag", "deltagusers") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinUserExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinUserExtensions.cs index 23bf9bb2..649b3672 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinUserExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinUserExtensions.cs @@ -25,10 +25,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "create") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "user", "create") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -47,11 +47,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "get") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "user", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("userid", request.UserId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -70,10 +70,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "user", "update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -92,11 +92,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "delete") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "user", "delete") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("userid", request.UserId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -115,10 +115,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "batchdelete") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "user", "batchdelete") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -137,14 +137,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "simplelist") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "user", "simplelist") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("department_id", request.DepartmentId); - if (request.RequireFetchChild != null) + if (request.RequireFetchChild is not null) flurlReq.SetQueryParam("fetch_child", request.RequireFetchChild.Value ? 1 : 0); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -163,14 +163,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "list") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "user", "list") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("department_id", request.DepartmentId); - if (request.RequireFetchChild != null) + if (request.RequireFetchChild is not null) flurlReq.SetQueryParam("fetch_child", request.RequireFetchChild.Value ? 1 : 0); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -189,10 +189,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "convert_to_openid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "user", "convert_to_openid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -211,10 +211,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "convert_to_userid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "user", "convert_to_userid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -234,11 +234,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "getuserinfo") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "user", "getuserinfo") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("code", request.Code); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -255,10 +255,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "getuserid") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "user", "getuserid") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -275,10 +275,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "get_active_stat") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "user", "get_active_stat") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -295,11 +295,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "list_selected_ticket_user") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "user", "list_selected_ticket_user") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("selected_ticket", request.SelectedTicket); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -316,10 +316,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "list_id") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "user", "list_id") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #region Auth @@ -339,11 +339,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "authsucc") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "user", "authsucc") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("userid", request.UserId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -360,10 +360,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "user", "tfa_succ") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "user", "tfa_succ") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -380,16 +380,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "list_member_auth") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "user", "list_member_auth") .SetQueryParam("access_token", request.AccessToken); - if (request.Cursor != null) + if (request.Cursor is not null) flurlReq.SetQueryParam("cursor", request.Cursor); - if (request.Limit != null) + if (request.Limit is not null) flurlReq.SetQueryParam("limit", request.Limit); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -406,11 +406,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get, "cgi-bin", "user", "check_member_auth") + .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "user", "check_member_auth") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("open_userid", request.OpenUserId); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinWedocExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinWedocExtensions.cs index 63bf0534..3f70ac59 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinWedocExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinWedocExtensions.cs @@ -24,10 +24,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "create_doc") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "create_doc") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -44,10 +44,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "rename_doc") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "rename_doc") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -64,10 +64,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "del_doc") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "del_doc") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -84,10 +84,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "get_doc_base_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "get_doc_base_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -104,10 +104,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "doc_share") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "doc_share") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -124,10 +124,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "doc_get_auth") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "doc_get_auth") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -144,10 +144,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "mod_doc_join_rule") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "mod_doc_join_rule") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -164,10 +164,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "mod_doc_member") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "mod_doc_member") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -184,10 +184,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "mod_doc_safty_setting") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "mod_doc_safty_setting") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -204,10 +204,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "document", "batch_update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "document", "batch_update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -226,10 +226,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "create_form") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "create_form") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -246,10 +246,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "modify_form") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "modify_form") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -266,10 +266,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "get_form_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "get_form_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -286,10 +286,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "get_form_statistic") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "get_form_statistic") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -306,10 +306,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "get_form_answer") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "get_form_answer") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -328,10 +328,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "spreadsheet", "batch_update") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "spreadsheet", "batch_update") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -348,10 +348,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "spreadsheet", "get_sheet_properties") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "spreadsheet", "get_sheet_properties") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -368,10 +368,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "spreadsheet", "get_sheet_range_data") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "spreadsheet", "get_sheet_range_data") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -390,10 +390,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "vip", "batch_add") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "vip", "batch_add") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -410,10 +410,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "vip", "batch_del") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "vip", "batch_del") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -430,10 +430,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "vip", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedoc", "vip", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinWedriveExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinWedriveExtensions.cs index 15b693cc..3a2682eb 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinWedriveExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinWedriveExtensions.cs @@ -24,10 +24,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_create") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_create") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -44,10 +44,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_rename") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_rename") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -64,10 +64,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_dismiss") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_dismiss") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -84,10 +84,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -104,10 +104,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "new_space_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "new_space_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -124,10 +124,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_setting") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_setting") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -144,10 +144,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_share") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_share") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -166,10 +166,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_acl_add") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_acl_add") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -186,10 +186,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_acl_del") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "space_acl_del") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -208,10 +208,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -228,10 +228,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_upload") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_upload") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -248,10 +248,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_download") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_download") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -268,10 +268,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_upload_init") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_upload_init") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -288,10 +288,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_upload_part") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_upload_part") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -308,10 +308,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_upload_finish") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_upload_finish") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -328,10 +328,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_create") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_create") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -348,10 +348,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_rename") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_rename") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -368,10 +368,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_move") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_move") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -388,10 +388,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_delete") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_delete") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -408,10 +408,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -428,10 +428,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_setting") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_setting") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -448,10 +448,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_secure_setting") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_secure_setting") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -468,10 +468,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_share") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_share") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -488,10 +488,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "get_file_permission") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "get_file_permission") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -510,10 +510,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_acl_add") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_acl_add") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -530,10 +530,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_acl_del") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "file_acl_del") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -552,10 +552,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "mng_pro_info") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "mng_pro_info") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -572,10 +572,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "mng_capacity") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "mng_capacity") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion @@ -594,10 +594,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "vip", "batch_add") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "vip", "batch_add") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -614,10 +614,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "vip", "batch_del") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "vip", "batch_del") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -634,10 +634,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "vip", "list") + .CreateFlurlRequest(request, HttpMethod.Post, "cgi-bin", "wedrive", "vip", "list") .SetQueryParam("access_token", request.AccessToken); - return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinAgent/CgibinAgentGetResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinAgent/CgibinAgentGetResponse.cs index a90eb22a..e00accf3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinAgent/CgibinAgentGetResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinAgent/CgibinAgentGetResponse.cs @@ -104,27 +104,27 @@ /// 获取或设置是否被停用。 /// [Newtonsoft.Json.JsonProperty("close")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("close")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsClosed { get; set; } /// /// 获取或设置是否上报用户地理位置。 /// [Newtonsoft.Json.JsonProperty("report_location_flag")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("report_location_flag")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsReportLocation { get; set; } /// /// 获取或设置是否上报用户进入事件。 /// [Newtonsoft.Json.JsonProperty("isreportenter")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("isreportenter")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsReportEnter { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinAgent/CgibinAgentSetRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinAgent/CgibinAgentSetRequest.cs index e53273d1..1aba54e8 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinAgent/CgibinAgentSetRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinAgent/CgibinAgentSetRequest.cs @@ -37,18 +37,18 @@ /// 获取或设置是否上报用户地理位置。 /// [Newtonsoft.Json.JsonProperty("report_location_flag")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("report_location_flag")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsReportLocation { get; set; } /// /// 获取或设置是否上报用户进入事件。 /// [Newtonsoft.Json.JsonProperty("isreportenter")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("isreportenter")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsReportEnter { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinAppChat/CgibinAppChatSendRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinAppChat/CgibinAppChatSendRequest.cs index 4f40b2c7..c31a989a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinAppChat/CgibinAppChatSendRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinAppChat/CgibinAppChatSendRequest.cs @@ -125,9 +125,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否是保密消息。 /// [Newtonsoft.Json.JsonProperty("safe")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("safe")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsSafe { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCheckin/CgibinCheckinGetCheckinDataResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCheckin/CgibinCheckinGetCheckinDataResponse.cs index 5eb15eba..f8d7d50d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCheckin/CgibinCheckinGetCheckinDataResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCheckin/CgibinCheckinGetCheckinDataResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Models +namespace SKIT.FlurlHttpClient.Wechat.Work.Models { /// /// 表示 [POST] /cgi-bin/checkin/getcheckindata 接口的响应。 @@ -77,14 +77,14 @@ /// [Newtonsoft.Json.JsonProperty("lng")] [System.Text.Json.Serialization.JsonPropertyName("lng")] - public double? LocationLongitude { get; set; } + public decimal? LocationLongitude { get; set; } /// /// 获取或设置打卡地点纬度。 /// [Newtonsoft.Json.JsonProperty("lat")] [System.Text.Json.Serialization.JsonPropertyName("lat")] - public double? LocationLatitude { get; set; } + public decimal? LocationLatitude { get; set; } /// /// 获取或设置打卡 Wi-Fi 名称。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCheckin/Option/CgibinCheckinAddCheckinOptionRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCheckin/Option/CgibinCheckinAddCheckinOptionRequest.cs index 8b8383a4..25e50498 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCheckin/Option/CgibinCheckinAddCheckinOptionRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCheckin/Option/CgibinCheckinAddCheckinOptionRequest.cs @@ -283,8 +283,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// /// 获取或设置特殊日期开始时间戳。 /// - [Newtonsoft.Json.JsonProperty("timestamp")] - [System.Text.Json.Serialization.JsonPropertyName("timestamp")] + [Newtonsoft.Json.JsonProperty("begintime")] + [System.Text.Json.Serialization.JsonPropertyName("begintime")] public long? BeginTimestamp { get; set; } /// @@ -347,14 +347,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("lng")] [System.Text.Json.Serialization.JsonPropertyName("lng")] - public double Longitude { get; set; } + public decimal Longitude { get; set; } /// /// 获取或设置位置打卡地点纬度。 /// [Newtonsoft.Json.JsonProperty("lat")] [System.Text.Json.Serialization.JsonPropertyName("lat")] - public double Latitude { get; set; } + public decimal Latitude { get; set; } /// /// 获取或设置允许打卡范围（单位：米）。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCheckin/Option/CgibinCheckinGetCheckinOptionResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCheckin/Option/CgibinCheckinGetCheckinOptionResponse.cs index a5a44781..e178ecef 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCheckin/Option/CgibinCheckinGetCheckinOptionResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCheckin/Option/CgibinCheckinGetCheckinOptionResponse.cs @@ -230,14 +230,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("lng")] [System.Text.Json.Serialization.JsonPropertyName("lng")] - public double Longitude { get; set; } + public decimal Longitude { get; set; } /// /// 获取或设置位置打卡地点纬度。 /// [Newtonsoft.Json.JsonProperty("lat")] [System.Text.Json.Serialization.JsonPropertyName("lat")] - public double Latitude { get; set; } + public decimal Latitude { get; set; } /// /// 获取或设置允许打卡范围（单位：米）。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCorp/CgibinCorpGetOpenApprovalDataResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCorp/CgibinCorpGetOpenApprovalDataResponse.cs index cc025036..f7c935a7 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCorp/CgibinCorpGetOpenApprovalDataResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCorp/CgibinCorpGetOpenApprovalDataResponse.cs @@ -170,7 +170,7 @@ /// [Newtonsoft.Json.JsonProperty("ThirdNo")] [System.Text.Json.Serialization.JsonPropertyName("ThirdNo")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringConverter))] public string ThirdPartyApprovalNumber { get; set; } = default!; /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCorpGroup/Corp/CgibinCorpGroupCorpGetChainCorpInfoListResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCorpGroup/Corp/CgibinCorpGroupCorpGetChainCorpInfoListResponse.cs index 686d4b72..6685754a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCorpGroup/Corp/CgibinCorpGroupCorpGetChainCorpInfoListResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCorpGroup/Corp/CgibinCorpGroupCorpGetChainCorpInfoListResponse.cs @@ -55,9 +55,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置企业是否已加入。 /// [Newtonsoft.Json.JsonProperty("is_joined")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_joined")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsJoined { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCorpGroup/Corp/CgibinCorpGroupCorpGetChainCorpInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCorpGroup/Corp/CgibinCorpGroupCorpGetChainCorpInfoResponse.cs index f4b5b966..ccbcce55 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCorpGroup/Corp/CgibinCorpGroupCorpGetChainCorpInfoResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinCorpGroup/Corp/CgibinCorpGroupCorpGetChainCorpInfoResponse.cs @@ -37,9 +37,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置企业是否已加入。 /// [Newtonsoft.Json.JsonProperty("is_joined")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_joined")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsJoined { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinDialog/CgibinDialogGetDialogRecordResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinDialog/CgibinDialogGetDialogRecordResponse.cs index ad4caabf..c4f3ae9f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinDialog/CgibinDialogGetDialogRecordResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinDialog/CgibinDialogGetDialogRecordResponse.cs @@ -42,7 +42,7 @@ /// [Newtonsoft.Json.JsonProperty("phone")] [System.Text.Json.Serialization.JsonPropertyName("phone")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringConverter))] public string? PhoneNumber { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExmail/App/CgibinExmailAppComposeSendRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExmail/App/CgibinExmailAppComposeSendRequest.cs index 7ac93762..1a08842e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExmail/App/CgibinExmailAppComposeSendRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExmail/App/CgibinExmailAppComposeSendRequest.cs @@ -296,9 +296,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否开启 ID 转译。 /// [Newtonsoft.Json.JsonProperty("enable_id_trans")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("enable_id_trans")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? EnableIdTransform { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExmail/App/CgibinExmailAppGetMailListResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExmail/App/CgibinExmailAppGetMailListResponse.cs index 11472c57..22b424cf 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExmail/App/CgibinExmailAppGetMailListResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExmail/App/CgibinExmailAppGetMailListResponse.cs @@ -29,9 +29,9 @@ /// 获取或设置是否还有更多数据。 /// [Newtonsoft.Json.JsonProperty("has_more")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("has_more")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool HasMore { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/CgibinExternalContactGetResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/CgibinExternalContactGetResponse.cs index 1fd9852d..9f1d0022 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/CgibinExternalContactGetResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/CgibinExternalContactGetResponse.cs @@ -114,9 +114,9 @@ /// 获取或设置是否关注了“学校通知”。 /// [Newtonsoft.Json.JsonProperty("is_subscribe")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_subscribe")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsSubscribe { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/CgibinExternalContactGetUserBehaviorDataResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/CgibinExternalContactGetUserBehaviorDataResponse.cs index c7e4554b..a622d873 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/CgibinExternalContactGetUserBehaviorDataResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/CgibinExternalContactGetUserBehaviorDataResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Models +namespace SKIT.FlurlHttpClient.Wechat.Work.Models { /// /// 表示 [POST] /cgi-bin/externalcontact/get_user_behavior_data 接口的响应。 @@ -35,7 +35,7 @@ /// [Newtonsoft.Json.JsonProperty("reply_percentage")] [System.Text.Json.Serialization.JsonPropertyName("reply_percentage")] - public double? ReplyPercentage { get; set; } + public decimal? ReplyPercentage { get; set; } /// /// 获取或设置平均首次回复时长（单位：分钟）。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/GroupChat/CgibinExternalContactGroupChatGetRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/GroupChat/CgibinExternalContactGroupChatGetRequest.cs index 10ba1468..0c3c8a98 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/GroupChat/CgibinExternalContactGroupChatGetRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/GroupChat/CgibinExternalContactGroupChatGetRequest.cs @@ -16,9 +16,9 @@ /// 获取或设置是否需要返回群成员的名字。 /// [Newtonsoft.Json.JsonProperty("need_name")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("need_name")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? RequireMemberName { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/GroupChat/Statistics/CgibinExternalContactGroupChatStatisticsRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/GroupChat/Statistics/CgibinExternalContactGroupChatStatisticsRequest.cs index 39830bc2..9290cb3c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/GroupChat/Statistics/CgibinExternalContactGroupChatStatisticsRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/GroupChat/Statistics/CgibinExternalContactGroupChatStatisticsRequest.cs @@ -52,9 +52,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否升序排序。 /// [Newtonsoft.Json.JsonProperty("order_asc")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("order_asc")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsAscending { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/GroupWelcome/CgibinExternalContactGroupWelcomeTemplateAddRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/GroupWelcome/CgibinExternalContactGroupWelcomeTemplateAddRequest.cs index 82ee2af9..1e9bbe21 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/GroupWelcome/CgibinExternalContactGroupWelcomeTemplateAddRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/GroupWelcome/CgibinExternalContactGroupWelcomeTemplateAddRequest.cs @@ -78,9 +78,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否通知成员将这条入群欢迎语应用到客户群中。 /// [Newtonsoft.Json.JsonProperty("notify")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("notify")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? RequireNotify { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/InterceptRule/CgibinExternalContactAddInterceptRuleResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/InterceptRule/CgibinExternalContactAddInterceptRuleResponse.cs index e41fef58..c91c54b2 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/InterceptRule/CgibinExternalContactAddInterceptRuleResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/InterceptRule/CgibinExternalContactAddInterceptRuleResponse.cs @@ -10,7 +10,7 @@ /// [Newtonsoft.Json.JsonProperty("rule_id")] [System.Text.Json.Serialization.JsonPropertyName("rule_id")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringConverter))] public string RuleId { get; set; } = default!; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/InterceptRule/CgibinExternalContactGetInterceptRuleListResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/InterceptRule/CgibinExternalContactGetInterceptRuleListResponse.cs index 2f22057c..43c20885 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/InterceptRule/CgibinExternalContactGetInterceptRuleListResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/InterceptRule/CgibinExternalContactGetInterceptRuleListResponse.cs @@ -14,7 +14,7 @@ /// [Newtonsoft.Json.JsonProperty("rule_id")] [System.Text.Json.Serialization.JsonPropertyName("rule_id")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringConverter))] public string RuleId { get; set; } = default!; /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/Message/CgibinExternalContactMessageSendRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/Message/CgibinExternalContactMessageSendRequest.cs index ec233591..fde595bf 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/Message/CgibinExternalContactMessageSendRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/Message/CgibinExternalContactMessageSendRequest.cs @@ -105,9 +105,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否发送给学校的所有家长。 /// [Newtonsoft.Json.JsonProperty("toall")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("toall")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsToAll { get; set; } /// @@ -191,18 +191,18 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否开启 ID 转译。 /// [Newtonsoft.Json.JsonProperty("enable_id_trans")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("enable_id_trans")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? EnableIdTransform { get; set; } /// /// 获取或设置是否开启重复消息检查。 /// [Newtonsoft.Json.JsonProperty("enable_duplicate_check")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("enable_duplicate_check")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? EnableDuplicateCheck { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/Moment/CgibinExternalContactGetMomentListResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/Moment/CgibinExternalContactGetMomentListResponse.cs index a99d7ec6..8f1b098c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/Moment/CgibinExternalContactGetMomentListResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinExternalContact/Moment/CgibinExternalContactGetMomentListResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Models +namespace SKIT.FlurlHttpClient.Wechat.Work.Models { /// /// 表示 [POST] /cgi-bin/externalcontact/get_moment_list 接口的响应。 @@ -72,14 +72,14 @@ /// [Newtonsoft.Json.JsonProperty("longitude")] [System.Text.Json.Serialization.JsonPropertyName("longitude")] - public double Longitude { get; set; } + public decimal Longitude { get; set; } /// /// 获取或设置地理位置纬度。 /// [Newtonsoft.Json.JsonProperty("latitude")] [System.Text.Json.Serialization.JsonPropertyName("latitude")] - public double Latitude { get; set; } + public decimal Latitude { get; set; } /// /// 获取或设置地理位置名称。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinHealth/CgibinHealthGetReportJobIdsResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinHealth/CgibinHealthGetReportJobIdsResponse.cs index 8cb987df..16e56d86 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinHealth/CgibinHealthGetReportJobIdsResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinHealth/CgibinHealthGetReportJobIdsResponse.cs @@ -16,9 +16,9 @@ /// 获取或设置翻页是否结束。 /// [Newtonsoft.Json.JsonProperty("ending")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("ending")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsEnding { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinHealth/CgibinHealthGetReportJobInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinHealth/CgibinHealthGetReportJobInfoResponse.cs index d868bca7..27ba1418 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinHealth/CgibinHealthGetReportJobInfoResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinHealth/CgibinHealthGetReportJobInfoResponse.cs @@ -85,9 +85,9 @@ /// 获取或设置是否必填。 /// [Newtonsoft.Json.JsonProperty("is_required")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_required")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsRequired { get; set; } /// @@ -152,9 +152,9 @@ /// 获取或设置非工作日是否需要上报。 /// [Newtonsoft.Json.JsonProperty("skip_weekend")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("skip_weekend")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsSkipWeekend { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfGetCorpStatisticResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfGetCorpStatisticResponse.cs index 2c2861da..69ea5afb 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfGetCorpStatisticResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfGetCorpStatisticResponse.cs @@ -60,14 +60,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("ai_transfer_rate")] [System.Text.Json.Serialization.JsonPropertyName("ai_transfer_rate")] - public double AITransferRate { get; set; } + public decimal AITransferRate { get; set; } /// /// 获取或设置智能回复知识命中率。 /// [Newtonsoft.Json.JsonProperty("ai_knowledge_hit_rate")] [System.Text.Json.Serialization.JsonPropertyName("ai_knowledge_hit_rate")] - public double AIKnowledgeHitRate { get; set; } + public decimal AIKnowledgeHitRate { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfGetServicerStatisticResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfGetServicerStatisticResponse.cs index d12bf686..7fadf4d0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfGetServicerStatisticResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfGetServicerStatisticResponse.cs @@ -39,7 +39,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("reply_rate")] [System.Text.Json.Serialization.JsonPropertyName("reply_rate")] - public double ReplyRate { get; set; } + public decimal ReplyRate { get; set; } /// /// 获取或设置平均首次响应时长（单位：秒）。 @@ -60,28 +60,28 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("satisfaction_participation_rate")] [System.Text.Json.Serialization.JsonPropertyName("satisfaction_participation_rate")] - public double SatisfactionParticipationRate { get; set; } + public decimal SatisfactionParticipationRate { get; set; } /// /// 获取或设置“满意”评价占比。 /// [Newtonsoft.Json.JsonProperty("satisfied_rate")] [System.Text.Json.Serialization.JsonPropertyName("satisfied_rate")] - public double SatisfiedRate { get; set; } + public decimal SatisfiedRate { get; set; } /// /// 获取或设置“一般”评价占比。 /// [Newtonsoft.Json.JsonProperty("middling_rate")] [System.Text.Json.Serialization.JsonPropertyName("middling_rate")] - public double MiddlingRate { get; set; } + public decimal MiddlingRate { get; set; } /// /// 获取或设置“不满意”评价占比。 /// [Newtonsoft.Json.JsonProperty("dissatisfied_rate")] [System.Text.Json.Serialization.JsonPropertyName("dissatisfied_rate")] - public double DissatisfiedRate { get; set; } + public decimal DissatisfiedRate { get; set; } /// /// 获取或设置升级服务客户数。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfSendMessageRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfSendMessageRequest.cs index 33420124..1d7db3c5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfSendMessageRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfSendMessageRequest.cs @@ -112,9 +112,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置内容后面是否不换行。 /// [Newtonsoft.Json.JsonProperty("no_newline")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("no_newline")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsNoNewline { get; set; } } @@ -243,14 +243,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("latitude")] [System.Text.Json.Serialization.JsonPropertyName("latitude")] - public double Latitude { get; set; } + public decimal Latitude { get; set; } /// /// 获取或设置经度坐标。 /// [Newtonsoft.Json.JsonProperty("longitude")] [System.Text.Json.Serialization.JsonPropertyName("longitude")] - public double Longitude { get; set; } + public decimal Longitude { get; set; } /// /// 获取或设置位置名称。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfSyncMessageResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfSyncMessageResponse.cs index 35a8d7ff..f5fa60a1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfSyncMessageResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/CgibinKfSyncMessageResponse.cs @@ -51,8 +51,35 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models { } - public class MenuMessage : CgibinKfSendMessageRequest.Types.MenuMessage + public class MenuMessage { + public static class Types + { + public class MenuItem : CgibinKfSendMessageRequest.Types.MenuMessage.Types.MenuItem + { + } + } + + /// + /// 获取或设置头部内容。 + /// + [Newtonsoft.Json.JsonProperty("head_content")] + [System.Text.Json.Serialization.JsonPropertyName("head_content")] + public string? HeadContent { get; set; } + + /// + /// 获取或设置菜单列表。 + /// + [Newtonsoft.Json.JsonProperty("list")] + [System.Text.Json.Serialization.JsonPropertyName("list")] + public Types.MenuItem[] List { get; set; } = default!; + + /// + /// 获取或设置尾部内容。 + /// + [Newtonsoft.Json.JsonProperty("tail_content")] + [System.Text.Json.Serialization.JsonPropertyName("tail_content")] + public string? TailContent { get; set; } } public class LocationMessage : CgibinKfSendMessageRequest.Types.LocationMessage @@ -532,9 +559,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否还有更多数据。 /// [Newtonsoft.Json.JsonProperty("has_more")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("has_more")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool HasMore { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/Customer/CgibinKfCustomerBatchGetRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/Customer/CgibinKfCustomerBatchGetRequest.cs index 37d215f2..3e4227c1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/Customer/CgibinKfCustomerBatchGetRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/Customer/CgibinKfCustomerBatchGetRequest.cs @@ -18,9 +18,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否需要返回客户最后一次进入会话的上下文信息。 /// [Newtonsoft.Json.JsonProperty("need_enter_session_context")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("need_enter_session_context")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? RequireEnterSessionContext { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/KnowledgeGroup/CgibinKfKnowledgeListGroupResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/KnowledgeGroup/CgibinKfKnowledgeListGroupResponse.cs index a6cc6455..9592edf5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/KnowledgeGroup/CgibinKfKnowledgeListGroupResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/KnowledgeGroup/CgibinKfKnowledgeListGroupResponse.cs @@ -27,9 +27,9 @@ /// 获取或设置是否为默认分组。 /// [Newtonsoft.Json.JsonProperty("is_default")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_default")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsDefault { get; set; } } } @@ -45,9 +45,9 @@ /// 获取或设置是否还有更多数据。 /// [Newtonsoft.Json.JsonProperty("has_more")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("has_more")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool HasMore { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/KnowledgeIntent/CgibinKfKnowledgeListIntentResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/KnowledgeIntent/CgibinKfKnowledgeListIntentResponse.cs index 44f0585d..c3655db6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/KnowledgeIntent/CgibinKfKnowledgeListIntentResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinKf/KnowledgeIntent/CgibinKfKnowledgeListIntentResponse.cs @@ -233,9 +233,9 @@ /// 获取或设置是否还有更多数据。 /// [Newtonsoft.Json.JsonProperty("has_more")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("has_more")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool HasMore { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/Account/CgibinLicenseListActivedAccountResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/Account/CgibinLicenseListActivedAccountResponse.cs index 61fc232a..59f88dab 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/Account/CgibinLicenseListActivedAccountResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/Account/CgibinLicenseListActivedAccountResponse.cs @@ -50,9 +50,9 @@ /// 获取或设置是否还有更多数据。 /// [Newtonsoft.Json.JsonProperty("has_more")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("has_more")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool HasMore { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/Order/CgibinLicenseListOrderAccountResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/Order/CgibinLicenseListOrderAccountResponse.cs index 7e8bbcff..9912eae1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/Order/CgibinLicenseListOrderAccountResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/Order/CgibinLicenseListOrderAccountResponse.cs @@ -43,9 +43,9 @@ /// 获取或设置是否还有更多数据。 /// [Newtonsoft.Json.JsonProperty("has_more")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("has_more")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool HasMore { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/Order/CgibinLicenseListOrderResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/Order/CgibinLicenseListOrderResponse.cs index e33b46ef..56a91316 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/Order/CgibinLicenseListOrderResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/Order/CgibinLicenseListOrderResponse.cs @@ -36,9 +36,9 @@ /// 获取或设置是否还有更多数据。 /// [Newtonsoft.Json.JsonProperty("has_more")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("has_more")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool HasMore { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/OrderJob/CgibinLicenseCreateNewOrderJobRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/OrderJob/CgibinLicenseCreateNewOrderJobRequest.cs index 2e60da84..7331b4ed 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/OrderJob/CgibinLicenseCreateNewOrderJobRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/OrderJob/CgibinLicenseCreateNewOrderJobRequest.cs @@ -47,9 +47,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否自动激活。 /// [Newtonsoft.Json.JsonProperty("auto_active_status")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("auto_active_status")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsAutoActive { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/OrderJob/CgibinLicenseGetUnionOrderResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/OrderJob/CgibinLicenseGetUnionOrderResponse.cs index f9045306..25a4b924 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/OrderJob/CgibinLicenseGetUnionOrderResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLicense/OrderJob/CgibinLicenseGetUnionOrderResponse.cs @@ -113,9 +113,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否还有更多数据。 /// [Newtonsoft.Json.JsonProperty("has_more")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("has_more")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool HasMore { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLinkedCorp/Message/CgibinLinkedCorpMessageSendRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLinkedCorp/Message/CgibinLinkedCorpMessageSendRequest.cs index 2815ac90..f4e10afc 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLinkedCorp/Message/CgibinLinkedCorpMessageSendRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLinkedCorp/Message/CgibinLinkedCorpMessageSendRequest.cs @@ -75,9 +75,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否发送给应用可见范围内的所有人，包括互联企业的成员。 /// [Newtonsoft.Json.JsonProperty("toall")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("toall")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsToAll { get; set; } /// @@ -168,9 +168,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否是保密消息。 /// [Newtonsoft.Json.JsonProperty("safe")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("safe")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsSafe { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLiving/CgibinLivingGetLivingInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLiving/CgibinLivingGetLivingInfoResponse.cs index 24d6cc5b..acc03320 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLiving/CgibinLivingGetLivingInfoResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLiving/CgibinLivingGetLivingInfoResponse.cs @@ -90,9 +90,9 @@ /// 获取或设置是否开启回放。 /// [Newtonsoft.Json.JsonProperty("open_replay")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("open_replay")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsOpenReplay { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLiving/CgibinLivingGetWatchStatisticsResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLiving/CgibinLivingGetWatchStatisticsResponse.cs index 4ecc55f7..c1b11a79 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLiving/CgibinLivingGetWatchStatisticsResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinLiving/CgibinLivingGetWatchStatisticsResponse.cs @@ -31,18 +31,18 @@ /// 获取或设置是否评论。 /// [Newtonsoft.Json.JsonProperty("is_comment")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_comment")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsComment { get; set; } /// /// 获取或设置是否连麦。 /// [Newtonsoft.Json.JsonProperty("is_mic")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_mic")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsMic { get; set; } /// @@ -94,18 +94,18 @@ /// 获取或设置是否评论。 /// [Newtonsoft.Json.JsonProperty("is_comment")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_comment")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsComment { get; set; } /// /// 获取或设置是否连麦。 /// [Newtonsoft.Json.JsonProperty("is_mic")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_mic")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsMic { get; set; } /// @@ -151,9 +151,9 @@ /// 获取或设置翻页是否结束。 /// [Newtonsoft.Json.JsonProperty("ending")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("ending")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsEnding { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMedia/CgibinMediaGetJssdkResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMedia/CgibinMediaGetJssdkResponse.cs index 7d1c9bff..5c93396d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMedia/CgibinMediaGetJssdkResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMedia/CgibinMediaGetJssdkResponse.cs @@ -1,4 +1,6 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Models +using System.Linq; + +namespace SKIT.FlurlHttpClient.Wechat.Work.Models { /// /// 表示 [GET] /cgi-bin/media/get/jssdk 接口的响应。 @@ -7,7 +9,7 @@ { public override bool IsSuccessful() { - return base.IsSuccessful() && RawBytes?.Length > 0; + return base.IsSuccessful() && GetRawBytes().Any(); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMedia/CgibinMediaGetResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMedia/CgibinMediaGetResponse.cs index ae16678f..3de24364 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMedia/CgibinMediaGetResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMedia/CgibinMediaGetResponse.cs @@ -1,4 +1,6 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Models +using System.Linq; + +namespace SKIT.FlurlHttpClient.Wechat.Work.Models { /// /// 表示 [GET] /cgi-bin/media/get 接口的响应。 @@ -7,7 +9,7 @@ { public override bool IsSuccessful() { - return base.IsSuccessful() && RawBytes?.Length > 0; + return base.IsSuccessful() && GetRawBytes().Any(); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/CgibinMeetingCreateRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/CgibinMeetingCreateRequest.cs index 3088dc7d..7dcbd7a4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/CgibinMeetingCreateRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/CgibinMeetingCreateRequest.cs @@ -222,9 +222,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否重复会议。 /// [Newtonsoft.Json.JsonProperty("is_repeat")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_repeat")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsRepeat { get; set; } /// @@ -238,9 +238,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否自定义重复设置。 /// [Newtonsoft.Json.JsonProperty("is_custom_repeat")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_custom_repeat")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsCustomRepeat { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/CgibinMeetingGetInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/CgibinMeetingGetInfoResponse.cs index 0f610732..320b5d43 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/CgibinMeetingGetInfoResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/CgibinMeetingGetInfoResponse.cs @@ -185,7 +185,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置企业成员的 UserId 列表。 /// [Newtonsoft.Json.JsonProperty("userid")] - [System.Text.Json.Serialization.JsonPropertyName("userids")] + [System.Text.Json.Serialization.JsonPropertyName("userid")] public string[]? UserIdList { get; set; } } } @@ -358,9 +358,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否重复会议。 /// [Newtonsoft.Json.JsonProperty("is_repeat")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_repeat")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsRepeat { get; set; } /// @@ -374,9 +374,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否自定义重复设置。 /// [Newtonsoft.Json.JsonProperty("is_custom_repeat")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_custom_repeat")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsCustomRepeat { get; set; } /// @@ -598,9 +598,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否还有更多子会议特例。 /// [Newtonsoft.Json.JsonProperty("has_more_sub_meeting")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("has_more_sub_meeting")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool HasMoreSubMeeting { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Enroll/CgibinMeetingEnrollListResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Enroll/CgibinMeetingEnrollListResponse.cs index c0ae2945..3ed4efc2 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Enroll/CgibinMeetingEnrollListResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Enroll/CgibinMeetingEnrollListResponse.cs @@ -62,7 +62,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("enroll_id")] [System.Text.Json.Serialization.JsonPropertyName("enroll_id")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringReadOnlyConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringReadOnlyConverter))] public string EnrollId { get; set; } = default!; /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Phone/CgibinMeetingPhoneCalloutRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Phone/CgibinMeetingPhoneCalloutRequest.cs index 0b807077..3257cd3c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Phone/CgibinMeetingPhoneCalloutRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Phone/CgibinMeetingPhoneCalloutRequest.cs @@ -15,9 +15,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置国家地区代码。 /// [Newtonsoft.Json.JsonProperty("area")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalStringConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalStringConverter))] [System.Text.Json.Serialization.JsonPropertyName("area")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringConverter))] public string AreaCode { get; set; } = string.Empty; /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Phone/CgibinMeetingPhoneCalloutResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Phone/CgibinMeetingPhoneCalloutResponse.cs index 32069886..0268fa5c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Phone/CgibinMeetingPhoneCalloutResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Phone/CgibinMeetingPhoneCalloutResponse.cs @@ -14,7 +14,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("area")] [System.Text.Json.Serialization.JsonPropertyName("area")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringReadOnlyConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringReadOnlyConverter))] public string AreaCode { get; set; } = default!; /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Phone/CgibinMeetingPhoneGetCalloutStatusResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Phone/CgibinMeetingPhoneGetCalloutStatusResponse.cs index b54d0302..2fc54c0d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Phone/CgibinMeetingPhoneGetCalloutStatusResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Phone/CgibinMeetingPhoneGetCalloutStatusResponse.cs @@ -14,7 +14,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("area")] [System.Text.Json.Serialization.JsonPropertyName("area")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringReadOnlyConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringReadOnlyConverter))] public string AreaCode { get; set; } = default!; /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Phone/CgibinMeetingPhoneGetTempOpenIdResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Phone/CgibinMeetingPhoneGetTempOpenIdResponse.cs index 04566d4a..cf0cb8d7 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Phone/CgibinMeetingPhoneGetTempOpenIdResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Phone/CgibinMeetingPhoneGetTempOpenIdResponse.cs @@ -14,7 +14,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("area")] [System.Text.Json.Serialization.JsonPropertyName("area")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringReadOnlyConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringReadOnlyConverter))] public string AreaCode { get; set; } = default!; /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollCreateThemeRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollCreateThemeRequest.cs index 8dcc9835..1b1d820c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollCreateThemeRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollCreateThemeRequest.cs @@ -73,9 +73,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否匿名。 /// [Newtonsoft.Json.JsonProperty("is_anony")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_anony")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsAnonymous { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollGetPollDetailResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollGetPollDetailResponse.cs index 9d7f55ee..04f58d71 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollGetPollDetailResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollGetPollDetailResponse.cs @@ -38,7 +38,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("option_id")] [System.Text.Json.Serialization.JsonPropertyName("option_id")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringReadOnlyConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringReadOnlyConverter))] public string QuestionId { get; set; } = default!; /// @@ -76,7 +76,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("question_id")] [System.Text.Json.Serialization.JsonPropertyName("question_id")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringReadOnlyConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringReadOnlyConverter))] public string QuestionId { get; set; } = default!; /// @@ -134,18 +134,18 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否共享。 /// [Newtonsoft.Json.JsonProperty("is_shared")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_shared")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsShared { get; set; } /// /// 获取或设置是否匿名。 /// [Newtonsoft.Json.JsonProperty("is_anony")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_anony")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsAnonymous { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollGetPollListResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollGetPollListResponse.cs index a39cf312..d29fce3a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollGetPollListResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollGetPollListResponse.cs @@ -38,18 +38,18 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否共享。 /// [Newtonsoft.Json.JsonProperty("is_shared")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_shared")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsShared { get; set; } /// /// 获取或设置是否匿名。 /// [Newtonsoft.Json.JsonProperty("is_anony")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_anony")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsAnonymous { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollGetThemeInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollGetThemeInfoResponse.cs index cf4645fd..6aba5478 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollGetThemeInfoResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollGetThemeInfoResponse.cs @@ -70,9 +70,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否匿名。 /// [Newtonsoft.Json.JsonProperty("is_anony")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_anony")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsAnonymous { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollUpdateThemeRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollUpdateThemeRequest.cs index 2597faa0..2d29be40 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollUpdateThemeRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Poll/CgibinMeetingPollUpdateThemeRequest.cs @@ -60,9 +60,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否匿名。 /// [Newtonsoft.Json.JsonProperty("is_anony")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_anony")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsAnonymous { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/RealControl/CgibinMeetingRealControlDismissRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/RealControl/CgibinMeetingRealControlDismissRequest.cs index 47fb33f1..38ce45dd 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/RealControl/CgibinMeetingRealControlDismissRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/RealControl/CgibinMeetingRealControlDismissRequest.cs @@ -16,18 +16,18 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否强制结束会议。 /// [Newtonsoft.Json.JsonProperty("force_dismiss")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("force_dismiss")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsForceDismiss { get; set; } /// /// 获取或设置是否回收会议号。 /// [Newtonsoft.Json.JsonProperty("retrieve_code")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("retrieve_code")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsRetrieveCode { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Rooms/CgibinMeetingRoomsGetInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Rooms/CgibinMeetingRoomsGetInfoResponse.cs index 0ca2dcf3..fbcd2269 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Rooms/CgibinMeetingRoomsGetInfoResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Rooms/CgibinMeetingRoomsGetInfoResponse.cs @@ -209,7 +209,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("monitor_frequency")] [System.Text.Json.Serialization.JsonPropertyName("monitor_frequency")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringReadOnlyConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringReadOnlyConverter))] public string MonitorFrequency { get; set; } = default!; /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Rooms/CgibinMeetingRoomsListControllersResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Rooms/CgibinMeetingRoomsListControllersResponse.cs index 84fcb077..a73bc750 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Rooms/CgibinMeetingRoomsListControllersResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Rooms/CgibinMeetingRoomsListControllersResponse.cs @@ -97,7 +97,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("status")] [System.Text.Json.Serialization.JsonPropertyName("status")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringReadOnlyConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringReadOnlyConverter))] public string ControllerStatus { get; set; } = default!; /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Webinar/CgibinMeetingWebinarUpdateGuestListRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Webinar/CgibinMeetingWebinarUpdateGuestListRequest.cs index 46df6c09..41aa1a46 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Webinar/CgibinMeetingWebinarUpdateGuestListRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMeeting/Webinar/CgibinMeetingWebinarUpdateGuestListRequest.cs @@ -30,7 +30,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("area")] [System.Text.Json.Serialization.JsonPropertyName("area")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringReadOnlyConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringReadOnlyConverter))] public string? AreaCode { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMessage/CgibinMessageSendRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMessage/CgibinMessageSendRequest.cs index 9d3c24a5..48839401 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMessage/CgibinMessageSendRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMessage/CgibinMessageSendRequest.cs @@ -440,7 +440,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("aspect_ratio")] [System.Text.Json.Serialization.JsonPropertyName("aspect_ratio")] - public double? AspectRatio { get; set; } + public decimal? AspectRatio { get; set; } } public class QuoteArea @@ -978,27 +978,27 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置接收消息的成员账号列表。 /// [Newtonsoft.Json.JsonProperty("touser")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.TextualStringListWithPipeSplitConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.StringifiedStringListWithPipeSplitConverter))] [System.Text.Json.Serialization.JsonPropertyName("touser")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualStringListWithPipeSplitConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.StringifiedStringListWithPipeSplitConverter))] public IList? ToUserIdList { get; set; } /// /// 获取或设置接收消息的部门 ID 列表。 /// [Newtonsoft.Json.JsonProperty("toparty")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.TextualLongListWithPipeSplitConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.StringifiedNumberListWithPipeSplitConverter))] [System.Text.Json.Serialization.JsonPropertyName("toparty")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualLongListWithPipeSplitConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.StringifiedNumberListWithPipeSplitConverter))] public IList? ToDepartmentIdList { get; set; } /// /// 获取或设置接收消息的标签 ID 列表。 /// [Newtonsoft.Json.JsonProperty("totag")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.TextualIntegerListWithPipeSplitConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.StringifiedNumberListWithPipeSplitConverter))] [System.Text.Json.Serialization.JsonPropertyName("totag")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualIntegerListWithPipeSplitConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.StringifiedNumberListWithPipeSplitConverter))] public IList? ToTagIdList { get; set; } /// @@ -1117,27 +1117,27 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否是保密消息。 /// [Newtonsoft.Json.JsonProperty("safe")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("safe")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsSafe { get; set; } /// /// 获取或设置是否开启 ID 转译。 /// [Newtonsoft.Json.JsonProperty("enable_id_trans")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("enable_id_trans")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? EnableIdTransform { get; set; } /// /// 获取或设置是否开启重复消息检查。 /// [Newtonsoft.Json.JsonProperty("enable_duplicate_check")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("enable_duplicate_check")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? EnableDuplicateCheck { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMessage/CgibinMessageSendResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMessage/CgibinMessageSendResponse.cs index 9ade5ac1..0513c5ed 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMessage/CgibinMessageSendResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMessage/CgibinMessageSendResponse.cs @@ -9,36 +9,36 @@ /// 获取或设置无效的成员账号列表。 /// [Newtonsoft.Json.JsonProperty("invaliduser")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.TextualStringArrayWithPipeSplitConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.StringifiedStringArrayWithPipeSplitConverter))] [System.Text.Json.Serialization.JsonPropertyName("invaliduser")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualStringArrayWithPipeSplitConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.StringifiedStringArrayWithPipeSplitConverter))] public string[]? InvalidUserIdList { get; set; } /// /// 获取或设置无效的部门 ID 列表。 /// [Newtonsoft.Json.JsonProperty("invalidparty")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.TextualLongArrayWithPipeSplitConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.StringifiedNumberArrayWithPipeSplitConverter))] [System.Text.Json.Serialization.JsonPropertyName("invalidparty")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualLongArrayWithPipeSplitConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.StringifiedNumberArrayWithPipeSplitConverter))] public long[]? InvalidDepartmentIdList { get; set; } /// /// 获取或设置无效的标签 ID 列表。 /// [Newtonsoft.Json.JsonProperty("invalidtag")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.TextualIntegerArrayWithPipeSplitConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.StringifiedNumberArrayWithPipeSplitConverter))] [System.Text.Json.Serialization.JsonPropertyName("invalidtag")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualIntegerArrayWithPipeSplitConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.StringifiedNumberArrayWithPipeSplitConverter))] public int[]? InvalidTagIdList { get; set; } /// /// 获取或设置没有基础接口许可的成员账号列表。 /// [Newtonsoft.Json.JsonProperty("unlicenseduser")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.TextualStringArrayWithPipeSplitConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.StringifiedStringArrayWithPipeSplitConverter))] [System.Text.Json.Serialization.JsonPropertyName("unlicenseduser")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualStringArrayWithPipeSplitConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.StringifiedStringArrayWithPipeSplitConverter))] public string[]? UnlicensedUserIdList { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMessage/CgibinMessageUpdateTemplateCardRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMessage/CgibinMessageUpdateTemplateCardRequest.cs index e9c33335..f97f6001 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMessage/CgibinMessageUpdateTemplateCardRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMessage/CgibinMessageUpdateTemplateCardRequest.cs @@ -69,9 +69,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否更新整个任务接收人员。 /// [Newtonsoft.Json.JsonProperty("atall")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("atall")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsAtAll { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMiniAppPay/Order/CgibinMiniAppPayCreateOrderRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMiniAppPay/Order/CgibinMiniAppPayCreateOrderRequest.cs index 983a85ed..0ddfddec 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMiniAppPay/Order/CgibinMiniAppPayCreateOrderRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMiniAppPay/Order/CgibinMiniAppPayCreateOrderRequest.cs @@ -215,9 +215,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置交易结束时间。 /// [Newtonsoft.Json.JsonProperty("time_expire")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.RFC3339NullableDateTimeOffsetConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.Rfc3339DateTimeOffsetConverter))] [System.Text.Json.Serialization.JsonPropertyName("time_expire")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.RFC3339NullableDateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.Rfc3339DateTimeOffsetConverter))] public DateTimeOffset? ExpireTime { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMiniAppPay/Order/CgibinMiniAppPayGetOrderResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMiniAppPay/Order/CgibinMiniAppPayGetOrderResponse.cs index ade69297..d7a240f4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMiniAppPay/Order/CgibinMiniAppPayGetOrderResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMiniAppPay/Order/CgibinMiniAppPayGetOrderResponse.cs @@ -242,9 +242,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置支付完成时间。 /// [Newtonsoft.Json.JsonProperty("success_time")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.RFC3339NullableDateTimeOffsetConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.Rfc3339DateTimeOffsetConverter))] [System.Text.Json.Serialization.JsonPropertyName("success_time")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.RFC3339NullableDateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.Rfc3339DateTimeOffsetConverter))] public DateTimeOffset? SuccessTime { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMiniAppPay/Refund/CgibinMiniAppPayGetRefundDetailResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMiniAppPay/Refund/CgibinMiniAppPayGetRefundDetailResponse.cs index edd45a4d..0123ea5d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMiniAppPay/Refund/CgibinMiniAppPayGetRefundDetailResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinMiniAppPay/Refund/CgibinMiniAppPayGetRefundDetailResponse.cs @@ -132,18 +132,18 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置退款成功时间。 /// [Newtonsoft.Json.JsonProperty("success_time")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.RFC3339NullableDateTimeOffsetConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.Rfc3339DateTimeOffsetConverter))] [System.Text.Json.Serialization.JsonPropertyName("success_time")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.RFC3339NullableDateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.Rfc3339DateTimeOffsetConverter))] public DateTimeOffset? SuccessTime { get; set; } /// /// 获取或设置退款创建时间。 /// [Newtonsoft.Json.JsonProperty("create_time")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.RFC3339DateTimeOffsetConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.Rfc3339DateTimeOffsetConverter))] [System.Text.Json.Serialization.JsonPropertyName("create_time")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.RFC3339DateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.Rfc3339DateTimeOffsetConverter))] public DateTimeOffset CreateTime { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/CgibinOAApplyEventRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/CgibinOAApplyEventRequest.cs index 48f15843..4bf1a441 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/CgibinOAApplyEventRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/CgibinOAApplyEventRequest.cs @@ -339,14 +339,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("longitude")] [System.Text.Json.Serialization.JsonPropertyName("longitude")] - public double Longitude { get; set; } + public decimal Longitude { get; set; } /// /// 获取或设置纬度。 /// [Newtonsoft.Json.JsonProperty("latitude")] [System.Text.Json.Serialization.JsonPropertyName("latitude")] - public double Latitude { get; set; } + public decimal Latitude { get; set; } /// /// 获取或设置地点标题。 @@ -489,9 +489,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否启用审批人模式。 /// [Newtonsoft.Json.JsonProperty("use_template_approver")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("use_template_approver")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool UseTemplateApprover { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/CgibinOAGetApprovalDetailResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/CgibinOAGetApprovalDetailResponse.cs index 81eddc0e..0ae7f8ca 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/CgibinOAGetApprovalDetailResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/CgibinOAGetApprovalDetailResponse.cs @@ -77,7 +77,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("sptime")] [System.Text.Json.Serialization.JsonPropertyName("sptime")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualNullableLongConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.TextualNumberConverter))] public long? ApproveTimestamp { get; set; } /// @@ -259,7 +259,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("s_timestamp")] [System.Text.Json.Serialization.JsonPropertyName("s_timestamp")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualNullableLongConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.TextualNumberConverter))] public long? Timestamp { get; set; } } @@ -471,14 +471,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("longitude")] [System.Text.Json.Serialization.JsonPropertyName("longitude")] - public double Longitude { get; set; } + public decimal Longitude { get; set; } /// /// 获取或设置纬度。 /// [Newtonsoft.Json.JsonProperty("latitude")] [System.Text.Json.Serialization.JsonPropertyName("latitude")] - public double Latitude { get; set; } + public decimal Latitude { get; set; } /// /// 获取或设置地点标题。 @@ -499,7 +499,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("time")] [System.Text.Json.Serialization.JsonPropertyName("time")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualNullableLongConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.TextualNumberConverter))] public long? Timestamp { get; set; } } @@ -603,7 +603,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("time")] [System.Text.Json.Serialization.JsonPropertyName("time")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualNullableLongConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.TextualNumberConverter))] public long? Timestamp { get; set; } /// @@ -611,7 +611,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("daymonthyear")] [System.Text.Json.Serialization.JsonPropertyName("daymonthyear")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualNullableLongConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.TextualNumberConverter))] public long? DateTimestamp { get; set; } } } @@ -674,7 +674,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("commentid")] [System.Text.Json.Serialization.JsonPropertyName("commentid")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringConverter))] public string CommentId { get; set; } = default!; /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/Template/CgibinOAApprovalCreateTemplateRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/Template/CgibinOAApprovalCreateTemplateRequest.cs index 3c536f50..3440cd61 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/Template/CgibinOAApprovalCreateTemplateRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/Template/CgibinOAApprovalCreateTemplateRequest.cs @@ -55,18 +55,18 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否为必填项。 /// [Newtonsoft.Json.JsonProperty("require")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("require")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsRequired { get; set; } /// /// 获取或设置是否不可打印。 /// [Newtonsoft.Json.JsonProperty("un_print")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("un_print")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsUnprintable { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/Template/CgibinOAGetTemplateDetailResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/Template/CgibinOAGetTemplateDetailResponse.cs index c772305d..5dc5050a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/Template/CgibinOAGetTemplateDetailResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Approval/Template/CgibinOAGetTemplateDetailResponse.cs @@ -66,18 +66,18 @@ /// 获取或设置是否为必填项。 /// [Newtonsoft.Json.JsonProperty("require")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("require")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsRequired { get; set; } /// /// 获取或设置是否不可打印。 /// [Newtonsoft.Json.JsonProperty("un_print")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("un_print")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsUnprintable { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarAddRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarAddRequest.cs index 1dbf075d..fc02e70f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarAddRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarAddRequest.cs @@ -59,9 +59,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否将该日历设置为默认日历。 /// [Newtonsoft.Json.JsonProperty("set_as_default")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("set_as_default")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsDefault { get; set; } /// @@ -89,9 +89,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否是公共日历。 /// [Newtonsoft.Json.JsonProperty("is_public")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_public")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsPublicCalendar { get; set; } /// @@ -105,9 +105,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否是全员日历。 /// [Newtonsoft.Json.JsonProperty("is_corp_calendar")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_corp_calendar")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsCorpCalendar { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarGetResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarGetResponse.cs index 57af6c17..050aaf24 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarGetResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarGetResponse.cs @@ -85,9 +85,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否是公共日历。 /// [Newtonsoft.Json.JsonProperty("is_public")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_public")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsPublicCalendar { get; set; } /// @@ -101,9 +101,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否是全员日历。 /// [Newtonsoft.Json.JsonProperty("is_corp_calendar")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_corp_calendar")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsCorpCalendar { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarUpdateRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarUpdateRequest.cs index e8d262cd..7db5b444 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarUpdateRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Calendar/CgibinOACalendarUpdateRequest.cs @@ -61,9 +61,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否是公共日历。 /// [Newtonsoft.Json.JsonProperty("is_public")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_public")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsPublicCalendar { get; set; } /// @@ -77,9 +77,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否是全员日历。 /// [Newtonsoft.Json.JsonProperty("is_corp_calendar")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_corp_calendar")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsCorpCalendar { get; set; } /// @@ -95,9 +95,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否不更新可订阅范围。 /// [Newtonsoft.Json.JsonProperty("skip_public_range")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("skip_public_range")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsSkipPublicRange { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Journal/CgibinOAJournalGetRecordDetailResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Journal/CgibinOAJournalGetRecordDetailResponse.cs index 0922e05d..8071452a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Journal/CgibinOAJournalGetRecordDetailResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Journal/CgibinOAJournalGetRecordDetailResponse.cs @@ -404,7 +404,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("commentid")] [System.Text.Json.Serialization.JsonPropertyName("commentid")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringConverter))] public string CommentId { get; set; } = default!; /// @@ -412,7 +412,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("tocommentid")] [System.Text.Json.Serialization.JsonPropertyName("tocommentid")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringConverter))] public string? ToCommentId { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Journal/CgibinOAJournalGetRecordListResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Journal/CgibinOAJournalGetRecordListResponse.cs index bfde4720..4f7dc852 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Journal/CgibinOAJournalGetRecordListResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Journal/CgibinOAJournalGetRecordListResponse.cs @@ -16,9 +16,9 @@ /// 获取或设置翻页是否结束。 /// [Newtonsoft.Json.JsonProperty("endflag")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("endflag")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsEnding { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Journal/CgibinOAJournalGetStatListResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Journal/CgibinOAJournalGetStatListResponse.cs index d89f2c0d..26e0da66 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Journal/CgibinOAJournalGetStatListResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Journal/CgibinOAJournalGetStatListResponse.cs @@ -73,9 +73,9 @@ /// 获取或设置是否迟交。 /// [Newtonsoft.Json.JsonProperty("flag")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("flag")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsLate { get; set; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomCancelBookRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomCancelBookRequest.cs index ac025661..efadc7fb 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomCancelBookRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomCancelBookRequest.cs @@ -16,9 +16,9 @@ /// 获取或设置是否保留关联日程。 /// [Newtonsoft.Json.JsonProperty("keep_schedule")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("keep_schedule")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsKeepSchedule { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomAddRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomAddRequest.cs index 962b0c54..cbf23a91 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomAddRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomAddRequest.cs @@ -16,14 +16,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("longitude")] [System.Text.Json.Serialization.JsonPropertyName("longitude")] - public double Longitude { get; set; } + public decimal Longitude { get; set; } /// /// 获取或设置纬度。 /// [Newtonsoft.Json.JsonProperty("latitude")] [System.Text.Json.Serialization.JsonPropertyName("latitude")] - public double Latitude { get; set; } + public decimal Latitude { get; set; } } public class Range diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomListResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomListResponse.cs index 2de58b60..5cd8bc5b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomListResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/CgibinOAMeetingRoomListResponse.cs @@ -100,9 +100,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否需要审批。 /// [Newtonsoft.Json.JsonProperty("need_approval")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("need_approval")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool RequireApproval { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Schedule/CgibinOAScheduleAddRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Schedule/CgibinOAScheduleAddRequest.cs index 1d43c6be..4649f412 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Schedule/CgibinOAScheduleAddRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Schedule/CgibinOAScheduleAddRequest.cs @@ -29,9 +29,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否需要提醒。 /// [Newtonsoft.Json.JsonProperty("is_remind")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_remind")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsRemind { get; set; } /// @@ -52,9 +52,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否重复日程。 /// [Newtonsoft.Json.JsonProperty("is_repeat")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_repeat")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsRepeat { get; set; } /// @@ -75,9 +75,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否自定义重复。 /// [Newtonsoft.Json.JsonProperty("is_custom_repeat")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_custom_repeat")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsCustomRepeat { get; set; } /// @@ -142,9 +142,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否设置为全天日程。 /// [Newtonsoft.Json.JsonProperty("is_whole_day")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_whole_day")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsWholeDay { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Schedule/CgibinOAScheduleGetResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Schedule/CgibinOAScheduleGetResponse.cs index 7570ffb3..061ca1aa 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Schedule/CgibinOAScheduleGetResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Schedule/CgibinOAScheduleGetResponse.cs @@ -47,9 +47,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否需要提醒。 /// [Newtonsoft.Json.JsonProperty("is_remind")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_remind")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsRemind { get; set; } /// @@ -70,9 +70,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否重复日程。 /// [Newtonsoft.Json.JsonProperty("is_repeat")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_repeat")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsRepeat { get; set; } /// @@ -93,9 +93,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否自定义重复。 /// [Newtonsoft.Json.JsonProperty("is_custom_repeat")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_custom_repeat")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsCustomRepeat { get; set; } /// @@ -167,9 +167,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否设置为全天日程。 /// [Newtonsoft.Json.JsonProperty("is_whole_day")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_whole_day")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsWholeDay { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Schedule/CgibinOAScheduleUpdateRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Schedule/CgibinOAScheduleUpdateRequest.cs index 89f3adea..97e8d82b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Schedule/CgibinOAScheduleUpdateRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Schedule/CgibinOAScheduleUpdateRequest.cs @@ -54,9 +54,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否设置为全天日程。 /// [Newtonsoft.Json.JsonProperty("is_whole_day")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_whole_day")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsWholeDay { get; set; } /// @@ -105,9 +105,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否只允许组织者发起群聊。 /// [Newtonsoft.Json.JsonProperty("only_organizer_create_chat")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("only_organizer_create_chat")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsOnlyOrganizerCreateChat { get; set; } } } @@ -116,9 +116,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否忽略参与者字段。 /// [Newtonsoft.Json.JsonProperty("skip_attendees")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("skip_attendees")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsSkipAttendees { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Vocation/CgibinOAVacationGetCorpConfigResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Vocation/CgibinOAVacationGetCorpConfigResponse.cs index 2fcf5ee3..7423fe34 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Vocation/CgibinOAVacationGetCorpConfigResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Vocation/CgibinOAVacationGetCorpConfigResponse.cs @@ -229,9 +229,9 @@ /// 获取或设置是否关联加班调休。 /// [Newtonsoft.Json.JsonProperty("is_newovertime")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_newovertime")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsNewOvertime { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinPSTNCC/CgibinPSTNCCGetStatesResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinPSTNCC/CgibinPSTNCCGetStatesResponse.cs index 5e43e99b..3ba7dc1c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinPSTNCC/CgibinPSTNCCGetStatesResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinPSTNCC/CgibinPSTNCCGetStatesResponse.cs @@ -9,9 +9,9 @@ /// 获取或设置是否通话。 /// [Newtonsoft.Json.JsonProperty("istalked")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("istalked")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsTalked { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinReport/Patrol/CgibinReportPatrolGetOrderListResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinReport/Patrol/CgibinReportPatrolGetOrderListResponse.cs index ce19082f..8ac8e3bc 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinReport/Patrol/CgibinReportPatrolGetOrderListResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinReport/Patrol/CgibinReportPatrolGetOrderListResponse.cs @@ -32,14 +32,14 @@ /// [Newtonsoft.Json.JsonProperty("longitude")] [System.Text.Json.Serialization.JsonPropertyName("longitude")] - public double Longitude { get; set; } + public decimal Longitude { get; set; } /// /// 获取或设置纬度。 /// [Newtonsoft.Json.JsonProperty("latitude")] [System.Text.Json.Serialization.JsonPropertyName("latitude")] - public double Latitude { get; set; } + public decimal Latitude { get; set; } } public class ProcessRecord diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinReport/SiteCode/CgibinReportSiteCodeGetReportAnswerResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinReport/SiteCode/CgibinReportSiteCodeGetReportAnswerResponse.cs index 4f8eeeb0..8d3484f1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinReport/SiteCode/CgibinReportSiteCodeGetReportAnswerResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinReport/SiteCode/CgibinReportSiteCodeGetReportAnswerResponse.cs @@ -91,9 +91,9 @@ /// 获取或设置是否还有更多数据。 /// [Newtonsoft.Json.JsonProperty("has_more")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("has_more")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool HasMore { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinReport/SiteCode/CgibinReportSiteCodeGetSiteReportInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinReport/SiteCode/CgibinReportSiteCodeGetSiteReportInfoResponse.cs index a2417ea4..da0aff02 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinReport/SiteCode/CgibinReportSiteCodeGetSiteReportInfoResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinReport/SiteCode/CgibinReportSiteCodeGetSiteReportInfoResponse.cs @@ -54,9 +54,9 @@ /// 获取或设置是否必填。 /// [Newtonsoft.Json.JsonProperty("is_required")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_required")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsRequired { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/CgibinSchoolSetUpgradeInfoRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/CgibinSchoolSetUpgradeInfoRequest.cs index 90835a83..82ffab9f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/CgibinSchoolSetUpgradeInfoRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/CgibinSchoolSetUpgradeInfoRequest.cs @@ -9,9 +9,9 @@ /// 获取或设置是否自动升年级。 /// [Newtonsoft.Json.JsonProperty("upgrade_switch")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("upgrade_switch")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool UpgradeSwitch { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Department/CgibinSchoolDepartmentListResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Department/CgibinSchoolDepartmentListResponse.cs index 74e7ff9c..805637b5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Department/CgibinSchoolDepartmentListResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Department/CgibinSchoolDepartmentListResponse.cs @@ -96,18 +96,18 @@ /// 获取或设置是否已毕业。 /// [Newtonsoft.Json.JsonProperty("is_graduated")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_graduated")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsGraduated { get; set; } /// /// 获取或设置是否开启客户群（即班级群）。 /// [Newtonsoft.Json.JsonProperty("open_group_chat")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("open_group_chat")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsOpenGroupChat { get; set; } /// @@ -115,7 +115,7 @@ /// [Newtonsoft.Json.JsonProperty("group_chat_id")] [System.Text.Json.Serialization.JsonPropertyName("group_chat_id")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalStringConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringConverter))] public string? GroupChatId { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetLivingInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetLivingInfoResponse.cs index d7185c20..4de7a837 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetLivingInfoResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetLivingInfoResponse.cs @@ -68,9 +68,9 @@ /// 获取或设置是否开启回放。 /// [Newtonsoft.Json.JsonProperty("open_replay")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("open_replay")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsOpenReplay { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetUnwatchStatisticsResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetUnwatchStatisticsResponse.cs index 734f9e40..b1eba58a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetUnwatchStatisticsResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetUnwatchStatisticsResponse.cs @@ -56,9 +56,9 @@ /// 获取或设置翻页是否结束。 /// [Newtonsoft.Json.JsonProperty("ending")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("ending")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsEnding { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetUnwatchStatisticsV2Response.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetUnwatchStatisticsV2Response.cs index 8bb2db17..82c1cfbc 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetUnwatchStatisticsV2Response.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetUnwatchStatisticsV2Response.cs @@ -66,9 +66,9 @@ /// 获取或设置是否还有更多。 /// [Newtonsoft.Json.JsonProperty("has_more")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("has_more")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool HasMore { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetWatchStatisticsResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetWatchStatisticsResponse.cs index c5acc65f..9e36e872 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetWatchStatisticsResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetWatchStatisticsResponse.cs @@ -59,9 +59,9 @@ /// 获取或设置是否评论。 /// [Newtonsoft.Json.JsonProperty("is_comment")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_comment")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsComment { get; set; } } @@ -99,9 +99,9 @@ /// 获取或设置是否评论。 /// [Newtonsoft.Json.JsonProperty("is_comment")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_comment")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsComment { get; set; } } } @@ -133,9 +133,9 @@ /// 获取或设置翻页是否结束。 /// [Newtonsoft.Json.JsonProperty("ending")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("ending")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsEnding { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetWatchStatisticsV2Response.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetWatchStatisticsV2Response.cs index 1d3b8164..62761124 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetWatchStatisticsV2Response.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/Living/CgibinSchoolLivingGetWatchStatisticsV2Response.cs @@ -52,9 +52,9 @@ /// 获取或设置是否评论。 /// [Newtonsoft.Json.JsonProperty("is_comment")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_comment")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsComment { get; set; } } @@ -102,9 +102,9 @@ /// 获取或设置是否评论。 /// [Newtonsoft.Json.JsonProperty("is_comment")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_comment")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsComment { get; set; } } } @@ -143,9 +143,9 @@ /// 获取或设置是否还有更多。 /// [Newtonsoft.Json.JsonProperty("has_more")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("has_more")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool HasMore { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/User/CgibinSchoolUserGetResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/User/CgibinSchoolUserGetResponse.cs index b858035c..17a1af96 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/User/CgibinSchoolUserGetResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/User/CgibinSchoolUserGetResponse.cs @@ -38,9 +38,9 @@ /// 获取或设置是否关注了“学校通知”。 /// [Newtonsoft.Json.JsonProperty("is_subscribe")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_subscribe")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsSubscribe { get; set; } /// @@ -135,9 +135,9 @@ /// 获取或设置是否关注了“学校通知”。 /// [Newtonsoft.Json.JsonProperty("is_subscribe")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_subscribe")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsSubscribe { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/User/Health/CgibinSchoolUserGetTeacherCustomizeHealthInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/User/Health/CgibinSchoolUserGetTeacherCustomizeHealthInfoResponse.cs index 4744009d..a5a0ea0a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/User/Health/CgibinSchoolUserGetTeacherCustomizeHealthInfoResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinSchool/User/Health/CgibinSchoolUserGetTeacherCustomizeHealthInfoResponse.cs @@ -54,9 +54,9 @@ /// 获取或设置健康状态是否为本人填写。 /// [Newtonsoft.Json.JsonProperty("self_submit")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("self_submit")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsSelfSubmit { get; set; } /// @@ -114,18 +114,18 @@ /// 获取或设置是否必填。 /// [Newtonsoft.Json.JsonProperty("is_must_fill")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_must_fill")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsRequired { get; set; } /// /// 获取或设置是否隐藏。 /// [Newtonsoft.Json.JsonProperty("is_not_display")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_not_display")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsHidden { get; set; } /// @@ -162,9 +162,9 @@ /// 获取或设置翻页是否结束。 /// [Newtonsoft.Json.JsonProperty("ending")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("ending")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool IsEnding { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinService/CgibinServiceGetAppQrcodeResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinService/CgibinServiceGetAppQrcodeResponse.cs index 312069b8..c9f114d6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinService/CgibinServiceGetAppQrcodeResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinService/CgibinServiceGetAppQrcodeResponse.cs @@ -1,4 +1,6 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work.Models +using System.Linq; + +namespace SKIT.FlurlHttpClient.Wechat.Work.Models { /// /// 表示 [POST] /cgi-bin/service/get_app_qrcode 接口的响应。 @@ -14,7 +16,7 @@ public override bool IsSuccessful() { - return base.IsSuccessful() && RawBytes?.Length > 0; + return base.IsSuccessful() && GetRawBytes().Any(); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinTag/TagUser/CgibinTagAddTagUsersResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinTag/TagUser/CgibinTagAddTagUsersResponse.cs index 0aa68f9a..7a9130fa 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinTag/TagUser/CgibinTagAddTagUsersResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinTag/TagUser/CgibinTagAddTagUsersResponse.cs @@ -9,9 +9,9 @@ /// 获取或设置无效的成员账号列表。 /// [Newtonsoft.Json.JsonProperty("invalidlist")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.TextualStringArrayWithPipeSplitConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.StringifiedStringArrayWithPipeSplitConverter))] [System.Text.Json.Serialization.JsonPropertyName("invalidlist")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.TextualStringArrayWithPipeSplitConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.StringifiedStringArrayWithPipeSplitConverter))] public string[]? InvalidUserIdList { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinUser/CgibinUserCreateRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinUser/CgibinUserCreateRequest.cs index b4228442..434819ea 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinUser/CgibinUserCreateRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinUser/CgibinUserCreateRequest.cs @@ -304,9 +304,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否启用成员。 /// [Newtonsoft.Json.JsonProperty("enable")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("enable")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsEnabled { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinUser/CgibinUserUpdateRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinUser/CgibinUserUpdateRequest.cs index 6db0c725..3bcdd6cf 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinUser/CgibinUserUpdateRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinUser/CgibinUserUpdateRequest.cs @@ -134,9 +134,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置是否启用成员。 /// [Newtonsoft.Json.JsonProperty("enable")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("enable")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalBooleanConverter))] public bool? IsEnabled { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinWedoc/Form/CgibinWedocCreateFormRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinWedoc/Form/CgibinWedocCreateFormRequest.cs index 40733ddd..09bc5fa1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinWedoc/Form/CgibinWedocCreateFormRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinWedoc/Form/CgibinWedocCreateFormRequest.cs @@ -83,14 +83,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("number_min")] [System.Text.Json.Serialization.JsonPropertyName("number_min")] - public double? NumberMinimum { get; set; } + public decimal? NumberMinimum { get; set; } /// /// 获取或设置数字的区间右端。 /// [Newtonsoft.Json.JsonProperty("number_max")] [System.Text.Json.Serialization.JsonPropertyName("number_max")] - public double? NumberMaximum { get; set; } + public decimal? NumberMaximum { get; set; } } public class RadioSettings diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinWedoc/Form/CgibinWedocGetFormAnswerResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinWedoc/Form/CgibinWedocGetFormAnswerResponse.cs index 15ebc96d..6998984c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinWedoc/Form/CgibinWedocGetFormAnswerResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinWedoc/Form/CgibinWedocGetFormAnswerResponse.cs @@ -104,14 +104,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// [Newtonsoft.Json.JsonProperty("days")] [System.Text.Json.Serialization.JsonPropertyName("days")] - public double? Days { get; set; } + public decimal? Days { get; set; } /// /// 获取或设置小时数。 /// [Newtonsoft.Json.JsonProperty("hours")] [System.Text.Json.Serialization.JsonPropertyName("hours")] - public double? Hours { get; set; } + public decimal? Hours { get; set; } } public class DepartmentReply diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinWedoc/SpreadSheet/CgibinWedocSpreadSheetBatchUpdateRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinWedoc/SpreadSheet/CgibinWedocSpreadSheetBatchUpdateRequest.cs index f06f9307..fcb0d767 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinWedoc/SpreadSheet/CgibinWedocSpreadSheetBatchUpdateRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinWedoc/SpreadSheet/CgibinWedocSpreadSheetBatchUpdateRequest.cs @@ -19,7 +19,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models /// 获取或设置工作表名称。 /// [Newtonsoft.Json.JsonProperty("title")] - [System.Text.Json.Serialization.JsonPropertyName("text")] + [System.Text.Json.Serialization.JsonPropertyName("title")] public string Title { get; set; } = string.Empty; /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/Models/Abstractions/ChatMessage.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/Models/Abstractions/ChatMessage.cs index 00532425..f30bf008 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/Models/Abstractions/ChatMessage.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/Models/Abstractions/ChatMessage.cs @@ -159,14 +159,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance.Models.Abstractions /// [Newtonsoft.Json.JsonProperty("latitude")] [System.Text.Json.Serialization.JsonPropertyName("latitude")] - public double Latitude { get; set; } + public decimal Latitude { get; set; } /// /// 获取或设置经度坐标。 /// [Newtonsoft.Json.JsonProperty("longitude")] [System.Text.Json.Serialization.JsonPropertyName("longitude")] - public double Longitude { get; set; } + public decimal Longitude { get; set; } /// /// 获取或设置位置名称。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/Models/GetMediaFileBufferResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/Models/GetMediaFileBufferResponse.cs index 49d14949..45d0f5b3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/Models/GetMediaFileBufferResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/Models/GetMediaFileBufferResponse.cs @@ -1,3 +1,5 @@ +using System.Linq; + namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance.Models { /// @@ -6,14 +8,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance.Models public class GetMediaFileBufferResponse : WechatWorkFinanceResponse { /// - /// 获取或设置文件分片二进制数组。 + /// 获取文件分片二进制数组。 /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public byte[] FileBufferBytes { - get { return RawBytes; } - set { RawBytes = value; } + get { return GetRawBytes(); } } /// @@ -32,7 +33,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance.Models public override bool IsSuccessful() { - return base.IsSuccessful() && FileBufferBytes?.Length > 0; + return base.IsSuccessful() && FileBufferBytes.Any(); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/Models/GetMediaFileResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/Models/GetMediaFileResponse.cs index 287c5a78..b72f9242 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/Models/GetMediaFileResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/Models/GetMediaFileResponse.cs @@ -1,3 +1,5 @@ +using System.Linq; + namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance.Models { /// @@ -6,19 +8,18 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance.Models public class GetMediaFileResponse : WechatWorkFinanceResponse { /// - /// 获取或设置文件二进制数组。 + /// 获取文件二进制数组。 /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public byte[] FileBytes { - get { return RawBytes; } - set { RawBytes = value; } + get { return GetRawBytes(); } } public override bool IsSuccessful() { - return base.IsSuccessful() && FileBytes?.Length > 0; + return base.IsSuccessful() && FileBytes.Any(); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/Settings/Credentials.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/Settings/Credentials.cs index ca67d074..019f87cf 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/Settings/Credentials.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/Settings/Credentials.cs @@ -16,7 +16,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance.Settings internal Credentials(WechatWorkFinanceClientOptions options) { - if (options == null) throw new ArgumentNullException(nameof(options)); + if (options is null) throw new ArgumentNullException(nameof(options)); CorpId = options.CorpId; SecretKey = options.SecretKey; diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/WechatWorkFinanceClient.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/WechatWorkFinanceClient.cs index ae66d1ef..d48714e7 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/WechatWorkFinanceClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/WechatWorkFinanceClient.cs @@ -41,7 +41,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance public WechatWorkFinanceClient(WechatWorkFinanceClientOptions options) : base() { - if (options == null) throw new ArgumentNullException(nameof(options)); + if (options is null) throw new ArgumentNullException(nameof(options)); Credentials = new Settings.Credentials(options); EncryptionKeyManager = options.EncryptionKeyManager; @@ -83,6 +83,30 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance #endif } + private void EnsureInitialized() + { + if (_disposed) + throw new ObjectDisposedException(nameof(WechatWorkFinanceClient)); + + if (!_initialized) + { + lock (_lockObj) + { + if (!_initialized) + { + int ret = /* 初始化 SDK */ + IsRunOnWindows() ? FinanceDllWindowsPInvoker.Init(_sdkPtr, Credentials.CorpId, Credentials.SecretKey) : + IsRunOnLinux() ? FinanceDllLinuxPInvoker.Init(_sdkPtr, Credentials.CorpId, Credentials.SecretKey) : + throw new PlatformNotSupportedException(); + if (ret != 0) + throw new WechatWorkFinanceException($"Failed to initialize Wechat Work Finance SDK (ret: {ret})."); + + _initialized = true; + } + } + } + } + /// /// /// @@ -91,7 +115,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance /// public Task ExecuteGetChatRecordsAsync(Models.GetChatRecordsRequest request, CancellationToken cancellationToken = default) { - if (request == null) throw new ArgumentNullException(nameof(request)); + if (request is null) throw new ArgumentNullException(nameof(request)); EnsureInitialized(); @@ -120,8 +144,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance try { int ret = /* 获取聊天记录数据 */ - IsRunOnWindows() ? FinanceDllWindowsPInvoker.GetChatData(_sdkPtr, request.LastSequence, request.Limit, _proxyAddress!, _proxyAuthentication!, (request.Timeout ?? _timeout) / 1000, dataPtr) : - IsRunOnLinux() ? FinanceDllLinuxPInvoker.GetChatData(_sdkPtr, request.LastSequence, request.Limit, _proxyAddress!, _proxyAuthentication!, (request.Timeout ?? _timeout) / 1000, dataPtr) : + IsRunOnWindows() ? FinanceDllWindowsPInvoker.GetChatData(_sdkPtr, request.LastSequence, request.Limit, _proxyAddress!, _proxyAuthentication!, (long)(request._InternalTimeout?.TotalMilliseconds ?? _timeout) / 1000, dataPtr) : + IsRunOnLinux() ? FinanceDllLinuxPInvoker.GetChatData(_sdkPtr, request.LastSequence, request.Limit, _proxyAddress!, _proxyAuthentication!, (long)(request._InternalTimeout?.TotalMilliseconds ?? _timeout) / 1000, dataPtr) : throw new PlatformNotSupportedException(); if (ret == 0) { @@ -136,7 +160,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance string dataContent = MarshalerHelper.PtrToStringUTF8(dataContentPtr); response = JsonSerializer.Deserialize(dataContent); - response.RawBytes = Encoding.UTF8.GetBytes(dataContent); + response._InternalRawBytes = Encoding.UTF8.GetBytes(dataContent); } response.ReturnCode = ret; @@ -161,7 +185,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance /// public Task ExecuteDecryptChatRecordAsync(Models.DecryptChatRecordRequest request, CancellationToken cancellationToken = default) { - if (request == null) throw new ArgumentNullException(nameof(request)); + if (request is null) throw new ArgumentNullException(nameof(request)); EnsureInitialized(); @@ -234,7 +258,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance catch (System.Text.Json.JsonException) { // NOTICE: 某些情况下微信返回的 JSON 字符串中包含设备控制符，可能导致 System.Text.Json 反序列化抛出异常 - if (JsonSerializer is FlurlSystemTextJsonSerializer) + if (JsonSerializer is SystemTextJsonSerializer) { string fixedDataContent = dataContent .Replace("\\u0011", string.Empty) @@ -249,7 +273,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance } } - response.RawBytes = Encoding.UTF8.GetBytes(dataContent); + response._InternalRawBytes = Encoding.UTF8.GetBytes(dataContent); } response.ReturnCode = ret; @@ -274,7 +298,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance /// public Task ExecuteGetMediaFileBufferAsync(Models.GetMediaFileBufferRequest request, CancellationToken cancellationToken = default) { - if (request == null) throw new ArgumentNullException(nameof(request)); + if (request is null) throw new ArgumentNullException(nameof(request)); EnsureInitialized(); @@ -303,8 +327,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance try { int ret = /* 获取媒体文件数据 */ - IsRunOnWindows() ? FinanceDllWindowsPInvoker.GetMediaData(_sdkPtr, request.BufferIndex ?? string.Empty, request.FileId, _proxyAddress!, _proxyAuthentication!, (request.Timeout ?? _timeout) / 1000, dataPtr) : - IsRunOnLinux() ? FinanceDllLinuxPInvoker.GetMediaData(_sdkPtr, request.BufferIndex ?? string.Empty, request.FileId, _proxyAddress!, _proxyAuthentication!, (request.Timeout ?? _timeout) / 1000, dataPtr) : + IsRunOnWindows() ? FinanceDllWindowsPInvoker.GetMediaData(_sdkPtr, request.BufferIndex ?? string.Empty, request.FileId, _proxyAddress!, _proxyAuthentication!, (long)(request._InternalTimeout?.TotalMilliseconds ?? _timeout) / 1000, dataPtr) : + IsRunOnLinux() ? FinanceDllLinuxPInvoker.GetMediaData(_sdkPtr, request.BufferIndex ?? string.Empty, request.FileId, _proxyAddress!, _proxyAuthentication!, (long)(request._InternalTimeout?.TotalMilliseconds ?? _timeout) / 1000, dataPtr) : throw new PlatformNotSupportedException(); if (ret == 0) { @@ -328,7 +352,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance byte[] bytes = new byte[dataSize]; Marshal.Copy(dataContentPtr, bytes, 0, bytes.Length); - response.FileBufferBytes = bytes; + response._InternalRawBytes = bytes; response.NextBufferIndex = MarshalerHelper.PtrToStringAnsi(dataNextBufferIndex); response.IsFinished = dataIsFinishFlag != 0; } @@ -355,7 +379,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance /// public async Task ExecuteGetMediaFileAsync(Models.GetMediaFileRequest request, CancellationToken cancellationToken = default) { - if (request == null) throw new ArgumentNullException(nameof(request)); + if (request is null) throw new ArgumentNullException(nameof(request)); EnsureInitialized(); @@ -380,7 +404,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance { FileId = fileId, BufferIndex = nextBufferIndex, - Timeout = request.Timeout + _InternalTimeout = request._InternalTimeout }; var resBuffer = await ExecuteGetMediaFileBufferAsync(reqBuffer, cancellationToken); response.ReturnCode = resBuffer.ReturnCode; @@ -410,65 +434,29 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance } } - response.RawBytes = stream.ToArray(); + response._InternalRawBytes = stream.ToArray(); return response; } } - private void EnsureInitialized() - { - if (_disposed) - throw new ObjectDisposedException(nameof(WechatWorkFinanceClient)); - - if (!_initialized) - { - lock (_lockObj) - { - if (!_initialized) - { - int ret = /* 初始化 SDK */ - IsRunOnWindows() ? FinanceDllWindowsPInvoker.Init(_sdkPtr, Credentials.CorpId, Credentials.SecretKey) : - IsRunOnLinux() ? FinanceDllLinuxPInvoker.Init(_sdkPtr, Credentials.CorpId, Credentials.SecretKey) : - throw new PlatformNotSupportedException(); - if (ret != 0) - throw new WechatWorkFinanceException($"Failed to initialize Wechat Work Finance SDK (ret: {ret})."); - - _initialized = true; - } - } - } - } - - private void Dispose(bool disposing) + protected override void Dispose(bool disposing) { if (!_disposed) { - if (disposing) + IntPtr sdkPtr = _sdkPtr; + if (sdkPtr != IntPtr.Zero) { - // 释放托管资源 - } - - // 释放非托管资源 - IntPtr tmpptr = _sdkPtr; - if (tmpptr != IntPtr.Zero) - { - if (IsRunOnWindows()) FinanceDllWindowsPInvoker.DestroySdk(tmpptr); - else if (IsRunOnLinux()) FinanceDllLinuxPInvoker.DestroySdk(tmpptr); - else Marshal.FreeHGlobal(tmpptr); - _sdkPtr = IntPtr.Zero; + + if (IsRunOnWindows()) FinanceDllWindowsPInvoker.DestroySdk(sdkPtr); + else if (IsRunOnLinux()) FinanceDllLinuxPInvoker.DestroySdk(sdkPtr); + else Marshal.FreeHGlobal(sdkPtr); } _disposed = true; } - } - public override void Dispose() - { - base.Dispose(); - - Dispose(disposing: true); - GC.SuppressFinalize(this); + base.Dispose(disposing); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/WechatWorkFinanceRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/WechatWorkFinanceRequest.cs index 7dd608e4..c24e5a8f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/WechatWorkFinanceRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/WechatWorkFinanceRequest.cs @@ -1,3 +1,5 @@ +using System; + namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance { /// @@ -5,11 +7,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance /// public abstract class WechatWorkFinanceRequest : ICommonRequest { - /// - /// 获取或设置请求超时时间（单位：毫秒）。如果不指定将使用构造 时的 参数。 - /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] - public virtual int? Timeout { get; set; } + internal TimeSpan? _InternalTimeout; + + /// + public void WithTimeout(TimeSpan? timeout) + { + _InternalTimeout = timeout; + } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/WechatWorkFinanceResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/WechatWorkFinanceResponse.cs index 4176381e..53e76935 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/WechatWorkFinanceResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/SDK/Finance/WechatWorkFinanceResponse.cs @@ -8,38 +8,31 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance /// public abstract class WechatWorkFinanceResponse : ICommonResponse { - /// - /// - /// - int ICommonResponse.RawStatus + internal protected WechatWorkFinanceResponse() { - get { throw new NotSupportedException(); } - set { throw new NotSupportedException(); } + _InternalRawBytes = Array.Empty(); } - /// - /// - /// - IDictionary ICommonResponse.RawHeaders - { - get { throw new NotSupportedException(); } - set { throw new NotSupportedException(); } - } - - /// - /// - /// - byte[] ICommonResponse.RawBytes { get; set; } = Array.Empty(); - - /// - /// 获取原始的响应数据。 - /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] - public byte[] RawBytes + internal byte[] _InternalRawBytes; + + /// + int ICommonResponse.GetRawStatus() { - get { return ((ICommonResponse)this).RawBytes; } - internal set { ((ICommonResponse)this).RawBytes = value; } + throw new NotImplementedException(); + } + + /// + HttpHeaderCollection ICommonResponse.GetRawHeaders() + { + throw new NotImplementedException(); + } + + /// + public byte[] GetRawBytes() + { + return _InternalRawBytes; } /// @@ -50,7 +43,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.SDK.Finance public int ReturnCode { get; internal set; } /// - /// 获取一个值，该值指示调用企业微信会话内容存档 API 是否成功（即 "ret" 值为 0）。 + /// 获取一个值，该值指示调用企业微信会话内容存档 API 是否成功。 + /// + ///（即 值为 0） + /// /// /// public virtual bool IsSuccessful() diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/SKIT.FlurlHttpClient.Wechat.Work.csproj b/src/SKIT.FlurlHttpClient.Wechat.Work/SKIT.FlurlHttpClient.Wechat.Work.csproj index 268d9f96..ac549775 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/SKIT.FlurlHttpClient.Wechat.Work.csproj +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/SKIT.FlurlHttpClient.Wechat.Work.csproj @@ -2,7 +2,7 @@ net461; net471; netstandard2.0; net6.0 - 8.0 + 10.0 enable true @@ -14,7 +14,7 @@ MIT https://github.com/fudiwei/DotNetCore.SKIT.FlurlHttpClient.Wechat Flurl.Http Wechat Weixin MicroMessage WechatWork WeixinWork WxWork WeWork WeCom 微信 企业微信 企业号 微信企业号 - 2.25.0 + 3.0.0-preview.1 基于 Flurl.Http 的企业微信 API 客户端，支持企业内部开发、第三方应用开发、服务商代开发、智慧硬件开发模式，支持基础服务、通讯录管理、身份验证、企业互联、上下游、消息推送、应用管理、素材管理、电子发票、客户联系、微信客服、企业支付、会话内容存档、家校沟通、家校应用、政民沟通、邮件、文档、日程、会议、微盘、直播、公费电话、打卡、审批、汇报、人事助手、会议室、紧急通知应用、硬件云端接入等功能。 Fu Diwei git @@ -48,7 +48,7 @@ - + diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Settings/Credentials.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Settings/Credentials.cs index 5270d9a9..419c2f59 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Settings/Credentials.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Settings/Credentials.cs @@ -56,7 +56,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Settings internal Credentials(WechatWorkClientOptions options) { - if (options == null) throw new ArgumentNullException(nameof(options)); + if (options is null) throw new ArgumentNullException(nameof(options)); CorpId = options.CorpId; AgentId = options.AgentId; diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/AESUtility.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/AESUtility.cs index f87c4003..e52194c1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/AESUtility.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/AESUtility.cs @@ -29,11 +29,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities const int NONCE_LENGTH_BYTE = 12; const int TAG_LENGTH_BYTE = 16; - if (keyBytes == null) throw new ArgumentNullException(nameof(keyBytes)); + if (keyBytes is null) throw new ArgumentNullException(nameof(keyBytes)); if (keyBytes.Length != KEY_LENGTH_BYTE) throw new ArgumentException($"Invalid key byte length (expected: {KEY_LENGTH_BYTE}, actual: {keyBytes.Length}).", nameof(keyBytes)); - if (nonceBytes == null) throw new ArgumentNullException(nameof(nonceBytes)); + if (nonceBytes is null) throw new ArgumentNullException(nameof(nonceBytes)); if (nonceBytes.Length != NONCE_LENGTH_BYTE) throw new ArgumentException($"Invalid nonce byte length (expected: {NONCE_LENGTH_BYTE}, actual: {nonceBytes.Length}).", nameof(nonceBytes)); - if (cipherBytes == null) throw new ArgumentNullException(nameof(cipherBytes)); + if (cipherBytes is null) throw new ArgumentNullException(nameof(cipherBytes)); if (cipherBytes.Length < TAG_LENGTH_BYTE) throw new ArgumentException($"Invalid cipher byte length (expected: more than {TAG_LENGTH_BYTE}, actual: {cipherBytes.Length}).", nameof(cipherBytes)); IBufferedCipher cipher = CipherUtilities.GetCipher(string.Format("{0}/{1}", AES_CIPHER_ALGORITHM_GCM, paddingMode)); @@ -61,14 +61,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities /// 解密后的文本数据。 public static string DecryptWithGCM(string key, string nonce, string? aad, string cipherText, string paddingMode = AES_CIPHER_PADDING_NOPADDING) { - if (key == null) throw new ArgumentNullException(nameof(key)); - if (nonce == null) throw new ArgumentNullException(nameof(nonce)); - if (cipherText == null) throw new ArgumentNullException(nameof(cipherText)); + if (key is null) throw new ArgumentNullException(nameof(key)); + if (nonce is null) throw new ArgumentNullException(nameof(nonce)); + if (cipherText is null) throw new ArgumentNullException(nameof(cipherText)); byte[] plainBytes = DecryptWithGCM( keyBytes: Encoding.UTF8.GetBytes(key), nonceBytes: Encoding.UTF8.GetBytes(nonce), - aadBytes: aad != null ? Encoding.UTF8.GetBytes(aad) : null, + aadBytes: aad is not null ? Encoding.UTF8.GetBytes(aad) : null, cipherBytes: Convert.FromBase64String(cipherText), paddingMode: paddingMode ); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/Internal/XmlUtility.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/Internal/XmlUtility.cs deleted file mode 100644 index 34157525..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/Internal/XmlUtility.cs +++ /dev/null @@ -1,76 +0,0 @@ -using System; -using System.Collections; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using System.Xml; -using System.Xml.Serialization; - -namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities -{ - internal static class XmlUtility - { - // REF: https://docs.microsoft.com/zh-cn/dotnet/api/system.xml.serialization.xmlserializer#dynamically-generated-assemblies - private static readonly Hashtable _xmlSerializers = new Hashtable(); - private static readonly XmlRootAttribute _xmlRoot = new XmlRootAttribute("xml"); - - private static XmlSerializer GetTypedSerializer(Type type) - { - if (type == null) throw new ArgumentNullException(nameof(type)); - - string skey = type.AssemblyQualifiedName ?? type.GetHashCode().ToString(); - XmlSerializer? xmlSerializer = (XmlSerializer?)_xmlSerializers[skey]; - if (xmlSerializer == null) - { - xmlSerializer = new XmlSerializer(type, _xmlRoot); - _xmlSerializers[skey] = xmlSerializer; - } - - return xmlSerializer; - } - - public static string Serialize(Type type, object obj) - { - string xml; - - var settings = new XmlWriterSettings(); - settings.Encoding = Encoding.UTF8; - settings.Indent = false; - settings.OmitXmlDeclaration = true; - settings.WriteEndDocumentOnClose = false; - settings.NamespaceHandling = NamespaceHandling.OmitDuplicates; - - using var stream = new MemoryStream(); - using var writer = XmlWriter.Create(stream, settings); - XmlSerializer serializer = GetTypedSerializer(type); - XmlSerializerNamespaces ns = new XmlSerializerNamespaces(); - ns.Add(string.Empty, string.Empty); - serializer.Serialize(writer, obj, ns); - writer.Flush(); - xml = Encoding.UTF8.GetString(stream.ToArray()); - xml = Regex.Replace(xml, "\\s*<\\w+ ([a-zA-Z0-9]+):nil=\"true\"[^>]*/>", string.Empty, RegexOptions.IgnoreCase); - xml = Regex.Replace(xml, "<\\?xml[^>]*\\?>", string.Empty, RegexOptions.IgnoreCase); - - return xml; - } - - public static string Serialize(T obj) - where T : class - { - return Serialize(typeof(T), obj); - } - - public static object Deserialize(Type type, string xml) - { - using var reader = new StringReader(xml); - XmlSerializer serializer = GetTypedSerializer(type); - return serializer.Deserialize(reader)!; - } - - public static T Deserialize(string xml) - where T : class - { - return (T)Deserialize(typeof(T), xml); - } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/RSAUtility.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/RSAUtility.cs index 644ced19..1438fc8d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/RSAUtility.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/RSAUtility.cs @@ -61,8 +61,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities /// 解密后的数据字节数组。 public static byte[] DecryptWithECB(byte[] privateKeyBytes, byte[] cipherBytes, string paddingMode = RSA_CIPHER_PADDING_PKCS1) { - if (privateKeyBytes == null) throw new ArgumentNullException(nameof(privateKeyBytes)); - if (cipherBytes == null) throw new ArgumentNullException(nameof(cipherBytes)); + if (privateKeyBytes is null) throw new ArgumentNullException(nameof(privateKeyBytes)); + if (cipherBytes is null) throw new ArgumentNullException(nameof(cipherBytes)); RsaKeyParameters rsaPrivateKeyParams = ParsePrivateKeyPemToPrivateKeyParameters(privateKeyBytes); return DecryptWithECB(rsaPrivateKeyParams, cipherBytes, paddingMode); @@ -77,8 +77,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities /// 解密后的文本数据。 public static string DecryptWithECB(string privateKey, string cipherText, string paddingMode = RSA_CIPHER_PADDING_PKCS1) { - if (privateKey == null) throw new ArgumentNullException(nameof(privateKey)); - if (cipherText == null) throw new ArgumentNullException(nameof(cipherText)); + if (privateKey is null) throw new ArgumentNullException(nameof(privateKey)); + if (cipherText is null) throw new ArgumentNullException(nameof(cipherText)); byte[] privateKeyBytes = ConvertPrivateKeyPkcs1PemToByteArray(privateKey); byte[] cipherBytes = Convert.FromBase64String(cipherText); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/SHA1Utility.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/SHA1Utility.cs index a58f7304..8c14e8ae 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/SHA1Utility.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/SHA1Utility.cs @@ -16,7 +16,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities /// 信息摘要字节数组。 public static byte[] Hash(byte[] bytes) { - if (bytes == null) throw new ArgumentNullException(nameof(bytes)); + if (bytes is null) throw new ArgumentNullException(nameof(bytes)); using SHA1 sha = SHA1.Create(); return sha.ComputeHash(bytes); @@ -29,7 +29,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities /// 信息摘要。 public static string Hash(string message) { - if (message == null) throw new ArgumentNullException(nameof(message)); + if (message is null) throw new ArgumentNullException(nameof(message)); byte[] msgBytes = Encoding.UTF8.GetBytes(message); byte[] hashBytes = Hash(msgBytes); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/Internal/FileHttpContentBuilder.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/__Internal/FileHttpContentBuilder.cs similarity index 92% rename from src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/Internal/FileHttpContentBuilder.cs rename to src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/__Internal/FileHttpContentBuilder.cs index 7266eca2..cc4bec23 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/Internal/FileHttpContentBuilder.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/__Internal/FileHttpContentBuilder.cs @@ -14,9 +14,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities public static MultipartFormDataContent Build(string fileName, byte[] fileBytes, string fileContentType, string formDataName, Action configureFileHttpContent) { - if (fileName == null) throw new ArgumentNullException(nameof(fileName)); - if (formDataName == null) throw new ArgumentNullException(nameof(formDataName)); - if (configureFileHttpContent == null) throw new ArgumentNullException(nameof(configureFileHttpContent)); + if (fileName is null) throw new ArgumentNullException(nameof(fileName)); + if (formDataName is null) throw new ArgumentNullException(nameof(formDataName)); + if (configureFileHttpContent is null) throw new ArgumentNullException(nameof(configureFileHttpContent)); fileName = fileName.Replace("\"", string.Empty); fileBytes = fileBytes ?? Array.Empty(); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/Internal/FileNameToContentTypeMapper.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/__Internal/FileNameToContentTypeMapper.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/Internal/FileNameToContentTypeMapper.cs rename to src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/__Internal/FileNameToContentTypeMapper.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/Internal/WxMsgCryptor.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/__Internal/WxMsgCryptor.cs similarity index 88% rename from src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/Internal/WxMsgCryptor.cs rename to src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/__Internal/WxMsgCryptor.cs index 6e8827eb..434c5f45 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/Internal/WxMsgCryptor.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/__Internal/WxMsgCryptor.cs @@ -60,7 +60,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities private static byte[] Decode2(byte[] decryptedBytes) { - if (decryptedBytes == null) throw new ArgumentNullException(nameof(decryptedBytes)); + if (decryptedBytes is null) throw new ArgumentNullException(nameof(decryptedBytes)); int pad = (int)decryptedBytes[decryptedBytes.Length - 1]; if (pad < 1 || pad > 32) @@ -75,9 +75,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities private static byte[] AESDecrypt(byte[] keyBytes, byte[] ivBytes, byte[] cipherBytes) { - if (keyBytes == null) throw new ArgumentNullException(nameof(keyBytes)); - if (ivBytes == null) throw new ArgumentNullException(nameof(ivBytes)); - if (cipherBytes == null) throw new ArgumentNullException(nameof(cipherBytes)); + if (keyBytes is null) throw new ArgumentNullException(nameof(keyBytes)); + if (ivBytes is null) throw new ArgumentNullException(nameof(ivBytes)); + if (cipherBytes is null) throw new ArgumentNullException(nameof(cipherBytes)); using var aes = Aes.Create(); aes.KeySize = AES_KEY_SIZE; @@ -103,9 +103,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities private static string AESEncrypt(byte[] keyBytes, byte[] ivBytes, byte[] plainBytes) { - if (keyBytes == null) throw new ArgumentNullException(nameof(keyBytes)); - if (ivBytes == null) throw new ArgumentNullException(nameof(ivBytes)); - if (plainBytes == null) throw new ArgumentNullException(nameof(plainBytes)); + if (keyBytes is null) throw new ArgumentNullException(nameof(keyBytes)); + if (ivBytes is null) throw new ArgumentNullException(nameof(ivBytes)); + if (plainBytes is null) throw new ArgumentNullException(nameof(plainBytes)); using var aes = Aes.Create(); aes.KeySize = AES_KEY_SIZE; @@ -140,8 +140,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities /// 解密后的文本内容。 public static string AESDecrypt(string cipherText, string encodingAESKey, out string corpId) { - if (cipherText == null) throw new ArgumentNullException(nameof(cipherText)); - if (encodingAESKey == null) throw new ArgumentNullException(nameof(encodingAESKey)); + if (cipherText is null) throw new ArgumentNullException(nameof(cipherText)); + if (encodingAESKey is null) throw new ArgumentNullException(nameof(encodingAESKey)); byte[] chiperBytes = Convert.FromBase64String(cipherText); byte[] keyBytes = Convert.FromBase64String(encodingAESKey + "="); @@ -170,9 +170,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities /// 加密后的文本内容。 public static string AESEncrypt(string plainText, string encodingAESKey, string corpId) { - if (plainText == null) throw new ArgumentNullException(nameof(plainText)); - if (encodingAESKey == null) throw new ArgumentNullException(nameof(encodingAESKey)); - if (corpId == null) throw new ArgumentNullException(nameof(corpId)); + if (plainText is null) throw new ArgumentNullException(nameof(plainText)); + if (encodingAESKey is null) throw new ArgumentNullException(nameof(encodingAESKey)); + if (corpId is null) throw new ArgumentNullException(nameof(corpId)); byte[] keyBytes = Convert.FromBase64String(encodingAESKey + "="); byte[] ivBytes = new byte[16]; @@ -204,11 +204,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities /// 验证结果。 public static bool VerifySignature(string sToken, string sTimestamp, string sNonce, string sMsgEncrypt, string sMsgSign) { - if (sToken == null) throw new ArgumentNullException(nameof(sToken)); - if (sTimestamp == null) throw new ArgumentNullException(nameof(sTimestamp)); - if (sNonce == null) throw new ArgumentNullException(nameof(sNonce)); - if (sMsgEncrypt == null) throw new ArgumentNullException(nameof(sMsgEncrypt)); - if (sMsgSign == null) throw new ArgumentNullException(nameof(sMsgSign)); + if (sToken is null) throw new ArgumentNullException(nameof(sToken)); + if (sTimestamp is null) throw new ArgumentNullException(nameof(sTimestamp)); + if (sNonce is null) throw new ArgumentNullException(nameof(sNonce)); + if (sMsgEncrypt is null) throw new ArgumentNullException(nameof(sMsgEncrypt)); + if (sMsgSign is null) throw new ArgumentNullException(nameof(sMsgSign)); string expectedSign = GenerateSignature(sToken, sTimestamp, sNonce, sMsgEncrypt); return string.Equals(expectedSign, sMsgSign, StringComparison.OrdinalIgnoreCase); @@ -224,10 +224,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities /// 签名。 public static string GenerateSignature(string sToken, string sTimestamp, string sNonce, string sMsgEncrypt) { - if (sToken == null) throw new ArgumentNullException(nameof(sToken)); - if (sTimestamp == null) throw new ArgumentNullException(nameof(sTimestamp)); - if (sNonce == null) throw new ArgumentNullException(nameof(sNonce)); - if (sMsgEncrypt == null) throw new ArgumentNullException(nameof(sMsgEncrypt)); + if (sToken is null) throw new ArgumentNullException(nameof(sToken)); + if (sTimestamp is null) throw new ArgumentNullException(nameof(sTimestamp)); + if (sNonce is null) throw new ArgumentNullException(nameof(sNonce)); + if (sMsgEncrypt is null) throw new ArgumentNullException(nameof(sMsgEncrypt)); List tmp = new List(capacity: 4) { sToken, sTimestamp, sNonce, sMsgEncrypt }; tmp.Sort(StringComparer.Ordinal); @@ -259,7 +259,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities /// public static bool TryParseXml(string xml, out string encryptedMsg, out string toUserName, out string agentId) { - if (xml == null) throw new ArgumentNullException(nameof(xml)); + if (xml is null) throw new ArgumentNullException(nameof(xml)); encryptedMsg = string.Empty; toUserName = string.Empty; @@ -272,7 +272,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities xmlDoc.LoadXml(xml); XmlNode? xmlRoot = xmlDoc.FirstChild; - if (xmlRoot == null) + if (xmlRoot is null) return false; encryptedMsg = xmlRoot["Encrypt"]?.InnerText?.ToString() ?? string.Empty; @@ -295,8 +295,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities /// public static string WrapXml(string sToken, string sMsgEncrypt) { - if (sToken == null) throw new ArgumentNullException(nameof(sToken)); - if (sMsgEncrypt == null) throw new ArgumentNullException(nameof(sMsgEncrypt)); + if (sToken is null) throw new ArgumentNullException(nameof(sToken)); + if (sMsgEncrypt is null) throw new ArgumentNullException(nameof(sMsgEncrypt)); string sTimestamp = DateTimeOffset.Now.ToLocalTime().ToUnixTimeSeconds().ToString(); string sNonce = DateTimeOffset.Now.Ticks.ToString("x"); @@ -314,10 +314,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities /// public static string WrapXml(string sTimestamp, string sNonce, string sMsgEncrypt, string sMsgSign) { - if (sTimestamp == null) throw new ArgumentNullException(nameof(sTimestamp)); - if (sNonce == null) throw new ArgumentNullException(nameof(sNonce)); - if (sMsgEncrypt == null) throw new ArgumentNullException(nameof(sMsgEncrypt)); - if (sMsgSign == null) throw new ArgumentNullException(nameof(sMsgSign)); + if (sTimestamp is null) throw new ArgumentNullException(nameof(sTimestamp)); + if (sNonce is null) throw new ArgumentNullException(nameof(sNonce)); + if (sMsgEncrypt is null) throw new ArgumentNullException(nameof(sMsgEncrypt)); + if (sMsgSign is null) throw new ArgumentNullException(nameof(sMsgSign)); StringBuilder builder = new StringBuilder(); builder.AppendFormat(""); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/__Internal/XmlHelper.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/__Internal/XmlHelper.cs new file mode 100644 index 00000000..3d0075cb --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Utilities/__Internal/XmlHelper.cs @@ -0,0 +1,31 @@ +using System; + +namespace SKIT.FlurlHttpClient.Wechat.Work.Utilities +{ + using SKIT.FlurlHttpClient.Internal; + + internal static class XmlHelper + { + public static string Serialize(object obj, Type type) + { + return _XmlSimpleSerializer.Serialize(obj, type); + } + + public static string Serialize(T obj) + where T : class + { + return Serialize(obj, typeof(T)); + } + + public static object Deserialize(string xml, Type type) + { + return _XmlSimpleSerializer.Deserialize(xml, type); + } + + public static T Deserialize(string xml) + where T : class + { + return (T)Deserialize(xml, typeof(T)); + } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs index f31a75fc..1009224b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkClient.cs @@ -21,42 +21,37 @@ namespace SKIT.FlurlHttpClient.Wechat.Work /// /// 配置项。 public WechatWorkClient(WechatWorkClientOptions options) - : base() + : this(options, null) { - if (options == null) throw new ArgumentNullException(nameof(options)); + } + + /// + /// + /// + /// + /// + /// + internal protected WechatWorkClient(WechatWorkClientOptions options, HttpClient? httpClient, bool disposeClient = true) + : base(httpClient, disposeClient) + { + if (options is null) throw new ArgumentNullException(nameof(options)); Credentials = new Settings.Credentials(options); FlurlClient.BaseUrl = options.Endpoint ?? WechatWorkEndpoints.DEFAULT; - FlurlClient.WithTimeout(TimeSpan.FromMilliseconds(options.Timeout)); - } - - /// - /// 用指定的企业微信 CorpId、企业微信 AgentId 和企业微信 AgentSecret 初始化 类的新实例。 - /// - /// 企业微信 CorpId。 - /// 企业微信 AgentId。 - /// 企业微信 AgentSecret。 - public WechatWorkClient(string corpId, int agentId, string agentSecret) - : this(new WechatWorkClientOptions() { CorpId = corpId, AgentId = agentId, AgentSecret = agentSecret }) - { + FlurlClient.WithTimeout(options.Timeout <= 0 ? Timeout.InfiniteTimeSpan : TimeSpan.FromMilliseconds(options.Timeout)); } /// /// 使用当前客户端生成一个新的 对象。 /// /// - /// + /// /// /// - public IFlurlRequest CreateRequest(WechatWorkRequest request, HttpMethod method, params object[] urlSegments) + public IFlurlRequest CreateFlurlRequest(WechatWorkRequest request, HttpMethod httpMethod, params object[] urlSegments) { - IFlurlRequest flurlRequest = FlurlClient.Request(urlSegments).WithVerb(method); - - if (request.Timeout != null) - { - flurlRequest.WithTimeout(TimeSpan.FromMilliseconds(request.Timeout.Value)); - } + IFlurlRequest flurlRequest = base.CreateFlurlRequest(request, httpMethod, urlSegments); return flurlRequest; } @@ -69,24 +64,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work /// /// /// - public async Task SendRequestAsync(IFlurlRequest flurlRequest, HttpContent? httpContent = null, CancellationToken cancellationToken = default) + public async Task SendFlurlRequestAsync(IFlurlRequest flurlRequest, HttpContent? httpContent = null, CancellationToken cancellationToken = default) where T : WechatWorkResponse, new() { - if (flurlRequest == null) throw new ArgumentNullException(nameof(flurlRequest)); + if (flurlRequest is null) throw new ArgumentNullException(nameof(flurlRequest)); - try - { - using IFlurlResponse flurlResponse = await base.SendRequestAsync(flurlRequest, httpContent, cancellationToken); - return await WrapResponseWithJsonAsync(flurlResponse, cancellationToken); - } - catch (FlurlHttpTimeoutException ex) - { - throw new Exceptions.WechatWorkRequestTimeoutException(ex.Message, ex); - } - catch (FlurlHttpException ex) - { - throw new WechatWorkException(ex.Message, ex); - } + using IFlurlResponse flurlResponse = await base.SendFlurlRequestAsync(flurlRequest, httpContent, cancellationToken); + return await WrapFlurlResponseAsJsonAsync(flurlResponse, cancellationToken); } /// @@ -97,30 +81,19 @@ namespace SKIT.FlurlHttpClient.Wechat.Work /// /// /// - public async Task SendRequestWithJsonAsync(IFlurlRequest flurlRequest, object? data = null, CancellationToken cancellationToken = default) + public async Task SendFlurlRequestAsJsonAsync(IFlurlRequest flurlRequest, object? data = null, CancellationToken cancellationToken = default) where T : WechatWorkResponse, new() { - if (flurlRequest == null) throw new ArgumentNullException(nameof(flurlRequest)); + if (flurlRequest is null) throw new ArgumentNullException(nameof(flurlRequest)); - try - { - bool isSimpleRequest = data == null || - flurlRequest.Verb == HttpMethod.Get || - flurlRequest.Verb == HttpMethod.Head || - flurlRequest.Verb == HttpMethod.Options; - using IFlurlResponse flurlResponse = isSimpleRequest ? - await base.SendRequestAsync(flurlRequest, null, cancellationToken) : - await base.SendRequestWithJsonAsync(flurlRequest, data, cancellationToken); - return await WrapResponseWithJsonAsync(flurlResponse, cancellationToken); - } - catch (FlurlHttpTimeoutException ex) - { - throw new Exceptions.WechatWorkRequestTimeoutException(ex.Message, ex); - } - catch (FlurlHttpException ex) - { - throw new WechatWorkException(ex.Message, ex); - } + bool isSimpleRequest = data is null || + flurlRequest.Verb == HttpMethod.Get || + flurlRequest.Verb == HttpMethod.Head || + flurlRequest.Verb == HttpMethod.Options; + using IFlurlResponse flurlResponse = isSimpleRequest ? + await base.SendFlurlRequestAsync(flurlRequest, null, cancellationToken) : + await base.SendFlurlRequestAsJsonAsync(flurlRequest, data, cancellationToken); + return await WrapFlurlResponseAsJsonAsync(flurlResponse, cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkEvent.cs index 5bee6501..3f855232 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkEvent.cs @@ -1,26 +1,12 @@ -using System; - namespace SKIT.FlurlHttpClient.Wechat.Work { /// /// 表示微信 API 回调通知事件的基类。 /// - [Serializable] - public class WechatWorkEvent + [Newtonsoft.Json.JsonObject] + [System.Xml.Serialization.XmlRoot("xml")] + public class WechatWorkEvent : ICommonWebhookEvent { - public static class Serialization - { - [Newtonsoft.Json.JsonObject] - public interface IJsonSerializable - { - } - - [System.Xml.Serialization.XmlRoot("xml")] - public interface IXmlSerializable - { - } - } - /// /// 获取或设置企业 CorpId 或第三方应用的 SuiteId。 /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkException.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkException.cs index 4adcb232..ddff01e4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkException.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkException.cs @@ -1,12 +1,11 @@ using System; -using Newtonsoft.Json; namespace SKIT.FlurlHttpClient.Wechat.Work { /// /// 当调用企业微信 API 出错时引发的异常。 /// - public class WechatWorkException : CommonExceptionBase + public class WechatWorkException : CommonException { /// public WechatWorkException() diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkRequest.cs index 040e3252..49a24833 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkRequest.cs @@ -1,21 +1,18 @@ -namespace SKIT.FlurlHttpClient.Wechat.Work +namespace SKIT.FlurlHttpClient.Wechat.Work { /// /// 表示企业微信 API 请求的基类。 /// - public abstract class WechatWorkRequest : ICommonRequest + public abstract class WechatWorkRequest : CommonRequestBase, ICommonRequest { - /// - /// 获取或设置请求超时时间（单位：毫秒）。如果不指定将使用构造 时的 参数，这在需要指定特定耗时请求（比如上传或下载文件）的超时时间时很有用。 - /// - [Newtonsoft.Json.JsonIgnore] - [System.Text.Json.Serialization.JsonIgnore] - public virtual int? Timeout { get; set; } - /// /// 获取或设置企业微信的 AccessToken。 - /// 注意：部分第三方应用开发或服务商代开发的接口中该字段表示第三方应用的 SuiteAccessToken。 - /// 注意：部分智慧硬件开发的接口中该字段表示设备的 DeviceAccessToken。 + /// + /// 注意：部分第三方应用开发或服务商代开发的接口中该字段表示第三方应用的 SuiteAccessToken。 + /// + /// + /// 注意：部分智慧硬件开发的接口中该字段表示设备的 DeviceAccessToken。 + /// /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkResponse.cs index dd04f170..1f467b0c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/WechatWorkResponse.cs @@ -1,60 +1,10 @@ -using System.Collections.Generic; - namespace SKIT.FlurlHttpClient.Wechat.Work { /// /// 表示企业微信 API 响应的基类。 /// - public abstract class WechatWorkResponse : ICommonResponse + public abstract class WechatWorkResponse : CommonResponseBase, ICommonResponse { - /// - /// - /// - int ICommonResponse.RawStatus { get; set; } - - /// - /// - /// - IDictionary ICommonResponse.RawHeaders { get; set; } = default!; - - /// - /// - /// - byte[] ICommonResponse.RawBytes { get; set; } = default!; - - /// - /// 获取原始的 HTTP 响应状态码。 - /// - [Newtonsoft.Json.JsonIgnore] - [System.Text.Json.Serialization.JsonIgnore] - public int RawStatus - { - get { return ((ICommonResponse)this).RawStatus; } - internal set { ((ICommonResponse)this).RawStatus = value; } - } - - /// - /// 获取原始的 HTTP 响应表头集合。 - /// - [Newtonsoft.Json.JsonIgnore] - [System.Text.Json.Serialization.JsonIgnore] - public IDictionary RawHeaders - { - get { return ((ICommonResponse)this).RawHeaders; } - internal set { ((ICommonResponse)this).RawHeaders = value; } - } - - /// - /// 获取原始的 HTTP 响应正文。 - /// - [Newtonsoft.Json.JsonIgnore] - [System.Text.Json.Serialization.JsonIgnore] - public byte[] RawBytes - { - get { return ((ICommonResponse)this).RawBytes; } - internal set { ((ICommonResponse)this).RawBytes = value; } - } - /// /// 获取企业微信 API 返回的错误码。 /// @@ -70,12 +20,15 @@ namespace SKIT.FlurlHttpClient.Wechat.Work public virtual string? ErrorMessage { get; set; } /// - /// 获取一个值，该值指示调用企业微信 API 是否成功（即 HTTP 状态码为 200、且 errcode 值为 0）。 + /// 获取一个值，该值指示调用企业微信 API 是否成功。 + /// + ///（即 HTTP 状态码为 200，且 值为 0） + /// /// /// - public virtual bool IsSuccessful() + public override bool IsSuccessful() { - return RawStatus == 200 && ErrorCode == 0; + return GetRawStatus() == 200 && ErrorCode == 0; } } } diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/IMPORTANT_CodeAnalyzeTests.cs b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/IMPORTANT_CodeAnalyzeTests.cs new file mode 100644 index 00000000..24bd6e91 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/IMPORTANT_CodeAnalyzeTests.cs @@ -0,0 +1,56 @@ +using System; +using System.IO; +using System.Reflection; +using SKIT.FlurlHttpClient.Tools.CodeAnalyzer; +using Xunit; + +namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests +{ + public class CodeAnalyzeTests + { + [Fact(DisplayName = "代码质量分析")] + public void CodeAnalyze() + { + Assert.Null(Record.Exception(() => + { + var options = new TypeDeclarationAnalyzerOptions() + { + SdkAssembly = Assembly.GetAssembly(typeof(WechatWorkClient))!, + SdkRequestModelDeclarationNamespace = "SKIT.FlurlHttpClient.Wechat.Work.Models", + SdkResponseModelDeclarationNamespace = "SKIT.FlurlHttpClient.Wechat.Work.Models", + SdkExecutingExtensionDeclarationNamespace = "SKIT.FlurlHttpClient.Wechat.Work", + SdkWebhookEventDeclarationNamespace = "SKIT.FlurlHttpClient.Wechat.Work.Events", + ThrowOnNotFoundRequestModelTypes = true, + ThrowOnNotFoundResponseModelTypes = true, + ThrowOnNotFoundExecutingExtensionTypes = true, + ThrowOnNotFoundWebhookEventTypes = true + }; + new TypeDeclarationAnalyzer(options).AssertNoIssues(); + })); + + Assert.Null(Record.Exception(() => + { + string workdir = Environment.CurrentDirectory; + string projdir = Path.Combine(workdir, "../../../../../"); + + var options = new SourceFileAnalyzerOptions() + { + SdkAssembly = Assembly.GetAssembly(typeof(WechatWorkClient))!, + SdkRequestModelDeclarationNamespace = "SKIT.FlurlHttpClient.Wechat.Work.Models", + SdkResponseModelDeclarationNamespace = "SKIT.FlurlHttpClient.Wechat.Work.Models", + SdkWebhookEventDeclarationNamespace = "SKIT.FlurlHttpClient.Wechat.Work.Events", + ProjectSourceRootDirectory = Path.Combine(projdir, "./src/SKIT.FlurlHttpClient.Wechat.Work/"), + ProjectTestRootDirectory = Path.Combine(projdir, "./test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/"), + ThrowOnNotFoundRequestModelClassCodeFiles = true, + ThrowOnNotFoundResponseModelClassCodeFiles = true, + ThrowOnNotFoundExecutingExtensionClassCodeFiles = true, + ThrowOnNotFoundWebhookEventClassCodeFiles = true, + ThrowOnNotFoundRequestModelSerializationSampleFiles = true, + ThrowOnNotFoundResponseModelSerializationSampleFiles = true, + ThrowOnNotFoundWebhookEventSerializationSampleFiles = true + }; + new SourceFileAnalyzer(options).AssertNoIssues(); + })); + } + } +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/SKIT.FlurlHttpClient.Wechat.Work.UnitTests.csproj b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/SKIT.FlurlHttpClient.Wechat.Work.UnitTests.csproj index 3f07b515..4e8fee83 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/SKIT.FlurlHttpClient.Wechat.Work.UnitTests.csproj +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/SKIT.FlurlHttpClient.Wechat.Work.UnitTests.csproj @@ -1,4 +1,4 @@ - + net472; net6.0 @@ -10,24 +10,24 @@ - - Never - Never - - - PreserveNewest - PreserveNewest - + + PreserveNewest + PreserveNewest + + + Always + Always + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/TestCase_CodeReview.cs b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/TestCase_CodeReview.cs deleted file mode 100644 index 2cde4290..00000000 --- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/TestCase_CodeReview.cs +++ /dev/null @@ -1,28 +0,0 @@ -using SKIT.FlurlHttpClient.Tools.CodeAnalyzer; -using Xunit; - -namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests -{ - public class TestCase_CodeReview - { - [Fact(DisplayName = "测试用例：代码质量分析")] - public void TestCodeAnalyzer() - { - Assert.Null(Record.Exception(() => - { - CodeAnalyzerOptions options = new CodeAnalyzerOptions() - { - AssemblyName = "SKIT.FlurlHttpClient.Wechat.Work", - WorkDirectoryForSourceCode = TestConfigs.WorkDirectoryForSdk, - WorkDirectoryForTestSample = TestConfigs.WorkDirectoryForTest, - AllowNotFoundEventTypes = true, - AllowNotFoundEventSamples = true - }; - CodeAnalyzer analyzer = new CodeAnalyzer(options); - analyzer.Start(); - analyzer.Assert(); - analyzer.Flush(); - })); - } - } -} diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/TestCase_FinanceSdkTests.cs b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/TestCase_FinanceSdkTests.cs index e9f522b4..2160bfd1 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/TestCase_FinanceSdkTests.cs +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/TestCase_FinanceSdkTests.cs @@ -1,5 +1,4 @@ using System.Threading.Tasks; -using Flurl.Http.Configuration; using Xunit; namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests @@ -103,12 +102,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests [Fact(DisplayName = "测试用例：聊天记录 - 会话内容存档数据结构反序列化")] public void TestFinanceSdkModelsDeserialization() { - var newtonsoftJsonSerializer = new FlurlNewtonsoftJsonSerializer(); - var systemTextJsonSerializer = new FlurlSystemTextJsonSerializer(); + var newtonsoftJsonSerializer = new NewtonsoftJsonSerializer(); + var systemTextJsonSerializer = new SystemTextJsonSerializer(); #region 用例：聊天记录列表 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""errcode"": 0, @@ -137,7 +136,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = "{\"msgid\":\"MSGID\",\"action\":\"ACTION\",\"from\":\"FROM\",\"tolist\":[\"TO\"],\"roomid\":\"ROOMID\",\"msgtime\":1234567890}"; @@ -157,7 +156,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 文本 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""CAQQluDa4QUY0On2rYSAgAMgzPrShAE="", @@ -184,7 +183,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 图片 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""CAQQvPnc4QUY0On2rYSAgAMgooLa0Q8="", @@ -215,7 +214,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 撤回消息 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""15775510700152506326_1603875615"", @@ -242,7 +241,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 同意会话聊天内容 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""8891446340739254950_1603875826"", @@ -271,7 +270,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 语音 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""10958372969718811103_1603875609"", @@ -304,7 +303,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 视频 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""17955920891003447432_1603875627"", @@ -337,7 +336,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 名片 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""13714216591700685558_1603875680"", @@ -366,7 +365,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 位置 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""2641513858500683770_1603876152"", @@ -401,7 +400,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 位置 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""6623217619416669654_1603875612"", @@ -438,7 +437,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 文件 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""18039699423706571225_1603875608"", @@ -473,7 +472,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 链接 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""11788441727514772650_1603875624"", @@ -506,7 +505,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 小程序消息 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""11930598857592605935_1603875608"", @@ -539,7 +538,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 会话记录消息 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""11354299838102555191_1603875658"", @@ -580,7 +579,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 待办消息 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""11354299838102555191_1603875658"", @@ -609,7 +608,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 投票消息 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""11354299838102555191_1603875658"", @@ -642,7 +641,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 填表消息 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""2500536226619379797_1576034482"", @@ -695,7 +694,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 红包消息 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""333590477316965370_1603877439"", @@ -728,7 +727,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 会议邀请消息 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""5935786683775673543_1603877328"", @@ -769,7 +768,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 切换企业日志 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""125289002219525886280"", @@ -790,7 +789,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 在线文档消息 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""9732089160923053207_1603877765"", @@ -821,7 +820,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - Markdown 格式消息 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""7546287934688259248_1603875715"", @@ -848,7 +847,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 日程消息 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""2345881211604379705_1603877680"", @@ -887,7 +886,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 混合消息 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""DAQQluDa4QUY0On4kYSABAMgzPrShAE="", @@ -921,7 +920,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 音频存档消息 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""17952229780246929345_1594197637"", @@ -969,7 +968,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 音频共享文档消息 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""16527954622422422847_1594199256"", @@ -1003,7 +1002,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 互通红包消息 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""8632214264349267353_1603786184"", @@ -1036,7 +1035,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 视频号消息 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""5702551662099334532_1619511584_external"", @@ -1067,7 +1066,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 音视频通话 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""10950316726562067988_1666601563058"", @@ -1096,7 +1095,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests #region 用例：聊天记录 - 微盘文件 { - static void AssertModelWithJsonSerializer(ISerializer serializer) + static void AssertModelWithJsonSerializer(IJsonSerializer serializer) { const string json = @"{ ""msgid"": ""904076622482680588_1666602581569_external"", diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/TestConfigs.cs b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/TestConfigs.cs index 126b7f9d..6c19d0e2 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/TestConfigs.cs +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/TestConfigs.cs @@ -17,16 +17,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests using var stream = File.OpenRead("appsettings.local.json"); using var jdoc = JsonDocument.Parse(stream); - var config = jdoc.RootElement.GetProperty("TestConfig"); + var config = jdoc.RootElement.GetProperty("TestConfigs"); WechatCorpId = config.GetProperty("CorpId").GetString()!; WechatAgentId = int.Parse(config.GetProperty("AgentId").GetString()!); WechatAgentSecret = config.GetProperty("AgentSecret").GetString()!; WechatAccessToken = config.GetProperty("AccessToken").GetString()!; WechatFinanceSecretKey = config.GetProperty("FinanceSecretKey").GetString()!; WechatFinanceEncryptionPrivateKey = config.GetProperty("FinanceEncryptionPrivateKey").GetString()!; - - WorkDirectoryForSdk = jdoc.RootElement.GetProperty("WorkDirectoryForSdk").GetString()!; - WorkDirectoryForTest = jdoc.RootElement.GetProperty("WorkDirectoryForTest").GetString()!; } catch (Exception ex) { @@ -40,8 +37,5 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.UnitTests public static readonly string WechatAccessToken; public static readonly string WechatFinanceSecretKey; public static readonly string WechatFinanceEncryptionPrivateKey; - - public static readonly string WorkDirectoryForSdk; - public static readonly string WorkDirectoryForTest; } } diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/appsettings.json b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/appsettings.json index 4319cbb3..e1236f07 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/appsettings.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/appsettings.json @@ -1,12 +1,10 @@ { - "TestConfig": { + "TestConfigs": { "CorpId": "请在此填写用于测试的企业微信 CorpId", "AgentId": "请在此填写用于测试的企业微信 AgentId", "AgentSecret": "请在此填写用于测试的企业微信 AgentSecret", "AccessToken": "请在此填写用于测试的企业微信 AccessToken", "FinanceSecretKey": "请在此填写用于测试的企业微信会话内容存档 SecretKey", "FinanceEncryptionPrivateKey": "请在此填写用于测试的企业微信会话内容存档消息加解密私钥" - }, - "WorkDirectoryForSdk": "请输入当前 SDK 项目所在的目录完整路径，如 C:\\Project\\src\\SKIT.FlurlHttpClient.Wechat.Work\\", - "WorkDirectoryForTest": "请输入当前测试项目所在的目录完整路径，如 C:\\Project\\test\\SKIT.FlurlHttpClient.Wechat.Work.UnitTests\\" + } }