From b36499330f9777a252fd4264e73475fdaeaba380 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Sun, 11 Oct 2020 11:52:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81HTTPS=E7=9A=84API=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/rpc/rpc_client.go                            | 7 +++++--
 web/views/@default/api/node/@menu.html                | 2 +-
 web/views/@default/clusters/cluster/node/install.html | 5 +++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/internal/rpc/rpc_client.go b/internal/rpc/rpc_client.go
index ec836904..abed49bf 100644
--- a/internal/rpc/rpc_client.go
+++ b/internal/rpc/rpc_client.go
@@ -2,6 +2,7 @@ package rpc
 
 import (
 	"context"
+	"crypto/tls"
 	"encoding/base64"
 	"errors"
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
@@ -12,6 +13,7 @@ import (
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/rands"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/metadata"
 	"net/url"
 	"time"
@@ -39,8 +41,9 @@ func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) {
 		if u.Scheme == "http" {
 			conn, err = grpc.Dial(u.Host, grpc.WithInsecure())
 		} else if u.Scheme == "https" {
-			// TODO 暂不支持HTTPS
-			conn, err = grpc.Dial(u.Host)
+			conn, err = grpc.Dial(u.Host, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{
+				InsecureSkipVerify: true,
+			})))
 		} else {
 			return nil, errors.New("parse endpoint failed: invalid scheme '" + u.Scheme + "'")
 		}
diff --git a/web/views/@default/api/node/@menu.html b/web/views/@default/api/node/@menu.html
index b56ca1e8..297c8d5e 100644
--- a/web/views/@default/api/node/@menu.html
+++ b/web/views/@default/api/node/@menu.html
@@ -2,6 +2,6 @@
 	<menu-item href="/api">节点列表</menu-item>
 	<span class="item">|</span>
 	<menu-item :href="'/api/node?nodeId=' + node.id" code="index">"{{node.name}}"详情</menu-item>
-	<menu-item :href="'/api/node/update?nodeId=' + node.id" code="update">修改节点</menu-item>
 	<menu-item :href="'/api/node/install?nodeId=' + node.id" code="install">安装节点</menu-item>
+	<menu-item :href="'/api/node/update?nodeId=' + node.id" code="update">修改节点</menu-item>
 </first-menu>
diff --git a/web/views/@default/clusters/cluster/node/install.html b/web/views/@default/clusters/cluster/node/install.html
index 6cc082bc..fe1e4658 100644
--- a/web/views/@default/clusters/cluster/node/install.html
+++ b/web/views/@default/clusters/cluster/node/install.html
@@ -32,9 +32,10 @@
 		<h3>方法2：手动安装</h3>
 		<table class="ui table definition selectable">
 			<tr>
-				<td>配置文件<em>（configs/api.yaml）</em></td>
+				<td>配置文件<em>（configs/api.yaml）</em><br/>
+				<em><download-link :v-element="'rpc-code'" :v-file="'api.yaml'">[下载]</download-link ></em></td>
 				<td>
-					<pre>rpc:
+					<pre id="rpc-code">rpc:
   endpoints: [ {{apiEndpoints}} ]
 nodeId: "{{node.uniqueId}}"
 secret: "{{node.secret}}"</pre>