云收藏 增加AI检测图片
This commit is contained in:
1 parent
b28940c02d
commit
b54a5f5310
36 files changed
+1978
-523
No files matched your search
@@ -418,7 +418,13 @@ namespace Work.Services
|
||||
public static async Task<PageData<CloudGoods>> SearchFavorites(UserFavoritesGoodsSearchRequest request)
|
||||
{
|
||||
request.UserName = GetUserName();
|
||||
return await StoreApiClient.Instance.CloudGoods.SearchFavorites(request);
|
||||
var page = await StoreApiClient.Instance.CloudGoods.SearchFavorites(request);
|
||||
foreach (var item in page.List)
|
||||
{
|
||||
item.DetectionResult = item.IsSafe == null ? "未检测" : item.IsSafe.Value ? "安全" : "违规";
|
||||
}
|
||||
|
||||
return page;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -576,6 +582,8 @@ namespace Work.Services
|
||||
/// 平台类型
|
||||
/// </summary>
|
||||
public PlatformType Platform { get; set; }
|
||||
/// <summary>安全状态:0 全部(默认),1 安全,2 违规,3 未检测。</summary>
|
||||
public int SafeStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 页码(默认1)
|
||||
@@ -629,6 +637,7 @@ namespace Work.Services
|
||||
}
|
||||
public class CloudGoods : BindableBase
|
||||
{
|
||||
|
||||
public bool IsSelected
|
||||
{
|
||||
get => GetValue<bool>();
|
||||
@@ -719,5 +728,18 @@ namespace Work.Services
|
||||
/// 索引同步状态:0未同步 1已同步
|
||||
/// </summary>
|
||||
public byte IndexStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 安全检测
|
||||
/// </summary>
|
||||
public bool? IsSafe { get; set; }
|
||||
|
||||
|
||||
[JsonIgnore]
|
||||
public string? DetectionResult
|
||||
{
|
||||
get => GetValue<string>();
|
||||
set => SetValue(value);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,143 @@
|
||||
using AllBase.Model;
|
||||
using AllBase.Model.Result;
|
||||
using AllBase.Model.Result.PDDResult;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using TemuKJD.BLL.ImportConverts;
|
||||
using AllBase;
|
||||
using System.Collections.Generic;
|
||||
using TemuKJD.BLL;
|
||||
|
||||
namespace Work.Services;
|
||||
|
||||
public static class ComplianceProductReader
|
||||
{
|
||||
public static Product Read(ComplianceGoods item)
|
||||
{
|
||||
KJDDBProduct db;
|
||||
if (item.type == ComplianceGoods.Cloud)
|
||||
db = new KJDDBProduct { product_json = CloudGoodsService.GetGoodsDetail(long.Parse(item.id)) };
|
||||
else if (item.type == ComplianceGoods.Library)
|
||||
{
|
||||
db = GetProductDetail(item.id, out var message);
|
||||
if (!string.IsNullOrEmpty(message)) throw new InvalidDataException(message);
|
||||
}
|
||||
else throw new InvalidDataException("未知商品来源:" + item.type);
|
||||
|
||||
if (string.IsNullOrWhiteSpace(db?.product_json)) throw new InvalidDataException("未取得商品详情。");
|
||||
var raw = db.product_json;
|
||||
var root = JObject.Parse(raw);
|
||||
PDDProductInfo info;
|
||||
string error = null;
|
||||
var converter = new PDDProdFormConverter();
|
||||
if (root.SelectToken("detail.galleries") is JArray)
|
||||
info = root.ToObject<PDDProductInfo>();
|
||||
else if (db.product_get_type_text == "厂商直采") info = converter.JstPddProdToPddConvert(out error, db);
|
||||
else if (db.product_get_type_text == "微信店采") info = converter.WXProdToPddConvert(out error, db);
|
||||
else if (db.product_get_type_text == "微信小店") info = converter.WXClientToPddConvert(out error, db);
|
||||
else if (db.product_get_type_text == "1688厂家") info = converter._1688ClientToPddConvert(out error, db);
|
||||
else if (db.product_get_type_text == "1688外部数据") info = converter._1688OutToPddConvert(out error, db);
|
||||
else
|
||||
{
|
||||
var front = ConverterToPddFactory.SetContentConvert(raw);
|
||||
if (front != null)
|
||||
{
|
||||
var originalId = front.GoodsId > 0 ? front.GoodsId.ToString() : db.spu_id;
|
||||
return new Product
|
||||
{
|
||||
ProductId = item.type == ComplianceGoods.Cloud ? item.id : originalId,
|
||||
Platform = item.platform.HasValue ? (PlatformType)item.platform.Value : front.Platform,
|
||||
Title = front.Title ?? item.name, Description = front.Description,
|
||||
MainImages = front.MainImages, DetailImages = front.DetailImages,
|
||||
Skus = front.Skus?.Select(x => new ProductSku { SkuId = x.SkuId, ImageUrl = x.SpecImage }).ToList()
|
||||
};
|
||||
}
|
||||
string converted;
|
||||
if (raw.Contains("\"spec_keys\"") && raw.Contains("\"spec_values\""))
|
||||
converted = converter.PddFrontToPddBackConvert(raw, isSaveDb: false);
|
||||
else if (raw.Contains("\"goods_id\"") && raw.Contains("\"gallery\""))
|
||||
converted = converter.PddFrontToPddBackConvert2(raw, isSaveDb: false);
|
||||
else if (raw.Contains("\"topGallery\"") && raw.Contains("\"detailGallery\""))
|
||||
converted = converter.PddFrontToPddBackConvert3(raw, isSaveDb: false);
|
||||
else if (raw.Contains("\"商品编号\"") && raw.Contains("\"商品链接\""))
|
||||
converted = converter.PddFrontToPddBackConvertV4(raw, isSaveDb: false);
|
||||
else throw new InvalidDataException("不支持的商品详情格式。");
|
||||
if (converted == null || !converted.StartsWith("success", StringComparison.Ordinal))
|
||||
throw new InvalidDataException(converted ?? "商品详情转换失败。");
|
||||
info = JObject.Parse(converted.Substring(7)).ToObject<PDDProductInfo>();
|
||||
}
|
||||
if (!string.IsNullOrEmpty(error) || info?.detail == null)
|
||||
throw new InvalidDataException(error ?? "商品详情转换失败。");
|
||||
var detail = info.detail;
|
||||
var platform = db.product_get_type_text switch
|
||||
{
|
||||
"微信店采" or "微信小店" or "微信外部数据" or "微信" => PlatformType.WX,
|
||||
"厂商直采" or "1688厂家" or "1688外部数据" => PlatformType.None,
|
||||
_ => PlatformType.PDD
|
||||
};
|
||||
var productId = db.product_get_type_text == "厂商直采"
|
||||
? (string)root.SelectToken("pddData.itemSpuId") ?? db.spu_id
|
||||
: detail.goods_id > 0 ? detail.goods_id.ToString() : db.spu_id;
|
||||
return new Product
|
||||
{
|
||||
Platform = item.platform.HasValue ? (PlatformType)item.platform.Value : platform,
|
||||
ProductId = item.type == ComplianceGoods.Cloud ? item.id : productId,
|
||||
Title = detail.goods_name ?? item.name, Description = detail.goods_desc,
|
||||
MainImages = detail.galleries?.Where(x => x.type == 1).Select(x => x.url).ToList(),
|
||||
DetailImages = detail.galleries?.Where(x => x.type == 2).Select(x => x.url).ToList(),
|
||||
Skus = detail.sku?.Select(x => new ProductSku { SkuId = x.sku_id.ToString(), ImageUrl = x.thumb_url }).ToList()
|
||||
};
|
||||
}
|
||||
|
||||
public static KJDDBProduct GetProductDetail(string prodDbId, out string errMsg, bool noViolationProduct = false, bool noBanWx = false)
|
||||
{
|
||||
errMsg = "";
|
||||
|
||||
if (string.IsNullOrEmpty(prodDbId))
|
||||
{
|
||||
errMsg = "产品编号为空";
|
||||
return new KJDDBProduct();
|
||||
}
|
||||
|
||||
List<KJDDBProduct> list = new List<KJDDBProduct>();
|
||||
|
||||
var url = BaseClass.BuildObjString("product/get_pdd_product_detail_list");
|
||||
var data = UserLogin.GetSignaturex() + "&search_db_ids=" + prodDbId;
|
||||
if (noViolationProduct)
|
||||
data += "&wx_safe_status=安全商品,未校验";
|
||||
if (noBanWx)
|
||||
data += "&ban_wx=0";
|
||||
if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.Contains("爆款数据") || BaseClass.UserAuthority.Contains("学员数据") || BaseClass.ParentAuthority.Contains("学员数据"))
|
||||
data += "&special_prod_type=普通商品,爆款数据";
|
||||
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var jArr = JObject.Parse(html)["data"];
|
||||
if (jArr.Count() == 0)
|
||||
return null;
|
||||
var sProd = JsonHelper.SerializeObject(jArr);
|
||||
|
||||
try
|
||||
{
|
||||
list = JsonHelper.DeserializeJsonToList<KJDDBProduct>(sProd);
|
||||
var item = list.FirstOrDefault();
|
||||
if (item == null)
|
||||
item = new KJDDBProduct();
|
||||
return item;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,265 @@
|
||||
using AllBase.Helper;
|
||||
using AllBase;
|
||||
using AllBase.Model;
|
||||
using Work.Store.Api;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Drawing;
|
||||
using System.Drawing.Drawing2D;
|
||||
using System.Drawing.Imaging;
|
||||
using System.Net.Http;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace Work.Services;
|
||||
|
||||
public sealed class ComplianceGoods
|
||||
{
|
||||
public const string Cloud = "云端收藏";
|
||||
public const string Library = "我的商品库";
|
||||
|
||||
public string id { get; set; }
|
||||
public string name { get; set; }
|
||||
public string image { get; set; }
|
||||
public string type { get; set; }
|
||||
public byte? platform { get; set; }
|
||||
}
|
||||
|
||||
public sealed class ComplianceResult
|
||||
{
|
||||
public string Text { get; internal set; }
|
||||
public string[] Hits { get; internal set; } = Array.Empty<string>();
|
||||
public int HitImageNumber { get; internal set; }
|
||||
public string Error { get; internal set; }
|
||||
public string Status => Error != null ? "失败,可重试" : Hits.Length == 0 ? "安全" : "有风险";
|
||||
public string Summary => Error != null ? "失败:" + Error :
|
||||
Hits.Length == 0 ? Status : $"有风险:第 {HitImageNumber} 张图片命中关键词:{string.Join(",", Hits)}";
|
||||
}
|
||||
|
||||
public sealed class ComplianceBatchResult
|
||||
{
|
||||
public int Safe { get; internal set; }
|
||||
public int Risk { get; internal set; }
|
||||
public int Failed { get; internal set; }
|
||||
public int Unfinished { get; internal set; }
|
||||
}
|
||||
|
||||
public static class GoodsComplianceService
|
||||
{
|
||||
private static readonly HttpClient ImageClient = new HttpClient(new HttpClientHandler { UseCookies = false })
|
||||
{
|
||||
Timeout = TimeSpan.FromSeconds(30),
|
||||
MaxResponseContentBufferSize = 32 * 1024 * 1024
|
||||
};
|
||||
private static readonly SemaphoreSlim BatchGate = new SemaphoreSlim(1, 1);
|
||||
|
||||
public static async Task<ComplianceBatchResult> DetectSelectedAsync(IReadOnlyList<ComplianceGoods> items,
|
||||
Func<ComplianceGoods, Product> readProduct, Action<string, string> update, CancellationToken cancellationToken = default)
|
||||
{
|
||||
if (items == null || items.Count == 0) throw new ArgumentException("请选择商品。", nameof(items));
|
||||
if (readProduct == null) throw new ArgumentNullException(nameof(readProduct));
|
||||
if (update == null) throw new ArgumentNullException(nameof(update));
|
||||
if (!BatchGate.Wait(0)) throw new InvalidOperationException("已有商品正在检测。");
|
||||
try
|
||||
{
|
||||
var options = GlobalConfig.GlobalSettings.GoodsCompliance;
|
||||
var words = ValidateOptions(options);
|
||||
var path = QueuePath();
|
||||
var pending = ReadPending(path);
|
||||
if (items.Any(InvalidItem)) throw new ArgumentException("缺少商品 ID 或来源。", nameof(items));
|
||||
var selected = items.GroupBy(x => Tuple.Create(x.type, x.id)).Select(g => g.First()).ToList();
|
||||
var existing = new HashSet<Tuple<string, string>>(pending.Select(x => Tuple.Create(x.type, x.id)));
|
||||
pending.AddRange(selected.Where(x => existing.Add(Tuple.Create(x.type, x.id))));
|
||||
SavePending(path, pending);
|
||||
|
||||
var batch = new ComplianceBatchResult { Unfinished = selected.Count };
|
||||
foreach (var item in selected)
|
||||
{
|
||||
if (cancellationToken.IsCancellationRequested) break;
|
||||
update(item.id, "读取详情中");
|
||||
ComplianceResult result;
|
||||
try
|
||||
{
|
||||
var product = await Task.Run(() => readProduct(item), cancellationToken);
|
||||
result = await DetectProductAsync(product, options, words,
|
||||
number => update(item.id, $"正在检测第 {number} 张图片"), cancellationToken);
|
||||
}
|
||||
catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
|
||||
{
|
||||
update(item.id, "已停止");
|
||||
break;
|
||||
}
|
||||
catch (Exception ex) { result = new ComplianceResult { Error = ex.Message }; }
|
||||
if (result.Error == null)
|
||||
{
|
||||
var remaining = pending.Where(x => x.type != item.type || x.id != item.id).ToList();
|
||||
try { SavePending(path, remaining); pending = remaining; }
|
||||
catch (Exception ex) { result.Error = ex.Message; }
|
||||
}
|
||||
if (result.Error != null) batch.Failed++;
|
||||
else if (result.Hits.Length > 0) batch.Risk++;
|
||||
else batch.Safe++;
|
||||
batch.Unfinished--;
|
||||
update(item.id, result.Summary);
|
||||
}
|
||||
return batch;
|
||||
}
|
||||
finally { BatchGate.Release(); }
|
||||
}
|
||||
|
||||
private static string QueuePath()
|
||||
{
|
||||
var username = BaseClass.UserName;
|
||||
if (string.IsNullOrWhiteSpace(username)) throw new InvalidOperationException("请先登录。");
|
||||
var user = Convert.ToBase64String(Encoding.UTF8.GetBytes(username)).Replace('/', '_').Replace('+', '-');
|
||||
return Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "data", "config", "goods_compliance_" + user + ".json");
|
||||
}
|
||||
|
||||
private static bool InvalidItem(ComplianceGoods item) =>
|
||||
item == null || string.IsNullOrWhiteSpace(item.id) || string.IsNullOrWhiteSpace(item.type);
|
||||
|
||||
private static List<ComplianceGoods> ReadPending(string path)
|
||||
{
|
||||
if (!File.Exists(path)) return new List<ComplianceGoods>();
|
||||
var items = JsonConvert.DeserializeObject<List<ComplianceGoods>>(File.ReadAllText(path));
|
||||
if (items == null || items.Any(InvalidItem))
|
||||
throw new InvalidDataException("待检测配置无效,请检查 " + path);
|
||||
return items;
|
||||
}
|
||||
|
||||
private static void SavePending(string path, List<ComplianceGoods> items)
|
||||
{
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(path));
|
||||
var temp = path + ".tmp";
|
||||
File.WriteAllText(temp, JsonConvert.SerializeObject(items));
|
||||
if (File.Exists(path)) File.Replace(temp, path, null);
|
||||
else File.Move(temp, path);
|
||||
}
|
||||
|
||||
public static async Task DetectAsync(IReadOnlyList<Product> products, ComplianceOptions options,
|
||||
Action<Product, ComplianceResult> completed, Action<Product> started = null)
|
||||
{
|
||||
if (products == null) throw new ArgumentNullException(nameof(products));
|
||||
if (completed == null) throw new ArgumentNullException(nameof(completed));
|
||||
var words = ValidateOptions(options);
|
||||
foreach (var product in products)
|
||||
{
|
||||
started?.Invoke(product);
|
||||
completed(product, await DetectProductAsync(product, options, words));
|
||||
}
|
||||
}
|
||||
|
||||
private static string[] ValidateOptions(ComplianceOptions options)
|
||||
{
|
||||
var words = Keywords(options?.Keywords);
|
||||
if (words.Length == 0) throw new ArgumentException("请先在系统设置的「商品 AI 检测」中保存 AI 检测关键词。");
|
||||
if (options.MainCount <= 0 || options.DetailCount < 0)
|
||||
throw new ArgumentException("请检查检测关键词和图片数量。");
|
||||
return words;
|
||||
}
|
||||
|
||||
private static async Task<ComplianceResult> DetectProductAsync(Product product, ComplianceOptions options,
|
||||
string[] words, Action<int> imageStarted = null, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var result = new ComplianceResult();
|
||||
try
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
if (string.IsNullOrWhiteSpace(product?.ProductId)) throw new InvalidDataException("缺少商品 ID。");
|
||||
var urls = SelectImages(product.MainImages, options.MainCount)
|
||||
.Concat(SelectImages(product.DetailImages, options.DetailCount));
|
||||
if (options.IncludeSku) urls = urls.Concat(SelectImages(product.Skus?.Select(s => s?.ImageUrl), null));
|
||||
var texts = new List<string>();
|
||||
int imageNumber = 0;
|
||||
foreach (var url in urls.Distinct(StringComparer.Ordinal))
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
imageNumber++;
|
||||
imageStarted?.Invoke(imageNumber);
|
||||
try
|
||||
{
|
||||
var jpeg = await DownloadInspectionImageAsync(url);
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
var lines = await StoreApiClient.Instance.CloudGoods.RecognizeAsync(BaseClass.GetMd5(url), jpeg);
|
||||
var imageText = string.Join(Environment.NewLine, lines);
|
||||
texts.AddRange(lines);
|
||||
result.Hits = Matches(imageText, words);
|
||||
if (result.Hits.Length > 0)
|
||||
{
|
||||
result.HitImageNumber = imageNumber;
|
||||
break;
|
||||
}
|
||||
}
|
||||
catch (Exception ex) when (!cancellationToken.IsCancellationRequested)
|
||||
{
|
||||
throw new InvalidDataException($"第 {imageNumber} 张图片检测失败:{ex.Message}", ex);
|
||||
}
|
||||
}
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
if (imageNumber == 0) throw new InvalidDataException("所选检测范围内没有图片。");
|
||||
result.Text = string.Join(Environment.NewLine, texts);
|
||||
try
|
||||
{
|
||||
await StoreApiClient.Instance.CloudGoods.SaveProductSafety(new SaveProductSafetyRequest
|
||||
{
|
||||
UserName = GetUserName(),
|
||||
ProductId = product.ProductId,
|
||||
IsSafe = result.Hits.Length == 0
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
result.Error = $"检测结果为{result.Status},上报失败:{ex.Message}";
|
||||
}
|
||||
}
|
||||
catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested) { throw; }
|
||||
catch (Exception ex) { result.Error = ex.Message; }
|
||||
return result;
|
||||
}
|
||||
|
||||
private static IEnumerable<string> SelectImages(IEnumerable<string> urls, int? count) =>
|
||||
(urls ?? Enumerable.Empty<string>()).Where(url => !string.IsNullOrWhiteSpace(url)).Select(url => url.Trim())
|
||||
.Distinct(StringComparer.Ordinal).Take(count ?? int.MaxValue);
|
||||
|
||||
private static async Task<byte[]> DownloadInspectionImageAsync(string url)
|
||||
{
|
||||
if (!Uri.TryCreate(url, UriKind.Absolute, out var uri) ||
|
||||
(uri.Scheme != Uri.UriSchemeHttp && uri.Scheme != Uri.UriSchemeHttps))
|
||||
throw new InvalidDataException("图片链接必须为 HTTP 或 HTTPS 地址。");
|
||||
var bytes = await ImageClient.GetByteArrayAsync(uri).ConfigureAwait(false);
|
||||
const int maxSide = 600;
|
||||
using (var input = new MemoryStream(bytes))
|
||||
using (var source = Image.FromStream(input))
|
||||
{
|
||||
var scale = Math.Min(1d, (double)maxSide / Math.Max(source.Width, source.Height));
|
||||
int width = Math.Max(1, (int)Math.Round(source.Width * scale));
|
||||
int height = Math.Max(1, (int)Math.Round(source.Height * scale));
|
||||
using var canvas = new Bitmap(width, height, PixelFormat.Format24bppRgb);
|
||||
using var output = new MemoryStream();
|
||||
using (var g = Graphics.FromImage(canvas))
|
||||
{
|
||||
g.Clear(Color.White);
|
||||
g.InterpolationMode = InterpolationMode.HighQualityBicubic;
|
||||
g.DrawImage(source, new Rectangle(0, 0, width, height),
|
||||
0, 0, source.Width, source.Height, GraphicsUnit.Pixel);
|
||||
}
|
||||
canvas.Save(output, ImageFormat.Jpeg);
|
||||
return output.ToArray();
|
||||
}
|
||||
}
|
||||
|
||||
public static string[] Keywords(string value) =>
|
||||
System.Text.RegularExpressions.Regex.Split(value ?? "", @"[,,;;|\s]+")
|
||||
.Where(x => x.Length > 0).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
|
||||
|
||||
public static string[] Matches(string recognized, string[] keywords) =>
|
||||
keywords.Where(x => recognized.IndexOf(x, StringComparison.OrdinalIgnoreCase) >= 0).ToArray();
|
||||
public static string GetUserName()
|
||||
{
|
||||
return string.IsNullOrEmpty(BaseClass.ParentUserName) ? BaseClass.UserName : BaseClass.ParentUserName;
|
||||
}
|
||||
}
|
||||
@@ -8,10 +8,12 @@ public sealed class ApiException : HttpException
|
||||
{
|
||||
public int? Code { get; }
|
||||
public JToken ResponseData { get; }
|
||||
public string TraceId { get; }
|
||||
|
||||
public ApiException(string message, int? code, JToken responseData) : base(message)
|
||||
public ApiException(string message, int? code, JToken responseData, string traceId = null) : base(message)
|
||||
{
|
||||
Code = code;
|
||||
ResponseData = responseData;
|
||||
TraceId = traceId;
|
||||
}
|
||||
}
|
||||
+119
-62
@@ -1,4 +1,5 @@
|
||||
using CsharpHttpHelper;
|
||||
using AllBase.Model.Result;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
@@ -6,6 +7,8 @@ using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Work.Store.Api;
|
||||
|
||||
@@ -14,16 +17,14 @@ public sealed class ApiTransport
|
||||
{
|
||||
private readonly string _baseUrl;
|
||||
private string _token;
|
||||
private Func<string> _login;
|
||||
internal object SessionGate { get; } = new object();
|
||||
private LoginRequest _credentials;
|
||||
internal SemaphoreSlim SessionGate { get; } = new SemaphoreSlim(1, 1);
|
||||
|
||||
internal void SetSession(string token, Func<string> login)
|
||||
// 调用方持有 SessionGate。
|
||||
internal void SetSession(string token, LoginRequest credentials)
|
||||
{
|
||||
lock (SessionGate)
|
||||
{
|
||||
_token = token;
|
||||
_login = login;
|
||||
}
|
||||
_token = token;
|
||||
_credentials = credentials;
|
||||
}
|
||||
|
||||
public ApiTransport(string baseUrl)
|
||||
@@ -39,29 +40,102 @@ public sealed class ApiTransport
|
||||
/// <summary>仅存于内存;手动赋值会清除自动登录凭据,设为 null 退出本地会话。</summary>
|
||||
public string Token
|
||||
{
|
||||
get { lock (SessionGate) return _token; }
|
||||
get
|
||||
{
|
||||
SessionGate.Wait();
|
||||
try { return _token; }
|
||||
finally { SessionGate.Release(); }
|
||||
}
|
||||
set
|
||||
{
|
||||
if (value != null && (string.IsNullOrWhiteSpace(value) || value.IndexOfAny(new[] { '\r', '\n' }) >= 0))
|
||||
throw new ArgumentException("Token 不能为空白或包含换行。", nameof(value));
|
||||
SetSession(value, null);
|
||||
SessionGate.Wait();
|
||||
try { SetSession(value, null); }
|
||||
finally { SessionGate.Release(); }
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>同步请求;无 data 时返回 default(T),界面调用需放在后台线程。</summary>
|
||||
public T Send<T>(string route, MethodType method, object body = null,
|
||||
IDictionary<string, string> query = null, bool authenticated = true,
|
||||
int timeoutMilliseconds = 30000)
|
||||
{
|
||||
var item = CreateRequest(route, method, body, query, timeoutMilliseconds);
|
||||
string token = null;
|
||||
if (authenticated)
|
||||
{
|
||||
//SessionGate.Wait();
|
||||
//try { token = _token ?? throw new HttpException("请先登录。") { IsOnline = false }; }
|
||||
//finally { SessionGate.Release(); }
|
||||
}
|
||||
for (int attempt = 0; ; attempt++)
|
||||
{
|
||||
if (token != null) item.Header["Authorization"] = "Bearer " + token;
|
||||
var response = HttpHelper.Request(item);
|
||||
try { return ReadResult<T>(response); }
|
||||
catch (HttpException ex) when (authenticated && !ex.IsOnline)
|
||||
{
|
||||
SessionGate.Wait();
|
||||
try
|
||||
{
|
||||
if (_token == token)
|
||||
{
|
||||
_token = null;
|
||||
if (attempt == 0 && _credentials != null)
|
||||
_token = AuthApi.LoginCore(this, _credentials).Token;
|
||||
}
|
||||
if (attempt != 0 || _token == null) throw;
|
||||
token = _token;
|
||||
}
|
||||
finally { SessionGate.Release(); }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<T> SendAsync<T>(string route, MethodType method, object body = null,
|
||||
IDictionary<string, string> query = null, bool authenticated = true,
|
||||
int timeoutMilliseconds = 30000)
|
||||
{
|
||||
var item = CreateRequest(route, method, body, query, timeoutMilliseconds);
|
||||
string token = null;
|
||||
if (authenticated)
|
||||
{
|
||||
//await SessionGate.WaitAsync().ConfigureAwait(false);
|
||||
//try { token = _token ?? throw new HttpException("请先登录。") { IsOnline = false }; }
|
||||
//finally { SessionGate.Release(); }
|
||||
}
|
||||
for (int attempt = 0; ; attempt++)
|
||||
{
|
||||
if (token != null) item.Header["Authorization"] = "Bearer " + token;
|
||||
var response = await HttpHelper.RequestAsync(item).ConfigureAwait(false);
|
||||
try { return ReadResult<T>(response); }
|
||||
catch (HttpException ex) when (authenticated && !ex.IsOnline)
|
||||
{
|
||||
await SessionGate.WaitAsync().ConfigureAwait(false);
|
||||
try
|
||||
{
|
||||
if (_token == token)
|
||||
{
|
||||
_token = null;
|
||||
if (attempt == 0 && _credentials != null)
|
||||
_token = (await AuthApi.LoginCoreAsync(this, _credentials).ConfigureAwait(false)).Token;
|
||||
}
|
||||
if (attempt != 0 || _token == null) throw;
|
||||
token = _token;
|
||||
}
|
||||
finally { SessionGate.Release(); }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private HttpItem CreateRequest(string route, MethodType method, object body,
|
||||
IDictionary<string, string> query, int timeoutMilliseconds)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(route) ||
|
||||
!Regex.IsMatch(route, @"\A[A-Za-z0-9_-]+(/[A-Za-z0-9_-]+)*\z"))
|
||||
throw new ArgumentException("接口必须使用相对路由,例如 Auth/Login。", nameof(route));
|
||||
if (body != null) Validator.ValidateObject(body, new ValidationContext(body), true);
|
||||
if (timeoutMilliseconds <= 0) throw new ArgumentOutOfRangeException(nameof(timeoutMilliseconds));
|
||||
string token = authenticated ? Token : null;
|
||||
if (authenticated && token == null)
|
||||
throw new HttpException("请先登录。") { IsOnline = false };
|
||||
|
||||
var url = new StringBuilder(_baseUrl).Append(route);
|
||||
if (query != null)
|
||||
{
|
||||
@@ -74,7 +148,7 @@ public sealed class ApiTransport
|
||||
first = false;
|
||||
}
|
||||
}
|
||||
var item = new HttpItem
|
||||
return new HttpItem
|
||||
{
|
||||
URL = url.ToString(),
|
||||
Method = method,
|
||||
@@ -87,54 +161,31 @@ public sealed class ApiTransport
|
||||
ReadWriteTimeout = timeoutMilliseconds,
|
||||
Allowautoredirect = false
|
||||
};
|
||||
for (int attempt = 0; ; attempt++)
|
||||
{
|
||||
if (token != null) item.Header["Authorization"] = "Bearer " + token;
|
||||
var response = HttpHelper.Request(item);
|
||||
int status = (int)response.StatusCode;
|
||||
if (status == 0) throw new HttpException("无法连接服务器或请求超时。");
|
||||
}
|
||||
|
||||
JObject result = null;
|
||||
JsonException parseError = null;
|
||||
try { result = JObject.Parse(response.Html ?? ""); }
|
||||
catch (JsonException ex) { parseError = ex; }
|
||||
private static T ReadResult<T>(HttpResult response)
|
||||
{
|
||||
int status = (int)response.StatusCode;
|
||||
if (status == 0) throw new HttpException("无法连接服务器或请求超时。");
|
||||
|
||||
var code = result?["code"];
|
||||
if (status == 401 || (code?.Type == JTokenType.Integer && code.ToString() == "401"))
|
||||
{
|
||||
if (authenticated)
|
||||
{
|
||||
lock (SessionGate)
|
||||
{
|
||||
// 并发旧请求复用已更新的 Token;同一请求最多重新发送一次。
|
||||
if (_token == token)
|
||||
{
|
||||
_token = null;
|
||||
if (attempt == 0 && _login != null)
|
||||
_token = _login();
|
||||
}
|
||||
if (attempt == 0 && _token != null)
|
||||
{
|
||||
token = _token;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
throw new HttpException(result?["msg"]?.ToString() ?? "登录已失效,请重新登录。") { IsOnline = false };
|
||||
}
|
||||
if (status < 200 || status >= 300)
|
||||
throw new HttpException($"请求失败(HTTP {status}):{result?["msg"]}");
|
||||
if (result == null)
|
||||
throw new HttpException("服务器响应不是有效的 JSON 对象。", parseError);
|
||||
// 先检查业务码,避免错误响应的 data 结构掩盖服务端错误。
|
||||
if (code?.Type != JTokenType.Integer || code.ToString() != "200")
|
||||
throw new ApiException("请求失败:" + (result["msg"]?.ToString() ?? "响应缺少成功状态码。"),
|
||||
code?.Type == JTokenType.Integer && int.TryParse(code.ToString(), out var businessCode) ? businessCode : (int?)null,
|
||||
result["data"]);
|
||||
if (result["data"] == null || result["data"].Type == JTokenType.Null) return default;
|
||||
try { return result["data"].ToObject<T>(); }
|
||||
catch (JsonException ex) { throw new HttpException("服务器响应 data 格式无效。", ex); }
|
||||
}
|
||||
Result<JToken> result = null;
|
||||
JsonException parseError = null;
|
||||
try { result = JsonConvert.DeserializeObject<Result<JToken>>(response.Html ?? ""); }
|
||||
catch (JsonException ex) { parseError = ex; }
|
||||
|
||||
if (status == 401 || (result?.Success == false && result.Code == 401))
|
||||
throw new HttpException(result?.Msg ?? "登录已失效,请重新登录。") { IsOnline = false };
|
||||
// 统一错误响应即使使用 HTTP 4xx/5xx,也保留业务码、数据和追踪 ID。
|
||||
if (result?.Success == false)
|
||||
throw new ApiException("请求失败:" + (result.Msg ?? $"业务码 {result.Code}。"),
|
||||
result.Code, result.Data, result.TraceId);
|
||||
if (status < 200 || status >= 300)
|
||||
throw new HttpException($"请求失败(HTTP {status}):{result?.Msg}");
|
||||
if (result?.Success == null)
|
||||
throw new HttpException("服务器响应不是有效的 Result 格式。", parseError);
|
||||
if (result.Data == null || result.Data.Type == JTokenType.Null) return default;
|
||||
try { return result.Data.ToObject<T>(); }
|
||||
catch (JsonException ex) { throw new HttpException("服务器响应 data 格式无效。", ex); }
|
||||
}
|
||||
|
||||
public T GetRequired<T>(string route, MethodType method, object body = null,
|
||||
@@ -142,5 +193,11 @@ public sealed class ApiTransport
|
||||
int timeoutMilliseconds = 30000) where T : class
|
||||
=> Send<T>(route, method, body, query, authenticated, timeoutMilliseconds)
|
||||
?? throw new HttpException("服务器响应缺少 data。");
|
||||
|
||||
public async Task<T> GetRequiredAsync<T>(string route, MethodType method, object body = null,
|
||||
IDictionary<string, string> query = null, bool authenticated = true,
|
||||
int timeoutMilliseconds = 30000) where T : class
|
||||
=> await SendAsync<T>(route, method, body, query, authenticated, timeoutMilliseconds).ConfigureAwait(false)
|
||||
?? throw new HttpException("服务器响应缺少 data。");
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using CsharpHttpHelper;
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
|
||||
@@ -52,17 +53,30 @@ public sealed class AuthApi
|
||||
DeviceId = _deviceId ?? request.DeviceId,
|
||||
DeviceName = request.DeviceName
|
||||
};
|
||||
lock (_transport.SessionGate)
|
||||
_transport.SessionGate.Wait();
|
||||
try
|
||||
{
|
||||
var result = LoginCore(credentials);
|
||||
_transport.SetSession(result.Token, () => LoginCore(credentials).Token);
|
||||
var result = LoginCore(_transport, credentials);
|
||||
_transport.SetSession(result.Token, credentials);
|
||||
return result;
|
||||
}
|
||||
finally { _transport.SessionGate.Release(); }
|
||||
}
|
||||
|
||||
private LoginResult LoginCore(LoginRequest request)
|
||||
internal static LoginResult LoginCore(ApiTransport transport, LoginRequest request)
|
||||
{
|
||||
var result = transport.GetRequired<LoginResult>("Auth/Login", MethodType.Post, request, authenticated: false);
|
||||
return ValidateToken(result);
|
||||
}
|
||||
|
||||
internal static async Task<LoginResult> LoginCoreAsync(ApiTransport transport, LoginRequest request)
|
||||
{
|
||||
var result = await transport.GetRequiredAsync<LoginResult>("Auth/Login", MethodType.Post, request, authenticated: false).ConfigureAwait(false);
|
||||
return ValidateToken(result);
|
||||
}
|
||||
|
||||
private static LoginResult ValidateToken(LoginResult result)
|
||||
{
|
||||
var result = _transport.GetRequired<LoginResult>("Auth/Login", MethodType.Post, request, authenticated: false);
|
||||
if (result == null || string.IsNullOrWhiteSpace(result.Token) ||
|
||||
result.Token.IndexOfAny(new[] { '\r', '\n' }) >= 0 ||
|
||||
!string.Equals(result.TokenType, "Bearer", StringComparison.OrdinalIgnoreCase))
|
||||
|
||||
@@ -1,55 +1,86 @@
|
||||
using AllBase.Model.Result;
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using CsharpHttpHelper;
|
||||
using NaiBa.Util.Helper;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Threading.Tasks;
|
||||
using Work.Services;
|
||||
using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
|
||||
|
||||
namespace Work.Store.Api;
|
||||
|
||||
/// <summary>云商品接口,沿用服务端不带版本号的路由。</summary>
|
||||
public sealed class CloudGoodsApi
|
||||
{
|
||||
private readonly ApiTransport _transport;
|
||||
private readonly ApiTransport _transport;
|
||||
|
||||
public CloudGoodsApi(ApiTransport transport)
|
||||
=> _transport = transport ?? throw new ArgumentNullException(nameof(transport));
|
||||
public CloudGoodsApi(ApiTransport transport)
|
||||
=> _transport = transport ?? throw new ArgumentNullException(nameof(transport));
|
||||
|
||||
public Task<PageData<CloudGoods>> GetGoods(GoodsSearchRequest request)
|
||||
=> Task.Run(() => _transport.GetRequired<PageData<CloudGoods>>("CloudGoods/SearchGoods", MethodType.Post, request));
|
||||
public Task<PageData<CloudGoods>> GetGoods(GoodsSearchRequest request)
|
||||
=> _transport.GetRequiredAsync<PageData<CloudGoods>>("CloudGoods/SearchGoods", MethodType.Post, request);
|
||||
|
||||
public string GetGoodsDetail(long goodsId)
|
||||
=> _transport.GetRequired<string>("CloudGoods/GetGoodsRawData", MethodType.Post,
|
||||
query: new Dictionary<string, string> { ["goodsId"] = goodsId.ToString(CultureInfo.InvariantCulture) });
|
||||
public string GetGoodsDetail(long goodsId)
|
||||
=> _transport.GetRequired<string>("CloudGoods/GetGoodsRawData", MethodType.Post,
|
||||
query: new Dictionary<string, string> { ["goodsId"] = goodsId.ToString(CultureInfo.InvariantCulture) });
|
||||
|
||||
public Task<List<ReportGoodsViolationResult>> ReportViolations(List<ReportGoodsViolationItem> items)
|
||||
=> Task.Run(() => _transport.GetRequired<List<ReportGoodsViolationResult>>("CloudGoods/ReportViolations", MethodType.Post, items,
|
||||
timeoutMilliseconds: 5000));
|
||||
public Task<List<ReportGoodsViolationResult>> ReportViolations(List<ReportGoodsViolationItem> items)
|
||||
=> _transport.GetRequiredAsync<List<ReportGoodsViolationResult>>("CloudGoods/ReportViolations", MethodType.Post, items,
|
||||
timeoutMilliseconds: 5000);
|
||||
|
||||
public List<GoodsViolationStatus> GetViolationStatus(List<long> goodsIds)
|
||||
=> _transport.GetRequired<List<GoodsViolationStatus>>("CloudGoods/GetViolationStatus", MethodType.Post, goodsIds,
|
||||
timeoutMilliseconds: 5000);
|
||||
public List<GoodsViolationStatus> GetViolationStatus(List<long> goodsIds)
|
||||
=> _transport.GetRequired<List<GoodsViolationStatus>>("CloudGoods/GetViolationStatus", MethodType.Post, goodsIds,
|
||||
timeoutMilliseconds: 5000);
|
||||
|
||||
public Task RecordViolationLogs(IReadOnlyList<RecordViolationLogRequest> requests)
|
||||
=> Task.Run(() => _transport.Send<object>("CloudGoods/RecordViolationLog", MethodType.Post, requests,
|
||||
timeoutMilliseconds: 5000));
|
||||
public Task RecordViolationLogs(IReadOnlyList<RecordViolationLogRequest> requests)
|
||||
=> _transport.SendAsync<object>("CloudGoods/RecordViolationLog", MethodType.Post, requests,
|
||||
timeoutMilliseconds: 5000);
|
||||
|
||||
public Task<List<CloudGoodsService.ViolationReason>> GetViolationReasons()
|
||||
=> Task.Run(() => _transport.GetRequired<List<CloudGoodsService.ViolationReason>>("CloudGoods/GetViolationReasons", MethodType.Get));
|
||||
public Task<List<CloudGoodsService.ViolationReason>> GetViolationReasons()
|
||||
=> _transport.GetRequiredAsync<List<CloudGoodsService.ViolationReason>>("CloudGoods/GetViolationReasons", MethodType.Get);
|
||||
|
||||
public Task<List<GoodsViolationLogEntity>> GetViolationLogs(GetViolationLogsRequest request)
|
||||
=> Task.Run(() => _transport.GetRequired<List<GoodsViolationLogEntity>>("CloudGoods/GetViolationLogs", MethodType.Post, request,
|
||||
timeoutMilliseconds: 5000));
|
||||
public Task<List<GoodsViolationLogEntity>> GetViolationLogs(GetViolationLogsRequest request)
|
||||
=> _transport.GetRequiredAsync<List<GoodsViolationLogEntity>>("CloudGoods/GetViolationLogs", MethodType.Post, request,
|
||||
timeoutMilliseconds: 5000);
|
||||
|
||||
public Task<PageData<CloudGoods>> SearchFavorites(UserFavoritesGoodsSearchRequest request)
|
||||
=> Task.Run(() => _transport.GetRequired<PageData<CloudGoods>>("CloudGoods/SearchFavorites", MethodType.Post, request));
|
||||
public Task<PageData<CloudGoods>> SearchFavorites(UserFavoritesGoodsSearchRequest request)
|
||||
=> _transport.GetRequiredAsync<PageData<CloudGoods>>("CloudGoods/SearchFavorites", MethodType.Post, request);
|
||||
|
||||
public Task<int> Favorite(string userName, List<long> goodsIds)
|
||||
=> Task.Run(() => _transport.Send<int>("CloudGoods/AddFavorite", MethodType.Post,
|
||||
new { UserName = userName, GoodsIds = goodsIds }));
|
||||
public Task<int> Favorite(string userName, List<long> goodsIds)
|
||||
=> _transport.SendAsync<int>("CloudGoods/AddFavorite", MethodType.Post,
|
||||
new { UserName = userName, GoodsIds = goodsIds });
|
||||
|
||||
public Task<int> RemoveFavorites(string userName, List<long> goodsIds)
|
||||
=> Task.Run(() => _transport.Send<int>("CloudGoods/RemoveFavorites", MethodType.Post,
|
||||
new { UserName = userName, GoodsIds = goodsIds }));
|
||||
public Task<int> RemoveFavorites(string userName, List<long> goodsIds)
|
||||
=> _transport.SendAsync<int>("CloudGoods/RemoveFavorites", MethodType.Post,
|
||||
new { UserName = userName, GoodsIds = goodsIds });
|
||||
|
||||
|
||||
/// <summary>识别上传图片中的文字和品牌 Logo。</summary>
|
||||
public async Task<List<string>> RecognizeAsync(string urlMd5, byte[] jpeg)
|
||||
{
|
||||
int sleep = 0;
|
||||
if (EnvironmentHelper.IsProduction)
|
||||
{
|
||||
sleep = RandomHelper.GetRandom(600, 1200);
|
||||
}
|
||||
var minimumDuration = Task.Delay(TimeSpan.FromMilliseconds(sleep));
|
||||
var request = new { UserName = BaseClass.UserName, Md5 = urlMd5, Image = Convert.ToBase64String(jpeg) };
|
||||
var recognitionTask = _transport.GetRequiredAsync<List<string>>("CloudGoods/InspectImage", MethodType.Post, request);
|
||||
await Task.WhenAll(minimumDuration, recognitionTask).ConfigureAwait(false);
|
||||
return await recognitionTask.ConfigureAwait(false);
|
||||
}
|
||||
|
||||
public async Task SaveProductSafety(SaveProductSafetyRequest request)
|
||||
{
|
||||
var ret = await _transport.SendAsync<int>("CloudGoods/SaveProductSafety", MethodType.Post, new
|
||||
{
|
||||
UserName = request.UserName,
|
||||
ProductId = request.ProductId,
|
||||
IsSafe = request.IsSafe
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using CsharpHttpHelper;
|
||||
using NaiBa.Util.Helper;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Work.Store.Api;
|
||||
|
||||
public sealed class GoodsComplianceApi
|
||||
{
|
||||
private readonly ApiTransport transport;
|
||||
internal GoodsComplianceApi(ApiTransport transport) => this.transport = transport;
|
||||
|
||||
///// <summary>上报平台商品的安全检测记录。</summary>
|
||||
//public Task SaveProductSafety(SaveProductSafetyRequest request)
|
||||
//{
|
||||
// request.UserName = BaseClass.UserName;
|
||||
// return transport.SendAsync<object>("ProductInspection/SaveProductSafety", MethodType.Post,
|
||||
// request ?? throw new ArgumentNullException(nameof(request)));
|
||||
//}
|
||||
|
||||
/// <summary>按平台和商品 ID 批量查询安全记录。</summary>
|
||||
public Task<List<ProductSafetyDto>> QueryProductSafety(QueryProductSafetyRequest request)
|
||||
{
|
||||
request.UserName = BaseClass.UserName;
|
||||
return transport.GetRequiredAsync<List<ProductSafetyDto>>("ProductInspection/QueryProductSafety", MethodType.Post,
|
||||
request ?? throw new ArgumentNullException(nameof(request)));
|
||||
}
|
||||
|
||||
/// <summary>识别上传图片中的文字和品牌 Logo。</summary>
|
||||
public async Task<List<string>> RecognizeAsync(string urlMd5, byte[] jpeg)
|
||||
{
|
||||
int sleep = 0;
|
||||
if (EnvironmentHelper.IsProduction)
|
||||
{
|
||||
sleep = RandomHelper.GetRandom(600, 1200);
|
||||
}
|
||||
var minimumDuration = Task.Delay(TimeSpan.FromMilliseconds(sleep));
|
||||
var request = new { UserName = BaseClass.UserName, Md5 = urlMd5, Image = Convert.ToBase64String(jpeg) };
|
||||
var recognitionTask = transport.GetRequiredAsync<List<string>>("ProductInspection/InspectImage", MethodType.Post, request);
|
||||
await Task.WhenAll(minimumDuration, recognitionTask).ConfigureAwait(false);
|
||||
return await recognitionTask.ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class SaveProductSafetyRequest
|
||||
{
|
||||
[Required] public string UserName { get; set; } = "";
|
||||
[Required] public string ProductId { get; set; } = "";
|
||||
[Required] public bool? IsSafe { get; set; }
|
||||
}
|
||||
|
||||
public sealed class QueryProductSafetyRequest
|
||||
{
|
||||
[Required] public string UserName { get; set; } = "";
|
||||
[Required] public string PlatformId { get; set; } = "";
|
||||
[Required] public string[] ProductIds { get; set; } = [];
|
||||
}
|
||||
|
||||
public sealed record ProductSafetyDto(string ProductId, bool IsSafe)
|
||||
{
|
||||
[Required] public string UserName { get; set; } = "";
|
||||
public string ProductId { get; } = ProductId;
|
||||
public bool IsSafe { get; } = IsSafe;
|
||||
}
|
||||
@@ -9,15 +9,16 @@ namespace Work.Store.Api;
|
||||
/// <summary>全局共用一个用户会话与请求出口,窗体通过 Instance 访问。</summary>
|
||||
public sealed class StoreApiClient
|
||||
{
|
||||
private static readonly string BaseUrl = EnvironmentHelper.IsDevelopment
|
||||
? "http://localhost:14312/api/"
|
||||
: "http://103.90.155.78:9001/api/";
|
||||
private static readonly string BaseUrl = EnvironmentHelper.IsProduction
|
||||
? "http://103.90.155.78:9001/api/"
|
||||
: "http://localhost:14312/api/";
|
||||
|
||||
public static StoreApiClient Instance { get; } = new StoreApiClient();
|
||||
|
||||
public ApiTransport Transport { get; }
|
||||
public AuthApi Auth { get; }
|
||||
public CloudGoodsApi CloudGoods { get; }
|
||||
//public GoodsComplianceApi GoodsCompliance { get; }
|
||||
public ImageCacheApi ImageCache { get; }
|
||||
/// <summary>当前 Windows 安装的 SHA-256 设备指纹,登录时作为 DeviceId 发送。</summary>
|
||||
public string DeviceId { get; }
|
||||
@@ -28,6 +29,7 @@ public sealed class StoreApiClient
|
||||
Transport = new ApiTransport(BaseUrl);
|
||||
Auth = new AuthApi(Transport, DeviceId);
|
||||
CloudGoods = new CloudGoodsApi(Transport);
|
||||
//GoodsCompliance = new GoodsComplianceApi(Transport);
|
||||
ImageCache = new ImageCacheApi(Transport);
|
||||
}
|
||||
|
||||
|
||||
@@ -78,4 +78,8 @@
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="..\TEMUKJD\BLL\PDDProdFormConverter.cs" Link="ImportConverters\PDDProdFormConverter.cs" />
|
||||
<Compile Include="..\TEMUKJD\BLL\ImportConverters\*.cs" Link="ImportConverters\%(Filename)%(Extension)" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
Reference in new issue
Block a user