From 2825a847991f4f01d4d253affc2c56d8f33a1854 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 5 Apr 2023 16:44:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BD=91=E5=85=B3=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Win_in.Sfs.Auth.Web/appsettings.json | 28 ++----------------- .../src/Win_in.Sfs.Auth.Web/package.json | 2 +- .../Win_in.Sfs.Basedata.HttpApi.Host.csproj | 11 -------- .../appsettings.json | 8 ++---- .../Win_in.Sfs.Core.Host/appsettings.json | 8 ++---- .../appsettings.json | 8 ++---- .../appsettings.json | 8 ++---- .../Win_in.Sfs.Wms.Pda.Host.csproj | 1 + .../Win_in.Sfs.Wms.Pda.Host/appsettings.json | 8 ++---- 9 files changed, 14 insertions(+), 68 deletions(-) diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json index d2ed45fca..8a93db331 100644 --- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json +++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json @@ -1,30 +1,6 @@ { - "AgileConfig": { - "appId": "sfs", - "secret": "sfs", - "nodes": "http://config:8848", - "env": "prod" - }, - "ReverseProxy": { - "Routes": { - "ids4": { - "ClusterId": "ids4cluster", - "Match": { - "Path": "/api/connect/{**catch-all}" - }, - "Transforms": [ { "PathRemovePrefix": "/api" } ] - } - }, - "Clusters": { - "ids4cluster": { - "Destinations": { - "default": { - "Address": "http://localhost:59093/" - } - } - } - } - }, + "ConfigServer": "http://localhost:21093", + "ConfigServer.Docker": "http://gateway:21093", "ConnectionStrings": { "Default": "Server=dev.ccwin-in.com,21195;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;", "Auth": "Server=dev.ccwin-in.com,21195;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;" diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/package.json b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/package.json index 870e700a7..96f6395a5 100644 --- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/package.json +++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/package.json @@ -5,4 +5,4 @@ "dependencies": { "@abp/aspnetcore.mvc.ui.theme.basic": "^4.4.2" } -} \ No newline at end of file +} diff --git a/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/Win_in.Sfs.Basedata.HttpApi.Host.csproj b/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/Win_in.Sfs.Basedata.HttpApi.Host.csproj index abafefdaf..8fd3126bf 100644 --- a/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/Win_in.Sfs.Basedata.HttpApi.Host.csproj +++ b/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/Win_in.Sfs.Basedata.HttpApi.Host.csproj @@ -36,15 +36,4 @@ - - - all - runtime; build; native; contentfiles; analyzers - - - - - - - diff --git a/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/appsettings.json b/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/appsettings.json index 8456a816a..fc30b6483 100644 --- a/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/appsettings.json +++ b/be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/appsettings.json @@ -1,10 +1,6 @@ { - "AgileConfig": { - "appId": "sfs", - "secret": "sfs", - "nodes": "http://config:8848", - "env": "prod" - }, + "ConfigServer": "http://localhost:21093", + "ConfigServer.Docker": "http://gateway:21093", "ConnectionStrings": { "Default": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;", "Auth": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;" diff --git a/be/Hosts/Core.Host/Win_in.Sfs.Core.Host/appsettings.json b/be/Hosts/Core.Host/Win_in.Sfs.Core.Host/appsettings.json index 8456a816a..fc30b6483 100644 --- a/be/Hosts/Core.Host/Win_in.Sfs.Core.Host/appsettings.json +++ b/be/Hosts/Core.Host/Win_in.Sfs.Core.Host/appsettings.json @@ -1,10 +1,6 @@ { - "AgileConfig": { - "appId": "sfs", - "secret": "sfs", - "nodes": "http://config:8848", - "env": "prod" - }, + "ConfigServer": "http://localhost:21093", + "ConfigServer.Docker": "http://gateway:21093", "ConnectionStrings": { "Default": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;", "Auth": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;" diff --git a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/appsettings.json b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/appsettings.json index 37d0d28ba..5795dff80 100644 --- a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/appsettings.json +++ b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/appsettings.json @@ -1,8 +1,4 @@ { - "AgileConfig": { - "appId": "sfs", - "secret": "sfs", - "nodes": "http://config:8848", - "env": "prod" - } + "ConfigServer": "http://localhost:21093", + "ConfigServer.Docker": "http://gateway:21093" } diff --git a/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/appsettings.json b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/appsettings.json index 8456a816a..fc30b6483 100644 --- a/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/appsettings.json +++ b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/appsettings.json @@ -1,10 +1,6 @@ { - "AgileConfig": { - "appId": "sfs", - "secret": "sfs", - "nodes": "http://config:8848", - "env": "prod" - }, + "ConfigServer": "http://localhost:21093", + "ConfigServer.Docker": "http://gateway:21093", "ConnectionStrings": { "Default": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;", "Auth": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;" diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Win_in.Sfs.Wms.Pda.Host.csproj b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Win_in.Sfs.Wms.Pda.Host.csproj index 75ae27d26..2dfa5179b 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Win_in.Sfs.Wms.Pda.Host.csproj +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Win_in.Sfs.Wms.Pda.Host.csproj @@ -28,6 +28,7 @@ + diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.json b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.json index 37d0d28ba..5795dff80 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.json +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.json @@ -1,8 +1,4 @@ { - "AgileConfig": { - "appId": "sfs", - "secret": "sfs", - "nodes": "http://config:8848", - "env": "prod" - } + "ConfigServer": "http://localhost:21093", + "ConfigServer.Docker": "http://gateway:21093" }