Skip to content

Commit fc931a6

Browse files
fix: resolve conflito de merge no ocelot.Development.json
1 parent 80e1dd4 commit fc931a6

1 file changed

Lines changed: 10 additions & 115 deletions

File tree

Lines changed: 10 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,151 +1,46 @@
11
{
22
"Routes": [
33
{
4-
<<<<<<< HEAD
5-
"DownstreamPathTemplate": "/backend/Usuarios/{catchAll}",
4+
"DownstreamPathTemplate": "/api/Auth/{catchAll}",
65
"DownstreamScheme": "http",
7-
"DownstreamHostAndPorts": [
8-
{ "Host": "localhost", "Port": 5133 }
9-
],
6+
"DownstreamHostAndPorts": [ { "Host": "localhost", "Port": 5133 } ],
107
"UpstreamPathTemplate": "/backend/Usuarios/{catchAll}",
118
"UpstreamHttpMethod": ["Get", "Post", "Put", "Delete", "Patch", "Options"]
129
},
1310
{
14-
"DownstreamPathTemplate": "/backend/Usuarios",
11+
"DownstreamPathTemplate": "/api/Clientes/{catchAll}",
1512
"DownstreamScheme": "http",
16-
"DownstreamHostAndPorts": [
17-
{ "Host": "localhost", "Port": 5133 }
18-
],
19-
"UpstreamPathTemplate": "/backend/Usuarios",
20-
"UpstreamHttpMethod": ["Get", "Post", "Put", "Delete", "Patch", "Options"]
21-
},
22-
{
23-
"DownstreamPathTemplate": "/backend/Clientes/{catchAll}",
24-
=======
25-
26-
"DownstreamPathTemplate": "/api/Auth/{everything}",
27-
"DownstreamScheme": "http",
28-
"DownstreamHostAndPorts": [
29-
{ "Host": "localhost", "Port": 5133 }
30-
],
31-
"UpstreamPathTemplate": "/backend/Usuarios/{everything}",
32-
"UpstreamHttpMethod": ["Get", "Post", "Put", "Delete", "Patch", "Options"]
33-
34-
},
35-
{
36-
"DownstreamPathTemplate": "/api/Clientes/{everything}",
37-
>>>>>>> 70f559d076e9b20e675a271cfb76afd57b2413f0
38-
"DownstreamScheme": "http",
39-
"DownstreamHostAndPorts": [
40-
{ "Host": "localhost", "Port": 5156 }
41-
],
42-
<<<<<<< HEAD
13+
"DownstreamHostAndPorts": [ { "Host": "localhost", "Port": 5156 } ],
4314
"UpstreamPathTemplate": "/backend/Clientes/{catchAll}",
4415
"UpstreamHttpMethod": ["Get", "Post", "Put", "Delete", "Patch", "Options"]
4516
},
4617
{
47-
"DownstreamPathTemplate": "/backend/Clientes",
18+
"DownstreamPathTemplate": "/api/Emprestimos/{catchAll}",
4819
"DownstreamScheme": "http",
49-
"DownstreamHostAndPorts": [
50-
{ "Host": "localhost", "Port": 5156 }
51-
],
52-
"UpstreamPathTemplate": "/backend/Clientes",
53-
"UpstreamHttpMethod": ["Get", "Post", "Put", "Delete", "Patch", "Options"]
54-
},
55-
{
56-
"DownstreamPathTemplate": "/backend/Emprestimos/{catchAll}",
57-
=======
58-
"UpstreamPathTemplate": "/backend/Clientes/{everything}",
59-
"UpstreamHttpMethod": ["Get", "Post", "Put", "Delete", "Patch", "Options"]
60-
},
61-
{
62-
"DownstreamPathTemplate": "/api/Emprestimos/{everything}",
63-
>>>>>>> 70f559d076e9b20e675a271cfb76afd57b2413f0
64-
"DownstreamScheme": "http",
65-
"DownstreamHostAndPorts": [
66-
{ "Host": "localhost", "Port": 5276 }
67-
],
68-
<<<<<<< HEAD
20+
"DownstreamHostAndPorts": [ { "Host": "localhost", "Port": 5276 } ],
6921
"UpstreamPathTemplate": "/backend/Emprestimos/{catchAll}",
7022
"UpstreamHttpMethod": ["Get", "Post", "Put", "Delete", "Patch", "Options"]
7123
},
7224
{
73-
"DownstreamPathTemplate": "/backend/Emprestimos",
74-
"DownstreamScheme": "http",
75-
"DownstreamHostAndPorts": [
76-
{ "Host": "localhost", "Port": 5276 }
77-
],
78-
"UpstreamPathTemplate": "/backend/Emprestimos",
79-
"UpstreamHttpMethod": ["Get", "Post", "Put", "Delete", "Patch", "Options"]
80-
},
81-
{
82-
"DownstreamPathTemplate": "/backend/Notificacoes/{catchAll}",
25+
"DownstreamPathTemplate": "/api/Notificacoes/{catchAll}",
8326
"DownstreamScheme": "http",
84-
"DownstreamHostAndPorts": [
85-
{ "Host": "localhost", "Port": 5243 }
86-
],
27+
"DownstreamHostAndPorts": [ { "Host": "localhost", "Port": 5243 } ],
8728
"UpstreamPathTemplate": "/backend/Notificacoes/{catchAll}",
8829
"UpstreamHttpMethod": ["Get", "Post", "Put", "Delete", "Patch", "Options"]
8930
},
9031
{
91-
"DownstreamPathTemplate": "/backend/Notificacoes",
32+
"DownstreamPathTemplate": "/api/report/{catchAll}",
9233
"DownstreamScheme": "http",
93-
"DownstreamHostAndPorts": [
94-
{ "Host": "localhost", "Port": 5243 }
95-
],
96-
"UpstreamPathTemplate": "/backend/Notificacoes",
97-
"UpstreamHttpMethod": ["Get", "Post", "Put", "Delete", "Patch", "Options"]
98-
},
99-
{
100-
"DownstreamPathTemplate": "/backend/Report/{catchAll}",
101-
=======
102-
"UpstreamPathTemplate": "/backend/Emprestimos/{everything}",
103-
"UpstreamHttpMethod": ["Get", "Post", "Put", "Delete", "Patch", "Options"]
104-
},
105-
{
106-
"DownstreamPathTemplate": "/api/report/{everything}",
107-
>>>>>>> 70f559d076e9b20e675a271cfb76afd57b2413f0
108-
"DownstreamScheme": "http",
109-
"DownstreamHostAndPorts": [
110-
{ "Host": "localhost", "Port": 5169 }
111-
],
112-
<<<<<<< HEAD
34+
"DownstreamHostAndPorts": [ { "Host": "localhost", "Port": 5169 } ],
11335
"UpstreamPathTemplate": "/backend/Report/{catchAll}",
11436
"UpstreamHttpMethod": ["Get", "Post", "Put", "Delete", "Patch", "Options"]
115-
},
116-
{
117-
"DownstreamPathTemplate": "/backend/Report",
118-
"DownstreamScheme": "http",
119-
"DownstreamHostAndPorts": [
120-
{ "Host": "localhost", "Port": 5169 }
121-
],
122-
"UpstreamPathTemplate": "/backend/Report",
123-
=======
124-
"UpstreamPathTemplate": "/backend/Report/{everything}",
125-
"UpstreamHttpMethod": ["Get", "Post", "Put", "Delete", "Patch", "Options"]
126-
},
127-
{
128-
"DownstreamPathTemplate": "/api/Notificacoes/{everything}",
129-
"DownstreamScheme": "http",
130-
"DownstreamHostAndPorts": [
131-
{ "Host": "localhost", "Port": 5243 }
132-
],
133-
"UpstreamPathTemplate": "/backend/Notificacoes/{everything}",
134-
>>>>>>> 70f559d076e9b20e675a271cfb76afd57b2413f0
135-
"UpstreamHttpMethod": ["Get", "Post", "Put", "Delete", "Patch", "Options"]
13637
}
13738
],
13839
"GlobalConfiguration": {
139-
<<<<<<< HEAD
14040
"BaseUrl": "http://localhost:5046",
14141
"UnauthorizedResponse": {
14242
"statusCode": 401,
14343
"message": "Unauthorized. Please provide a valid token."
14444
}
14545
}
14646
}
147-
=======
148-
"BaseUrl": "http://localhost:5046"
149-
}
150-
}
151-
>>>>>>> 70f559d076e9b20e675a271cfb76afd57b2413f0

0 commit comments

Comments
 (0)