[Update] 修改翻译

cmd/locale/en_US/LC_MESSAGES/koko.po

@@ -122,57 +122,57 @@ msgid ""
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/session.go:264
+#: pkg/handler/session.go:267
 msgid "No Assets"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/session.go:286
+#: pkg/handler/session.go:289
 msgid "Node: [ ID.Name(Asset amount) ]"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/session.go:287
+#: pkg/handler/session.go:290
 msgid "Tips: Enter g+NodeID to display the host under the node, such as g1"
 msgstr ""
 
 #. i18n.T
-#: pkg/handler/session.go:301
+#: pkg/handler/session.go:304
 msgid "Refresh done"
 msgstr ""
 
 #. i18n.T
-#: pkg/proxy/parser.go:118
+#: pkg/proxy/parser.go:124
 msgid "Command `%s` is forbidden"
 msgstr ""
 
 #. i18n.T
-#: pkg/proxy/proxy.go:110
+#: pkg/proxy/proxy.go:152
 msgid "Connecting to %s@%s  %.1f"
 msgstr ""
 
 #. i18n.T
-#: pkg/proxy/proxy.go:128
+#: pkg/proxy/proxy.go:171
 msgid "System user <%s> and asset <%s> protocol are inconsistent."
 msgstr ""
 
 #. i18n.T
-#: pkg/proxy/proxy.go:134
+#: pkg/proxy/proxy.go:177
 msgid ""
 "Terminal only support protocol ssh/telnet, please use web terminal to access"
 msgstr ""
 
 #. i18n.T
-#: pkg/proxy/proxy.go:161
+#: pkg/proxy/sessmanager.go:63
 msgid "Connect with api server failed"
 msgstr ""
 
 #. i18n.T
-#: pkg/proxy/switch.go:136
+#: pkg/proxy/switch.go:142
 msgid "Connect idle more than %d minutes, disconnect"
 msgstr ""
 
 #. i18n.T
-#: pkg/proxy/switch.go:142
+#: pkg/proxy/switch.go:148
 msgid "Terminated by administrator"
 msgstr ""

cmd/locale/zh_CN/LC_MESSAGES/koko.po

@@ -112,67 +112,71 @@ msgstr "页码: %d, 数量: %d, 总页数: %d, 总数量: %d"
 msgid ""
 "\n"
 "Tips: Enter the asset ID and log directly into the asset.\n"
-msgstr "\n提示: 输入资产ID，直接登录资产.\n"
+msgstr ""
+"\n"
+"提示: 输入资产ID，直接登录资产.\n"
 
 #. i18n.T
 #: pkg/handler/pagination.go:180
 msgid ""
 "\n"
 "Page up: P/p\tPage down: Enter|N/n\tBACK: b.\n"
-msgstr "\n上一页: P/p  下一页: Enter|N/n  返回: B/b\n"
+msgstr ""
+"\n"
+"上一页: P/p  下一页: Enter|N/n  返回: B/b\n"
 
 #. i18n.T
-#: pkg/handler/session.go:264
+#: pkg/handler/session.go:267
 msgid "No Assets"
 msgstr "没有资产"
 
 #. i18n.T
-#: pkg/handler/session.go:286
+#: pkg/handler/session.go:289
 msgid "Node: [ ID.Name(Asset amount) ]"
 msgstr "节点: [ ID.名称(资产数量) ]"
 
 #. i18n.T
-#: pkg/handler/session.go:287
+#: pkg/handler/session.go:290
 msgid "Tips: Enter g+NodeID to display the host under the node, such as g1"
 msgstr "提示: 输入 g+节点ID 显示节点下主机. 如: g1"
 
 #. i18n.T
-#: pkg/handler/session.go:301
+#: pkg/handler/session.go:304
 msgid "Refresh done"
 msgstr "刷新完成"
 
 #. i18n.T
-#: pkg/proxy/parser.go:118
+#: pkg/proxy/parser.go:124
 msgid "Command `%s` is forbidden"
 msgstr "命令 `%s` 是被禁止的 ..."
 
 #. i18n.T
-#: pkg/proxy/proxy.go:110
+#: pkg/proxy/proxy.go:152
 msgid "Connecting to %s@%s  %.1f"
 msgstr "开始连接到 %s@%s  %.1f"
 
 #. i18n.T
-#: pkg/proxy/proxy.go:128
+#: pkg/proxy/proxy.go:171
 msgid "System user <%s> and asset <%s> protocol are inconsistent."
 msgstr "系统用户<%s>和资产<%s>协议不一致"
 
 #. i18n.T
-#: pkg/proxy/proxy.go:134
+#: pkg/proxy/proxy.go:177
 msgid ""
 "Terminal only support protocol ssh/telnet, please use web terminal to access"
 msgstr "终端仅支持ssh/telnet协议，请使用web终端登录"
 
 #. i18n.T
-#: pkg/proxy/proxy.go:161
+#: pkg/proxy/sessmanager.go:63
 msgid "Connect with api server failed"
 msgstr "连接API服务失败"
 
 #. i18n.T
-#: pkg/proxy/switch.go:136
+#: pkg/proxy/switch.go:142
 msgid "Connect idle more than %d minutes, disconnect"
 msgstr "空闲时间超过%d分钟，断开连接"
 
 #. i18n.T
-#: pkg/proxy/switch.go:142
+#: pkg/proxy/switch.go:148
 msgid "Terminated by administrator"
 msgstr "管理员中断连接"

pkg/httpd/server.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"path/filepath"
 
-	socketio "github.com/googollee/go-socket.io"
+	"github.com/googollee/go-socket.io"
 	"github.com/gorilla/mux"
 
 	"github.com/jumpserver/koko/pkg/config"
@@ -33,7 +33,9 @@ func StartHTTPServer() {
 
 	server.OnConnect("/elfinder", OnELFinderConnect)
 	server.OnDisconnect("/elfinder", OnELFinderDisconnect)
+	server.OnError("/elfiner", OnErrorHandler)
 	server.OnDisconnect("", SocketDisconnect)
+	server.OnError("", OnErrorHandler)
 
 	go server.Serve()
 	defer server.Close()

pkg/proxy/sessmanager.go

@@ -60,8 +60,8 @@ func CreateSession(p *ProxyServer) (sw *SwitchSession, err error) {
 	sw = NewSwitchSession(p)
 	// Post到Api端
 	ok := postSession(sw)
+	msg := i18n.T("Connect with api server failed")
 	if !ok {
-		msg := i18n.T("Connect with api server failed")
 		msg = utils.WrapperWarn(msg)
 		utils.IgnoreErrWriteString(p.UserConn, msg)
 		logger.Error(msg)
@@ -70,7 +70,6 @@ func CreateSession(p *ProxyServer) (sw *SwitchSession, err error) {
 	// 获取系统用户的过滤规则，并设置
 	cmdRules, err := service.GetSystemUserFilterRules(p.SystemUser.ID)
 	if err != nil {
-		msg := i18n.T("Connect with api server failed")
 		msg = utils.WrapperWarn(msg)
 		utils.IgnoreErrWriteString(p.UserConn, msg)
 		logger.Error(msg + err.Error())

tools/message.sh

@@ -17,11 +17,13 @@ init_message() {
 }
 
 make_message() {
+    cd ${PROJECT_DIR}
     go run ${BIN} -domain ${DOMAIN} -in ${INPUT} -out /tmp/
     for lang in $LANG;do
          po_file=${OUTPUT}/${lang}/LC_MESSAGES/${DOMAIN}.po
          msgmerge -U ${po_file} /tmp/${DOMAIN}.po
     done
+    cd -
 }
 
 compile_message() {