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 74ecca68d..b2a84587a 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 @@ -3,11 +3,10 @@ using System.ComponentModel.DataAnnotations; using System.Net.Http; using System.Threading.Tasks; using IdentityModel.Client; -using IdentityServer4.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; -using Volo.Abp; +using Microsoft.Extensions.Logging; using Volo.Abp.Application.Services; namespace Win_in.Sfs.Auth.Tokens; @@ -17,11 +16,13 @@ public class TokenService : ApplicationService { private readonly IHttpClientFactory _httpClientFactory; private readonly IConfiguration _configuration; + private readonly ILogger _logger; - public TokenService(IHttpClientFactory httpClientFactory, IConfiguration configuration) + public TokenService(IHttpClientFactory httpClientFactory, IConfiguration configuration, ILogger logger) { this._httpClientFactory = httpClientFactory; this._configuration = configuration; + this._logger = logger; } [HttpPost] @@ -37,10 +38,10 @@ public class TokenService : ApplicationService 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}"); + this._logger.LogInformation($"address:{address},TokenEndpoint:{discovery.TokenEndpoint},clientId:{clientId},clientSecret:{clientSecret}"); var result = await _httpClientFactory.CreateClient().RequestPasswordTokenAsync(new PasswordTokenRequest { - Address = discovery.TokenEndpoint, + Address = $"{address.TrimEnd('/')}/connect/token", GrantType = "password", ClientId = clientId, ClientSecret = clientSecret, @@ -48,17 +49,26 @@ public class TokenService : ApplicationService Password = model.Password }).ConfigureAwait(false); Console.WriteLine($"Result:${(result.IsError ? result.ErrorDescription : result.AccessToken)}"); - if (result.RefreshToken == null) - { - throw new UserFriendlyException("用户名或密码错误"); - } + //if (result.RefreshToken == null) + //{ + // throw new UserFriendlyException("用户名或密码错误"); + //} - return new JsonResult(new { + return new JsonResult(new + { result.TokenType, result.AccessToken, result.ExpiresIn, result.RefreshToken, - result.Scope }); + result.Scope, + result.HttpStatusCode, + result.Error, + result.HttpErrorReason, + result.ErrorDescription, + result.ErrorType, + result.Exception?.Message, + Exception = result.Exception?.ToString() + }); } [HttpGet("[action]")] diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/AuthWebModule.cs b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/AuthWebModule.cs index b96f281b9..df4f4c611 100644 --- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/AuthWebModule.cs +++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/AuthWebModule.cs @@ -10,6 +10,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.AspNetCore.Serilog; using Volo.Abp.Autofac; +using Volo.Abp.EntityFrameworkCore.SqlServer; using Volo.Abp.Identity.Web; using Volo.Abp.Modularity; using Volo.Abp.SettingManagement.Web; @@ -52,7 +53,8 @@ namespace Win_in.Sfs.Auth.Web; typeof(StoreApplicationContractsModule), typeof(LabelApplicationContractsModule), typeof(MessageApplicationContractsModule), - typeof(FileStorageApplicationContractsModule) + typeof(FileStorageApplicationContractsModule), + typeof(AbpEntityFrameworkCoreSqlServerModule) )] public class AuthWebModule : ModuleBase { 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 3c37da438..218ac720c 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 @@ -14,7 +14,7 @@ true Win_in.Sfs.Auth-4681b4fd-151f-4221-84a4-929d86723e4c 1.yyyy.Mdd.Hmm - 1.2023.327.1207 + 1.2023.406.2008 True 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 d0b1693c4..520c2c060 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,4 +1,6 @@ { + "ConfigServer": "http://localhost:21093", + "ConfigServer.Docker": "http://gateway:21093", //"AgileConfig": { // "appId": "sfs", // "secret": "sfs", diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Host/HostBuilderExtensions.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Host/HostBuilderExtensions.cs index 1e033b63f..5319f16a2 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Host/HostBuilderExtensions.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Host/HostBuilderExtensions.cs @@ -41,8 +41,8 @@ public static class HostBuilderExtensions var isDocker = Environment.GetEnvironmentVariable("DOTNET_RUNNING_IN_CONTAINER") == "true"; var key = isDocker ? "ConfigServer.Docker" : "ConfigServer"; var configUrl = config.GetValue(key, "http://localhost:21093/").TrimEnd('/') + "/settings/"; - AddJsonByUrl(cb, $"{configUrl}/appsettings.json"); - AddJsonByUrl(cb, $"{configUrl}/appsettings.{builder.Environment.EnvironmentName}.json"); + AddJsonByUrl(cb, $"{configUrl}appsettings.json"); + AddJsonByUrl(cb, $"{configUrl}appsettings.{builder.Environment.EnvironmentName}.json"); if (builder.Environment.IsDevelopment()) { cb.AddJsonFile(Path.Combine(Directory.GetCurrentDirectory(), $"appsettings.{builder.Environment.EnvironmentName}.json")); @@ -78,6 +78,7 @@ public static class HostBuilderExtensions private static void AddJsonByUrl(IConfigurationBuilder configurationBuilder, string url) { + Console.WriteLine($"load config form：{url}"); var stream = new HttpClient().GetStreamAsync(url).Result; configurationBuilder.AddJsonStream(stream); } 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 ec6c15925..0b7689bb8 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 @@ -7,7 +7,6 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http.Features; @@ -208,7 +207,7 @@ public abstract class ModuleBase : AbpModule where T : AbpModule app.UseCorrelationId(); app.UseStaticFiles(); app.UseRouting(); - app.UseCors("Default"); + app.UseCors("CorsPolicy"); app.UseAuthentication(); app.UseJwtTokenMiddleware(); app.UseUnitOfWork(); @@ -246,27 +245,9 @@ public abstract class ModuleBase : AbpModule where T : AbpModule Console.WriteLine($"CORS Origins:{string.Concat(origins)}"); ServiceConfigurationContext.Services.AddCors(options => { - //options.AddDefaultPolicy(builder => - //{ - // builder - // .WithOrigins( - // origins - // .Select(o => o.RemovePostFix("/")) - // .ToArray() - // ) - // //.AllowAnyOrigin()//允许所有跨域 - // //.WithAbpExposedHeaders() - // .SetIsOriginAllowedToAllowWildcardSubdomains() - // .AllowAnyHeader() - // .AllowAnyMethod() - // .AllowCredentials();//按配置文件中 跨域 - //}); - options.AddPolicy("Default", builder => + options.AddPolicy("CorsPolicy", builder => { - builder.SetIsOriginAllowed(isOriginAllowed => true) - .AllowAnyMethod() - .AllowAnyHeader() - .AllowCredentials(); + builder.SetIsOriginAllowed(_ => true).AllowAnyMethod().AllowAnyHeader().AllowCredentials(); }); }); } diff --git a/build/src/docker/publish/apps/be/Web.Gateway/Web.Gateway.dll b/build/src/docker/publish/apps/be/Web.Gateway/Web.Gateway.dll index 961cd0322..5f4083c4a 100644 Binary files a/build/src/docker/publish/apps/be/Web.Gateway/Web.Gateway.dll and b/build/src/docker/publish/apps/be/Web.Gateway/Web.Gateway.dll differ diff --git a/build/src/docker/publish/apps/be/Web.Gateway/Web.Gateway.pdb b/build/src/docker/publish/apps/be/Web.Gateway/Web.Gateway.pdb index 83c73dd42..1751df5ed 100644 Binary files a/build/src/docker/publish/apps/be/Web.Gateway/Web.Gateway.pdb and b/build/src/docker/publish/apps/be/Web.Gateway/Web.Gateway.pdb differ diff --git a/build/src/docker/publish/apps/be/Web.Gateway/wwwroot/settings/appsettings.Development.json b/build/src/docker/publish/apps/be/Web.Gateway/wwwroot/settings/appsettings.Development.json new file mode 100644 index 000000000..5f8979a00 --- /dev/null +++ b/build/src/docker/publish/apps/be/Web.Gateway/wwwroot/settings/appsettings.Development.json @@ -0,0 +1,165 @@ +{ + "AlwaysAllowAuthorization": "False", + "App": { + "CorsOrigins": [ + "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" + ] + }, + "AuthServer": { + "Audience": "Auth", + "Authority": "http://localhost:59093/", + "ClientId": "Auth_App", + "ClientSecret": "1q2w3E*", + "RequireHttpsMetadata": "false", + "SwaggerClientId": "Auth_App", + "SwaggerClientSecret": "1q2w3e*", + "UseAuth": "true" + }, + // "ConnectionStrings": { + // "AbpAuditLogging": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "AbpBackgroundJobs": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "AbpBlobStoring": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "AbpFeatureManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "AbpIdentity": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "AbpIdentityServer": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "AbpPermissionManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "AbpSettingManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "AbpTenantManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "Auth": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "Basedata": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "DataExchange": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "FileStorage": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "Inventory": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "Job": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "Label": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "Message": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "Store": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;" + // }, + "ConnectionStrings": { + "AbpAuditLogging": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpBackgroundJobs": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpBlobStoring": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpFeatureManagement": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpIdentity": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpIdentityServer": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpPermissionManagement": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpSettingManagement": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpTenantManagement": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Auth": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Basedata": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "DataExchange": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "FileStorage": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Inventory": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Job": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Label": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Message": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Store": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;" + }, + "IdentityClients": { + "Default": { + "Authority": "http://localhost:59093", + "ClientId": "Auth_App", + "ClientSecret": "1q2w3E*", + "GrantType": "client_credentials", + "RequireHttps": "false", + "Scope": "Auth" + } + }, + "IsMultiTenancy": "True", + "Redis": { + "Configuration": "localhost:21194", + "KeyPrefix": "Wms:" + }, + "RemoteServices": { + "Auth": { + "BaseUrl": "http://dev.ccwin-in.com:59093/" + }, + "BaseData": { + "BaseUrl": "http://dev.ccwin-in.com:59094/" + }, + "Default": { + "BaseUrl": "http://dev.ccwin-in.com:59093" + }, + "FileStorage": { + "BaseUrl": "http://dev.ccwin-in.com:59092/" + }, + "Inventory": { + "BaseUrl": "http://dev.ccwin-in.com:59095/" + }, + "Job": { + "BaseUrl": "http://dev.ccwin-in.com:59095/" + }, + "Label": { + "BaseUrl": "http://dev.ccwin-in.com:59092/" + }, + "Message": { + "BaseUrl": "http://dev.ccwin-in.com:59092/" + }, + "Store": { + "BaseUrl": "http://dev.ccwin-in.com:59095/" + } + }, + "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 diff --git a/build/src/docker/publish/apps/be/Web.Gateway/wwwroot/settings/appsettings.json b/build/src/docker/publish/apps/be/Web.Gateway/wwwroot/settings/appsettings.json new file mode 100644 index 000000000..6dd1cb14f --- /dev/null +++ b/build/src/docker/publish/apps/be/Web.Gateway/wwwroot/settings/appsettings.json @@ -0,0 +1,154 @@ +{ + //是否绕过权限验证 + "AlwaysAllowAuthorization": "True", + //跨域 + "App": { + "CorsOrigins": [ + "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" + ] + }, + //ids4的建权服务端配置 + "AuthServer": { + "Audience": "Auth", + "Authority": "http://localhost:21093/", + "ClientId": "Auth_App", + "ClientSecret": "1q2w3E*", + "RequireHttpsMetadata": "false", + "SwaggerClientId": "Auth_App", + "SwaggerClientSecret": "1q2w3e*", + "UseAuth": "true" + }, + //ids4的建权客户端配置 配置要和服务端对应 + "IdentityClients": { + "Default": { + "Authority": "http://localhost:59093", + "ClientId": "Auth_App", + "ClientSecret": "1q2w3E*", + "GrantType": "client_credentials", + "RequireHttps": "false", + "Scope": "Auth" + } + }, + //数据库连接 + "Database": "SQLServer", + "ConnectionStrings": { + "AbpAuditLogging": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpBackgroundJobs": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpBlobStoring": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpFeatureManagement": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpIdentity": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpIdentityServer": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpPermissionManagement": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpSettingManagement": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpTenantManagement": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Auth": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Basedata": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "DataExchange": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "FileStorage": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Inventory": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Job": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Label": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Message": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Store": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;" + }, + //多租户 + "IsMultiTenancy": "True", + //缓存服务器 + "Redis": { + "Configuration": "redis:6379", + "KeyPrefix": "Wms:" + }, + //转发地址配置 + "RemoteServices": { + "Auth": { + "BaseUrl": "http://dev.ccwin-in.com:59093/" + }, + "BaseData": { + "BaseUrl": "http://dev.ccwin-in.com:59094/" + }, + "Default": { + "BaseUrl": "http://dev.ccwin-in.com:59093" + }, + "FileStorage": { + "BaseUrl": "http://dev.ccwin-in.com:59092/" + }, + "Inventory": { + "BaseUrl": "http://dev.ccwin-in.com:59095/" + }, + "Job": { + "BaseUrl": "http://dev.ccwin-in.com:59095/" + }, + "Label": { + "BaseUrl": "http://dev.ccwin-in.com:59092/" + }, + "Message": { + "BaseUrl": "http://dev.ccwin-in.com:59092/" + }, + "Store": { + "BaseUrl": "http://dev.ccwin-in.com:59095/" + } + }, + "Serilog": { + "WriteTo": [ + { + "Args": { + "configure": [ + { + "Args": { + "path": "logs/log.txt", + "retainedFileCountLimit": "30", + "rollingInterval": "Day" + }, + "Name": "File" + } + ] + }, + "Name": "Async" + }, + { + "Args": { + "serverUrl": "http://seq:5341" + }, + "Name": "Seq" + } + ] + } +} \ No newline at end of file diff --git a/build/src/docker/publish/conf/gateway/appsettings.json b/build/src/docker/publish/conf/gateway/appsettings.json index 08e1db93b..d3167f637 100644 --- a/build/src/docker/publish/conf/gateway/appsettings.json +++ b/build/src/docker/publish/conf/gateway/appsettings.json @@ -6,7 +6,8 @@ "abp": { "AllowAnyOrigin": false, "Origins": [ - "http://localhost:9527" + "http://localhost:9527", + "http://dev.ccwin-in.com:21380" ] } }, diff --git a/build/src/docker/publish/conf/settings/appsettings.Production.json b/build/src/docker/publish/conf/settings/appsettings.Production.json new file mode 100644 index 000000000..2c63c0851 --- /dev/null +++ b/build/src/docker/publish/conf/settings/appsettings.Production.json @@ -0,0 +1,2 @@ +{ +} diff --git a/build/src/docker/publish/conf/settings/appsettings.json b/build/src/docker/publish/conf/settings/appsettings.json index b6b5d99db..315fb9b4b 100644 --- a/build/src/docker/publish/conf/settings/appsettings.json +++ b/build/src/docker/publish/conf/settings/appsettings.json @@ -48,12 +48,13 @@ //ids4的建权服务端配置 "AuthServer": { "Audience": "Auth", - "Authority": "http://localhost:21093/", + "Authority": "http://dev.ccwin-in.com:21293/", "ClientId": "Auth_App", "ClientSecret": "1q2w3E*", "RequireHttpsMetadata": "false", "SwaggerClientId": "Auth_App", "SwaggerClientSecret": "1q2w3e*", + "RequireHttps": false, "UseAuth": "true" }, //ids4的建权客户端配置 配置要和服务端对应 @@ -63,7 +64,7 @@ "ClientId": "Auth_App", "ClientSecret": "1q2w3E*", "GrantType": "client_credentials", - "RequireHttps": "false", + "RequireHttps": false, "Scope": "Auth" } }, diff --git a/build/src/docker/publish/docker-compose.yml b/build/src/docker/publish/docker-compose.yml index 5504dccd9..742636fa8 100644 --- a/build/src/docker/publish/docker-compose.yml +++ b/build/src/docker/publish/docker-compose.yml @@ -50,6 +50,7 @@ services: - ./data/redis:/data database: image: mcr.microsoft.com/mssql/server:${SQLSERVER_VERSION} + user: root environment: - ACCEPT_EULA=Y - MSSQL_SA_PASSWORD=${MSSQL_SA_PASSWORD} diff --git a/build/src/win-x64/publish/supervisord/supervisor.conf b/build/src/win-x64/publish/supervisord/supervisor.conf index 5c1c75657..f0185e0f0 100644 --- a/build/src/win-x64/publish/supervisord/supervisor.conf +++ b/build/src/win-x64/publish/supervisord/supervisor.conf @@ -27,6 +27,12 @@ command = dotnet Web.Gateway.dll --urls http://localhost:21093 autorestart=true stdout_logfile=./logs/gateway.log +[program:InfluxDB] +directory = ./influxdb/ +command = ./influxd.exe +autorestart=true +stdout_logfile=./logs/influxdb.log + [program:Sfs.Core.Host] directory = ./apps/be/Sfs.Core.Host/ command = dotnet Win_in.Sfs.Core.HttpApi.Host.dll --urls http://localhost:59092 diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js index 9be1ae048..188653b47 100644 --- a/fe/PC/public/config.js +++ b/fe/PC/public/config.js @@ -20,7 +20,7 @@ // localhost window.SITE_CONFIG['base'] = 'http://localhost:21093' -window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:21093/api/auth' +window.SITE_CONFIG['user'] = 'http://localhost:21093/api/auth' window.SITE_CONFIG['print'] = 'print' window.SITE_CONFIG['largeScreen'] = 'http://localhost:59082' window.SITE_CONFIG['warehouseCode'] = 'T8'