From 5cc2603759e01ca9c3d95d4c0edfa6377373f455 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 05 十一月 2025 16:57:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

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

diff --git a/Wms/Wms/appsettings.json b/Wms/Wms/appsettings.json
index 715247a..06c2dc9 100644
--- a/Wms/Wms/appsettings.json
+++ b/Wms/Wms/appsettings.json
@@ -11,32 +11,36 @@
     //"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=10.26.200.29;Database=WMS_JC34;User ID=sa;Password=boxline@2016;Integrated Security=False;",
+    //"ConnectionString": "Server=10.26.200.29;Database=WMS_JC34;User ID=sa;Password=boxline@2016;Integrated Security=False;",
     //"ConnectionString": "Server=192.168.62.200;Database=WMS_JC34;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;"
+    "ConnectionString": "Server=.\\MSSQLSERVER2019;Database=WMS_JC34;User ID=sa;Password=admin2023@;Integrated Security=False;"
   },
   "JWTConfig": {
-    "Issuer": "WYY", //Token锟斤拷锟斤拷锟斤拷
-    "Audience": "EveryTestOne", //Token锟斤拷锟斤拷锟斤拷
-    "IssuerSigningKey": "WYY&YL889455200Sily", //锟斤拷钥锟斤拷锟皆癸拷锟斤拷锟斤拷锟斤拷锟斤拷锟较可碉拷token锟斤拷签锟斤拷锟斤拷钥锟斤拷锟斤拷锟斤拷锟斤拷16
-    "AccessTokenExpiresMinutes": "600" //锟斤拷锟斤拷时锟斤拷 锟斤拷锟斤拷
+    "Issuer": "WYY", //Token      
+    "Audience": "EveryTestOne", //Token      
+    "IssuerSigningKey": "WYY&YL889455200Sily", //  钥   怨          峡傻 token  签    钥        16
+    "AccessTokenExpiresMinutes": "600" //    时       
   },
   "ApiUrlConfig": {
-    "ErpHost": "http://10.110.24.30:8081", //erpIP
+    "ErpHost": "http://172.16.68.156:50000", //erpIP
     "WcsHost": "http://10.26.254.34:5005", //wcsIPhttp://localhost:57061/
     "BoxHost": "http://10.110.24.30:8081", //boxIP
+    "LimesHost": "http://10.110.24.30:8081", //LimesIP
 
     "IssueComApiUrl": "/api/openApi/wcsTasks", //涓嬪彂鍛戒护(鍑哄簱銆佺Щ搴�)
     "IssueComApiUrl2": "/api/openApi/wcsTask", //閲嶆柊涓嬪彂鍛戒护(鍑哄簱銆佺Щ搴�)
 
-    "AsnFinishUrl": "/api/wmsInterface/OutStockTask", //鍏ュ簱璁㈠崟鍏抽棴
-    "SoFinishUrl": "/api/wmsInterface/OutStockTask", //鍑哄簱璁㈠崟鍏抽棴
+    "AsnFinishUrl": "/RESTAdapter/BKWMS/RKHC", //鍏ュ簱璁㈠崟鍏抽棴
+    "SoFinishUrl": "/RESTAdapter/BKWMS/CKHC", //鍑哄簱璁㈠崟鍏抽棴
+    "SoFinishUrl2": "/RESTAdapter/BKWMS/CKHC", //鎶芥鍑哄簱璁㈠崟鍏抽棴
     "DataChangeUrl": "/api/wmsInterface/OutStockTask", //搴撳瓨鍙樻洿鍥炰紶
     "GetBoxUrl": "/api/wmsInterface/OutStockTask", //鑾峰彇绠辩爜淇℃伅
 
-    "EditLocateUrl": "/api/WCSApi/EditLocatStatus" //鍚屾淇敼鍌ㄤ綅淇℃伅
+    "EditLocateUrl": "/api/WCSApi/EditLocatStatus", //鍚屾淇敼鍌ㄤ綅淇℃伅
 
+    "SendInspection": "" //鍙戣捣璐ㄦLIMES
   },
   "SignConfig": {
     "ERPAppKey": "90170307d4184844ac2a26b431f79980", //ERP楠岀
@@ -47,8 +51,9 @@
   },
   "Quartz": {
     "dbProviderName": "SqlServer",
-    //"connectionString": "Server=192.168.62.200;Database=WMS_JC34QRTZ;User ID=sa;Password=sql2019;Integrated Security=False;",
-    "connectionString": "Server=10.26.200.29;Database=WMS_JC34QRTZ;User ID=sa;Password=boxline@2016;Integrated Security=False;"
+    "ConnectionString": "Server=.\\MSSQLSERVER2019;Database=QRTZ;User ID=sa;Password=admin2023@;Integrated Security=False;"
+    //"connectionString": "Server=192.168.62.200;Database=WMS_JC34QRTZ;User ID=sa;Password=sql2019;Integrated Security=False;"
+    //"connectionString": "Server=10.26.200.29;Database=WMS_JC34QRTZ;User ID=sa;Password=boxline@2016;Integrated Security=False;"
   }
 
 

--
Gitblit v1.8.0