文件配置化，去掉partial class

97f9c6a2 · 何阳 · fde99e6e · 97f9c6a2 · 97f9c6a2 · 97f9c6a2
Commit 97f9c6a2 authored Dec 19, 2023 by 何阳
Showing with 132 additions and 29 deletions
FtpAgent/Error.cs → FtpAgent/ApiServerError.cs
FtpAgent/Config.cs
FtpAgent/ErrorHandlerAttribute.cs
FtpAgent/FtpAgent.csproj
FtpAgent/OcrRequest.cs
FtpAgent/OcrResultData.cs
FtpAgent/OcrServer.cs
FtpAgent/Program.cs
FtpAgent/Respond.cs
FtpAgent/config.ini
--- a/FtpAgent/Error.cs
+++ b/FtpAgent/Error.cs
-using System;
+// See https://aka.ms/new-console-template for more information
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 namespace FtpAgent
 {
-    public class ApiError
+    public class ApiServerError
    {
        public int Code { get; set; }
        public string? Msg { get; set; }

--- a/FtpAgent/Config.cs
+++ b/FtpAgent/Config.cs
+using Microsoft.Extensions.Configuration;
+namespace FtpAgent
+{
+    public class Config
+    {
+        public string CustomerName { get; set; }
+        public string DeviceNo { get; set; }
+        public int OcrType { get; set; }
+        public string OrderNo { get; set; }
+        public int OrderType { get; set; }
+        public int PhotoMode { get; set; }
+        public string Secret { get; set; }
+        public string TenantId { get; set; }
+        public string OcrServerUrl { get; set; }
+        public string OcrApiUrl { get; set; }
+        public string Ip { get; set; }
+        public int Port { get; set; }
+        public string  Dir{ get; set; }
+        public Config(string filePath)
+        {
+            var builder = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+            .AddIniFile(filePath);
+            IConfiguration config = builder.Build();
+            CustomerName = config["OCR:customerName"];
+            DeviceNo = config["OCR:deviceNo"];
+            OcrType = int.Parse(config["OCR:ocrType"]);
+            OrderNo = config["OCR:orderNo"];
+            OrderType = int.Parse( config["OCR:orderType"]);
+            PhotoMode = int.Parse( config["OCR:photoMode"]);
+            Secret = config["OCR:secret"];
+            TenantId = config["OCR:tenantId"];
+            OcrServerUrl = config["OCR:OCR_SERVER_URL"];
+            OcrApiUrl = config["OCR:OCR_API_URL"];
+            Ip = config["OCR:Ip"];
+            Port = int.Parse(config["OCR:Port"]);
+            Dir = config["OCR:DIR"];
+        }
+    }
+}
--- a/FtpAgent/ErrorHandlerAttribute.cs
+++ b/FtpAgent/ErrorHandlerAttribute.cs
@@ -23,7 +23,7 @@ namespace FtpAgent
        public override void OnException(MethodContext context)
        {
            Log.Error(context.Exception, Msg);
-            context.HandledException(this, returnValue:Result.Failure<T,ApiError>( new ApiError()
+            context.HandledException(this, returnValue:Result.Failure<T, ApiServerError>( new ApiServerError()
            {
                Code = 600,
                Msg = $"{Msg} 程序错误:{context?.Exception?.Message}"

--- a/FtpAgent/FtpAgent.csproj
+++ b/FtpAgent/FtpAgent.csproj
@@ -7,10 +7,18 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="config.ini" />
+  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="CSharpFunctionalExtensions" Version="2.40.3" />
    <PackageReference Include="FubarDev.FtpServer" Version="3.1.2" />
    <PackageReference Include="FubarDev.FtpServer.FileSystem.DotNet" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
    <PackageReference Include="Rougamo.Fody" Version="2.1.1" />
    <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
@@ -19,4 +27,10 @@
    <PackageReference Include="Serilog.Sinks.Trace" Version="3.0.0" />
  </ItemGroup>
+  <ItemGroup>
+    <None Update="config.ini">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
--- a/FtpAgent/OcrRequest.cs
+++ b/FtpAgent/OcrRequest.cs
@@ -25,6 +25,7 @@ public class OcrRequest
    {
        this.ocrFile = ocrFile;
        uniqueNo = Guid.NewGuid().ToString();
    }
    /// <summary>

--- a/FtpAgent/OcrResultData.cs
+++ b/FtpAgent/OcrResultData.cs
 // See https://aka.ms/new-console-template for more information
-public partial class OcrServer
+namespace FtpAgent
 {
    public class LinesItem
    {
@@ -17,11 +18,12 @@ public partial class OcrServer
        /// <summary>
        ///  OCR识别结果
        /// </summary>
-        public List<LinesItem> ?lines { get; set; }
+        public List<LinesItem>? lines { get; set; }
        /// <summary>
        /// OCR记录ID，后续需要传输匹配接口和提交结果
        /// </summary>
        public long ocrLogId { get; set; }
    }
 }
\ No newline at end of file
--- a/FtpAgent/OcrServer.cs
+++ b/FtpAgent/OcrServer.cs
@@ -2,21 +2,18 @@
 using Newtonsoft.Json;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 using System.Net.Http.Headers;
-using System.Text;
 using Serilog;
 using CSharpFunctionalExtensions;
-using CSharpFunctionalExtensions.ValueTasks;
-using FtpAgent;
-using static OcrServer;
-public partial class OcrServer
+namespace FtpAgent
 {
+    public partial class OcrServer
+    {
        public static string OCR_SERVER_URL { get; private set; } = "https://hardware-test.guke.tech";
        public static string OCR_API_URL { get; private set; } = "/api/service/ocr/v2/recognize";
        [ErrorHandler<OcrResultData>("上传图片到OCR服务器失败!")]
-    public static async Task<Result<OcrResultData, ApiError>> UploadFile(OcrRequest result)
+        public static async Task<Result<OcrResultData, ApiServerError>> UploadFile(OcrRequest result)
        {
            string url = $"{OCR_SERVER_URL}{OCR_API_URL}?ocrChannel=1&ocrType=4&remark=certificate test";
            using (var httpclient = new HttpClient())
@@ -31,18 +28,18 @@ public partial class OcrServer
                if (!response.IsSuccessStatusCode)
                {
                    Log.Error($"请求远程OCR服务器失败，失败code=${response.StatusCode}, msg={responseContent}");
-                return Result.Failure<OcrResultData, ApiError>(new ApiError() { Code = (int)response.StatusCode, Msg = responseContent });
+                    return Result.Failure<OcrResultData, ApiServerError>(new ApiServerError() { Code = (int)response.StatusCode, Msg = responseContent });
                }
                Log.Information("Post请求:{url},请求结果:{responseContent}", url, responseContent);
                var respond = JsonConvert.DeserializeObject<Respond<OcrResultData>>(responseContent);
                if (respond.code != 200)
                {
                    Log.Error($"请求远程OCR API失败，失败code=${respond.code}, msg={respond.detail}");
-                return Result.Failure<OcrResultData, ApiError>(new ApiError() { Code = respond.code, Msg = respond.msg }) ;
+                    return Result.Failure<OcrResultData, ApiServerError>(new ApiServerError() { Code = respond.code, Msg = respond.msg });
                }
                var test = respond?.data?.lines.Select(item => item.text).Aggregate((l, f) => l + f);
                Log.Information($"返回结果文本长度:{test.Length}");
-            return Result.Success<OcrResultData, ApiError>(respond.data);         
+                return Result.Success<OcrResultData, ApiServerError>(respond.data);
            }
        }
@@ -74,4 +71,5 @@ public partial class OcrServer
            string json = JsonConvert.SerializeObject(logData, Formatting.Indented);
            Log.Information("Form Data Content: {FormData}", json);
        }
+    }
 }
--- a/FtpAgent/Program.cs
+++ b/FtpAgent/Program.cs
@@ -2,6 +2,7 @@
 using CaptureAgent;
+using FtpAgent;
 using FubarDev.FtpServer;
 using FubarDev.FtpServer.FileSystem.DotNet;
 using Microsoft.Extensions.DependencyInjection;
@@ -9,12 +10,29 @@ using Serilog;
 HashSet<string> FileChangeCnt = new();
 Logging.InitLogging();
+var config = new Config("config.ini");
+Log.Information($"Customer Name: {config.CustomerName}");
+Log.Information($"Device No: {config.DeviceNo}");
+Log.Information($"OCR Type: {config.OcrType}");
+Log.Information($"Order No: {config.OrderNo}");
+Log.Information($"Order Type: {config.OrderType}");
+Log.Information($"Photo Mode: {config.PhotoMode}");
+Log.Information($"Secret: {config.Secret}");
+Log.Information($"Tenant Id: {config.TenantId}");
+Log.Information($"OCR Server URL: {config.OcrServerUrl}");
+Log.Information($"OCR API URL: {config.OcrApiUrl}");
+Log.Information($"IP: {config.Ip}");
+Log.Information($"Port: {config.Port}");
+Log.Information($"Dir: {config.Dir}");
 // Setup dependency injection
 var services = new ServiceCollection();
 // use %TEMP%/TestFtpServer as root folder
 services.Configure<DotNetFileSystemOptions>(opt => opt
-    .RootPath = Path.Combine(Environment.CurrentDirectory, "Test"));
+    .RootPath = Path.Combine(Environment.CurrentDirectory, config.Dir));
 // Add FTP server services
 // DotNetFileSystemProvider = Use the .NET file system functionality
@@ -23,11 +41,14 @@ services.AddFtpServer(builder => builder
    .UseDotNetFileSystem() // Use the .NET file system functionality
    .EnableAnonymousAuthentication()); // allow anonymous logins
 // Configure the FTP server
 services.Configure<FtpServerOptions>(opt =>
 {
-    opt.ServerAddress = "127.0.0.1";
+    opt.ServerAddress = config.Ip;
-    opt.Port = 9527;
+    opt.Port = config.Port;
 });
 // Build the service provider
@@ -35,13 +56,13 @@ using (var serviceProvider = services.BuildServiceProvider())
 {
    Log.Information("开始运行FTP服务");
-    Directory.CreateDirectory("Test");
+    Directory.CreateDirectory(config.Dir);
    // Initialize the FTP server
    var ftpServerHost = serviceProvider.GetRequiredService<IFtpServerHost>();
    // 设置文件系统监控器
-    var watcher = new FileSystemWatcher("Test");
+    var watcher = new FileSystemWatcher(config.Dir);
    // 监控的文件类型
    watcher.Filter = "*.*";
    // 添加事件处理器
@@ -52,7 +73,7 @@ using (var serviceProvider = services.BuildServiceProvider())
    watcher.EnableRaisingEvents = true;
    // Start the FTP server
    await ftpServerHost.StartAsync(CancellationToken.None);
-    Console.WriteLine("输入q退出");
+    Log.Information("输入q退出");
    while (Console.ReadKey().Key != ConsoleKey.Q)
    {
@@ -79,7 +100,17 @@ async void Watcher_Changed(object sender, FileSystemEventArgs e)
    if (Path.GetExtension(e.Name) == ".jpg")
    {
        Log.Information("{Name} 文件转发到服务器", e.Name);
-        OcrRequest result = new OcrRequest(e.FullPath);
+        OcrRequest result = new OcrRequest(e.FullPath)
+        {
+            deviceNo = config.DeviceNo,
+            customerName = config.CustomerName,
+            ocrType = config.OcrType,
+            orderNo = config.OrderNo,
+            orderType = config.OrderType,
+            photoMode = config.PhotoMode,
+            secret = config.Secret,
+            tenantId = config.TenantId,
+        };
        await OcrServer.UploadFile(result);
    }
    FileChangeCnt.Remove(e.Name);

--- a/FtpAgent/Respond.cs
+++ b/FtpAgent/Respond.cs
 // See https://aka.ms/new-console-template for more information
-public partial class OcrServer
+namespace FtpAgent
 {
-    public record Respond<T> where T: class
+    public record Respond<T> where T : class
    {
        public Respond(int code, string msg, T data)
        {
@@ -33,6 +34,6 @@ public partial class OcrServer
        /// <summary>
        /// 异常信息
        /// </summary>
-        public string ?detail { get; set; }
+        public string? detail { get; set; }
    }
 }
\ No newline at end of file
--- a/FtpAgent/config.ini
+++ b/FtpAgent/config.ini
+[OCR]
+customerName=无境创新
+deviceNo=CS
+ocrType=4
+orderNo=1
+orderType=1
+photoMode=1
+secret=knz2r23rdhnbnhc7zr9b9ux7evkvzvdm
+tenantId=0
+OCR_SERVER_URL=https://hardware-test.guke.tech
+OCR_API_URL=/api/service/ocr/v2/recognize
+Ip=127.0.0.1
+Port=9527
+DIR=Image
\ No newline at end of file