From 9122bca201d907726953e452b0cc9caa212a9b81 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 15 八月 2025 14:29:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/App.config |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 37df7e4..973ebc5 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -21,13 +21,31 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
   </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <probing privatePath="x86" />
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
   <appSettings>
-    <add key="WebApiUrl" value="http://localhost:5263/" />
+    <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+    <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
+    <add key="WebApiUrl" value="http://192.168.1.145:81/" />
     <add key="LogPath" value="logs" />
-    <add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
+    <add key="ProductName" value="G-MES V2.0" />
     <add key="PageSize" value="50" />
-    <add key="Version" value="3.0" />
-    <add key="AutoUpdaterXml" value="https://dianbei.top/AutoUpdater/AutoUpdater.xml" />
+    <add key="Version" value="0.1" />
+    <add key="IsAutoUpdater" value="0" />
+    <add key="AutoUpdaterXml" value="http://192.168.1.145:86/AutoUpdater/AutoUpdater.xml" />
+    <add key="ToastSeconds" value="5" />
+	<add key="AsyncSeconds" value="2" />
   </appSettings>
   <userSettings>
     <Gs.DevApp.Properties.Settings>
@@ -40,8 +58,11 @@
       <setting name="remember" serializeAs="String">
         <value>False</value>
       </setting>
-      <setting name="orgGuid" serializeAs="String">
-        <value />
+      <setting name="fontSizeName" serializeAs="String">
+        <value>瀹嬩綋,10</value>
+      </setting>
+      <setting name="isWeight" serializeAs="String">
+        <value>False</value>
       </setting>
     </Gs.DevApp.Properties.Settings>
   </userSettings>

--
Gitblit v1.9.3