From c936ec44015c36157573fc20a1f3fa902f878e8b Mon Sep 17 00:00:00 2001
From: harveyshao <harveyshao@tencent.com>
Date: Sat, 18 Feb 2023 13:05:53 +0800
Subject: [PATCH] opt some

---
 base/nfs/trash.go    | 6 +++---
 base/web/spide.go    | 2 +-
 core/code/autogen.go | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/base/nfs/trash.go b/base/nfs/trash.go
index ddceb21e..67dd3966 100644
--- a/base/nfs/trash.go
+++ b/base/nfs/trash.go
@@ -1,6 +1,7 @@
 package nfs
 
 import (
+	"os"
 	"path"
 
 	ice "shylinux.com/x/icebergs"
@@ -13,6 +14,7 @@ func _trash_create(m *ice.Message, from string) {
 		return
 	}
 	s, e := StatFile(m, from)
+	defer os.Remove(from)
 	if m.Warn(e, ice.ErrNotFound, from) {
 		return
 	}
@@ -54,6 +56,4 @@ func init() {
 	})
 }
 
-func Trash(m *ice.Message, p string) *ice.Message {
-	return m.Cmd(TRASH, mdb.CREATE, p)
-}
+func Trash(m *ice.Message, p string) *ice.Message { return m.Cmd(TRASH, mdb.CREATE, p) }
diff --git a/base/web/spide.go b/base/web/spide.go
index 8021d3a7..cf9ddb67 100644
--- a/base/web/spide.go
+++ b/base/web/spide.go
@@ -27,7 +27,7 @@ func _spide_create(m *ice.Message, name, address string) {
 		mdb.HashSelectUpdate(m, mdb.HashCreate(m, CLIENT_NAME, name), func(value ice.Map) {
 			dir, file := path.Split(uri.EscapedPath())
 			value[SPIDE_CLIENT] = kit.Dict(mdb.NAME, name, SPIDE_METHOD, http.MethodPost, "url", address, "origin", uri.Scheme+"://"+uri.Host,
-				tcp.PROTOCOL, uri.Scheme, tcp.HOSTNAME, uri.Host, nfs.PATH, dir, nfs.FILE, file, "query", uri.RawQuery,
+				tcp.PROTOCOL, uri.Scheme, tcp.HOSTNAME, uri.Hostname(), tcp.HOST, uri.Host, nfs.PATH, dir, nfs.FILE, file, "query", uri.RawQuery,
 				cli.TIMEOUT, "30s", LOGHEADERS, ice.FALSE,
 			)
 		})
diff --git a/core/code/autogen.go b/core/code/autogen.go
index 3a3efc57..d0f18ca3 100644
--- a/core/code/autogen.go
+++ b/core/code/autogen.go
@@ -167,7 +167,8 @@ func init() {
 			}},
 			RELAY: {Name: "relay alias username host port=22 init", Help: "跳板", Hand: func(m *ice.Message, arg ...string) {
 				m.Cmdy(COMPILE, RELAY)
-				m.Cmdy(nfs.LINK, ice.USR_PUBLISH+m.Option(mdb.ALIAS), ice.USR_PUBLISH+RELAY)
+				// m.Cmdy(nfs.LINK, ice.USR_PUBLISH+m.Option(mdb.ALIAS), ice.USR_PUBLISH+RELAY)
+				m.Cmdy(cli.SYSTEM, "ln", "-s", RELAY, ice.USR_PUBLISH+m.Option(mdb.ALIAS))
 				m.Cmd(nfs.SAVE, path.Join(kit.Env(cli.HOME), ".ssh/"+m.Option(mdb.ALIAS)+".json"),
 					kit.Formats(kit.Dict(m.OptionSimple("username,host,port,init"))))
 			}},