From 77c091dbe8ab3acc81a9f1953cfe396135b07881 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Mon, 6 Jan 2020 08:49:04 +0800
Subject: [PATCH] update
Former-commit-id: f2497de9351de4b86f5dc0a3723ff7bbe15859fc
---
projects/ApiGateway/Gateway.json | 258 +++++++++++++++++-
projects/ApiGateway/Program.cs | 11 +-
projects/NuGet.config | 10 +-
projects/WebUI/Properties/launchSettings.json | 10 +-
projects/WebUI/appsettings.json | 4 +-
5 files changed, 276 insertions(+), 17 deletions(-)
diff --git a/projects/ApiGateway/Gateway.json b/projects/ApiGateway/Gateway.json
index 41211664..68e1b367 100644
--- a/projects/ApiGateway/Gateway.json
+++ b/projects/ApiGateway/Gateway.json
@@ -1 +1,257 @@
-{"PluginsStatus":{},"AgentMaxConnection":200,"AgentRequestQueueSize":2000,"GatewayQueueSize":400,"OutputServerAddress":false,"StatisticsEnabled":true,"StatisticsExts":"","WSEnabled":true,"BufferSize":4096,"PoolMaxSize":51200,"InstanceID":"771f61cb790c4bc29a881f55b74bb5df","Servers":[{"Uri":"http://localhost:8012/","MaxConnections":200,"Category":null,"Remark":null,"Properties":[]},{"Uri":"http://localhost:8010/","MaxConnections":200,"Category":null,"Remark":null,"Properties":[]},{"Uri":"http://localhost:8013/","MaxConnections":200,"Category":null,"Remark":null,"Properties":[]},{"Uri":"http://localhost:8011/","MaxConnections":200,"Category":null,"Remark":null,"Properties":[]},{"Uri":"http://localhost:8088/","MaxConnections":200,"Category":null,"Remark":null,"Properties":[]}],"Urls":[{"Servers":[],"PluginConfig":{"Requesting":[],"AgentRequesting":[],"HeaderWriting":[],"Requested":[],"ResponseError":[]},"Url":"*","Remark":null,"HashPattern":null,"MaxRps":0},{"Servers":[{"Url":"http://localhost:8013/","Weight":0,"MaxRps":0}],"PluginConfig":{"Requesting":[],"AgentRequesting":[],"HeaderWriting":[],"Requested":[],"ResponseError":[]},"Url":"/ManagementCenter.*","Remark":null,"HashPattern":null,"MaxRps":0},{"Servers":[],"PluginConfig":{"Requesting":["configuration_website_icon"],"AgentRequesting":[],"HeaderWriting":[],"Requested":[],"ResponseError":[]},"Url":"^/favicon\\.ico","Remark":null,"HashPattern":null,"MaxRps":0},{"Servers":[{"Url":"http://localhost:8012/","Weight":0,"MaxRps":0}],"PluginConfig":{"Requesting":[],"AgentRequesting":[],"HeaderWriting":[],"Requested":[],"ResponseError":[]},"Url":"/StudyCenter.*","Remark":null,"HashPattern":null,"MaxRps":0},{"Servers":[{"Url":"http://localhost:8010/","Weight":0,"MaxRps":0}],"PluginConfig":{"Requesting":[],"AgentRequesting":[],"HeaderWriting":[],"Requested":[],"ResponseError":[]},"Url":"/UserCenter.*","Remark":null,"HashPattern":"","MaxRps":0},{"Servers":[],"PluginConfig":{"Requesting":["configuration_static_resources"],"AgentRequesting":[],"HeaderWriting":[],"Requested":[],"ResponseError":[]},"Url":"^/__system.*","Remark":null,"HashPattern":null,"MaxRps":0},{"Servers":[{"Url":"http://localhost:8011/","Weight":0,"MaxRps":0}],"PluginConfig":{"Requesting":[],"AgentRequesting":[],"HeaderWriting":[],"Requested":[],"ResponseError":[]},"Url":"/IoTCenter.*","Remark":null,"HashPattern":null,"MaxRps":0},{"Servers":[{"Url":"http://localhost:8088/","Weight":0,"MaxRps":0}],"PluginConfig":{"Requesting":[],"AgentRequesting":[],"HeaderWriting":[],"Requested":[],"ResponseError":[]},"Url":"/.*","Remark":null,"HashPattern":null,"MaxRps":0}],"PluginConfig":{"Requesting":[],"AgentRequesting":[],"HeaderWriting":[],"Requested":[],"ResponseError":[]}}
\ No newline at end of file
+{
+ "PluginsStatus": {
+ },
+ "AgentMaxConnection": 200,
+ "AgentRequestQueueSize": 2000,
+ "GatewayQueueSize": 400,
+ "OutputServerAddress": false,
+ "StatisticsEnabled": true,
+ "StatisticsExts": "",
+ "WSEnabled": true,
+ "BufferSize": 4096,
+ "PoolMaxSize": 51200,
+ "InstanceID": "771f61cb790c4bc29a881f55b74bb5df",
+ "Servers": [
+ {
+ "Uri": "http://localhost:8012/",
+ "MaxConnections": 200,
+ "Category": null,
+ "Remark": null,
+ "Properties": [
+ ]
+ },
+ {
+ "Uri": "http://localhost:8010/",
+ "MaxConnections": 200,
+ "Category": null,
+ "Remark": null,
+ "Properties": [
+ ]
+ },
+ {
+ "Uri": "http://localhost:8013/",
+ "MaxConnections": 200,
+ "Category": null,
+ "Remark": null,
+ "Properties": [
+ ]
+ },
+ {
+ "Uri": "http://localhost:8011/",
+ "MaxConnections": 200,
+ "Category": null,
+ "Remark": null,
+ "Properties": [
+ ]
+ },
+ {
+ "Uri": "http://localhost:8088/",
+ "MaxConnections": 200,
+ "Category": null,
+ "Remark": null,
+ "Properties": [
+ ]
+ }
+ ],
+ "Urls": [
+ {
+ "Servers": [
+ ],
+ "PluginConfig": {
+ "Requesting": [
+ ],
+ "AgentRequesting": [
+ ],
+ "HeaderWriting": [
+ ],
+ "Requested": [
+ ],
+ "ResponseError": [
+ ]
+ },
+ "Url": "*",
+ "Remark": null,
+ "HashPattern": null,
+ "MaxRps": 0
+ },
+ {
+ "Servers": [
+ {
+ "Url": "http://localhost:8013/",
+ "Weight": 0,
+ "MaxRps": 0
+ }
+ ],
+ "PluginConfig": {
+ "Requesting": [
+ ],
+ "AgentRequesting": [
+ ],
+ "HeaderWriting": [
+ ],
+ "Requested": [
+ ],
+ "ResponseError": [
+ ]
+ },
+ "Url": "/ManagementCenter.*",
+ "Remark": null,
+ "HashPattern": null,
+ "MaxRps": 0
+ },
+ {
+ "Servers": [
+ ],
+ "PluginConfig": {
+ "Requesting": [
+ "configuration_website_icon"
+ ],
+ "AgentRequesting": [
+ ],
+ "HeaderWriting": [
+ ],
+ "Requested": [
+ ],
+ "ResponseError": [
+ ]
+ },
+ "Url": "^/favicon\\.ico",
+ "Remark": null,
+ "HashPattern": null,
+ "MaxRps": 0
+ },
+ {
+ "Servers": [
+ {
+ "Url": "http://localhost:8012/",
+ "Weight": 0,
+ "MaxRps": 0
+ }
+ ],
+ "PluginConfig": {
+ "Requesting": [
+ ],
+ "AgentRequesting": [
+ ],
+ "HeaderWriting": [
+ ],
+ "Requested": [
+ ],
+ "ResponseError": [
+ ]
+ },
+ "Url": "/StudyCenter.*",
+ "Remark": null,
+ "HashPattern": null,
+ "MaxRps": 0
+ },
+ {
+ "Servers": [
+ {
+ "Url": "http://localhost:8010/",
+ "Weight": 0,
+ "MaxRps": 0
+ }
+ ],
+ "PluginConfig": {
+ "Requesting": [
+ ],
+ "AgentRequesting": [
+ ],
+ "HeaderWriting": [
+ ],
+ "Requested": [
+ ],
+ "ResponseError": [
+ ]
+ },
+ "Url": "/UserCenter.*",
+ "Remark": null,
+ "HashPattern": "",
+ "MaxRps": 0
+ },
+ {
+ "Servers": [
+ ],
+ "PluginConfig": {
+ "Requesting": [
+ "configuration_static_resources"
+ ],
+ "AgentRequesting": [
+ ],
+ "HeaderWriting": [
+ ],
+ "Requested": [
+ ],
+ "ResponseError": [
+ ]
+ },
+ "Url": "^/__system.*",
+ "Remark": null,
+ "HashPattern": null,
+ "MaxRps": 0
+ },
+ {
+ "Servers": [
+ {
+ "Url": "http://localhost:8011/",
+ "Weight": 0,
+ "MaxRps": 0
+ }
+ ],
+ "PluginConfig": {
+ "Requesting": [
+ ],
+ "AgentRequesting": [
+ ],
+ "HeaderWriting": [
+ ],
+ "Requested": [
+ ],
+ "ResponseError": [
+ ]
+ },
+ "Url": "/IoTCenter.*",
+ "Remark": null,
+ "HashPattern": null,
+ "MaxRps": 0
+ },
+ {
+ "Servers": [
+ {
+ "Url": "http://localhost:8020/",
+ "Weight": 0,
+ "MaxRps": 0
+ }
+ ],
+ "PluginConfig": {
+ "Requesting": [
+ ],
+ "AgentRequesting": [
+ ],
+ "HeaderWriting": [
+ ],
+ "Requested": [
+ ],
+ "ResponseError": [
+ ]
+ },
+ "Url": "/.*",
+ "Remark": null,
+ "HashPattern": null,
+ "MaxRps": 0
+ }
+ ],
+ "PluginConfig": {
+ "Requesting": [
+ ],
+ "AgentRequesting": [
+ ],
+ "HeaderWriting": [
+ ],
+ "Requested": [
+ ],
+ "ResponseError": [
+ ]
+ }
+}
\ No newline at end of file
diff --git a/projects/ApiGateway/Program.cs b/projects/ApiGateway/Program.cs
index f185f4de..7a50acf1 100644
--- a/projects/ApiGateway/Program.cs
+++ b/projects/ApiGateway/Program.cs
@@ -3,15 +3,16 @@ using System;
namespace ApiGateway
{
- class Program
+ internal class Program
{
- static Gateway gateway;
- static void Main(string[] args)
+ private static Gateway gateway;
+
+ private static void Main(string[] args)
{
gateway = new Gateway();
gateway.HttpOptions(o =>
{
- o.Port = 80;
+ o.Port = 80;//http://localhost/__system/bumblebee/routes.html
o.LogToConsole = true;
o.LogLevel = BeetleX.EventArgs.LogType.Error;
});
@@ -20,4 +21,4 @@ namespace ApiGateway
Console.Read();
}
}
-}
+}
\ No newline at end of file
diff --git a/projects/NuGet.config b/projects/NuGet.config
index 7af7f3f5..bf5ba148 100644
--- a/projects/NuGet.config
+++ b/projects/NuGet.config
@@ -1,4 +1,6 @@
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
\ No newline at end of file
diff --git a/projects/WebUI/Properties/launchSettings.json b/projects/WebUI/Properties/launchSettings.json
index c59ada48..0df74b81 100644
--- a/projects/WebUI/Properties/launchSettings.json
+++ b/projects/WebUI/Properties/launchSettings.json
@@ -1,9 +1,9 @@
{
"iisSettings": {
- "windowsAuthentication": false,
- "anonymousAuthentication": true,
+ "windowsAuthentication": false,
+ "anonymousAuthentication": true,
"iisExpress": {
- "applicationUrl": "http://localhost:8088",
+ "applicationUrl": "http://localhost:8020",
"sslPort": 0
}
},
@@ -18,10 +18,10 @@
"WebUI": {
"commandName": "Project",
"launchBrowser": true,
- "applicationUrl": "http://localhost:8088",
+ "applicationUrl": "http://localhost:8020",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
-}
+}
\ No newline at end of file
diff --git a/projects/WebUI/appsettings.json b/projects/WebUI/appsettings.json
index f9f556a0..66115980 100644
--- a/projects/WebUI/appsettings.json
+++ b/projects/WebUI/appsettings.json
@@ -7,6 +7,6 @@
}
},
"AllowedHosts": "*",
- "server.urls": "http://*:8088",
+ "server.urls": "http://*:8020",
"FrontEnd": false
-}
+}
\ No newline at end of file