diff --git a/aspnet-core/.gitignore b/aspnet-core/.gitignore index 0026a60ee..8e1f553e1 100644 --- a/aspnet-core/.gitignore +++ b/aspnet-core/.gitignore @@ -1,2 +1,4 @@ .vs -LocalNuget \ No newline at end of file +LocalNuget +*.DotSettings.user +**/*.csproj.user \ No newline at end of file diff --git a/aspnet-core/database/ApiGateway-Init.sql b/aspnet-core/database/ApiGateway-Init.sql index ab098d66f..a67949be2 100644 --- a/aspnet-core/database/ApiGateway-Init.sql +++ b/aspnet-core/database/ApiGateway-Init.sql @@ -870,7 +870,7 @@ CREATE TABLE `appapigatewayglobalconfiguration` ( -- Records of appapigatewayglobalconfiguration -- ---------------------------- INSERT INTO `appapigatewayglobalconfiguration` VALUES (1, '{}', 'f7973118f2c2425c8cc96b59883b99aa', 1260841964962947072, NULL, 'http://localhost:30000', 'HTTP', NULL, 0, 1, 'TEST-APP'); -I + -- ---------------------------- -- Table structure for appapigatewayheaders -- ---------------------------- diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain.Shared/LINGYUN/ApiGateway/Localization/DomainShared/zh-Hans.json b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain.Shared/LINGYUN/ApiGateway/Localization/DomainShared/zh-Hans.json index f33808bb4..1e1be7b14 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain.Shared/LINGYUN/ApiGateway/Localization/DomainShared/zh-Hans.json +++ b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain.Shared/LINGYUN/ApiGateway/Localization/DomainShared/zh-Hans.json @@ -16,58 +16,123 @@ "Side:ClusterOcelot": "服务器集群", "Side:ClusterOcelot:ServerList": "服务器列表", "Submit": "立即提交", + "HttpHandler": "HTTP处理程序", + "OtherOptions": "其他选项", + "LoadWay": "负载方式", + "RouteName": "路由名称", + + /////聚合路由 + "AggregateRoutes": "聚合路由", + "AggregateRoute:ManageRouteConfig": "管理路由配置", + "AggregateRoute:AddNew": "添加聚合路由", + "AggregateRoute:EditBy": "编辑 - {0}", + + "DisplayName:Name": "名称", + "DisplayName:UpstreamPathTemplate": "上游路径", + "DisplayName:RouteKeys": "ReRouteKeys", + "DisplayName:UpstreamHost": "上游主机地址", + "DisplayName:Aggregator": "聚合器", + "DisplayName:Priority": "优先级", + + "DisplayName:Parameter": "参数", + "DisplayName:JsonPath": "JsonPath", + + "DisplayName:AppId": "AppId", + "DisplayName:CaseSensitive": "区分大小写", + "DisplayName:UpstreamHttpMethod": "上游请求方式", + "DisplayName:RouteKey": "ReRouteKey", + + /////路由分组 + "Groups": "路由分组", + "Group:EditBy": "编辑 - {0}", + "Group:AddNew": "添加路由分组", + + "DisplayName:AppName": "AppName", + "DisplayName:AppAddress": "地址", + "DisplayName:IsActive": "启用", + "DisplayName:Description": "描述", + + /////公共配置 + "Globals": "公共配置", + "Global:EditBy": "编辑 - {0}", + "Global:AddNew": "添加公共配置", + + "DisplayName:BaseUrl": "访问路径", + "DisplayName:RequestIdKey": "访问标识", + "DisplayName:DownstreamScheme": "下游协议", + "DisplayName:DownstreamHttpVersion": "下游http协议版本", + "Basic": "基础配置", - "BaseUrl": "访问路径", - "RequestIdKey": "访问标识", - "DownstreamScheme": "下游协议", "Qos": "服务质量", - "ExceptionsAllowedBeforeBreaking": "最大异常请求", - "DurationOfBreak": "熔断时间(ms)", - "TimeoutValue": "超时时间(ms)", - "RateLimit": "流量控制", - "ClientIdHeader": "客户端请求头", - "QuotaExceededMessage": "过载错误消息", - "HttpStatusCode": "HTTP错误代码", - "DisableRateLimitHeaders": "禁用HTTP头", "HttpOptions": "HTTP选项", - "HttpHandler": "HTTP处理程序", - "OtherOptions": "其他选项", - "AllowAutoRedirect": "HTTP重定向", - "UseCookieContainer": "Cookie容器", - "UseProxy": "HTTP代理", - "UseTracing": "HTTP追踪", + "RateLimit": "流量控制", "LoadBalancer": "负载均衡", - "LoadWay": "负载方式", "ServiceDiscovery": "服务发现", - "DiscoveryType": "实例类型", - "Host": "主机地址", - "Port": "端口号", - "RouteName": "路由名称", - "ServiceName": "服务名称", - "UpstreamPathTemplate": "上游路径", - "DownstreamPathTemplate": "下游路径", - "UpstreamHttpMethod": "上游请求方式", - "DownstreamHostAndPorts": "下游请求地址", - "RouteClaimsRequirement": "路由鉴权标识", - "AggregateKey": "聚合标识", - "Priority": "优先级", + + "DisplayName:MaxConnectionsPerServer": "最大连接数", + "DisplayName:UseProxy": "HTTP代理", + "DisplayName:UseTracing": "HTTP追踪", + "DisplayName:AllowAutoRedirect": "HTTP重定向", + "DisplayName:UseCookieContainer": "Cookie容器", + "DisplayName:DisableRateLimitHeaders": "禁用HTTP头", + "DisplayName:ClientIdHeader": "客户端请求头", + "DisplayName:HttpStatusCode": "HTTP状态代码", + "DisplayName:RateLimitCounterPrefix": "限流计数器前缀", + "DisplayName:QuotaExceededMessage": "过载错误消息", + "DisplayName:TimeoutValue": "超时时间(ms)", + "DisplayName:DurationOfBreak": "熔断时间(ms)", + "DisplayName:ExceptionsAllowedBeforeBreaking": "最大异常请求次数", + "DisplayName:LoadBalancerType": "负载均衡类型", + "DisplayName:PollingKey": "PollingKey", + "DisplayName:Expiry": "Expiry", + "DisplayName:DiscoveryType": "实例类型", + "DisplayName:Host": "主机地址", + "DisplayName:Port": "端口号", + "DisplayName:Token": "Token", + "DisplayName:ConfigurationKey": "ConfigurationKey", + "DisplayName:Namespace": "Namespace", + "DisplayName:Scheme": "Scheme", + "DisplayName:PollingInterval": "轮询间隔(ms)", + "DisplayName:Enable": "启用", + "DisplayName:Disable": "禁用", + + /////路由 + "Routes": "路由", + "Route:EditBy": "编辑 - {0}", + "Route:AddNew": "添加路由", + + "DisplayName:DownstreamPathTemplate": "下游路径", + "DisplayName:DownstreamHostAndPorts": "下游请求地址", + "DisplayName:Timeout": "超时时间(ms)", + "DisplayName:ServiceName": "服务名称", + + "Forward": "转发规则", + "RequestProcessing": "请求处理", + "SecurityOptions": "安全选项", + + "DisplayName:DangerousAcceptAnyServerCertificateValidator": "忽略SSL警告", + "DisplayName:AggregateKey": "聚合标识", + "DisplayName:DownstreamHttpMethod": "下游请求方式", + "DisplayName:AddClaimsToRequest": "用户声明转换", + "DisplayName:AddHeadersToRequest": "请求头转换", + "DisplayName:UpstreamHeaderTransform": "上游请求头", + "DisplayName:DownstreamHeaderTransform": "下游请求头", + "DisplayName:ChangeDownstreamPathTemplate": "变更下游路径", + "DisplayName:RouteClaimsRequirement": "路由鉴权标识", + "DisplayName:DelegatingHandlers": "委托处理器", + "DisplayName:Limit": "最大允许次数", + "DisplayName:Period": "周期", + "DisplayName:PeriodTimespan": "重试时间(s)", + "DisplayName:ClientWhitelist": "客户端白名单", + "DisplayName:AuthenticationProviderKey": "授权标识", + "DisplayName:AllowedScopes": "授权范围", + "DisplayName:IpAllowedList": "IP白名单", + "DisplayName:IpBlockedList": "IP黑名单", + + ///// "CertificateValidator": "忽略SSL警告", - "CaseSensitive": "区分大小写", - "UpstreamHeaderTransform": "上游请求头", - "DownstreamHeaderTransform": "下游请求头", - "AddHeadersToRequest": "请求头转换", - "AddClaimsToRequest": "用户声明转换", "AddQueriesToRequest": "查询参数转换", - "ClientWhitelist": "客户端白名单", - "Limit": "最大允许次数", - "PeriodTimespan": "重试时间(s)", - "Period": "限制时间", "EnableRateLimiting": "启用流量控制", - "AuthenticationProviderKey": "授权标识", - "AllowedScopes": "授权范围", - "IpAllowedList": "IP白名单", - "IpBlockedList": "IP黑名单", - "SecurityOptions": "安全选项", "RefreshList": "刷新列表", "AddReoute": "添加路由", "EditRoute": "编辑路由", diff --git a/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/zh-Hans.json b/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/zh-Hans.json index 3978893d6..8bfb0cb98 100644 --- a/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/zh-Hans.json +++ b/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/zh-Hans.json @@ -1,6 +1,10 @@ { "culture": "zh-Hans", "texts": { + "Languages": "语言", + "Resources": "资源", + "Texts": "文档", + "Delete": "删除", "DisplayName:Any": "所有", "DisplayName:CreationTime": "创建时间", diff --git a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json index 8333d7154..12b6c9a93 100644 --- a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json @@ -8,7 +8,9 @@ "tag": "IdentityServer.Admin" }, "App": { - "TrackingEntitiesChanged": true + "TrackingEntitiesChanged": true, + "SelfUrl": "http://localhost:30015/", + "CorsOrigins": "http://localhost:4200,http://localhost:9527,http://localhost:3100" }, "ConnectionStrings": { "Default": "Server=localhost;Database=IdentityServer;User Id=root;Password=123456", diff --git a/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/AbpMessageServiceHttpApiHostModule.cs b/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/AbpMessageServiceHttpApiHostModule.cs index bde17b2e9..26f4c770a 100644 --- a/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/AbpMessageServiceHttpApiHostModule.cs +++ b/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/AbpMessageServiceHttpApiHostModule.cs @@ -7,7 +7,7 @@ using LINGYUN.Abp.Data.DbMigrator; using LINGYUN.Abp.EventBus.CAP; using LINGYUN.Abp.ExceptionHandling.Notifications; using LINGYUN.Abp.Hangfire.Storage.MySql; -using LINGYUN.Abp.Identity.WeChat; +//using LINGYUN.Abp.Identity.WeChat; using LINGYUN.Abp.IM.SignalR; using LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore; using LINGYUN.Abp.MessageService.EntityFrameworkCore; @@ -27,9 +27,9 @@ using Volo.Abp.AspNetCore.Serilog; using Volo.Abp.Autofac; using Volo.Abp.BackgroundWorkers; using Volo.Abp.Caching.StackExchangeRedis; -using Volo.Abp.Identity.EntityFrameworkCore; +//using Volo.Abp.Identity.EntityFrameworkCore; using Volo.Abp.Modularity; -using Volo.Abp.PermissionManagement.EntityFrameworkCore; +//using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.TenantManagement.EntityFrameworkCore; @@ -42,12 +42,12 @@ namespace LINGYUN.Abp.MessageService typeof(AbpAspNetCoreMultiTenancyModule), typeof(AbpMessageServiceApplicationModule), typeof(AbpMessageServiceHttpApiModule), - typeof(AbpIdentityWeChatModule), + //typeof(AbpIdentityWeChatModule), typeof(AbpMessageServiceEntityFrameworkCoreModule), - typeof(AbpIdentityEntityFrameworkCoreModule), + //typeof(AbpIdentityEntityFrameworkCoreModule), typeof(AbpTenantManagementEntityFrameworkCoreModule), typeof(AbpSettingManagementEntityFrameworkCoreModule), - typeof(AbpPermissionManagementEntityFrameworkCoreModule), + //typeof(AbpPermissionManagementEntityFrameworkCoreModule), typeof(AbpLocalizationManagementEntityFrameworkCoreModule), typeof(AbpDataDbMigratorModule), typeof(AbpAspNetCoreAuthenticationJwtBearerModule), diff --git a/aspnet-core/services/start-all-service.bat b/aspnet-core/services/start-all-service.bat index 34f84feff..664f779ac 100644 --- a/aspnet-core/services/start-all-service.bat +++ b/aspnet-core/services/start-all-service.bat @@ -5,6 +5,7 @@ start .\start-auth-server.bat --run start .\start-identity-server.bat --run start .\start-apigateway-admin.bat --run start .\start-backend-admin.bat --run +start .\start-localization.bat --run start .\start-messages.bat --run start .\start-platform.bat --run ping -n 10 127.1 >nul