fix: 升级安装时未复制 etc 目录下的rdp证书和私钥文件导致服务无法启动；

fix: 主机列表界面，linux图标显示不正常；
fix: sftp客户端反复重连时导致核心服务假死（改为重连时报认证错误，避免其反复重连）；

dist/server/script/main.py

@@ -508,8 +508,8 @@ class InstallerLinux(InstallerBase):
                         x = l.split('=')
                         self._install_path = x[1]
                         break
-                        
+
-            
+
             # self._fix_path()
 
         if self._is_installed:
@@ -533,6 +533,14 @@ class InstallerLinux(InstallerBase):
 
         if not os.path.exists(self._config_path):
             utils.copy_ex(os.path.join(env.src_path, 'tmp', 'etc'), self._config_path)
+        else:
+            utils.copy_ex(os.path.join(env.src_path, 'tmp', 'etc'), self._config_path, 'core.ini', force=False)
+            utils.copy_ex(os.path.join(env.src_path, 'tmp', 'etc'), self._config_path, 'web.ini', force=False)
+            utils.copy_ex(os.path.join(env.src_path, 'tmp', 'etc'), self._config_path, 'tp_ssh_server.key', force=False)
+            utils.copy_ex(os.path.join(env.src_path, 'tmp', 'etc'), self._config_path, 'tp_rdp_ca.crt', force=False)
+            utils.copy_ex(os.path.join(env.src_path, 'tmp', 'etc'), self._config_path, 'tp_rdp_server.crt', force=False)
+            utils.copy_ex(os.path.join(env.src_path, 'tmp', 'etc'), self._config_path, 'tp_rdp_server.key', force=False)
+
 
     def _delete_files(self, del_settings):
         utils.remove(os.path.join(self._install_path, 'bin'))

server/tp_core/protocol/ssh/ssh_session.cpp

@@ -554,7 +554,8 @@ int SshSession::_do_auth(const char* user, const char* secret)
             m_auth_err_msg += m_sid;
             m_auth_err_msg += "'.";
             EXLOGE("[%s] %s\n", m_dbg_name.c_str(), m_auth_err_msg.c_str());
-            return SSH_AUTH_SUCCESS;
+            // return SSH_AUTH_SUCCESS;
+            return SSH_AUTH_DENIED;
         }
 
         m_conn_ip = m_conn_info->conn_ip;

server/www/teleport/static/less/_base.less

@@ -107,6 +107,7 @@ ul.list {
   //list-style: none;
   margin: 0;
   padding: 3px 0 5px 0;
+
   li {
     margin: 3px 3px 5px 10px;
   }
@@ -114,11 +115,13 @@ ul.list {
 
 .btn-single-line {
   white-space: nowrap;
+
   .btn {
     &:first-child {
       border-top-left-radius: 3px;
       border-bottom-left-radius: 3px;
     }
+
     &:last-child {
       border-top-right-radius: 3px;
       border-bottom-right-radius: 3px;
@@ -191,11 +194,13 @@ hr.small {
         margin-top: 1px;
         cursor: pointer;
       }
+
       input[type=checkbox] {
         display: block;
         float: left;
         margin: 3px 5px 0 0;
       }
+
       //select {
       //	margin-top: -3px;
       //}
@@ -228,43 +233,48 @@ hr.small {
 // icons.
 //=============================================
 .os-icon-windows:after {
-  //color: #00bcf6;
-  font-style: normal;
   content: "\f17a";
-  //font-size: 18px;
+  //color: #00bcf6;
-  //width: 24px;
+
-  //height: 24px;
+  font-style: normal;
-  //line-height: 24px;
+  text-align: center;
+  width: 1.25em;
+  height: 1.25em;
+  line-height: 1.25em;
+  border-radius: 50%;
   display: inline-block;
-  font-family: 'Font Awesome 5 Brands';
+  font-family: "Font Awesome 5 Brands";
   font-weight: 400;
 }
 
 .os-icon-linux:after {
-  //color: #fff;
-  font-style: normal;
   content: "\f17c";
-  //font-size: 18px;
+  color: #fff;
-  //width: 24px;
-  //height: 24px;
-  //line-height: 24px;
   background-color: #333;
+
+  font-style: normal;
+  text-align: center;
+  width: 1.25em;
+  height: 1.25em;
+  line-height: 1.25em;
   border-radius: 50%;
   display: inline-block;
-  font-family: 'Font Awesome 5 Brands';
+  font-family: "Font Awesome 5 Brands";
   font-weight: 400;
 }
 
 .os-icon-macos:after {
-  //color: #a7a7a7;
-  font-style: normal;
   content: "\f179";
-  //font-size: 20px;
+  //color: #a7a7a7;
-  //width: 24px;
+
-  //height: 24px;
+  font-style: normal;
-  //line-height: 24px;
+  text-align: center;
+  width: 1.25em;
+  height: 1.25em;
+  line-height: 1.25em;
+  border-radius: 50%;
   display: inline-block;
-  font-family: 'Font Awesome 5 Brands';
+  font-family: "Font Awesome 5 Brands";
   font-weight: 400;
 }
 

server/www/teleport/webroot/app/controller/system.py

@@ -314,7 +314,7 @@ class DoSaveCfgHandler(TPBaseJsonHandler):
                 err = system_model.save_config(self, '更新连接控制设置', 'session', _cfg)
                 if err == TPE_OK:
                     try:
-                        req = {'method': 'set_config', 'param': {'noop_timeout': _noop_timeout}}
+                        req = {'method': 'set_runtime_config', 'param': {'noop_timeout': _noop_timeout}}
                         _yr = core_service_async_post_http(req)
                         code, ret_data = yield _yr
                         if code != TPE_OK: