github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
9,381 Commits
66 Branches
246 Tags
107 MiB
Commit Graph

9381 Commits (b0b14fe2e1217c2597dd879dbdbf441af7fc30c9)

Author SHA1 Message Date
jiangweidong 10dad85e9f Merge branch 'dev' of http://github.com/jumpserver/jumpserver into ssh_tunnel_no_auth_error 2023-02-23 18:17:38 +08:00
jiangweidong e45eb96f12 fix: 对于网关无法连接的，给出原因并停止此任务的后续步骤，不影响其他任务 2023-02-23 18:15:31 +08:00
fit2bot b797b46ab8
perf: translate (#9724) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-23 18:14:44 +08:00
fit2bot 9f8900041d
per: gather account perm (#9723) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2023-02-23 18:08:56 +08:00
老广 aa81db57b1
Merge pull request #9722 from jumpserver/pr@dev@perf_asset_update 
perf: 优化资产批量更新
 2023-02-23 17:54:09 +08:00
ibuler 1a9cd2dee2 perf: 优化资产批量更新 2023-02-23 17:44:38 +08:00
fit2bot b2f38c2218
perf: 增加定时任务清理僵尸作业 (#9714) 
* perf: 增加定时任务清理僵尸作业

* perf: 优化代码结构

* fix: 修改翻译

* perf: 延长清理间隔时间

* perf: 添加优先级括号

---------

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-23 17:01:24 +08:00
jiangweidong e1a1e838bf perf: 修改认证设置类的国际化，字符串方式会直接翻译成国际化内容 2023-02-23 16:59:35 +08:00
老广 4a36e54030
Merge pull request #9710 from jumpserver/pr@dev@fix_task_activity_error 
fix: 创建用户和验证账号任务的Activity日志保存失败
 2023-02-23 16:31:44 +08:00
老广 67d760719a
Merge pull request #9719 from jumpserver/pr@dev@fix_operatelog_i18n 
fix: 操作日志的国际化应该根据查询对象的语言决定
 2023-02-23 16:30:45 +08:00
jiangweidong 9c599fd1f4 fix: 更改label 2023-02-23 16:25:02 +08:00
jiangweidong 0a5766edd3 fix: 操作日志的国际化应该根据查询对象的语言决定 2023-02-23 16:20:43 +08:00
老广 bb62e19ea8
Merge pull request #9718 from jumpserver/pr@dev@perf_account_info 
perf: 修改 account asset auto_info 返回
 2023-02-23 16:16:39 +08:00
ibuler d1b807bd8b perf: 修改 account asset auto_info 返回 2023-02-23 16:14:24 +08:00
fit2bot 3ee2bfce9a
perf: 优化连接方式 (#9716) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-02-23 15:58:55 +08:00
吴小白 a20bd3acd4 perf: 更新 quick_start.sh 2023-02-23 15:54:08 +08:00
老广 68ea8ef1b7
Merge pull request #9713 from jumpserver/pr@dev@perf_agent_check 
perf: 修改 agent 判断
 2023-02-23 15:27:12 +08:00
ibuler ee926cfa42 perf: 修改 agent 判断 2023-02-23 15:04:07 +08:00
Bai d4435799ac fix: 授权规则账号列表返回asset.auto_info字段 2023-02-23 11:45:56 +08:00
fit2bot aaeef83d38
perf: history account secret (#9711) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-23 11:27:03 +08:00
jiangweidong c2b592f6fe fix: 创建用户和验证账号任务的Activity日志保存失败 2023-02-23 10:46:59 +08:00
老广 4ec7a4a118
Merge pull request #9707 from jumpserver/pr@dev@fix_serializer 
perf: 修复 role user serializer 问题
 2023-02-22 22:21:13 +08:00
ibuler c4982dd3b5 perf: 修复 role user serializer 问题 2023-02-22 22:20:11 +08:00
fit2bot 2279219404
perf: 工单备注 markdown (#9706) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 22:12:50 +08:00
老广 58341a9e85
Merge pull request #9689 from jumpserver/pr@dev@fix_operatelog_root_org 
fix: 操作日志、Activity日志显示当前组织和SYSTEM组织下的内容
 2023-02-22 22:09:26 +08:00
老广 ce8be265e7
Merge pull request #9705 from jumpserver/pr@dev@perf_perm_migrate 
perf: 优化迁移
 2023-02-22 21:58:41 +08:00
ibuler b8b25d2da8 perf: 修改 翻译 2023-02-22 21:57:48 +08:00
jiangweidong 07c23c5341 perf: 解决冲突 2023-02-22 21:56:40 +08:00
ibuler 37524106bf perf: 优化迁移 2023-02-22 21:52:37 +08:00
jiangweidong 6b6f844795 fix: 修改org_id位置 2023-02-22 21:48:11 +08:00
Eric_Lee 6a5b2bd29e
Merge pull request #9704 from jumpserver/pr@dev@fix_add_file_unspported_msg 
fix: 增加无法读取的文件提示
 2023-02-22 21:31:57 +08:00
Aaron3S 25bd5c71d1 fix: 增加无法读取的文件提示 2023-02-22 21:27:14 +08:00
Eric_Lee 3aa7d1841b
Merge pull request #9702 from jumpserver/pr@dev@perf_ops_permed_assets_error_msg 
perf: 优化报错代码
 2023-02-22 21:18:40 +08:00
Aaron3S 9b2f422622 perf: 优化报错代码 2023-02-22 21:14:13 +08:00
Bai 49c7a12bb3 fix: 修复资产授权规则过滤 2023-02-22 21:07:49 +08:00
老广 ad0fc0d70a
Merge pull request #9699 from jumpserver/pr@dev@perf_field 
perf: 优化部分 field
 2023-02-22 20:39:51 +08:00
老广 0b1f6e2606
Merge pull request #9693 from jumpserver/pr@dev@perf_accounts_version 
perf: 优化账号历史
 2023-02-22 20:38:52 +08:00
fit2bot b83667bbd5
perf: celery task and add org single (#9698) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 20:31:20 +08:00
ibuler ea31de0b2b perf: 优化部分 field 2023-02-22 20:30:43 +08:00
老广 8db3543e98
Merge pull request #9697 from jumpserver/pr@dev@fix_oracle_ping 
fix: 解决Oracle验证账号任务失败问题
 2023-02-22 20:19:11 +08:00
jiangweidong bcbab0ff49 fix: 解决冲突 2023-02-22 20:17:33 +08:00
jiangweidong 9207ee73ea fix: 解决Oracle验证账号任务失败问题 2023-02-22 20:16:04 +08:00
Eric_Lee 17a96a5b48
Merge pull request #9696 from jumpserver/pr@dev@fix_add_perm_classes 
fix: 添加 api permission_classes
 2023-02-22 20:07:41 +08:00
Aaron3S d14010d4fa fix: 添加 api permission_classes 2023-02-22 20:04:00 +08:00
fit2bot ec4cdc801f
perf: operate log amount (#9695) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 19:42:40 +08:00
fit2bot ddcd09c6a6
fix: 修复最后执行时间不更新的问题 (#9694) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-22 18:53:35 +08:00
Eric_Lee a4e920e410
Merge pull request #9688 from jumpserver/pr@dev@fix_job_center_account_not_in_perm 
fix: 修复作业中心资产和用于没有过滤授权规则的问题
 2023-02-22 18:51:04 +08:00
Aaron3S 34386bd6fb fix: 修改生成 inventory 错误代码，增加运行作业权限校验 2023-02-22 18:06:46 +08:00
ibuler 5d8d0a320b perf: 优化账号历史 2023-02-22 17:58:00 +08:00
fit2bot 042108a9c0
perf: k8s account @input (#9692) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 17:56:20 +08:00