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/en.json b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain.Shared/LINGYUN/ApiGateway/Localization/DomainShared/en.json index 5ef07596c..7ceb108d4 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain.Shared/LINGYUN/ApiGateway/Localization/DomainShared/en.json +++ b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain.Shared/LINGYUN/ApiGateway/Localization/DomainShared/en.json @@ -16,60 +16,125 @@ "Side:ClusterOcelot": "Server cluster", "Side:ClusterOcelot:ServerList": "Server list", "Submit": "Save changed", - "Basic": "Basic options", - "BaseUrl": "Baseurl", - "RequestIdKey": "RequestIdKey", - "DownstreamScheme": "DownstreamScheme", - "Qos": "Qos options", - "ExceptionsAllowedBeforeBreaking": "Max exception", - "DurationOfBreak": "Melting(ms)", - "TimeoutValue": "Timeout(ms)", - "RateLimit": "Rate limit", - "ClientIdHeader": "ClientIdHeader", - "QuotaExceededMessage": "Exceeded message", - "HttpStatusCode": "Httpcode", - "DisableRateLimitHeaders": "Disable header", - "HttpOptions": "Http options", "HttpHandler": "Http handler", "OtherOptions": "Other options", - "AllowAutoRedirect": "Auto rediret", - "UseCookieContainer": "Cookie container", - "UseProxy": "Http proxy", - "UseTracing": "Http track", - "LoadBalancer": "Load balancer", "LoadWay": "Balancer type", - "ServiceDiscovery": "Service discovery", - "DiscoveryType": "Service type", - "Host": "Host", - "Port": "Port", "RouteName": "Route name", - "ServiceName": "Service name", - "UpstreamPathTemplate": "UpstreamPathTemplate", - "DownstreamPathTemplate": "DownstreamPathTemplate", - "UpstreamHttpMethod": "UpstreamHttpMethod", - "DownstreamHostAndPorts": "DownstreamHostAndPorts", - "RouteClaimsRequirement": "RouteClaimsRequirement", - "AggregateKey": "AggregateKey", - "Priority": "Priority", + + /////聚合路由 + "AggregateRoutes": "Aggregate Routes", + "AggregateRoute:ManageRouteConfig": "Manage Route Config", + "AggregateRoute:AddNew": "Add", + "AggregateRoute:EditBy": "Edit - {0}", + + "DisplayName:Name": "Name", + "DisplayName:UpstreamPathTemplate": "Upstream Path Template", + "DisplayName:RouteKeys": "ReRouteKeys", + "DisplayName:UpstreamHost": "Upstream Host", + "DisplayName:Aggregator": "Aggregator", + "DisplayName:Priority": "Priority", + + "DisplayName:Parameter": "Parameter", + "DisplayName:JsonPath": "JsonPath", + + "DisplayName:AppId": "AppId", + "DisplayName:CaseSensitive": "Case Sensitive", + "DisplayName:UpstreamHttpMethod": "Upstream Http Method", + "DisplayName:RouteKey": "ReRouteKey", + + /////路由分组 + "Groups": "Groups", + "Group:EditBy": "Edit - {0}", + "Group:AddNew": "Add", + + "DisplayName:AppName": "AppName", + "DisplayName:AppAddress": "AppAddress", + "DisplayName:IsActive": "IsActive", + "DisplayName:Description": "Description", + + /////公共配置 + "Globals": "Globals", + "Global:EditBy": "Edit - {0}", + "Global:AddNew": "Add", + + "DisplayName:BaseUrl": "Base Url", + "DisplayName:RequestIdKey": "RequestIdKey", + "DisplayName:DownstreamScheme": "Downstream Scheme", + "DisplayName:DownstreamHttpVersion": "Downstream Http Version", + + "Basic": "Basic", + "Qos": "Qos", + "HttpOptions": "Http Options", + "RateLimit": "Rate Limit", + "LoadBalancer": "Load Balancer", + "ServiceDiscovery": "Service Discovery", + + "DisplayName:MaxConnectionsPerServer": "Max Connections Per Server", + "DisplayName:UseProxy": "Use HTTP Proxy", + "DisplayName:UseTracing": "Use HTTP Tracing", + "DisplayName:AllowAutoRedirect": "Allow Auto Redirect", + "DisplayName:UseCookieContainer": "Use Cookie Container", + "DisplayName:DisableRateLimitHeaders": "Disable Rate Limit Headers", + "DisplayName:ClientIdHeader": "ClientIdHeader", + "DisplayName:HttpStatusCode": "Http Status Code", + "DisplayName:RateLimitCounterPrefix": "Rate Limit Counter Prefix", + "DisplayName:QuotaExceededMessage": "Quota Exceeded Message", + "DisplayName:TimeoutValue": "Timeout(ms)", + "DisplayName:DurationOfBreak": "Duration Of Break(ms)", + "DisplayName:ExceptionsAllowedBeforeBreaking": "Exceptions Allowed Before Breaking", + "DisplayName:LoadBalancerType": "LoadBalancer Type", + "DisplayName:PollingKey": "PollingKey", + "DisplayName:Expiry": "Expiry", + "DisplayName:DiscoveryType": "Discovery Type", + "DisplayName:Host": "Host", + "DisplayName:Port": "Port", + "DisplayName:Token": "Token", + "DisplayName:ConfigurationKey": "ConfigurationKey", + "DisplayName:Namespace": "Namespace", + "DisplayName:Scheme": "Scheme", + "DisplayName:PollingInterval": "Polling Interval(ms)", + "DisplayName:Enable": "Enable", + "DisplayName:Disable": "Disable", + + /////路由 + "Routes": "Routes", + "Route:EditBy": "Edit - {0}", + "Route:AddNew": "Add", + + "DisplayName:DownstreamPathTemplate": "Downstream Path Template", + "DisplayName:DownstreamHostAndPorts": "Downstream Host And Ports", + "DisplayName:Timeout": "Timeout(ms)", + "DisplayName:ServiceName": "Service Name", + + "Forward": "Forward", + "RequestProcessing": "Request Processing", + "SecurityOptions": "Security Options", + + "DisplayName:DangerousAcceptAnyServerCertificateValidator": "Dangerous Accept Any Server Certificate Validator", + "DisplayName:AggregateKey": "Aggregate Key", + "DisplayName:DownstreamHttpMethod": "Downstream Http Method", + "DisplayName:AddClaimsToRequest": "Add Claims To Request", + "DisplayName:AddHeadersToRequest": "Add Headers To Request", + "DisplayName:UpstreamHeaderTransform": "Upstream Header Transform", + "DisplayName:DownstreamHeaderTransform": "Downstream Header Transform", + "DisplayName:ChangeDownstreamPathTemplate": "Change Downstream Path Template", + "DisplayName:RouteClaimsRequirement": "Route Claims Requirement", + "DisplayName:DelegatingHandlers": "Delegating Handlers", + "DisplayName:Limit": "Limit", + "DisplayName:Period": "Period", + "DisplayName:PeriodTimespan": "Period Timespan(s)", + "DisplayName:ClientWhitelist": "Client White list", + "DisplayName:AuthenticationProviderKey": "Authentication Provider Key", + "DisplayName:AllowedScopes": "Allowed Scopes", + "DisplayName:IpAllowedList": "Ip Allowed List", + "DisplayName:IpBlockedList": "Ip Blocked List", + + ///// "CertificateValidator": "CertificateValidator", - "CaseSensitive": "CaseSensitive", - "UpstreamHeaderTransform": "UpstreamHeaderTransform", - "DownstreamHeaderTransform": "DownstreamHeaderTransform", - "AddHeadersToRequest": "AddHeadersToRequest", - "AddClaimsToRequest": "AddClaimsToRequest", "AddQueriesToRequest": "AddQueriesToRequest", - "ClientWhitelist": "Client whitelist", - "Limit": "Limit", - "PeriodTimespan": "PeriodTimespan(s)", - "Period": "Period", "EnableRateLimiting": "EnableRateLimiting", - "AuthenticationProviderKey": "AuthenticationProviderKey", - "AllowedScopes": "AllowedScopes", - "IpAllowedList": "IpAllowedList", - "IpBlockedList": "IpBlockedList", - "SecurityOptions": "SecurityOptions", "RefreshList": "RefreshList", - "AddReoute": "AddReoute", + "AddRoute": "AddRoute", "EditRoute": "EditRoute", "DeleteSelection": "DeleteSelection", "DeleteAll": "DeleteAll", 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..8513b0bbd 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,60 +16,125 @@ "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": "添加路由", + "AddRoute": "添加路由", "EditRoute": "编辑路由", "DeleteSelection": "删除选择", "DeleteAll": "删除所有", diff --git a/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/en.json b/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/en.json index df3179afe..abf0296f0 100644 --- a/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/en.json +++ b/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/en.json @@ -1,6 +1,10 @@ { "culture": "en", "texts": { + "Languages": "Languages", + "Resources": "Resources", + "Texts": "Texts", + "Delete": "Delete", "DisplayName:Any": "Any", "DisplayName:CreationTime": "Creation Time", 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/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