TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-11 18:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

源站支持HTTP/2

Browse Source
This commit is contained in:
刘祥超
2023-06-23 11:43:36 +08:00
parent 8feae0a80f
commit 40d6c7f87b
12 changed files with 158 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
internal/web/actions/default/servers/addOriginPopup.go
View File

@@ -37,9 +37,10 @@ func (this *AddOriginPopupAction) RunPost(params struct {
Protocol string Protocol string
Addr string Addr string
DomainsJSON []byte DomainsJSON []byte
Host string Host string
FollowPort bool FollowPort bool
Http2Enabled bool
Must *actions.Must Must *actions.Must
}) { }) {
@@ -149,15 +150,16 @@ func (this *AddOriginPopupAction) RunPost(params struct {
} }
resp, err := this.RPC().OriginRPC().CreateOrigin(this.AdminContext(), &pb.CreateOriginRequest{ resp, err := this.RPC().OriginRPC().CreateOrigin(this.AdminContext(), &pb.CreateOriginRequest{
Name: "", Name: "",
Addr: pbAddr, Addr: pbAddr,
OssJSON: ossJSON, OssJSON: ossJSON,
Description: "", Description: "",
Weight: 10, Weight: 10,
IsOn: true, IsOn: true,
Domains: domains, Domains: domains,
Host: params.Host, Host: params.Host,
FollowPort: params.FollowPort, FollowPort: params.FollowPort,
Http2Enabled: params.Http2Enabled,
}) })
if err != nil { if err != nil {
this.ErrorPage(err) this.ErrorPage(err)

42
internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/index.go
View File

@@ -57,16 +57,17 @@ func (this *IndexAction) RunGet(params struct {
originConfig.Domains = []string{} originConfig.Domains = []string{}
} }
var m = maps.Map{ var m = maps.Map{
"id": originConfig.Id, "id": originConfig.Id,
"weight": originConfig.Weight, "weight": originConfig.Weight,
"addr": originConfig.AddrSummary(), "addr": originConfig.AddrSummary(),
"isOSS": originConfig.IsOSS(), "isOSS": originConfig.IsOSS(),
"name": originConfig.Name, "name": originConfig.Name,
"isOn": originConfig.IsOn, "isOn": originConfig.IsOn,
"domains": originConfig.Domains, "domains": originConfig.Domains,
"hasCert": originConfig.Cert != nil, "hasCert": originConfig.Cert != nil,
"host": originConfig.RequestHost, "host": originConfig.RequestHost,
"followPort": originConfig.FollowPort, "followPort": originConfig.FollowPort,
"http2Enabled": originConfig.HTTP2Enabled,
} }
primaryOriginMaps = append(primaryOriginMaps, m) primaryOriginMaps = append(primaryOriginMaps, m)
} }
@@ -75,16 +76,17 @@ func (this *IndexAction) RunGet(params struct {
originConfig.Domains = []string{} originConfig.Domains = []string{}
} }
var m = maps.Map{ var m = maps.Map{
"id": originConfig.Id, "id": originConfig.Id,
"weight": originConfig.Weight, "weight": originConfig.Weight,
"addr": originConfig.AddrSummary(), "addr": originConfig.AddrSummary(),
"isOSS": originConfig.IsOSS(), "isOSS": originConfig.IsOSS(),
"name": originConfig.Name, "name": originConfig.Name,
"isOn": originConfig.IsOn, "isOn": originConfig.IsOn,
"domains": originConfig.Domains, "domains": originConfig.Domains,
"hasCert": originConfig.Cert != nil, "hasCert": originConfig.Cert != nil,
"host": originConfig.RequestHost, "host": originConfig.RequestHost,
"followPort": originConfig.FollowPort, "followPort": originConfig.FollowPort,
"http2Enabled": originConfig.HTTP2Enabled,
} }
backupOriginMaps = append(backupOriginMaps, m) backupOriginMaps = append(backupOriginMaps, m)
} }

