diff --git a/apps/vue/src/api/messages/subscribes.ts b/apps/vue/src/api/messages/subscribes.ts index c5a2a75a8..d69e1c6d7 100644 --- a/apps/vue/src/api/messages/subscribes.ts +++ b/apps/vue/src/api/messages/subscribes.ts @@ -3,9 +3,9 @@ import { UserSubscreNotificationListResult } from './model/subscribesModel'; import { format } from '/@/utils/strings'; enum Api { - GetAll = '/api/my-subscribes/all', - Subscribe = '/api/my-subscribes', - UnSubscribe = '/api/my-subscribes?name={name}', + GetAll = '/api/notifications/my-subscribes/all', + Subscribe = '/api/notifications/my-subscribes', + UnSubscribe = '/api/notifications/my-subscribes?name={name}', } export const getAll = () => { diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/ocelot.Development.json b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/ocelot.Development.json index cd0c241a5..6e0628daf 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/ocelot.Development.json +++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/ocelot.Development.json @@ -1215,7 +1215,7 @@ } }, { - "DownstreamPathTemplate": "/api/my-subscribes", + "DownstreamPathTemplate": "/api/notifications/{everything}", "DownstreamScheme": "http", "DownstreamHostAndPorts": [ { @@ -1223,175 +1223,7 @@ "Port": 30020 } ], - "UpstreamPathTemplate": "/api/my-subscribes", - "UpstreamHttpMethod": [ - "GET", - "POST", - "PUT", - "DELETE" - ], - "LoadBalancerOptions": { - "Type": "RoundRobin" - }, - "RateLimitOptions": { - "ClientWhitelist": [], - "EnableRateLimiting": true, - "Period": "1s", - "PeriodTimespan": 1, - "Limit": 100 - }, - "QoSOptions": { - "ExceptionsAllowedBeforeBreaking": 10, - "DurationOfBreak": 1000, - "TimeoutValue": 10000 - }, - "HttpHandlerOptions": { - "UseTracing": true - }, - "Priority": 99 - }, - { - "DownstreamPathTemplate": "/api/my-subscribes/{everything}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "127.0.0.1", - "Port": 30020 - } - ], - "UpstreamPathTemplate": "/api/my-subscribes/{everything}", - "UpstreamHttpMethod": [ - "GET", - "POST", - "PUT", - "DELETE" - ], - "LoadBalancerOptions": { - "Type": "RoundRobin" - }, - "RateLimitOptions": { - "ClientWhitelist": [], - "EnableRateLimiting": true, - "Period": "1s", - "PeriodTimespan": 1, - "Limit": 100 - }, - "QoSOptions": { - "ExceptionsAllowedBeforeBreaking": 10, - "DurationOfBreak": 1000, - "TimeoutValue": 10000 - }, - "HttpHandlerOptions": { - "UseTracing": true - } - }, - { - "DownstreamPathTemplate": "/api/my-subscribes/all", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "127.0.0.1", - "Port": 30020 - } - ], - "UpstreamPathTemplate": "/api/my-subscribes/all", - "UpstreamHttpMethod": [ - "GET" - ], - "LoadBalancerOptions": { - "Type": "RoundRobin" - }, - "RateLimitOptions": { - "ClientWhitelist": [], - "EnableRateLimiting": true, - "Period": "1s", - "PeriodTimespan": 1, - "Limit": 100 - }, - "QoSOptions": { - "ExceptionsAllowedBeforeBreaking": 10, - "DurationOfBreak": 1000, - "TimeoutValue": 10000 - }, - "HttpHandlerOptions": { - "UseTracing": true - }, - "Priority": 99, - "Key": "my-subscribes" - }, - { - "DownstreamPathTemplate": "/api/notifications/notifilers/{everything}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "127.0.0.1", - "Port": 30020 - } - ], - "UpstreamPathTemplate": "/api/notifications/notifilers/{everything}", - "UpstreamHttpMethod": [ - "GET", - "POST" - ], - "LoadBalancerOptions": { - "Type": "RoundRobin" - }, - "RateLimitOptions": { - "ClientWhitelist": [], - "EnableRateLimiting": true, - "Period": "1s", - "PeriodTimespan": 1, - "Limit": 100 - }, - "QoSOptions": { - "ExceptionsAllowedBeforeBreaking": 10, - "DurationOfBreak": 1000, - "TimeoutValue": 10000 - }, - "HttpHandlerOptions": { - "UseTracing": true - } - }, - { - "DownstreamPathTemplate": "/api/notifications/my-notifilers", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "127.0.0.1", - "Port": 30020 - } - ], - "UpstreamPathTemplate": "/api/notifications/my-notifilers", - "UpstreamHttpMethod": [ "GET" ], - "LoadBalancerOptions": { - "Type": "RoundRobin" - }, - "RateLimitOptions": { - "ClientWhitelist": [], - "EnableRateLimiting": true, - "Period": "1s", - "PeriodTimespan": 1, - "Limit": 100 - }, - "QoSOptions": { - "ExceptionsAllowedBeforeBreaking": 10, - "DurationOfBreak": 1000, - "TimeoutValue": 10000 - }, - "HttpHandlerOptions": { - "UseTracing": true - } - }, - { - "DownstreamPathTemplate": "/api/notifications/my-notifilers/{id}", - "DownstreamScheme": "http", - "DownstreamHostAndPorts": [ - { - "Host": "127.0.0.1", - "Port": 30020 - } - ], - "UpstreamPathTemplate": "/api/notifications/my-notifilers/{id}", + "UpstreamPathTemplate": "/api/notifications/{everything}", "UpstreamHttpMethod": [ "GET", "POST", @@ -2058,14 +1890,6 @@ "UpstreamPathTemplate": "/api/setting-management/settings/by-current-user", "Aggregator": "AbpResponseMergeAggregator", "Priority": 99 - }, - { - "RouteKeys": [ - "my-subscribes" - ], - "UpstreamPathTemplate": "/api/my-subscribes/assignables-notifilers", - "Aggregator": "AbpResponseMergeAggregator", - "Priority": 99 } ] } \ No newline at end of file