From 32e0a92a0c603db872d56739299cb7f603b23dd1 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 12 九月 2025 17:31:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/App.config | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 199f753..548e44c 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -34,14 +34,9 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
- <connectionStrings>
- <!--鏂扮粶V2鏁版嵁搴�-->
- <add name="conn" connectionString="RGF0YSBTb3VyY2U9MTkyLjE2OC4xLjQ7SW5pdGlhbCBDYXRhbG9nPVNOTUVTO1VzZXIgSWQ9c2M7UGFzc3dvcmQ9bWVzQDEyMztQb29saW5nPUZhbHNlO1Bvb2xpbmc9dHJ1ZTtNaW4gUG9vbCBTaXplPTEwO01heCBQb29sIFNpemU9NTA7Q29ubmVjdCBUaW1lb3V0PTUwMA==" />
- <!--<add name="conn" connectionString="RGF0YSBTb3VyY2U9MTkyLjE2OC4xLjI7SW5pdGlhbCBDYXRhbG9nPVFYX1NOTUVTO1VzZXIgSWQ9c2M7UGFzc3dvcmQ9bWVzQDEyMztQb29saW5nPUZhbHNlO1Bvb2xpbmc9dHJ1ZTtNaW4gUG9vbCBTaXplPTEwO01heCBQb29sIFNpemU9NTA7Q29ubmVjdCBUaW1lb3V0PTUwMA=="/>-->
- </connectionStrings>
-
+
<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" />
@@ -54,7 +49,7 @@
<add key="AsyncSeconds" value="2" /><!--姘存瓒呮椂鏃堕棿-->
<add key="IsWater" value="0" /><!--鏄惁瑕佹按妫�鍙婂伐浣嶇爜-->
<add key="IqcGetWeight" value="3000" /><!--iqc璇荤О閲嶆椂-->
- <add key="TimingMailInterval" value="10000" /><!--iqc绉伴噸鏃跺埛鏂�-->
+ <add key="TimingMailInterval" value="10000" />
</appSettings>
<userSettings>
<Gs.DevApp.Properties.Settings>
--
Gitblit v1.9.3