42
internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/index.go
View File

@@ -57,16 +57,17 @@ func (this *IndexAction) RunGet(params struct {
originConfig.Domains = []string{} originConfig.Domains = []string{}
} }
m := maps.Map{ m := maps.Map{
"id": originConfig.Id, "id": originConfig.Id,
"weight": originConfig.Weight, "weight": originConfig.Weight,
"addr": originConfig.AddrSummary(), "addr": originConfig.AddrSummary(),
"isOSS": originConfig.IsOSS(), "isOSS": originConfig.IsOSS(),
"name": originConfig.Name, "name": originConfig.Name,
"isOn": originConfig.IsOn, "isOn": originConfig.IsOn,
"domains": originConfig.Domains, "domains": originConfig.Domains,
"hasCert": originConfig.Cert != nil, "hasCert": originConfig.Cert != nil,
"host": originConfig.RequestHost, "host": originConfig.RequestHost,
"followPort": originConfig.FollowPort, "followPort": originConfig.FollowPort,
"http2Enabled": originConfig.HTTP2Enabled,
} }
primaryOriginMaps = append(primaryOriginMaps, m) primaryOriginMaps = append(primaryOriginMaps, m)
} }
@@ -75,16 +76,17 @@ func (this *IndexAction) RunGet(params struct {
originConfig.Domains = []string{} originConfig.Domains = []string{}
} }
m := maps.Map{ m := maps.Map{
"id": originConfig.Id, "id": originConfig.Id,
"weight": originConfig.Weight, "weight": originConfig.Weight,
"addr": originConfig.AddrSummary(), "addr": originConfig.AddrSummary(),
"isOSS": originConfig.IsOSS(), "isOSS": originConfig.IsOSS(),
"name": originConfig.Name, "name": originConfig.Name,
"isOn": originConfig.IsOn, "isOn": originConfig.IsOn,
"domains": originConfig.Domains, "domains": originConfig.Domains,
"hasCert": originConfig.Cert != nil, "hasCert": originConfig.Cert != nil,
"host": originConfig.RequestHost, "host": originConfig.RequestHost,
"followPort": originConfig.FollowPort, "followPort": originConfig.FollowPort,
"http2Enabled": originConfig.HTTP2Enabled,
} }
backupOriginMaps = append(backupOriginMaps, m) backupOriginMaps = append(backupOriginMaps, m)
} }

42
internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/index.go
View File

@@ -57,16 +57,17 @@ func (this *IndexAction) RunGet(params struct {
originConfig.Domains = []string{} originConfig.Domains = []string{}
} }
var m = maps.Map{ var m = maps.Map{
"id": originConfig.Id, "id": originConfig.Id,
"weight": originConfig.Weight, "weight": originConfig.Weight,
"addr": originConfig.AddrSummary(), "addr": originConfig.AddrSummary(),
"isOSS": originConfig.IsOSS(), "isOSS": originConfig.IsOSS(),
"name": originConfig.Name, "name": originConfig.Name,
"isOn": originConfig.IsOn, "isOn": originConfig.IsOn,
"domains": originConfig.Domains, "domains": originConfig.Domains,
"hasCert": originConfig.Cert != nil, "hasCert": originConfig.Cert != nil,
"host": originConfig.RequestHost, "host": originConfig.RequestHost,
"followPort": originConfig.FollowPort, "followPort": originConfig.FollowPort,
"http2Enabled": originConfig.HTTP2Enabled,
} }
primaryOriginMaps = append(primaryOriginMaps, m) primaryOriginMaps = append(primaryOriginMaps, m)
} }
@@ -75,16 +76,17 @@ func (this *IndexAction) RunGet(params struct {
originConfig.Domains = []string{} originConfig.Domains = []string{}
} }
var m = maps.Map{ var m = maps.Map{
"id": originConfig.Id, "id": originConfig.Id,
"weight": originConfig.Weight, "weight": originConfig.Weight,
"addr": originConfig.AddrSummary(), "addr": originConfig.AddrSummary(),
"isOSS": originConfig.IsOSS(), "isOSS": originConfig.IsOSS(),
"name": originConfig.Name, "name": originConfig.Name,
"isOn": originConfig.IsOn, "isOn": originConfig.IsOn,
"domains": originConfig.Domains, "domains": originConfig.Domains,
"hasCert": originConfig.Cert != nil, "hasCert": originConfig.Cert != nil,
"host": originConfig.RequestHost, "host": originConfig.RequestHost,
"followPort": originConfig.FollowPort, "followPort": originConfig.FollowPort,
"http2Enabled": originConfig.HTTP2Enabled,
} }
backupOriginMaps = append(backupOriginMaps, m) backupOriginMaps = append(backupOriginMaps, m)
} }

