From adf7d885af8d016baa6f5e21b85046e1722fcf75 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GPE37UV\\THINKAPD" <tw919@qq.com>
Date: Sat, 15 Apr 2023 13:43:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3shortid.dll=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E3=80=82=20=E4=BF=AE=E6=AD=A3ModuleDataMonit?=
 =?UTF-8?q?or=E5=9C=A8BaseApp=E4=B8=AD=E8=A2=AB=E5=B1=8F=E8=94=BD=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AF=BC=E8=87=B4UI=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=8E=B7=E5=8F=96=E6=A8=A1=E7=BB=84Slot=E4=B8=ADWafer?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dependencies/shortid.dll                      | Bin 0 -> 9216 bytes
 .../ClientBase/BaseApp.cs                     |  28 +++++++++---------
 Sicentury.Core/Sicentury.Core.csproj          |   5 ++--
 3 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 Dependencies/shortid.dll

diff --git a/Dependencies/shortid.dll b/Dependencies/shortid.dll
new file mode 100644
index 0000000000000000000000000000000000000000..12f8a7b801e3f1d8995e81eb7e06cfb7938b36c9
GIT binary patch
literal 9216
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
I8|;Dq0>_?sUH||9

literal 0
HcmV?d00001

diff --git a/MECF.Framework.UI.Client/ClientBase/BaseApp.cs b/MECF.Framework.UI.Client/ClientBase/BaseApp.cs
index 82d1426..068b9d5 100644
--- a/MECF.Framework.UI.Client/ClientBase/BaseApp.cs
+++ b/MECF.Framework.UI.Client/ClientBase/BaseApp.cs
@@ -34,24 +34,24 @@ namespace MECF.Framework.UI.Client.ClientBase
 
         public BaseApp()
         {
-            this.UserMode = UserMode.None;
-            this.Initialized = false;
+            UserMode = UserMode.None;
+            Initialized = false;
  
-            this.Configure();
+            Configure();
         }
 
         public void Initialize(bool force = false)
         {
-            if (this.Initialized && !force)
+            if (Initialized && !force)
                 return;
 
-            this.MenuLoader = new MenuLoader(Path.Combine(PathManager.GetCfgDir(), "Menu.xml"));
+            MenuLoader = new MenuLoader(Path.Combine(PathManager.GetCfgDir(), "Menu.xml"));
              
-            this.MenuLoader.Load();
+            MenuLoader.Load();
 
-            this.MenuManager = new MenuManager();
+            MenuManager = new MenuManager();
 
-            this.UserContext = new UserContext();
+            UserContext = new UserContext();
 
             var file = string.Format("{0}MECF.Framework.UI.Client.dll", System.AppDomain.CurrentDomain.BaseDirectory);
             if (File.Exists(file))
@@ -60,13 +60,13 @@ namespace MECF.Framework.UI.Client.ClientBase
                 AssemblySource.Instance.Add(assembly);
             }
 
-            this.OnInitialize();
+            OnInitialize();
 
             //must be called after specific project initialized
-            //_dataMonitor = new ModuleDataMonitor();
+            _dataMonitor = new ModuleDataMonitor();
  
 
-            this.Initialized = true;
+            Initialized = true;
         }
 
         public virtual void Dispose()
@@ -77,7 +77,7 @@ namespace MECF.Framework.UI.Client.ClientBase
         protected void Configure()
         {
             //config skin/language...
-            this.OnConfiguration();
+            OnConfiguration();
  
         }
 
@@ -88,9 +88,9 @@ namespace MECF.Framework.UI.Client.ClientBase
         public int GetPermission(string menuid)
         {
             int per = 1;
-            if (this.UserContext != null)
+            if (UserContext != null)
             {
-                string[] list = this.UserContext.Role.MenuPermission.Split(';');
+                string[] list = UserContext.Role.MenuPermission.Split(';');
                 var result = from r in list
                              where r.Split(',')[0] == menuid
                              select r;
diff --git a/Sicentury.Core/Sicentury.Core.csproj b/Sicentury.Core/Sicentury.Core.csproj
index 3a31ba8..c84a98d 100644
--- a/Sicentury.Core/Sicentury.Core.csproj
+++ b/Sicentury.Core/Sicentury.Core.csproj
@@ -38,8 +38,9 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="shortid">
-      <HintPath>..\ThirdParty\dlls\shortid.dll</HintPath>
+    <Reference Include="shortid, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Dependencies\shortid.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />