From 1cd88321aad1dd0696b9d52c9dc37da67a083b56 Mon Sep 17 00:00:00 2001 From: Grady <3392207530@qq.com> Date: Wed, 26 Oct 2022 11:37:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?FIX:=E6=B5=81=E7=A8=8B=E6=8B=89=E9=80=9A,?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=83=A8=E5=88=86=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WorkFlowCore/DynamicForm/DynamicForm.Host/Startup.cs | 2 +- .../DynamicForm/DynamicForm.Host/appsettings.Development.json | 2 +- .../InternalGateway.Host/Properties/launchSettings.json | 2 +- WorkFlowCore/UserOrganization/Organization.Host/Startup.cs | 2 +- .../Organization.Host/appsettings.Development.json | 2 +- WorkFlowCore/Workflow/WorkFlowCore.Host/Startup.cs | 2 +- .../Workflow/WorkFlowCore.Host/appsettings.Development.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/WorkFlowCore/DynamicForm/DynamicForm.Host/Startup.cs b/WorkFlowCore/DynamicForm/DynamicForm.Host/Startup.cs index 215ad4b..e74f970 100644 --- a/WorkFlowCore/DynamicForm/DynamicForm.Host/Startup.cs +++ b/WorkFlowCore/DynamicForm/DynamicForm.Host/Startup.cs @@ -102,7 +102,7 @@ namespace DynamicForm.Host } app.UseCors("defaultcors"); - app.UseHttpsRedirection(); + //app.UseHttpsRedirection(); app.UseRouting(); diff --git a/WorkFlowCore/DynamicForm/DynamicForm.Host/appsettings.Development.json b/WorkFlowCore/DynamicForm/DynamicForm.Host/appsettings.Development.json index 2a1c588..177abf0 100644 --- a/WorkFlowCore/DynamicForm/DynamicForm.Host/appsettings.Development.json +++ b/WorkFlowCore/DynamicForm/DynamicForm.Host/appsettings.Development.json @@ -18,7 +18,7 @@ "Datacenter": "workflow-sample" }, "Service": { - "IP": "${ip}|172.29.160.1", + "IP": "${ip}|localhost", "Port": "${port}|5200", "Name": "${servicename}|dynamicform" }, diff --git a/WorkFlowCore/Gateways/InternalGateway.Host/Properties/launchSettings.json b/WorkFlowCore/Gateways/InternalGateway.Host/Properties/launchSettings.json index 1ecae49..01aad08 100644 --- a/WorkFlowCore/Gateways/InternalGateway.Host/Properties/launchSettings.json +++ b/WorkFlowCore/Gateways/InternalGateway.Host/Properties/launchSettings.json @@ -24,7 +24,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" }, "dotnetRunMessages": "true", - "applicationUrl": "http://localhost:7000" + "applicationUrl": "http://localhost:5400" }, "Docker": { "commandName": "Docker", diff --git a/WorkFlowCore/UserOrganization/Organization.Host/Startup.cs b/WorkFlowCore/UserOrganization/Organization.Host/Startup.cs index b8ff68c..7b20078 100644 --- a/WorkFlowCore/UserOrganization/Organization.Host/Startup.cs +++ b/WorkFlowCore/UserOrganization/Organization.Host/Startup.cs @@ -98,7 +98,7 @@ namespace Organization.Host app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "Organization.Host v1")); } app.UseCors("defaultcors"); - app.UseHttpsRedirection(); + //app.UseHttpsRedirection(); app.UseRouting(); diff --git a/WorkFlowCore/UserOrganization/Organization.Host/appsettings.Development.json b/WorkFlowCore/UserOrganization/Organization.Host/appsettings.Development.json index 6265bb7..9ca7572 100644 --- a/WorkFlowCore/UserOrganization/Organization.Host/appsettings.Development.json +++ b/WorkFlowCore/UserOrganization/Organization.Host/appsettings.Development.json @@ -18,7 +18,7 @@ "Datacenter": "workflow-sample" }, "Service": { - "IP": "${ip}|172.29.160.1", + "IP": "${ip}|localhost", "Port": "${port}|5100", "Name": "${servicename}|organisation" }, diff --git a/WorkFlowCore/Workflow/WorkFlowCore.Host/Startup.cs b/WorkFlowCore/Workflow/WorkFlowCore.Host/Startup.cs index ebbf4e5..7056d92 100644 --- a/WorkFlowCore/Workflow/WorkFlowCore.Host/Startup.cs +++ b/WorkFlowCore/Workflow/WorkFlowCore.Host/Startup.cs @@ -102,7 +102,7 @@ namespace WorkFlowCore.Host app.UseHsts(); } app.UseCors("defaultcors"); - app.UseHttpsRedirection(); + //app.UseHttpsRedirection(); app.UseRouting(); app.UseAuthorization(); diff --git a/WorkFlowCore/Workflow/WorkFlowCore.Host/appsettings.Development.json b/WorkFlowCore/Workflow/WorkFlowCore.Host/appsettings.Development.json index a08b61e..4314fd8 100644 --- a/WorkFlowCore/Workflow/WorkFlowCore.Host/appsettings.Development.json +++ b/WorkFlowCore/Workflow/WorkFlowCore.Host/appsettings.Development.json @@ -18,7 +18,7 @@ "Datacenter": "workflow-sample" }, "Service": { - "IP": "${ip}|172.29.160.1", //配置为 wsl 同一网段的ip即可被容器中的consul访问到（本地启动地址 改为 0.0.0.0:xxxx） + "IP": "${ip}|localhost", //配置为 wsl 同一网段的ip即可被容器中的consul访问到（本地启动地址 改为 0.0.0.0:xxxx） "Port": "${port}|5000", "Name": "${servicename}|workflow" }, -- Gitee From 748d0c43cf9b67a8d3dc6992391f175e4881622e Mon Sep 17 00:00:00 2001 From: Grady <3392207530@qq.com> Date: Wed, 26 Oct 2022 11:44:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?FIX:=E8=AE=BE=E7=BD=AE=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E9=A2=86=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/vue-admin-template/src/store/modules/organisationOrg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/vue-admin-template/src/store/modules/organisationOrg.js b/admin/vue-admin-template/src/store/modules/organisationOrg.js index 9a6982b..8688836 100644 --- a/admin/vue-admin-template/src/store/modules/organisationOrg.js +++ b/admin/vue-admin-template/src/store/modules/organisationOrg.js @@ -94,7 +94,7 @@ const actions = { }, data) { return request({ url: '/organisation/api/Organization/SetOrganizationLeaders', - method: 'post', + method: 'put', data: data }) }, -- Gitee