42
internal/web/actions/default/servers/server/settings/locations/reverseProxy/index.go
View File

@@ -58,16 +58,17 @@ func (this *IndexAction) RunGet(params struct {
originConfig.Domains = []string{} originConfig.Domains = []string{}
} }
var m = maps.Map{ var m = maps.Map{
"id": originConfig.Id, "id": originConfig.Id,
"weight": originConfig.Weight, "weight": originConfig.Weight,
"addr": originConfig.AddrSummary(), "addr": originConfig.AddrSummary(),
"isOSS": originConfig.IsOSS(), "isOSS": originConfig.IsOSS(),
"name": originConfig.Name, "name": originConfig.Name,
"isOn": originConfig.IsOn, "isOn": originConfig.IsOn,
"domains": originConfig.Domains, "domains": originConfig.Domains,
"hasCert": originConfig.Cert != nil, "hasCert": originConfig.Cert != nil,
"host": originConfig.RequestHost, "host": originConfig.RequestHost,
"followPort": originConfig.FollowPort, "followPort": originConfig.FollowPort,
"http2Enabled": originConfig.HTTP2Enabled,
} }
primaryOriginMaps = append(primaryOriginMaps, m) primaryOriginMaps = append(primaryOriginMaps, m)
} }
@@ -76,16 +77,17 @@ func (this *IndexAction) RunGet(params struct {
originConfig.Domains = []string{} originConfig.Domains = []string{}
} }
var m = maps.Map{ var m = maps.Map{
"id": originConfig.Id, "id": originConfig.Id,
"weight": originConfig.Weight, "weight": originConfig.Weight,
"addr": originConfig.AddrSummary(), "addr": originConfig.AddrSummary(),
"isOSS": originConfig.IsOSS(), "isOSS": originConfig.IsOSS(),
"name": originConfig.Name, "name": originConfig.Name,
"isOn": originConfig.IsOn, "isOn": originConfig.IsOn,
"domains": originConfig.Domains, "domains": originConfig.Domains,
"hasCert": originConfig.Cert != nil, "hasCert": originConfig.Cert != nil,
"host": originConfig.RequestHost, "host": originConfig.RequestHost,
"followPort": originConfig.FollowPort, "followPort": originConfig.FollowPort,
"http2Enabled": originConfig.HTTP2Enabled,
} }
backupOriginMaps = append(backupOriginMaps, m) backupOriginMaps = append(backupOriginMaps, m)
} }

8
internal/web/actions/default/servers/server/settings/origins/addPopup.go
View File

