diff --git a/internal/web/actions/default/servers/create.go b/internal/web/actions/default/servers/create.go index 0ad30b4c..7d65825f 100644 --- a/internal/web/actions/default/servers/create.go +++ b/internal/web/actions/default/servers/create.go @@ -36,24 +36,6 @@ func (this *CreateAction) RunGet(params struct{}) { } this.Data["countAuditing"] = countAuditingResp.Count - // 所有集群 - resp, err := this.RPC().NodeClusterRPC().FindAllEnabledNodeClusters(this.AdminContext(), &pb.FindAllEnabledNodeClustersRequest{}) - if err != nil { - this.ErrorPage(err) - } - if err != nil { - this.ErrorPage(err) - return - } - clusterMaps := []maps.Map{} - for _, cluster := range resp.NodeClusters { - clusterMaps = append(clusterMaps, maps.Map{ - "id": cluster.Id, - "name": cluster.Name, - }) - } - this.Data["clusters"] = clusterMaps - // 服务类型 this.Data["serverTypes"] = serverconfigs.AllServerTypes() @@ -95,10 +77,6 @@ func (this *CreateAction) RunPost(params struct { Must *actions.Must }) { - params.Must. - Field("name", params.Name). - Require("请输入服务名称") - var clusterId = params.ClusterId // 用户 @@ -129,7 +107,7 @@ func (this *CreateAction) RunPost(params struct { switch params.ServerType { case serverconfigs.ServerTypeHTTPProxy, serverconfigs.ServerTypeHTTPWeb: - listen := []*serverconfigs.NetworkAddressConfig{} + var listen = []*serverconfigs.NetworkAddressConfig{} err := json.Unmarshal([]byte(params.Addresses), &listen) if err != nil { this.Fail("端口地址解析失败：" + err.Error()) @@ -166,7 +144,7 @@ func (this *CreateAction) RunPost(params struct { this.Fail("DEMO模式下不能创建TCP反向代理") } - listen := []*serverconfigs.NetworkAddressConfig{} + var listen = []*serverconfigs.NetworkAddressConfig{} err := json.Unmarshal([]byte(params.Addresses), &listen) if err != nil { this.Fail("端口地址解析失败：" + err.Error()) @@ -197,13 +175,17 @@ func (this *CreateAction) RunPost(params struct { tlsConfig.AddListen(addr) } } + + if len(params.Name) == 0 { + params.Name = "TCP负载均衡" + } case serverconfigs.ServerTypeUDPProxy: // 在DEMO模式下不能创建 if teaconst.IsDemoMode { this.Fail("DEMO模式下不能创建UDP反向代理") } - listen := []*serverconfigs.NetworkAddressConfig{} + var listen = []*serverconfigs.NetworkAddressConfig{} err := json.Unmarshal([]byte(params.Addresses), &listen) if err != nil { this.Fail("端口地址解析失败：" + err.Error()) @@ -225,6 +207,10 @@ func (this *CreateAction) RunPost(params struct { udpConfig.AddListen(addr) } } + + if len(params.Name) == 0 { + params.Name = "UDP负载均衡" + } default: this.Fail("请选择正确的服务类型") } @@ -282,8 +268,13 @@ func (this *CreateAction) RunPost(params struct { } // 检查域名是否已经存在 - allServerNames := serverconfigs.PlainServerNames(serverNames) + var allServerNames = serverconfigs.PlainServerNames(serverNames) if len(allServerNames) > 0 { + // 指定默认名称 + if len(params.Name) == 0 { + params.Name = allServerNames[0] + } + dupResp, err := this.RPC().ServerRPC().CheckServerNameDuplicationInNodeCluster(this.AdminContext(), &pb.CheckServerNameDuplicationInNodeClusterRequest{ ServerNames: allServerNames, NodeClusterId: clusterId, diff --git a/web/public/js/components/common/network-addresses-box.js b/web/public/js/components/common/network-addresses-box.js index 551ae4c9..9367ccd2 100644 --- a/web/public/js/components/common/network-addresses-box.js +++ b/web/public/js/components/common/network-addresses-box.js @@ -24,7 +24,8 @@ Vue.component("network-addresses-box", { addresses: addresses, protocol: protocol, name: name, - from: from + from: from, + isEditing: false } }, watch: { @@ -39,6 +40,8 @@ Vue.component("network-addresses-box", { }, methods: { addAddr: function () { + this.isEditing = true + let that = this window.UPDATING_ADDR = null @@ -106,17 +109,31 @@ Vue.component("network-addresses-box", { }, supportRange: function () { return this.vSupportRange || (this.vServerType == "tcpProxy" || this.vServerType == "udpProxy") + }, + edit: function () { + this.isEditing = true } }, template: `
-
-
- {{addr.protocol}}://{{addr.host.quoteIP()}}*:{{addr.portRange}}{{addr.portRange}} - -
-
+
+
+
+ {{addr.protocol}}://{{addr.host.quoteIP()}}*:{{addr.portRange}}{{addr.portRange}} +
+     [修改] +
+
+
+
+
+ {{addr.protocol}}://{{addr.host.quoteIP()}}*:{{addr.portRange}}{{addr.portRange}} + + +
+
+
+ [添加端口绑定]
- [添加端口绑定]
` }) \ No newline at end of file diff --git a/web/views/@default/servers/addOriginPopup.html b/web/views/@default/servers/addOriginPopup.html index 82d89ecc..bbf33e45 100644 --- a/web/views/@default/servers/addOriginPopup.html +++ b/web/views/@default/servers/addOriginPopup.html @@ -5,7 +5,7 @@
- + + + + + @@ -42,13 +49,6 @@ - - - - - - - - - - - - - - - - - - - - - - -
源站协议源站协议 *
回源主机名 + +

请求源站时的Host字段值，用于修改源站接收到的域名，支持请求变量。

+
回源主机名 - -

请求源站时的Host，用于修改源站接收到的域名，自定义Host内容中支持请求变量。

-
专属域名 diff --git a/web/views/@default/servers/create.css b/web/views/@default/servers/create.css index 16441e4b..2647f551 100644 --- a/web/views/@default/servers/create.css +++ b/web/views/@default/servers/create.css @@ -1,4 +1,25 @@ .label em { font-style: italic !important; } +.checkboxes .checkbox { + float: left; + margin-bottom: 1em; + margin-right: 1em; +} +@media screen and (min-width: 1024px) { + .tables-box { + width: 1024px; + } + .tables-box .table-box { + width: 48%; + float: left; + } + .tables-box .table-box.right { + margin-left: 1em; + opacity: 0.3; + } + .tables-box .table-box.right:hover { + opacity: 1; + } +} /*# sourceMappingURL=create.css.map */ \ No newline at end of file diff --git a/web/views/@default/servers/create.css.map b/web/views/@default/servers/create.css.map index b16eb140..07689ae3 100644 --- a/web/views/@default/servers/create.css.map +++ b/web/views/@default/servers/create.css.map @@ -1 +1 @@ -{"version":3,"sources":["create.less"],"names":[],"mappings":"AAAA,MAAO;EACN,6BAAA","file":"create.css"} \ No newline at end of file +{"version":3,"sources":["create.less"],"names":[],"mappings":"AAAA,MAAO;EACN,6BAAA;;AAGD,WACC;EACC,WAAA;EACA,kBAAA;EACA,iBAAA;;AAIF,mBAAsC;EACrC;IACC,aAAA;;EADD,WAGC;IACC,UAAA;IACA,WAAA;;EALF,WAQC,WAAU;IACT,gBAAA;IACA,YAAA;;EAVF,WAaC,WAAU,MAAM;IACf,UAAA","file":"create.css"} \ No newline at end of file diff --git a/web/views/@default/servers/create.html b/web/views/@default/servers/create.html index 09599111..3e323199 100644 --- a/web/views/@default/servers/create.html +++ b/web/views/@default/servers/create.html @@ -4,138 +4,131 @@
- - - - - - - - - - - - - - - - - +
+
+
服务名称 * - -

可以是网站用途或者域名等。

-
所属用户 - -

当前服务所属平台用户。

-
选择套餐 - -
部署的集群 * -
- -

当前服务将会部署到所选集群的节点上。

-
-
跟随用户设置。
-
+ + + + + + + + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + +
所属用户 + +

当前服务所属平台用户。

+
选择套餐 + +
部署的集群 * +
+ +

当前服务将会部署到所选集群的节点上。

+
+
跟随用户设置。
+
绑定域名 * - -

绑定后，才能通过域名可以访问不同的服务。

-
绑定域名 * + +

绑定后，才能通过域名可以访问不同的服务。

+
服务类型 * - -

{{s.description}}

-
绑定端口 * - -
{{tlsProtocolName.toUpperCase()}}证书 + +
{{tlsProtocolName.toUpperCase()}}证书 - -
源站地址 * + +
+
+ {{origin.addr.protocol}}://{{origin.addr.host}}:{{origin.addr.portRange}} + +
+
+
+ [添加源站地址] +
源站地址 * - -
-
- {{origin.addr.protocol}}://{{origin.addr.host}}:{{origin.addr.portRange}} - -
-
-
- [添加源站地址] -
Web目录 + +
Web目录 - -
绑定端口 * + +
+ -
选择分组 - -
默认开启配置 - 访问日志 -     - Websocket -     - 缓存 -     - WAF -     - 从上级代理中读取IP -     - 统计 -
描述 - -
+
+

次要信息

+ + + + + + + + + + + + + + + + + +
服务类型 + +

{{s.description}}

+
服务名称 + +

可以是网站用途或者域名等。

+
默认开启配置 +
+ 访问日志 + Websocket + 缓存 + WAF + 从上级代理中读取IP + 统计 +
+
选择分组 + +
+
+
+
+
\ No newline at end of file diff --git a/web/views/@default/servers/create.less b/web/views/@default/servers/create.less index 7009c12c..d558c9b0 100644 --- a/web/views/@default/servers/create.less +++ b/web/views/@default/servers/create.less @@ -1,3 +1,31 @@ .label em { font-style: italic !important; +} + +.checkboxes { + .checkbox { + float: left; + margin-bottom: 1em; + margin-right: 1em; + } +} + +@media screen and (min-width: 1024px) { + .tables-box { + width: 1024px; + + .table-box { + width: 48%; + float: left; + } + + .table-box.right { + margin-left: 1em; + opacity: 0.3; + } + + .table-box.right:hover { + opacity: 1.0; + } + } } \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/origins/addPopup.html b/web/views/@default/servers/server/settings/origins/addPopup.html index 50d6e681..747ed3a6 100644 --- a/web/views/@default/servers/server/settings/origins/addPopup.html +++ b/web/views/@default/servers/server/settings/origins/addPopup.html @@ -35,6 +35,13 @@ 源站服务器地址，通常是一个IP（或域名）加端口，不需要加 http:// 或 https://。

+ + 回源主机名 + + +

请求源站时的Host字段值，用于修改源站接收到的域名，支持请求变量。

+ + @@ -45,13 +52,6 @@ - - 回源主机名 - - -

请求源站时的Host，用于修改源站接收到的域名，自定义Host内容中支持请求变量。

- - 专属域名 diff --git a/web/views/@default/servers/server/settings/origins/updatePopup.html b/web/views/@default/servers/server/settings/origins/updatePopup.html index 396b0854..41e9b179 100644 --- a/web/views/@default/servers/server/settings/origins/updatePopup.html +++ b/web/views/@default/servers/server/settings/origins/updatePopup.html @@ -36,6 +36,13 @@

{{addrError}}源站服务器地址，通常是一个IP（或域名）加端口，不需要加 http:// 或 https://。

+ + 回源主机名 + + +

请求源站时的Host字段值，用于修改源站接收到的域名，支持请求变量。

+ + @@ -46,13 +53,6 @@ - - 回源主机名 - - -

请求源站时的Host，用于修改源站接收到的域名，自定义Host内容中支持请求变量。

- - 专属域名