From 48bb52036ecf05a53d783ed07213410a3a615b24 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Thu, 23 Mar 2023 14:03:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=9F=E4=BA=A7=E7=8E=AF?= =?UTF-8?q?=E5=A2=83ids4=E9=BB=98=E8=AE=A4=E6=97=A0=E6=B3=95=E4=BD=BF?= =?UTF-8?q?=E7=94=A8http=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TokenService.cs | 28 ++- .../Win_in.Sfs.Auth.Web.csproj | 2 + .../src/Win_in.Sfs.Shared.Host/ModuleBase.cs | 1 + .../settings/appsettings.Development.json | 223 +++++++++--------- 4 files changed, 129 insertions(+), 125 deletions(-) diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/TokenService.cs b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/TokenService.cs index a48cbd188..4666d0a6c 100644 --- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/TokenService.cs +++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/TokenService.cs @@ -1,3 +1,4 @@ +using System; using System.ComponentModel.DataAnnotations; using System.Net.Http; using System.Threading.Tasks; @@ -10,7 +11,6 @@ using Volo.Abp.Application.Services; namespace Win_in.Sfs.Auth.Tokens; [Route($"api/token")] -[Authorize] public class TokenService : ApplicationService { private readonly IHttpClientFactory _httpClientFactory; @@ -24,13 +24,18 @@ public class TokenService : ApplicationService [HttpPost] [AllowAnonymous] - public async Task CreateAsync(LoginModel model) + public async Task CreateAsync(LoginModel model) { var address = _configuration["AuthServer:Authority"]; - var discovery = await _httpClientFactory.CreateClient().GetDiscoveryDocumentAsync(address).ConfigureAwait(false); + var request = new DiscoveryDocumentRequest + { + Address = address, + Policy = new DiscoveryPolicy { RequireHttps = false } + }; + var discovery = await _httpClientFactory.CreateClient().GetDiscoveryDocumentAsync(request).ConfigureAwait(false); var clientId = _configuration["AuthServer:ClientId"]; var clientSecret = _configuration["AuthServer:ClientSecret"]; - + Console.WriteLine($"address:{address},TokenEndpoint:{discovery.TokenEndpoint},clientId:{clientId},clientSecret:{clientSecret}"); var result = await _httpClientFactory.CreateClient().RequestPasswordTokenAsync(new PasswordTokenRequest { Address = discovery.TokenEndpoint, @@ -40,14 +45,13 @@ public class TokenService : ApplicationService UserName = model.UserName, Password = model.Password }).ConfigureAwait(false); - - return result; - } - - [HttpGet] - public string Test() - { - return "Test"; + Console.WriteLine($"Result:${(result.IsError ? result.ErrorDescription : result.AccessToken)}"); + return new JsonResult(new { + result.TokenType, + result.AccessToken, + result.ExpiresIn, + result.RefreshToken, + result.Scope }); } } diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Win_in.Sfs.Auth.Web.csproj b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Win_in.Sfs.Auth.Web.csproj index af8fcc90e..6010b6cd9 100644 --- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Win_in.Sfs.Auth.Web.csproj +++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Win_in.Sfs.Auth.Web.csproj @@ -13,6 +13,8 @@ false true Win_in.Sfs.Auth-4681b4fd-151f-4221-84a4-929d86723e4c + 1.yyyy.Mdd.Hmm + 1.2023.323.1337 diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Host/ModuleBase.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Host/ModuleBase.cs index 00d4efcfc..3bca91579 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Host/ModuleBase.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Host/ModuleBase.cs @@ -75,6 +75,7 @@ public abstract class ModuleBase : AbpModule where T : AbpModule public virtual void CreateDatabase(ApplicationInitializationContext context) where TEfCoreDbContext : IEfCoreDbContext { + Console.WriteLine($"应用版本:{Assembly.GetEntryAssembly().GetFileVersion()}"); //if (!context.GetEnvironment().IsDevelopment()) //{ // Console.WriteLine($"生产模式不执行数据库初始化"); diff --git a/build/src/docker/publish/settings/appsettings.Development.json b/build/src/docker/publish/settings/appsettings.Development.json index 6c2a0d641..0bc2a0f8f 100644 --- a/build/src/docker/publish/settings/appsettings.Development.json +++ b/build/src/docker/publish/settings/appsettings.Development.json @@ -1,148 +1,145 @@ { - "Serilog": { - "WriteTo": [ - { - "Name": "Async", - "Args": { - "configure": [ - { - "Name": "File", - "Args": { - "path": "logs/log.txt", - "rollingInterval": "Day", - "retainedFileCountLimit": "30" - } - } - ] - } - }, - { - "Name": "Seq", - "Args": { - "serverUrl": "http://localhost:5341" - } - } - ] - }, + "AlwaysAllowAuthorization": "True", "App": { "CorsOrigins": [ - //--------HTTP-------DEV服务器 - "http://localhost:59080", //PC-界面 - "http://localhost:59081", //手持-界面 - "http://localhost:59090", //PC-界面 - "http://localhost:59091", //手持-界面 - "http://localhost:59093", //权限 - "http://localhost:59094", //基础数据-接口 - "http://localhost:59095", //WMS-接口 - "http://localhost:59096", //PDA-接口 - "http://localhost:59097", //数据转换 - "http://localhost:59098", //看板-接口 - "http://localhost:59099", //网关 - //--------HTTP-------本地服务器 - "http://localhost:59090", //PC-界面 - "http://localhost:59091", //手持-界面 - "http://localhost:59093", //权限 - "http://localhost:59094", //基础数据-接口 - "http://localhost:59095", //WMS-接口 - "http://localhost:59096", //PDA-接口 - "http://localhost:59097", //数据转换 - "http://localhost:59098", //看板-接口 - "http://localhost:59099", //网关 - //--------HTTPS-------DEV服务器 - "https://localhost:59090", //PC-界面 - "https://localhost:59091", //手持-界面 - "https://localhost:59093", //权限 - "https://localhost:59094", //基础数据-接口 - "https://localhost:59095", //WMS-接口 - "https://localhost:59096", //PDA-接口 - "https://localhost:59097", //数据转换 - "https://localhost:59098", //看板-接口 - "https://localhost:59099", //网关 - //--------HTTPS-------本地服务器 - "https://localhost:59090", //PC-界面 - "https://localhost:59091", //手持-界面 - "https://localhost:59093", //权限 - "https://localhost:59094", //基础数据-接口 - "https://localhost:59095", //WMS-接口 - "https://localhost:59096", //PDA-接口 - "https://localhost:59097", //数据转换 - "https://localhost:59098", //看板-接口 - "https://localhost:59099" //网关 + "http://localhost:59080", + "http://localhost:59081", + "http://localhost:59090", + "http://localhost:59091", + "http://localhost:59093", + "http://localhost:59094", + "http://localhost:59095", + "http://localhost:59096", + "http://localhost:59097", + "http://localhost:59098", + "http://localhost:59099", + "http://localhost:59090", + "http://localhost:59091", + "http://localhost:59093", + "http://localhost:59094", + "http://localhost:59095", + "http://localhost:59096", + "http://localhost:59097", + "http://localhost:59098", + "http://localhost:59099", + "https://localhost:59090", + "https://localhost:59091", + "https://localhost:59093", + "https://localhost:59094", + "https://localhost:59095", + "https://localhost:59096", + "https://localhost:59097", + "https://localhost:59098", + "https://localhost:59099", + "https://localhost:59090", + "https://localhost:59091", + "https://localhost:59093", + "https://localhost:59094", + "https://localhost:59095", + "https://localhost:59096", + "https://localhost:59097", + "https://localhost:59098", + "https://localhost:59099", + "http://localhost:9527" ] }, - "ConnectionStrings": { - "Auth": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "AbpIdentity": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "AbpIdentityServer": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "AbpPermissionManagement": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "AbpSettingManagement": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "AbpTenantManagement": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "AbpFeatureManagement": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "AbpBackgroundJobs": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "AbpAuditLogging": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "AbpBlobStoring": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "Store": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "Job": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "Basedata": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "Inventory": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "Message": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "Label": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "FileStorage": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;", - "DataExchange": "Server=localhost;Port=3306;Database=Wms;Uid=root;Pwd=aA123456!;" - }, - "Redis": { - "Configuration": "localhost:16379", - "KeyPrefix": "Wms:" - }, "AuthServer": { - "UseAuth": "true", - "Authority": "http://dev.ccwin-in.com:59093/", + "Audience": "Auth", + "Authority": "http://localhost:59093/", + "ClientId": "Auth_App", + "ClientSecret": "1q2w3E*", "RequireHttpsMetadata": "false", "SwaggerClientId": "Auth_App", "SwaggerClientSecret": "1q2w3e*", - "Audience": "Auth", - "ClientId": "Auth_App", - "ClientSecret": "1q2w3e*" + "UseAuth": "true" + }, + "ConnectionStrings": { + "AbpAuditLogging": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "AbpBackgroundJobs": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "AbpBlobStoring": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "AbpFeatureManagement": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "AbpIdentity": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "AbpIdentityServer": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "AbpPermissionManagement": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "AbpSettingManagement": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "AbpTenantManagement": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "Auth": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "Basedata": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "DataExchange": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "FileStorage": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "Inventory": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "Job": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "Label": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "Message": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;", + "Store": "Server=localhost;Port=21196;Database=Wms;Uid=root;Pwd=aA123456!;" }, "IdentityClients": { "Default": { - "GrantType": "client_credentials", + "Authority": "http://dev.ccwin-in.com:59093", "ClientId": "Auth_App", "ClientSecret": "1q2w3e*", + "GrantType": "client_credentials", "RequireHttps": "false", - "Authority": "http://dev.ccwin-in.com:59093", "Scope": "Auth" } }, + "IsMultiTenancy": "True", + "Redis": { + "Configuration": "localhost:21194", + "KeyPrefix": "Wms:" + }, "RemoteServices": { - "Default": { - "BaseUrl": "http://dev.ccwin-in.com:59093" + "Auth": { + "BaseUrl": "http://dev.ccwin-in.com:59093/" }, "BaseData": { "BaseUrl": "http://dev.ccwin-in.com:59094/" }, - "Store": { - "BaseUrl": "http://dev.ccwin-in.com:59095/" + "Default": { + "BaseUrl": "http://dev.ccwin-in.com:59093" }, - "Job": { - "BaseUrl": "http://dev.ccwin-in.com:59095/" + "FileStorage": { + "BaseUrl": "http://dev.ccwin-in.com:59092/" }, "Inventory": { "BaseUrl": "http://dev.ccwin-in.com:59095/" }, - "FileStorage": { - "BaseUrl": "http://dev.ccwin-in.com:59092/" + "Job": { + "BaseUrl": "http://dev.ccwin-in.com:59095/" }, - "Message": { + "Label": { "BaseUrl": "http://dev.ccwin-in.com:59092/" }, - "Label": { + "Message": { "BaseUrl": "http://dev.ccwin-in.com:59092/" }, - "Auth": { - "BaseUrl": "http://dev.ccwin-in.com:59093/" + "Store": { + "BaseUrl": "http://dev.ccwin-in.com:59095/" } }, - "AlwaysAllowAuthorization": true, - "IsMultiTenancy": true -} + "Serilog": { + "WriteTo": [ + { + "Args": { + "configure": [ + { + "Args": { + "path": "logs/log.txt", + "retainedFileCountLimit": "30", + "rollingInterval": "Day" + }, + "Name": "File" + } + ] + }, + "Name": "Async" + }, + { + "Args": { + "serverUrl": "http://localhost:5341" + }, + "Name": "Seq" + } + ] + } +} \ No newline at end of file