@@ -70,9 +70,10 @@ func (this *AddPopupAction) RunPost(params struct {
CertIdsJSON []byte CertIdsJSON []byte
DomainsJSON []byte DomainsJSON []byte
Host string Host string
FollowPort bool FollowPort bool
Http2Enabled bool
Description string Description string
IsOn bool IsOn bool
@@ -248,6 +249,7 @@ func (this *AddPopupAction) RunPost(params struct {
Domains: domains, Domains: domains,
Host: params.Host, Host: params.Host,
FollowPort: params.FollowPort, FollowPort: params.FollowPort,
Http2Enabled: params.Http2Enabled,
}) })
if err != nil { if err != nil {
this.ErrorPage(err) this.ErrorPage(err)

9
internal/web/actions/default/servers/server/settings/origins/updatePopup.go
View File

@@ -115,6 +115,7 @@ func (this *UpdatePopupAction) RunGet(params struct {
"domains": config.Domains, "domains": config.Domains,
"host": config.RequestHost, "host": config.RequestHost,
"followPort": config.FollowPort, "followPort": config.FollowPort,
"http2Enabled": config.HTTP2Enabled,
"oss": config.OSS, "oss": config.OSS,
} }
@@ -142,9 +143,10 @@ func (this *UpdatePopupAction) RunPost(params struct {
CertIdsJSON []byte CertIdsJSON []byte
DomainsJSON []byte DomainsJSON []byte
Host string Host string
FollowPort bool FollowPort bool
Http2Enabled bool
Description string Description string
IsOn bool IsOn bool
@@ -323,6 +325,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
Domains: domains, Domains: domains,
Host: params.Host, Host: params.Host,
FollowPort: params.FollowPort, FollowPort: params.FollowPort,
Http2Enabled: params.Http2Enabled,
}) })
if err != nil { if err != nil {
this.ErrorPage(err) this.ErrorPage(err)

42
internal/web/actions/default/servers/server/settings/reverseProxy/index.go
View File

@@ -85,16 +85,17 @@ func (this *IndexAction) RunGet(params struct {
originConfig.Domains = []string{} originConfig.Domains = []string{}
} }
var m = maps.Map{ var m = maps.Map{
"id": originConfig.Id, "id": originConfig.Id,
"weight": originConfig.Weight, "weight": originConfig.Weight,
"addr": originConfig.AddrSummary(), "addr": originConfig.AddrSummary(),
"isOSS": originConfig.IsOSS(), "isOSS": originConfig.IsOSS(),
"name": originConfig.Name, "name": originConfig.Name,
"isOn": originConfig.IsOn, "isOn": originConfig.IsOn,
"domains": originConfig.Domains, "domains": originConfig.Domains,
"hasCert": originConfig.Cert != nil, "hasCert": originConfig.Cert != nil,
"host": originConfig.RequestHost, "host": originConfig.RequestHost,
"followPort": originConfig.FollowPort, "followPort": originConfig.FollowPort,
"http2Enabled": originConfig.HTTP2Enabled,
} }
primaryOriginMaps = append(primaryOriginMaps, m) primaryOriginMaps = append(primaryOriginMaps, m)
} }
@@ -103,16 +104,17 @@ func (this *IndexAction) RunGet(params struct {
originConfig.Domains = []string{} originConfig.Domains = []string{}
} }
var m = maps.Map{ var m = maps.Map{
"id": originConfig.Id, "id": originConfig.Id,
"weight": originConfig.Weight, "weight": originConfig.Weight,
"addr": originConfig.AddrSummary(), "addr": originConfig.AddrSummary(),
"isOSS": originConfig.IsOSS(), "isOSS": originConfig.IsOSS(),
"name": originConfig.Name, "name": originConfig.Name,
"isOn": originConfig.IsOn, "isOn": originConfig.IsOn,
"domains": originConfig.Domains, "domains": originConfig.Domains,
"hasCert": originConfig.Cert != nil, "hasCert": originConfig.Cert != nil,
"host": originConfig.RequestHost, "host": originConfig.RequestHost,
"followPort": originConfig.FollowPort, "followPort": originConfig.FollowPort,
"http2Enabled": originConfig.HTTP2Enabled,
} }
backupOriginMaps = append(backupOriginMaps, m) backupOriginMaps = append(backupOriginMaps, m)
} }

1
web/public/js/components/server/origin-list-box.js
View File

