Merge branch 'master' of http://git.51dayu.com.cn/diamond-cut/SparkClient

5 months ago · ece44475d1
parent ddc8fb73c4 079bc692e4
commit ece44475d1
6 changed files with 29 additions and 16 deletions
--- a/App.config
+++ b/App.config
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <appSettings>
+        <!-- 切工仪URL -->
+        <!-- <add key="BaseUrl" value="http://localhost:5000/api/SoC"/> -->
+        <add key="BaseUrl" value="http://192.168.3.100:8080"/>
+        <!-- SOC下载图片目录 -->
+        <add key="ImageFileBasePath" value="D:\\diamond_images"/>
+        <!-- 算法失败时，历史图片保存文件夹路径 -->
+        <add key="ImageHistoryPath" value="D:\\ImageHistory"/>
+    </appSettings>
+    <connectionStrings>
+        <add name="" connectionString=""/>
+    </connectionStrings>
+</configuration>
--- a/Model/Services/AlgorithmServer.cs
+++ b/Model/Services/AlgorithmServer.cs
@ -7,6 +7,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SparkClient.Model.Entity.ApiEntity;
 using SparkClient.Model.Helper;
+using System.Configuration;

 namespace SparkClient.Model.Services
 {
@ -39,8 +40,8 @@ namespace SparkClient.Model.Services
                string algo_config = lightLevelValue.ToString() ?? throw new InvalidOperationException();
                
                //图片根目录
-                string image_file_base_path = "D:\\diamond_images";
-                
+                string? image_file_base_path = ConfigurationManager.AppSettings["ImageFileBasePath"];
+
                // 将所有变量拼接成一个 JSON 对象
                JObject jsonData = new JObject(
                    new JProperty("shape", shape),
@ -86,9 +87,10 @@ namespace SparkClient.Model.Services

                // 算法调用失败时，保存图片到历史记录文件夹
                if (result.status == "P002")
-                {
+                { 
+                    // 从配置文件中读取 imageHistoryPath
                    // 定义历史记录文件夹路径
-                    string imageHistoryPath = "D:\\ImageHistory";
+                    string? imageHistoryPath = ConfigurationManager.AppSettings["ImageHistoryPath"];
                    // 生成时间戳，格式为 yyyyMMddHHmmss
                    string timestamp = DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss");
                    // 组合新的文件夹路径
@ -143,7 +145,6 @@ namespace SparkClient.Model.Services
                    catch (JsonException ex)
                    {
                        // 记录日志或处理异常
-                        Console.WriteLine($"Error parsing image_files JSON: {ex.Message}");
                        Logger.Error($"Error parsing image_files JSON: {ex.Message}");
                        Logger.Error($"Stack Trace: {ex.StackTrace}");
                    }
@ -155,15 +156,11 @@ namespace SparkClient.Model.Services
            catch (Exception ex)
            {
                // 记录日志或处理异常
-                Console.WriteLine($"Error in CallParseJsonAndReturnActions: {ex.Message}");
-                Console.WriteLine($"Stack Trace: {ex.StackTrace}");
                Logger.Error($"Error in CallParseJsonAndReturnActions: {ex.Message}");
                Logger.Error($"Stack Trace: {ex.StackTrace}");
                // 如果有 InnerException，打印出来
                if (ex.InnerException != null)
                {
-                    Console.WriteLine($"Inner Exception: {ex.InnerException.Message}");
-                    Console.WriteLine($"Inner Stack Trace: {ex.InnerException.StackTrace}");
                    Logger.Error($"Inner Exception: {ex.InnerException.Message}");
                    Logger.Error($"Inner Stack Trace: {ex.InnerException.StackTrace}");
                }
--- a/Model/Services/SOCClientService.cs
+++ b/Model/Services/SOCClientService.cs
@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using System;
+using System.Configuration;
 using System.Data;
 using System.IO;
 using System.Net.Http;
@ -27,7 +28,7 @@ namespace SparkClient.Model.Services
        /// <summary>
        /// 基础URL，用于构建完整的API请求地址。
        /// </summary>
-        private readonly string _baseUrl;
+        private readonly string? _baseUrl;

        /// <summary>
        /// 认证令牌，用于HTTP请求的认证。
@ -40,7 +41,7 @@ namespace SparkClient.Model.Services
        public SOCClientService()
        {
            //_baseUrl = "http://192.168.3.100:8080";
-            _baseUrl = "http://localhost:5000/api/SoC";
+            _baseUrl = ConfigurationManager.AppSettings["BaseUrl"];
            _authToken = "your_basic_auth_token";
        }

@ -127,7 +128,7 @@ namespace SparkClient.Model.Services
        /// </summary>
        /// <param name="savePath">保存图片路径</param>
        /// <returns>图片的字节数组</returns>
-        public async Task<List<string>> RetrieveImageAsync(string savePath)
+        public async Task<List<string>> RetrieveImageAsync(string? savePath)
        {
            List<string> imageNames = new List<string>();
            // 读取图片接口
@ -170,7 +171,6 @@ namespace SparkClient.Model.Services
                            return imageNames;
                        default:
                            // 其他状态码，记录警告并继续
-                            Console.WriteLine($"Unexpected status code: {status} for URL: {url}");
                            Logger.Warn($"Unexpected status code: {status} for URL: {url}");
                            imageIndex++;
                            break;
@ -179,7 +179,6 @@ namespace SparkClient.Model.Services
                catch (HttpRequestException ex)
                {
                    // 捕获HTTP请求异常并记录错误信息
-                    Console.WriteLine($"HTTP request failed for URL: {url}, Exception: {ex.Message}");
                    Logger.Error($"HTTP request failed for URL: {url}, Exception: {ex.Message}");
                    imageNames.Clear();
                    return imageNames;
@ -187,7 +186,6 @@ namespace SparkClient.Model.Services
                catch (Exception ex)
                {
                    // 捕获其他异常并记录错误信息，结束循环
-                    Console.WriteLine($"An unexpected error occurred for URL: {url}, Exception: {ex.Message}");
                    Logger.Error($"An unexpected error occurred for URL: {url}, Exception: {ex.Message}");
                    imageNames.Clear();
                    return imageNames;
@ -239,7 +237,7 @@ namespace SparkClient.Model.Services
            try
            {
                // SOC接口
-                string savePath = @"d:\diamond_images";
+                string? savePath = ConfigurationManager.AppSettings["ImageFileBasePath"];
                // 清理 savePath 文件夹
                if (Directory.Exists(savePath))
                {
--- a/SparkClient.csproj
+++ b/SparkClient.csproj
@ -18,6 +18,7 @@
      <PackageReference Include="HelixToolkit.Wpf.SharpDX" Version="2.25.0" />
      <PackageReference Include="log4net" Version="3.0.3" />
      <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
      <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
      <PackageReference Include="NPOI" Version="2.7.2" />
--- a/SparkClient.sln.DotSettings.user
+++ b/SparkClient.sln.DotSettings.user
@ -6,8 +6,10 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AButton_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F6412d4331611499aab4eb63809a2a83bf60910_003F94_003F46375460_003FButton_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AButton_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F89a2b53da2e32f22f450ecab5f59ea9f03bfe76b409627069931a786fcee_003FButton_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AClrObjectRuntime_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fab21534b1ec041498b3c23a65e9ed82b15a918_003F19_003F3f4e517b_003FClrObjectRuntime_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AConfigurationManager_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4855f825db5f4f469faf36f45940559e106918_003Fff_003Fb357c8b2_003FConfigurationManager_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AContentControl_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F27bb3fae2c21cbe9a2565477feaa7a5b3a19cd779b4a91a98edfff9cd468972_003FContentControl_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADependencyObject_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F60b63c019ead4a238340b47a1c0010d5226910_003Fca_003F09e9dbc0_003FDependencyObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADispatcherOperation_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F60b63c019ead4a238340b47a1c0010d5226910_003Fd8_003F13c94a2a_003FDispatcherOperation_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADispatcherOperation_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F60b63c019ead4a238340b47a1c0010d5226910_003Fd8_003F13c94a2a_003FDispatcherOperation_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADispatcher_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F60b63c019ead4a238340b47a1c0010d5226910_003Ff6_003F1c45f799_003FDispatcher_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADispatcher_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F60b63c019ead4a238340b47a1c0010d5226910_003Ff6_003F1c45f799_003FDispatcher_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
--- a/SparkDB.db
+++ b/SparkDB.db