From 8c6e292c508312eca0aef4c203e5857c4fc3094c Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期六, 07 九月 2024 09:18:39 +0800
Subject: [PATCH] Merge branch 'master' into Liudl

---
 Wms/Wms/appsettings.json |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/Wms/Wms/appsettings.json b/Wms/Wms/appsettings.json
index 078b114..b1357b1 100644
--- a/Wms/Wms/appsettings.json
+++ b/Wms/Wms/appsettings.json
@@ -11,7 +11,8 @@
     //"ConnectionString": "Server=47.95.120.93;Database=WMS_JC09;User ID=sa;password=boxline!@#; Integrated Security=True;",
     //"ConnectionString": "Server=47.95.120.53;Database=WMS_JC09;User ID=sa;Password=boxline!@#;Integrated Security=False;",
     //"ConnectionString": "Server=192.168.62.106;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;",
-    "ConnectionString": "Server=192.168.62.200;Database=WMS_JC23;User ID=sa;Password=sql2019;Integrated Security=False;"
+    //"ConnectionString": "Server=192.168.62.200;Database=WMS_JC26;User ID=sa;Password=sql2019;Integrated Security=False;",
+    "ConnectionString": "Server=192.168.62.200;Database=WMS_JC26;User ID=sa;Password=sql2019;Integrated Security=False;"
     //"ConnectionString": "Server=.;Database=WMS_JC09;User ID=sa;Password=sql2019;Integrated Security=False;"
     //"ConnectionString": "Data Source=DESKTOP-0EJDG95\\MSSQLSERVER1;Initial Catalog=WMS_V01;Integrated Security=True;"
   },
@@ -36,5 +37,18 @@
 
     "EditLocateUrl": "/api/WCSApi/EditLocatStatus" //鍚屾淇敼鍌ㄤ綅淇℃伅
 
+  },
+  "SignConfig": {
+    "ERPAppKey": "90170307d4184844ac2a26b431f79980", //ERP楠岀
+    "MESAppKey": "90170307d4184844ac2a26b431f79981", //MES楠岀
+    "LIMSAppKey": "90170307d4184844ac2a26b431f79982", //LIMS楠岀
+    "FuMaAppKey": "90170307d4184844ac2a26b431f79983", //FuMa楠岀
+    "Minutes": 5 //楠岀鏃堕棿 5鍒嗛挓
+  },
+  "Quartz": {
+    "dbProviderName": "SqlServer",
+    "connectionString": "Server=192.168.62.200;Database=QRTZ;User ID=sa;Password=sql2019;Integrated Security=False;"
   }
+
+
 }

--
Gitblit v1.8.0