From 2e54b439c64e0adbb7e010243c1f33aa5fc5f503 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 11 三月 2025 14:08:57 +0800
Subject: [PATCH] 完善程序; Merge branch 'master' of http://58.211.88.246:3600/r/WPF/WPFProject

---
 HMI.Core/Util/PathHelper.cs |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/HMI.Core/Util/PathHelper.cs b/HMI.Core/Util/PathHelper.cs
index be757b0..50f2b09 100644
--- a/HMI.Core/Util/PathHelper.cs
+++ b/HMI.Core/Util/PathHelper.cs
@@ -10,6 +10,8 @@
         public static string ConfigFolder { get; private set; }
         public static string DatabaseFolder { get; private set; }
         public static string DatabasePath { get; private set; }
+        public static string LangFolder { get; private set; }
+        public static string SettingFolder { get; private set; }
 
         /// <summary>
         /// 搴旂敤绋嬪簭鐨勬牴鐩綍
@@ -17,19 +19,15 @@
         /// <returns></returns>
         private static string RootPath()
         {
-            string DllPath = DllHelper.GetAssemblyPath();
+            string DllPath = AppDomain.CurrentDomain.BaseDirectory;
             string path = Path.GetFullPath(".");
             IconFolder = InitFolder(path + "\\Icon");
             ConfigFolder = InitFolder(path + "\\Config");
             DatabaseFolder = InitFolder(ConfigFolder + "\\Database");
             DatabasePath = DatabaseFolder + "\\database.db";
+            LangFolder = InitFolder(path + "\\Lang");
+            SettingFolder = InitFolder(ConfigFolder + "\\SystemSetting");
             return path;
-        }
-
-        public static string SettingFolder()
-        {
-            string Path = RootPath() + "\\Config\\Setting";
-            return Path;
         }
 
         /// <summary>

--
Gitblit v1.9.1