mirror of https://github.com/jumpserver/jumpserver
fix: 导入数据解析 title 时,没有过滤 read only 字段 (#6269)
* feat: Update README (#6182) * feat: Update README * feat: Update README * Update README.md * feat: update README * fix: 导入数据解析 title 时,没有过滤 read only 字段 type,type_display 翻译都是一样的,导出时使用的是 type,导入时识别成 type_display Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>pull/6277/head
parent
937acbd0b5
commit
94fc1fb53b
31
README.md
31
README.md
|
@ -37,8 +37,8 @@ JumpServer 采纳分布式架构,支持多机房跨区域部署,支持横向
|
|||
|
||||
<table>
|
||||
<tr>
|
||||
<td rowspan="8">身份认证<br>Authentication</td>
|
||||
<td rowspan="5">登录认证</td>
|
||||
<td rowspan="11">身份认证<br>Authentication</td>
|
||||
<td rowspan="7">登录认证</td>
|
||||
<td>资源统一登录与认证</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
@ -53,6 +53,12 @@ JumpServer 采纳分布式架构,支持多机房跨区域部署,支持横向
|
|||
<tr>
|
||||
<td>CAS 认证 (实现单点登录)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>钉钉认证 (扫码登录)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>企业微信认证 (扫码登录)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td rowspan="2">MFA认证</td>
|
||||
<td>MFA 二次认证(Google Authenticator)</td>
|
||||
|
@ -64,6 +70,10 @@ JumpServer 采纳分布式架构,支持多机房跨区域部署,支持横向
|
|||
<td>登录复核</td>
|
||||
<td>用户登录行为受管理员的监管与控制:small_orange_diamond:</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>登录限制</td>
|
||||
<td>用户登录来源 IP 受管理员控制(支持黑/白名单)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td rowspan="11">账号管理<br>Account</td>
|
||||
<td rowspan="2">集中账号</td>
|
||||
|
@ -105,7 +115,7 @@ JumpServer 采纳分布式架构,支持多机房跨区域部署,支持横向
|
|||
<td>统一对资产主机的用户密码进行查看、更新、测试操作:small_orange_diamond:</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td rowspan="15">授权控制<br>Authorization</td>
|
||||
<td rowspan="17">授权控制<br>Authorization</td>
|
||||
<td>多维授权</td>
|
||||
<td>对用户、用户组、资产、资产节点、应用以及系统用户进行授权</td>
|
||||
</tr>
|
||||
|
@ -157,17 +167,27 @@ JumpServer 采纳分布式架构,支持多机房跨区域部署,支持横向
|
|||
<td>工单管理</td>
|
||||
<td>支持对用户登录请求行为进行控制:small_orange_diamond:</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td rowspan="2">访问控制</td>
|
||||
<td>登录资产复核(通过 SSH/Telnet 协议登录资产):small_orange_diamond:</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>命令执行复核:small_orange_diamond:</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>组织管理</td>
|
||||
<td>实现多租户管理与权限隔离:small_orange_diamond:</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td rowspan="7">安全审计<br>Audit</td>
|
||||
<td rowspan="8">安全审计<br>Audit</td>
|
||||
<td>操作审计</td>
|
||||
<td>用户操作行为审计</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td rowspan="2">会话审计</td>
|
||||
<td rowspan="3">会话审计</td>
|
||||
<td>在线会话内容监控</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>在线会话内容审计</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
@ -301,3 +321,4 @@ Licensed under The GNU General Public License version 2 (GPLv2) (the "License")
|
|||
https://www.gnu.org/licenses/gpl-2.0.html
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
|
||||
|
||||
|
|
|
@ -47,8 +47,13 @@ class BaseFileParser(BaseParser):
|
|||
def convert_to_field_names(self, column_titles):
|
||||
fields_map = {}
|
||||
fields = self.serializer_fields
|
||||
fields_map.update({v.label: k for k, v in fields.items()})
|
||||
fields_map.update({k: k for k, _ in fields.items()})
|
||||
for k, v in fields.items():
|
||||
if v.read_only:
|
||||
continue
|
||||
fields_map.update({
|
||||
v.label: k,
|
||||
k: k
|
||||
})
|
||||
field_names = [
|
||||
fields_map.get(column_title.strip('*'), '')
|
||||
for column_title in column_titles
|
||||
|
|
Loading…
Reference in New Issue