@@ -109,6 +109,7 @@ Vue.component("origin-list-table", {
<tiny-basic-label v-if="origin.hasCert">证书</tiny-basic-label> <tiny-basic-label v-if="origin.hasCert">证书</tiny-basic-label>
<tiny-basic-label v-if="origin.host != null && origin.host.length > 0">主机名: {{origin.host}}</tiny-basic-label> <tiny-basic-label v-if="origin.host != null && origin.host.length > 0">主机名: {{origin.host}}</tiny-basic-label>
<tiny-basic-label v-if="origin.followPort">端口跟随</tiny-basic-label> <tiny-basic-label v-if="origin.followPort">端口跟随</tiny-basic-label>
<tiny-basic-label v-if="origin.addr != null && origin.addr.startsWith('https://') && origin.http2Enabled">HTTP/2</tiny-basic-label>
<span v-if="origin.domains != null && origin.domains.length > 0"><tiny-basic-label v-for="domain in origin.domains">匹配: {{domain}}</tiny-basic-label></span> <span v-if="origin.domains != null && origin.domains.length > 0"><tiny-basic-label v-for="domain in origin.domains">匹配: {{domain}}</tiny-basic-label></span>
<span v-else-if="hasMatchedDomains"><tiny-basic-label>匹配: 所有域名</tiny-basic-label></span> <span v-else-if="hasMatchedDomains"><tiny-basic-label>匹配: 所有域名</tiny-basic-label></span>

9
web/views/@default/servers/addOriginPopup.html
View File

@@ -70,7 +70,14 @@
<td>端口跟随</td> <td>端口跟随</td>
<td> <td>
<checkbox name="followPort"></checkbox> <checkbox name="followPort"></checkbox>
<p class="comment">选中后表示源站的端口保持和用户访问的服务端口保持一致；此时的源站地址中的端口号可以任意填写。</p> <p class="comment">选中后，表示源站的端口保持和用户访问的服务端口保持一致；此时的源站地址中的端口号可以任意填写。</p>
</td>
</tr>
<tr v-show="!isOSS && protocol == 'https'">
<td>支持HTTP/2</td>
<td>
<checkbox name="http2Enabled"></checkbox>
<p class="comment">选中后，表示源站支持HTTP/2协议。</p>
</td> </td>
</tr> </tr>
</tbody> </tbody>

7
web/views/@default/servers/server/settings/origins/addPopup.html
View File

@@ -76,6 +76,13 @@
<p class="comment">选中后表示源站的端口保持和用户访问的服务端口保持一致；此时的源站地址中的端口号可以任意填写。</p> <p class="comment">选中后表示源站的端口保持和用户访问的服务端口保持一致；此时的源站地址中的端口号可以任意填写。</p>
</td> </td>
</tr> </tr>
<tr v-show="!isOSS && protocol == 'https'">
<td>支持HTTP/2</td>
<td>
<checkbox name="http2Enabled"></checkbox>
<p class="comment">选中后，表示源站支持HTTP/2协议。</p>
</td>
</tr>
<tr> <tr>
<td>权重</td> <td>权重</td>
<td> <td>

7
web/views/@default/servers/server/settings/origins/updatePopup.html
View File

@@ -77,6 +77,13 @@
<p class="comment">选中后表示源站的端口保持和用户访问的服务端口保持一致；此时的源站地址中的端口号可以任意填写。</p> <p class="comment">选中后表示源站的端口保持和用户访问的服务端口保持一致；此时的源站地址中的端口号可以任意填写。</p>
</td> </td>
</tr> </tr>
<tr v-show="!isOSS && origin.protocol == 'https'">
<td>支持HTTP/2</td>
<td>
<checkbox name="http2Enabled" v-model="origin.http2Enabled"></checkbox>
<p class="comment">选中后，表示源站支持HTTP/2协议。</p>
</td>
</tr>
<tr> <tr>
<td>权重</td> <td>权重</td>
<td> <td>