From 3665d6ab60f25c79cc0eba2ea754b310c37992c0 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期二, 11 十一月 2025 11:20:36 +0800
Subject: [PATCH] 首页
---
HTML/js/public.js | 16 +++++--
Wms/Wms/appsettings.json | 11 ++++-
HTML/.vscode/settings.json | 3 +
Pda/js/public.js | 18 ++++++---
Wms/Wms/Startup.cs | 18 ++++----
5 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/HTML/.vscode/settings.json b/HTML/.vscode/settings.json
index 155422b..f623fbd 100644
--- a/HTML/.vscode/settings.json
+++ b/HTML/.vscode/settings.json
@@ -1,3 +1,4 @@
{
- "liveServer.settings.port": 5503
+ "liveServer.settings.port": 5503,
+ "editor.wordWrap": "on"
}
\ No newline at end of file
diff --git a/HTML/js/public.js b/HTML/js/public.js
index ff31e00..480c11d 100644
--- a/HTML/js/public.js
+++ b/HTML/js/public.js
@@ -1,12 +1,18 @@
//var IP = "http://47.104.149.73:1991";//鎺ュ彛IP
-// var IP = "http://172.16.71.101:8082/";//鎺ュ彛IP
+//var IP = "http://172.16.71.101:8082/";//鎺ュ彛IP
//var IP = "http://localhost:13243/api";
-//var IP = "http://localhost:50515/api"; //鏈湴
-var IP="https://localhost:44363/api";
-// var IP = "http://localhost:44318/api";
+//var IP = "http://localhost:50515/api";//鏈湴
+//var IP = "http://localhost:44318/api";
//var IP = "http://192.168.1.6:8017";
//var IP = "http://192.168.1.226:8086";
-// var IP = "http://192.168.62.200:8888/api"; //bkl鏈嶅姟鍣�
+//var IP = "http://192.168.62.200:8888/api";//bkl鏈嶅姟鍣�
+//杩愯
+//var IP="https://localhost:44363/api";
+//鏈湴鍙戝竷
+var IP="http://localhost:8034/api";
+
+
+
var pageCnt = 15;
var pageLimits = [10, 15, 20, 30, 50, 70, 100];
diff --git a/Pda/js/public.js b/Pda/js/public.js
index 9f55680..1abbbf9 100644
--- a/Pda/js/public.js
+++ b/Pda/js/public.js
@@ -1,12 +1,18 @@
-// var IP = "http://47.104.149.73:1991";//鎺ュ彛IP
-// var IP = "https://localhost:44368";
+//var IP = "http://47.104.149.73:1991";//鎺ュ彛IP
+//var IP = "https://localhost:44368";
//var IP = "http://localhost:13243/api";
//var IP = "http://localhost:50515/api";
-var IP = "https://localhost:44363/api";
//var IP = "http://192.168.1.2:8017/";
-// var IP = "http://192.168.10.112/WmsService/";
-// var IP = "http://192.168.1.226:8086";
-// var IP = "http://192.168.62.200:8888/api";
+//var IP = "http://192.168.10.112/WmsService/";
+//var IP = "http://192.168.1.226:8086";
+//var IP = "http://192.168.62.200:8888/api";
+//杩愯
+//var IP = "https://localhost:44363/api";
+//鏈湴鍙戝竷
+var IP = "http://localhost:8034/api";
+
+
+
jQuery.support.cors = true;
function sendData(url, data, type, callbackFun) {
// callbackFun("{}");
diff --git a/Wms/Wms/Startup.cs b/Wms/Wms/Startup.cs
index ce3d236..e0300b4 100644
--- a/Wms/Wms/Startup.cs
+++ b/Wms/Wms/Startup.cs
@@ -152,16 +152,16 @@
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
- if (env.IsDevelopment())
+ //if (env.IsDevelopment())
+ //{
+ app.UseDeveloperExceptionPage();
+ app.UseSwagger();
+ app.UseSwaggerUI(c =>
{
- app.UseDeveloperExceptionPage();
- app.UseSwagger();
- app.UseSwaggerUI(c =>
- {
- c.SwaggerEndpoint("/swagger/v1/swagger.json", "WebApiDemo v1");
- c.RoutePrefix = string.Empty;
- });
- }
+ c.SwaggerEndpoint("/swagger/v1/swagger.json", "WebApiDemo v1");
+ c.RoutePrefix = string.Empty;
+ });
+ //}
//全局返回规范
//app.UseApiResponse();//弃用 改用Filter [ServiceFilter(typeof(ApiResponseActionFilter))]
diff --git a/Wms/Wms/appsettings.json b/Wms/Wms/appsettings.json
index 06c2dc9..00d8855 100644
--- a/Wms/Wms/appsettings.json
+++ b/Wms/Wms/appsettings.json
@@ -15,7 +15,9 @@
//"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;"
+ //"ConnectionString": "Server=.\\MSSQLSERVER2019;Database=WMS_JC34;User ID=sa;Password=admin2023@;Integrated Security=False;",
+ //鏈湴鍦板潃
+ "ConnectionString": "Server=localhost;Database=WMS_JC34;User ID=sa;Password=root1234;Integrated Security=False;"
},
"JWTConfig": {
"Issuer": "WYY", //Token
@@ -25,7 +27,8 @@
},
"ApiUrlConfig": {
"ErpHost": "http://172.16.68.156:50000", //erpIP
- "WcsHost": "http://10.26.254.34:5005", //wcsIPhttp://localhost:57061/
+ //"WcsHost": "http://10.26.254.34:5005", //wcsIPhttp://localhost:57061/
+ "WcsHost": "http://localhost:9034", //wcsIPhttp://localhost:57061/
"BoxHost": "http://10.110.24.30:8081", //boxIP
"LimesHost": "http://10.110.24.30:8081", //LimesIP
@@ -51,7 +54,9 @@
},
"Quartz": {
"dbProviderName": "SqlServer",
- "ConnectionString": "Server=.\\MSSQLSERVER2019;Database=QRTZ;User ID=sa;Password=admin2023@;Integrated Security=False;"
+ //"ConnectionString": "Server=.\\MSSQLSERVER2019;Database=QRTZ;User ID=sa;Password=admin2023@;Integrated Security=False;"
+ //鏈湴鍦板潃
+ "ConnectionString": "Server=localhost;Database=WMS_JC34QRTZ;User ID=sa;Password=root1234;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